@finos/legend-query-builder 0.1.1 → 0.2.0

package/src/components/QueryBuilderPropertyExpressionEditor.tsx

@@ -52,10 +52,8 @@ import {
   isSuperType,
 } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import {
-  propertyExpression_setParametersValue,
-  BasicValueSpecificationEditor,
-} from '@finos/legend-application';
+import { BasicValueSpecificationEditor } from './shared/BasicValueSpecificationEditor.js';
+import { functionExpression_setParameterValue } from '../stores/shared/ValueSpecificationModifierHelper.js';
 
 const DerivedPropertyParameterValueEditor = observer(
   (props: {
@@ -71,10 +69,10 @@ const DerivedPropertyParameterValueEditor = observer(
     ).value.rawType;
     const handleDrop = useCallback(
       (item: QueryBuilderParameterDragSource): void => {
-        propertyExpression_setParametersValue(
+        functionExpression_setParameterValue(
           derivedPropertyExpressionState.propertyExpression,
-          idx + 1,
           item.variable.parameter,
+          idx + 1,
           derivedPropertyExpressionState.queryBuilderState.observableContext,
         );
       },
@@ -108,9 +106,8 @@ const DerivedPropertyParameterValueEditor = observer(
       [handleDrop],
     );
     const resetParameterValue = (): void => {
-      propertyExpression_setParametersValue(
+      functionExpression_setParameterValue(
         derivedPropertyExpressionState.propertyExpression,
-        idx + 1,
         generateMilestonedPropertyParameterValue(
           derivedPropertyExpressionState,
           idx,
@@ -120,6 +117,7 @@ const DerivedPropertyParameterValueEditor = observer(
             derivedPropertyExpressionState.queryBuilderState.graphManagerState
               .graph,
           ),
+        idx + 1,
         derivedPropertyExpressionState.queryBuilderState.observableContext,
       );
     };
@@ -142,15 +140,19 @@ const DerivedPropertyParameterValueEditor = observer(
                 derivedPropertyExpressionState.parameterValues[idx],
               )}
               setValueSpecification={(val: ValueSpecification): void => {
-                propertyExpression_setParametersValue(
+                functionExpression_setParameterValue(
                   derivedPropertyExpressionState.propertyExpression,
-                  idx + 1,
                   val,
+                  idx + 1,
                   derivedPropertyExpressionState.queryBuilderState
                     .observableContext,
                 );
               }}
               graph={graph}
+              obseverContext={
+                derivedPropertyExpressionState.queryBuilderState
+                  .observableContext
+              }
               typeCheckOption={{
                 expectedType: parameterType,
                 match:
@@ -273,7 +275,8 @@ export const QueryBuilderPropertyExpressionBadge = observer(
   }) => {
     const { propertyExpressionState, onPropertyExpressionChange } = props;
     const type =
-      propertyExpressionState.propertyExpression.func.genericType.value.rawType;
+      propertyExpressionState.propertyExpression.func.value.genericType.value
+        .rawType;
     const hasDerivedPropertyInExpression = Boolean(
       propertyExpressionState.derivedPropertyExpressionStates.length,
     );
@@ -359,7 +362,7 @@ export const QueryBuilderPropertyExpressionBadge = observer(
               propertyExpressionState={propertyExpressionState}
             />
             <QueryBuilderPropertyInfoTooltip
-              property={propertyExpressionState.propertyExpression.func}
+              property={propertyExpressionState.propertyExpression.func.value}
               path={getPropertyPath(propertyExpressionState.propertyExpression)}
               isMapped={true}
               placement="bottom-end"

package/src/components/QueryBuilderResultPanel.tsx

@@ -48,9 +48,6 @@ import {
   ActionAlertType,
   EDITOR_LANGUAGE,
   ExecutionPlanViewer,
-  instanceValue_changeValue,
-  instanceValue_changeValues,
-  PARAMETER_SUBMIT_ACTION,
   TAB_SIZE,
   TextInputEditor,
   useApplicationStore,
@@ -81,6 +78,11 @@ import {
 } from '../stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_In.js';
 import type { QueryBuilderPostFilterOperator } from '../stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterOperator.js';
 import { QueryBuilderProjectionState } from '../stores/fetch-structure/projection/QueryBuilderProjectionState.js';
+import {
+  instanceValue_setValue,
+  instanceValue_setValues,
+} from '../stores/shared/ValueSpecificationModifierHelper.js';
+import { PARAMETER_SUBMIT_ACTION } from '../stores/shared/LambdaParameterState.js';
 
 const QueryBuilderGridResultContextMenu = observer(
   forwardRef<
@@ -135,7 +137,7 @@ const QueryBuilderGridResultContextMenu = observer(
       conditionValue: InstanceValue,
     ): void => {
       if (event?.value !== null) {
-        instanceValue_changeValue(
+        instanceValue_setValue(
           conditionValue,
           conditionValue instanceof EnumValueInstanceValue
             ? EnumValueExplicitReference.create(
@@ -223,7 +225,7 @@ const QueryBuilderGridResultContextMenu = observer(
           conditionState.changeOperator(
             isFilterBy ? postFilterInOperator : postFilterNotInOperator,
           );
-          instanceValue_changeValues(conditionState.value as InstanceValue, [
+          instanceValue_setValues(conditionState.value as InstanceValue, [
             currentValueSpecificaton,
             newValueSpecification,
           ]);
@@ -245,7 +247,7 @@ const QueryBuilderGridResultContextMenu = observer(
             isFilterBy ? postFilterEqualOperator : postFilterNotEqualOperator
           ).getDefaultFilterConditionValue(conditionState);
           updateFilterConditionValue(newValueSpecification as InstanceValue);
-          instanceValue_changeValues(conditionState.value as InstanceValue, [
+          instanceValue_setValues(conditionState.value as InstanceValue, [
             ...(conditionState.value as InstanceValue).values,
             newValueSpecification,
           ]);

package/src/components/QueryBuilderTextEditor.tsx

@@ -38,7 +38,7 @@ export const QueryBuilderTextEditor = observer(
     const discardChanges = (): void => {
       queryBuilderState.textEditorState.setMode(undefined);
       // force close the backdrop just in case changes are discarded when there are grammar issues
-      queryBuilderState.setBackdrop(false);
+      queryBuilderState.setShowBackdrop(false);
     };
     const mode = queryTextEditorState.mode;
     useEffect(() => {
@@ -83,7 +83,7 @@ export const QueryBuilderTextEditor = observer(
             >
               {mode === QueryBuilderTextEditorMode.TEXT && (
                 <QueryBuilderLambdaEditor
-                  className={'query-builder-text-mode__lambda-editor'}
+                  className="query-builder-text-mode__lambda-editor"
                   disabled={queryTextEditorState.isConvertingLambdaToString}
                   queryBuilderState={queryBuilderState}
                   lambdaEditorState={queryTextEditorState}

package/src/components/QueryBuilder_TestID.ts

@@ -15,6 +15,8 @@
  */
 
 export enum QUERY_BUILDER_TEST_ID {
+  LAMBDA_EDITOR__EDITOR_INPUT = 'lambda-editor__editor__input',
+
   QUERY_BUILDER = 'query__builder',
   QUERY_BUILDER_SETUP = 'query__builder__setup',
   QUERY_BUILDER_PROJECTION = 'query__builder__projection',

package/src/components/explorer/QueryBuilderExplorerPanel.tsx

@@ -436,7 +436,7 @@ const QueryBuilderExplorerTreeNodeContainer = observer(
         }
         disabled={
           !(node instanceof QueryBuilderExplorerTreePropertyNodeData) ||
-          queryBuilderState.backdrop
+          queryBuilderState.showBackdrop
         }
         menuProps={{ elevation: 7 }}
         onOpen={onContextMenuOpen}
@@ -801,7 +801,7 @@ export const QueryBuilderExplorerPanel = observer(
       <div
         data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_EXPLORER}
         className={clsx('panel query-builder__explorer', {
-          backdrop__element: queryBuilderState.backdrop,
+          backdrop__element: queryBuilderState.showBackdrop,
         })}
       >
         <div className="panel__header">

package/src/components/explorer/QueryBuilderMilestoningEditor.tsx

@@ -36,7 +36,8 @@ import { useDrop } from 'react-dnd';
 import { VariableExpressionViewer } from '../QueryBuilderParametersPanel.js';
 import { Dialog, PanelEntryDropZonePlaceholder } from '@finos/legend-art';
 import { generateDefaultValueForPrimitiveType } from '../../stores/QueryBuilderValueSpecificationHelper.js';
-import { BasicValueSpecificationEditor } from '@finos/legend-application';
+import { BasicValueSpecificationEditor } from '../shared/BasicValueSpecificationEditor.js';
+import { instanceValue_setValues } from '../../stores/shared/ValueSpecificationModifierHelper.js';
 
 const MilestoningParameterEditor = observer(
   (props: {
@@ -106,9 +107,9 @@ const MilestoningParameterEditor = observer(
         ),
         queryBuilderState.observableContext,
       );
-      parameter.values = [
+      instanceValue_setValues(parameter, [
         generateDefaultValueForPrimitiveType(PRIMITIVE_TYPE.STRICTDATE),
-      ];
+      ]);
       if (stereotype === MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL) {
         queryBuilderState.milestoningState.setBusinessDate(parameter);
       } else {
@@ -126,6 +127,7 @@ const MilestoningParameterEditor = observer(
           <BasicValueSpecificationEditor
             valueSpecification={milestoningParameter}
             graph={queryBuilderState.graphManagerState.graph}
+            obseverContext={queryBuilderState.observableContext}
             setValueSpecification={(val: ValueSpecification): void =>
               stereotype === MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL
                 ? queryBuilderState.milestoningState.setBusinessDate(val)

package/src/components/fetch-structure/QueryBuilderPostFilterPanel.tsx

@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  useApplicationStore,
-  BasicValueSpecificationEditor,
-} from '@finos/legend-application';
+import { useApplicationStore } from '@finos/legend-application';
 import {
   type TreeNodeContainerProps,
   type TreeNodeViewProps,
@@ -101,6 +98,7 @@ import { QUERY_BUILDER_TEST_ID } from '../QueryBuilder_TestID.js';
 import { isTypeCompatibleForAssignment } from '../../stores/QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_GROUP_OPERATION } from '../../stores/QueryBuilderGroupOperationHelper.js';
 import { QueryBuilderProjectionState } from '../../stores/fetch-structure/projection/QueryBuilderProjectionState.js';
+import { BasicValueSpecificationEditor } from '../shared/BasicValueSpecificationEditor.js';
 
 const QueryBuilderPostFilterConditionContextMenu = observer(
   forwardRef<
@@ -506,6 +504,10 @@ const QueryBuilderPostFilterConditionEditor = observer(
                     valueSpecification={node.condition.value}
                     setValueSpecification={changeValueSpecification}
                     graph={graph}
+                    obseverContext={
+                      node.condition.postFilterState.projectionState
+                        .queryBuilderState.observableContext
+                    }
                     typeCheckOption={{
                       expectedType: guaranteeNonNullable(
                         node.condition.columnState.getReturnType(),

package/src/components/fetch-structure/QueryBuilderResultModifierPanel.tsx

@@ -99,7 +99,7 @@ const ColumnSortEditor = observer(
           className="query-builder__projection__options__sort__remove-btn btn--dark btn--caution"
           onClick={deleteColumnSort}
           tabIndex={-1}
-          title={'Remove'}
+          title="Remove"
         >
           <TimesIcon />
         </button>

package/src/components/filter/QueryBuilderFilterPanel.tsx

@@ -69,10 +69,7 @@ import {
   UnsupportedOperationError,
 } from '@finos/legend-shared';
 import { QUERY_BUILDER_TEST_ID } from '../QueryBuilder_TestID.js';
-import {
-  useApplicationStore,
-  BasicValueSpecificationEditor,
-} from '@finos/legend-application';
+import { useApplicationStore } from '@finos/legend-application';
 import {
   type QueryBuilderParameterDragSource,
   QUERY_BUILDER_PARAMETER_DND_TYPE,
@@ -86,6 +83,7 @@ import {
 import type { QueryBuilderFilterOperator } from '../../stores/filter/QueryBuilderFilterOperator.js';
 import { isTypeCompatibleForAssignment } from '../../stores/QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_GROUP_OPERATION } from '../../stores/QueryBuilderGroupOperationHelper.js';
+import { BasicValueSpecificationEditor } from '../shared/BasicValueSpecificationEditor.js';
 
 const QueryBuilderFilterGroupConditionEditor = observer(
   (props: {
@@ -159,7 +157,7 @@ const QueryBuilderFilterConditionEditor = observer(
         const parameterType =
           item.variable.parameter.genericType?.value.rawType;
         const conditionValueType =
-          node.condition.propertyExpressionState.propertyExpression.func
+          node.condition.propertyExpressionState.propertyExpression.func.value
             .genericType.value.rawType;
         if (isTypeCompatibleForAssignment(parameterType, conditionValueType)) {
           node.condition.setValue(item.variable.parameter);
@@ -275,10 +273,15 @@ const QueryBuilderFilterConditionEditor = observer(
                     valueSpecification={node.condition.value}
                     setValueSpecification={changeValueSpecification}
                     graph={graph}
+                    obseverContext={
+                      node.condition.filterState.queryBuilderState
+                        .observableContext
+                    }
                     typeCheckOption={{
                       expectedType:
                         node.condition.propertyExpressionState
-                          .propertyExpression.func.genericType.value.rawType,
+                          .propertyExpression.func.value.genericType.value
+                          .rawType,
                     }}
                     resetValue={resetNode}
                     selectorConfig={selectorConfig}