@finos/legend-application-query 12.0.9 → 13.0.1

package/lib/stores/QueryProductionizerSetupStore.js

@@ -13,36 +13,44 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { DEFAULT_TYPEAHEAD_SEARCH_LIMIT, DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH, } from '@finos/legend-application';
-import { QuerySearchSpecification, } from '@finos/legend-graph';
+import { QueryLoaderState } from '@finos/legend-query-builder';
 import { StoreProjectData, } from '@finos/legend-server-depot';
-import { ActionState, assertErrorThrown, } from '@finos/legend-shared';
 import { parseProjectIdentifier } from '@finos/legend-storage';
-import { flow, makeObservable, observable } from 'mobx';
 import { EXTERNAL_APPLICATION_NAVIGATION__generateStudioProductionizeQueryUrl } from '../__lib__/LegendQueryNavigation.js';
 import { BaseQuerySetupStore } from './QuerySetupStore.js';
+import { LegendQueryUserDataHelper } from '../__lib__/LegendQueryUserDataHelper.js';
+import { quantifyList } from '@finos/legend-shared';
+import { LegendQueryTelemetryHelper } from '../__lib__/LegendQueryTelemetryHelper.js';
 export class QueryProductionizerSetupStore extends BaseQuerySetupStore {
-    loadQueriesState = ActionState.create();
-    loadQueryState = ActionState.create();
-    queries = [];
-    currentQuery;
-    currentQueryInfo;
+    queryLoaderState;
     constructor(applicationStore, depotServerClient) {
         super(applicationStore, depotServerClient);
-        makeObservable(this, {
-            queries: observable,
-            currentQuery: observable,
-            currentQueryInfo: observable,
-            setCurrentQuery: flow,
-            loadQueries: flow,
+        this.queryLoaderState = new QueryLoaderState(applicationStore, this.graphManagerState, {
+            loadQuery: (query) => {
+                this.queryLoaderState.setQueryLoaderDialogOpen(false);
+                this.loadQueryProductionizer(query).catch(applicationStore.alertUnhandledError);
+            },
+            fetchDefaultQueries: () => this.graphManagerState.graphManager.getQueries(LegendQueryUserDataHelper.getRecentlyViewedQueries(this.applicationStore.userDataService)),
+            generateDefaultQueriesSummaryText: (queries) => queries.length
+                ? `Showing ${quantifyList(queries, 'recently viewed query', 'recently viewed queries')}`
+                : `No recently viewed queries`,
+            onQueryDeleted: (query) => LegendQueryUserDataHelper.removeRecentlyViewedQuery(this.applicationStore.userDataService, query.id),
+            onQueryRenamed: (query) => {
+                LegendQueryTelemetryHelper.logEvent_RenameQuerySucceeded(applicationStore.telemetryService, {
+                    query: {
+                        id: query.id,
+                        name: query.name,
+                        groupId: query.groupId,
+                        artifactId: query.artifactId,
+                        versionId: query.versionId,
+                    },
+                });
+            },
         });
     }
-    async loadQueryProductionizer() {
-        if (!this.currentQuery) {
-            return;
-        }
+    async loadQueryProductionizer(selectedQuery) {
         // fetch project data
-        const project = StoreProjectData.serialization.fromJson(await this.depotServerClient.getProject(this.currentQuery.groupId, this.currentQuery.artifactId));
+        const project = StoreProjectData.serialization.fromJson(await this.depotServerClient.getProject(selectedQuery.groupId, selectedQuery.artifactId));
         // find the matching SDLC instance
         const projectIDPrefix = parseProjectIdentifier(project.projectId).prefix;
         const matchingSDLCEntry = this.applicationStore.config.studioInstances.find((entry) => entry.sdlcProjectIDPrefix === projectIDPrefix);
@@ -52,52 +60,11 @@ export class QueryProductionizerSetupStore extends BaseQuerySetupStore {
                 prompt: 'Please do not close the application',
                 showLoading: true,
             });
-            this.applicationStore.navigationService.navigator.goToAddress(EXTERNAL_APPLICATION_NAVIGATION__generateStudioProductionizeQueryUrl(matchingSDLCEntry.url, this.currentQuery.id));
+            this.applicationStore.navigationService.navigator.goToAddress(EXTERNAL_APPLICATION_NAVIGATION__generateStudioProductionizeQueryUrl(matchingSDLCEntry.url, selectedQuery.id));
         }
         else {
             this.applicationStore.notificationService.notifyWarning(`Can't find the corresponding SDLC instance to productionize the query`);
         }
     }
-    *setCurrentQuery(queryId) {
-        if (queryId) {
-            try {
-                this.loadQueryState.inProgress();
-                this.currentQuery =
-                    (yield this.graphManagerState.graphManager.getLightQuery(queryId));
-                const queryInfo = (yield this.graphManagerState.graphManager.getQueryInfo(queryId));
-                queryInfo.content =
-                    (yield this.graphManagerState.graphManager.prettyLambdaContent(queryInfo.content));
-                this.currentQueryInfo = queryInfo;
-            }
-            catch (error) {
-                assertErrorThrown(error);
-                this.applicationStore.notificationService.notifyError(error);
-            }
-            finally {
-                this.loadQueryState.reset();
-            }
-        }
-        else {
-            this.currentQuery = undefined;
-        }
-    }
-    *loadQueries(searchText) {
-        const isValidSearchString = searchText.length >= DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH;
-        this.loadQueriesState.inProgress();
-        try {
-            const searchSpecification = new QuerySearchSpecification();
-            searchSpecification.searchTerm = isValidSearchString
-                ? searchText
-                : undefined;
-            searchSpecification.limit = DEFAULT_TYPEAHEAD_SEARCH_LIMIT;
-            this.queries = (yield this.graphManagerState.graphManager.searchQueries(searchSpecification));
-            this.loadQueriesState.pass();
-        }
-        catch (error) {
-            assertErrorThrown(error);
-            this.applicationStore.notificationService.notifyError(error);
-            this.loadQueriesState.fail();
-        }
-    }
 }
 //# sourceMappingURL=QueryProductionizerSetupStore.js.map

package/lib/stores/QueryProductionizerSetupStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryProductionizerSetupStore.js","sourceRoot":"","sources":["../../src/stores/QueryProductionizerSetupStore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryProductionizerSetupStore.js","sourceRoot":"","sources":["../../src/stores/QueryProductionizerSetupStore.ts"],"names":[],"mappings":"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"}

package/lib/stores/QuerySetupStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QuerySetupStore.d.ts","sourceRoot":"","sources":["../../src/stores/QuerySetupStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EACL,KAAK,WAAW,EAChB,WAAW,EAKZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAGpE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,4CAA4C,CAAC;AAC3F,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAE7E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAEvF,8BAAsB,mBAAmB;IACvC,QAAQ,CAAC,gBAAgB,EAAE,2BAA2B,CAAC;IACvD,QAAQ,CAAC,iBAAiB,EAAE,sBAAsB,CAAC;IACnD,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC9C,QAAQ,CAAC,aAAa,EAAE,wBAAwB,CAAC;IAEjD,QAAQ,CAAC,SAAS,cAAwB;gBAGxC,gBAAgB,EAAE,2BAA2B,EAC7C,iBAAiB,EAAE,iBAAiB;IAerC,UAAU,IAAI,WAAW,CAAC,IAAI,CAAC;CAmCjC;AAED,qBAAa,0BAA0B;IACrC,QAAQ,CAAC,gBAAgB,EAAE,2BAA2B,CAAC;IACvD,QAAQ,CAAC,aAAa,EAAE,wBAAwB,CAAC;IAEjD,QAAQ,CAAC,SAAS,cAAwB;IAE1C,OAAO,EAAE,6BAA6B,EAAE,CAAM;IAC9C,IAAI,EAAE,MAAM,EAAE,CAAM;IACpB,aAAa,UAAS;IACtB,mBAAmB,UAAS;IAC5B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;gBAEpB,gBAAgB,EAAE,2BAA2B;IAyBzD,IAAI,YAAY,IAAI,OAAO,CAI1B;IAED,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAKpC,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAK1C,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAQ5C,WAAW,IAAI,IAAI;IAOnB,OAAO,CAAC,oBAAoB;IAU5B,UAAU,CACR,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,IAAI;CAkBR"}
+{"version":3,"file":"QuerySetupStore.d.ts","sourceRoot":"","sources":["../../src/stores/QuerySetupStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EACL,KAAK,WAAW,EAChB,WAAW,EAKZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAMpE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,4CAA4C,CAAC;AAC3F,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAE7E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAEvF,8BAAsB,mBAAmB;IACvC,QAAQ,CAAC,gBAAgB,EAAE,2BAA2B,CAAC;IACvD,QAAQ,CAAC,iBAAiB,EAAE,sBAAsB,CAAC;IACnD,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC9C,QAAQ,CAAC,aAAa,EAAE,wBAAwB,CAAC;IAEjD,QAAQ,CAAC,SAAS,cAAwB;gBAGxC,gBAAgB,EAAE,2BAA2B,EAC7C,iBAAiB,EAAE,iBAAiB;IAerC,UAAU,IAAI,WAAW,CAAC,IAAI,CAAC;CAyCjC;AAED,qBAAa,0BAA0B;IACrC,QAAQ,CAAC,gBAAgB,EAAE,2BAA2B,CAAC;IACvD,QAAQ,CAAC,aAAa,EAAE,wBAAwB,CAAC;IAEjD,QAAQ,CAAC,SAAS,cAAwB;IAE1C,OAAO,EAAE,6BAA6B,EAAE,CAAM;IAC9C,IAAI,EAAE,MAAM,EAAE,CAAM;IACpB,aAAa,UAAS;IACtB,mBAAmB,UAAS;IAC5B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;gBAEpB,gBAAgB,EAAE,2BAA2B;IAyBzD,IAAI,YAAY,IAAI,OAAO,CAI1B;IAED,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAKpC,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAK1C,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAQ5C,WAAW,IAAI,IAAI;IAOnB,OAAO,CAAC,oBAAoB;IAU5B,UAAU,CACR,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,IAAI;CAkBR"}

package/lib/stores/QuerySetupStore.js

@@ -17,7 +17,7 @@ import { action, computed, flow, makeObservable, observable } from 'mobx';
 import { ActionState, assertErrorThrown, LogEvent, uniq, isNonNullable, } from '@finos/legend-shared';
 import { BasicGraphManagerState } from '@finos/legend-graph';
 import { LEGEND_QUERY_APP_EVENT } from '../__lib__/LegendQueryEvent.js';
-import { DEFAULT_TAB_SIZE } from '@finos/legend-application';
+import { DEFAULT_TAB_SIZE, LEGEND_APPLICATION_COLOR_THEME, } from '@finos/legend-application';
 import { generateQuerySetupRoute } from '../__lib__/LegendQueryNavigation.js';
 export class BaseQuerySetupStore {
     applicationStore;
@@ -38,6 +38,9 @@ export class BaseQuerySetupStore {
         if (!this.initState.isInInitialState) {
             return;
         }
+        // TODO?: remove this when we properly support theme everywhere
+        // See https://github.com/finos/legend-studio/issues/264
+        this.applicationStore.layoutService.setColorTheme(LEGEND_APPLICATION_COLOR_THEME.DEFAULT_DARK);
         try {
             this.initState.inProgress();
             yield this.graphManagerState.graphManager.initialize({

package/lib/stores/QuerySetupStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"QuerySetupStore.js","sourceRoot":"","sources":["../../src/stores/QuerySetupStore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QuerySetupStore.js","sourceRoot":"","sources":["../../src/stores/QuerySetupStore.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-query",
-  "version": "12.0.9",
+  "version": "13.0.1",
   "description": "Legend Query application core",
   "keywords": [
     "legend",
@@ -43,14 +43,14 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "15.0.6",
-    "@finos/legend-art": "7.0.7",
-    "@finos/legend-graph": "28.1.3",
-    "@finos/legend-lego": "0.1.12",
-    "@finos/legend-query-builder": "3.1.0",
-    "@finos/legend-server-depot": "6.0.3",
-    "@finos/legend-shared": "10.0.2",
-    "@finos/legend-storage": "3.0.52",
+    "@finos/legend-application": "15.0.8",
+    "@finos/legend-art": "7.0.9",
+    "@finos/legend-graph": "28.1.5",
+    "@finos/legend-lego": "1.0.0",
+    "@finos/legend-query-builder": "3.2.1",
+    "@finos/legend-server-depot": "6.0.5",
+    "@finos/legend-shared": "10.0.4",
+    "@finos/legend-storage": "3.0.54",
     "@testing-library/react": "14.0.0",
     "@types/react": "18.2.0",
     "@types/react-dom": "18.2.1",
@@ -61,7 +61,7 @@
     "serializr": "3.0.2"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.0.57",
+    "@finos/legend-dev-utils": "2.0.58",
     "@jest/globals": "29.5.0",
     "cross-env": "7.0.3",
     "eslint": "8.39.0",

package/src/__lib__/LegendQueryEvent.ts

@@ -21,6 +21,7 @@ export enum LEGEND_QUERY_APP_EVENT {
   VIEW_QUERY__SUCCESS = 'query-editor.view-query.success',
   CREATE_QUERY__SUCCESS = 'query-editor.create-query.success',
   UPDATE_QUERY__SUCCESS = 'query-editor.update-query.success',
+  RENAME_QUERY__SUCCESS = 'query-editor.rename.query.success',
 
   VIEW_PROJECT__LAUNCH = 'query-editor.view-project.launch',
   VIEW_SDLC_PROJECT__LAUNCH = 'query-editor.view-sdlc-project.launch',

package/src/__lib__/LegendQueryTelemetryHelper.ts

@@ -33,54 +33,47 @@ type Query_TelemetryData = {
 
 export class LegendQueryTelemetryHelper {
   static logEvent_ViewQuerySucceeded(
-    telemetryService: TelemetryService,
+    service: TelemetryService,
     data: Query_TelemetryData,
   ): void {
-    telemetryService.logEvent(LEGEND_QUERY_APP_EVENT.VIEW_QUERY__SUCCESS, data);
+    service.logEvent(LEGEND_QUERY_APP_EVENT.VIEW_QUERY__SUCCESS, data);
   }
 
   static logEvent_CreateQuerySucceeded(
-    telemetryService: TelemetryService,
+    service: TelemetryService,
     data: Query_TelemetryData,
   ): void {
-    telemetryService.logEvent(
-      LEGEND_QUERY_APP_EVENT.CREATE_QUERY__SUCCESS,
-      data,
-    );
+    service.logEvent(LEGEND_QUERY_APP_EVENT.CREATE_QUERY__SUCCESS, data);
   }
 
   static logEvent_UpdateQuerySucceeded(
-    telemetryService: TelemetryService,
+    service: TelemetryService,
     data: Query_TelemetryData,
   ): void {
-    telemetryService.logEvent(
-      LEGEND_QUERY_APP_EVENT.UPDATE_QUERY__SUCCESS,
-      data,
-    );
+    service.logEvent(LEGEND_QUERY_APP_EVENT.UPDATE_QUERY__SUCCESS, data);
   }
 
-  static logEvent_QueryViewProjectLaunched(
-    telemetryService: TelemetryService,
-  ): void {
-    telemetryService.logEvent(LEGEND_QUERY_APP_EVENT.VIEW_PROJECT__LAUNCH, {});
+  static logEvent_QueryViewProjectLaunched(service: TelemetryService): void {
+    service.logEvent(LEGEND_QUERY_APP_EVENT.VIEW_PROJECT__LAUNCH, {});
   }
 
   static logEvent_QueryViewSdlcProjectLaunched(
-    telemetryService: TelemetryService,
+    service: TelemetryService,
   ): void {
-    telemetryService.logEvent(
-      LEGEND_QUERY_APP_EVENT.VIEW_SDLC_PROJECT__LAUNCH,
-      {},
-    );
+    service.logEvent(LEGEND_QUERY_APP_EVENT.VIEW_SDLC_PROJECT__LAUNCH, {});
   }
 
   static logEvent_GraphInitializationSucceeded(
-    telemetryService: TelemetryService,
+    service: TelemetryService,
     data: GraphInitializationReport,
   ): void {
-    telemetryService.logEvent(
-      GRAPH_MANAGER_EVENT.INITIALIZE_GRAPH__SUCCESS,
-      data,
-    );
+    service.logEvent(GRAPH_MANAGER_EVENT.INITIALIZE_GRAPH__SUCCESS, data);
+  }
+
+  static logEvent_RenameQuerySucceeded(
+    service: TelemetryService,
+    data: Query_TelemetryData,
+  ): void {
+    service.logEvent(LEGEND_QUERY_APP_EVENT.RENAME_QUERY__SUCCESS, data);
   }
 }

package/src/__lib__/LegendQueryUserDataHelper.ts

@@ -0,0 +1,92 @@
+/**
+ * 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 type { UserDataService } from '@finos/legend-application';
+import { returnUndefOnError } from '@finos/legend-shared';
+import { createSimpleSchema, deserialize, list, primitive } from 'serializr';
+
+export enum LEGEND_QUERY_USER_DATA_KEY {
+  RECENTLY_VIEWED_QUERIES = 'query-editor.recent-queries',
+}
+
+const USER_DATA_RECENTLY_VIEWED_QUERIES_LIMIT = 10;
+type RecentlyViewedQueriesData = string[];
+
+export class LegendQueryUserDataHelper {
+  static getRecentlyViewedQueries(
+    service: UserDataService,
+  ): RecentlyViewedQueriesData {
+    const data = service.getObjectValue(
+      LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_QUERIES,
+    );
+    return (
+      // TODO: think of a better way to deserialize this data, maybe like settings, use JSON schema
+      // See https://github.com/finos/legend-studio/issues/407
+      returnUndefOnError(
+        () =>
+          (
+            deserialize(
+              createSimpleSchema({
+                data: list(primitive()),
+              }),
+              {
+                data,
+              },
+            ) as { data: RecentlyViewedQueriesData }
+          ).data,
+      ) ?? []
+    );
+  }
+
+  static removeRecentlyViewedQuery(
+    service: UserDataService,
+    queryId: string,
+  ): void {
+    const queries = LegendQueryUserDataHelper.getRecentlyViewedQueries(service);
+    const idx = queries.findIndex((query) => query === queryId);
+    if (idx !== -1) {
+      return;
+    }
+    queries.splice(idx, 1);
+    service.persistValue(
+      LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_QUERIES,
+      queries,
+    );
+  }
+
+  static addRecentlyViewedQuery(
+    service: UserDataService,
+    queryId: string,
+  ): void {
+    const queries = LegendQueryUserDataHelper.getRecentlyViewedQueries(service);
+    const idx = queries.findIndex((query) => query === queryId);
+    if (idx === -1) {
+      if (queries.length < USER_DATA_RECENTLY_VIEWED_QUERIES_LIMIT) {
+        queries.unshift(queryId);
+      } else {
+        queries.pop();
+        queries.unshift(queryId);
+      }
+    } else {
+      queries.splice(idx, 1);
+      queries.unshift(queryId);
+    }
+    service.persistValue(
+      LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_QUERIES,
+      queries,
+    );
+  }
+}

package/src/components/EditExistingQuerySetup.tsx

@@ -14,40 +14,19 @@
  * limitations under the License.
  */
 
-import {
-  type SelectComponent,
-  ArrowLeftIcon,
-  ArrowRightIcon,
-  BlankPanelContent,
-  clsx,
-  CustomSelectorInput,
-  PanelLoadingIndicator,
-  SearchIcon,
-  UserIcon,
-} from '@finos/legend-art';
-import { debounce, guaranteeType } from '@finos/legend-shared';
-import { flowResult } from 'mobx';
+import { ArrowLeftIcon } from '@finos/legend-art';
+import { guaranteeType } from '@finos/legend-shared';
 import { observer, useLocalObservable } from 'mobx-react-lite';
-import { useContext, useEffect, useMemo, useRef, useState } from 'react';
-import {
-  generateExistingQueryEditorRoute,
-  generateQuerySetupRoute,
-} from '../__lib__/LegendQueryNavigation.js';
+import { useContext } from 'react';
+import { generateQuerySetupRoute } from '../__lib__/LegendQueryNavigation.js';
 import { useApplicationStore } from '@finos/legend-application';
-import {
-  type QueryOption,
-  buildQueryOption,
-} from '@finos/legend-query-builder';
 import {
   useLegendQueryApplicationStore,
   useLegendQueryBaseStore,
 } from './LegendQueryFrameworkProvider.js';
 import { EditExistingQuerySetupStore } from '../stores/EditExistingQuerySetupStore.js';
 import { BaseQuerySetup, BaseQuerySetupStoreContext } from './QuerySetup.js';
-import {
-  CODE_EDITOR_LANGUAGE,
-  CodeEditor,
-} from '@finos/legend-lego/code-editor';
+import { QueryLoader } from '@finos/legend-query-builder';
 
 const EditExistingQuerySetupStoreProvider: React.FC<{
   children: React.ReactNode;
@@ -78,8 +57,6 @@ const useEditExistingQuerySetupStore = (): EditExistingQuerySetupStore =>
 const EditExistingQuerySetupContent = observer(() => {
   const setupStore = useEditExistingQuerySetupStore();
   const applicationStore = useApplicationStore();
-  const querySearchRef = useRef<SelectComponent>(null);
-  const [searchText, setSearchText] = useState('');
 
   // actions
   const back = (): void => {
@@ -87,112 +64,6 @@ const EditExistingQuerySetupContent = observer(() => {
       generateQuerySetupRoute(),
     );
   };
-  const next = (): void => {
-    if (setupStore.currentQuery) {
-      applicationStore.navigationService.navigator.goToLocation(
-        generateExistingQueryEditorRoute(setupStore.currentQuery.id),
-      );
-    }
-  };
-  const canProceed = setupStore.currentQuery;
-
-  // query
-  const queryOptions = setupStore.queries.map(buildQueryOption);
-  const selectedQueryOption = setupStore.currentQuery
-    ? buildQueryOption(setupStore.currentQuery)
-    : null;
-  const onQueryOptionChange = (option: QueryOption | null): void => {
-    if (option?.value !== setupStore.currentQuery) {
-      setupStore.setCurrentQuery(option?.value.id);
-    }
-  };
-  const formatQueryOptionLabel = (option: QueryOption): React.ReactNode => {
-    const deleteQuery: React.MouseEventHandler<HTMLButtonElement> = (event) => {
-      event.preventDefault();
-      event.stopPropagation();
-      setupStore.graphManagerState.graphManager
-        .deleteQuery(option.value.id)
-        .then(() =>
-          flowResult(setupStore.loadQueries('')).catch(
-            applicationStore.alertUnhandledError,
-          ),
-        )
-        .catch(applicationStore.alertUnhandledError);
-    };
-    if (option.value.id === setupStore.currentQuery?.id) {
-      return option.label;
-    }
-    return (
-      <div className="query-setup__existing-query__query-option">
-        <div
-          className="query-setup__existing-query__query-option__label"
-          title={option.label}
-        >
-          {option.label}
-        </div>
-        {setupStore.showCurrentUserQueriesOnly && (
-          <button
-            className="query-setup__existing-query__query-option__action"
-            tabIndex={-1}
-            onClick={deleteQuery}
-          >
-            Delete
-          </button>
-        )}
-        {!setupStore.showCurrentUserQueriesOnly &&
-          Boolean(option.value.owner) && (
-            <div
-              className={clsx(
-                'query-setup__existing-query__query-option__user',
-                {
-                  'query-setup__existing-query__query-option__user--mine':
-                    option.value.isCurrentUserQuery,
-                },
-              )}
-            >
-              {option.value.isCurrentUserQuery ? 'mine' : option.value.owner}
-            </div>
-          )}
-      </div>
-    );
-  };
-
-  // search text
-  const debouncedLoadQueries = useMemo(
-    () =>
-      debounce((input: string): void => {
-        flowResult(setupStore.loadQueries(input)).catch(
-          applicationStore.alertUnhandledError,
-        );
-      }, 500),
-    [applicationStore, setupStore],
-  );
-  const onSearchTextChange = (value: string): void => {
-    if (value !== searchText) {
-      setSearchText(value);
-      debouncedLoadQueries.cancel();
-      debouncedLoadQueries(value);
-    }
-  };
-
-  // show current user queries only
-  const toggleShowCurrentUserQueriesOnly = (): void => {
-    setupStore.setShowCurrentUserQueriesOnly(
-      !setupStore.showCurrentUserQueriesOnly,
-    );
-    debouncedLoadQueries.cancel();
-    debouncedLoadQueries(searchText);
-  };
-
-  useEffect(() => {
-    flowResult(setupStore.loadQueries('')).catch(
-      applicationStore.alertUnhandledError,
-    );
-  }, [setupStore, applicationStore]);
-
-  useEffect(() => {
-    querySearchRef.current?.focus();
-  }, []);
 
   return (
     <div className="query-setup__wizard query-setup__existing-query">
@@ -207,77 +78,12 @@ const EditExistingQuerySetupContent = observer(() => {
         <div className="query-setup__wizard__header__title">
           Loading an existing query...
         </div>
-        <button
-          className={clsx('query-setup__wizard__header__btn', {
-            'query-setup__wizard__header__btn--ready': canProceed,
-          })}
-          onClick={next}
-          disabled={!canProceed}
-          title="Edit query"
-        >
-          <ArrowRightIcon />
-        </button>
       </div>
-      <div className="query-setup__wizard__content">
-        <div className="query-setup__wizard__group query-setup__wizard__group--inline">
-          <div className="query-setup__wizard__group__title">
-            <SearchIcon />
-          </div>
-          <div className="query-setup__existing-query__input">
-            <CustomSelectorInput
-              ref={querySearchRef}
-              className="query-setup__wizard__selector"
-              options={queryOptions}
-              isLoading={setupStore.loadQueriesState.isInProgress}
-              onInputChange={onSearchTextChange}
-              inputValue={searchText}
-              onChange={onQueryOptionChange}
-              value={selectedQueryOption}
-              placeholder="Search for query by name..."
-              isClearable={true}
-              escapeClearsValue={true}
-              darkMode={true}
-              formatOptionLabel={formatQueryOptionLabel}
-            />
-            <button
-              className={clsx('query-setup__existing-query__btn', {
-                'query-setup__existing-query__btn--active':
-                  setupStore.showCurrentUserQueriesOnly,
-              })}
-              tabIndex={-1}
-              title={`[${
-                setupStore.showCurrentUserQueriesOnly ? 'on' : 'off'
-              }] Toggle show only queries of current user`}
-              onClick={toggleShowCurrentUserQueriesOnly}
-            >
-              <UserIcon />
-            </button>
-          </div>
-        </div>
-        <div className="query-setup__existing-query__preview">
-          <PanelLoadingIndicator
-            isLoading={setupStore.loadQueryState.isInProgress}
-          />
-          {setupStore.currentQuery && (
-            <>
-              {!setupStore.currentQueryInfo && (
-                <BlankPanelContent>{`Can't preview query`}</BlankPanelContent>
-              )}
-              {setupStore.currentQueryInfo && (
-                <CodeEditor
-                  inputValue={setupStore.currentQueryInfo.content}
-                  isReadOnly={true}
-                  language={CODE_EDITOR_LANGUAGE.PURE}
-                  showMiniMap={false}
-                  hideGutter={true}
-                />
-              )}
-            </>
-          )}
-          {!setupStore.currentQuery && (
-            <BlankPanelContent>No query to preview</BlankPanelContent>
-          )}
-        </div>
+      <div className="query-setup__existing-query__content">
+        <QueryLoader
+          queryLoaderState={setupStore.queryLoaderState}
+          loadActionLabel="load query"
+        />
       </div>
     </div>
   );