fix: add 'privateUrl' to Dataset domain model

IQSS · Oct 23, 2023 · 57b57a3 · 57b57a3
1 parent 20f0ecf
commit 57b57a3
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 31 deletions.
diff --git a/src/dataset/domain/models/Dataset.ts b/src/dataset/domain/models/Dataset.ts
@@ -289,7 +289,8 @@ export class Dataset {
     public readonly locks: DatasetLock[],
     public readonly hasValidTermsOfAccess: boolean,
     public readonly isValid: boolean,
-    public readonly isReleased: boolean
+    public readonly isReleased: boolean,
+    public readonly privateUrl?: string
   ) {}
 
   public getTitle(): string {
@@ -334,6 +335,7 @@ export class Dataset {
       public readonly hasValidTermsOfAccess: boolean,
       public readonly isValid: boolean,
       public readonly isReleased: boolean,
+      public readonly privateUrl?: string,
       public readonly privateUrlToken?: string
     ) {
       this.withLabels()
@@ -386,6 +388,9 @@ export class Dataset {
     }
 
     private withAlerts(): void {
+      console.log(
+        'withAlerts, privateUrl ' + this.privateUrl + ' privateUrlToken: ' + this.privateUrlToken
+      )
       if (
         this.version.publishingStatus === DatasetPublishingStatus.DRAFT &&
         this.permissions.canPublishDataset
@@ -418,20 +423,15 @@ export class Dataset {
           )
         }
       }
+      if (this.privateUrl && !this.privateUrlToken) {
+        const dynamicFields = { privateUrl: this.privateUrl }
+        this.alerts.push(
+          new DatasetAlert('info', DatasetAlertMessageKey.SHARE_UNPUBLISHED_DATASET, dynamicFields)
+        )
+      }
+
       if (this.privateUrlToken) {
-        if (this.permissions.canUpdateDataset) {
-          // TODO: set the whole Url, not just the token
-          const dynamicFields = { privateUrl: this.privateUrlToken }
-          this.alerts.push(
-            new DatasetAlert(
-              'info',
-              DatasetAlertMessageKey.SHARE_UNPUBLISHED_DATASET,
-              dynamicFields
-            )
-          )
-        } else {
-          this.alerts.push(new DatasetAlert('warning', DatasetAlertMessageKey.UNPUBLISHED_DATASET))
-        }
+        this.alerts.push(new DatasetAlert('warning', DatasetAlertMessageKey.UNPUBLISHED_DATASET))
       }
     }
 

diff --git a/src/stories/dataset/dataset-alerts/DatasetAlert.stories.tsx b/src/stories/dataset/dataset-alerts/DatasetAlert.stories.tsx
@@ -84,21 +84,20 @@ export const VersionNotFoundShowDraft: Story = {
 }
 export const SharePrivateUrl: Story = {
   render: () => {
-    const dataset = DatasetMother.createWithPrivateUrlToken(
-      'http://localhost:8080/privateurl.xhtml?token=cd943c75-1cc7-4c1d-9717-98141d65d5cb',
-      {
-        version: new DatasetVersion(
-          1,
-          DatasetPublishingStatus.RELEASED,
-          true,
-          false,
-          DatasetPublishingStatus.DRAFT,
-          1,
-          0
-        ),
-        permissions: DatasetPermissionsMother.createWithUpdateDatasetAllowed()
-      }
-    )
+    const dataset = DatasetMother.createRealistic({
+      version: new DatasetVersion(
+        1,
+        DatasetPublishingStatus.RELEASED,
+        true,
+        false,
+        DatasetPublishingStatus.DRAFT,
+        1,
+        0
+      ),
+      permissions: DatasetPermissionsMother.createWithUpdateDatasetAllowed(),
+      privateUrl:
+        'http://localhost:8080/privateurl.xhtml?token=cd943c75-1cc7-4c1d-9717-98141d65d5cb'
+    })
 
     return (
       <div>
@@ -110,7 +109,7 @@ export const SharePrivateUrl: Story = {
 export const UsePrivateUrl: Story = {
   render: () => {
     const dataset = DatasetMother.createWithPrivateUrlToken(
-      'http://localhost:8080/privateurl.xhtml?token=cd943c75-1cc7-4c1d-9717-98141d65d5cb',
+      'cd943c75-1cc7-4c1d-9717-98141d65d5cb',
       {
         version: new DatasetVersion(
           1,

diff --git a/tests/component/dataset/domain/models/DatasetMother.ts b/tests/component/dataset/domain/models/DatasetMother.ts
@@ -306,6 +306,7 @@ export class DatasetMother {
       dataset.hasValidTermsOfAccess,
       dataset.isValid,
       dataset.isReleased,
+      dataset.privateUrl,
       privateUrlToken
     ).build()
   }

diff --git a/tests/component/dataset/infrastructure/mappers/JSDatasetMapper.spec.ts b/tests/component/dataset/infrastructure/mappers/JSDatasetMapper.spec.ts
@@ -118,7 +118,8 @@ const expectedDataset = {
   locks: [],
   hasValidTermsOfAccess: true,
   isValid: true,
-  isReleased: false
+  isReleased: false,
+  privateUrl: undefined
 }
 const expectedDatasetAlternateVersion = {
   persistentId: 'doi:10.5072/FK2/B4B2MJ',
@@ -137,6 +138,7 @@ const expectedDatasetAlternateVersion = {
   hasValidTermsOfAccess: true,
   isReleased: false,
   isValid: true,
+  privateUrl: undefined,
   labels: [
     { semanticMeaning: 'dataset', value: 'Draft' },
     { semanticMeaning: 'warning', value: 'Unpublished' }