@finos/legend-query-builder 1.0.3 → 1.0.4

package/src/components/QueryBuilderResultPanel.tsx

@@ -155,6 +155,7 @@ const QueryBuilderGridResultContextMenu = observer(
               )
             : event?.value,
           0,
+          tdsState.queryBuilderState.observerContext,
         );
       }
     };
@@ -230,10 +231,11 @@ const QueryBuilderGridResultContextMenu = observer(
           conditionState.changeOperator(
             isFilterBy ? postFilterInOperator : postFilterNotInOperator,
           );
-          instanceValue_setValues(conditionState.value as InstanceValue, [
-            currentValueSpecificaton,
-            newValueSpecification,
-          ]);
+          instanceValue_setValues(
+            conditionState.value as InstanceValue,
+            [currentValueSpecificaton, newValueSpecification],
+            tdsState.queryBuilderState.observerContext,
+          );
         }
       } else {
         const doesValueAlreadyExist =
@@ -252,10 +254,14 @@ const QueryBuilderGridResultContextMenu = observer(
             isFilterBy ? postFilterEqualOperator : postFilterNotEqualOperator
           ).getDefaultFilterConditionValue(conditionState);
           updateFilterConditionValue(newValueSpecification as InstanceValue);
-          instanceValue_setValues(conditionState.value as InstanceValue, [
-            ...(conditionState.value as InstanceValue).values,
-            newValueSpecification,
-          ]);
+          instanceValue_setValues(
+            conditionState.value as InstanceValue,
+            [
+              ...(conditionState.value as InstanceValue).values,
+              newValueSpecification,
+            ],
+            tdsState.queryBuilderState.observerContext,
+          );
         }
       }
     };
@@ -326,18 +332,16 @@ const QueryBuilderGridResult = observer(
     const [cellDoubleClickedEvent, setCellDoubleClickedEvent] =
       useState<CellMouseOverEvent | null>(null);
     const columns = executionResult.result.columns;
-    let rowNumber = 1;
-    const rowData = executionResult.result.rows.map((_row) => {
+    const rowData = executionResult.result.rows.map((_row, rowIdx) => {
       const row: PlainObject = {};
       const cols = executionResult.result.columns;
-      _row.values.forEach((value, idx) => {
+      _row.values.forEach((value, colIdx) => {
         // `ag-grid` shows `false` value as empty string so we have
         // call `.toString()` to avoid this behavior.
         // See https://github.com/finos/legend-studio/issues/1008
-        row[cols[idx] as string] = isBoolean(value) ? String(value) : value;
-        row.rowNumber = rowNumber;
+        row[cols[colIdx] as string] = isBoolean(value) ? String(value) : value;
       });
-      rowNumber += 1;
+      row.rowNumber = rowIdx;
       return row;
     });
 

package/src/components/explorer/QueryBuilderExplorerPanel.tsx

@@ -69,10 +69,7 @@ import { useDrag } from 'react-dnd';
 import { QueryBuilderPropertyInfoTooltip } from '../shared/QueryBuilderPropertyInfoTooltip.js';
 import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import { flowResult } from 'mobx';
-import {
-  getPropertyChainName,
-  prettyPropertyName,
-} from '../../stores/QueryBuilderPropertyEditorState.js';
+import { getPropertyChainName } from '../../stores/QueryBuilderPropertyEditorState.js';
 import {
   type Type,
   type Multiplicity,
@@ -92,7 +89,11 @@ import {
 import { useApplicationStore } from '@finos/legend-application';
 import { getClassPropertyIcon } from '../shared/ElementIconUtils.js';
 import { QUERY_BUILDER_TEST_ID } from '../../application/QueryBuilderTesting.js';
-import { filterByType, guaranteeNonNullable } from '@finos/legend-shared';
+import {
+  filterByType,
+  guaranteeNonNullable,
+  prettyCONSTName,
+} from '@finos/legend-shared';
 import { QueryBuilderPropertySearchPanel } from './QueryBuilderPropertySearchPanel.js';
 import { QueryBuilderTDSState } from '../../stores/fetch-structure/tds/QueryBuilderTDSState.js';
 import { QueryBuilderSimpleProjectionColumnState } from '../../stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
@@ -226,9 +227,7 @@ const QueryBuilderExplorerPreviewDataModal = observer(
           darkMode={true}
           className="editor-modal query-builder__explorer__preview-data-modal"
         >
-          <ModalHeader
-            title={prettyPropertyName(previewDataState.propertyName)}
-          />
+          <ModalHeader title={prettyCONSTName(previewDataState.propertyName)} />
           <PanelLoadingIndicator
             isLoading={previewDataState.isGeneratingPreviewData}
           />
@@ -577,8 +576,8 @@ const QueryBuilderExplorerTreeNodeContainer = observer(
                 >
                   {explorerState.humanizePropertyName
                     ? node instanceof QueryBuilderExplorerTreeSubTypeNodeData
-                      ? TYPE_CAST_TOKEN + prettyPropertyName(node.label)
-                      : prettyPropertyName(node.label)
+                      ? TYPE_CAST_TOKEN + prettyCONSTName(node.label)
+                      : prettyCONSTName(node.label)
                     : node instanceof QueryBuilderExplorerTreeSubTypeNodeData
                     ? TYPE_CAST_TOKEN + node.label
                     : node.label}
@@ -942,7 +941,7 @@ export const QueryBuilderExplorerPanel = observer(
           <DragPreviewLayer
             labelGetter={(item: QueryBuilderExplorerTreeDragSource): string =>
               explorerState.humanizePropertyName
-                ? prettyPropertyName(item.node.label)
+                ? prettyCONSTName(item.node.label)
                 : item.node.label
             }
             types={Object.values(QUERY_BUILDER_EXPLORER_TREE_DND_TYPE)}

package/src/components/explorer/QueryBuilderMilestoningEditor.tsx

@@ -104,11 +104,13 @@ const MilestoningParameterEditor = observer(
             new GenericType(PrimitiveType.STRICTDATE),
           ),
         ),
-        queryBuilderState.observableContext,
+        queryBuilderState.observerContext,
+      );
+      instanceValue_setValues(
+        parameter,
+        [generateDefaultValueForPrimitiveType(PRIMITIVE_TYPE.STRICTDATE)],
+        queryBuilderState.observerContext,
       );
-      instanceValue_setValues(parameter, [
-        generateDefaultValueForPrimitiveType(PRIMITIVE_TYPE.STRICTDATE),
-      ]);
       if (stereotype === MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL) {
         queryBuilderState.milestoningState.setBusinessDate(parameter);
       } else {
@@ -126,7 +128,7 @@ const MilestoningParameterEditor = observer(
           <BasicValueSpecificationEditor
             valueSpecification={milestoningParameter}
             graph={queryBuilderState.graphManagerState.graph}
-            obseverContext={queryBuilderState.observableContext}
+            obseverContext={queryBuilderState.observerContext}
             setValueSpecification={(val: ValueSpecification): void =>
               stereotype === MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL
                 ? queryBuilderState.milestoningState.setBusinessDate(val)

package/src/components/explorer/QueryBuilderPropertySearchPanel.tsx

@@ -38,7 +38,11 @@ import {
   getAllClassProperties,
   getAllOwnClassProperties,
 } from '@finos/legend-graph';
-import { debounce, guaranteeNonNullable } from '@finos/legend-shared';
+import {
+  debounce,
+  guaranteeNonNullable,
+  prettyCONSTName,
+} from '@finos/legend-shared';
 import { observer } from 'mobx-react-lite';
 import { useDrag } from 'react-dnd';
 import { QUERY_BUILDER_PROPERTY_SEARCH_TYPE } from '../../stores/QueryBuilderConfig.js';
@@ -50,7 +54,6 @@ import {
   getQueryBuilderPropertyNodeData,
   type QueryBuilderExplorerState,
 } from '../../stores/explorer/QueryBuilderExplorerState.js';
-import { prettyPropertyName } from '../../stores/QueryBuilderPropertyEditorState.js';
 import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import {
   QueryBuilderSubclassInfoTooltip,
@@ -62,7 +65,7 @@ import { TextSearchAdvancedConfigMenu } from '@finos/legend-application';
 
 const prettyPropertyNameFromNodeId = (name: string): string => {
   let propNameArray = name.split('.');
-  propNameArray = propNameArray.map((p) => prettyPropertyName(p));
+  propNameArray = propNameArray.map(prettyCONSTName);
   let propName = '';
   propNameArray.forEach((p) => {
     propName = `${propName + p}/`;
@@ -76,7 +79,7 @@ const prettyPropertyNameForSubType = (name: string): string => {
   propNameArray = propNameArray
     .map((p) => p.replace(/.*::/, ''))
     .filter((p) => p !== '')
-    .map((p) => prettyPropertyName(p));
+    .map((p) => prettyCONSTName(p));
   let propName = '';
   propNameArray.slice(0, -1).forEach((p) => {
     propName = `${propName}(@${p})/`;
@@ -84,7 +87,7 @@ const prettyPropertyNameForSubType = (name: string): string => {
   propNameArray = guaranteeNonNullable(
     propNameArray[propNameArray.length - 1],
   ).split('.');
-  propNameArray = propNameArray.map((p) => prettyPropertyName(p));
+  propNameArray = propNameArray.map((p) => prettyCONSTName(p));
   propName = `${propName}(@${propNameArray[0]})/`;
   propNameArray.slice(1).forEach((p) => {
     propName = `${propName + p}/`;
@@ -98,7 +101,7 @@ const prettyPropertyNameForSubTypeClass = (name: string): string => {
   propNameArray = propNameArray
     .map((p) => p.replace(/.*::/, ''))
     .filter((p) => p !== '')
-    .map((p) => prettyPropertyName(p));
+    .map((p) => prettyCONSTName(p));
   let propName = '';
   propNameArray.forEach((p) => {
     propName = `${propName}@${p}`;

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

@@ -416,7 +416,7 @@ const QueryBuilderPostFilterConditionEditor = observer(
                     valueSpecification={node.condition.value}
                     setValueSpecification={changeValueSpecification}
                     graph={graph}
-                    obseverContext={queryBuilderState.observableContext}
+                    obseverContext={queryBuilderState.observerContext}
                     typeCheckOption={{
                       expectedType: guaranteeNonNullable(
                         node.condition.columnState.getColumnType(),

package/src/components/filter/QueryBuilderFilterPanel.tsx

@@ -269,7 +269,7 @@ const QueryBuilderFilterConditionEditor = observer(
                     valueSpecification={node.condition.value}
                     setValueSpecification={changeValueSpecification}
                     graph={graph}
-                    obseverContext={queryBuilderState.observableContext}
+                    obseverContext={queryBuilderState.observerContext}
                     typeCheckOption={{
                       expectedType:
                         node.condition.propertyExpressionState