fix: change the requestAccess undefine

Author: ChengShi-1

src/files/infrastructure/mappers/JSFileAccessMapper.ts

@@ -1,15 +1,12 @@
 import { FileAccess } from '../../domain/models/FileAccess'
 
 export class JSFileAccessMapper {
-  static toFileAccess(
-    jsFileRestricted: boolean,
-    jsFileRequestAccess: boolean | undefined
-  ): FileAccess {
+  static toFileAccess(jsFileRestricted: boolean, jsFileRequestAccess: boolean): FileAccess {
     return {
       restricted: jsFileRestricted,
       // TODO - Implement the rest of the properties when they are added to js-dataverse
       latestVersionRestricted: false,
-      canBeRequested: jsFileRequestAccess ?? false,
+      canBeRequested: jsFileRequestAccess,
       requested: false
     }
   }

src/files/infrastructure/mappers/JSFileMapper.ts

@@ -33,7 +33,7 @@ export class JSFileMapper {
       name: this.toFileName(jsFile.name),
       datasetPublishingStatus: datasetVersion.publishingStatus,
       datasetVersionNumber: datasetVersion.number,
-      access: JSFileAccessMapper.toFileAccess(jsFile.restricted, jsFile.fileAccessRequest),
+      access: JSFileAccessMapper.toFileAccess(jsFile.restricted, jsFile.fileAccessRequest || false),
       ingest: JSFileIngestMapper.toFileIngest(),
       metadata: JSFileMetadataMapper.toFileMetadata(jsFile, downloadsCount, thumbnail, tabularData),
       permissions: permissions
@@ -62,7 +62,7 @@ export class JSFileMapper {
       id: this.toFileId(jsFile.id),
       datasetPersistentId: jsDataset.persistentId,
       name: this.toFileName(jsFile.name),
-      access: JSFileAccessMapper.toFileAccess(jsFile.restricted, jsFile.fileAccessRequest),
+      access: JSFileAccessMapper.toFileAccess(jsFile.restricted, jsFile.fileAccessRequest || false),
       datasetVersion: datasetVersion,
       citation: citation,
       metadata: JSFileMetadataMapper.toFileMetadata(jsFile, downloadsCount, thumbnail, tabularData),

src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/DatasetRestrictFileButton.tsx

@@ -65,9 +65,9 @@ export const DatasetRestrictFileButton = ({
         show={showConfirmationModal}
         handleClose={handleCloseModal}
         handleRestrict={(enableAccessRequest, terms) =>
-          handleRestrictFile(fileId, enableAccessRequest, terms)
+          handleRestrictFile(fileId, enableAccessRequest, terms || undefined)
         }
-        requestAccess={datasetInfo.requestAccess ?? true}
+        requestAccess={datasetInfo.requestAccess}
         datasetReleasedVersionExists={datasetInfo.releasedVersionExists}
         termsOfAccessForRestrictedFiles={datasetInfo.termsOfAccessForRestrictedFiles}
         isRestrictingFile={isRestrictingFile}

src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions.tsx

@@ -31,7 +31,7 @@ export interface EditFilesMenuDatasetInfo {
   persistentId: string
   releasedVersionExists: boolean
   termsOfAccessForRestrictedFiles?: string
-  requestAccess?: boolean
+  requestAccess: boolean
 }
 
 const SELECTED_FILES_EMPTY = 0

src/sections/file/file-action-buttons/edit-file-menu/restrict-file-button/confirm-restrict-file-modal/ConfirmRestrictFileModal.tsx

@@ -1,14 +1,14 @@
 import { useTranslation } from 'react-i18next'
+import { useState } from 'react'
 import { Link } from 'react-router-dom'
 import { ExclamationTriangle } from 'react-bootstrap-icons'
 import { Button, Modal, Spinner, Stack, Col, Form } from '@iqss/dataverse-design-system'
 import styles from './ConfirmRestrictFileModal.module.scss'
-import { useState } from 'react'
 
 interface ConfirmRestrictFileModalProps {
   show: boolean
   handleClose: () => void
-  handleRestrict: (enableAccessRequest: boolean | undefined, terms: string | undefined) => void
+  handleRestrict: (enableAccessRequest: boolean, terms: string | undefined) => void
   datasetReleasedVersionExists: boolean
   requestAccess: boolean
   isRestrictingFile: boolean

src/sections/file/file-action-buttons/edit-file-menu/restrict-file-button/useRestrictFile.tsx

@@ -17,7 +17,7 @@ interface UseRestrictFileReturn {
   errorRestrictingFile: string | null
   handleRestrictFile: (
     fileId: number,
-    enableAccessRequest: boolean | undefined,
+    enableAccessRequest: boolean,
     terms: string | undefined
   ) => Promise<void>
   isRestricted: boolean
@@ -34,7 +34,7 @@ export const useRestrictFile = ({
 
   const handleRestrictFile = async (
     fileId: number,
-    enableAccessRequest: boolean | undefined,
+    enableAccessRequest: boolean,
     terms?: string
   ) => {
     setIsRestrictingFile(true)
@@ -49,7 +49,6 @@ export const useRestrictFile = ({
     }
 
     try {
-      console
       await restrictFile(fileRepository, fileId, restrictDTO)
       onSuccessfulRestrict()
     } catch (err: WriteError | unknown) {