Remove cyclical structure from Entry types

DDMAL · Jun 28, 2023 · 0e34f67 · 0e34f67
1 parent fec9a9d
commit 0e34f67
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 10 deletions.
diff --git a/src/Dashboard/FileSystem/FileSystemManager.ts b/src/Dashboard/FileSystem/FileSystemManager.ts
@@ -2,11 +2,21 @@ import { IFolder, IEntry, fs_functions } from '.';
 import { fetchUploadedDocuments } from '../Storage';
 import { samples_names } from '../samples';
 
-const FileSystemManager = () => {
+// Manager is used for accessing local storage and tracking the position of current folder
+const FileSystemManager = async () => {
+
+    const root = await getFileSystem();
+    let currentFolder: IFolder = root;
+
+    const getRoot = (): IFolder => root;
+
     // Save filesystem into local storage
     function setFileSystem(fs: IFolder): boolean {
         try {
+            console.log(1);
+            console.log(fs);
             const save_fs = fs_functions.createRoot(fs.name, fs.content);
+            console.log(2);
             window.localStorage.setItem('neon-fs', JSON.stringify(save_fs));
         } catch (e) {
             console.error(e);
@@ -78,12 +88,20 @@ const FileSystemManager = () => {
         return root;
     }
 
-    const root = getFileSystem();
+    function setCurrentFolder(folder: IFolder) {
+        currentFolder = folder;
+    }
+
+    function getCurrentFolder(): IFolder {
+        return currentFolder;
+    }
 
     const FileSystemProps = {
-        root: root,
+        getRoot: getRoot,
         setFileSystem: setFileSystem,
         getFileSystem: getFileSystem,
+        setCurrentFolder: setCurrentFolder,
+        getCurrentFolder: getCurrentFolder
     }
 
     return FileSystemProps;

diff --git a/src/Dashboard/FileSystem/file_mapper.ts b/src/Dashboard/FileSystem/file_mapper.ts
diff --git a/src/Dashboard/FileSystem/file_searcher.ts b/src/Dashboard/FileSystem/file_searcher.ts
diff --git a/src/Dashboard/FileSystem/file_loader.ts → src/Dashboard/FileSystem/fs_functions.ts b/src/Dashboard/FileSystem/file_loader.ts → src/Dashboard/FileSystem/fs_functions.ts
@@ -1,11 +1,15 @@
 import { EntryType, IEntry, IFolder, IFile } from '.';
 
+/*
+*   File System Functions that are used to create, move, and delete file system entries
+*   Does not depend on state 
+*/
+
 const createEntry = (name: string, type: EntryType, content: IEntry[] | string): IEntry => {
     return {
         name,
         type,
         content,
-        parent: null,
     };
 }
 
@@ -39,8 +43,6 @@ const moveEntry = (entry: IEntry, parent: IFolder, newParent: IFolder): boolean
 
 const AddEntry = (entry: IEntry, parent: IFolder): boolean => {
     try {
-        const AssignedEntry = { ...entry, parent: parent };
-
         // Check for duplicate name
         const isDuplicate = parent.content.some((e) => e.name === entry.name);
         if (isDuplicate) {
@@ -49,7 +51,7 @@ const AddEntry = (entry: IEntry, parent: IFolder): boolean => {
         }
 
         // Add entry to parent
-        parent.content.push(AssignedEntry);
+        parent.content.push(entry);
         parent.content.sort((a, b) => a.type.localeCompare(b.type));
         parent.content.sort((a, b) => a.name.localeCompare(b.name));
     } catch (e) {
@@ -79,8 +81,6 @@ const RemoveEntry = (entry: IEntry, parent: IFolder): boolean => {
     return true;
 }
 
-
-
 export const fs_functions = {
     createRoot: createRoot,
     createFolder: createFolder,

diff --git a/src/Dashboard/FileSystem/interface.ts → src/Dashboard/FileSystem/fs_interface.ts b/src/Dashboard/FileSystem/interface.ts → src/Dashboard/FileSystem/fs_interface.ts
@@ -7,7 +7,6 @@ export interface IEntry {
     name: string;
     type: EntryType;
     content: IEntry[] | string;
-    parent: IEntry;
 }
 
 export interface IFolder extends IEntry {

diff --git a/src/Dashboard/FileSystem/fs_searcher.ts b/src/Dashboard/FileSystem/fs_searcher.ts
@@ -0,0 +1,19 @@
+import { IFile, IFolder, IEntry, EntryType } from '.';
+
+// function getAbsolutePath(entry: IEntry, root?: IFolder): string[] {
+//     const path = [entry.name];
+//     let parent = entry.parent;
+
+//     while (parent) {
+//         path.unshift(parent.name);
+//         parent = parent.parent;
+//     }
+//     return path;
+// }
+
+// function findEntry(name: string, root: IFolder): IEntry {
+//     return
+// }
+
+export const fs_searcher = {
+}