chore: refactor instanceid handling

web-admin/src/client/gen/default/default.ts

@@ -278,7 +278,7 @@ import type {
   V1UpdateUserPreferencesResponse,
 } from "../index.schemas";
 
-import { httpClient } from "../../http-client";
+import httpClient from "../../http-client";
 
 type AwaitedInput<T> = PromiseLike<T> | T;
 

web-admin/src/features/alerts/CreateAlert.svelte

@@ -10,10 +10,10 @@
   import AlertForm from "@rilldata/web-common/features/alerts/AlertForm.svelte";
   import { useMetricsViewValidSpec } from "@rilldata/web-common/features/dashboards/selectors";
   import { getStateManagers } from "@rilldata/web-common/features/dashboards/state-managers/state-managers";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
   import { BellPlusIcon } from "lucide-svelte";
 
   const {
+    instanceId,
     selectors: {
       timeRangeSelectors: { isCustomTimeRange },
     },
@@ -22,8 +22,6 @@
     dashboardStore,
   } = getStateManagers();
 
-  $: ({ instanceId } = $runtime);
-
   $: metricsView = useMetricsViewValidSpec(instanceId, $metricsViewName);
   $: hasTimeDimension = !!$metricsView?.data?.timeDimension;
 

web-admin/src/features/alerts/history/AlertHistoryTable.svelte

@@ -4,13 +4,13 @@
   import { useAlert } from "@rilldata/web-admin/features/alerts/selectors";
   import ResourceList from "@rilldata/web-admin/features/resources/ResourceList.svelte";
   import type { V1AlertExecution } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import httpClient from "@rilldata/web-common/runtime-client/http-client";
   import type { ColumnDef } from "@tanstack/svelte-table";
   import { flexRender } from "@tanstack/svelte-table";
 
   export let alert: string;
 
-  $: ({ instanceId } = $runtime);
+  const instanceId = httpClient.getInstanceId();
 
   $: alertQuery = useAlert(instanceId, alert);
 

web-admin/src/features/alerts/metadata/AlertFilters.svelte

@@ -13,10 +13,12 @@
     V1Expression,
     V1TimeRange,
   } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import httpClient from "@rilldata/web-common/runtime-client/http-client";
   import { flip } from "svelte/animate";
   import { fly } from "svelte/transition";
 
+  const instanceId = httpClient.getInstanceId();
+
   export let metricsViewName: string;
   export let filters: V1Expression | undefined;
   export let dimensionsWithInlistFilter: string[];
@@ -36,7 +38,6 @@
     whereFilter = dimensionFilters;
     havingFilter = dimensionThresholdFilters;
   }
-  $: ({ instanceId } = $runtime);
 
   $: metricsView = useMetricsView(instanceId, metricsViewName);
   $: dimensionIdMap = getMapFromArray(

web-admin/src/features/alerts/metadata/AlertMetadata.svelte

@@ -31,14 +31,14 @@
     getRuntimeServiceListResourcesQueryKey,
     type V1MetricsViewAggregationRequest,
   } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import httpClient from "@rilldata/web-common/runtime-client/http-client";
   import { useQueryClient } from "@tanstack/svelte-query";
 
   export let organization: string;
   export let project: string;
   export let alert: string;
 
-  $: ({ instanceId } = $runtime);
+  const instanceId = httpClient.getInstanceId();
 
   $: alertQuery = useAlert(instanceId, alert);
   $: isAlertCreatedByCode = useIsAlertCreatedByCode(instanceId, alert);

web-admin/src/features/bookmarks/BookmarksFormDialog.svelte

@@ -36,7 +36,7 @@
   import { createForm } from "svelte-forms-lib";
   import * as yup from "yup";
   import type { Interval } from "luxon";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import httpClient from "@rilldata/web-common/runtime-client/http-client";
   import { getCanvasStore } from "@rilldata/web-common/features/canvas/state-managers/state-managers";
   import CanvasFilterChipsReadOnly from "@rilldata/web-common/features/dashboards/filters/CanvasFilterChipsReadOnly.svelte";
 
@@ -53,7 +53,7 @@
   let filterState: undefined | Awaited<ReturnType<typeof processUrl>> =
     undefined;
 
-  $: ({ instanceId } = $runtime);
+  const instanceId = httpClient.getInstanceId();
 
   $: ({ name: resourceName, kind: resourceKind } = resource);
 

web-admin/src/features/bookmarks/CanvasBookmarks.svelte

@@ -3,14 +3,14 @@
   import { getCanvasCategorisedBookmarks } from "@rilldata/web-admin/features/bookmarks/selectors.ts";
   import { useCanvas } from "@rilldata/web-common/features/canvas/selector";
   import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors.ts";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store.ts";
+  import httpClient from "@rilldata/web-common/runtime-client/http-client";
   import { writable } from "svelte/store";
 
   export let organization: string;
   export let project: string;
   export let canvasName: string;
 
-  $: ({ instanceId } = $runtime);
+  const instanceId = httpClient.getInstanceId();
 
   const orgAndProjectNameStore = writable({ organization, project });
   $: orgAndProjectNameStore.set({ organization, project });

web-admin/src/features/dashboards/listing/DashboardsTable.svelte

@@ -8,7 +8,7 @@
   import { resourceColorMapping } from "@rilldata/web-common/features/entity-management/resource-icon-mapping";
   import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
   import type { V1Resource } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import httpClient from "@rilldata/web-common/runtime-client/http-client";
   import { flexRender } from "@tanstack/svelte-table";
   import DashboardsTableCompositeCell from "./DashboardsTableCompositeCell.svelte";
   import { useDashboards } from "./selectors";
@@ -19,7 +19,7 @@
 
   const exploreColor = resourceColorMapping[ResourceKind.Explore];
 
-  $: ({ instanceId } = $runtime);
+  const instanceId = httpClient.getInstanceId();
   $: ({
     params: { organization, project },
   } = $page);

web-admin/src/features/dashboards/listing/LastRefreshedDate.svelte

@@ -2,12 +2,12 @@
   import Tooltip from "@rilldata/web-common/components/tooltip/Tooltip.svelte";
   import TooltipContent from "@rilldata/web-common/components/tooltip/TooltipContent.svelte";
   import { createRuntimeServiceGetExplore } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import httpClient from "@rilldata/web-common/runtime-client/http-client";
   import { timeAgo } from "./utils";
 
   export let dashboard: string;
 
-  $: ({ instanceId } = $runtime);
+  const instanceId = httpClient.getInstanceId();
 
   $: lastRefreshedQuery = createRuntimeServiceGetExplore(
     instanceId,

web-admin/src/features/dashboards/listing/selectors.ts

@@ -42,6 +42,7 @@ export function useDashboards(
       select: (data) => {
         return data.resources.filter((res) => res.canvas || res.explore);
       },
+      enabled: !!instanceId,
       refetchInterval: createSmartRefetchInterval,
     },
   });

web-admin/src/features/navigation/TopNavigationBar.svelte

@@ -12,7 +12,7 @@
   import StateManagersProvider from "@rilldata/web-common/features/dashboards/state-managers/StateManagersProvider.svelte";
   import { useExplore } from "@rilldata/web-common/features/explores/selectors";
   import { featureFlags } from "@rilldata/web-common/features/feature-flags";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import httpClient from "@rilldata/web-common/runtime-client/http-client";
   import {
     createAdminServiceGetCurrentUser,
     createAdminServiceListOrganizations as listOrgs,
@@ -49,7 +49,7 @@
   const user = createAdminServiceGetCurrentUser();
   const { alerts: alertsFlag, dimensionSearch, dashboardChat } = featureFlags;
 
-  $: ({ instanceId } = $runtime);
+  const instanceId = httpClient.getInstanceId();
 
   // These can be undefined
   $: ({

web-admin/src/features/organizations/selectors.ts

@@ -12,7 +12,9 @@ import type { FetchQueryOptions } from "@tanstack/query-core";
 export function areAllProjectsHibernating(organization: string) {
   return createAdminServiceListProjectsForOrganization(
     organization,
-    undefined,
+    {
+      pageSize: 100,
+    },
     {
       query: {
         enabled: !!organization,
@@ -26,8 +28,14 @@ export function areAllProjectsHibernating(organization: string) {
 
 export async function fetchAllProjectsHibernating(organization: string) {
   const projectsResp = await queryClient.fetchQuery({
-    queryKey: getAdminServiceListProjectsForOrganizationQueryKey(organization),
-    queryFn: () => adminServiceListProjectsForOrganization(organization),
+    queryKey: getAdminServiceListProjectsForOrganizationQueryKey(organization, {
+      pageSize: 100,
+    }),
+    queryFn: () =>
+      adminServiceListProjectsForOrganization(organization, {
+        pageSize: 100,
+      }),
+
     staleTime: Infinity,
   });
   return projectsResp.projects?.every((p) => !p.primaryDeploymentId) ?? false;

web-admin/src/features/projects/download-report.ts

@@ -4,13 +4,13 @@ import {
   createQueryServiceExportReport,
   type RpcStatus,
 } from "@rilldata/web-common/runtime-client";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import {
   createMutation,
   type CreateMutationOptions,
 } from "@tanstack/svelte-query";
 import type { MutationFunction } from "@tanstack/svelte-query";
 import { get } from "svelte/store";
+import httpClient from "@rilldata/web-common/runtime-client/http-client";
 
 export type DownloadReportRequest = {
   instanceId: string;
@@ -48,7 +48,7 @@ export function createDownloadReportMutation<
         originBaseUrl: data.originBaseUrl,
       },
     });
-    const downloadUrl = `${get(runtime).host}${exportResp.downloadUrlPath}`;
+    const downloadUrl = `${httpClient.getHost()}${exportResp.downloadUrlPath}`;
     window.open(downloadUrl, "_self");
   };
 

web-admin/src/features/projects/github/ProjectGithubConnection.svelte

@@ -8,12 +8,12 @@
     getRepoNameFromGitRemote,
     getGitUrlFromRemote,
   } from "@rilldata/web-common/features/project/deploy/github-utils";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import httpClient from "@rilldata/web-common/runtime-client/http-client";
 
   export let organization: string;
   export let project: string;
 
-  $: ({ instanceId } = $runtime);
+  const instanceId = httpClient.getInstanceId();
 
   $: proj = createAdminServiceGetProject(organization, project);
   $: ({

web-admin/src/features/projects/selectors.ts

@@ -20,7 +20,6 @@ import {
   useResourceV2,
 } from "@rilldata/web-common/features/entity-management/resource-selectors";
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
-import type { Runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import { derived, type Readable } from "svelte/store";
 
 export function getProjectPermissions(orgName: string, projName: string) {
@@ -134,18 +133,7 @@ export async function fetchProjectDeploymentDetails(
     queryFn,
   });
 
-  return {
-    projectPermissions: projResp.projectPermissions,
-    project: projResp.project,
-    runtime: <Runtime>{
-      host: projResp.prodDeployment?.runtimeHost,
-      instanceId: projResp.prodDeployment?.runtimeInstanceId,
-      jwt: {
-        token: projResp.jwt,
-        authContext: token ? "magic" : "user",
-      },
-    },
-  };
+  return projResp;
 }
 
 export function useGithubLastSynced(instanceId: string) {

web-admin/src/features/projects/status/ProjectGlobalStatusIndicator.svelte

@@ -5,16 +5,14 @@
   import LoadingSpinner from "@rilldata/web-common/components/icons/LoadingSpinner.svelte";
   import { useProjectParser } from "@rilldata/web-common/features/entity-management/resource-selectors";
   import { createRuntimeServiceListResources } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-  import { useQueryClient } from "@tanstack/svelte-query";
+  import httpClient from "@rilldata/web-common/runtime-client/http-client";
+  import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
   import { useProjectDeployment } from "./selectors";
 
-  const queryClient = useQueryClient();
-
   export let organization: string;
   export let project: string;
 
-  $: ({ instanceId } = $runtime);
+  const instanceId = httpClient.getInstanceId();
 
   $: projectDeployment = useProjectDeployment(organization, project);
   $: ({ data: deployment } = $projectDeployment);
@@ -34,6 +32,7 @@
         },
         refetchOnMount: true,
         refetchOnWindowFocus: true,
+        enabled: !!instanceId,
       },
     },
   );

web-admin/src/features/projects/status/ProjectParseErrors.svelte

@@ -6,9 +6,9 @@
   } from "@rilldata/web-common/features/entity-management/resource-selectors";
   import { EntityStatus } from "@rilldata/web-common/features/entity-management/types";
   import { createRuntimeServiceGetResource } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import httpClient from "@rilldata/web-common/runtime-client/http-client";
 
-  $: ({ instanceId } = $runtime);
+  const instanceId = httpClient.getInstanceId();
 
   $: projectParserQuery = createRuntimeServiceGetResource(
     instanceId,

web-admin/src/features/projects/status/ProjectResources.svelte

@@ -4,7 +4,7 @@
     createRuntimeServiceCreateTrigger,
     getRuntimeServiceListResourcesQueryKey,
   } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import httpClient from "@rilldata/web-common/runtime-client/http-client";
   import { useQueryClient } from "@tanstack/svelte-query";
   import Button from "web-common/src/components/button/Button.svelte";
   import ProjectResourcesTable from "./ProjectResourcesTable.svelte";
@@ -17,7 +17,7 @@
 
   let isConfirmDialogOpen = false;
 
-  $: ({ instanceId } = $runtime);
+  const instanceId = httpClient.getInstanceId();
 
   $: resources = useResources(instanceId);
 

web-admin/src/features/projects/status/ProjectResourcesTable.svelte

@@ -8,7 +8,7 @@
     V1ReconcileStatus,
     type V1Resource,
   } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import httpClient from "@rilldata/web-common/runtime-client/http-client";
   import { useQueryClient } from "@tanstack/svelte-query";
   import type { ColumnDef } from "@tanstack/svelte-table";
   import { flexRender } from "@tanstack/svelte-table";
@@ -25,6 +25,8 @@
   let dialogResourceKind = "";
   let dialogRefreshType: "full" | "incremental" = "full";
 
+  const instanceId = httpClient.getInstanceId();
+
   let openDropdownResourceKey = "";
 
   const createTrigger = createRuntimeServiceCreateTrigger();
@@ -56,7 +58,7 @@
   const handleRefresh = async () => {
     if (dialogResourceKind === ResourceKind.Model) {
       await $createTrigger.mutateAsync({
-        instanceId: $runtime.instanceId,
+        instanceId: instanceId,
         data: {
           models: [
             {
@@ -68,18 +70,15 @@
       });
     } else {
       await $createTrigger.mutateAsync({
-        instanceId: $runtime.instanceId,
+        instanceId: instanceId,
         data: {
           resources: [{ kind: dialogResourceKind, name: dialogResourceName }],
         },
       });
     }
 
     await queryClient.invalidateQueries({
-      queryKey: getRuntimeServiceListResourcesQueryKey(
-        $runtime.instanceId,
-        undefined,
-      ),
+      queryKey: getRuntimeServiceListResourcesQueryKey(instanceId, undefined),
     });
 
     closeRefreshDialog();

web-admin/src/features/scheduled-reports/history/ReportHistoryTable.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import ResourceList from "@rilldata/web-admin/features/resources/ResourceList.svelte";
   import type { V1ReportExecution } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import httpClient from "@rilldata/web-common/runtime-client/http-client";
   import type { ColumnDef } from "@tanstack/svelte-table";
   import { flexRender } from "@tanstack/svelte-table";
   import { useReport } from "../selectors";
@@ -10,7 +10,7 @@
 
   export let report: string;
 
-  $: ({ instanceId } = $runtime);
+  const instanceId = httpClient.getInstanceId();
 
   $: reportQuery = useReport(instanceId, report);