add VersionNotFound and PrivateUrl stories

IQSS · Oct 6, 2023 · da02bc4 · da02bc4
1 parent 5c00ae0
commit da02bc4
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 7 deletions.
diff --git a/public/locales/en/dataset.json b/public/locales/en/dataset.json
@@ -23,7 +23,7 @@
   },
   "alerts": {
     "draftVersion": "<b>This draft version needs to be published</b>. When ready for sharing, please <b>publish</b> it so that others can see these changes",
-    "requestedVersionNotFound": "Info – Version {0} was not found. This is version {1}",
-    "unpublishedDataset": "Privately share this dataset before it is published: {0}"
+    "requestedVersionNotFound": "Version {{requestedVersion}} was not found. This is version {{returnedVersion}}.",
+    "unpublishedDataset": "Privately share this dataset before it is published: {{privateUrl}}"
   }
 }
diff --git a/src/dataset/domain/models/Dataset.ts b/src/dataset/domain/models/Dataset.ts
@@ -34,7 +34,7 @@ export class DatasetAlert {
   constructor(
     public readonly variant: AlertVariant,
     public readonly message: DatasetAlertMessageKey,
-    public readonly dynamicFields?: string[],
+    public readonly dynamicFields?: {},
     public readonly customHeading?: string
   ) {}
 }
@@ -331,7 +331,10 @@ export class Dataset {
         )
       }
       if (this.version.requestedVersion) {
-        const dynamicFields = [this.version.requestedVersion, `${this.version.toString()}`]
+        const dynamicFields = {
+          requestedVersion: this.version.requestedVersion,
+          returnedVersion: `${this.version.toString()}`
+        }
 
         this.alerts.push(
           new DatasetAlert(
@@ -342,7 +345,7 @@ export class Dataset {
         )
       }
       if (this.privateUrl) {
-        const dynamicFields = [this.privateUrl]
+        const dynamicFields = { privateUrl: this.privateUrl }
         this.alerts.push(
           new DatasetAlert(
             'info',

diff --git a/src/sections/dataset/dataset-alerts/DatasetAlerts.tsx b/src/sections/dataset/dataset-alerts/DatasetAlerts.tsx
@@ -14,7 +14,10 @@ export function DatasetAlerts({ alerts }: DatasetAlertsProps) {
   return (
     <div className={styles.container}>
       {alerts.map((alert: DatasetAlert, index) => {
-        const translatedHTML = t(`alerts.${alert.message}`)
+        const translatedHTML = alert.dynamicFields
+          ? t(`alerts.${alert.message}`, alert.dynamicFields)
+          : t(`alerts.${alert.message}`)
+
         return (
           <Alert variant={alert.variant} customHeading={alert.customHeading} dismissible={false}>
             {parse(translatedHTML)}

diff --git a/src/stories/dataset/dataset-alerts/DatasetAlert.stories.tsx b/src/stories/dataset/dataset-alerts/DatasetAlert.stories.tsx
@@ -1,6 +1,11 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import { DatasetMockData } from '../DatasetMockData'
-import { DatasetPublishingStatus, DatasetVersion } from '../../../dataset/domain/models/Dataset'
+import {
+  DatasetAlert,
+  DatasetAlertMessageKey,
+  DatasetPublishingStatus,
+  DatasetVersion
+} from '../../../dataset/domain/models/Dataset'
 import { DatasetAlerts } from '../../../sections/dataset/dataset-alerts/DatasetAlerts'
 import { WithI18next } from '../../WithI18next'
 import { AlertVariant } from '@iqss/dataverse-design-system/dist/components/alert/AlertVariant'
@@ -26,3 +31,36 @@ export const DraftVersion: Story = {
     )
   }
 }
+export const VersionNotFound: Story = {
+  render: () => {
+    const dataset = DatasetMockData({
+      version: new DatasetVersion(1, DatasetPublishingStatus.RELEASED, 1, 0, '3.0')
+    })
+    return (
+      <div>
+        <DatasetAlerts alerts={dataset.alerts} />
+      </div>
+    )
+  }
+}
+export const PrivateUrl: Story = {
+  render: () => {
+    const alerts = [
+      new DatasetAlert(
+        'info',
+        DatasetAlertMessageKey.UNPUBLISHED_DATASET,
+        {
+          privateUrl:
+            'http://localhost:8080/privateurl.xhtml?token=f6815782-1227-4d80-a46d-91621c2d9386'
+        },
+        'Unpublished Dataset Private URL'
+      )
+    ]
+
+    return (
+      <div>
+        <DatasetAlerts alerts={alerts} />
+      </div>
+    )
+  }
+}