feat: update request access button

Author: ChengShi-1

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

src/files/infrastructure/mappers/JSFileMapper.ts

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

src/sections/file/File.tsx

@@ -101,8 +101,7 @@ export function File({ repository, id, datasetVersionNumber }: FileProps) {
                           versionNumber: file.datasetVersion.number.toSearchParam(),
                           termsOfAccessForRestrictedFiles:
                             file.datasetVersion.termsOfAccess?.termsOfAccessForRestrictedFiles,
-                          requestAccess:
-                            file.datasetVersion.termsOfAccess?.fileAccessRequest ?? true
+                          requestAccess: file.datasetVersion.termsOfAccess?.fileAccessRequest
                         }}
                       />
                     )}

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

@@ -30,7 +30,6 @@ export const useRestrictFile = ({
 }: UseRestrictFile): UseRestrictFileReturn => {
   const { t } = useTranslation('file')
   const [isRestrictingFile, setIsRestrictingFile] = useState<boolean>(false)
-
   const [errorRestrictingFile, seterrorRestrictingFile] = useState<string | null>(null)
 
   const handleRestrictFile = async (
@@ -39,7 +38,7 @@ export const useRestrictFile = ({
     terms?: string
   ) => {
     setIsRestrictingFile(true)
-    console.log('enableAccessRequest terms', enableAccessRequest, terms)
+
     const restrictDTO: RestrictDTO = {
       restrict: !isRestricted
     }