@finos/legend-query-builder 4.2.4 → 4.3.0

package/lib/stores/workflows/ServiceQueryBuilderState.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-query-builder",
-  "version": "4.2.4",
+  "version": "4.3.0",
   "description": "Legend query builder core",
   "keywords": [
     "legend",
@@ -44,9 +44,9 @@
   "dependencies": {
     "@finos/legend-application": "15.0.36",
     "@finos/legend-art": "7.0.36",
-    "@finos/legend-graph": "31.1.1",
-    "@finos/legend-lego": "1.1.17",
-    "@finos/legend-server-depot": "6.0.23",
+    "@finos/legend-graph": "31.1.2",
+    "@finos/legend-lego": "1.1.18",
+    "@finos/legend-server-depot": "6.0.24",
     "@finos/legend-shared": "10.0.22",
     "@finos/legend-storage": "3.0.72",
     "@testing-library/react": "14.0.0",

package/src/components/QueryBuilder.tsx

@@ -127,10 +127,14 @@ const QueryBuilderStatusBar = observer(
           <button
             className={clsx(
               'query-builder__status-bar__action query-builder__status-bar__action__toggler',
+              {
+                'query-builder__status-bar__action__toggler--toggled':
+                  queryBuilderState.isQueryChatOpened === true,
+              },
             )}
             onClick={openQueryChat}
             tabIndex={-1}
-            title="Open query chat"
+            title="Open Query Chat"
           >
             <ChatIcon />
           </button>

package/src/components/QueryBuilderSideBar.tsx

@@ -212,6 +212,206 @@ export const QueryBuilderClassSelector = observer(
   },
 );
 
+export const QueryBuilderMappingSelector = observer(
+  (props: {
+    queryBuilderState: QueryBuilderState;
+    classes: Class[];
+    onClassChange?: ((val: Class) => void) | undefined;
+    noMatchMessage?: string | undefined;
+  }) => {
+    const { queryBuilderState, classes, onClassChange, noMatchMessage } = props;
+    const milestoningState = queryBuilderState.milestoningState;
+    const applicationStore = useApplicationStore();
+
+    // class
+    const elementFilterOption = createFilter({
+      ignoreCase: true,
+      ignoreAccents: false,
+      stringify: (option: PackageableElementOption<Class>): string =>
+        option.value.path,
+    });
+
+    const classOptions = classes.map((_class) => ({
+      value: _class,
+      label: generateClassLabel(_class, queryBuilderState),
+    }));
+    const selectedClassOption = queryBuilderState.class
+      ? {
+          value: queryBuilderState.class,
+          label: generateClassLabel(queryBuilderState.class, queryBuilderState),
+        }
+      : null;
+    const changeClass = (val: PackageableElementOption<Class>): void => {
+      if (val.value === queryBuilderState.class) {
+        return;
+      }
+      queryBuilderState.changeClass(val.value);
+      onClassChange?.(val.value);
+    };
+
+    // milestoning
+    const showMilestoningEditor = (): void =>
+      milestoningState.setShowMilestoningEditor(true);
+
+    return (
+      <div className="query-builder__setup__config-group query-builder__setup__config-group--class">
+        <div className="query-builder__setup__config-group__content">
+          <div className="query-builder__setup__config-group__item ">
+            <div
+              className="btn--sm query-builder__setup__config-group__item__label"
+              title="class"
+            >
+              <PURE_ClassIcon />
+            </div>
+            <CustomSelectorInput
+              className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector query-builder__setup__config-group__item__selector__milestoned"
+              placeholder={
+                classOptions.length
+                  ? 'Choose a class...'
+                  : noMatchMessage ?? 'No class found'
+              }
+              disabled={
+                classOptions.length < 1 ||
+                (classOptions.length === 1 && Boolean(selectedClassOption))
+              }
+              noMatchMessage={noMatchMessage}
+              options={classOptions}
+              onChange={changeClass}
+              value={selectedClassOption}
+              darkMode={
+                !applicationStore.layoutService
+                  .TEMPORARY__isLightColorThemeEnabled
+              }
+              filterOption={elementFilterOption}
+              formatOptionLabel={getPackageableElementOptionFormatter({
+                darkMode:
+                  !applicationStore.layoutService
+                    .TEMPORARY__isLightColorThemeEnabled,
+              })}
+            />
+            {queryBuilderState.isQuerySupported && (
+              <button
+                className="btn--dark btn__icon--dark query-builder__setup__milestoning"
+                tabIndex={-1}
+                onClick={showMilestoningEditor}
+                disabled={!milestoningState.isMilestonedQuery}
+                title="Edit Milestoning Parameters"
+              >
+                <ClockIcon />
+              </button>
+            )}
+            {milestoningState.isMilestonedQuery && (
+              <MilestoningParametersEditor
+                queryBuilderState={queryBuilderState}
+              />
+            )}
+          </div>
+        </div>
+      </div>
+    );
+  },
+);
+
+export const QueryBuilderFunction = observer(
+  (props: {
+    queryBuilderState: QueryBuilderState;
+    classes: Class[];
+    onClassChange?: ((val: Class) => void) | undefined;
+    noMatchMessage?: string | undefined;
+  }) => {
+    const { queryBuilderState, classes, onClassChange, noMatchMessage } = props;
+    const milestoningState = queryBuilderState.milestoningState;
+    const applicationStore = useApplicationStore();
+
+    // class
+    const elementFilterOption = createFilter({
+      ignoreCase: true,
+      ignoreAccents: false,
+      stringify: (option: PackageableElementOption<Class>): string =>
+        option.value.path,
+    });
+
+    const classOptions = classes.map((_class) => ({
+      value: _class,
+      label: generateClassLabel(_class, queryBuilderState),
+    }));
+    const selectedClassOption = queryBuilderState.class
+      ? {
+          value: queryBuilderState.class,
+          label: generateClassLabel(queryBuilderState.class, queryBuilderState),
+        }
+      : null;
+    const changeClass = (val: PackageableElementOption<Class>): void => {
+      if (val.value === queryBuilderState.class) {
+        return;
+      }
+      queryBuilderState.changeClass(val.value);
+      onClassChange?.(val.value);
+    };
+
+    // milestoning
+    const showMilestoningEditor = (): void =>
+      milestoningState.setShowMilestoningEditor(true);
+
+    return (
+      <div className="query-builder__setup__config-group query-builder__setup__config-group--class">
+        <div className="query-builder__setup__config-group__content">
+          <div className="query-builder__setup__config-group__item ">
+            <div
+              className="btn--sm query-builder__setup__config-group__item__label"
+              title="class"
+            >
+              <PURE_ClassIcon />
+            </div>
+            <CustomSelectorInput
+              className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector query-builder__setup__config-group__item__selector__milestoned"
+              placeholder={
+                classOptions.length
+                  ? 'Choose a class...'
+                  : noMatchMessage ?? 'No class found'
+              }
+              disabled={
+                classOptions.length < 1 ||
+                (classOptions.length === 1 && Boolean(selectedClassOption))
+              }
+              noMatchMessage={noMatchMessage}
+              options={classOptions}
+              onChange={changeClass}
+              value={selectedClassOption}
+              darkMode={
+                !applicationStore.layoutService
+                  .TEMPORARY__isLightColorThemeEnabled
+              }
+              filterOption={elementFilterOption}
+              formatOptionLabel={getPackageableElementOptionFormatter({
+                darkMode:
+                  !applicationStore.layoutService
+                    .TEMPORARY__isLightColorThemeEnabled,
+              })}
+            />
+            {queryBuilderState.isQuerySupported && (
+              <button
+                className="btn--dark btn__icon--dark query-builder__setup__milestoning"
+                tabIndex={-1}
+                onClick={showMilestoningEditor}
+                disabled={!milestoningState.isMilestonedQuery}
+                title="Edit Milestoning Parameters"
+              >
+                <ClockIcon />
+              </button>
+            )}
+            {milestoningState.isMilestonedQuery && (
+              <MilestoningParametersEditor
+                queryBuilderState={queryBuilderState}
+              />
+            )}
+          </div>
+        </div>
+      </div>
+    );
+  },
+);
+
 export const buildRuntimeValueOption = (
   runtimeValue: Runtime,
 ): { label: string; value: Runtime } => ({
@@ -257,13 +457,14 @@ const BasicQueryBuilderSetup = observer(
       queryBuilderState.graphManagerState.usableMappings.map(
         buildElementOption,
       );
-    const selectedMappingOption = queryBuilderState.mapping
-      ? buildElementOption(queryBuilderState.mapping)
+    const selectedMappingOption = queryBuilderState.executionContextState
+      .mapping
+      ? buildElementOption(queryBuilderState.executionContextState.mapping)
       : null;
     const changeMapping = (val: PackageableElementOption<Mapping>): void => {
       if (
         !queryBuilderState.class ||
-        val.value === queryBuilderState.mapping ||
+        val.value === queryBuilderState.executionContextState.mapping ||
         queryBuilderState.isMappingReadOnly
       ) {
         return;
@@ -284,12 +485,15 @@ const BasicQueryBuilderSetup = observer(
           new RuntimePointer(PackageableElementExplicitReference.create(rt)),
       )
       .map(buildRuntimeValueOption);
-    const selectedRuntimeOption = queryBuilderState.runtimeValue
-      ? buildRuntimeValueOption(queryBuilderState.runtimeValue)
+    const selectedRuntimeOption = queryBuilderState.executionContextState
+      .runtimeValue
+      ? buildRuntimeValueOption(
+          queryBuilderState.executionContextState.runtimeValue,
+        )
       : null;
     const changeRuntime = (val: { value: Runtime }): void => {
       if (
-        val.value === queryBuilderState.runtimeValue ||
+        val.value === queryBuilderState.executionContextState.runtimeValue ||
         queryBuilderState.isRuntimeReadOnly
       ) {
         return;
@@ -368,7 +572,7 @@ const BasicQueryBuilderSetup = observer(
                 disabled={
                   queryBuilderState.isRuntimeReadOnly ||
                   !queryBuilderState.class ||
-                  !queryBuilderState.mapping
+                  !queryBuilderState.executionContextState.mapping
                 }
                 options={runtimeOptions}
                 onChange={changeRuntime}

package/src/components/QueryChat.tsx

@@ -62,8 +62,9 @@ export const QueryChat = observer(
           </ModalBody>
           <ModalFooter>
             <ModalFooterButton
+              className="btn--caution"
               onClick={() => queryBuilderState.setIsQueryChatOpened(false)}
-              text="Close"
+              text="Discard and Close"
             />
           </ModalFooter>
         </Modal>

package/src/components/__test-utils__/QueryBuilderComponentTestUtils.tsx

@@ -84,8 +84,8 @@ export const TEST__setUpQueryBuilder = async (
     graphManagerState,
   );
   const mapping = graphManagerState.graph.getMapping(mappingPath);
-  queryBuilderState.setMapping(mapping);
-  queryBuilderState.setRuntimeValue(
+  queryBuilderState.executionContextState.setMapping(mapping);
+  queryBuilderState.executionContextState.setRuntimeValue(
     new RuntimePointer(
       PackageableElementExplicitReference.create(
         graphManagerState.graph.getRuntime(runtimePath),

package/src/components/explorer/QueryBuilderExplorerPanel.tsx

@@ -849,7 +849,11 @@ export const QueryBuilderExplorerPanel = observer(
       flowResult(explorerState.analyzeMappingModelCoverage()).catch(
         applicationStore.alertUnhandledError,
       );
-    }, [applicationStore, explorerState, queryBuilderState.mapping]);
+    }, [
+      applicationStore,
+      explorerState,
+      queryBuilderState.executionContextState.mapping,
+    ]);
     return (
       <div
         data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_EXPLORER}

package/src/components/workflows/ClassQueryBuilder.tsx

@@ -71,11 +71,15 @@ const ClassQueryBuilderSetupPanelContent = observer(
           )
         : []
     ).map(buildElementOption);
-    const selectedMappingOption = queryBuilderState.mapping
-      ? buildElementOption(queryBuilderState.mapping)
+    const selectedMappingOption = queryBuilderState.executionContextState
+      .mapping
+      ? buildElementOption(queryBuilderState.executionContextState.mapping)
       : null;
     const changeMapping = (val: PackageableElementOption<Mapping>): void => {
-      if (!queryBuilderState.class || val.value === queryBuilderState.mapping) {
+      if (
+        !queryBuilderState.class ||
+        val.value === queryBuilderState.executionContextState.mapping
+      ) {
         return;
       }
       queryBuilderState.changeMapping(val.value);
@@ -90,9 +94,9 @@ const ClassQueryBuilderSetupPanelContent = observer(
 
     // runtime
     const runtimeOptions = (
-      queryBuilderState.mapping
+      queryBuilderState.executionContextState.mapping
         ? getMappingCompatibleRuntimes(
-            queryBuilderState.mapping,
+            queryBuilderState.executionContextState.mapping,
             queryBuilderState.graphManagerState.usableRuntimes,
           )
         : []
@@ -102,11 +106,14 @@ const ClassQueryBuilderSetupPanelContent = observer(
           new RuntimePointer(PackageableElementExplicitReference.create(rt)),
       )
       .map(buildRuntimeValueOption);
-    const selectedRuntimeOption = queryBuilderState.runtimeValue
-      ? buildRuntimeValueOption(queryBuilderState.runtimeValue)
+    const selectedRuntimeOption = queryBuilderState.executionContextState
+      .runtimeValue
+      ? buildRuntimeValueOption(
+          queryBuilderState.executionContextState.runtimeValue,
+        )
       : null;
     const changeRuntime = (val: { value: Runtime }): void => {
-      if (val.value === queryBuilderState.runtimeValue) {
+      if (val.value === queryBuilderState.executionContextState.runtimeValue) {
         return;
       }
       queryBuilderState.changeRuntime(val.value);
@@ -177,7 +184,8 @@ const ClassQueryBuilderSetupPanelContent = observer(
                 placeholder="Choose a runtime..."
                 noMatchMessage="No compatible runtime found for specified mapping"
                 disabled={
-                  !queryBuilderState.class || !queryBuilderState.mapping
+                  !queryBuilderState.class ||
+                  !queryBuilderState.executionContextState.mapping
                 }
                 options={runtimeOptions}
                 onChange={changeRuntime}

package/src/components/workflows/MappingQueryBuilder.tsx

@@ -62,11 +62,12 @@ const MappingQueryBuilderSetupPanelContent = observer(
       queryBuilderState.graphManagerState.usableMappings.map(
         buildElementOption,
       );
-    const selectedMappingOption = queryBuilderState.mapping
-      ? buildElementOption(queryBuilderState.mapping)
+    const selectedMappingOption = queryBuilderState.executionContextState
+      .mapping
+      ? buildElementOption(queryBuilderState.executionContextState.mapping)
       : null;
     const changeMapping = (val: PackageableElementOption<Mapping>): void => {
-      if (val.value === queryBuilderState.mapping) {
+      if (val.value === queryBuilderState.executionContextState.mapping) {
         return;
       }
       queryBuilderState.changeMapping(val.value);
@@ -82,9 +83,9 @@ const MappingQueryBuilderSetupPanelContent = observer(
 
     // runtime
     const runtimeOptions = (
-      queryBuilderState.mapping
+      queryBuilderState.executionContextState.mapping
         ? getMappingCompatibleRuntimes(
-            queryBuilderState.mapping,
+            queryBuilderState.executionContextState.mapping,
             queryBuilderState.graphManagerState.usableRuntimes,
           )
         : []
@@ -94,11 +95,14 @@ const MappingQueryBuilderSetupPanelContent = observer(
           new RuntimePointer(PackageableElementExplicitReference.create(rt)),
       )
       .map(buildRuntimeValueOption);
-    const selectedRuntimeOption = queryBuilderState.runtimeValue
-      ? buildRuntimeValueOption(queryBuilderState.runtimeValue)
+    const selectedRuntimeOption = queryBuilderState.executionContextState
+      .runtimeValue
+      ? buildRuntimeValueOption(
+          queryBuilderState.executionContextState.runtimeValue,
+        )
       : null;
     const changeRuntime = (val: { value: Runtime }): void => {
-      if (val.value === queryBuilderState.runtimeValue) {
+      if (val.value === queryBuilderState.executionContextState.runtimeValue) {
         return;
       }
       queryBuilderState.changeRuntime(val.value);
@@ -113,9 +117,9 @@ const MappingQueryBuilderSetupPanelContent = observer(
     });
 
     // class
-    const classes = queryBuilderState.mapping
+    const classes = queryBuilderState.executionContextState.mapping
       ? getMappingCompatibleClasses(
-          queryBuilderState.mapping,
+          queryBuilderState.executionContextState.mapping,
           queryBuilderState.graphManagerState.usableClasses,
         )
       : [];
@@ -170,7 +174,7 @@ const MappingQueryBuilderSetupPanelContent = observer(
                 className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
                 placeholder="Choose a runtime..."
                 noMatchMessage="No compatible runtime found for specified mapping"
-                disabled={!queryBuilderState.mapping}
+                disabled={!queryBuilderState.executionContextState.mapping}
                 options={runtimeOptions}
                 onChange={changeRuntime}
                 value={selectedRuntimeOption}

package/src/components/workflows/ServiceQueryBuilder.tsx

@@ -47,6 +47,7 @@ const buildExecutionContextOption = (
  *
  * See details on propagation/cascading in {@link ServiceQueryBuilderState}
  */
+// TODO: add mapping/runtime for `from` queries
 const ServiceQueryBuilderSetupPanelContent = observer(
   (props: { queryBuilderState: ServiceQueryBuilderState }) => {
     const { queryBuilderState } = props;
@@ -87,9 +88,9 @@ const ServiceQueryBuilderSetupPanelContent = observer(
     };
 
     // class
-    const classes = queryBuilderState.mapping
+    const classes = queryBuilderState.executionContextState.mapping
       ? getMappingCompatibleClasses(
-          queryBuilderState.mapping,
+          queryBuilderState.executionContextState.mapping,
           queryBuilderState.graphManagerState.usableClasses,
         )
       : [];

package/src/index.ts

@@ -37,6 +37,7 @@ export {
   getRuntimeOptionFormatter,
 } from './components/QueryBuilderSideBar.js';
 export { ClassQueryBuilderState } from './stores/workflows/ClassQueryBuilderState.js';
+export { FunctionQueryBuilderState } from './stores/workflows/FunctionQueryBuilderState.js';
 export { MappingQueryBuilderState } from './stores/workflows/MappingQueryBuilderState.js';
 export {
   type ServiceExecutionContext,

package/src/stores/QueryBuilderExecutionContextState.ts

@@ -0,0 +1,69 @@
+/**
+ * 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 { Mapping, Runtime } from '@finos/legend-graph';
+import type { QueryBuilderState } from './QueryBuilderState.js';
+import { action, makeObservable, observable } from 'mobx';
+
+export abstract class QueryBuilderExecutionContextState {
+  readonly queryBuilderState: QueryBuilderState;
+  mapping: Mapping | undefined;
+  runtimeValue: Runtime | undefined;
+
+  constructor(queryBuilderState: QueryBuilderState) {
+    this.queryBuilderState = queryBuilderState;
+  }
+
+  setMapping(val: Mapping | undefined): void {
+    this.mapping = val;
+  }
+
+  setRuntimeValue(val: Runtime | undefined): void {
+    this.runtimeValue = val;
+  }
+
+  get specifiedInQuery(): boolean {
+    return true;
+  }
+}
+
+export class QueryBuilderEmbeddedFromExecutionContextState extends QueryBuilderExecutionContextState {
+  constructor(queryBuilderState: QueryBuilderState) {
+    super(queryBuilderState);
+    makeObservable(this, {
+      mapping: observable,
+      runtimeValue: observable,
+      setMapping: action,
+      setRuntimeValue: action,
+    });
+  }
+}
+
+export class QueryBuilderExternalExecutionContextState extends QueryBuilderExecutionContextState {
+  constructor(queryBuilderState: QueryBuilderState) {
+    super(queryBuilderState);
+    makeObservable(this, {
+      mapping: observable,
+      runtimeValue: observable,
+      setMapping: action,
+      setRuntimeValue: action,
+    });
+  }
+
+  override get specifiedInQuery(): boolean {
+    return false;
+  }
+}

package/src/stores/QueryBuilderInternalizeState.ts

@@ -0,0 +1,34 @@
+/**
+ * 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 { QueryBuilderState } from './QueryBuilderState.js';
+import type { Binding, VariableExpression } from '@finos/legend-graph';
+
+export class QueryBuilderInternalizeState {
+  readonly queryBuilderState: QueryBuilderState;
+  binding: Binding;
+  inputData: VariableExpression;
+
+  constructor(
+    binding: Binding,
+    inputData: VariableExpression,
+    queryBuilderState: QueryBuilderState,
+  ) {
+    this.queryBuilderState = queryBuilderState;
+    this.binding = binding;
+    this.inputData = inputData;
+  }
+}

package/src/stores/QueryBuilderResultState.ts

@@ -217,8 +217,8 @@ export class QueryBuilderResultState {
       const result =
         (yield this.queryBuilderState.graphManagerState.graphManager.runQuery(
           query,
-          this.queryBuilderState.mapping,
-          this.queryBuilderState.runtimeValue,
+          this.queryBuilderState.executionContextState.mapping,
+          this.queryBuilderState.executionContextState.runtimeValue,
           this.queryBuilderState.graphManagerState.graph,
           {
             serializationFormat,
@@ -260,11 +260,11 @@ export class QueryBuilderResultState {
       this.setIsRunningQuery(true);
       const currentHashCode = this.queryBuilderState.hashCode;
       const mapping = guaranteeNonNullable(
-        this.queryBuilderState.mapping,
+        this.queryBuilderState.executionContextState.mapping,
         'Mapping is required to execute query',
       );
       const runtime = guaranteeNonNullable(
-        this.queryBuilderState.runtimeValue,
+        this.queryBuilderState.executionContextState.runtimeValue,
         `Runtime is required to execute query`,
       );
       const query = this.buildExecutionRawLambda();
@@ -350,11 +350,11 @@ export class QueryBuilderResultState {
     try {
       this.isGeneratingPlan = true;
       const mapping = guaranteeNonNullable(
-        this.queryBuilderState.mapping,
+        this.queryBuilderState.executionContextState.mapping,
         'Mapping is required to execute query',
       );
       const runtime = guaranteeNonNullable(
-        this.queryBuilderState.runtimeValue,
+        this.queryBuilderState.executionContextState.runtimeValue,
         `Runtime is required to execute query`,
       );
       const query = this.queryBuilderState.buildQuery();