resolve merge conflicts

Author: ekraffmiller

CHANGELOG.md

@@ -15,6 +15,7 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
 - Edit Terms Integration.
 - With the addition of the new runtime configuration approach, we now support dynamic configuration for languages. If more than one language is configured, the Language Switcher will be shown in the header to allow users to change the language.
 - Added Notifications tab in Account Page
+- Added runtime configuration options for homepage branding and support link.
 - Added an environment variable to docker-compose-dev.yml to hide the OIDC client used in the SPA from the JSF frontend: DATAVERSE_AUTH_OIDC_HIDDEN_JSF: 1
 
 ### Changed
@@ -25,14 +26,16 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
 - Changed the way we were handling DATE type metadata field validation to better match the backend validation and give users better error messages. For example, for an input like “foo AD”, we now show “Production Date is not a valid date. The AD year must be numeric.“. For an input like “99999 AD”, we now show “Production Date is not a valid date. The AD year cant be higher than 9999.“. For an input like “[-9999?], we now show “Production Date is not a valid date. The year in brackets cannot be negative.“, etc.
 - The SPA now fetches the runtime configuration from `config.js` on each load, allowing configurations without rebuilding the app. We don't use `.env` variables at build time anymore.
 - Renamed dataset template fetch/create use cases and DTOs to `getTemplatesByCollectionId` and `CreateTemplateDTO` for API alignment, and added new `getTemplate` and `deleteTemplate` use cases for retrieving a single template by ID and deleting templates.
+- Added disclaimer text and custom popup text to Publish Dataset modal for better communication of the implications of publishing a dataset. The text can be configured through the runtime configuration.
+- Dataset page Terms tab title now depends on permissions: users with dataset update permission see `Terms and Guestbook`, and read-only users see `Terms`.
 
 ### Fixed
 
 - Add word-break to items text to prevent layout issues when long descriptions without spaces are entered. (#839)
 - Show toast notification when API token is copied to clipboard.
 - Dataset versions: (1) file changes should be `Access: Restricted` instead of `isResticted: true/false`; (2) logic of View Detail button. (#879)
 - File versions: (1) logic of linking to a file version; (2)If file not included, show text information "File not included in this version.". (#879)
-- Notifications unread count now refreshes immediately (without waiting for polling) after notifications are read and after dataset/collection create or dataset publish actions that generate notifications.
+- Dataset page publish flow now avoids rendering duplicate tab sets by making tabs skeleton and tabs content mutually exclusive.
 
 ### Removed
 

cypress.config.ts

@@ -46,6 +46,16 @@ export default defineConfig({
       { code: 'es', name: 'Español' }
     ],
     defaultLanguage: 'en',
+    branding: {
+      dataverseName: 'Dataverse'
+    },
+    homepage: {
+      supportUrl: 'https://support.dataverse.harvard.edu/'
+    },
+    footer: {
+      copyrightHolder: 'The President & Fellows of Harvard College',
+      privacyPolicyUrl: 'https://support.dataverse.harvard.edu/harvard-dataverse-privacy-policy'
+    },
     codeCoverage: {
       exclude: ['tests/**/*.*', '**/ErrorPage.tsx']
     }

package-lock.json

@@ -20,5 +20,17 @@ window.__APP_CONFIG__ = {
     { code: 'es', name: 'Español' }
   ],
   // Default language code from the list above
-  defaultLanguage: 'en'
+  defaultLanguage: 'en',
+  // Optional branding values for homepage/footer text
+  branding: {
+    // Used in homepage strings such as "{{dataverseName}} is a repository..."
+    dataverseName: 'Harvard Dataverse'
+  },
+  homepage: {
+    supportUrl: 'https://support.dataverse.harvard.edu/'
+  },
+  footer: {
+    copyrightHolder: 'The President & Fellows of Harvard College',
+    privacyPolicyUrl: 'https://support.dataverse.harvard.edu/harvard-dataverse-privacy-policy'
+  }
 }

public/config.js

@@ -2,6 +2,7 @@
   "filesTabTitle": "Files",
   "metadataTabTitle": "Metadata",
   "termsTabTitle": "Terms and Guestbook",
+  "termsTabTitleReadOnly": "Terms",
   "anonymizedFieldValue": "withheld",
   "customTerms": {
     "title": "Custom Dataset Terms",
@@ -69,7 +70,8 @@
       },
       "deleteDatasetModal": {
         "title": "Delete Dataset",
-        "message": "Are you sure you want to delete this dataset? This action cannot be undone.",
+        "messageDraft": "Are you sure you want to delete this draft version? Files will be reverted to the most recently published version. You cannot undelete this draft.",
+        "messageDataset": "Are you sure you want to delete this dataset? You cannot undelete this dataset.",
         "defaultDatasetDeleteError": "An error occurred while deleting the dataset."
       }
     },
@@ -142,7 +144,8 @@
       "heading": "Unpublished Dataset Private URL",
       "alertText": "This unpublished dataset is being privately shared."
     },
-    "datasetDeletedSuccess": "The dataset has been deleted."
+    "datasetDeletedSuccessDraft": "The dataset draft has been deleted.",
+    "datasetDeletedSuccessDataset": "The dataset has been deleted."
   },
   "termsTab": {
     "editTermsButton": "Edit Terms and Guestbook",

public/locales/en/dataset.json

@@ -1,5 +1,5 @@
 {
-  "copyright": "Copyright © {{year}}, The President & Fellows of Harvard College | ",
+  "copyright": "Copyright © {{year}}, {{copyrightHolder}}",
   "privacyPolicy": "Privacy Policy",
   "poweredBy": "Powered by"
 }

public/locales/en/footer.json

@@ -20,7 +20,7 @@
   "usage": {
     "datasets": {
       "title": "Deposit and share your data. Get academic credit.",
-      "content": "Harvard Dataverse is a repository for research data. Deposit data and code here.",
+      "content": "{{dataverseName}} is a repository for research data. Deposit data and code here.",
       "text_button": "Add a dataset"
     },
     "collections": {
@@ -29,7 +29,7 @@
       "text_button": "Add a collection"
     },
     "general": {
-      "title": "Publishing your data is easy on Harvard Dataverse!",
+      "title": "Publishing your data is easy on {{dataverseName}}!",
       "content": "Learn about getting started creating your own dataverse repository here.",
       "text_button": "Getting started"
     }

public/locales/en/homepage.json

@@ -1,7 +1,8 @@
 {
   "filesTabTitle": "Ficheros",
   "metadataTabTitle": "Metadatos",
-  "termsTabTitle": "Términos",
+  "termsTabTitle": "Términos y libros de visitas",
+  "termsTabTitleReadOnly": "Términos",
   "anonymizedFieldValue": "retirado",
   "customTerms": {
     "title": "Términos personalizados del dataset",
@@ -68,7 +69,8 @@
       },
       "deleteDatasetModal": {
         "title": "Eliminar dataset",
-        "message": "¿Seguro que quieres eliminar este dataset? Esta acción no se puede deshacer.",
+        "messageDraft": "¿Seguro que quieres eliminar esta versión borrador? No podrás recuperar este borrador.",
+        "messageDataset": "¿Seguro que quieres eliminar este dataset? Esta acción no se puede deshacer.",
         "defaultDatasetDeleteError": "Ocurrió un error al eliminar el dataset."
       }
     },
@@ -137,7 +139,8 @@
       "heading": "URL privada de dataset no publicado",
       "alertText": "Este dataset no publicado se está compartiendo de forma privada."
     },
-    "datasetDeletedSuccess": "El dataset ha sido eliminado."
+    "datasetDeletedSuccessDraft": "El borrador del dataset ha sido eliminado.",
+    "datasetDeletedSuccessDataset": "El dataset ha sido eliminado."
   },
   "termsTab": {
     "editTermsButton": "Editar requisitos de términos",

public/locales/es/dataset.json

@@ -1,5 +1,5 @@
 {
-  "copyright": "Copyright © {{year}}, El Presidente y Miembros de la Universidad de Harvard | ",
+  "copyright": "Copyright © {{year}}, {{copyrightHolder}}",
   "privacyPolicy": "Política de privacidad",
   "poweredBy": "Desarrollado por"
 }

public/locales/es/footer.json

@@ -20,7 +20,7 @@
   "usage": {
     "datasets": {
       "title": "Deposita y comparte tus datos. Obtén crédito académico.",
-      "content": "Harvard Dataverse es un repositorio para datos de investigación. Deposita aquí tus datos y código.",
+      "content": "{{dataverseName}} es un repositorio para datos de investigación. Deposita aquí tus datos y código.",
       "text_button": "Agregar un dataset"
     },
     "collections": {
@@ -29,7 +29,7 @@
       "text_button": "Agregar una colección"
     },
     "general": {
-      "title": "¡Publicar tus datos es fácil en Harvard Dataverse!",
+      "title": "¡Publicar tus datos es fácil en {{dataverseName}}!",
       "content": "Aprende cómo comenzar a crear tu propio repositorio Dataverse aquí.",
       "text_button": "Comenzar"
     }