From 99d1efb58136372e7b771c5dbdea6c57a369c808 Mon Sep 17 00:00:00 2001
From: chenganj <jayanthy.chengan@utoronto.ca>
Date: Fri, 9 Feb 2024 13:07:36 -0500
Subject: [PATCH] sp custom version 6.1

---
 .../iq/dataverse/DatasetFieldValueValidator.java   |  1 -
 .../harvard/iq/dataverse/SendFeedbackDialog.java   | 14 ++++++++++++--
 .../impl/DuraCloudSubmitToArchiveCommand.java      |  0
 src/main/java/propertyFiles/Bundle.properties      |  2 +-
 src/main/webapp/dataverseuser.xhtml                |  2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)
 delete mode 100644 src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DuraCloudSubmitToArchiveCommand.java

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java
index c53d31371cd..610bb70ff49 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java
@@ -18,7 +18,6 @@
 import edu.harvard.iq.dataverse.validation.EMailValidator;
 import edu.harvard.iq.dataverse.validation.URLValidator;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.validator.routines.UrlValidator;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/SendFeedbackDialog.java b/src/main/java/edu/harvard/iq/dataverse/SendFeedbackDialog.java
index accbf0c86b9..099c53e0dae 100644
--- a/src/main/java/edu/harvard/iq/dataverse/SendFeedbackDialog.java
+++ b/src/main/java/edu/harvard/iq/dataverse/SendFeedbackDialog.java
@@ -107,9 +107,15 @@ public void initUserInput(ActionEvent ae) {
         op1 = Long.valueOf(random.nextInt(10));
         op2 = Long.valueOf(random.nextInt(10));
         userSum = null;
-        String systemEmail = settingsService.getValueForKey(SettingsServiceBean.Key.SystemEmail);
-        systemAddress = MailUtil.parseSystemAddress(systemEmail);
 
+        // to be tested JC - old code
+        //String systemEmail = settingsService.getValueForKey(SettingsServiceBean.Key.SystemEmail);
+        //systemAddress = MailUtil.parseSystemAddress(systemEmail);
+
+        String supportEmail = JvmSettings.SUPPORT_EMAIL.lookupOptional().orElse(settingsService.getValueForKey(SettingsServiceBean.Key.SystemEmail));
+        systemAddress = MailUtil.parseSystemAddress(supportEmail);
+
+        // JC old code
         dataverseUserPage.supportMode() ;
     }
 
@@ -227,6 +233,10 @@ public String sendMessage() {
         String supportTeamName = BrandingUtil.getSupportTeamName(systemAddress);
         List<Feedback> feedbacks = FeedbackUtil.gatherFeedback(recipient, dataverseSession, messageAffiliation + " - " + messageSubject  , userMessage, systemAddress, userEmail, systemConfig.getDataverseSiteUrl(), installationBrandName, supportTeamName);
 
+        // to be tested JC - new code
+        //Feedback feedback = FeedbackUtil.gatherFeedback(feedbackTarget, dataverseSession, messageSubject, userMessage, systemAddress, userEmail, systemConfig.getDataverseSiteUrl(), installationBrandName, supportTeamName, ccSupport());
+        //if (feedback==null) {
+
         if (feedbacks.isEmpty()) {
             logger.warning("No feedback has been sent!");
             return null;
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DuraCloudSubmitToArchiveCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DuraCloudSubmitToArchiveCommand.java
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index a61af35f9f7..4e2328c5098 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -1440,7 +1440,7 @@ metrics.dataset.tip.default=Aggregated metrics for this dataset.
 metrics.dataset.makedatacount.title=Make Data Count (MDC) Metrics
 metrics.dataset.makedatacount.since=since
 metrics.dataset.tip.makedatacount=Metrics collected using <a href="https://makedatacount.org/counter-code-of-practice-for-research-data/" target="_blank" rel="noopener"/>Make Data Count</a> standards.
-metrics.dataset.views.tip=Dataset views are combined with both aggregated file views and file downloads.
+metrics.dataset.views.tip=Aggregate of views of the dataset landing page, file views, and file downloads.
 metrics.dataset.downloads.default.tip.replaced=Total aggregated downloads of files in this dataset.
 metrics.dataset.downloads.makedatacount.tip=Each file downloaded is counted as 1, and added to the total download count.
 metrics.dataset.downloads.premakedatacount.tip=Downloads prior to enabling MDC. Counts do not have the same filtering and detail as MDC metrics.
diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index 1090bf04984..4d2e3a7b42b 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -115,7 +115,7 @@
                                                             <a href="#{systemConfig.guidesBaseUrl}/#{systemConfig.guidesVersion}/user/index.html" title="#{dataverseServiceBean.findRootDataverse().name} #{bundle['header.guides.user']}" target="_blank">#{bundle['header.guides.user']}</a>
                                                         </o:param>
                                                         <o:param>
-                                                            <a href="https://demodv.scholarsportal.info">#{bundle['notification.demoSite']}</a>
+                                                            <a href="https://demo.borealisdata.ca/">#{bundle['notification.demoSite']}</a>
                                                         </o:param>
                                                     </h:outputFormat>
                                                     <!--Only show message about an email confirmation link to non-Shib users (Shib users can't edit their accounts)-->