lk-region-form -> data-region-form

Author: labkey-adam

panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java

@@ -286,12 +286,12 @@ public String renderURL(RenderContext ctx)
                 return license != null ? license.getUrl() : null;
             }
             @Override
-            public Class getValueClass()
+            public Class<String> getValueClass()
             {
                 return String.class;
             }
             @Override
-            public Class getDisplayValueClass()
+            public Class<String> getDisplayValueClass()
             {
                 return String.class;
             }
@@ -314,7 +314,7 @@ public Class getDisplayValueClass()
         getMutableColumn("ModifiedBy").setFk(new UserIdQueryForeignKey(schema));
 
         ExprColumn catalogEntryCol = getCatalogEntryCol();
-        catalogEntryCol.setDisplayColumnFactory(colInfo -> new CatalogEntryIconColumn(colInfo));
+        catalogEntryCol.setDisplayColumnFactory(CatalogEntryIconColumn::new);
         addColumn(catalogEntryCol);
 
         List<FieldKey> visibleColumns = new ArrayList<>();

panoramapublic/test/src/org/labkey/test/tests/panoramapublic/PanoramaWebPublicSearchTest.java

@@ -118,7 +118,7 @@ public void testExperimentSearch()
         }
         catch (StaleElementReferenceException e)
         {
-            shortWait().until(ExpectedConditions.stalenessOf(Locator.tagWithAttribute("form", "lk-region-form", "Targeted MS Experiment List").findElement(getDriver())));
+            shortWait().until(ExpectedConditions.stalenessOf(Locator.tagWithAttribute("form", "data-region-form", "Targeted MS Experiment List").findElement(getDriver())));
         }
         checker().verifyEquals("Incorrect search results", 3, table.getDataRowCount());
         checker().verifyEquals("Incorrect values for experiment title", Arrays.asList(" Test experiment for search improvements", " Experiment for small molecule search", " Submitter Experiment"),
@@ -135,7 +135,7 @@ public void testExperimentSearch()
         }
         catch (StaleElementReferenceException e)
         {
-            shortWait().until(ExpectedConditions.stalenessOf(Locator.tagWithAttribute("form", "lk-region-form", "Targeted MS Experiment List").findElement(getDriver())));
+            shortWait().until(ExpectedConditions.stalenessOf(Locator.tagWithAttribute("form", "data-region-form", "Targeted MS Experiment List").findElement(getDriver())));
         }
         checker().verifyEquals("Incorrect search results", 1, table.getDataRowCount());
         checker().verifyEquals("Incorrect values for experiment title", Arrays.asList(" Submitter Experiment"),