cleanup commands

front/js/svelte/layout/Folder.svelte

@@ -6,7 +6,7 @@
     const channel = getContext("channel");
     export let folder;
     export let schema;
-    export let expanded = folder.shoudlExpand;
+    export let expanded = folder.shouldExpand;
 
     function toggleExpand() {
         expanded = !expanded;

front/js/svelte/layout/Navbar.svelte

@@ -7,7 +7,7 @@
     const readableSchemas = getContext("readableSchemas");
 
     function addToFolder(tree, folderPath, aSchema) {
-        let shoudlExpand = aSchema.name === schema?.name;
+        let shouldExpand = aSchema.name === schema?.name;
         if (folderPath === "") {
             tree.files.push(aSchema)
             return tree
@@ -16,12 +16,15 @@
         folderNames.forEach(folderName => {
             let queriedFolder = tree.folders.find(folder => folder.name === folderName)
             if (!queriedFolder) {
-                queriedFolder = {name: folderName, files: [], folders: [], shoudlExpand: shoudlExpand};
+                queriedFolder = {name: folderName, files: [], folders: [], shouldExpand: shouldExpand};
             }
             folderNames.shift()
             let remainingFolderPath = folderNames.join(".");
             queriedFolder =  addToFolder(queriedFolder, remainingFolderPath, aSchema)
+
+            tree.folders = tree.folders.filter(f => f.name !== queriedFolder.name)
             tree.folders.push(queriedFolder);
+
         })
 
         return tree;
@@ -30,7 +33,9 @@
     const schemaTree = readableSchemas.reduce((carry, schema) => {
         carry = addToFolder(carry, schema.folder,schema)
         return carry;
-    }, {name: "", files: [], folders: [], shoudlExpand:true});
+    }, {name: "", files: [], folders: [], shouldExpand:true});
+
+    console.log({schemaTree})
 </script>
 <div class="sidebar-top">
     <a class="logo" href="{channel.lucentUrl}">{channel.name}</a>

front/js/svelte/records/previews/PreviewFile.svelte

@@ -48,7 +48,7 @@
 
 </script>
 
-<div class="preview-file" class:is-trashed={edge._isTrashed}>
+<div class="preview-file" class:is-trashed={edge?._isTrashed}>
     <div style="display: flex;align-items: center;gap: 10px;">
         <div class="image">
             <Preview {record} size="small"/>
@@ -60,8 +60,8 @@
                         href="{channel.lucentUrl}/records/{record.id}"
                 >
                     {cardTitle}
-                    {#if edge._isTrashed}
-                        <span class="trashed-text">Trashed</span>
+                    {#if edge?._isTrashed}
+                        <span class="trashed-text">will remove on save</span>
                     {/if}
                 </a>
                 <small class="d-block">
@@ -92,7 +92,7 @@
         {/if}
         {#if hasDelete}
             <div class="reference-action">
-                {#if edge._isTrashed}
+                {#if edge?._isTrashed}
                     <button
                             title="Restore"
                             class="button"

front/js/svelte/records/previews/PreviewReference.svelte

@@ -35,7 +35,7 @@
 </script>
 
 
-<div class="preview-reference" class:is-trashed={edge._isTrashed}>
+<div class="preview-reference" class:is-trashed={edge?._isTrashed}>
     <div style="display: flex;align-items: center;gap: 10px;">
 
         {#if cardImageRecord}
@@ -51,8 +51,8 @@
                 >
 
                     {cardTitle}
-                    {#if edge._isTrashed}
-                        <span class="trashed-text">Trashed</span>
+                    {#if edge?._isTrashed}
+                        <span class="trashed-text">will remove on save</span>
                     {/if}
 
                 </a>
@@ -69,7 +69,7 @@
     </div>
     {#if hasDelete}
         <div class="reference-action">
-            {#if edge._isTrashed}
+            {#if edge?._isTrashed}
                 <button
                         title="Restore"
                         class="button"

front/sass/_preview.scss

@@ -31,7 +31,9 @@
   &:hover{
     background: var(--p30);
     .reference-action{
-      display: block;
+      display: flex;
+      align-items: center;
+      gap: 3px;
     }
   }
 }