- Replaced "Home" button with "Data Folder" link in the success view of RequestDeletionAction.

- Fixed SQLException by updating DatasetStatus handling:
  - Delete row in DatasetStatus when data is resubmitted and a new Panorama Public copy is created.
  - Delete row in DatasetStatus when the Panorama Public copy is deleted.
  - Prevents SQLException from shortUrl FK constraint when deleting Panorama Public copy followed by source data folder, or vice versa.
- Cleanup user accounts in PrivateDataReminderTest.

Author: vagisha

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

@@ -10548,7 +10548,9 @@ public ModelAndView getSuccessView(ShortUrlForm shortUrlForm)
             setTitle("Deletion Request Success");
             return new HtmlView(DIV("A deletion request was successfully submitted for the data at " + _exptAnnotations.getShortUrl().renderShortURL(),
                     BR(),
-                    DIV(new ButtonBuilder("Home").submit(false).href(AppProps.getInstance().getHomePageActionURL()))
+                    DIV(
+                            LinkBuilder.labkeyLink("Data Folder", PageFlowUtil.urlProvider(ProjectUrls.class).getBeginURL(_exptAnnotations.getContainer()))
+                    )
                 ));
         }
     }

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

@@ -74,6 +74,7 @@
 import org.labkey.panoramapublic.proteomexchange.ProteomeXchangeService;
 import org.labkey.panoramapublic.proteomexchange.ProteomeXchangeServiceException;
 import org.labkey.panoramapublic.query.CatalogEntryManager;
+import org.labkey.panoramapublic.query.DatasetStatusManager;
 import org.labkey.panoramapublic.query.ExperimentAnnotationsManager;
 import org.labkey.panoramapublic.query.JournalManager;
 import org.labkey.panoramapublic.query.SubmissionManager;
@@ -150,6 +151,12 @@ private void finishUp(PipelineJob job, CopyExperimentJobSupport jobSupport) thro
 
             // Update the row in panoramapublic.ExperimentAnnotations - set the shortURL and version
             ExperimentAnnotations targetExperiment = updateExperimentAnnotations(container, sourceExperiment, js, user, log);
+            if (previousCopy != null)
+            {
+                // If this is a re-copy, a row may exist in DatasetStatus for the short URL associated with the experiment. Remove it now.
+                // This is a fresh copy, so data status should be reset.
+                DatasetStatusManager.deleteStatusForExperiment(targetExperiment);
+            }
 
             // If there is a Panorama Public data catalog entry associated with the previous copy of the experiment, move it to the
             // new container.

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

@@ -1,6 +1,7 @@
 package org.labkey.panoramapublic.query;
 
 import org.jetbrains.annotations.Nullable;
+import org.labkey.api.data.DbScope;
 import org.labkey.api.data.SimpleFilter;
 import org.labkey.api.data.Table;
 import org.labkey.api.data.TableSelector;
@@ -9,6 +10,7 @@
 import org.labkey.api.view.ShortURLRecord;
 import org.labkey.panoramapublic.PanoramaPublicManager;
 import org.labkey.panoramapublic.model.DatasetStatus;
+import org.labkey.panoramapublic.model.ExperimentAnnotations;
 
 public class DatasetStatusManager
 {
@@ -37,4 +39,16 @@ public static void update(DatasetStatus datasetStatus, User user)
     {
         Table.update(user, PanoramaPublicManager.getTableInfoDatasetStatus(), datasetStatus, datasetStatus.getId());
     }
+
+    public static void deleteStatusForExperiment(ExperimentAnnotations expAnnotations)
+    {
+        DatasetStatus status = getForShortUrl(expAnnotations.getShortUrl());
+        if (status == null) return;
+
+        try(DbScope.Transaction transaction = PanoramaPublicManager.getSchema().getScope().ensureTransaction())
+        {
+            Table.delete(PanoramaPublicManager.getTableInfoDatasetStatus(), new SimpleFilter(FieldKey.fromParts("id"), status.getId()));
+            transaction.commit();
+        }
+    }
 }

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

@@ -283,6 +283,10 @@ private static void deleteExperiment(ExperimentAnnotations expAnnotations, User
         }
         else
         {
+            // Delete the row in DatasetStatus for this experiment. Do this before setting the experiment's shortURL to null
+            // in SubmissionManager.beforeCopiedExperimentDeleted().
+            DatasetStatusManager.deleteStatusForExperiment(expAnnotations);
+
             // This experiment is a journal copy (i.e. in the Panorama Public project on PanoramaWeb)
             SubmissionManager.beforeCopiedExperimentDeleted(expAnnotations, user);
         }

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

@@ -162,6 +162,7 @@ public static void delete(Journal journal, User user)
         List<ExperimentAnnotations> expAnnotations = getExperimentsForJournal(journal.getId());
         for(ExperimentAnnotations expAnnotation: expAnnotations)
         {
+            DatasetStatusManager.deleteStatusForExperiment(expAnnotation);
             removeJournalAccess(expAnnotation, journal, user);
         }
         SubmissionManager.deleteAllSubmissionsForJournal(journal.getId());

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

@@ -4,6 +4,7 @@
 import org.junit.experimental.categories.Category;
 import org.labkey.test.BaseWebDriverTest;
 import org.labkey.test.Locator;
+import org.labkey.test.TestTimeoutException;
 import org.labkey.test.categories.External;
 import org.labkey.test.categories.MacCossLabModules;
 import org.labkey.test.pages.LabkeyErrorPage;
@@ -381,6 +382,14 @@ private void goToSendRemindersPage(String projectName)
         waitForText(projectName, "A reminder message will be sent to the submitters of the selected experiments");
     }
 
+    @Override
+    protected void doCleanup(boolean afterTest) throws TestTimeoutException
+    {
+        _userHelper.deleteUsers(false,SUBMITTER_1, SUBMITTER_2, SUBMITTER_3, ADMIN_1, ADMIN_2, ADMIN_3);
+
+        super.doCleanup(afterTest);
+    }
+
     private static class DataFolderInfo
     {
         private final String _sourceFolder;