Merge branch 'develop' into feat/635-replace-file-btn-in-dataset-page

Author: g-saracca

package-lock.json

@@ -17,7 +17,7 @@
     "@dnd-kit/sortable": "8.0.0",
     "@dnd-kit/utilities": "3.2.2",
     "@faker-js/faker": "7.6.0",
-    "@iqss/dataverse-client-javascript": "2.0.0-alpha.31",
+    "@iqss/dataverse-client-javascript": "2.0.0-alpha.35",
     "@iqss/dataverse-design-system": "*",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@tanstack/react-table": "8.9.2",
@@ -46,7 +46,6 @@
     "react-loader-spinner": "5.3.4",
     "react-markdown": "8.0.7",
     "react-router-dom": "6.23.1",
-    "react-slot-counter": "3.3.0",
     "react-toastify": "11.0.2",
     "react-topbar-progress-indicator": "4.1.1",
     "sass": "1.58.1",

package.json

@@ -216,5 +216,30 @@
     "forwardUrl": "URL where this dataset can be accessed after deaccessioning:",
     "cancelButton": "Cancel",
     "deaccessionButton": "Deaccession"
+  },
+  "metrics": {
+    "title": "Dataset Metrics",
+    "tip": {
+      "default": "Aggregated metrics for this dataset.",
+      "makeDataCount": "Metrics collected using Make Data Count standards."
+    },
+    "makeDataCount": {
+      "title": "Make Data Count (MDC) Metrics",
+      "since": "since"
+    },
+    "downloads": {
+      "count": {
+        "default_zero": "{{count}} Downloads",
+        "default_one": "{{count}} Download",
+        "default_other": "{{count}} Downloads",
+        "preMDC_zero": "{{count}} Downloads pre-MDC",
+        "preMDC_one": "{{count}} Download pre-MDC",
+        "preMDC_other": "{{count}} Downloads pre-MDC"
+      },
+      "defaultTip": "Total aggregated downloads of files in this dataset.",
+      "preMakeDataCountTip": "Downloads prior to enabling MDC. Counts do not have the same filtering and detail as MDC metrics.",
+      "makeDataCountTip": "Each file downloaded is counted as 1, and added to the total download count."
+    },
+    "defaultGetDownloadCountError": "Something went wrong while getting the dataset download count. Try again later."
   }
 }

public/locales/en/dataset.json

@@ -79,15 +79,16 @@
     "restrictAccess": "Restrict Access",
     "restrictionInfoP1": "Restricting limits access to published files. People who want to use the restricted files can request access by default. ",
     "restrictionInfoP2": "If you disable request access, you must add information about access to the Terms of Access field.",
-    "restrictionInfoP3": "Learn about restricting files and dataset access in the ",
-    "userGuide": "User Guide",
+    "restrictionInfoP3": "Learn about restricting files and dataset access in the <a>User Guide</a>.",
     "termsOfAccess": "Terms of Access for Restricted Files",
     "enableAccessRequest": "Enable access request",
     "saveChanges": "Save Changes",
     "cancelChanges": "Cancel Changes",
     "messagePublishedDataset": "Files will not be changed from previously published versions of the dataset.",
     "message": "The file will be unrestricted.",
     "defaultFileRestrictError": "Something went wrong restricting the file. Try again later.",
-    "defaultFileUnrestrictError": "Something went wrong unrestricting the file. Try again later."
+    "defaultFileUnrestrictError": "Something went wrong unrestricting the file. Try again later.",
+    "requestAccessTooltipText": "If checked, users can request access to the restricted files in this dataset.",
+    "termsOfAccessTooltipTex": "information on how and if users can access restricted files in this dataset."
   }
 }

public/locales/en/file.json

@@ -1,16 +1,21 @@
 {
   "browseCollections": "Browse All Collections",
   "metrics": {
-    "title": "Activity",
+    "title": "Dataverse in Numbers",
     "datasets": "Datasets",
     "files": "Files",
     "total": "Total",
+    "lastMonth": "Last Month",
     "past30days": "Past 30 Days",
     "downloaded": "Downloaded",
     "download30days": "Downloads (30 days)",
+    "downloadedLastMonth": "Downloaded (last month)",
     "deposited": "Deposited",
     "deposited30days": "Deposited (30 days)",
-    "harvested": "Harvested"
+    "depositedLastMonth": "Deposited (last month)",
+    "harvested": "Harvested",
+    "harvestedLastMonth": "Harvested (last month)",
+    "poweredByDataverseHub": "Powered by the <a>Dataverse Hub</a>"
   },
   "usage": {
     "datasets": {

public/locales/en/homepage.json

@@ -0,0 +1,5 @@
+{
+  "statusNumberNotFound": "404",
+  "message": "We can't find the <1>{{type}}</1> you're looking for.\n Sorry for the inconvenience.",
+  "backToHomepage": "Back to {{brandName}} Homepage"
+}

public/locales/en/notFoundPage.json

@@ -1,4 +1,8 @@
 {
+  "collection": "Collection",
+  "dataset": "Dataset",
+  "file": "File",
+  "page": "Page",
   "asterisksIndicateRequiredFields": "Asterisks indicate required fields",
   "remove": "Remove",
   "add": "Add",
@@ -21,10 +25,6 @@
     "heading": "Page Number Not Found",
     "message": "The page number you requested does not exist. Please try a different page number."
   },
-  "pageNotFound": {
-    "heading": "Page Not Found",
-    "message": "The page you are looking for was not found."
-  },
   "pagination": {
     "results_one": "1 {{item}}",
     "results_other": "{{start}} to {{end}} of {{formattedCount}} {{item}}s",

public/locales/en/shared.json

@@ -219,6 +219,13 @@ export enum DatasetNonNumericVersionSearchParam {
   DRAFT = 'DRAFT'
 }
 
+export enum DatasetVersionState {
+  DRAFT = 'DRAFT',
+  RELEASED = 'RELEASED',
+  ARCHIVED = 'ARCHIVED',
+  DEACCESSIONED = 'DEACCESSIONED'
+}
+
 export class DatasetVersionNumber {
   constructor(public readonly majorNumber?: number, public readonly minorNumber?: number) {}
 
@@ -401,6 +408,7 @@ export class Dataset {
   constructor(
     public readonly persistentId: string,
     public readonly version: DatasetVersion,
+    public readonly internalVersionNumber: number,
     public readonly alerts: Alert[],
     public readonly summaryFields: DatasetMetadataBlock[],
     public readonly termsOfUse: DatasetTermsOfUse,
@@ -496,6 +504,7 @@ export class Dataset {
     constructor(
       public readonly persistentId: string,
       public readonly version: DatasetVersion,
+      public readonly internalVersionNumber: number,
       public readonly summaryFields: DatasetMetadataBlock[],
       public readonly termsOfUse: DatasetTermsOfUse,
       public readonly metadataBlocks: DatasetMetadataBlocks,
@@ -565,6 +574,7 @@ export class Dataset {
       return new Dataset(
         this.persistentId,
         this.version,
+        this.internalVersionNumber,
         this.alerts,
         this.summaryFields,
         this.termsOfUse,

src/dataset/domain/models/Dataset.ts

@@ -0,0 +1,5 @@
+export interface DatasetDownloadCount {
+  id: number | string
+  downloadCount: number
+  MDCStartDate?: string
+}

src/dataset/domain/models/DatasetDownloadCount.ts

@@ -1,3 +1,5 @@
+import { DatasetVersionState } from './Dataset'
+
 export interface DatasetVersionDiff {
   oldVersion: VersionSummary
   newVersion: VersionSummary
@@ -24,7 +26,9 @@ export interface FileSummary {
 export interface VersionSummary {
   versionNumber: string
   lastUpdatedDate: string
+  versionState: DatasetVersionState
 }
+
 export interface MetadataBlockDiff {
   blockName: string
   changed: FieldDiff[]