@finos/legend-query-builder 0.4.1 → 0.4.3

package/lib/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderWatermarkValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,wBAAwB,EAGzB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAElF,eAAO,MAAM,wBAAwB,mBACnB,0BAA0B,cAC9B,wBAAwB,KACnC,wBAAwB,GAAG,SAkB7B,CAAC"}
+{"version":3,"file":"QueryBuilderWatermarkValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,wBAAwB,EAEzB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAElF,eAAO,MAAM,wBAAwB,mBACnB,0BAA0B,cAC9B,wBAAwB,KACnC,wBAAwB,GAAG,SAiB7B,CAAC"}

package/lib/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.js

@@ -20,7 +20,7 @@ export const buildWatermarkExpression = (watermarkState, getAllFunc) => {
         return undefined;
     }
     // main filter expression
-    const watermarkExpression = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.WATERMARK), watermarkState.value.multiplicity);
+    const watermarkExpression = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.WATERMARK));
     // param [0]
     watermarkExpression.parametersValues.push(getAllFunc);
     // param [1]

package/lib/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderWatermarkValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,wBAAwB,EACxB,0BAA0B,GAE3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iCAAiC,EAAE,MAAM,sDAAsD,CAAC;AAGzG,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,cAA0C,EAC1C,UAAoC,EACE,EAAE;IACxC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,yBAAyB;IACzB,MAAM,mBAAmB,GAAG,IAAI,wBAAwB,CACtD,0BAA0B,CAAC,iCAAiC,CAAC,SAAS,CAAC,EACtE,cAAc,CAAC,KAA4B,CAAC,YAAY,CAC1D,CAAC;IAEF,YAAY;IACZ,mBAAmB,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAEtD,YAAY;IACZ,mBAAmB,CAAC,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAEhE,OAAO,mBAAmB,CAAC;AAC7B,CAAC,CAAC"}
+{"version":3,"file":"QueryBuilderWatermarkValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,wBAAwB,EACxB,0BAA0B,GAC3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iCAAiC,EAAE,MAAM,sDAAsD,CAAC;AAGzG,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,cAA0C,EAC1C,UAAoC,EACE,EAAE;IACxC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,yBAAyB;IACzB,MAAM,mBAAmB,GAAG,IAAI,wBAAwB,CACtD,0BAA0B,CAAC,iCAAiC,CAAC,SAAS,CAAC,CACxE,CAAC;IAEF,YAAY;IACZ,mBAAmB,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAEtD,YAAY;IACZ,mBAAmB,CAAC,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAEhE,OAAO,mBAAmB,CAAC;AAC7B,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-query-builder",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "Legend query builder core",
   "keywords": [
     "legend",
@@ -41,19 +41,19 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@ag-grid-community/client-side-row-model": "28.2.0",
-    "@ag-grid-community/core": "28.2.0",
-    "@ag-grid-community/react": "28.2.0",
-    "@finos/legend-application": "10.0.5",
-    "@finos/legend-art": "5.0.3",
-    "@finos/legend-graph": "19.2.1",
-    "@finos/legend-server-depot": "4.1.4",
-    "@finos/legend-shared": "6.2.0",
-    "@finos/legend-storage": "3.0.15",
+    "@ag-grid-community/client-side-row-model": "28.2.1",
+    "@ag-grid-community/core": "28.2.1",
+    "@ag-grid-community/react": "28.2.1",
+    "@finos/legend-application": "10.0.7",
+    "@finos/legend-art": "5.0.4",
+    "@finos/legend-graph": "20.0.1",
+    "@finos/legend-server-depot": "4.1.5",
+    "@finos/legend-shared": "6.2.1",
+    "@finos/legend-storage": "3.0.16",
     "@testing-library/react": "13.4.0",
     "@types/papaparse": "5.3.5",
     "@types/react": "18.0.24",
-    "@types/react-dom": "18.0.7",
+    "@types/react-dom": "18.0.8",
     "mobx": "6.6.2",
     "mobx-react-lite": "3.4.0",
     "monaco-editor": "0.34.1",
@@ -64,7 +64,7 @@
     "serializr": "3.0.1"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.0.23",
+    "@finos/legend-dev-utils": "2.0.24",
     "@jest/globals": "29.2.2",
     "cross-env": "7.0.3",
     "eslint": "8.26.0",

package/src/components/QueryBuilder.tsx

@@ -207,7 +207,7 @@ export const QueryBuilder = observer(
     };
 
     useCommands(queryBuilderState);
-    const toggleShowOlapGroupByPanel = (): void => {
+    const toggleShowOLAPGroupByPanel = (): void => {
       if (isTDSState) {
         const tdsState = guaranteeType(
           queryBuilderState.fetchStructureState.implementation,
@@ -324,7 +324,7 @@ export const QueryBuilder = observer(
                           </MenuContentItemLabel>
                         </MenuContentItem>
                         <MenuContentItem
-                          onClick={toggleShowOlapGroupByPanel}
+                          onClick={toggleShowOLAPGroupByPanel}
                           disabled={
                             !queryBuilderState.isQuerySupported ||
                             !(

package/src/components/QueryBuilderDiffPanel.tsx

@@ -165,18 +165,12 @@ export const QueryBuilderDiffViewPanel = observer(
                     {
                       parameters: diffViewState.initialQuery.parameters
                         ? pruneSourceInformation(
-                            diffViewState.initialQuery.parameters as Record<
-                              PropertyKey,
-                              unknown
-                            >,
+                            diffViewState.initialQuery.parameters,
                           )
                         : undefined,
                       body: diffViewState.initialQuery.body
                         ? pruneSourceInformation(
-                            diffViewState.initialQuery.body as Record<
-                              PropertyKey,
-                              unknown
-                            >,
+                            diffViewState.initialQuery.body,
                           )
                         : undefined,
                     },
@@ -187,18 +181,12 @@ export const QueryBuilderDiffViewPanel = observer(
                     {
                       parameters: diffViewState.currentQuery.parameters
                         ? pruneSourceInformation(
-                            diffViewState.currentQuery.parameters as Record<
-                              PropertyKey,
-                              unknown
-                            >,
+                            diffViewState.currentQuery.parameters,
                           )
                         : undefined,
                       body: diffViewState.currentQuery.body
                         ? pruneSourceInformation(
-                            diffViewState.currentQuery.body as Record<
-                              PropertyKey,
-                              unknown
-                            >,
+                            diffViewState.currentQuery.body,
                           )
                         : undefined,
                     },

package/src/components/QueryBuilderNavigationBlocker.tsx

@@ -51,6 +51,10 @@ export const QueryBuilderNavigationBlocker = observer(
             ],
           });
         },
+        () =>
+          applicationStore.notifyWarning(
+            `Navigation from the query builder is blocked`,
+          ),
       );
       return (): void => {
         applicationStore.navigator.unblockNavigation();

package/src/components/QueryBuilderParametersPanel.tsx

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { useState } from 'react';
 import { observer } from 'mobx-react-lite';
 import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
 import {
@@ -40,11 +39,12 @@ import {
 } from '../stores/QueryBuilderParametersState.js';
 import {
   type Type,
-  MULTIPLICITY_INFINITE,
-  PRIMITIVE_TYPE,
   VariableExpression,
   GenericTypeExplicitReference,
   GenericType,
+  PrimitiveType,
+  Multiplicity,
+  getMultiplicityPrettyDescription,
 } from '@finos/legend-graph';
 import {
   type PackageableElementOption,
@@ -55,10 +55,22 @@ import {
 import { useDrag } from 'react-dnd';
 import { generateEnumerableNameFromToken } from '@finos/legend-shared';
 import { DEFAULT_VARIABLE_NAME } from '../stores/QueryBuilderConfig.js';
-import { variableExpression_setName } from '../stores/shared/ValueSpecificationModifierHelper.js';
+import {
+  valueSpecification_setMultiplicity,
+  variableExpression_setName,
+} from '../stores/shared/ValueSpecificationModifierHelper.js';
 import { LambdaParameterState } from '../stores/shared/LambdaParameterState.js';
 import { LambdaParameterValuesEditor } from './shared/LambdaParameterValuesEditor.js';
 
+type MultiplicityOption = { label: string; value: Multiplicity };
+
+const buildMultiplicityOption = (
+  multiplicity: Multiplicity,
+): MultiplicityOption => ({
+  label: getMultiplicityPrettyDescription(multiplicity),
+  value: multiplicity,
+});
+
 const VariableExpressionEditor = observer(
   (props: {
     queryBuilderState: QueryBuilderState;
@@ -86,12 +98,10 @@ const VariableExpressionEditor = observer(
       : undefined;
 
     // type
-    const stringType =
-      queryBuilderState.graphManagerState.graph.getPrimitiveType(
-        PRIMITIVE_TYPE.STRING,
-      );
-    const variableType = lambdaParameterState.variableType ?? stringType;
+    const variableType =
+      lambdaParameterState.variableType ?? PrimitiveType.STRING;
     const selectedType = buildElementOption(variableType);
+    const selectedMultiplicity = buildMultiplicityOption(multiplity);
     const typeOptions: PackageableElementOption<Type>[] =
       queryBuilderState.graphManagerState.graph.primitiveTypes
         .map(buildElementOption)
@@ -107,37 +117,16 @@ const VariableExpressionEditor = observer(
     };
 
     // multiplicity
-    const changeLowerBound: React.ChangeEventHandler<HTMLInputElement> = (
-      event,
-    ) => {
-      lambdaParameterState.changeMultiplicity(
-        varState,
-        parseInt(event.target.value),
-        multiplity.upperBound,
-      );
-    };
-    const [upperBound, setUppBound] = useState<string>(
-      multiplity.upperBound === undefined
-        ? MULTIPLICITY_INFINITE
-        : multiplity.upperBound.toString(),
-    );
-    const changeUpperBound: React.ChangeEventHandler<HTMLInputElement> = (
-      event,
-    ) => {
-      const value = event.target.value;
-      if (
-        value === MULTIPLICITY_INFINITE ||
-        value === '' ||
-        !isNaN(parseInt(value, 10))
-      ) {
-        lambdaParameterState.changeMultiplicity(
-          varState,
-          multiplity.lowerBound,
-          value === MULTIPLICITY_INFINITE || value === ''
-            ? undefined
-            : parseInt(value, 10),
-        );
-        setUppBound(value);
+    const validParamMultiplicityList = [
+      Multiplicity.ONE,
+      Multiplicity.ZERO_ONE,
+      Multiplicity.ZERO_MANY,
+    ];
+    const multilicityOptions: MultiplicityOption[] =
+      validParamMultiplicityList.map(buildMultiplicityOption);
+    const changeMultiplicity = (val: MultiplicityOption): void => {
+      if (multiplity !== val.value) {
+        valueSpecification_setMultiplicity(varState, val.value);
       }
     };
 
@@ -169,18 +158,16 @@ const VariableExpressionEditor = observer(
             title={`${isCreating ? 'Create Parameter' : 'Update Parameter'}`}
           />
           <ModalBody className="query-builder__parameters__modal__body">
-            <div className="panel__content__form__section">
-              <PanelFormTextField
-                name="Parameter Name"
-                prompt="Name of the parameter. Should be descriptive of its purpose."
-                update={(value: string | undefined): void =>
-                  variableExpression_setName(varState, value ?? '')
-                }
-                value={varState.name}
-                errorMessage={validationMessage}
-                isReadOnly={false}
-              />
-            </div>
+            <PanelFormTextField
+              name="Parameter Name"
+              prompt="Name of the parameter. Should be descriptive of its purpose."
+              update={(value: string | undefined): void =>
+                variableExpression_setName(varState, value ?? '')
+              }
+              value={varState.name}
+              errorMessage={validationMessage}
+              isReadOnly={false}
+            />
             <div className="panel__content__form__section">
               <div className="panel__content__form__section__header__label">
                 Type
@@ -207,19 +194,17 @@ const VariableExpressionEditor = observer(
                 The multiplity determines how many values a parameter can have.
                 Default is set to mandatory single vlue.
               </div>
-              <input
-                className="panel__content__form__section__input panel__content__form__section__number-input"
-                type="number"
-                spellCheck={false}
-                value={multiplity.lowerBound}
-                onChange={changeLowerBound}
-              />
-              ..
-              <input
-                className="panel__content__form__section__input panel__content__form__section__number-input"
-                spellCheck={false}
-                value={upperBound}
-                onChange={changeUpperBound}
+              <CustomSelectorInput
+                placeholder="Choose a multiplicity..."
+                options={multilicityOptions}
+                onChange={changeMultiplicity}
+                value={selectedMultiplicity}
+                hasError={
+                  !validParamMultiplicityList.includes(
+                    selectedMultiplicity.value,
+                  )
+                }
+                darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
               />
             </div>
           </ModalBody>
@@ -342,11 +327,7 @@ export const QueryBuilderParametersPanel = observer(
             generateEnumerableNameFromToken(varNames, DEFAULT_VARIABLE_NAME),
             queryBuilderState.graphManagerState.graph.getMultiplicity(1, 1),
             GenericTypeExplicitReference.create(
-              new GenericType(
-                queryParameterState.queryBuilderState.graphManagerState.graph.getPrimitiveType(
-                  PRIMITIVE_TYPE.STRING,
-                ),
-              ),
+              new GenericType(PrimitiveType.STRING),
             ),
           ),
           queryBuilderState.observableContext,

package/src/components/QueryBuilderPropertyExpressionEditor.tsx

@@ -52,7 +52,6 @@ import {
   Class,
   Enumeration,
   PrimitiveType,
-  PRIMITIVE_TYPE,
   isSuperType,
 } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
@@ -159,9 +158,7 @@ const DerivedPropertyParameterValueEditor = observer(
               }
               typeCheckOption={{
                 expectedType: parameterType,
-                match:
-                  parameterType ===
-                  graph.getPrimitiveType(PRIMITIVE_TYPE.DATETIME),
+                match: parameterType === PrimitiveType.DATETIME,
               }}
               resetValue={resetParameterValue}
             />

package/src/components/QueryBuilderResultPanel.tsx

@@ -57,6 +57,7 @@ import {
   assertErrorThrown,
   guaranteeNonNullable,
   isBoolean,
+  type PlainObject,
 } from '@finos/legend-shared';
 import { forwardRef, useState } from 'react';
 import type { CellMouseOverEvent } from '@ag-grid-community/core';
@@ -323,7 +324,7 @@ const QueryBuilderGridResult = observer(
       useState<CellMouseOverEvent | null>(null);
     const columns = executionResult.result.columns;
     const rowData = executionResult.result.rows.map((_row) => {
-      const row: Record<PropertyKey, unknown> = {};
+      const row: PlainObject = {};
       const cols = executionResult.result.columns;
       _row.values.forEach((value, idx) => {
         // `ag-grid` shows `false` value as empty string so we have

package/src/components/QueryBuilderSideBar.tsx

@@ -32,7 +32,6 @@ import {
   type Mapping,
   type Runtime,
   type ValueSpecification,
-  PRIMITIVE_TYPE,
   LATEST_DATE,
   MILESTONING_STEREOTYPE,
   PrimitiveInstanceValue,
@@ -42,6 +41,7 @@ import {
   RuntimePointer,
   VARIABLE_REFERENCE_TOKEN,
   isElementDeprecated,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   type PackageableElementOption,
@@ -59,12 +59,12 @@ const getParameterValue = (
   } else {
     if (
       parameter instanceof PrimitiveInstanceValue &&
-      parameter.genericType.value.rawType.name === PRIMITIVE_TYPE.STRICTDATE
+      parameter.genericType.value.rawType === PrimitiveType.STRICTDATE
     ) {
       return parameter.values[0] as string;
     } else if (
       parameter instanceof PrimitiveInstanceValue &&
-      parameter.genericType.value.rawType.name === PRIMITIVE_TYPE.LATESTDATE
+      parameter.genericType.value.rawType === PrimitiveType.LATESTDATE
     ) {
       return LATEST_DATE;
     }

package/src/components/explorer/QueryBuilderMilestoningEditor.tsx

@@ -29,7 +29,7 @@ import {
   observe_PrimitiveInstanceValue,
   PrimitiveInstanceValue,
   PRIMITIVE_TYPE,
-  TYPICAL_MULTIPLICITY_TYPE,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import { useDrop } from 'react-dnd';
@@ -103,14 +103,7 @@ const MilestoningParameterEditor = observer(
       const parameter = observe_PrimitiveInstanceValue(
         new PrimitiveInstanceValue(
           GenericTypeExplicitReference.create(
-            new GenericType(
-              queryBuilderState.graphManagerState.graph.getPrimitiveType(
-                PRIMITIVE_TYPE.STRICTDATE,
-              ),
-            ),
-          ),
-          queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-            TYPICAL_MULTIPLICITY_TYPE.ONE,
+            new GenericType(PrimitiveType.STRICTDATE),
           ),
         ),
         queryBuilderState.observableContext,
@@ -142,10 +135,7 @@ const MilestoningParameterEditor = observer(
                 : queryBuilderState.milestoningState.setProcessingDate(val)
             }
             typeCheckOption={{
-              expectedType:
-                queryBuilderState.graphManagerState.graph.getPrimitiveType(
-                  PRIMITIVE_TYPE.DATE,
-                ),
+              expectedType: PrimitiveType.DATE,
             }}
             resetValue={resetMilestoningParameter}
           />