Update file artifact references

rilldata · Dec 20, 2024 · eb5bcb9 · eb5bcb9
1 parent 40d5875
commit eb5bcb9
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 61 deletions.
diff --git a/web-common/src/features/canvas/Canvas.svelte b/web-common/src/features/canvas/Canvas.svelte
@@ -24,8 +24,8 @@
   $: ({
     saveLocalContent: updateComponentFile,
     autoSave,
-    updateLocalContent,
-    localContent,
+    updateEditorContent,
+    editorContent,
     remoteContent,
   } = fileArtifact);
 
@@ -43,12 +43,14 @@
   }
 
   async function deleteComponent(index: number) {
-    const parsedDocument = parseDocument($localContent ?? $remoteContent ?? "");
+    const parsedDocument = parseDocument(
+      $editorContent ?? $remoteContent ?? "",
+    );
 
     const items = parsedDocument.get("items") as any;
     if (!items) return;
     items.delete(index);
-    updateLocalContent(parsedDocument.toString(), true);
+    updateEditorContent(parsedDocument.toString(), true);
     if ($autoSave) await updateComponentFile();
   }
 
@@ -59,7 +61,9 @@
       dimensions: Vector;
     }>,
   ) {
-    const parsedDocument = parseDocument($localContent ?? $remoteContent ?? "");
+    const parsedDocument = parseDocument(
+      $editorContent ?? $remoteContent ?? "",
+    );
     const items = parsedDocument.get("items") as any;
 
     const node = items.get(e.detail.index);
@@ -69,7 +73,7 @@
     node.set("x", e.detail.position[0]);
     node.set("y", e.detail.position[1]);
 
-    updateLocalContent(parsedDocument.toString(), true);
+    updateEditorContent(parsedDocument.toString(), true);
 
     if ($autoSave) await updateComponentFile();
   }

diff --git a/web-common/src/features/canvas/components/AddComponentMenu.svelte b/web-common/src/features/canvas/components/AddComponentMenu.svelte
@@ -1,33 +1,14 @@
 <script lang="ts">
+  import Button from "@rilldata/web-common/components/button/Button.svelte";
   import * as DropdownMenu from "@rilldata/web-common/components/dropdown-menu";
-  import Search from "@rilldata/web-common/components/search/Search.svelte";
-  import {
-    ResourceKind,
-    useClientFilteredResources,
-  } from "@rilldata/web-common/features/entity-management/resource-selectors";
+  import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
   import { ChevronDown, Plus } from "lucide-svelte";
-  import { runtime } from "../../../runtime-client/runtime-store";
   import { getNameFromFile } from "../../entity-management/entity-mappers";
-  // import { featureFlags } from "../feature-flags";
-  import Button from "@rilldata/web-common/components/button/Button.svelte";
   import { createResourceFile } from "../../file-explorer/new-files";
 
-  // const { ai } = featureFlags;
-
   export let addComponent: (componentName: string) => void;
 
   let open = false;
-  let value = "";
-
-  // We want to get only valid components here. Hence using ListResources API
-  $: componentsQuery = useClientFilteredResources(
-    $runtime.instanceId,
-    ResourceKind.Component,
-  );
-  $: componentFileNames =
-    $componentsQuery.data
-      ?.filter((c) => !c.component?.spec?.definedInCanvas)
-      .map((c) => c.meta?.name?.name ?? "") ?? [];
 
   async function handleAddComponent() {
     const newFilePath = await createResourceFile(ResourceKind.Component);
@@ -54,33 +35,9 @@
   </DropdownMenu.Trigger>
   <DropdownMenu.Content class="flex flex-col gap-y-1 ">
     <DropdownMenu.Group>
-      <!-- <DropdownMenu.Item disabled>
-        Generate chart
-        {#if $ai}
-          with AI
-          <WandIcon class="w-3 h-3" />
-        {/if}
-      </DropdownMenu.Item> -->
       <DropdownMenu.Item on:click={handleAddComponent}>
         Create new component
       </DropdownMenu.Item>
     </DropdownMenu.Group>
-
-    <DropdownMenu.Separator />
-    <div class="px-1">
-      <Search bind:value />
-    </div>
-    <DropdownMenu.Separator />
-
-    <DropdownMenu.Label class="text-[11px] text-gray-500 py-0">
-      EXISTING COMPONENTS
-    </DropdownMenu.Label>
-    <DropdownMenu.Group>
-      {#each componentFileNames.filter( (n) => n.startsWith(value), ) as componentName (componentName)}
-        <DropdownMenu.Item on:click={() => addComponent(componentName)}>
-          {componentName}
-        </DropdownMenu.Item>
-      {/each}
-    </DropdownMenu.Group>
   </DropdownMenu.Content>
 </DropdownMenu.Root>
diff --git a/web-common/src/features/canvas/inspector/VisualCanvasEditing.svelte b/web-common/src/features/canvas/inspector/VisualCanvasEditing.svelte
@@ -11,9 +11,9 @@
 
   const { validSpecStore, canvasStore } = getCanvasStateManagers();
 
-  $: ({ localContent, remoteContent, saveContent, path } = fileArtifact);
+  $: ({ editorContent, remoteContent, saveContent, path } = fileArtifact);
 
-  $: parsedDocument = parseDocument($localContent ?? $remoteContent ?? "");
+  $: parsedDocument = parseDocument($editorContent ?? $remoteContent ?? "");
   $: selectedComponentIndex = $canvasStore.selectedComponentIndex;
 
   $: selectedComponentName =

diff --git a/web-common/src/features/canvas/inspector/selectors.ts b/web-common/src/features/canvas/inspector/selectors.ts
@@ -27,9 +27,9 @@ export const useAllSimpleMeasureFromMetric = (
   );
 
 export function getParsedDocument(fileArtifact: FileArtifact) {
-  const { localContent, remoteContent } = fileArtifact;
+  const { editorContent, remoteContent } = fileArtifact;
   return derived(
-    [localContent, remoteContent],
+    [editorContent, remoteContent],
     ([$localContent, $remoteContent]) => {
       return parseDocument($localContent ?? $remoteContent ?? "");
     },

diff --git a/web-common/src/features/workspaces/CanvasWorkspace.svelte b/web-common/src/features/workspaces/CanvasWorkspace.svelte
@@ -26,7 +26,6 @@
   import WorkspaceEditorContainer from "@rilldata/web-common/layout/workspace/WorkspaceEditorContainer.svelte";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-  import { setContext } from "svelte";
   import { parseDocument } from "yaml";
   import PreviewButton from "../explores/PreviewButton.svelte";
 
@@ -40,8 +39,8 @@
     autoSave,
     path: filePath,
     fileName,
-    updateLocalContent,
-    localContent,
+    updateEditorContent,
+    editorContent,
     getResource,
     getAllErrors,
     remoteContent,
@@ -64,7 +63,6 @@
   $: canvasResource = data?.canvas;
 
   $: canvasName = getNameFromFile(filePath);
-  $: setContext("rill::canvas:name", canvasName);
 
   $: ({ instanceId } = $runtime);
 
@@ -93,7 +91,9 @@
       x: 0,
       y: 0,
     };
-    const parsedDocument = parseDocument($localContent ?? $remoteContent ?? "");
+    const parsedDocument = parseDocument(
+      $editorContent ?? $remoteContent ?? "",
+    );
 
     const items = parsedDocument.get("items") as any;
 
@@ -103,7 +103,7 @@
       items.add(newComponent);
     }
 
-    updateLocalContent(parsedDocument.toString(), true);
+    updateEditorContent(parsedDocument.toString(), true);
 
     if ($autoSave) await updateComponentFile();
   }