Merge 23.11 to 24.1

Author: labkey-teamcity

LDK/resources/web/LDK/panel/AbstractFilterType.js

@@ -1,6 +1,9 @@
 Ext4.define('LDK.panel.AbstractFilterType', {
     extend: 'Ext.panel.Panel',
 
+    // This is passed to the filter types to apply a non-removable filter on these QC state labels
+    reportQCStates: [],
+
     initComponent: function(){
         Ext4.apply(this, {
             layout: 'hbox',
@@ -31,10 +34,16 @@ Ext4.define('LDK.panel.AbstractFilterType', {
     },
 
     getFilterArray: function(tab, subject){
-        return {
+        let filterArray = {
             removable: [],
             nonRemovable: []
         };
+
+        if (this.reportQCStates?.length) {
+            filterArray.nonRemovable.push(LABKEY.Filter.create('qcstate/label', this.reportQCStates, LABKEY.Filter.Types.EQUALS_ONE_OF));
+        }
+
+        return filterArray;
     },
 
     getTitle: function(){

LDK/resources/web/LDK/panel/SingleSubjectFilterType.js

@@ -64,6 +64,10 @@ Ext4.define('LDK.panel.SingleSubjectFilterType', {
             nonRemovable: []
         };
 
+        if (this.reportQCStates?.length) {
+            filterArray.nonRemovable.push(LABKEY.Filter.create('qcstate/label', this.reportQCStates, LABKEY.Filter.Types.EQUALS_ONE_OF));
+        }
+
         var subjectFieldName;
         if(tab.report) {
             subjectFieldName = tab.report.subjectFieldName;

LDK/resources/web/LDK/panel/TabbedReportPanel.js

@@ -31,6 +31,9 @@ Ext4.define('LDK.panel.TabbedReportPanel', {
     // Passed to filters implementing caseInsensitive id search
     caseInsensitiveSubjects: false,
 
+    // Passed to filters implementing reportQCStates filter
+    reportQCStates: [],
+
     btnPanelPrefix: 'btnPanel',
     totalPanelPrefix: 'totalPanel',
     btnPrefix: 'btn',
@@ -1019,6 +1022,7 @@ Ext4.define('LDK.panel.TabbedReportPanel', {
             cfg.tabbedReportPanel = this;
             cfg.filterContext = this.getFilterContext();
             cfg.caseInsensitive = this.caseInsensitiveSubjects;
+            cfg.reportQCStates = this.reportQCStates;
 
             if (this.activeFilterType){
                 this.activeFilterType.prepareRemove();

laboratory/resources/web/laboratory/panel/ProjectFilterType.js

@@ -77,6 +77,10 @@ Ext4.define('Laboratory.panel.ProjectFilterType', {
             nonRemovable: []
         };
 
+        if (this.reportQCStates?.length) {
+            filterArray.nonRemovable.push(LABKEY.Filter.create('qcstate/label', this.reportQCStates, LABKEY.Filter.Types.EQUALS_ONE_OF));
+        }
+
         var filters = this.getFilters();
         var report = tab.report;
         var projectFieldName = (filters.projectFilterMode === 'overlappingProjects') ? report.overlappingProjectsFieldName : report.allProjectsFieldName;

laboratory/src/org/labkey/laboratory/view/dataBrowser.jsp

@@ -32,7 +32,7 @@
     String wpId = "wp_" + me.getWebPartRowId();
 %>
 
-<div id=<%=q(wpId)%>></div>
+<div id="<%=h(wpId)%>"></div>
 
 <script type="text/javascript">
     Ext4.onReady(function(){

laboratory/src/org/labkey/laboratory/view/workbookHeader.jsp

@@ -47,7 +47,7 @@
     }
 </style>
 
-<div id=<%=q(wpId)%>></div>
+<div id="<%=h(wpId)%>"></div>
 
 <script type="text/javascript">
     Ext4.onReady(function(){