@finos/legend-application-query 10.0.5 → 11.0.1

package/src/{stores/LegendQueryRouter.ts → application/LegendQueryNavigation.ts}

@@ -24,7 +24,7 @@ import {
 } from '@finos/legend-shared';
 import { generateGAVCoordinates } from '@finos/legend-storage';
 
-export enum LEGEND_QUERY_PATH_PARAM_TOKEN {
+export enum LEGEND_QUERY_ROUTE_PATTERN_TOKEN {
   GAV = 'gav',
   QUERY_ID = 'queryId',
   MAPPING_PATH = 'mappingPath',
@@ -32,16 +32,6 @@ export enum LEGEND_QUERY_PATH_PARAM_TOKEN {
   SERVICE_PATH = 'servicePath',
 }
 
-export enum LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN {
-  SHOW_ALL_GROUPS = 'showAllGroups',
-  SHOW_ADVANCED_ACTIONS = 'showAdvancedActions',
-  TAG = 'tag',
-}
-
-export enum LEGEND_QUERY_QUERY_PARAM_TOKEN {
-  SERVICE_EXECUTION_KEY = 'executionKey',
-}
-
 export const LEGEND_QUERY_ROUTE_PATTERN = Object.freeze({
   SETUP: '/setup',
   EDIT_EXISTING_QUERY_SETUP: '/setup/existing-query',
@@ -50,15 +40,27 @@ export const LEGEND_QUERY_ROUTE_PATTERN = Object.freeze({
   QUERY_PRODUCTIONIZER_SETUP: '/setup/productionize-query',
   UPDATE_EXISTING_SERVICE_QUERY_SETUP: '/setup/update-existing-service-query',
   LOAD_PROJECT_SERVICE_QUERY_SETUP: '/setup/load-project-service-query',
-  CREATE_FROM_MAPPING_QUERY: `/create/manual/:${LEGEND_QUERY_PATH_PARAM_TOKEN.GAV}/:${LEGEND_QUERY_PATH_PARAM_TOKEN.MAPPING_PATH}/:${LEGEND_QUERY_PATH_PARAM_TOKEN.RUNTIME_PATH}`,
-  CREATE_FROM_SERVICE_QUERY: `/create-from-service/:${LEGEND_QUERY_PATH_PARAM_TOKEN.GAV}/:${LEGEND_QUERY_PATH_PARAM_TOKEN.SERVICE_PATH}`,
-  EDIT_EXISTING_QUERY: `/edit/:${LEGEND_QUERY_PATH_PARAM_TOKEN.QUERY_ID}`,
+  CREATE_FROM_MAPPING_QUERY: `/create/manual/:${LEGEND_QUERY_ROUTE_PATTERN_TOKEN.GAV}/:${LEGEND_QUERY_ROUTE_PATTERN_TOKEN.MAPPING_PATH}/:${LEGEND_QUERY_ROUTE_PATTERN_TOKEN.RUNTIME_PATH}`,
+  CREATE_FROM_SERVICE_QUERY: `/create-from-service/:${LEGEND_QUERY_ROUTE_PATTERN_TOKEN.GAV}/:${LEGEND_QUERY_ROUTE_PATTERN_TOKEN.SERVICE_PATH}`,
+  EDIT_EXISTING_QUERY: `/edit/:${LEGEND_QUERY_ROUTE_PATTERN_TOKEN.QUERY_ID}`,
 });
 
+export enum LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN {
+  SHOW_ALL_GROUPS = 'showAllGroups',
+  SHOW_ADVANCED_ACTIONS = 'showAdvancedActions',
+  TAG = 'tag',
+}
+
+export enum LEGEND_QUERY_QUERY_PARAM_TOKEN {
+  SERVICE_EXECUTION_KEY = 'executionKey',
+}
+
 export type QuerySetupQueryParams = {
-  [LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN.SHOW_ALL_GROUPS]?: string;
-  [LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN.SHOW_ADVANCED_ACTIONS]?: string;
-  [LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN.TAG]?: string;
+  [LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN.SHOW_ALL_GROUPS]?: string | undefined;
+  [LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN.SHOW_ADVANCED_ACTIONS]?:
+    | string
+    | undefined;
+  [LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN.TAG]?: string | undefined;
 };
 
 export const generateQuerySetupRoute = (
@@ -117,20 +119,20 @@ export const generateMappingQueryCreatorRoute = (
   runtimePath: string,
 ): string =>
   generatePath(LEGEND_QUERY_ROUTE_PATTERN.CREATE_FROM_MAPPING_QUERY, {
-    [LEGEND_QUERY_PATH_PARAM_TOKEN.GAV]: generateGAVCoordinates(
+    [LEGEND_QUERY_ROUTE_PATTERN_TOKEN.GAV]: generateGAVCoordinates(
       groupId,
       artifactId,
       versionId,
     ),
-    [LEGEND_QUERY_PATH_PARAM_TOKEN.MAPPING_PATH]: mappingPath,
-    [LEGEND_QUERY_PATH_PARAM_TOKEN.RUNTIME_PATH]: runtimePath,
+    [LEGEND_QUERY_ROUTE_PATTERN_TOKEN.MAPPING_PATH]: mappingPath,
+    [LEGEND_QUERY_ROUTE_PATTERN_TOKEN.RUNTIME_PATH]: runtimePath,
   });
 
-export interface MappingQueryCreatorPathParams {
-  [LEGEND_QUERY_PATH_PARAM_TOKEN.GAV]: string;
-  [LEGEND_QUERY_PATH_PARAM_TOKEN.MAPPING_PATH]: string;
-  [LEGEND_QUERY_PATH_PARAM_TOKEN.RUNTIME_PATH]: string;
-}
+export type MappingQueryCreatorPathParams = {
+  [LEGEND_QUERY_ROUTE_PATTERN_TOKEN.GAV]: string;
+  [LEGEND_QUERY_ROUTE_PATTERN_TOKEN.MAPPING_PATH]: string;
+  [LEGEND_QUERY_ROUTE_PATTERN_TOKEN.RUNTIME_PATH]: string;
+};
 
 export const generateServiceQueryCreatorRoute = (
   groupId: string,
@@ -141,12 +143,12 @@ export const generateServiceQueryCreatorRoute = (
 ): string =>
   addQueryParamsStringToUrl(
     generatePath(LEGEND_QUERY_ROUTE_PATTERN.CREATE_FROM_SERVICE_QUERY, {
-      [LEGEND_QUERY_PATH_PARAM_TOKEN.GAV]: generateGAVCoordinates(
+      [LEGEND_QUERY_ROUTE_PATTERN_TOKEN.GAV]: generateGAVCoordinates(
         groupId,
         artifactId,
         versionId,
       ),
-      [LEGEND_QUERY_PATH_PARAM_TOKEN.SERVICE_PATH]: servicePath,
+      [LEGEND_QUERY_ROUTE_PATTERN_TOKEN.SERVICE_PATH]: servicePath,
     }),
     stringifyQueryParams({
       [LEGEND_QUERY_QUERY_PARAM_TOKEN.SERVICE_EXECUTION_KEY]: executionKey
@@ -155,23 +157,23 @@ export const generateServiceQueryCreatorRoute = (
     }),
   );
 
-export interface ServiceQueryCreatorPathParams {
-  [LEGEND_QUERY_PATH_PARAM_TOKEN.GAV]: string;
-  [LEGEND_QUERY_PATH_PARAM_TOKEN.SERVICE_PATH]: string;
-}
+export type ServiceQueryCreatorPathParams = {
+  [LEGEND_QUERY_ROUTE_PATTERN_TOKEN.GAV]: string;
+  [LEGEND_QUERY_ROUTE_PATTERN_TOKEN.SERVICE_PATH]: string;
+};
 
 export type ServiceQueryCreatorQueryParams = {
-  [LEGEND_QUERY_QUERY_PARAM_TOKEN.SERVICE_EXECUTION_KEY]?: string;
+  [LEGEND_QUERY_QUERY_PARAM_TOKEN.SERVICE_EXECUTION_KEY]?: string | undefined;
 };
 
 export const generateExistingQueryEditorRoute = (queryId: string): string =>
   generatePath(LEGEND_QUERY_ROUTE_PATTERN.EDIT_EXISTING_QUERY, {
-    [LEGEND_QUERY_PATH_PARAM_TOKEN.QUERY_ID]: queryId,
+    [LEGEND_QUERY_ROUTE_PATTERN_TOKEN.QUERY_ID]: queryId,
   });
 
-export interface ExistingQueryEditorPathParams {
-  [LEGEND_QUERY_PATH_PARAM_TOKEN.QUERY_ID]: string;
-}
+export type ExistingQueryEditorPathParams = {
+  [LEGEND_QUERY_ROUTE_PATTERN_TOKEN.QUERY_ID]: string;
+};
 
 /**
  * @external_application_navigation This depends on Legend Studio routing and is hardcoded so it's potentially brittle

package/src/{stores/LegendQueryTelemetry.ts → application/LegendQueryTelemetryHelper.ts}

@@ -15,7 +15,7 @@
  */
 
 import type { TelemetryService } from '@finos/legend-application';
-import { LEGEND_QUERY_APP_EVENT } from './LegendQueryAppEvent.js';
+import { LEGEND_QUERY_APP_EVENT } from './LegendQueryEvent.js';
 
 type Query_TelemetryData = {
   query: {
@@ -27,7 +27,7 @@ type Query_TelemetryData = {
   };
 };
 
-export class LegendQueryTelemetry {
+export class LegendQueryTelemetryHelper {
   static logEvent_ViewQuerySucceeded(
     telemetryService: TelemetryService,
     data: Query_TelemetryData,

package/src/components/CloneQueryServiceSetup.tsx

@@ -29,7 +29,7 @@ import { useContext, useEffect } from 'react';
 import {
   generateQuerySetupRoute,
   generateServiceQueryCreatorRoute,
-} from '../stores/LegendQueryRouter.js';
+} from '../application/LegendQueryNavigation.js';
 import {
   LATEST_VERSION_ALIAS,
   SNAPSHOT_VERSION_ALIAS,

package/src/components/Core_LegendQueryApplicationPlugin.tsx

@@ -37,7 +37,7 @@ import {
   generateQueryProductionizerSetupRoute,
   generateUpdateExistingServiceQuerySetup,
   LEGEND_QUERY_ROUTE_PATTERN,
-} from '../stores/LegendQueryRouter.js';
+} from '../application/LegendQueryNavigation.js';
 import type { ApplicationPageEntry } from '@finos/legend-application';
 import { CloneQueryServiceSetup } from './CloneQueryServiceSetup.js';
 import { QueryProductionizerSetup } from './QueryProductionizerSetup.js';

package/src/components/CreateMappingQuerySetup.tsx

@@ -29,7 +29,7 @@ import { useContext, useEffect } from 'react';
 import {
   generateMappingQueryCreatorRoute,
   generateQuerySetupRoute,
-} from '../stores/LegendQueryRouter.js';
+} from '../application/LegendQueryNavigation.js';
 import {
   LATEST_VERSION_ALIAS,
   SNAPSHOT_VERSION_ALIAS,

package/src/components/EditExistingQuerySetup.tsx

@@ -32,7 +32,7 @@ import { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import {
   generateExistingQueryEditorRoute,
   generateQuerySetupRoute,
-} from '../stores/LegendQueryRouter.js';
+} from '../application/LegendQueryNavigation.js';
 import { useDepotServerClient } from '@finos/legend-server-depot';
 import {
   useApplicationStore,

package/src/components/LegendQueryApplication.tsx

@@ -15,7 +15,7 @@
  */
 
 import { observer } from 'mobx-react-lite';
-import { LEGEND_QUERY_ROUTE_PATTERN } from '../stores/LegendQueryRouter.js';
+import { LEGEND_QUERY_ROUTE_PATTERN } from '../application/LegendQueryNavigation.js';
 import { QuerySetupLandingPage } from './QuerySetup.js';
 import {
   MappingQueryCreator,

package/src/components/LoadProjectServiceQuerySetup.tsx

@@ -19,7 +19,7 @@ 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 '../stores/LegendQueryRouter.js';
+import { generateQuerySetupRoute } from '../application/LegendQueryNavigation.js';
 import { useDepotServerClient } from '@finos/legend-server-depot';
 import { useLegendQueryApplicationStore } from './LegendQueryBaseStoreProvider.js';
 import { LoadProjectServiceQuerySetupStore } from '../stores/LoadProjectServiceQuerySetupStore.js';

package/src/components/QueryEditor.tsx

@@ -44,24 +44,18 @@ import {
   LightBulbIcon,
   EmptyLightBulbIcon,
 } from '@finos/legend-art';
-import {
-  debounce,
-  getQueryParameters,
-  getQueryParameterValue,
-  sanitizeURL,
-} from '@finos/legend-shared';
+import { debounce } from '@finos/legend-shared';
 import { observer } from 'mobx-react-lite';
 import { Fragment, useEffect, useMemo, useRef, useState } from 'react';
 import {
   type MappingQueryCreatorPathParams,
   type ExistingQueryEditorPathParams,
   type ServiceQueryCreatorPathParams,
-  type ServiceQueryCreatorQueryParams,
   LEGEND_QUERY_QUERY_PARAM_TOKEN,
-  LEGEND_QUERY_PATH_PARAM_TOKEN,
+  LEGEND_QUERY_ROUTE_PATTERN_TOKEN,
   generateExistingQueryEditorRoute,
   generateQuerySetupRoute,
-} from '../stores/LegendQueryRouter.js';
+} from '../application/LegendQueryNavigation.js';
 import {
   type QueryEditorStore,
   ExistingQueryEditorStore,
@@ -70,7 +64,7 @@ import {
   createViewSDLCProjectHandler,
 } from '../stores/QueryEditorStore.js';
 import {
-  LEGEND_APPLICATION_SETTINGS_KEY,
+  LEGEND_APPLICATION_COLOR_THEME,
   useApplicationStore,
   useParams,
 } from '@finos/legend-application';
@@ -406,13 +400,12 @@ const QueryEditorHeaderContent = observer(
         applicationStore.alertUnhandledError,
       );
     };
-    const toggleLightDarkMode = (): void => {
-      applicationStore.layoutService.TEMPORARY__setIsLightThemeEnabled(
-        !applicationStore.layoutService.TEMPORARY__isLightThemeEnabled,
-      );
-      applicationStore.storageService.settingsStore.persist(
-        LEGEND_APPLICATION_SETTINGS_KEY.EDITOR_THEME,
-        applicationStore.layoutService.TEMPORARY__isLightThemeEnabled,
+    const TEMPORARY__toggleLightDarkMode = (): void => {
+      applicationStore.layoutService.setColorTheme(
+        applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
+          ? LEGEND_APPLICATION_COLOR_THEME.DEFAULT_DARK
+          : LEGEND_APPLICATION_COLOR_THEME.LEGACY_LIGHT,
+        { persist: true },
       );
     };
     const saveQuery = (): void => {
@@ -479,24 +472,22 @@ const QueryEditorHeaderContent = observer(
               queryBuilderState={queryBuilderState}
             />
           )}
-          {applicationStore.config.options.TEMPORARY__enableThemeSwitcher && (
-            <button
-              title="Toggle light/dark mode"
-              onClick={toggleLightDarkMode}
-              className="query-editor__header__action"
-              disabled={editorStore.isViewProjectActionDisabled}
-            >
-              {applicationStore.layoutService.TEMPORARY__isLightThemeEnabled ? (
-                <>
-                  <LightBulbIcon className="query-editor__header__action__icon--bulb--light" />
-                </>
-              ) : (
-                <>
-                  <EmptyLightBulbIcon className="query-editor__header__action__icon--bulb--dark" />
-                </>
-              )}
-            </button>
-          )}
+          <button
+            title="Toggle light/dark mode"
+            onClick={TEMPORARY__toggleLightDarkMode}
+            className="query-editor__header__action"
+          >
+            {applicationStore.layoutService
+              .TEMPORARY__isLightColorThemeEnabled ? (
+              <>
+                <LightBulbIcon className="query-editor__header__action__icon--bulb--light" />
+              </>
+            ) : (
+              <>
+                <EmptyLightBulbIcon className="query-editor__header__action__icon--bulb--dark" />
+              </>
+            )}
+          </button>
 
           <DropdownMenu
             className="query-editor__header__action btn--medium"
@@ -570,23 +561,8 @@ export const QueryEditor = observer(() => {
     );
   }, [editorStore, applicationStore]);
 
-  useEffect(() => {
-    document.body.classList.toggle(
-      'light-theme',
-      applicationStore.layoutService.TEMPORARY__isLightThemeEnabled,
-    );
-  }, [applicationStore.layoutService.TEMPORARY__isLightThemeEnabled]);
-
   return (
-    <div
-      className={clsx([
-        'query-editor ',
-        {
-          'query-editor--light':
-            applicationStore.layoutService.TEMPORARY__isLightThemeEnabled,
-        },
-      ])}
-    >
+    <div className="query-editor">
       <div className="query-editor__header">
         <div className="query-editor__header__menu">
           <DropdownMenu
@@ -598,7 +574,6 @@ export const QueryEditor = observer(() => {
             }}
             content={
               <MenuContent>
-                {/* <MenuContentItem onClick={openHelp}>Help...</MenuContentItem> */}
                 <MenuContentItem
                   disabled={!appDocUrl}
                   onClick={goToDocumentation}
@@ -660,7 +635,7 @@ export const QueryEditor = observer(() => {
 
 export const ExistingQueryEditor = observer(() => {
   const params = useParams<ExistingQueryEditorPathParams>();
-  const queryId = params[LEGEND_QUERY_PATH_PARAM_TOKEN.QUERY_ID];
+  const queryId = params[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.QUERY_ID];
 
   return (
     <ExistingQueryEditorStoreProvider queryId={queryId}>
@@ -671,18 +646,13 @@ export const ExistingQueryEditor = observer(() => {
 
 export const ServiceQueryCreator = observer(() => {
   const applicationStore = useApplicationStore();
-  const params = useParams<ServiceQueryCreatorPathParams>();
-  const gav = params[LEGEND_QUERY_PATH_PARAM_TOKEN.GAV];
-  const servicePath = params[LEGEND_QUERY_PATH_PARAM_TOKEN.SERVICE_PATH];
-  const executionKey = getQueryParameterValue(
-    getQueryParameters<ServiceQueryCreatorQueryParams>(
-      sanitizeURL(
-        applicationStore.navigationService.navigator.getCurrentAddress(),
-      ),
-      true,
-    ),
-    LEGEND_QUERY_QUERY_PARAM_TOKEN.SERVICE_EXECUTION_KEY,
-  );
+  const parameters = useParams<ServiceQueryCreatorPathParams>();
+  const gav = parameters[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.GAV];
+  const servicePath = parameters[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.SERVICE_PATH];
+  const executionKey =
+    applicationStore.navigationService.navigator.getAddressParameterValue(
+      LEGEND_QUERY_QUERY_PARAM_TOKEN.SERVICE_EXECUTION_KEY,
+    );
 
   return (
     <ServiceQueryCreatorStoreProvider
@@ -697,9 +667,9 @@ export const ServiceQueryCreator = observer(() => {
 
 export const MappingQueryCreator = observer(() => {
   const params = useParams<MappingQueryCreatorPathParams>();
-  const gav = params[LEGEND_QUERY_PATH_PARAM_TOKEN.GAV];
-  const mappingPath = params[LEGEND_QUERY_PATH_PARAM_TOKEN.MAPPING_PATH];
-  const runtimePath = params[LEGEND_QUERY_PATH_PARAM_TOKEN.RUNTIME_PATH];
+  const gav = params[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.GAV];
+  const mappingPath = params[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.MAPPING_PATH];
+  const runtimePath = params[LEGEND_QUERY_ROUTE_PATTERN_TOKEN.RUNTIME_PATH];
 
   return (
     <MappingQueryCreatorStoreProvider

package/src/components/QueryEditorComponentTestUtils.tsx

@@ -46,7 +46,7 @@ import {
 import { TEST__getTestLegendQueryApplicationConfig } from '../stores/QueryEditorStoreTestUtils.js';
 import { LegendQueryPluginManager } from '../application/LegendQueryPluginManager.js';
 import { ExistingQueryEditor } from './QueryEditor.js';
-import { generateExistingQueryEditorRoute } from '../stores/LegendQueryRouter.js';
+import { generateExistingQueryEditorRoute } from '../application/LegendQueryNavigation.js';
 import type { Entity } from '@finos/legend-storage';
 import { ExistingQueryEditorStore } from '../stores/QueryEditorStore.js';
 import { LegendQueryBaseStoreProvider } from './LegendQueryBaseStoreProvider.js';

package/src/components/QueryProductionizerSetup.tsx

@@ -41,7 +41,7 @@ import {
   buildQueryOption,
   type QueryOption,
 } from '@finos/legend-query-builder';
-import { generateQuerySetupRoute } from '../stores/LegendQueryRouter.js';
+import { generateQuerySetupRoute } from '../application/LegendQueryNavigation.js';
 
 const QueryProductionizerSetupStoreProvider: React.FC<{
   children: React.ReactNode;

package/src/components/QuerySetup.tsx

@@ -32,18 +32,10 @@ import {
   MenuContentDivider,
   AssistantIcon,
 } from '@finos/legend-art';
-import {
-  getQueryParameters,
-  getQueryParameterValue,
-  guaranteeNonNullable,
-  sanitizeURL,
-} from '@finos/legend-shared';
+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,
-  type QuerySetupQueryParams,
-} from '../stores/LegendQueryRouter.js';
+import { LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN } from '../application/LegendQueryNavigation.js';
 import {
   QuerySetupLandingPageStore,
   type BaseQuerySetupStore,
@@ -261,24 +253,18 @@ export const QuerySetupLandingPage = withQuerySetupLandingPageStore(
   observer(() => {
     const setupStore = useQuerySetupLandingPageStore();
     const applicationStore = useLegendQueryApplicationStore();
-    const params = getQueryParameters<QuerySetupQueryParams>(
-      sanitizeURL(
-        applicationStore.navigationService.navigator.getCurrentAddress(),
-      ),
-      true,
-    );
-    const showAdvancedActions = getQueryParameterValue(
-      params,
-      LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN.SHOW_ADVANCED_ACTIONS,
-    );
-    const showAllGroups = getQueryParameterValue(
-      params,
-      LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN.SHOW_ALL_GROUPS,
-    );
-    const tagToFocus = getQueryParameterValue(
-      params,
-      LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN.TAG,
-    );
+    const showAdvancedActions =
+      applicationStore.navigationService.navigator.getAddressParameterValue(
+        LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN.SHOW_ADVANCED_ACTIONS,
+      );
+    const showAllGroups =
+      applicationStore.navigationService.navigator.getAddressParameterValue(
+        LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN.SHOW_ALL_GROUPS,
+      );
+    const tagToFocus =
+      applicationStore.navigationService.navigator.getAddressParameterValue(
+        LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN.TAG,
+      );
     const goToStudio = (): void =>
       applicationStore.navigationService.navigator.visitAddress(
         applicationStore.config.studioUrl,

package/src/components/UpdateExistingServiceQuerySetup.tsx

@@ -24,7 +24,7 @@ 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 '../stores/LegendQueryRouter.js';
+import { generateQuerySetupRoute } from '../application/LegendQueryNavigation.js';
 import { useDepotServerClient } from '@finos/legend-server-depot';
 import { useLegendQueryApplicationStore } from './LegendQueryBaseStoreProvider.js';
 import { UpdateExistingServiceQuerySetupStore } from '../stores/UpdateExistingServiceQuerySetupStore.js';

package/src/index.ts

@@ -14,22 +14,19 @@
  * limitations under the License.
  */
 
+// application
 export * from './application/LegendQuery.js';
-export * from './components/LegendQueryBaseStoreProvider.js';
-export * from './stores/LegendQueryBaseStore.js';
-
-export {
-  QueryEditorStoreContext,
-  useQueryEditorStore,
-} from './components/QueryEditorStoreProvider.js';
-export { QueryEditor } from './components/QueryEditor.js';
-
-export { LegendQueryPluginManager } from './application/LegendQueryPluginManager.js';
+export * from './application/LegendQueryApplicationConfig.js';
+export * from './application/LegendQueryPluginManager.js';
+export * from './application/LegendQueryEvent.js';
+export * from './application/LegendQueryEventHelper.js';
+export { useLegendQueryApplicationStore } from './components/LegendQueryBaseStoreProvider.js';
+export type { LegendQueryApplicationStore } from './stores/LegendQueryBaseStore.js';
+export { generateExistingQueryEditorRoute } from './application/LegendQueryNavigation.js';
 
+// stores
 export * from './stores/LegendQueryApplicationPlugin.js';
-export * from './stores/LegendQueryRouter.js';
 export { BaseQuerySetupStore } from './stores/QuerySetupStore.js';
-export { LegendQueryApplicationConfig } from './application/LegendQueryApplicationConfig.js';
 export {
   createViewProjectHandler,
   createViewSDLCProjectHandler,
@@ -37,9 +34,10 @@ export {
   ExistingQueryEditorStore,
   type QueryExportConfiguration,
 } from './stores/QueryEditorStore.js';
+
+// components
 export {
-  LegendQueryBaseStore,
-  type LegendQueryApplicationStore,
-} from './stores/LegendQueryBaseStore.js';
-export { LEGEND_QUERY_APP_EVENT } from './stores/LegendQueryAppEvent.js';
-export { LegendQueryEventService } from './stores/LegendQueryEventService.js';
+  QueryEditorStoreContext,
+  useQueryEditorStore,
+} from './components/QueryEditorStoreProvider.js';
+export { QueryEditor } from './components/QueryEditor.js';

package/src/stores/CloneServiceQuerySetupStore.ts

@@ -31,7 +31,7 @@ import {
 } from '@finos/legend-shared';
 import type { EntitiesWithOrigin, Entity } from '@finos/legend-storage';
 import { action, flow, flowResult, makeObservable, observable } from 'mobx';
-import { LEGEND_QUERY_APP_EVENT } from './LegendQueryAppEvent.js';
+import { LEGEND_QUERY_APP_EVENT } from '../application/LegendQueryEvent.js';
 import type { LegendQueryApplicationStore } from './LegendQueryBaseStore.js';
 import { BaseQuerySetupStore } from './QuerySetupStore.js';
 import type { Service } from '@finos/legend-graph';

package/src/stores/CreateMappingQuerySetupStore.ts

@@ -39,7 +39,7 @@ import {
   makeObservable,
   observable,
 } from 'mobx';
-import { LEGEND_QUERY_APP_EVENT } from './LegendQueryAppEvent.js';
+import { LEGEND_QUERY_APP_EVENT } from '../application/LegendQueryEvent.js';
 import type { LegendQueryApplicationStore } from './LegendQueryBaseStore.js';
 import { BaseQuerySetupStore } from './QuerySetupStore.js';
 

package/src/stores/LegendQueryBaseStore.ts

@@ -17,7 +17,7 @@
 import type { DepotServerClient } from '@finos/legend-server-depot';
 import {
   type ApplicationStore,
-  ApplicationTelemetry,
+  LegendApplicationTelemetryHelper,
   APPLICATION_EVENT,
 } from '@finos/legend-application';
 import type { LegendQueryPluginManager } from '../application/LegendQueryPluginManager.js';
@@ -79,9 +79,7 @@ export class LegendQueryBaseStore {
     } catch (error) {
       assertErrorThrown(error);
       this.applicationStore.logService.error(
-        LogEvent.create(
-          APPLICATION_EVENT.APPLICATION_IDENTITY_AUTO_FETCH__FAILURE,
-        ),
+        LogEvent.create(APPLICATION_EVENT.IDENTITY_AUTO_FETCH__FAILURE),
         error,
       );
       this.applicationStore.notificationService.notifyWarning(error.message);
@@ -90,7 +88,7 @@ export class LegendQueryBaseStore {
     // setup telemetry service
     this.applicationStore.telemetryService.setup();
 
-    ApplicationTelemetry.logEvent_ApplicationInitializationSucceeded(
+    LegendApplicationTelemetryHelper.logEvent_ApplicationInitializationSucceeded(
       this.applicationStore.telemetryService,
       this.applicationStore,
     );

package/src/stores/LoadProjectServiceQuerySetupStore.ts

@@ -27,7 +27,7 @@ import {
 import { parseProjectIdentifier } from '@finos/legend-storage';
 import { flow, makeObservable, observable } from 'mobx';
 import type { LegendQueryApplicationStore } from './LegendQueryBaseStore.js';
-import { EXTERNAL_APPLICATION_NAVIGATION__generateStudioUpdateProjectServiceQueryUrl } from './LegendQueryRouter.js';
+import { EXTERNAL_APPLICATION_NAVIGATION__generateStudioUpdateProjectServiceQueryUrl } from '../application/LegendQueryNavigation.js';
 import { BaseQuerySetupStore } from './QuerySetupStore.js';
 
 export class LoadProjectServiceQuerySetupStore extends BaseQuerySetupStore {