CR feedback

- Use table name constant and date format string constant.
- isSortable and isFilterable return false for DatasetStatusColumn.
- Added clarifying text for form input elements in privateDataRemindersSettingsForm.jsp

Author: vagisha

panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java

@@ -6316,7 +6316,7 @@ public void addNavTrail(NavTree root)
         List<ExperimentAnnotations> publishedVersions = ExperimentAnnotationsManager.getPublishedVersionsOfExperiment(sourceExperimentId);
         if (!publishedVersions.isEmpty())
         {
-            QuerySettings qSettings = new QuerySettings(getViewContext(), "PublishedVersions", "ExperimentAnnotations");
+            QuerySettings qSettings = new QuerySettings(getViewContext(), "PublishedVersions", PanoramaPublicSchema.TABLE_EXPERIMENT_ANNOTATIONS);
             qSettings.setBaseFilter(new SimpleFilter(new SimpleFilter(FieldKey.fromParts("SourceExperimentId"), sourceExperimentId)));
 
             List<FieldKey> columns = new ArrayList<>(List.of(FieldKey.fromParts("Version"), FieldKey.fromParts("Created"), FieldKey.fromParts("Link"), FieldKey.fromParts("Share")));
@@ -9759,7 +9759,8 @@ public static class CreatePanoramaPublicMessageAction extends SimpleViewAction<P
         @Override
         public ModelAndView getView(PanoramaPublicMessageForm form, BindException errors) throws Exception
         {
-            QuerySettings qSettings = new QuerySettings(getViewContext(), "ExperimentAnnotationsTable", "ExperimentAnnotations");
+            QuerySettings qSettings = new QuerySettings(getViewContext(),  PanoramaPublicSchema.TABLE_EXPERIMENT_ANNOTATIONS,
+                    PanoramaPublicSchema.TABLE_EXPERIMENT_ANNOTATIONS);
             qSettings.setContainerFilterName(ContainerFilter.Type.CurrentAndSubfolders.name());
             QueryView tableView = new QueryView(new PanoramaPublicSchema(getUser(), getContainer()), qSettings, errors);
             tableView.setTitle("Panorama Public Experiments");
@@ -10239,7 +10240,8 @@ public ModelAndView getView(PrivateDataSendReminderForm form, boolean reshow, Bi
                 return new SimpleErrorView(errors, true);
             }
 
-            QuerySettings qSettings = new QuerySettings(getViewContext(), "ExperimentAnnotationsTable", "ExperimentAnnotations");
+            QuerySettings qSettings = new QuerySettings(getViewContext(),  PanoramaPublicSchema.TABLE_EXPERIMENT_ANNOTATIONS,
+                    PanoramaPublicSchema.TABLE_EXPERIMENT_ANNOTATIONS);
             qSettings.setContainerFilterName(ContainerFilter.Type.CurrentAndSubfolders.name());
             qSettings.setBaseFilter(new SimpleFilter(FieldKey.fromParts("Public"), "No"));
 
@@ -10353,7 +10355,7 @@ public ModelAndView getConfirmView(ShortUrlForm shortUrlForm, BindException erro
             HtmlView view = new HtmlView(DIV(
                     DIV(getConfirmViewMessage()),
                     DIV("Title: " + _exptAnnotations.getTitle()),
-                    DIV("Submitted on: " + DateUtil.formatDateTime(_exptAnnotations.getCreated(), "MMMM d, yyyy")),
+                    DIV("Submitted on: " + DateUtil.formatDateTime(_exptAnnotations.getCreated(), PrivateDataReminderSettings.DATE_FORMAT_PATTERN)),
                     DIV("Submitter: " + _exptAnnotations.getSubmitterName())
             ));
             view.setTitle(getConfirmViewTitle());

panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicNotification.java

@@ -374,7 +374,7 @@ public static String getDataStatusReminderMessage(@NotNull ExperimentAnnotations
     {
         String shortUrl = exptAnnotations.getShortUrl().renderShortURL();
         String makePublicLink = PanoramaPublicController.getMakePublicUrl(exptAnnotations.getId(), exptAnnotations.getContainer()).getURIString();
-        String dateString = DateUtil.formatDateTime(js.getLatestSubmission().getCreated(), "MMMM d, yyyy");
+        String dateString = DateUtil.formatDateTime(js.getLatestSubmission().getCreated(), PrivateDataReminderSettings.DATE_FORMAT_PATTERN);
 
         ActionURL viewMessageUrl = new ActionURL("announcements", "thread", announcementContainer)
                 .addParameter("rowId", announcement.getRowId());

panoramapublic/src/org/labkey/panoramapublic/message/PrivateDataReminderSettings.java

@@ -26,7 +26,7 @@ public class PrivateDataReminderSettings
     private static final int DEFAULT_REMINDER_FREQUENCY = 1; // Send reminders once a month, unless extension or deletion was requested.
     private static final int DEFAULT_EXTENSION_LENGTH = 6; // Private status of a dataset can be extended by 6 months.
 
-    private static final String DATE_FORMAT_PATTERN = "MMMM d, yyyy";
+    public static final String DATE_FORMAT_PATTERN = "MMMM d, yyyy";
 
     private boolean _enableReminders;
     private int _delayUntilFirstReminder;

panoramapublic/src/org/labkey/panoramapublic/pipeline/PrivateDataReminderJob.java

@@ -130,7 +130,8 @@ private static ReminderDecision reminderIsDue(ExperimentAnnotations exptAnnotati
         LocalDate firstReminderDate = copyDate.plusMonths(settings.getDelayUntilFirstReminder());
         if (LocalDate.now().isBefore(firstReminderDate))
         {
-            return ReminderDecision.skip(String.format("First reminder not due until %s", firstReminderDate.format(DateTimeFormatter.ofPattern("MMMM d, yyyy"))));
+            return ReminderDecision.skip(String.format("First reminder not due until %s",
+                    firstReminderDate.format(DateTimeFormatter.ofPattern(PrivateDataReminderSettings.DATE_FORMAT_PATTERN))));
         }
         return ReminderDecision.post();
     }

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

@@ -927,5 +927,17 @@ public void addQueryFieldKeys(Set<FieldKey> keys)
             super.addQueryFieldKeys(keys);
             keys.add(ID_COL);
         }
+
+        @Override
+        public boolean isSortable()
+        {
+            return false;
+        }
+
+        @Override
+        public boolean isFilterable()
+        {
+            return false;
+        }
     }
 }

panoramapublic/src/org/labkey/panoramapublic/view/createMessageForm.jsp

@@ -28,7 +28,7 @@
     function submitForm()
     {
         const form = document.getElementById("panorama-public-message-form");
-        let dataRegion = LABKEY.DataRegions['ExperimentAnnotationsTable'];
+        let dataRegion = LABKEY.DataRegions['ExperimentAnnotations'];
         let selectedRowIds = dataRegion.getChecked();
         // console.log("Selection count: " + selectedRowIds.length);
         let selected = "";

panoramapublic/src/org/labkey/panoramapublic/view/privateDataRemindersSettingsForm.jsp

@@ -85,6 +85,11 @@
                 </td>
                 <td>
                     <input style="padding:0 10px 0 0;" type="text" name="delayUntilFirstReminder" value="<%=form.getDelayUntilFirstReminder()%>" />
+                    <div style="font-size: 0.9em; color: #8B0000; margin: 4px 0 6px 0;">
+                        Number of months after data submission before sending the first reminder.
+                        <br/>
+                        Entering 0 will send a reminder the next time the job runs.
+                    </div>
                 </td>
             </tr>
             <tr>
@@ -93,6 +98,11 @@
                 </td>
                 <td>
                     <input style="padding:0 10px 0 0;" type="text" name="reminderFrequency" value="<%=form.getReminderFrequency()%>" />
+                    <div style="font-size: 0.9em; color: #8B0000; margin: 4px 0 6px 0;">
+                        Interval in months between reminder messages after the first one.
+                        <br/>
+                        Entering 0 will send a reminder the next time the job runs.
+                    </div>
                 </td>
             </tr>
             <tr>
@@ -101,6 +111,9 @@
                 </td>
                 <td>
                     <input style="padding:0 10px 0 0;" type="text" name="extensionLength" value="<%=form.getExtensionLength()%>" />
+                    <div style="font-size: 0.9em; color: #8B0000; margin: 4px 0 6px 0;">
+                        Number of months the private status of a dataset can be extended at the submitter's request.
+                    </div>
                 </td>
             </tr>
             <tr><td colspan=2">

panoramapublic/src/org/labkey/panoramapublic/view/sendPrivateDataRemindersForm.jsp

@@ -39,7 +39,7 @@
     function submitForm()
     {
         const form = document.getElementById("send-reminders-form");
-        let dataRegion = LABKEY.DataRegions['ExperimentAnnotationsTable'];
+        let dataRegion = LABKEY.DataRegions['ExperimentAnnotations'];
         let selectedRowIds = dataRegion.getChecked();
         console.log("Selection count: " + selectedRowIds.length);
         let selected = "";

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

@@ -323,7 +323,7 @@ private void postReminders(String projectName, boolean testMode, int expectedExp
     {
         goToSendRemindersPage(projectName);
 
-        DataRegionTable table = new DataRegionTable("ExperimentAnnotationsTable", getDriver());
+        DataRegionTable table = new DataRegionTable("ExperimentAnnotations", getDriver());
         assertEquals(expectedExperimentCount, table.getDataRowCount());
 
         table.clearAllFilters();