Issue 51620: Remove the UI for Object-level discussions (#6275)

LabKey · Feb 7, 2025 · 869283e · 869283e
1 parent c9882b4
commit 869283e
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 9 deletions.
diff --git a/announcements/src/org/labkey/announcements/model/DiscussionServiceImpl.java b/announcements/src/org/labkey/announcements/model/DiscussionServiceImpl.java
@@ -132,7 +132,7 @@ public DiscussionService.DiscussionView getDiscussionArea(ViewContext context, S
     @Nullable
     public DiscussionService.DiscussionView getDiscussionArea(Container c, User user, URLHelper currentURL, String objectId, ActionURL pageURL, String newDiscussionTitle, boolean allowMultipleDiscussions, boolean displayFirstDiscussionByDefault)
     {
-        if (!LookAndFeelProperties.getInstance(c).isDiscussionEnabled())
+        if (!LookAndFeelProperties.getInstance(c).isDiscussionEnabled() || !AppProps.getInstance().isOptionalFeatureEnabled(AppProps.DEPRECATED_OBJECT_LEVEL_DISCUSSIONS))
             return null;
 
         // get discussion parameters

diff --git a/api/src/org/labkey/api/settings/AppProps.java b/api/src/org/labkey/api/settings/AppProps.java
@@ -48,6 +48,7 @@ public interface AppProps
     String EXPERIMENTAL_NO_GUESTS = "disableGuestAccount";
     String EXPERIMENTAL_BLOCKER = "blockMaliciousClients";
     String EXPERIMENTAL_RESOLVE_PROPERTY_URI_COLUMNS = "resolve-property-uri-columns";
+    String DEPRECATED_OBJECT_LEVEL_DISCUSSIONS = "deprecatedObjectLevelDiscussions";
 
     String UNKNOWN_VERSION = "Unknown Release Version";
 

diff --git a/assay/src/org/labkey/api/assay/nab/view/runDetails.jsp b/assay/src/org/labkey/api/assay/nab/view/runDetails.jsp
@@ -22,6 +22,7 @@
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.api.view.template.ClientDependencies" %>
+<%@ page import="org.labkey.api.settings.AppProps" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%!
@@ -84,7 +85,12 @@
         </labkey:panel>
 
 <%
-    if (!bean.isPrintView() && writer && LookAndFeelProperties.getInstance(getContainer()).isDiscussionEnabled())
+    if (
+            !bean.isPrintView()
+                    && writer
+                    && AppProps.getInstance().isOptionalFeatureEnabled(AppProps.DEPRECATED_OBJECT_LEVEL_DISCUSSIONS)
+                    && LookAndFeelProperties.getInstance(getContainer()).isDiscussionEnabled()
+        )
     {
 %>
         <labkey:panel title="Discussions">
@@ -96,4 +102,4 @@
         </labkey:panel>
 <%
     }
-%>
+%>
diff --git a/core/package-lock.json b/core/package-lock.json
diff --git a/core/package.json b/core/package.json
@@ -54,7 +54,7 @@
     }
   },
   "dependencies": {
-    "@labkey/components": "6.21.3",
+    "@labkey/components": "6.22.0",
     "@labkey/themes": "1.4.0"
   },
   "devDependencies": {

diff --git a/core/src/org/labkey/core/CoreModule.java b/core/src/org/labkey/core/CoreModule.java
@@ -510,6 +510,10 @@ public QuerySchema createSchema(DefaultSchema schema, Module module)
                 "Short-circuit robots",
                 "Save resources by not rendering pages marked as 'noindex' for robots. This is experimental as not all robots are search engines.",
                 false);
+        AdminConsole.addOptionalFeatureFlag(new OptionalFeatureFlag(AppProps.DEPRECATED_OBJECT_LEVEL_DISCUSSIONS,
+                "Restore Object-Level Discussions",
+                "This option and all support for Object-Level Discussions will be removed in LabKey Server v25.7.",
+                false, false, FeatureType.Deprecated));
 
         SiteValidationService svc = SiteValidationService.get();
         if (null != svc)
@@ -1335,6 +1339,7 @@ public JSONObject getPageContextJson(ContainerUser context)
     {
         JSONObject json = new JSONObject(getDefaultPageContextJson(context.getContainer()));
         json.put("productFeatures", ProductRegistry.getProductFeatureSet());
+        json.put(AppProps.DEPRECATED_OBJECT_LEVEL_DISCUSSIONS, AppProps.getInstance().isOptionalFeatureEnabled(AppProps.DEPRECATED_OBJECT_LEVEL_DISCUSSIONS));
         return json;
     }
 

diff --git a/core/src/org/labkey/core/admin/lookAndFeelProperties.jsp b/core/src/org/labkey/core/admin/lookAndFeelProperties.jsp
@@ -56,6 +56,7 @@
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.Set" %>
 <%@ page import="java.util.stream.Collectors" %>
+<%@ page import="org.labkey.api.settings.AppProps" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
@@ -209,6 +210,10 @@
     <%=inheritCheckbox(inherited, helpMenuEnabled)%>
     <td><input type="checkbox" id="<%=helpMenuEnabled%>" name="<%=helpMenuEnabled%>" size="<%=standardInputWidth%>"<%=checked(laf.isHelpMenuEnabled())%><%=disabled(inherited)%>></td>
 </tr>
+<%
+    if (AppProps.getInstance().isOptionalFeatureEnabled(AppProps.DEPRECATED_OBJECT_LEVEL_DISCUSSIONS))
+    {
+%>
 <tr>
     <%
         String enableDiscussionHelp = "Some items within LabKey Server, like reports and wiki pages, support discussions " +
@@ -219,6 +224,9 @@
     <%=inheritCheckbox(inherited, discussionEnabled)%>
     <td><input type="checkbox" id="<%=discussionEnabled%>" name="<%=discussionEnabled%>" size="<%=standardInputWidth%>"<%=checked(laf.isDiscussionEnabled())%><%=disabled(inherited)%>></td>
 </tr>
+<%
+    }
+%>
 <tr>
     <td class="labkey-form-label"><label for="<%=logoHref%>">Logo link (specifies page that header logo links to)</label></td>
     <% inherited = isInherited(laf.getUnsubstitutedLogoHrefStored()); %>

diff --git a/list/src/org/labkey/list/controllers/ListController.java b/list/src/org/labkey/list/controllers/ListController.java
@@ -89,6 +89,7 @@
 import org.labkey.api.security.permissions.PlatformDeveloperPermission;
 import org.labkey.api.security.permissions.ReadPermission;
 import org.labkey.api.security.permissions.UpdatePermission;
+import org.labkey.api.settings.AppProps;
 import org.labkey.api.settings.LookAndFeelProperties;
 import org.labkey.api.util.FileStream;
 import org.labkey.api.util.FileUtil;
@@ -625,7 +626,12 @@ public ModelAndView getView(ListDefinitionForm form, BindException errors)
                 view.addView(new HtmlView(PageFlowUtil.link("show item history").href(getViewContext().cloneActionURL().addParameter("showHistory", "1")).build()));
             }
 
-            if (_list.getDiscussionSetting().isLinked() && LookAndFeelProperties.getInstance(getContainer()).isDiscussionEnabled() && DiscussionService.get() != null)
+            if (
+                    _list.getDiscussionSetting().isLinked()
+                            && AppProps.getInstance().isOptionalFeatureEnabled(AppProps.DEPRECATED_OBJECT_LEVEL_DISCUSSIONS)
+                            && LookAndFeelProperties.getInstance(getContainer()).isDiscussionEnabled()
+                            && DiscussionService.get() != null
+                )
             {
                 String entityId = item.getEntityId();