Merge pull request #546 from fairDataSociety/fix/search

fix: search
fairDataSociety · Oct 16, 2023 · 8a0c2ad · 8a0c2ad
2 parents d31efe8 + fe376b2
commit 8a0c2ad
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 20 deletions.
diff --git a/src/api/pod.ts b/src/api/pod.ts
@@ -29,6 +29,10 @@ export function getFdpPathByDirectory(directory: string): string {
     return '/';
   }
 
+  if (directory.startsWith('/')) {
+    return directory;
+  }
+
   return '/' + directory;
 }
 

diff --git a/src/components/Modals/PreviewFileModal/PreviewFileModal.tsx b/src/components/Modals/PreviewFileModal/PreviewFileModal.tsx
@@ -34,7 +34,7 @@ import FilePreview, {
   isFilePreviewSupported,
 } from '@components/FilePreview/FilePreview';
 import { FileItem } from '@fairdatasociety/fdp-storage';
-import { extractFileExtension } from '@utils/filename';
+import { extractFileExtension, rootPathToRelative } from '@utils/filename';
 import { useLocales } from '@context/LocalesContext';
 
 interface PreviewModalProps {
@@ -62,6 +62,8 @@ const PreviewFileModal: FC<PreviewModalProps> = ({
   const [showConfirmDeleteModal, setShowConfirmDeleteModal] = useState(false);
   const { intl } = useLocales();
 
+  const directory = rootPathToRelative(previewFile.path || directoryName);
+
   useEffect(() => {
     if (!isFilePreviewSupported(previewFile?.name)) {
       return;
@@ -70,7 +72,7 @@ const PreviewFileModal: FC<PreviewModalProps> = ({
     setLoading(true);
     downloadFile(fdpClientRef.current, {
       filename: previewFile?.name,
-      directory: previewFile.path || directoryName,
+      directory,
       podName: activePod,
     })
       .then(async (response) => {
@@ -92,7 +94,7 @@ const PreviewFileModal: FC<PreviewModalProps> = ({
 
     downloadFile(fdpClientRef.current, {
       filename: previewFile?.name,
-      directory: directoryName,
+      directory,
       podName: activePod,
     })
       .then((response) => {
@@ -119,7 +121,7 @@ const PreviewFileModal: FC<PreviewModalProps> = ({
     deleteFile(fdpClientRef.current, {
       file_name: previewFile?.name,
       podName: activePod,
-      path: formatDirectory(directoryName),
+      path: formatDirectory(directory),
     })
       .then(() => {
         trackEvent({
@@ -158,7 +160,7 @@ const PreviewFileModal: FC<PreviewModalProps> = ({
             file={previewFile}
             source={fileContent}
             pod={activePod}
-            directory={directoryName}
+            directory={directory}
             onError={() => setErrorMessage(intl.get('FILE_PREVIEW_ERROR'))}
           />
         ) : null}
@@ -254,7 +256,7 @@ const PreviewFileModal: FC<PreviewModalProps> = ({
         closeModal={() => setShowShareFileModal(false)}
         fileName={previewFile?.name}
         podName={activePod}
-        path={formatDirectory(directoryName)}
+        path={formatDirectory(directory)}
       />
 
       <ConfirmDeleteModal

diff --git a/src/components/Views/DriveGridView/DriveGridView.tsx b/src/components/Views/DriveGridView/DriveGridView.tsx
@@ -21,7 +21,7 @@ const DriveGridView: FC<DriveGridViewProps> = ({
     <div className="flex flex-wrap h-full">
       {directories?.map((directory) => (
         <DriveCard
-          key={directory.name}
+          key={directory.path || directory.name}
           type="folder"
           data={{
             name: directory.name,
@@ -35,7 +35,7 @@ const DriveGridView: FC<DriveGridViewProps> = ({
 
       {files?.map((data) => (
         <DriveCard
-          key={data.name}
+          key={data.path || data.name}
           type="file"
           data={{
             name: data.name,

diff --git a/src/components/Views/DriveListView/DriveListView.tsx b/src/components/Views/DriveListView/DriveListView.tsx
@@ -61,7 +61,7 @@ const DriveListView: FC<DriveListViewProps> = ({
         <tbody>
           {pageDirectories.map((directory) => (
             <DriveTableItem
-              key={directory.name}
+              key={directory.path || directory.name}
               type="folder"
               data={{
                 name: directory.name,
@@ -75,7 +75,7 @@ const DriveListView: FC<DriveListViewProps> = ({
 
           {pageFiles.map((data) => (
             <DriveTableItem
-              key={data.name}
+              key={data.path || data.name}
               type="file"
               data={{
                 name: data.name,

diff --git a/src/pages/drive/index.tsx b/src/pages/drive/index.tsx
@@ -282,22 +282,24 @@ const Drive: FC = () => {
         }
 
         if (Array.isArray(content?.files)) {
-          matchedFiles = matchedFiles
-            .concat(content.files.filter(({ name }) => name.includes(search)))
-            .map((file) => {
-              file.path = path;
-              return file;
-            });
+          matchedFiles = matchedFiles.concat(
+            content.files
+              .filter(({ name }) => name.includes(search))
+              .map((file) => ({
+                ...file,
+                path,
+              }))
+          );
         }
 
         if (Array.isArray(content?.directories)) {
           matchedDirectories = matchedDirectories.concat(
             content.directories
               .filter(({ name }) => name.includes(search))
-              .map((directory) => {
-                directory.path = path;
-                return directory;
-              })
+              .map((directory) => ({
+                ...directory,
+                path,
+              }))
           );
 
           if (depth < maxDepth) {