@finos/legend-application-query 13.4.0 → 13.4.2

package/lib/stores/data-space/DataSpaceTemplateQueryCreatorStore.js

@@ -0,0 +1,104 @@
+/**
+ * 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 { extractElementNameFromPath, } from '@finos/legend-graph';
+import { StoreProjectData, } from '@finos/legend-server-depot';
+import { filterByType, guaranteeNonNullable, uuid } from '@finos/legend-shared';
+import { QueryEditorStore, createViewProjectHandler, createViewSDLCProjectHandler, } from '../QueryEditorStore.js';
+import { DSL_DataSpace_getGraphManagerExtension, DataSpaceExecutableTemplate, getDataSpace, retrieveAnalyticsResultCache, } from '@finos/legend-extension-dsl-data-space/graph';
+import { DataSpaceProjectInfo, DataSpaceQueryBuilderState, createQueryClassTaggedValue, createQueryDataSpaceTaggedValue, } from '@finos/legend-extension-dsl-data-space/application';
+import { generateDataSpaceTemplateQueryCreatorRoute } from '../../__lib__/DSL_DataSpace_LegendQueryNavigation.js';
+export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
+    groupId;
+    artifactId;
+    versionId;
+    dataSpacePath;
+    templateQueryId;
+    templateQueryTitle;
+    constructor(applicationStore, depotServerClient, groupId, artifactId, versionId, dataSpacePath, templateQueryId) {
+        super(applicationStore, depotServerClient);
+        this.groupId = groupId;
+        this.artifactId = artifactId;
+        this.versionId = versionId;
+        this.dataSpacePath = dataSpacePath;
+        this.templateQueryId = templateQueryId;
+    }
+    getProjectInfo() {
+        return {
+            groupId: this.groupId,
+            artifactId: this.artifactId,
+            versionId: this.versionId,
+        };
+    }
+    async initializeQueryBuilderState() {
+        const dataSpace = getDataSpace(this.dataSpacePath, this.graphManagerState.graph);
+        const dataSpaceExecutableTemplate = guaranteeNonNullable(dataSpace.executables
+            ?.filter(filterByType(DataSpaceExecutableTemplate))
+            .find((executable) => executable.id === this.templateQueryId), `Can't find template query with id '${this.templateQueryId}'`);
+        const executionContext = guaranteeNonNullable(dataSpaceExecutableTemplate.executionContextKey
+            ? dataSpace.executionContexts.filter((ec) => ec.name === dataSpaceExecutableTemplate.executionContextKey)[0]
+            : dataSpace.defaultExecutionContext, `Can't find execution context '${dataSpaceExecutableTemplate.executionContextKey}'`);
+        this.templateQueryTitle = dataSpaceExecutableTemplate.title;
+        let dataSpaceAnalysisResult;
+        try {
+            const project = StoreProjectData.serialization.fromJson(await this.depotServerClient.getProject(this.groupId, this.artifactId));
+            dataSpaceAnalysisResult = await DSL_DataSpace_getGraphManagerExtension(this.graphManagerState.graphManager).retrieveDataSpaceAnalysisFromCache(() => retrieveAnalyticsResultCache(project, this.versionId, dataSpace.path, this.depotServerClient));
+        }
+        catch {
+            // do nothing
+        }
+        const projectInfo = new DataSpaceProjectInfo(this.groupId, this.artifactId, this.versionId, createViewProjectHandler(this.applicationStore), createViewSDLCProjectHandler(this.applicationStore, this.depotServerClient));
+        const sourceInfo = {
+            groupId: projectInfo.groupId,
+            artifactId: projectInfo.artifactId,
+            versionId: projectInfo.versionId,
+            dataSpace: dataSpace.path,
+        };
+        const queryBuilderState = new DataSpaceQueryBuilderState(this.applicationStore, this.graphManagerState, this.depotServerClient, dataSpace, executionContext, (dataSpaceInfo) => {
+            this.applicationStore.notificationService.notifyWarning(`Can't switch data space to visit current template query`);
+        }, true, dataSpaceAnalysisResult, (ec) => {
+            this.applicationStore.navigationService.navigator.updateCurrentLocation(generateDataSpaceTemplateQueryCreatorRoute(this.groupId, this.artifactId, this.versionId, dataSpace.path, this.templateQueryId));
+        }, undefined, undefined, projectInfo, this.applicationStore.config.options.queryBuilderConfig, sourceInfo);
+        queryBuilderState.setExecutionContext(executionContext);
+        queryBuilderState.propagateExecutionContextChange(executionContext);
+        queryBuilderState.initializeWithQuery(dataSpaceExecutableTemplate.query);
+        return queryBuilderState;
+    }
+    getPersistConfiguration(lambda, options) {
+        return {
+            defaultName: options?.update
+                ? `${extractElementNameFromPath(this.dataSpacePath)}`
+                : `New Query for ${extractElementNameFromPath(this.dataSpacePath)}[${this.templateQueryId}]`,
+            decorator: (query) => {
+                query.id = uuid();
+                query.groupId = this.groupId;
+                query.artifactId = this.artifactId;
+                query.versionId = this.versionId;
+                if (this.queryBuilderState?.class) {
+                    query.taggedValues = [
+                        createQueryDataSpaceTaggedValue(this.dataSpacePath),
+                        createQueryClassTaggedValue(this.queryBuilderState.class.path),
+                    ];
+                }
+                else {
+                    query.taggedValues = [
+                        createQueryDataSpaceTaggedValue(this.dataSpacePath),
+                    ];
+                }
+            },
+        };
+    }
+}
+//# sourceMappingURL=DataSpaceTemplateQueryCreatorStore.js.map

package/lib/stores/data-space/DataSpaceTemplateQueryCreatorStore.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-query",
-  "version": "13.4.0",
+  "version": "13.4.2",
   "description": "Legend Query application core",
   "keywords": [
     "legend",
@@ -45,9 +45,10 @@
   "dependencies": {
     "@finos/legend-application": "15.0.74",
     "@finos/legend-art": "7.1.26",
-    "@finos/legend-graph": "31.9.10",
-    "@finos/legend-lego": "1.2.23",
-    "@finos/legend-query-builder": "4.14.24",
+    "@finos/legend-extension-dsl-data-space": "10.3.1",
+    "@finos/legend-graph": "31.9.11",
+    "@finos/legend-lego": "1.2.24",
+    "@finos/legend-query-builder": "4.14.25",
     "@finos/legend-server-depot": "6.0.39",
     "@finos/legend-shared": "10.0.34",
     "@finos/legend-storage": "3.0.84",

package/src/__lib__/DSL_DataSpace_LegendQueryDocumentation.ts

@@ -0,0 +1,19 @@
+/**
+ * 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.
+ */
+
+export enum DSL_DATA_SPACE_LEGEND_QUERY_DOCUMENTATION_KEY {
+  CURATED_TEMPLATE_QUERY = 'dsl-dataspace.curated-template-query',
+}

package/src/__lib__/DSL_DataSpace_LegendQueryNavigation.ts

@@ -0,0 +1,123 @@
+/**
+ * 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 {
+  generateExtensionUrlPattern,
+  generatePath,
+} from '@finos/legend-application/browser';
+import {
+  addQueryParametersToUrl,
+  stringifyQueryParams,
+} from '@finos/legend-shared';
+import { generateGAVCoordinates } from '@finos/legend-storage';
+
+export enum DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN {
+  GAV = 'gav',
+  DATA_SPACE_PATH = 'dataSpacePath',
+  EXECUTION_CONTEXT = 'executionContext',
+  RUNTIME_PATH = 'runtimePath',
+}
+
+export enum DATA_SPACE_QUERY_CREATOR_QUERY_PARAM_TOKEN {
+  CLASS_PATH = 'class',
+}
+
+export enum DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN {
+  GAV = 'gav',
+  DATA_SPACE_PATH = 'dataSpacePath',
+  TEMPLATE = 'template',
+  TEMPLATE_QUERY_ID = 'templateQueryId',
+}
+
+export type DataSpaceQueryCreatorPathParams = {
+  [DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV]: string;
+  [DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_SPACE_PATH]: string;
+  [DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.EXECUTION_CONTEXT]: string;
+  [DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.RUNTIME_PATH]?: string;
+};
+
+export type DataSpaceTemplateQueryCreatorPathParams = {
+  [DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV]: string;
+  [DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_SPACE_PATH]: string;
+  [DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.TEMPLATE_QUERY_ID]: string;
+};
+
+export type DataSpaceQueryEditorQueryParams = {
+  [DATA_SPACE_QUERY_CREATOR_QUERY_PARAM_TOKEN.CLASS_PATH]?: string | undefined;
+};
+
+export const DATA_SPACE_QUERY_ROUTE_PATTERN = Object.freeze({
+  SETUP: `/dataspace`,
+  CREATE: `/dataspace/:${DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV}/:${DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_SPACE_PATH}/:${DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.EXECUTION_CONTEXT}/:${DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.RUNTIME_PATH}?`,
+  TEMPLATE_QUERY: `/dataspace/:${DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV}/:${DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_SPACE_PATH}/:${DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.TEMPLATE}/:${DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.TEMPLATE_QUERY_ID}`,
+});
+
+export const generateDataSpaceQuerySetupRoute = (): string =>
+  generatePath(
+    generateExtensionUrlPattern(DATA_SPACE_QUERY_ROUTE_PATTERN.SETUP),
+    {},
+  );
+
+export const generateDataSpaceQueryCreatorRoute = (
+  groupId: string,
+  artifactId: string,
+  versionId: string,
+  dataSpacePath: string,
+  executionContextKey: string,
+  runtimePath?: string | undefined,
+  classPath?: string | undefined,
+): string =>
+  addQueryParametersToUrl(
+    generatePath(
+      generateExtensionUrlPattern(DATA_SPACE_QUERY_ROUTE_PATTERN.CREATE),
+      {
+        [DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV]:
+          generateGAVCoordinates(groupId, artifactId, versionId),
+        [DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_SPACE_PATH]:
+          dataSpacePath,
+        [DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.EXECUTION_CONTEXT]:
+          executionContextKey,
+        [DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.RUNTIME_PATH]:
+          runtimePath,
+      },
+    ),
+    stringifyQueryParams({
+      [DATA_SPACE_QUERY_CREATOR_QUERY_PARAM_TOKEN.CLASS_PATH]: classPath
+        ? encodeURIComponent(classPath)
+        : undefined,
+    }),
+  );
+
+export const generateDataSpaceTemplateQueryCreatorRoute = (
+  groupId: string,
+  artifactId: string,
+  versionId: string,
+  dataSpacePath: string,
+  templateQueryId: string,
+): string =>
+  generatePath(
+    generateExtensionUrlPattern(DATA_SPACE_QUERY_ROUTE_PATTERN.TEMPLATE_QUERY),
+    {
+      [DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV]:
+        generateGAVCoordinates(groupId, artifactId, versionId),
+      [DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_SPACE_PATH]:
+        dataSpacePath,
+      [DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.TEMPLATE]:
+        DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.TEMPLATE,
+      [DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.TEMPLATE_QUERY_ID]:
+        templateQueryId,
+    },
+  );

package/src/components/Core_LegendQueryApplicationPlugin.tsx

@@ -27,6 +27,7 @@ import {
   ManageSearchIcon,
   PlusIcon,
   RobotIcon,
+  SquareIcon,
 } from '@finos/legend-art';
 import {
   generateCloneServiceQuerySetupRoute,
@@ -49,6 +50,7 @@ import {
   configureCodeEditorComponent,
   setupPureLanguageService,
 } from '@finos/legend-lego/code-editor';
+import { generateDataSpaceQuerySetupRoute } from '../__lib__/DSL_DataSpace_LegendQueryNavigation.js';
 
 export class Core_LegendQueryApplicationPlugin extends LegendQueryApplicationPlugin {
   static NAME = packageJson.extensions.applicationQueryPlugin;
@@ -183,6 +185,22 @@ export class Core_LegendQueryApplicationPlugin extends LegendQueryApplicationPlu
         className: 'query-setup__landing-page__action--productionize-query',
         icon: <ArrowCircleUpIcon />,
       },
+      // data space
+      {
+        key: 'create-query-from-data-space',
+        isAdvanced: false,
+        isCreateAction: true,
+        action: async (setupStore) => {
+          setupStore.applicationStore.navigationService.navigator.goToLocation(
+            generateDataSpaceQuerySetupRoute(),
+          );
+        },
+        label: 'Create query from data space',
+        className: 'query-setup__landing-page__action--data-space',
+        icon: (
+          <SquareIcon className="query-setup__landing-page__icon--data-space" />
+        ),
+      },
     ];
   }
 }

package/src/components/LegendQueryWebApplication.tsx

@@ -39,7 +39,10 @@ import { EditExistingQuerySetup } from './EditExistingQuerySetup.js';
 import { CreateMappingQuerySetup } from './CreateMappingQuerySetup.js';
 import { useEffect } from 'react';
 import { flowResult } from 'mobx';
-import { guaranteeNonNullable, isNonNullable } from '@finos/legend-shared';
+import { DATA_SPACE_QUERY_ROUTE_PATTERN } from '../__lib__/DSL_DataSpace_LegendQueryNavigation.js';
+import { DataSpaceQuerySetup } from './data-space/DataSpaceQuerySetup.js';
+import { DataSpaceTemplateQueryCreator } from './data-space/DataSpaceTemplateQueryCreator.js';
+import { DataSpaceQueryCreator } from './data-space/DataSpaceQueryCreator.js';
 
 const LegendQueryWebApplicationRouter = observer(() => {
   const applicationStore = useLegendQueryApplicationStore();
@@ -49,16 +52,6 @@ const LegendQueryWebApplicationRouter = observer(() => {
     .getApplicationPlugins()
     .flatMap((plugin) => plugin.getExtraApplicationPageEntries?.() ?? []);
 
-  const setupRoot = applicationStore.pluginManager
-    .getApplicationPlugins()
-    .flatMap((plugin) => plugin.getExtraRootAppRedirectPath?.())
-    .filter(isNonNullable);
-
-  const rootRedirect =
-    setupRoot.length === 1
-      ? generateExtensionUrlPattern(guaranteeNonNullable(setupRoot[0]))
-      : LEGEND_QUERY_ROUTE_PATTERN.SETUP;
-
   useEffect(() => {
     flowResult(baseStore.initialize()).catch(
       applicationStore.alertUnhandledError,
@@ -117,6 +110,44 @@ const LegendQueryWebApplicationRouter = observer(() => {
               MappingQueryCreator as TEMPORARY__ReactRouterComponentType
             }
           />
+          {/* DATA SPACE */}
+          <Route
+            exact={true}
+            path={[
+              generateExtensionUrlPattern(DATA_SPACE_QUERY_ROUTE_PATTERN.SETUP),
+            ]}
+            component={
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+              DataSpaceQuerySetup as TEMPORARY__ReactRouterComponentType
+            }
+          />
+
+          <Route
+            exact={true}
+            path={[
+              generateExtensionUrlPattern(
+                DATA_SPACE_QUERY_ROUTE_PATTERN.TEMPLATE_QUERY,
+              ),
+            ]}
+            component={
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+              DataSpaceTemplateQueryCreator as TEMPORARY__ReactRouterComponentType
+            }
+          />
+
+          <Route
+            exact={true}
+            path={[
+              generateExtensionUrlPattern(
+                DATA_SPACE_QUERY_ROUTE_PATTERN.CREATE,
+              ),
+            ]}
+            component={
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+              DataSpaceQueryCreator as TEMPORARY__ReactRouterComponentType
+            }
+          />
+
           {extraApplicationPageEntries.map((entry) => (
             <Route
               key={entry.key}
@@ -128,7 +159,12 @@ const LegendQueryWebApplicationRouter = observer(() => {
               }
             />
           ))}
-          <Redirect to={rootRedirect} />
+          {/* Redirect to data space view */}
+          <Redirect
+            to={generateExtensionUrlPattern(
+              DATA_SPACE_QUERY_ROUTE_PATTERN.SETUP,
+            )}
+          />
         </Switch>
       )}
     </div>

package/src/components/QueryEditor.tsx

@@ -47,6 +47,7 @@ import {
   Panel,
   PanelFullContent,
   CustomSelectorInput,
+  ArrowCircleUpIcon,
 } from '@finos/legend-art';
 import { observer } from 'mobx-react-lite';
 import { Fragment, useEffect, useMemo, useRef, useState } from 'react';
@@ -86,21 +87,28 @@ import {
   type QueryBuilderState,
 } from '@finos/legend-query-builder';
 import { QUERY_DOCUMENTATION_KEY } from '../application/LegendQueryDocumentation.js';
-import {
-  debounce,
-  guaranteeNonNullable,
-  isNonNullable,
-} from '@finos/legend-shared';
+import { buildUrl, debounce } from '@finos/legend-shared';
 import { LegendQueryTelemetryHelper } from '../__lib__/LegendQueryTelemetryHelper.js';
 import { QUERY_EDITOR_TEST_ID } from '../__lib__/LegendQueryTesting.js';
 import {
   compareSemVerVersions,
   generateGAVCoordinates,
+  parseProjectIdentifier,
 } from '@finos/legend-storage';
 import type { Query } from '@finos/legend-graph';
-import { LATEST_VERSION_ALIAS } from '@finos/legend-server-depot';
+import {
+  LATEST_VERSION_ALIAS,
+  StoreProjectData,
+} from '@finos/legend-server-depot';
 import { buildVersionOption, type VersionOption } from './QuerySetup.js';
 import { QueryEditorExistingQueryVersionRevertModal } from './QueryEdtiorExistingQueryVersionRevertModal.js';
+import {
+  DataSpaceQueryBuilderState,
+  generateDataSpaceTemplateQueryPromotionRoute,
+} from '@finos/legend-extension-dsl-data-space/application';
+import { getDataSpaceQueryInfo } from './data-space/QueryDataSpaceUtil.js';
+import { generateDataSpaceQueryCreatorRoute } from '../__lib__/DSL_DataSpace_LegendQueryNavigation.js';
+import { DataSpaceTemplateQueryCreatorStore } from '../stores/data-space/DataSpaceTemplateQueryCreatorStore.js';
 
 const CreateQueryDialog = observer(() => {
   const editorStore = useQueryEditorStore();
@@ -602,16 +610,22 @@ const QueryEditorHeaderContent = observer(
       if (editorStore instanceof ExistingQueryEditorStore) {
         const query = editorStore.query;
         if (query) {
-          const paths = applicationStore.pluginManager
-            .getApplicationPlugins()
-            .flatMap(
-              (plugin) => plugin.getExtraNewQueryNavigationPaths?.() ?? [],
-            )
-            .map((callback) => callback(query, editorStore))
-            .filter(isNonNullable);
-          if (paths.length) {
+          const dataSpacePath = getDataSpaceQueryInfo(query);
+          if (
+            dataSpacePath &&
+            queryBuilderState instanceof DataSpaceQueryBuilderState
+          ) {
             editorStore.applicationStore.navigationService.navigator.goToLocation(
-              guaranteeNonNullable(paths[0]),
+              generateDataSpaceQueryCreatorRoute(
+                query.groupId,
+                query.artifactId,
+                query.versionId,
+                dataSpacePath,
+                // TODO: fix execution key once that is fixed
+                queryBuilderState.executionContext.name,
+                undefined,
+                undefined,
+              ),
             );
           } else {
             editorStore.applicationStore.navigationService.navigator.goToLocation(
@@ -659,17 +673,21 @@ const QueryEditorHeaderContent = observer(
             existingEditorStore={editorStore}
           />
         );
+      } else if (editorStore instanceof DataSpaceTemplateQueryCreatorStore) {
+        return (
+          <div className="query-editor__dataspace__header">
+            <div className="query-editor__header__content__main query-editor__header__content__title__text query-editor__dataspace__header__title__text">
+              {editorStore.templateQueryTitle}
+            </div>
+            <div className="query-editor__dataspace__header__title__tag">
+              template
+            </div>
+          </div>
+        );
       }
-      const extensionHeader = applicationStore.pluginManager
-        .getApplicationPlugins()
-        .flatMap((plugin) => plugin.getExtraQueryHeaders?.() ?? [])
-        .map((renderFunc) => renderFunc(editorStore))
-        .find((element) => element !== undefined);
 
       return (
-        extensionHeader ?? (
-          <div className="query-editor__header__content__main query-editor__header__content__title" />
-        )
+        <div className="query-editor__header__content__main query-editor__header__content__title" />
       );
     };
 
@@ -690,6 +708,57 @@ const QueryEditorHeaderContent = observer(
         </MenuContentItem>
       ));
 
+    const proceedCuratedTemplateQueryPromotion = async (): Promise<void> => {
+      if (
+        !(
+          editorStore instanceof ExistingQueryEditorStore &&
+          queryBuilderState instanceof DataSpaceQueryBuilderState
+        )
+      ) {
+        return;
+      }
+      // fetch project data
+      const project = StoreProjectData.serialization.fromJson(
+        await editorStore.depotServerClient.getProject(
+          editorStore.lightQuery.groupId,
+          editorStore.lightQuery.artifactId,
+        ),
+      );
+
+      // find the matching SDLC instance
+      const projectIDPrefix = parseProjectIdentifier(project.projectId).prefix;
+      const matchingSDLCEntry =
+        editorStore.applicationStore.config.studioInstances.find(
+          (entry) => entry.sdlcProjectIDPrefix === projectIDPrefix,
+        );
+      if (matchingSDLCEntry) {
+        editorStore.applicationStore.navigationService.navigator.visitAddress(
+          buildUrl([
+            editorStore.applicationStore.config.studioApplicationUrl,
+            generateDataSpaceTemplateQueryPromotionRoute(
+              editorStore.lightQuery.groupId,
+              editorStore.lightQuery.artifactId,
+              editorStore.lightQuery.versionId,
+              queryBuilderState.dataSpace.path,
+              editorStore.lightQuery.id,
+            ),
+          ]),
+        );
+      } else {
+        editorStore.applicationStore.notificationService.notifyWarning(
+          `Can't find the corresponding SDLC instance to productionize the query`,
+        );
+      }
+    };
+
+    const proceedTemplate = (): void => {
+      queryBuilderState.changeDetectionState.alertUnsavedChanges(() => {
+        proceedCuratedTemplateQueryPromotion().catch(
+          editorStore.applicationStore.alertUnhandledError,
+        );
+      });
+    };
+
     return (
       <div
         className="query-editor__header__content"
@@ -710,7 +779,26 @@ const QueryEditorHeaderContent = observer(
                 {actionConfig.renderer(editorStore, queryBuilderState)}
               </Fragment>
             ))}
-
+          <>
+            {editorStore instanceof ExistingQueryEditorStore &&
+              queryBuilderState instanceof DataSpaceQueryBuilderState && (
+                <button
+                  className="query-editor__header__action btn--dark"
+                  tabIndex={-1}
+                  onClick={proceedTemplate}
+                  title={
+                    !(editorStore instanceof ExistingQueryEditorStore)
+                      ? 'Please save your query first before promoting'
+                      : 'Promote Curated Template query...'
+                  }
+                >
+                  <ArrowCircleUpIcon className="query-editor__header__action__icon--productionize" />
+                  <div className="query-editor__header__action__label">
+                    Promote as Template Query
+                  </div>
+                </button>
+              )}
+          </>
           <Button
             className="query-editor__header__action btn--dark"
             disabled={editorStore.isPerformingBlockingAction}