Fix paths with leading slash

rilldata · Apr 17, 2024 · 1a6d5a0 · 1a6d5a0
1 parent 0272eb2
commit 1a6d5a0
Showing 1 changed file with 21 additions and 14 deletions.
diff --git a/web-common/src/features/entity-management/file-selectors.ts b/web-common/src/features/entity-management/file-selectors.ts
@@ -151,16 +151,19 @@ export function useFileNamesInDirectory(
   instanceId: string,
   directoryPath: string,
 ) {
-  if (directoryPath === "") directoryPath = "/";
+  directoryPath += "/";
   return createRuntimeServiceListFiles(instanceId, undefined, {
     query: {
       select: (data) => {
         const files = data.files?.filter(
           (file) => !file.isDir && file.path?.startsWith(directoryPath),
         );
-        const fileNames = files?.map((file) => {
-          return file.path?.replace(directoryPath, "") ?? "";
-        });
+        const fileNames = files
+          .map((file) => {
+            return file.path?.replace(directoryPath, "") ?? "";
+          })
+          // filter out files in subdirectories
+          .filter((filePath) => !filePath.includes("/"));
         const sortedFileNames = fileNames?.sort((fileNameA, fileNameB) =>
           fileNameA.localeCompare(fileNameB, undefined, {
             sensitivity: "base",
@@ -176,19 +179,23 @@ export function useDirectoryNamesInDirectory(
   instanceId: string,
   directoryPath: string,
 ) {
-  if (directoryPath === "") directoryPath = "/";
+  directoryPath += "/";
   return createRuntimeServiceListFiles(instanceId, undefined, {
     query: {
       select: (data) => {
-        const files = data.files?.filter(
-          (file) =>
-            file.isDir &&
-            file.path?.startsWith(directoryPath) &&
-            file.path !== directoryPath,
-        );
-        const directoryNames = files?.map((file) => {
-          return file.path?.replace(directoryPath, "") ?? "";
-        });
+        const files =
+          data.files?.filter(
+            (file) =>
+              file.isDir &&
+              file.path?.startsWith(directoryPath) &&
+              file.path !== directoryPath,
+          ) ?? [];
+        const directoryNames = files
+          ?.map((file) => {
+            return file.path?.replace(directoryPath, "") ?? "";
+          })
+          // filter out dirs in subdirectories
+          .filter((filePath) => !filePath.includes("/"));
         const sortedDirectoryNames = directoryNames?.sort(
           (dirNameA, dirNameB) =>
             dirNameA.localeCompare(dirNameB, undefined, {