Merge branch 'develop' into TemplateUI

Author: ChengShi-1

CHANGELOG.md

@@ -14,6 +14,7 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
 - Share button in File Page.
 - Link Collection and Link Dataset features.
 - Edit Terms Integration.
+- File upload now shows the remaining storage quota when upload limits are available.
 - 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.
@@ -27,6 +28,7 @@ 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

package-lock.json

@@ -148,6 +148,10 @@ export const EditorActions = ({ editor, disabled, locales }: EditorActionsProps)
 
   const handleUndo = () => editor?.chain().focus().undo().run()
   const handleRedo = () => editor?.chain().focus().redo().run()
+  const linkDialogTitle =
+    locales?.linkDialog?.title ?? richTextEditorDefaultLocales.linkDialog?.title
+  const imageDialogTitle =
+    locales?.imageDialog?.title ?? richTextEditorDefaultLocales.imageDialog?.title
 
   return (
     <>
@@ -378,11 +382,13 @@ export const EditorActions = ({ editor, disabled, locales }: EditorActionsProps)
       </div>
 
       {/* Dialog for pasting a url to the link */}
-      <Modal show={linkDialog.open} onHide={handleCloseLinkDialog} size="lg">
+      <Modal
+        show={linkDialog.open}
+        onHide={handleCloseLinkDialog}
+        size="lg"
+        ariaLabel={linkDialogTitle}>
         <Modal.Header>
-          <Modal.Title>
-            {locales?.linkDialog?.title ?? richTextEditorDefaultLocales.linkDialog?.title}
-          </Modal.Title>
+          <Modal.Title>{linkDialogTitle}</Modal.Title>
         </Modal.Header>
         <Modal.Body>
           <Form.Group controlId="link-url" as={Col}>
@@ -416,11 +422,13 @@ export const EditorActions = ({ editor, disabled, locales }: EditorActionsProps)
       </Modal>
 
       {/* Dialog for adding the url and alt text of the image  */}
-      <Modal show={imageDialog.open} onHide={handleCloseImageDialog} size="lg">
+      <Modal
+        show={imageDialog.open}
+        onHide={handleCloseImageDialog}
+        size="lg"
+        ariaLabel={imageDialogTitle}>
         <Modal.Header>
-          <Modal.Title>
-            {locales?.imageDialog?.title ?? richTextEditorDefaultLocales.imageDialog?.title}
-          </Modal.Title>
+          <Modal.Title>{imageDialogTitle}</Modal.Title>
         </Modal.Header>
         <Modal.Body>
           <Form.Group controlId="image-url" as={Col}>

packages/design-system/src/lib/components/rich-text-editor/EditorActions.tsx

@@ -29,6 +29,7 @@ const meta: Meta<typeof Modal> = {
 
 function DefaultExample(size?: 'sm' | 'lg' | 'xl') {
   const [show, setShow] = useState(false)
+  const modalTitle = 'Modal heading'
 
   const handleClose = () => setShow(false)
   const handleShow = () => setShow(true)
@@ -37,9 +38,9 @@ function DefaultExample(size?: 'sm' | 'lg' | 'xl') {
     <>
       <Button onClick={handleShow}>Launch demo modal</Button>
 
-      <Modal show={show} onHide={handleClose} size={size}>
+      <Modal show={show} onHide={handleClose} size={size} ariaLabel={modalTitle}>
         <Modal.Header>
-          <Modal.Title>Modal heading</Modal.Title>
+          <Modal.Title>{modalTitle}</Modal.Title>
         </Modal.Header>
         <Modal.Body>You are reading this text in a modal!</Modal.Body>
         <Modal.Footer>

packages/design-system/src/lib/stories/modal/Modal.stories.tsx

@@ -3,10 +3,11 @@ import { Modal } from '../../../src/lib/components/modal/Modal'
 describe('Modal', () => {
   it('renders the modal with header, body and footer', () => {
     const onHide = cy.stub()
+    const modalTitle = 'Modal Title'
     cy.mount(
-      <Modal show onHide={onHide}>
+      <Modal show onHide={onHide} ariaLabel={modalTitle}>
         <Modal.Header>
-          <Modal.Title>Modal Title</Modal.Title>
+          <Modal.Title>{modalTitle}</Modal.Title>
         </Modal.Header>
         <Modal.Body>Modal Body</Modal.Body>
         <Modal.Footer>
@@ -25,10 +26,11 @@ describe('Modal', () => {
 
   it('calls onHide when the close button is clicked', () => {
     const onHide = cy.stub().as('onHide')
+    const modalTitle = 'Modal Title'
     cy.mount(
-      <Modal show onHide={onHide}>
+      <Modal show onHide={onHide} ariaLabel={modalTitle}>
         <Modal.Header>
-          <Modal.Title>Modal Title</Modal.Title>
+          <Modal.Title>{modalTitle}</Modal.Title>
         </Modal.Header>
         <Modal.Body>Modal Body</Modal.Body>
       </Modal>
@@ -40,10 +42,11 @@ describe('Modal', () => {
 
   it('renders the modal with a custom size', () => {
     const onHide = cy.stub()
+    const modalTitle = 'Modal Title'
     cy.mount(
-      <Modal show onHide={onHide} size="sm">
+      <Modal show onHide={onHide} size="sm" ariaLabel={modalTitle}>
         <Modal.Header>
-          <Modal.Title>Modal Title</Modal.Title>
+          <Modal.Title>{modalTitle}</Modal.Title>
         </Modal.Header>
         <Modal.Body>Modal Body</Modal.Body>
       </Modal>

packages/design-system/tests/component/modal/Modal.spec.tsx

@@ -52,7 +52,12 @@
   "editCollection": {
     "edit": "Edit",
     "generalInfo": "General Information",
+    "themeAndWidgets": "Theme + Widgets",
+    "permissions": "Permissions",
+    "groups": "Groups",
     "datasetTemplates": "Dataset Templates",
+    "datasetGuestbooks": "Dataset Guestbooks",
+    "featuredDataverses": "Featured Dataverses",
     "deleteCollection": "Delete Collection"
   },
   "featuredItems": {

public/locales/en/collection.json

@@ -221,6 +221,9 @@
     "selectFileMultiple": "Select files to add",
     "dragDropSingle": "Drag and drop file here.",
     "dragDropMultiple": "Drag and drop files and/or directories here.",
+    "uploadWidgetHelp": "Select files or drag and drop into the upload widget. Maximum of {{maxFilesPerUpload}} files per upload.",
+    "uploadWidgetMaxFilesHelp": "Maximum of {{maxFilesAvailableToUpload}} files available to upload.",
+    "uploadWidgetStorageQuotaHelp": "Storage quota: {{storageQuotaRemaining}} remaining.",
     "cancelUpload": "Cancel upload",
     "uploadFailed": "There was an error uploading this file.",
     "loadingConfiguration": "Loading configuration",

public/locales/en/shared.json

@@ -52,7 +52,12 @@
   "editCollection": {
     "edit": "Editar",
     "generalInfo": "Información general",
-    "datasetTemplates": "Plantillas de conjuntos de datos",
+    "themeAndWidgets": "Tema + Widgets",
+    "permissions": "Permisos",
+    "groups": "Grupos",
+    "datasetTemplates": "Plantillas de dataset",
+    "datasetGuestbooks": "Libros de visitas de dataset",
+    "featuredDataverses": "Dataverses destacados",
     "deleteCollection": "Eliminar colección"
   },
   "featuredItems": {

public/locales/es/collection.json

@@ -221,6 +221,9 @@
     "selectFileMultiple": "Seleccionar ficheros para agregar",
     "dragDropSingle": "Arrastra y suelta el fichero aquí.",
     "dragDropMultiple": "Arrastra y suelta ficheros y/o directorios aquí.",
+    "uploadWidgetHelp": "Selecciona ficheros o arrástralos y suéltalos en el widget de carga. Máximo de {{maxFilesPerUpload}} ficheros por carga.",
+    "uploadWidgetMaxFilesHelp": "Máximo de {{maxFilesAvailableToUpload}} ficheros disponibles para cargar.",
+    "uploadWidgetStorageQuotaHelp": "Cuota de almacenamiento: {{storageQuotaRemaining}} restantes.",
     "cancelUpload": "Cancelar carga",
     "uploadFailed": "Ocurrió un error al cargar este fichero.",
     "loadingConfiguration": "Cargando configuración",

public/locales/es/shared.json

@@ -0,0 +1,4 @@
+export interface DatasetUploadLimits {
+  numberOfFilesRemaining?: number
+  storageQuotaRemaining?: number
+}