From c85442de73f63c74d9dc5a6b518559846acea766 Mon Sep 17 00:00:00 2001
From: bbimber <bbimber@gmail.com>
Date: Fri, 8 Aug 2025 07:11:56 -0700
Subject: [PATCH 1/3] More visible link to notification service admin

---
 LDK/src/org/labkey/ldk/LDKModule.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/LDK/src/org/labkey/ldk/LDKModule.java b/LDK/src/org/labkey/ldk/LDKModule.java
index 7930a41b..78b1a83b 100644
--- a/LDK/src/org/labkey/ldk/LDKModule.java
+++ b/LDK/src/org/labkey/ldk/LDKModule.java
@@ -31,6 +31,9 @@
 import org.labkey.api.security.permissions.ReadPermission;
 import org.labkey.api.settings.AdminConsole;
 import org.labkey.api.util.PageFlowUtil;
+import org.labkey.api.view.DeveloperMenuNavTrees;
+import org.labkey.api.view.NavTree;
+import org.labkey.api.view.PopupDeveloperView;
 import org.labkey.api.view.WebPartFactory;
 import org.labkey.ldk.notification.NotificationServiceImpl;
 import org.labkey.ldk.notification.SiteSummaryNotification;
@@ -84,6 +87,17 @@ protected void init()
     protected void doStartupAfterSpringConfig(ModuleContext moduleContext)
     {
         AdminConsole.addLink(AdminConsole.SettingsLinkType.Management, "notification service admin", DetailsURL.fromString("/ldk/notificationSiteAdmin.view").getActionURL(), AdminOperationsPermission.class);
+        PopupDeveloperView.registerMenuProvider((c, user, trees) -> {
+            if (c.isRoot() & user.hasSiteAdminPermission())
+            {
+                trees.add(DeveloperMenuNavTrees.Section.tools, new NavTree("Notification Service Admin", DetailsURL.fromString("ldk/notificationSiteAdmin.view", c).getActionURL()));
+            }
+            else if (!c.isRoot() & c.hasPermission(user, AdminPermission.class))
+            {
+                trees.add(DeveloperMenuNavTrees.Section.tools, new NavTree("Notification Service Admin", DetailsURL.fromString("ldk/notificationAdmin.view", c).getActionURL()));
+            }
+        });
+
         AdminConsole.addLink(AdminConsole.SettingsLinkType.Management, "file root usage summary", DetailsURL.fromString("/ldk/folderSizeSummary.view").getActionURL(), ReadPermission.class);
 
         if (isSqlServer())

From 8c329ce18c8f3cecd4c0ae6482cf5d9060b2002f Mon Sep 17 00:00:00 2001
From: bbimber <bbimber@gmail.com>
Date: Tue, 19 Aug 2025 12:43:30 -0700
Subject: [PATCH 2/3] Consider container when truncating data in
 AbstractDataDefinedTable

---
 .../org/labkey/api/ldk/table/AbstractDataDefinedTable.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/LDK/api-src/org/labkey/api/ldk/table/AbstractDataDefinedTable.java b/LDK/api-src/org/labkey/api/ldk/table/AbstractDataDefinedTable.java
index a974a4d7..cef47256 100644
--- a/LDK/api-src/org/labkey/api/ldk/table/AbstractDataDefinedTable.java
+++ b/LDK/api-src/org/labkey/api/ldk/table/AbstractDataDefinedTable.java
@@ -194,9 +194,13 @@ protected Map<String, Object> updateRow(User user, Container container, Map<Stri
         protected int truncateRows(User user, Container container)
         {
             SimpleFilter filter = new SimpleFilter(FieldKey.fromString(_filterColumn), _filterValue, CompareType.EQUAL);
+            if (getColumn("container") != null)
+            {
+                filter.addClause(new ContainerFilter.CurrentOrParentAndWorkbooks(container, user).createFilterClause(getSchema(), FieldKey.fromParts("container")));
+            }
+
             return Table.delete(getDbTable(), filter);
         }
-
     }
 
     protected class ValuesManager

From 214800a0913daa6906633923f386e56dbf3fb455 Mon Sep 17 00:00:00 2001
From: bbimber <bbimber@gmail.com>
Date: Tue, 19 Aug 2025 12:45:08 -0700
Subject: [PATCH 3/3] Avoid hard-coding container

---
 .../org/labkey/api/ldk/table/AbstractDataDefinedTable.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/LDK/api-src/org/labkey/api/ldk/table/AbstractDataDefinedTable.java b/LDK/api-src/org/labkey/api/ldk/table/AbstractDataDefinedTable.java
index cef47256..a4e67d92 100644
--- a/LDK/api-src/org/labkey/api/ldk/table/AbstractDataDefinedTable.java
+++ b/LDK/api-src/org/labkey/api/ldk/table/AbstractDataDefinedTable.java
@@ -194,9 +194,10 @@ protected Map<String, Object> updateRow(User user, Container container, Map<Stri
         protected int truncateRows(User user, Container container)
         {
             SimpleFilter filter = new SimpleFilter(FieldKey.fromString(_filterColumn), _filterValue, CompareType.EQUAL);
-            if (getColumn("container") != null)
+
+            if (getContainerFieldKey() != null)
             {
-                filter.addClause(new ContainerFilter.CurrentOrParentAndWorkbooks(container, user).createFilterClause(getSchema(), FieldKey.fromParts("container")));
+                filter.addClause(new ContainerFilter.CurrentOrParentAndWorkbooks(container, user).createFilterClause(getSchema(), getContainerFieldKey()));
             }
 
             return Table.delete(getDbTable(), filter);