@finos/legend-query-builder 4.14.50 → 4.14.52

package/src/components/filter/QueryBuilderFilterPanel.tsx

@@ -14,7 +14,14 @@
  * limitations under the License.
  */
 
-import { useRef, useState, useCallback, forwardRef, useMemo } from 'react';
+import {
+  useRef,
+  useState,
+  useCallback,
+  forwardRef,
+  useMemo,
+  useEffect,
+} from 'react';
 import { observer } from 'mobx-react-lite';
 import {
   type TreeNodeContainerProps,
@@ -103,9 +110,9 @@ import type { QueryBuilderFilterOperator } from '../../stores/filter/QueryBuilde
 import { isTypeCompatibleForAssignment } from '../../stores/QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_GROUP_OPERATION } from '../../stores/QueryBuilderGroupOperationHelper.js';
 import {
-  BasicValueSpecificationEditor,
   type QueryBuilderVariableDragSource,
   QUERY_BUILDER_VARIABLE_DND_TYPE,
+  EditableBasicValueSpecificationEditor,
 } from '../shared/BasicValueSpecificationEditor.js';
 import { QueryBuilderTelemetryHelper } from '../../__lib__/QueryBuilderTelemetryHelper.js';
 import { getPropertyChainName } from '../../stores/QueryBuilderPropertyEditorState.js';
@@ -350,6 +357,7 @@ export const buildFilterTreeWithExists = (
     undefined,
     filterConditionState,
   );
+  treeNode.setIsNewlyAdded(true);
   filterState.addNodeFromNode(treeNode, parentNode);
   if (targetDropNode instanceof QueryBuilderFilterTreeBlankConditionNodeData) {
     filterState.removeNodeAndPruneBranch(targetDropNode);
@@ -511,6 +519,7 @@ const buildFilterTree = (
       undefined,
       filterConditionState,
     );
+    treeNode.setIsNewlyAdded(true);
     // Check if there are any exists node present in the parent nodes of the target.
     // This would change the way we build the filter tree
     let cn: QueryBuilderFilterTreeNodeData | undefined = targetDropNode;
@@ -798,6 +807,10 @@ const QueryBuilderFilterConditionEditor = observer(
       cleanUpReloadValues,
     };
 
+    useEffect(() => {
+      node.setIsNewlyAdded(false);
+    }, [node]);
+
     return (
       <div
         className="dnd__entry__container"
@@ -856,11 +869,11 @@ const QueryBuilderFilterConditionEditor = observer(
                   isDragOver={isFilterValueDragOver}
                   label="Change Filter Value"
                 >
-                  <BasicValueSpecificationEditor
+                  <EditableBasicValueSpecificationEditor
                     valueSpecification={node.condition.value}
                     setValueSpecification={changeValueSpecification}
                     graph={graph}
-                    obseverContext={queryBuilderState.observerContext}
+                    observerContext={queryBuilderState.observerContext}
                     typeCheckOption={{
                       expectedType:
                         node.condition.propertyExpressionState
@@ -872,6 +885,7 @@ const QueryBuilderFilterConditionEditor = observer(
                     isConstant={queryBuilderState.constantState.isValueSpecConstant(
                       node.condition.value,
                     )}
+                    initializeAsEditable={node.isNewlyAdded}
                   />
                 </PanelEntryDropZonePlaceholder>
               </div>

package/src/components/result/QueryBuilderResultPanel.tsx

@@ -334,6 +334,7 @@ export const QueryBuilderResultPanel = observer(
         <MenuContentItem
           key={item.key}
           title={item.title ?? ''}
+          disabled={item.disableFunc?.(queryBuilderState) ?? false}
           onClick={() => {
             item.onClick(queryBuilderState);
           }}

package/src/components/result/tds/QueryBuilderTDSGridResult.tsx

@@ -22,7 +22,6 @@ import {
   DataGrid,
   type DataGridApi,
   type DataGridCellRange,
-  type DataGridColumnApi,
   type DataGridColumnDefinition,
   type DataGridGetContextMenuItemsParams,
   type DataGridIRowNode,
@@ -249,9 +248,7 @@ export const QueryBuilderTDSGridResult = observer(
     const applicationStore = useApplicationStore();
     const darkMode =
       !applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled;
-    const [columnAPi, setColumnApi] = useState<DataGridColumnApi | undefined>(
-      undefined,
-    );
+    const [gridApi, setGridApi] = useState<DataGridApi | undefined>(undefined);
     const [aggFuncParams, setAggFuncParams] = useState<
       DataGridIAggFuncParams | undefined
     >(undefined);
@@ -262,12 +259,12 @@ export const QueryBuilderTDSGridResult = observer(
       : getColDefs(executionResult, resultState);
 
     const onSaveGridColumnState = (): void => {
-      if (!columnAPi) {
+      if (!gridApi) {
         return;
       }
       resultState.setGridConfig({
-        columns: columnAPi.getColumnState(),
-        isPivotModeEnabled: columnAPi.isPivotMode(),
+        columns: gridApi.getColumnState(),
+        isPivotModeEnabled: gridApi.isPivotMode(),
         isLocalModeEnabled: true,
         previewLimit: resultState.previewLimit,
         ...(resultState.wavgAggregationState?.weightedColumnIdPairs && {
@@ -368,7 +365,7 @@ export const QueryBuilderTDSGridResult = observer(
       ],
     );
 
-    const weightedColumnOptions = columnAPi
+    const weightedColumnOptions = gridApi
       ?.getColumns()
       ?.filter((c) => c.getColDef().cellDataType === 'number')
       .map((col) => ({
@@ -458,7 +455,7 @@ export const QueryBuilderTDSGridResult = observer(
 
     useEffect(() => {
       if (aggFuncParams) {
-        aggFuncParams.columnApi.setColumnAggFunc(
+        aggFuncParams.api.setColumnAggFunc(
           aggFuncParams.colDef.field!,
           QueryBuilderDataGridCustomAggregationFunction.WAVG,
         );
@@ -480,10 +477,12 @@ export const QueryBuilderTDSGridResult = observer(
             <DataGrid
               rowData={getRowDataFromExecutionResult(executionResult)}
               onGridReady={(params): void => {
-                setColumnApi(params.columnApi);
-                params.columnApi.setPivotMode(
-                  Boolean(resultState.gridConfig?.isPivotModeEnabled),
-                );
+                setGridApi(params.api);
+                params.api.updateGridOptions({
+                  pivotMode: Boolean(
+                    resultState.gridConfig?.isPivotModeEnabled,
+                  ),
+                });
               }}
               gridOptions={{
                 suppressScrollOnNewData: true,

package/src/components/result/tds/QueryBuilderTDSResultShared.tsx

@@ -316,7 +316,7 @@ const updateExistingPostFilterConditionNodeData = (
           .map((v) =>
             v instanceof EnumValueInstanceValue
               ? v.values.map((ef) => ef.value.name)
-              : (v as InstanceValue).values,
+              : v.values,
           )
           .flat()
           .includes(_cellData.value ?? data?.value);

package/src/components/result/tds/QueryBuilderTDSSimpleGridResult.tsx

@@ -114,11 +114,11 @@ const QueryResultCellRenderer = observer(
       ) {
         return undefined;
       }
-      if (params.columnApi.getColumnState()[colIndex]?.sort === 'asc') {
+      if (params.api.getColumnState()[colIndex]?.sort === 'asc') {
         resultState.executionResult.result.rows.sort((a, b) =>
           getTDSRowRankByColumnInAsc(a, b, colIndex),
         );
-      } else if (params.columnApi.getColumnState()[colIndex]?.sort === 'desc') {
+      } else if (params.api.getColumnState()[colIndex]?.sort === 'desc') {
         resultState.executionResult.result.rows.sort((a, b) =>
           getTDSRowRankByColumnInAsc(b, a, colIndex),
         );