fix: issues with bookmarks selection and deletion (#5921)

rilldata · Oct 16, 2024 · d553424 · d553424 · github-actions · Oct 16, 2024
1 parent 8c2bdbf
commit d553424
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/web-admin/src/features/bookmarks/Bookmarks.svelte b/web-admin/src/features/bookmarks/Bookmarks.svelte
@@ -29,7 +29,11 @@
  let showDialog = false;
  let bookmark: BookmarkEntry | null = null;
 
- $: bookmarkApplier = createBookmarkApplier($runtime?.instanceId, exploreName);
+ $: bookmarkApplier = createBookmarkApplier(
+ $runtime?.instanceId,
+ metricsViewName,
+ exploreName,
+ );
 
  $: exploreStore = useExploreStore(exploreName);
  $: projectId = useProjectId($page.params.organization, $page.params.project);
@@ -71,8 +75,8 @@
  return queryClient.refetchQueries(
  getAdminServiceListBookmarksQueryKey({
  projectId: $projectId.data ?? "",
- resourceKind: ResourceKind.MetricsView,
- resourceName: metricsViewName,
+ resourceKind: ResourceKind.Explore,
+ resourceName: exploreName,
  }),
  );
  }

diff --git a/web-admin/src/features/bookmarks/applyBookmark.ts b/web-admin/src/features/bookmarks/applyBookmark.ts
@@ -4,11 +4,15 @@ import { useExploreValidSpec } from "@rilldata/web-common/features/explores/sele
 import { createQueryServiceMetricsViewSchema } from "@rilldata/web-common/runtime-client";
 import { get } from "svelte/store";
 
-export function createBookmarkApplier(instanceId: string, exploreName: string) {
+export function createBookmarkApplier(
+ instanceId: string,
+ metricsViewName: string,
+ exploreName: string,
+) {
  const validExploreSpec = useExploreValidSpec(instanceId, exploreName);
  const metricsSchema = createQueryServiceMetricsViewSchema(
  instanceId,
- exploreName,
+ metricsViewName,
  );
 
  return (bookmark: V1Bookmark) => {