Merge pull request #766 from IQSS/764-update-includedeaccessioned-to-getfile

Update includedeaccessioned to GetFileById

Author: ofahimIQSS

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.52",
+    "@iqss/dataverse-client-javascript": "2.0.0-alpha.53",
     "@iqss/dataverse-design-system": "*",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@tanstack/react-table": "8.9.2",

package.json

@@ -252,20 +252,29 @@ export class FileJSDataverseRepository implements FileRepository {
   }
 
   getById(id: number, datasetVersionNumber?: string): Promise<File> {
-    return getFileAndDataset
-      .execute(id, datasetVersionNumber)
-      .then(([jsFile, jsDataset]) =>
-        Promise.all([
-          jsFile,
-          jsDataset,
-          getDatasetCitation.execute(jsDataset.id, datasetVersionNumber, includeDeaccessioned),
-          FileJSDataverseRepository.getCitationById(jsFile.id, datasetVersionNumber),
-          FileJSDataverseRepository.getDownloadCountById(jsFile.id, jsFile.publicationDate),
-          FileJSDataverseRepository.getPermissionsById(jsFile.id),
-          FileJSDataverseRepository.getThumbnailById(jsFile.id),
-          FileJSDataverseRepository.getTabularDataById(jsFile.id, jsFile.tabularData)
-        ])
-      )
+    return FileJSDataverseRepository.getPermissionsById(id)
+      .then((permissions) => {
+        const includeDeaccessioned = permissions?.canEditOwnerDataset
+
+        return getFileAndDataset
+          .execute(id, datasetVersionNumber, includeDeaccessioned)
+          .then(([jsFile, jsDataset]) => {
+            return Promise.all([
+              jsFile,
+              jsDataset,
+              getDatasetCitation.execute(jsDataset.id, datasetVersionNumber, includeDeaccessioned),
+              FileJSDataverseRepository.getCitationById(
+                jsFile.id,
+                datasetVersionNumber,
+                includeDeaccessioned
+              ),
+              FileJSDataverseRepository.getDownloadCountById(jsFile.id, jsFile.publicationDate),
+              Promise.resolve(permissions),
+              FileJSDataverseRepository.getThumbnailById(jsFile.id),
+              FileJSDataverseRepository.getTabularDataById(jsFile.id, jsFile.tabularData)
+            ])
+          })
+      })
       .then(
         ([
           jsFile,
@@ -293,7 +302,11 @@ export class FileJSDataverseRepository implements FileRepository {
       })
   }
 
-  private static getCitationById(id: number, datasetVersionNumber?: string): Promise<string> {
+  private static getCitationById(
+    id: number,
+    datasetVersionNumber?: string,
+    includeDeaccessioned?: boolean
+  ): Promise<string> {
     return getFileCitation
       .execute(id, datasetVersionNumber, includeDeaccessioned)
       .catch((error: ReadError) => {

src/files/infrastructure/FileJSDataverseRepository.ts

@@ -77,7 +77,8 @@ export function FileVersions({
             const isCurrentVersion = fileVersion.datasetVersion === displayVersion
             const isLinkable =
               fileVersion.versionState === DatasetVersionState.RELEASED ||
-              fileVersion.versionState === DatasetVersionState.DEACCESSIONED ||
+              (fileVersion.versionState === DatasetVersionState.DEACCESSIONED &&
+                canEditOwnerDataset) ||
               (fileVersion.versionState === DatasetVersionState.DRAFT && canEditOwnerDataset)
 
             return (

src/sections/file/file-version/FileVersions.tsx

@@ -67,6 +67,29 @@ describe('FileVersions', () => {
       )
   })
 
+  it('disables the link button for deaccessioned versions without permission', () => {
+    const deaccessionedFile = [
+      {
+        ...fileVersionSummaries[0],
+        datasetVersion: '1.2',
+        versionState: DatasetVersionState.DEACCESSIONED
+      }
+    ]
+    fileRepository.getFileVersionSummaries = cy.stub().resolves(deaccessionedFile)
+    cy.customMount(
+      <FileVersions
+        fileId={1}
+        datasetVersionNumber={'2.0'}
+        fileRepository={fileRepository}
+        canEditOwnerDataset={false}
+        isInView
+      />
+    )
+
+    cy.get('span').contains('1.2').should('exist')
+    cy.findByTestId('file-version-link-1.2').should('not.exist')
+  })
+
   it('disables the link button for draft version without permission', () => {
     const draftFile = [
       {