Fix lint

rilldata · Jan 28, 2025 · a0fea42 · a0fea42
1 parent ede3cdf
commit a0fea42
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 34 deletions.
diff --git a/web-common/src/features/connectors/olap/TableEntry.svelte b/web-common/src/features/connectors/olap/TableEntry.svelte
@@ -33,12 +33,7 @@
   });
   $: showSchema = $expandedStore;
 
-  const {
-    allowContextMenu,
-    allowNavigateToTable,
-    allowShowSchema,
-    allowSelectTable,
-  } = store;
+  const { allowContextMenu, allowNavigateToTable, allowShowSchema } = store;
 
   $: fullyQualifiedTableName = makeFullyQualifiedTableName(
     driver,

diff --git a/web-common/src/features/entity-management/WatchResourcesClient.ts b/web-common/src/features/entity-management/WatchResourcesClient.ts
@@ -289,7 +289,9 @@ export class WatchResourcesClient {
             );
 
             // Remove the connector's state from the connector explorer store
-            connectorExplorerStore.deleteItem(res.name.name);
+            connectorExplorerStore.deleteItem({
+              connector: res.name.name,
+            });
 
             // Done
             return;

diff --git a/web-common/src/features/welcome/ProjectCards.svelte b/web-common/src/features/welcome/ProjectCards.svelte
@@ -11,7 +11,6 @@
   import { MetricsEventSpace } from "../../metrics/service/MetricsTypes";
   import { createRuntimeServiceUnpackExample } from "../../runtime-client";
   import { runtime } from "../../runtime-client/runtime-store";
-  import { EMPTY_PROJECT_TITLE } from "./constants";
 
   const unpackExampleProject = createRuntimeServiceUnpackExample();
 
@@ -42,26 +41,21 @@
 
   $: ({ mutateAsync: unpackExample } = $unpackExampleProject);
 
-  async function unpackProject(example?: (typeof EXAMPLES)[number]) {
-    selectedProjectName = example ? example.name : EMPTY_PROJECT_TITLE;
+  async function unpackProject(example: (typeof EXAMPLES)[number]) {
+    selectedProjectName = example.name;
 
     await behaviourEvent?.fireSplashEvent(
-      example
-        ? BehaviourEventAction.ExampleAdd
-        : BehaviourEventAction.ProjectEmpty,
+      BehaviourEventAction.ExampleAdd,
       BehaviourEventMedium.Card,
       MetricsEventSpace.Workspace,
-      example?.name,
+      selectedProjectName,
     );
 
-    const mutationFunction = example ? unpackExample : unpackEmpty;
-    const key = example ? "name" : "displayName";
-
     try {
-      await mutationFunction({
+      await unpackExample({
         instanceId,
         data: {
-          [key]: selectedProjectName,
+          name: selectedProjectName,
           force: true,
         },
       });

diff --git a/web-common/src/features/welcome/wizard/onboarding-state.ts b/web-common/src/features/welcome/wizard/onboarding-state.ts
@@ -9,6 +9,7 @@ import {
   runtimeServiceListFiles,
   runtimeServicePutFile,
   runtimeServiceUnpackEmpty,
+  type V1GetFileResponse,
   type V1ListFilesResponse,
 } from "../../../runtime-client";
 import { runtime } from "../../../runtime-client/runtime-store";
@@ -80,9 +81,11 @@ export class OnboardingState {
     await this.save();
   }
 
-  async fetch() {
+  async fetchAndParse() {
+    let response: V1GetFileResponse;
+
     try {
-      const response = await queryClient.fetchQuery({
+      response = await queryClient.fetchQuery({
         queryKey: getRuntimeServiceGetFileQueryKey(this.runtimeInstanceId, {
           path: ONBOARDING_STATE_FILE_PATH,
         }),
@@ -91,23 +94,27 @@ export class OnboardingState {
             path: ONBOARDING_STATE_FILE_PATH,
           }),
       });
-
-      // parse the state
-      const state = JSON.parse(response.blob);
-
-      // set the state
-      this.managementType = writable(state.managementType);
-      this.olapDriver = writable(state.olapDriver);
-      this.firstDataSource = writable(state.firstDataSource);
-      return;
     } catch (error) {
       if (error?.response?.data?.message?.includes("no such file")) {
         await this.initializeOnboardingState();
+        return;
       } else {
         console.error("throwing error", error);
         throw error;
       }
     }
+
+    if (!response.blob) {
+      throw new Error("No file content found");
+    }
+
+    // parse the state
+    const state = JSON.parse(response.blob);
+
+    // set the state
+    this.managementType = writable(state.managementType);
+    this.olapDriver = writable(state.olapDriver);
+    this.firstDataSource = writable(state.firstDataSource);
   }
 
   async save() {

diff --git a/web-common/src/features/workspaces/VisualMetrics.svelte b/web-common/src/features/workspaces/VisualMetrics.svelte
@@ -52,14 +52,14 @@
 
   const { clickhouseModeling } = featureFlags;
   const store = connectorExplorerStore.duplicateStore(
-    (connector, database, schema, table) => {
-      if (!table || !schema) return;
+    ({ connector, database, databaseSchema, table }) => {
+      if (!table || !databaseSchema) return;
 
       confirmation = {
         action: "switch",
         connector,
         database,
-        schema,
+        schema: databaseSchema,
         model: table,
       };
 

diff --git a/web-local/src/routes/welcome/(wizard)/+layout.ts b/web-local/src/routes/welcome/(wizard)/+layout.ts
@@ -6,7 +6,7 @@ export async function load({ parent }) {
   if (!(await onboardingState.isOnboardingStateFilePresent())) {
     await onboardingState.initializeOnboardingState().catch(console.error);
   } else {
-    await onboardingState.fetch().catch(console.error);
+    await onboardingState.fetchAndParse().catch(console.error);
   }
 
   return { onboardingState };