@finos/legend-application-query 11.0.16 → 12.0.1

package/src/application/LegendQueryApplicationConfig.ts

@@ -171,4 +171,8 @@ export class LegendQueryApplicationConfig extends LegendApplicationConfig {
         {}) as PlainObject<LegendQueryApplicationCoreOptions>,
     );
   }
+
+  override getDefaultApplicationStorageKey(): string {
+    return 'legend-query';
+  }
 }

package/src/components/CloneQueryServiceSetup.tsx

@@ -29,14 +29,16 @@ import { useContext, useEffect } from 'react';
 import {
   generateQuerySetupRoute,
   generateServiceQueryCreatorRoute,
-} from '../application/LegendQueryNavigation.js';
+} from '../__lib__/LegendQueryNavigation.js';
 import {
   LATEST_VERSION_ALIAS,
   SNAPSHOT_VERSION_ALIAS,
-  useDepotServerClient,
 } from '@finos/legend-server-depot';
 import { useApplicationStore } from '@finos/legend-application';
-import { useLegendQueryApplicationStore } from './LegendQueryBaseStoreProvider.js';
+import {
+  useLegendQueryApplicationStore,
+  useLegendQueryBaseStore,
+} from './LegendQueryFrameworkProvider.js';
 import {
   CloneServiceQuerySetupStore,
   type ServiceExecutionOption,
@@ -55,9 +57,13 @@ const CloneServiceQuerySetupStoreProvider: React.FC<{
   children: React.ReactNode;
 }> = ({ children }) => {
   const applicationStore = useLegendQueryApplicationStore();
-  const depotServerClient = useDepotServerClient();
+  const baseStore = useLegendQueryBaseStore();
   const store = useLocalObservable(
-    () => new CloneServiceQuerySetupStore(applicationStore, depotServerClient),
+    () =>
+      new CloneServiceQuerySetupStore(
+        applicationStore,
+        baseStore.depotServerClient,
+      ),
   );
   return (
     <BaseQuerySetupStoreContext.Provider value={store}>

package/src/components/Core_LegendQueryApplicationPlugin.tsx

@@ -37,9 +37,8 @@ import {
   generateQueryProductionizerSetupRoute,
   generateUpdateExistingServiceQuerySetup,
   LEGEND_QUERY_ROUTE_PATTERN,
-} from '../application/LegendQueryNavigation.js';
+} from '../__lib__/LegendQueryNavigation.js';
 import {
-  setupPureLanguageService,
   type ApplicationPageEntry,
   type LegendApplicationSetup,
 } from '@finos/legend-application';
@@ -47,6 +46,10 @@ import { CloneQueryServiceSetup } from './CloneQueryServiceSetup.js';
 import { QueryProductionizerSetup } from './QueryProductionizerSetup.js';
 import { UpdateExistingServiceQuerySetup } from './UpdateExistingServiceQuerySetup.js';
 import { LoadProjectServiceQuerySetup } from './LoadProjectServiceQuerySetup.js';
+import {
+  configureCodeEditorComponent,
+  setupPureLanguageService,
+} from '@finos/legend-lego/code-editor';
 
 export class Core_LegendQueryApplicationPlugin extends LegendQueryApplicationPlugin {
   static NAME = packageJson.extensions.applicationQueryPlugin;
@@ -58,7 +61,8 @@ export class Core_LegendQueryApplicationPlugin extends LegendQueryApplicationPlu
   override getExtraApplicationSetups(): LegendApplicationSetup[] {
     return [
       async (applicationStore) => {
-        setupPureLanguageService([], []);
+        await configureCodeEditorComponent(applicationStore);
+        setupPureLanguageService({});
       },
     ];
   }
@@ -67,24 +71,26 @@ export class Core_LegendQueryApplicationPlugin extends LegendQueryApplicationPlu
     return [
       {
         key: 'clone-service-query-setup-application-page',
-        urlPatterns: [LEGEND_QUERY_ROUTE_PATTERN.CLONE_SERVICE_QUERY_SETUP],
+        addressPatterns: [LEGEND_QUERY_ROUTE_PATTERN.CLONE_SERVICE_QUERY_SETUP],
         renderer: CloneQueryServiceSetup,
       },
       {
         key: 'query-productionizer-setup-application-page',
-        urlPatterns: [LEGEND_QUERY_ROUTE_PATTERN.QUERY_PRODUCTIONIZER_SETUP],
+        addressPatterns: [
+          LEGEND_QUERY_ROUTE_PATTERN.QUERY_PRODUCTIONIZER_SETUP,
+        ],
         renderer: QueryProductionizerSetup,
       },
       {
         key: 'update-existing-service-query-setup-application-page',
-        urlPatterns: [
+        addressPatterns: [
           LEGEND_QUERY_ROUTE_PATTERN.UPDATE_EXISTING_SERVICE_QUERY_SETUP,
         ],
         renderer: UpdateExistingServiceQuerySetup,
       },
       {
         key: 'load-project-service-query-setup-application-page',
-        urlPatterns: [
+        addressPatterns: [
           LEGEND_QUERY_ROUTE_PATTERN.LOAD_PROJECT_SERVICE_QUERY_SETUP,
         ],
         renderer: LoadProjectServiceQuerySetup,

package/src/components/CreateMappingQuerySetup.tsx

@@ -29,19 +29,16 @@ import { useContext, useEffect } from 'react';
 import {
   generateMappingQueryCreatorRoute,
   generateQuerySetupRoute,
-} from '../application/LegendQueryNavigation.js';
+} from '../__lib__/LegendQueryNavigation.js';
 import {
   LATEST_VERSION_ALIAS,
   SNAPSHOT_VERSION_ALIAS,
-  useDepotServerClient,
 } from '@finos/legend-server-depot';
+import { useApplicationStore } from '@finos/legend-application';
 import {
-  useApplicationStore,
-  buildElementOption,
-  type PackageableElementOption,
-  getPackageableElementOptionFormatter,
-} from '@finos/legend-application';
-import { useLegendQueryApplicationStore } from './LegendQueryBaseStoreProvider.js';
+  useLegendQueryApplicationStore,
+  useLegendQueryBaseStore,
+} from './LegendQueryFrameworkProvider.js';
 import { CreateMappingQuerySetupStore } from '../stores/CreateMappingQuerySetupStore.js';
 import {
   BaseQuerySetup,
@@ -53,14 +50,23 @@ import {
 } from './QuerySetup.js';
 import { compareSemVerVersions } from '@finos/legend-storage';
 import type { Mapping, PackageableRuntime } from '@finos/legend-graph';
+import {
+  buildElementOption,
+  getPackageableElementOptionFormatter,
+  type PackageableElementOption,
+} from '@finos/legend-lego/graph-editor';
 
 const CreateMappingQuerySetupStoreProvider: React.FC<{
   children: React.ReactNode;
 }> = ({ children }) => {
   const applicationStore = useLegendQueryApplicationStore();
-  const depotServerClient = useDepotServerClient();
+  const baseStore = useLegendQueryBaseStore();
   const store = useLocalObservable(
-    () => new CreateMappingQuerySetupStore(applicationStore, depotServerClient),
+    () =>
+      new CreateMappingQuerySetupStore(
+        applicationStore,
+        baseStore.depotServerClient,
+      ),
   );
   return (
     <BaseQuerySetupStoreContext.Provider value={store}>

package/src/components/EditExistingQuerySetup.tsx

@@ -32,28 +32,34 @@ import { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import {
   generateExistingQueryEditorRoute,
   generateQuerySetupRoute,
-} from '../application/LegendQueryNavigation.js';
-import { useDepotServerClient } from '@finos/legend-server-depot';
-import {
-  useApplicationStore,
-  CODE_EDITOR_LANGUAGE,
-} from '@finos/legend-application';
+} from '../__lib__/LegendQueryNavigation.js';
+import { useApplicationStore } from '@finos/legend-application';
 import {
   type QueryOption,
   buildQueryOption,
 } from '@finos/legend-query-builder';
-import { useLegendQueryApplicationStore } from './LegendQueryBaseStoreProvider.js';
+import {
+  useLegendQueryApplicationStore,
+  useLegendQueryBaseStore,
+} from './LegendQueryFrameworkProvider.js';
 import { EditExistingQuerySetupStore } from '../stores/EditExistingQuerySetupStore.js';
 import { BaseQuerySetup, BaseQuerySetupStoreContext } from './QuerySetup.js';
-import { CodeEditor } from '@finos/legend-lego/code-editor';
+import {
+  CODE_EDITOR_LANGUAGE,
+  CodeEditor,
+} from '@finos/legend-lego/code-editor';
 
 const EditExistingQuerySetupStoreProvider: React.FC<{
   children: React.ReactNode;
 }> = ({ children }) => {
   const applicationStore = useLegendQueryApplicationStore();
-  const depotServerClient = useDepotServerClient();
+  const baseStore = useLegendQueryBaseStore();
   const store = useLocalObservable(
-    () => new EditExistingQuerySetupStore(applicationStore, depotServerClient),
+    () =>
+      new EditExistingQuerySetupStore(
+        applicationStore,
+        baseStore.depotServerClient,
+      ),
   );
   return (
     <BaseQuerySetupStoreContext.Provider value={store}>

package/src/components/{LegendQueryBaseStoreProvider.tsx → LegendQueryFrameworkProvider.tsx}

@@ -18,12 +18,12 @@ import { createContext, useContext } from 'react';
 import { useLocalObservable } from 'mobx-react-lite';
 import { LegendQueryBaseStore } from '../stores/LegendQueryBaseStore.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import { useDepotServerClient } from '@finos/legend-server-depot';
 import type { LegendQueryPluginManager } from '../application/LegendQueryPluginManager.js';
 import type { LegendQueryApplicationConfig } from '../application/LegendQueryApplicationConfig.js';
 import {
   type ApplicationStore,
   useApplicationStore,
+  ApplicationFrameworkProvider,
 } from '@finos/legend-application';
 
 export const useLegendQueryApplicationStore = (): ApplicationStore<
@@ -36,13 +36,12 @@ const LegendQueryBaseStoreContext = createContext<
   LegendQueryBaseStore | undefined
 >(undefined);
 
-export const LegendQueryBaseStoreProvider: React.FC<{
+const LegendQueryBaseStoreProvider: React.FC<{
   children: React.ReactNode;
 }> = ({ children }) => {
   const applicationStore = useLegendQueryApplicationStore();
-  const depotServerClient = useDepotServerClient();
   const store = useLocalObservable(
-    () => new LegendQueryBaseStore(applicationStore, depotServerClient),
+    () => new LegendQueryBaseStore(applicationStore),
   );
   return (
     <LegendQueryBaseStoreContext.Provider value={store}>
@@ -56,3 +55,11 @@ export const useLegendQueryBaseStore = (): LegendQueryBaseStore =>
     useContext(LegendQueryBaseStoreContext),
     `Can't find Legend Query base store in context`,
   );
+
+export const LegendQueryFrameworkProvider: React.FC<{
+  children: React.ReactNode;
+}> = ({ children }) => (
+  <ApplicationFrameworkProvider>
+    <LegendQueryBaseStoreProvider>{children}</LegendQueryBaseStoreProvider>
+  </ApplicationFrameworkProvider>
+);

package/src/components/LegendQueryWebApplication.tsx

@@ -0,0 +1,117 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { observer } from 'mobx-react-lite';
+import { LEGEND_QUERY_ROUTE_PATTERN } from '../__lib__/LegendQueryNavigation.js';
+import { QuerySetupLandingPage } from './QuerySetup.js';
+import {
+  MappingQueryCreator,
+  ExistingQueryEditor,
+  ServiceQueryCreator,
+} from './QueryEditor.js';
+import {
+  BrowserEnvironmentProvider,
+  Redirect,
+  Route,
+  Switch,
+  generateExtensionUrlPattern,
+} from '@finos/legend-application/browser';
+import {
+  LegendQueryFrameworkProvider,
+  useLegendQueryApplicationStore,
+  useLegendQueryBaseStore,
+} from './LegendQueryFrameworkProvider.js';
+import { EditExistingQuerySetup } from './EditExistingQuerySetup.js';
+import { CreateMappingQuerySetup } from './CreateMappingQuerySetup.js';
+import { useEffect } from 'react';
+import { flowResult } from 'mobx';
+
+const LegendQueryWebApplicationRouter = observer(() => {
+  const applicationStore = useLegendQueryApplicationStore();
+  const baseStore = useLegendQueryBaseStore();
+
+  const extraApplicationPageEntries = applicationStore.pluginManager
+    .getApplicationPlugins()
+    .flatMap((plugin) => plugin.getExtraApplicationPageEntries?.() ?? []);
+
+  useEffect(() => {
+    flowResult(baseStore.initialize()).catch(
+      applicationStore.alertUnhandledError,
+    );
+  }, [applicationStore, baseStore]);
+
+  return (
+    <div className="app">
+      {baseStore.initState.hasCompleted && (
+        <Switch>
+          <Route
+            exact={true}
+            path={LEGEND_QUERY_ROUTE_PATTERN.SETUP}
+            component={QuerySetupLandingPage}
+          />
+          <Route
+            exact={true}
+            path={LEGEND_QUERY_ROUTE_PATTERN.EDIT_EXISTING_QUERY_SETUP}
+            component={EditExistingQuerySetup}
+          />
+          <Route
+            exact={true}
+            path={LEGEND_QUERY_ROUTE_PATTERN.CREATE_MAPPING_QUERY_SETUP}
+            component={CreateMappingQuerySetup}
+          />
+          <Route
+            exact={true}
+            path={LEGEND_QUERY_ROUTE_PATTERN.EDIT_EXISTING_QUERY}
+            component={ExistingQueryEditor}
+          />
+          <Route
+            exact={true}
+            path={LEGEND_QUERY_ROUTE_PATTERN.CREATE_FROM_SERVICE_QUERY}
+            component={ServiceQueryCreator}
+          />
+          <Route
+            exact={true}
+            path={LEGEND_QUERY_ROUTE_PATTERN.CREATE_FROM_MAPPING_QUERY}
+            component={MappingQueryCreator}
+          />
+          {extraApplicationPageEntries.map((entry) => (
+            <Route
+              key={entry.key}
+              exact={true}
+              path={entry.addressPatterns.map(generateExtensionUrlPattern)}
+              component={entry.renderer as React.ComponentType<unknown>}
+            />
+          ))}
+          <Redirect to={LEGEND_QUERY_ROUTE_PATTERN.SETUP} />
+        </Switch>
+      )}
+    </div>
+  );
+});
+
+export const LegendQueryWebApplication = observer(
+  (props: { baseUrl: string }) => {
+    const { baseUrl } = props;
+
+    return (
+      <BrowserEnvironmentProvider baseUrl={baseUrl}>
+        <LegendQueryFrameworkProvider>
+          <LegendQueryWebApplicationRouter />
+        </LegendQueryFrameworkProvider>
+      </BrowserEnvironmentProvider>
+    );
+  },
+);

package/src/components/LoadProjectServiceQuerySetup.tsx

@@ -19,9 +19,11 @@ import { guaranteeType } from '@finos/legend-shared';
 import { flowResult } from 'mobx';
 import { observer, useLocalObservable } from 'mobx-react-lite';
 import { useContext, useEffect } from 'react';
-import { generateQuerySetupRoute } from '../application/LegendQueryNavigation.js';
-import { useDepotServerClient } from '@finos/legend-server-depot';
-import { useLegendQueryApplicationStore } from './LegendQueryBaseStoreProvider.js';
+import { generateQuerySetupRoute } from '../__lib__/LegendQueryNavigation.js';
+import {
+  useLegendQueryApplicationStore,
+  useLegendQueryBaseStore,
+} from './LegendQueryFrameworkProvider.js';
 import { LoadProjectServiceQuerySetupStore } from '../stores/LoadProjectServiceQuerySetupStore.js';
 import {
   BaseQuerySetup,
@@ -36,12 +38,12 @@ const LoadProjectServiceQuerySetupStoreProvider: React.FC<{
   children: React.ReactNode;
 }> = ({ children }) => {
   const applicationStore = useLegendQueryApplicationStore();
-  const depotServerClient = useDepotServerClient();
+  const baseStore = useLegendQueryBaseStore();
   const store = useLocalObservable(
     () =>
       new LoadProjectServiceQuerySetupStore(
         applicationStore,
-        depotServerClient,
+        baseStore.depotServerClient,
       ),
   );
   return (

package/src/components/QueryEditor.tsx

@@ -55,7 +55,7 @@ import {
   LEGEND_QUERY_ROUTE_PATTERN_TOKEN,
   generateExistingQueryEditorRoute,
   generateQuerySetupRoute,
-} from '../application/LegendQueryNavigation.js';
+} from '../__lib__/LegendQueryNavigation.js';
 import {
   type QueryEditorStore,
   ExistingQueryEditorStore,
@@ -66,8 +66,8 @@ import {
 import {
   LEGEND_APPLICATION_COLOR_THEME,
   useApplicationStore,
-  useParams,
 } from '@finos/legend-application';
+import { useParams } from '@finos/legend-application/browser';
 import {
   MappingQueryCreatorStoreProvider,
   ExistingQueryEditorStoreProvider,
@@ -76,7 +76,7 @@ import {
 } from './QueryEditorStoreProvider.js';
 import type { RawLambda } from '@finos/legend-graph';
 import { flowResult } from 'mobx';
-import { useLegendQueryApplicationStore } from './LegendQueryBaseStoreProvider.js';
+import { useLegendQueryApplicationStore } from './LegendQueryFrameworkProvider.js';
 import {
   QueryBuilder,
   QueryBuilderNavigationBlocker,

package/src/components/QueryEditorStoreProvider.tsx

@@ -23,8 +23,10 @@ import {
   ExistingQueryEditorStore,
   ServiceQueryCreatorStore,
 } from '../stores/QueryEditorStore.js';
-import { useDepotServerClient } from '@finos/legend-server-depot';
-import { useLegendQueryApplicationStore } from './LegendQueryBaseStoreProvider.js';
+import {
+  useLegendQueryApplicationStore,
+  useLegendQueryBaseStore,
+} from './LegendQueryFrameworkProvider.js';
 import { parseGAVCoordinates } from '@finos/legend-storage';
 
 export const QueryEditorStoreContext = createContext<
@@ -36,12 +38,12 @@ export const ExistingQueryEditorStoreProvider: React.FC<{
   queryId: string;
 }> = ({ children, queryId }) => {
   const applicationStore = useLegendQueryApplicationStore();
-  const depotServerClient = useDepotServerClient();
+  const baseStore = useLegendQueryBaseStore();
   const store = useLocalObservable(
     () =>
       new ExistingQueryEditorStore(
         applicationStore,
-        depotServerClient,
+        baseStore.depotServerClient,
         queryId,
       ),
   );
@@ -60,12 +62,12 @@ export const MappingQueryCreatorStoreProvider: React.FC<{
 }> = ({ children, gav, mappingPath, runtimePath }) => {
   const { groupId, artifactId, versionId } = parseGAVCoordinates(gav);
   const applicationStore = useLegendQueryApplicationStore();
-  const depotServerClient = useDepotServerClient();
+  const baseStore = useLegendQueryBaseStore();
   const store = useLocalObservable(
     () =>
       new MappingQueryCreatorStore(
         applicationStore,
-        depotServerClient,
+        baseStore.depotServerClient,
         groupId,
         artifactId,
         versionId,
@@ -88,12 +90,12 @@ export const ServiceQueryCreatorStoreProvider: React.FC<{
 }> = ({ children, gav, servicePath, executionKey }) => {
   const { groupId, artifactId, versionId } = parseGAVCoordinates(gav);
   const applicationStore = useLegendQueryApplicationStore();
-  const depotServerClient = useDepotServerClient();
+  const baseStore = useLegendQueryBaseStore();
   const store = useLocalObservable(
     () =>
       new ServiceQueryCreatorStore(
         applicationStore,
-        depotServerClient,
+        baseStore.depotServerClient,
         groupId,
         artifactId,
         versionId,

package/src/components/QueryProductionizerSetup.tsx

@@ -28,29 +28,34 @@ import { debounce, guaranteeType } from '@finos/legend-shared';
 import { flowResult } from 'mobx';
 import { observer, useLocalObservable } from 'mobx-react-lite';
 import { useContext, useEffect, useMemo, useRef, useState } from 'react';
-import { useDepotServerClient } from '@finos/legend-server-depot';
+import { useApplicationStore } from '@finos/legend-application';
 import {
-  CODE_EDITOR_LANGUAGE,
-  useApplicationStore,
-} from '@finos/legend-application';
-import { useLegendQueryApplicationStore } from './LegendQueryBaseStoreProvider.js';
+  useLegendQueryApplicationStore,
+  useLegendQueryBaseStore,
+} from './LegendQueryFrameworkProvider.js';
 import { QueryProductionizerSetupStore } from '../stores/QueryProductionizerSetupStore.js';
 import { BaseQuerySetup, BaseQuerySetupStoreContext } from './QuerySetup.js';
 import {
   buildQueryOption,
   type QueryOption,
 } from '@finos/legend-query-builder';
-import { generateQuerySetupRoute } from '../application/LegendQueryNavigation.js';
-import { CodeEditor } from '@finos/legend-lego/code-editor';
+import { generateQuerySetupRoute } from '../__lib__/LegendQueryNavigation.js';
+import {
+  CODE_EDITOR_LANGUAGE,
+  CodeEditor,
+} from '@finos/legend-lego/code-editor';
 
 const QueryProductionizerSetupStoreProvider: React.FC<{
   children: React.ReactNode;
 }> = ({ children }) => {
   const applicationStore = useLegendQueryApplicationStore();
-  const depotServerClient = useDepotServerClient();
+  const baseStore = useLegendQueryBaseStore();
   const store = useLocalObservable(
     () =>
-      new QueryProductionizerSetupStore(applicationStore, depotServerClient),
+      new QueryProductionizerSetupStore(
+        applicationStore,
+        baseStore.depotServerClient,
+      ),
   );
   return (
     <BaseQuerySetupStoreContext.Provider value={store}>

package/src/components/QuerySetup.tsx

@@ -35,14 +35,14 @@ import {
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import { observer, useLocalObservable } from 'mobx-react-lite';
 import React, { createContext, useContext, useEffect } from 'react';
-import { LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN } from '../application/LegendQueryNavigation.js';
+import { LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN } from '../__lib__/LegendQueryNavigation.js';
 import {
   QuerySetupLandingPageStore,
   type BaseQuerySetupStore,
 } from '../stores/QuerySetupStore.js';
 import type { ProjectData } from '@finos/legend-server-depot';
 import { useApplicationStore } from '@finos/legend-application';
-import { useLegendQueryApplicationStore } from './LegendQueryBaseStoreProvider.js';
+import { useLegendQueryApplicationStore } from './LegendQueryFrameworkProvider.js';
 import type { QuerySetupActionConfiguration } from '../stores/LegendQueryApplicationPlugin.js';
 
 export type ProjectOption = { label: string; value: ProjectData };

package/src/components/UpdateExistingServiceQuerySetup.tsx

@@ -24,9 +24,11 @@ import { debounce, guaranteeType } from '@finos/legend-shared';
 import { flowResult } from 'mobx';
 import { observer, useLocalObservable } from 'mobx-react-lite';
 import { useContext, useEffect, useMemo, useRef, useState } from 'react';
-import { generateQuerySetupRoute } from '../application/LegendQueryNavigation.js';
-import { useDepotServerClient } from '@finos/legend-server-depot';
-import { useLegendQueryApplicationStore } from './LegendQueryBaseStoreProvider.js';
+import { generateQuerySetupRoute } from '../__lib__/LegendQueryNavigation.js';
+import {
+  useLegendQueryApplicationStore,
+  useLegendQueryBaseStore,
+} from './LegendQueryFrameworkProvider.js';
 import { UpdateExistingServiceQuerySetupStore } from '../stores/UpdateExistingServiceQuerySetupStore.js';
 import { BaseQuerySetup, BaseQuerySetupStoreContext } from './QuerySetup.js';
 import {
@@ -39,12 +41,12 @@ const UpdateExistingServiceQuerySetupStoreProvider: React.FC<{
   children: React.ReactNode;
 }> = ({ children }) => {
   const applicationStore = useLegendQueryApplicationStore();
-  const depotServerClient = useDepotServerClient();
+  const baseStore = useLegendQueryBaseStore();
   const store = useLocalObservable(
     () =>
       new UpdateExistingServiceQuerySetupStore(
         applicationStore,
-        depotServerClient,
+        baseStore.depotServerClient,
       ),
   );
   return (