Merge pull request #149 from LabKey/fb_merge_22.11_to_develop

Merge discvr-22.11 to develop

Author: bbimber

LDK/resources/web/LDK/grid/Panel.js

@@ -58,8 +58,8 @@ Ext4.apply(LABKEY.ext4.GRIDBUTTONS, {
                 var model = LDK.StoreUtils.createModelInstance(grid.store, null, true);
                 grid.store.insert(0, [model]); //add a blank record in the first position
 
-                if(cellEditing)
-                    cellEditing.startEditByPosition({row: 0, column: this.firstEditableColumn || 0});
+                if (cellEditing)
+                    cellEditing.startEditByPosition({row: 0, column: grid.firstEditableColumn || 0});
             }
         }, config);
     },

…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/schemas/dbscripts/postgresql/laboratory-12.304-12.305.sql

@@ -0,0 +1,2 @@
+-- Cleanup legacy orphan rows
+delete from laboratory.workbooks WHERE (SELECT c.entityid from core.containers c where c.entityid = container) is null;

laboratory/resources/schemas/dbscripts/sqlserver/laboratory-12.304-12.305.sql

@@ -0,0 +1,2 @@
+-- Cleanup legacy orphan rows
+delete from laboratory.workbooks WHERE (SELECT c.entityid from core.containers c where c.entityid = container) is null;

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/LaboratoryModule.java

@@ -77,7 +77,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 12.304;
+        return 12.305;
     }
 
     @Override

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;
 

laboratory/src/org/labkey/laboratory/WorkbookTestCase.java

@@ -1,9 +1,15 @@
 package org.labkey.laboratory;
 
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.labkey.api.collections.CaseInsensitiveHashMap;
+import org.labkey.api.data.Container;
+import org.labkey.api.data.ContainerManager;
+import org.labkey.api.data.DbSchema;
+import org.labkey.api.data.DbSchemaType;
+import org.labkey.api.data.SimpleFilter;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.data.TableSelector;
 import org.labkey.api.data.WorkbookContainerType;
@@ -33,7 +39,10 @@ public class WorkbookTestCase extends WorkbookContainerType.AbstractTestCase
     public void setUp() throws Exception
     {
         _context = TestContext.get();
-        doInitialSetUp(PROJECT_NAME);
+        if (_project == null)
+        {
+            doInitialSetUp(PROJECT_NAME);
+        }
     }
 
     @Test
@@ -66,11 +75,26 @@ public void testCrossContainerBehaviorsForSimpleSchema() throws Exception
                 testCrossContainerBehaviors(_project, _workbooks, LaboratoryModule.SCHEMA_NAME, LaboratorySchema.TABLE_SAMPLE_TYPE, LaboratorySchema.TABLE_SAMPLES, "samplename", "sampletype", Arrays.asList("Value1", "Value2", "Value3", "Value4"), extraRowValues);
             }
         }
+
+        // Verify laboratory.workbooks rows get deleted:
+        Container newWorkbook = ContainerManager.createContainer(_project, null, "Title3", null, WorkbookContainerType.NAME, _context.getUser());
+
+        TableInfo ti = DbSchema.get(LaboratoryModule.SCHEMA_NAME, DbSchemaType.Module).getTable(LaboratorySchema.TABLE_WORKBOOKS);
+        TableSelector ts = new TableSelector(ti, new SimpleFilter(FieldKey.fromString("container"), newWorkbook.getId()), null);
+        Assert.assertTrue("laboratory.workbooks row should exist", ts.exists());
+
+        ContainerManager.delete(newWorkbook, TestContext.get().getUser());
+        Assert.assertFalse("laboratory.workbooks row should have been deleted", ts.exists());
     }
 
     @After
     public void onComplete()
     {
         doCleanup(PROJECT_NAME);
+        if (_project != null)
+        {
+            TableSelector ts = new TableSelector(DbSchema.get(LaboratoryModule.SCHEMA_NAME, DbSchemaType.Module).getTable(LaboratorySchema.TABLE_WORKBOOKS), new SimpleFilter(FieldKey.fromString("parentContainer"), _project.getId()), null);
+            Assert.assertFalse("laboratory.workbooks rows should have been deleted", ts.exists());
+        }
     }
 }