272 move filepreview permissions

package.json

@@ -107,6 +107,7 @@
     "@auto-it/released": "10.46.0",
     "@csstools/postcss-cascade-layers": "3.0.1",
     "@cypress/code-coverage": "3.10.7",
+    "@cypress/grep": "4.0.1",
     "@storybook/addon-a11y": "7.0.2",
     "@storybook/addon-essentials": "7.0.2",
     "@storybook/addon-interactions": "7.0.2",

src/files/domain/models/File.ts

@@ -1,8 +1,5 @@
 import { DatasetVersion } from '../../../dataset/domain/models/Dataset'
-
-export interface FilePermissions {
-  canDownloadFile: boolean
-}
+import { FilePermissions } from './FilePermissions'
 
 export interface File {
   name: string

src/files/domain/models/FilePermissions.ts

@@ -0,0 +1,3 @@
+export interface FilePermissions {
+  canDownloadFile: boolean
+}

src/files/domain/models/FilePreview.ts

@@ -1,4 +1,5 @@
 import FileTypeToFriendlyTypeMap from './FileTypeToFriendlyTypeMap'
+import { FilePermissions } from './FilePermissions'
 
 export enum FileSizeUnit {
   BYTES = 'B',
@@ -182,6 +183,7 @@ export class FilePreview {
     public readonly isDeleted: boolean,
     public readonly ingest: FileIngest,
     public readonly downloadUrls: FileDownloadUrls,
+    public readonly permissions: FilePermissions,
     public thumbnail?: string,
     readonly directory?: string,
     readonly embargo?: FileEmbargo,

src/files/domain/repositories/FileRepository.ts

@@ -2,7 +2,6 @@ import { FilePreview, FileDownloadMode } from '../models/FilePreview'
 import { File } from '../models/File'
 import { FileCriteria } from '../models/FileCriteria'
 import { FilesCountInfo } from '../models/FilesCountInfo'
-import { FileUserPermissions } from '../models/FileUserPermissions'
 import { DatasetVersion, DatasetVersionNumber } from '../../../dataset/domain/models/Dataset'
 import { FilePaginationInfo } from '../models/FilePaginationInfo'
 
@@ -23,7 +22,6 @@ export interface FileRepository {
     datasetVersionNumber: DatasetVersionNumber,
     criteria?: FileCriteria
   ) => Promise<number>
-  getUserPermissionsById: (id: number) => Promise<FileUserPermissions>
   getById: (id: number) => Promise<File | undefined>
   getMultipleFileDownloadUrl: (ids: number[], downloadMode: FileDownloadMode) => string
   getFileDownloadUrl: (id: number, downloadMode: FileDownloadMode) => string

src/files/infrastructure/FileJSDataverseRepository.ts

@@ -1,11 +1,12 @@
 import { FileRepository } from '../domain/repositories/FileRepository'
 import { FilePreview, FileDownloadMode } from '../domain/models/FilePreview'
 import { FilesCountInfo } from '../domain/models/FilesCountInfo'
-import { FileUserPermissions } from '../domain/models/FileUserPermissions'
+
 import {
   File as JSFile,
   FileDataTable as JSFileTabularData,
   FileDownloadSizeMode,
+  FileUserPermissions as JSFileUserPermissions,
   getDatasetFileCounts,
   getDatasetFiles,
   getDatasetFilesTotalDownloadSize,
@@ -49,15 +50,17 @@ export class FileJSDataverseRepository implements FileRepository {
           jsFiles,
           FileJSDataverseRepository.getAllDownloadCount(jsFiles),
           FileJSDataverseRepository.getAllThumbnails(jsFiles),
+          FileJSDataverseRepository.getAllWithPermissions(jsFiles),
           FileJSDataverseRepository.getAllTabularData(jsFiles)
         ])
       )
-      .then(([jsFiles, downloadCounts, thumbnails, jsTabularData]) =>
+      .then(([jsFiles, downloadCounts, thumbnails, jsFileUserPermissions, jsTabularData]) =>
         jsFiles.map((jsFile, index) =>
           JSFileMapper.toFile(
             jsFile,
             datasetVersion,
             downloadCounts[index],
+            jsFileUserPermissions[index],
             thumbnails[index],
             jsTabularData[index]
           )
@@ -87,7 +90,15 @@ export class FileJSDataverseRepository implements FileRepository {
       )
     )
   }
+  private static getAllWithPermissions(files: JSFile[]): Promise<JSFileUserPermissions[]> {
+    return Promise.all(files.map((jsFile) => this.getFileUserPermissionById(jsFile.id)))
+  }
 
+  private static getFileUserPermissionById(id: number): Promise<JSFileUserPermissions> {
+    return getFileUserPermissions.execute(id).then((jsFileUserPermissions) => {
+      return jsFileUserPermissions
+    })
+  }
   private static getAllThumbnails(jsFiles: JSFile[]): Promise<(string | undefined)[]> {
     return Promise.all(jsFiles.map((jsFile) => this.getThumbnailById(jsFile.id)))
   }
@@ -146,17 +157,6 @@ export class FileJSDataverseRepository implements FileRepository {
       })
   }
 
-  getUserPermissionsById(id: number): Promise<FileUserPermissions> {
-    return getFileUserPermissions
-      .execute(id)
-      .then((jsFileUserPermissions) =>
-        JSFileMapper.toFileUserPermissions(id, jsFileUserPermissions)
-      )
-      .catch((error: ReadError) => {
-        throw new Error(error.message)
-      })
-  }
-
   // eslint-disable-next-line unused-imports/no-unused-vars
   getById(id: number): Promise<File> {
     return new Promise((resolve) => {

src/files/infrastructure/mappers/JSFileMapper.ts

@@ -21,14 +21,15 @@ import {
   FileEmbargo as JSFileEmbargo,
   FileChecksum as JSFileChecksum,
   FileCounts as JSFilesCountInfo,
+  FileUserPermissions as JSFileUserPermissions,
   FileContentTypeCount as JSFileContentTypeCount,
   FileCategoryNameCount as JSFileCategoryNameCount,
   FileAccessStatusCount as JSFileAccessStatusCount,
   FileAccessStatus as JSFileAccessStatus,
   FileDataTable as JSFileTabularData
 } from '@iqss/dataverse-client-javascript'
 import { DatasetPublishingStatus, DatasetVersion } from '../../../dataset/domain/models/Dataset'
-import { FileUserPermissions } from '../../domain/models/FileUserPermissions'
+import { FilePermissions } from '../../domain/models/FilePermissions'
 import {
   FileAccessCount,
   FilesCountInfo,
@@ -42,6 +43,7 @@ export class JSFileMapper {
     jsFile: JSFile,
     datasetVersion: DatasetVersion,
     downloadsCount: number,
+    fileUserPermissions: JSFileUserPermissions,
     thumbnail?: string,
     jsTabularData?: JSFileTabularData[]
   ): FilePreview {
@@ -58,6 +60,7 @@ export class JSFileMapper {
       this.toFileIsDeleted(jsFile.deleted),
       { status: FileIngestStatus.NONE }, // TODO - Implement this when it is added to js-dataverse
       this.toFileOriginalFileDownloadUrl(jsFile.id),
+      this.toFilePermissions(fileUserPermissions),
       this.toFileThumbnail(thumbnail),
       this.toFileDirectory(jsFile.directoryLabel),
       this.toFileEmbargo(jsFile.embargo),
@@ -66,18 +69,23 @@ export class JSFileMapper {
       this.toFileChecksum(jsFile.checksum)
     )
   }
-
+  static toFilePermissions(jsFileUserPermissions: {
+    canDownloadFile: boolean
+    canEditOwnerDataset: boolean
+  }): FilePermissions {
+    return {
+      canDownloadFile: jsFileUserPermissions.canDownloadFile
+    }
+  }
   static toFileUserPermissions(
     jsFileId: number,
     jsFileUserPermissions: {
       canDownloadFile: boolean
       canEditOwnerDataset: boolean
     }
-  ): FileUserPermissions {
+  ): FilePermissions {
     return {
-      fileId: jsFileId,
-      canDownloadFile: jsFileUserPermissions.canDownloadFile,
-      canEditDataset: jsFileUserPermissions.canEditOwnerDataset
+      canDownloadFile: jsFileUserPermissions.canDownloadFile
     }
   }
 

src/sections/dataset/DatasetFactory.tsx

@@ -8,7 +8,6 @@ import { FileJSDataverseRepository } from '../../files/infrastructure/FileJSData
 import { MetadataBlockInfoProvider } from './metadata-block-info/MetadataBlockProvider'
 import { MetadataBlockInfoJSDataverseRepository } from '../../metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository'
 import { SettingJSDataverseRepository } from '../../settings/infrastructure/SettingJSDataverseRepository'
-import { FilePermissionsProvider } from '../file/file-permissions/FilePermissionsProvider'
 import { SettingsProvider } from '../settings/SettingsProvider'
 import { DatasetProvider } from './DatasetProvider'
 import { MultipleFileDownloadProvider } from '../file/multiple-file-download/MultipleFileDownloadProvider'
@@ -24,19 +23,17 @@ export class DatasetFactory {
   static create(): ReactElement {
     return (
       <MultipleFileDownloadProvider repository={fileRepository}>
-        <FilePermissionsProvider repository={fileRepository}>
-          <SettingsProvider repository={settingRepository}>
-            <NotImplementedModalProvider>
-              <MetadataBlockInfoProvider repository={metadataBlockInfoRepository}>
-                <AnonymizedProvider>
-                  <AlertProvider>
-                    <DatasetWithSearchParams />
-                  </AlertProvider>
-                </AnonymizedProvider>
-              </MetadataBlockInfoProvider>
-            </NotImplementedModalProvider>
-          </SettingsProvider>
-        </FilePermissionsProvider>
+        <SettingsProvider repository={settingRepository}>
+          <NotImplementedModalProvider>
+            <MetadataBlockInfoProvider repository={metadataBlockInfoRepository}>
+              <AnonymizedProvider>
+                <AlertProvider>
+                  <DatasetWithSearchParams />
+                </AlertProvider>
+              </AnonymizedProvider>
+            </MetadataBlockInfoProvider>
+          </NotImplementedModalProvider>
+        </SettingsProvider>
       </MultipleFileDownloadProvider>
     )
   }

src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessStatus.tsx

@@ -3,25 +3,22 @@ import { Globe, LockFill, UnlockFill } from 'react-bootstrap-icons'
 import { useTranslation } from 'react-i18next'
 import styles from './AccessFileMenu.module.scss'
 import { DropdownButtonItem } from '@iqss/dataverse-design-system'
-import { useFileDownloadPermission } from '../../../../../../../file/file-permissions/useFileDownloadPermission'
 
 interface AccessStatusProps {
   file: FilePreview
 }
 
 export function AccessStatus({ file }: AccessStatusProps) {
-  const { sessionUserHasFileDownloadPermission } = useFileDownloadPermission(file)
-
   return (
     <DropdownButtonItem disabled>
       <span>
         <AccessStatusIcon
-          sessionUserHasFileDownloadPermission={sessionUserHasFileDownloadPermission}
+          sessionUserHasFileDownloadPermission={file.permissions.canDownloadFile}
           restricted={file.access.restricted}
         />{' '}
         <AccessStatusText
           file={file}
-          sessionUserHasFileDownloadPermission={sessionUserHasFileDownloadPermission}
+          sessionUserHasFileDownloadPermission={file.permissions.canDownloadFile}
         />
       </span>
     </DropdownButtonItem>

src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileDownloadOptions.tsx

@@ -4,17 +4,15 @@ import { FilePreview } from '../../../../../../../../files/domain/models/FilePre
 import { FileTabularDownloadOptions } from './FileTabularDownloadOptions'
 import { FileNonTabularDownloadOptions } from './FileNonTabularDownloadOptions'
 import { useTranslation } from 'react-i18next'
-import { useFileDownloadPermission } from '../../../../../../../file/file-permissions/useFileDownloadPermission'
 
 interface FileDownloadOptionsProps {
   file: FilePreview
 }
 
 export function FileDownloadOptions({ file }: FileDownloadOptionsProps) {
   const { t } = useTranslation('files')
-  const { sessionUserHasFileDownloadPermission } = useFileDownloadPermission(file)
 
-  if (!sessionUserHasFileDownloadPermission) {
+  if (!file.permissions.canDownloadFile) {
     return <></>
   }