Merge discvr-22.7 to discvr-22.11 (#28)

* Refactor ContainerIncrementingTable into laboratory API

* Purchasing updates

Co-authored-by: root <bbimber>

Author: bbimber

…ry/query/ContainerIncrementingTable.java …ry/query/ContainerIncrementingTable.javalaboratory/src/org/labkey/laboratory/query/ContainerIncrementingTable.java renamed to laboratory/api-src/org/labkey/api/laboratory/query/ContainerIncrementingTable.java laboratory/src/org/labkey/laboratory/query/ContainerIncrementingTable.java renamed to laboratory/api-src/org/labkey/api/laboratory/query/ContainerIncrementingTable.java

@@ -1,4 +1,4 @@
-package org.labkey.laboratory.query;
+package org.labkey.api.laboratory.query;
 
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;

laboratory/resources/web/laboratory/window/ChangeAssayResultStatusWindow.js

@@ -8,12 +8,12 @@ Ext4.define('Laboratory.window.ChangeAssayResultStatusWindow', {
         buttonHandler: function(dataRegionName, schemaName, queryName){
             var dataRegion = LABKEY.DataRegions[dataRegionName];
             if (!dataRegion || !dataRegion.getChecked() || !dataRegion.getChecked().length){
-                Ext4.Msg.alert('Error', '');
+                Ext4.Msg.alert('Error', 'No rows selected');
                 return;
             }
 
             LDK.Assert.assertTrue('DataRegion not suitable for ChangeAssayResultStatusWindow for: ' + LDK.DataRegionUtils.getDisplayName(dataRegion), (dataRegion.pkCols && dataRegion.pkCols.length == 1));
-            if (dataRegion.pkCols.length != 1){
+            if (dataRegion.pkCols.length !== 1){
                 Ext4.Msg.alert('Error', 'This button cannot be used with this table');
                 return;
             }

laboratory/src/org/labkey/laboratory/LaboratoryController.java

@@ -84,7 +84,7 @@
 import org.labkey.api.view.UnauthorizedException;
 import org.labkey.api.view.template.ClientDependency;
 import org.labkey.laboratory.assay.AssayHelper;
-import org.labkey.laboratory.query.ContainerIncrementingTable;
+import org.labkey.api.laboratory.query.ContainerIncrementingTable;
 import org.labkey.laboratory.query.WorkbookModel;
 import org.springframework.validation.BindException;
 import org.springframework.validation.Errors;

laboratory/src/org/labkey/laboratory/LaboratoryManager.java

@@ -56,7 +56,7 @@
 import org.labkey.api.security.permissions.InsertPermission;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.Portal;
-import org.labkey.laboratory.query.ContainerIncrementingTable;
+import org.labkey.api.laboratory.query.ContainerIncrementingTable;
 import org.labkey.laboratory.query.LaboratoryWorkbooksTable;
 import org.labkey.laboratory.query.WorkbookModel;
 

laboratory/src/org/labkey/laboratory/LaboratoryUserSchema.java

@@ -11,7 +11,7 @@
 import org.labkey.api.query.QuerySchema;
 import org.labkey.api.query.SimpleUserSchema;
 import org.labkey.api.security.User;
-import org.labkey.laboratory.query.ContainerIncrementingTable;
+import org.labkey.api.laboratory.query.ContainerIncrementingTable;
 import org.labkey.laboratory.query.LaboratoryWorkbooksTable;
 import org.labkey.api.ldk.table.ContainerScopedTable;