Merge pull request #235 from LabKey/fb_merge_25.3_to_develop

Merge discvr-25.3 to develop

Author: bbimber

.github/workflows/build.yml

@@ -1,5 +1,6 @@
 name: Build DISCVR
 on:
+  workflow_dispatch:
   push:
   pull_request:
 jobs:

LDK/api-src/org/labkey/api/ldk/table/ContainerScopedTable.java

@@ -287,7 +287,8 @@ public Object call()
                         Object pesudoPkVal = it.getInputColumnValue(inputColMap.get(_pseudoPk));
                         if (pesudoPkVal != null)
                         {
-                            if (_context.getInsertOption() != QueryUpdateService.InsertOption.MERGE && keyManager.rowExists(c, pesudoPkVal))
+                            // NOTE: this code is called for both inserts and updates:
+                            if (_context.getInsertOption() == QueryUpdateService.InsertOption.INSERT && keyManager.rowExists(c, pesudoPkVal))
                             {
                                 _context.getErrors().addRowError(new ValidationException("A record is already present with value: " + pesudoPkVal));
                             }

LDK/src/org/labkey/ldk/LDKController.java

@@ -847,14 +847,10 @@ public ModelAndView getView(QueryForm form, BindException errors) throws Excepti
 
             if (keyField != null)
             {
+                // Note: the ContainerContext will need to be set within QueryView
                 DetailsURL importUrl = DetailsURL.fromString("/query/importData.view?schemaName=" + schemaName + "&query.queryName=" + queryName + "&keyField=" + keyField);
-                importUrl.setContainerContext(getContainer());
-
                 DetailsURL updateUrl = DetailsURL.fromString("/ldk/manageRecord.view?schemaName=" + schemaName + "&query.queryName=" + queryName + "&keyField=" + keyField + "&key=${" + keyField + "}");
-                updateUrl.setContainerContext(getContainer());
-
                 DetailsURL deleteUrl = DetailsURL.fromString("/query/deleteQueryRows.view?schemaName=" + schemaName + "&query.queryName=" + queryName);
-                deleteUrl.setContainerContext(getContainer());
 
                 url.addParameter("importURL", importUrl.toString());
                 url.addParameter("updateURL", updateUrl.toString());
@@ -866,7 +862,7 @@ public ModelAndView getView(QueryForm form, BindException errors) throws Excepti
             url.addParameter("queryName", queryName);
             url.addParameter("allowChooseQuery", false);
 
-            WebPartFactory factory = Portal.getPortalPartCaseInsensitive("Query");
+            WebPartFactory factory = Portal.getPortalPart("Query");
             Portal.WebPart part = factory.createWebPart();
             part.setProperties(url.getQueryString());
 

LDK/test/src/org/labkey/test/tests/external/labModules/LabModulesTest.java

@@ -16,12 +16,15 @@
 package org.labkey.test.tests.external.labModules;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.labkey.api.util.DateUtil;
 import org.labkey.remoteapi.CommandException;
 import org.labkey.remoteapi.Connection;
 import org.labkey.remoteapi.collections.CaseInsensitiveHashMap;
@@ -1415,6 +1418,7 @@ private void samplesTableTest() throws Exception
             columnLabels.add(getColumnLabel(srr, name));
         }
 
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         List<List<String>> rows = new ArrayList<>();
         for (Map<String, Object> row : srr.getRows())
         {
@@ -1425,7 +1429,7 @@ private void samplesTableTest() throws Exception
                 String val = row.get(name) == null ? "" : String.valueOf(row.get(name));
                 if (name.toLowerCase().contains("date"))
                 {
-                    val = StringUtils.isEmpty(val) ? "" : ExcelHelper.getDateTimeFormat().format(new Date(val));
+                    val = StringUtils.isEmpty(val) ? "" : dateFormat.format(Date.parse(val));
                 }
 
                 target.add(val);
@@ -1440,10 +1444,10 @@ private void samplesTableTest() throws Exception
             List<List<String>> lines = ExcelHelper.getFirstNRows(sheet, 5);
 
             Assert.assertEquals(columnLabels, lines.get(0));
-            Assert.assertEquals(rows.get(0), lines.get(1));
-            Assert.assertEquals(rows.get(0), lines.get(2));
-            Assert.assertEquals(rows.get(1), lines.get(3));
-            Assert.assertEquals(rows.get(1), lines.get(4));
+            Assert.assertEquals("Row did not match. ExcelHelper pattern: " + ExcelHelper.getDateTimeFormat().toPattern(), rows.get(0), lines.get(1));
+            Assert.assertEquals("Row did not match. ExcelHelper pattern: " + ExcelHelper.getDateTimeFormat().toPattern(), rows.get(0), lines.get(2));
+            Assert.assertEquals("Row did not match. ExcelHelper pattern: " + ExcelHelper.getDateTimeFormat().toPattern(), rows.get(1), lines.get(3));
+            Assert.assertEquals("Row did not match. ExcelHelper pattern: " + ExcelHelper.getDateTimeFormat().toPattern(), rows.get(1), lines.get(4));
         }
 
         refresh();

laboratory/api-src/org/labkey/api/laboratory/query/ContainerIncrementingTable.java

@@ -59,7 +59,7 @@ public ContainerIncrementingTable(UserSchema us, TableInfo st, ContainerFilter c
     }
 
     @Override
-    public SimpleUserSchema.SimpleTable init()
+    public SimpleUserSchema.SimpleTable<?> init()
     {
         super.init();