Merge branch 'develop' into 896-add-terms-of-use-and-guestbook-to-file-download

Author: ChengShi-1

CHANGELOG.md

@@ -13,6 +13,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.
@@ -29,6 +30,7 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
 - 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`.
+- Avoided prop-drilling for collection repository, so used context to share epository instances.
 
 ### Fixed
 

public/locales/en/collection.json

@@ -52,6 +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/shared.json

@@ -220,6 +220,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/es/collection.json

@@ -52,6 +52,12 @@
   "editCollection": {
     "edit": "Editar",
     "generalInfo": "Información general",
+    "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/shared.json

@@ -220,6 +220,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",

src/alert/domain/models/Alert.ts

@@ -1,4 +1,7 @@
-import { type AlertVariant } from '@iqss/dataverse-design-system'
+import { ComponentProps } from 'react'
+import { Alert as DesignSystemAlert } from '@iqss/dataverse-design-system'
+
+type AlertVariant = ComponentProps<typeof DesignSystemAlert>['variant']
 
 export enum AlertMessageKey {
   DRAFT_VERSION = 'draftVersion',

src/dataset/domain/models/DatasetUploadLimits.ts

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

src/dataset/domain/repositories/DatasetRepository.ts

@@ -11,6 +11,7 @@ import { FormattedCitation, CitationFormat } from '../models/DatasetCitation'
 import { DatasetLicenseUpdateRequest } from '../models/DatasetLicenseUpdateRequest'
 import { CollectionSummary } from '@/collection/domain/models/CollectionSummary'
 import { DatasetVersionPaginationInfo } from '../models/DatasetVersionPaginationInfo'
+import { DatasetUploadLimits } from '../models/DatasetUploadLimits'
 
 export interface DatasetRepository {
   getByPersistentId: (
@@ -68,4 +69,5 @@ export interface DatasetRepository {
   link(datasetId: string | number, collectionIdOrAlias: string | number): Promise<void>
   unlink(datasetId: string | number, collectionIdOrAlias: string | number): Promise<void>
   getDatasetLinkedCollections: (datasetId: string | number) => Promise<CollectionSummary[]>
+  getDatasetUploadLimits: (datasetId: string | number) => Promise<DatasetUploadLimits>
 }

src/dataset/domain/useCases/getDatasetUploadLimits.ts

@@ -0,0 +1,9 @@
+import { DatasetRepository } from '../repositories/DatasetRepository'
+import { DatasetUploadLimits } from '../models/DatasetUploadLimits'
+
+export async function getDatasetUploadLimits(
+  datasetId: string | number,
+  datasetRepository: DatasetRepository
+): Promise<DatasetUploadLimits> {
+  return datasetRepository.getDatasetUploadLimits(datasetId)
+}

src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts

@@ -43,7 +43,8 @@ import {
   unlinkDataset,
   getDatasetLinkedCollections,
   updateTermsOfAccess,
-  updateDatasetLicense
+  updateDatasetLicense,
+  getDatasetUploadLimits
 } from '@iqss/dataverse-client-javascript'
 import { JSDatasetMapper } from '../mappers/JSDatasetMapper'
 import { DatasetPaginationInfo } from '../../domain/models/DatasetPaginationInfo'
@@ -62,6 +63,7 @@ import { requireAppConfig } from '../../../config'
 import { AxiosResponse } from 'axios'
 import { JSDataverseReadErrorHandler } from '@/shared/helpers/JSDataverseReadErrorHandler'
 import { CollectionSummary } from '@/collection/domain/models/CollectionSummary'
+import { DatasetUploadLimits } from '@/dataset/domain/models/DatasetUploadLimits'
 
 const includeDeaccessioned = true
 
@@ -468,4 +470,8 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
   updateTermsOfAccess(datasetId: string | number, termsOfAccess: TermsOfAccess): Promise<void> {
     return updateTermsOfAccess.execute(datasetId, termsOfAccess)
   }
+
+  getDatasetUploadLimits(datasetId: string | number): Promise<DatasetUploadLimits> {
+    return getDatasetUploadLimits.execute(datasetId)
+  }
 }