fix: SKFP-1246 adjust label in file entity and configure cavatica for…

… unauthorized files (#4144) * fix: SKFP-1246 adjust label in file entity and configure cavatica for unauthorized files * fix: SKFP-1246 adjust cavatica rule
kids-first · Oct 8, 2024 · 5cb9660 · 5cb9660
1 parent c683793
commit 5cb9660
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/utils/dataFiles.ts b/src/utils/dataFiles.ts
@@ -11,18 +11,27 @@ export const userHasAccessToFile = (
     return false;
   }
 
-  if (file.controlled_access === FileAccessType.CONTROLLED && !isConnectedToGen3) {
+  const fileAccess = file;
+  if (
+    fileAccess.controlled_access === FileAccessType.CONTROLLED &&
+    fileAccess.data_category === 'Imaging' &&
+    fileAccess.access_urls?.startsWith('drs://cavatica-ga4gh-api.sbgenomics.com/')
+  ) {
+    fileAccess.controlled_access = FileAccessType.REGISTERED;
+  }
+
+  if (fileAccess.controlled_access === FileAccessType.CONTROLLED && !isConnectedToGen3) {
     return false;
   }
 
-  if (file.controlled_access === FileAccessType.REGISTERED && !isConnectedToCavatica) {
+  if (fileAccess.controlled_access === FileAccessType.REGISTERED && !isConnectedToCavatica) {
     return false;
   }
 
   return (
-    !file.acl ||
-    file.acl.length === 0 ||
-    intersection(userAcls, file.acl).length > 0 ||
-    file.controlled_access === FileAccessType.REGISTERED
+    !fileAccess.acl ||
+    fileAccess.acl.length === 0 ||
+    intersection(userAcls, fileAccess.acl).length > 0 ||
+    fileAccess.controlled_access === FileAccessType.REGISTERED
   );
 };
diff --git a/src/views/FileEntity/utils/getImagingItems.tsx b/src/views/FileEntity/utils/getImagingItems.tsx
@@ -25,13 +25,13 @@ const getImagingItems = (
     value: imagingData?.modality || TABLE_EMPTY_PLACE_HOLDER,
   },
   {
-    label: intl.get('entities.file.imaging.sequence_types'),
+    label: intl.get('entities.file.imaging.sequence_type'),
     value: imagingData?.imaging_sequence_type
       ? joinUniqueCleanWords(imagingData?.imaging_sequence_type)
       : TABLE_EMPTY_PLACE_HOLDER,
   },
   {
-    label: intl.get('entities.file.imaging.techniques'),
+    label: intl.get('entities.file.imaging.technique'),
     value: imagingData?.imaging_technique
       ? joinUniqueCleanWords(imagingData?.imaging_technique)
       : TABLE_EMPTY_PLACE_HOLDER,