Issue 52395: NPE in PanoramaPublicController$DeleteExperimentAnnotation (#553)

* Issue 52395: NPE in.PanoramaPublicController$DeleteExperimentAnnotationsAction.validateCommand()

* Widen panoramapublic.ExperimentAnnotations.LabHeadAffiliation

Author: labkey-jeckels

panoramapublic/resources/schemas/dbscripts/postgresql/panoramapublic-25.000-25.001.sql

@@ -0,0 +1 @@
+ALTER TABLE panoramapublic.experimentannotations ALTER COLUMN LabHeadAffiliation TYPE VARCHAR(300);

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

@@ -6058,11 +6058,11 @@ else if(children.size() > 0)
 
             // If this experiment has been submitted show the submission requests
             List<JournalSubmission> jsList = SubmissionManager.getAllJournalSubmissions(exptAnnotations);
-            if (jsList.size() > 0 && getContainer().hasPermission(getUser(), AdminPermission.class))
+            if (!jsList.isEmpty() && getContainer().hasPermission(getUser(), AdminPermission.class))
             {
                 QuerySettings qSettings = new QuerySettings(getViewContext(), "Submission", "Submission");
                 qSettings.setBaseFilter(new SimpleFilter(new SimpleFilter.InClause(FieldKey.fromParts("JournalExperimentId"),
-                        jsList.stream().map(js -> js.getJournalExperimentId()).collect(Collectors.toList()))));
+                        jsList.stream().map(JournalSubmission::getJournalExperimentId).collect(Collectors.toList()))));
                 QueryView submissionList = new QueryView(new PanoramaPublicSchema(getUser(), getContainer()), qSettings, errors);
                 submissionList.setShowRecordSelectors(false);
                 submissionList.setButtonBarPosition(DataRegion.ButtonBarPosition.TOP);
@@ -6102,7 +6102,7 @@ public void addNavTrail(NavTree root)
     public static class ExperimentAnnotationsDetails
     {
         private final ExperimentAnnotations _experimentAnnotations;
-        private JournalSubmission _lastSubmittedRecord;
+        private final JournalSubmission _lastSubmittedRecord;
         private final boolean _fullDetails;
         private boolean _canPublish;
         private String _version;
@@ -6590,7 +6590,7 @@ public void validateCommand(DeleteExperimentAnnotationsForm deleteForm, Errors e
             {
                 errors.reject(ERROR_MSG, "Could not find an experiment with ID "  + _experimentAnnotationsId);
             }
-            if(_expAnnotations.isJournalCopy() && _expAnnotations.isFinal())
+            else if(_expAnnotations.isJournalCopy() && _expAnnotations.isFinal())
             {
                 errors.reject(ERROR_MSG, "Experiment cannot be deleted.  It is public and is associated with a publication.");
             }

panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicModule.java

@@ -91,7 +91,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 23.001;
+        return 25.001;
     }
 
     @Override