Reset expore state when metrics view is changed

rilldata · Dec 10, 2024 · d88e4ba · d88e4ba
1 parent 30b0075
commit d88e4ba
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/web-common/src/features/entity-management/file-artifact.ts b/web-common/src/features/entity-management/file-artifact.ts
@@ -74,6 +74,7 @@ export class FileArtifact {
   readonly fileName: string;
   readonly disableAutoSave: boolean;
   readonly autoSave: Writable<boolean>;
+  lastSeenResource: V1Resource;
 
   private remoteCallbacks = new Set<(content: string, force?: true) => void>();
   private localCallbacks = new Set<(content: string | null) => void>();
@@ -231,6 +232,7 @@ export class FileArtifact {
       resource.meta?.reconcileStatus ===
         V1ReconcileStatus.RECONCILE_STATUS_RUNNING,
     );
+    this.lastSeenResource = resource;
   }
 
   hardDeleteResource() {

diff --git a/web-common/src/features/entity-management/file-artifacts.ts b/web-common/src/features/entity-management/file-artifacts.ts
@@ -118,6 +118,13 @@ export class FileArtifacts {
       .map((artifact) => get(artifact.resourceName)?.name ?? "");
   }
 
+  getResourcesForKind(kind: ResourceKind): V1Resource[] {
+    return Array.from(this.artifacts.values())
+      .filter((artifact) => get(artifact.resourceName)?.kind === kind)
+      .map((artifact) => artifact.lastSeenResource)
+      .filter(Boolean);
+  }
+
   async saveAll() {
     await Promise.all(
       Array.from(this.artifacts.values()).map((artifact) =>

diff --git a/web-common/src/features/metrics-views/editor/MetricsEditor.svelte b/web-common/src/features/metrics-views/editor/MetricsEditor.svelte
@@ -8,6 +8,8 @@
   import { clearExploreSessionStore } from "@rilldata/web-common/features/dashboards/url-state/explore-web-view-store";
   import Editor from "@rilldata/web-common/features/editor/Editor.svelte";
   import { FileArtifact } from "@rilldata/web-common/features/entity-management/file-artifact";
+  import { fileArtifacts } from "@rilldata/web-common/features/entity-management/file-artifacts";
+  import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
   import { yamlSchema } from "codemirror-json-schema/yaml";
   import type { JSONSchema7 } from "json-schema";
   import MetricsEditorContainer from "./MetricsEditorContainer.svelte";
@@ -47,6 +49,22 @@
       createPersistentDashboardStore(metricsViewName).reset();
       clearExploreSessionStore(metricsViewName, undefined);
 
+      // Reset local persisted explore state derived from this metrics view
+      fileArtifacts
+        .getResourcesForKind(ResourceKind.Explore)
+        .forEach((exploreResource) => {
+          const exploreName = exploreResource?.meta?.name?.name;
+          if (
+            !exploreName ||
+            !exploreResource?.explore?.state?.validSpec?.metricsView ||
+            exploreResource?.explore?.state?.validSpec?.metricsView !==
+              metricsViewName
+          )
+            return;
+          createPersistentDashboardStore(exploreName).reset();
+          clearExploreSessionStore(exploreName, undefined);
+        });
+
       if (!content?.length) {
         setLineStatuses([], editor);
       }