@finos/legend-application-query 5.2.6 → 5.2.7

package/lib/stores/filter/operators/QueryBuilderFilterOperatorHelper.js

@@ -18,7 +18,7 @@ import { guaranteeType, guaranteeNonNullable, assertTrue, generateEnumerableName
 import { FilterConditionState, } from '../QueryBuilderFilterState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../QueryBuilder_Const.js';
 import { buildGenericLambdaFunctionInstanceValue } from '../../QueryBuilderValueSpecificationHelper.js';
-import { buildPropertyExpressionChain } from '../../QueryBuilderValueSpecificationBuilder.js';
+import { buildPropertyExpressionChain } from '../../QueryBuilderValueSpecificationBuilderHelper.js';
 const getPropertyExpressionChainVariable = (propertyExpression) => {
     let currentExpression = propertyExpression;
     while (currentExpression instanceof AbstractPropertyExpression) {
@@ -143,15 +143,15 @@ export const buildFilterConditionExpression = (filterConditionState, operatorFun
  * we record the lambda parameter names, so we can use those while re-building the function
  * If for some reason, this list is stale, we can start adding our own parameter names
  */
-const buildFilterConditionStateWithExists = (filterState, precedingExpression, operatorFunctionFullPath) => {
-    if (matchFunctionName(precedingExpression.functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.EXISTS)) {
+const buildFilterConditionStateWithExists = (filterState, parentExpression, operatorFunctionFullPath) => {
+    if (matchFunctionName(parentExpression.functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.EXISTS)) {
         // 1. Decompose the exists() lambda chain into property expression chains
         const existsLambdaParameterNames = [];
         // `existsLambdaExpressions` should be a list of `AbstractPropertyExpression`
         // e.g. |Firm.all()->filter(x|$x.employees->exists(x_1|$x_1->subType(@Develper).id->exists(x_2|$x_2 == 1))
         // In the first exists() lambda, `$x_1->subType(@Develper).id` is an `AbstractPropertyExpression`.
         const existsLambdaExpressions = [];
-        let mainFilterExpression = precedingExpression;
+        let mainFilterExpression = parentExpression;
         while (matchFunctionName(mainFilterExpression.functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.EXISTS)) {
             const existsLambda = guaranteeNonNullable(guaranteeType(mainFilterExpression.parametersValues[1], LambdaFunctionInstanceValue).values[0], `Can't process exists() expression: exists() lambda is missing`);
             assertTrue(existsLambda.expressionSequence.length === 1, `Can't process exists() expression: exists() lambda body should hold an expression`);
@@ -171,7 +171,7 @@ const buildFilterConditionStateWithExists = (filterState, precedingExpression, o
         }
         // 2. Build the property expression
         const multiplicityOne = filterState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
-        const initialPropertyExpression = guaranteeType(precedingExpression.parametersValues[0], AbstractPropertyExpression);
+        const initialPropertyExpression = guaranteeType(parentExpression.parametersValues[0], AbstractPropertyExpression);
         let flattenedPropertyExpressionChain = new AbstractPropertyExpression('', multiplicityOne);
         flattenedPropertyExpressionChain.func = initialPropertyExpression.func;
         flattenedPropertyExpressionChain.parametersValues =

package/lib/stores/filter/operators/QueryBuilderFilterOperatorHelper.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-query",
-  "version": "5.2.6",
+  "version": "5.2.7",
   "description": "Legend Query application core",
   "keywords": [
     "legend",
@@ -46,19 +46,19 @@
     "@ag-grid-community/client-side-row-model": "28.1.1",
     "@ag-grid-community/core": "28.1.1",
     "@ag-grid-community/react": "28.1.1",
-    "@finos/legend-application": "7.1.5",
-    "@finos/legend-art": "3.0.3",
-    "@finos/legend-graph": "14.0.5",
-    "@finos/legend-server-depot": "3.0.8",
-    "@finos/legend-shared": "6.0.3",
-    "@finos/legend-storage": "3.0.7",
-    "@testing-library/react": "13.3.0",
-    "@types/react": "18.0.17",
+    "@finos/legend-application": "7.1.6",
+    "@finos/legend-art": "3.0.4",
+    "@finos/legend-graph": "14.0.6",
+    "@finos/legend-server-depot": "3.0.9",
+    "@finos/legend-shared": "6.0.4",
+    "@finos/legend-storage": "3.0.8",
+    "@testing-library/react": "13.4.0",
+    "@types/react": "18.0.18",
     "@types/react-dom": "18.0.6",
     "@types/react-router-dom": "5.3.3",
     "date-fns": "2.29.2",
     "history": "5.3.0",
-    "mobx": "6.6.1",
+    "mobx": "6.6.2",
     "mobx-react-lite": "3.4.0",
     "monaco-editor": "0.34.0",
     "react": "18.2.0",
@@ -71,14 +71,14 @@
     "serializr": "2.0.5"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.0.13",
-    "@jest/globals": "29.0.1",
+    "@finos/legend-dev-utils": "2.0.14",
+    "@jest/globals": "29.0.2",
     "cross-env": "7.0.3",
     "eslint": "8.23.0",
-    "jest": "29.0.1",
+    "jest": "29.0.2",
     "npm-run-all": "4.1.5",
     "rimraf": "3.0.2",
-    "sass": "1.54.5",
+    "sass": "1.54.8",
     "typescript": "4.8.2"
   },
   "peerDependencies": {

package/src/components/QueryBuilder.tsx

@@ -48,7 +48,7 @@ import { useApplicationStore } from '@finos/legend-application';
 import { QueryBuilderParameterPanel } from './QueryBuilderParameterPanel.js';
 import { QueryBuilderPostFilterPanel } from './fetch-structure/QueryBuilderPostFilterPanel.js';
 import { QueryBuilderFunctionsExplorerPanel } from './explorer/QueryBuilderFunctionsExplorerPanel.js';
-import { FETCH_STRUCTURE_MODE } from '../stores/fetch-structure/QueryBuilderFetchStructureState.js';
+import { QueryBuilderProjectionState } from '../stores/fetch-structure/projection/QueryBuilderProjectionState.js';
 
 enum QUERY_BUILDER_HOTKEY {
   COMPILE = 'COMPILE',
@@ -142,10 +142,16 @@ export const QueryBuilder = observer(
       );
     };
     const toggleShowPostFilterPanel = (): void => {
-      queryBuilderState.fetchStructureState.projectionState.setShowPostFilterPanel(
-        !queryBuilderState.fetchStructureState.projectionState
-          .showPostFilterPanel,
-      );
+      if (
+        queryBuilderState.fetchStructureState.implementation instanceof
+        QueryBuilderProjectionState
+      ) {
+        const projectionState =
+          queryBuilderState.fetchStructureState.implementation;
+        projectionState.setShowPostFilterPanel(
+          !projectionState.showPostFilterPanel,
+        );
+      }
     };
 
     // settings
@@ -178,6 +184,7 @@ export const QueryBuilder = observer(
                       Show Function(s)
                     </MenuContentItemLabel>
                   </MenuContentItem>
+                  {/* TODO?: consider hiding this menu option when the fetch-structure is not projection */}
                   <MenuContentItem
                     onClick={toggleShowParameterPanel}
                     disabled={
@@ -197,16 +204,20 @@ export const QueryBuilder = observer(
                   <MenuContentItem
                     onClick={toggleShowPostFilterPanel}
                     disabled={
-                      queryBuilderState.fetchStructureState
-                        .fetchStructureMode !==
-                        FETCH_STRUCTURE_MODE.PROJECTION ||
+                      !(
+                        queryBuilderState.fetchStructureState
+                          .implementation instanceof QueryBuilderProjectionState
+                      ) ||
                       Array.from(
-                        queryBuilderState.fetchStructureState.projectionState.postFilterState.nodes.values(),
+                        queryBuilderState.fetchStructureState.implementation.postFilterState.nodes.values(),
                       ).length > 0
                     }
                   >
                     <MenuContentItemIcon>
-                      {queryBuilderState.fetchStructureState.projectionState
+                      {queryBuilderState.fetchStructureState
+                        .implementation instanceof
+                        QueryBuilderProjectionState &&
+                      queryBuilderState.fetchStructureState.implementation
                         .showPostFilterPanel ? (
                         <CheckIcon />
                       ) : null}
@@ -339,28 +350,36 @@ export const QueryBuilder = observer(
                       </ResizablePanel>
                       <ResizablePanelSplitter />
                       <ResizablePanel minSize={300}>
-                        {!queryBuilderState.fetchStructureState.projectionState
-                          .showPostFilterPanel && (
+                        {(!(
+                          queryBuilderState.fetchStructureState
+                            .implementation instanceof
+                          QueryBuilderProjectionState
+                        ) ||
+                          !queryBuilderState.fetchStructureState.implementation
+                            .showPostFilterPanel) && (
                           <QueryBuilderFilterPanel
                             queryBuilderState={queryBuilderState}
                           />
                         )}
-                        {queryBuilderState.fetchStructureState.projectionState
-                          .showPostFilterPanel && (
-                          <ResizablePanelGroup orientation="horizontal">
-                            <ResizablePanel minSize={300}>
-                              <QueryBuilderFilterPanel
-                                queryBuilderState={queryBuilderState}
-                              />
-                            </ResizablePanel>
-                            <ResizablePanelSplitter />
-                            <ResizablePanel>
-                              <QueryBuilderPostFilterPanel
-                                queryBuilderState={queryBuilderState}
-                              />
-                            </ResizablePanel>
-                          </ResizablePanelGroup>
-                        )}
+                        {queryBuilderState.fetchStructureState
+                          .implementation instanceof
+                          QueryBuilderProjectionState &&
+                          queryBuilderState.fetchStructureState.implementation
+                            .showPostFilterPanel && (
+                            <ResizablePanelGroup orientation="horizontal">
+                              <ResizablePanel minSize={300}>
+                                <QueryBuilderFilterPanel
+                                  queryBuilderState={queryBuilderState}
+                                />
+                              </ResizablePanel>
+                              <ResizablePanelSplitter />
+                              <ResizablePanel>
+                                <QueryBuilderPostFilterPanel
+                                  queryBuilderState={queryBuilderState}
+                                />
+                              </ResizablePanel>
+                            </ResizablePanelGroup>
+                          )}
                       </ResizablePanel>
                     </ResizablePanelGroup>
                   ) : (

package/src/components/QueryBuilderResultPanel.tsx

@@ -78,29 +78,29 @@ import {
   QueryBuilderPostFilterOperator_NotIn,
 } 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';
 
-const QueryBuilderResultContextMenu = observer(
+const QueryBuilderGridResultContextMenu = observer(
   forwardRef<
     HTMLDivElement,
     {
       event: CellMouseOverEvent | null;
-      queryBuilderState: QueryBuilderState;
+      projectionState: QueryBuilderProjectionState;
     }
   >(function QueryBuilderResultContextMenu(props, ref) {
-    const { event, queryBuilderState } = props;
+    const { event, projectionState } = props;
     const applicationStore = useApplicationStore();
     const postFilterEqualOperator = new QueryBuilderPostFilterOperator_Equal();
     const postFilterInOperator = new QueryBuilderPostFilterOperator_In();
     const postFilterNotEqualOperator =
       new QueryBuilderPostFilterOperator_NotEqual();
     const postFilterNotInOperator = new QueryBuilderPostFilterOperator_NotIn();
-    const postFilterState =
-      queryBuilderState.fetchStructureState.projectionState.postFilterState;
+    const postFilterState = projectionState.postFilterState;
     const projectionColumnState = guaranteeNonNullable(
-      queryBuilderState.fetchStructureState.projectionState.columns
+      projectionState.columns
         .filter((c) => c.columnName === event?.column.getColId())
         .concat(
-          queryBuilderState.fetchStructureState.projectionState.aggregationState.columns
+          projectionState.aggregationState.columns
             .filter((c) => c.columnName === event?.column.getColId())
             .map((ag) => ag.projectionColumnState),
         )[0],
@@ -252,9 +252,7 @@ const QueryBuilderResultContextMenu = observer(
     };
 
     const filterByOrOut = (isFilterBy: boolean): void => {
-      queryBuilderState.fetchStructureState.projectionState.setShowPostFilterPanel(
-        true,
-      );
+      projectionState.setShowPostFilterPanel(true);
       const existingPostFilterNode = getExistingPostFilterNode(
         isFilterBy
           ? [postFilterEqualOperator, postFilterInOperator]
@@ -297,6 +295,8 @@ const QueryBuilderGridResult = observer(
     queryBuilderState: QueryBuilderState;
   }) => {
     const { executionResult, queryBuilderState } = props;
+    const fetchStructureImplementation =
+      queryBuilderState.fetchStructureState.implementation;
     const [cellDoubleClickedEvent, setCellDoubleClickedEvent] =
       useState<CellMouseOverEvent | null>(null);
     const columns = executionResult.result.columns;
@@ -315,10 +315,17 @@ const QueryBuilderGridResult = observer(
     return (
       <ContextMenu
         content={
-          <QueryBuilderResultContextMenu
-            event={cellDoubleClickedEvent}
-            queryBuilderState={queryBuilderState}
-          />
+          // NOTE: we only support this functionality for grid result with a projection fetch-structure
+          fetchStructureImplementation instanceof
+          QueryBuilderProjectionState ? (
+            <QueryBuilderGridResultContextMenu
+              event={cellDoubleClickedEvent}
+              projectionState={fetchStructureImplementation}
+            />
+          ) : null
+        }
+        disabled={
+          !(fetchStructureImplementation instanceof QueryBuilderProjectionState)
         }
         menuProps={{ elevation: 7 }}
         key={executionResult._UUID}

package/src/components/QueryBuilderSetupPanel.tsx

@@ -187,7 +187,7 @@ export const QueryBuilderSetupPanel = observer(
       if (querySetupState._class && !querySetupState.mappingIsReadOnly) {
         querySetupState.setMapping(val.value);
         queryBuilderState.resetQueryBuilder();
-        queryBuilderState.resetQuerySetup();
+        queryBuilderState.resetQueryContent();
       }
     };
     // runtime

package/src/components/explorer/QueryBuilderExplorerPanel.tsx

@@ -85,8 +85,6 @@ import { getClassPropertyIcon } from '../shared/ElementIconUtils.js';
 import { QUERY_BUILDER_TEST_ID } from '../QueryBuilder_TestID.js';
 import { filterByType, guaranteeNonNullable } from '@finos/legend-shared';
 import { QueryBuilderPropertySearchPanel } from './QueryBuilderPropertySearchPanel.js';
-import type { QueryBuilderFetchStructureState } from '../../stores/fetch-structure/QueryBuilderFetchStructureState.js';
-import { QueryBuilderSimpleProjectionColumnState } from '../../stores/fetch-structure/projection/QueryBuilderProjectionColumnState.js';
 
 const checkForDeprecatedNode = (
   node: QueryBuilderExplorerTreeNodeData,
@@ -113,35 +111,26 @@ const checkForDeprecatedNode = (
   return false;
 };
 
-export const isNodeAlreadyUsed = (
+export const isExplorerTreeNodeAlreadyUsed = (
   node: QueryBuilderExplorerTreeNodeData,
-  fetchStructureState: QueryBuilderFetchStructureState,
+  queryBuilderState: QueryBuilderState,
 ): boolean => {
+  // if the fetch-structure is non-empty, it means we can mark the root node as used
   if (
     node instanceof QueryBuilderExplorerTreeRootNodeData &&
-    (fetchStructureState.projectionState.columns.filter(
-      (column) => column instanceof QueryBuilderSimpleProjectionColumnState,
-    ).length > 0 ||
-      (fetchStructureState.graphFetchTreeState.treeData !== undefined &&
-        fetchStructureState.graphFetchTreeState.treeData.rootIds.length > 0))
+    queryBuilderState.fetchStructureState.implementation
+      .usedExplorerTreePropertyNodeIDs.length > 0
   ) {
     return true;
   }
-  return (
-    fetchStructureState.projectionState.usedPropertyNodeIds.includes(node.id) ||
-    (fetchStructureState.graphFetchTreeState.treeData !== undefined &&
-      fetchStructureState.graphFetchTreeState.treeData.rootIds.length > 0 &&
-      (Array.from(
-        guaranteeNonNullable(
-          fetchStructureState.graphFetchTreeState.treeData,
-        ).nodes.values(),
-      ).find((n) => n.id === node.id) !== undefined ||
-        Array.from(
-          guaranteeNonNullable(
-            fetchStructureState.graphFetchTreeState.treeData,
-          ).nodes.values(),
-        ).find((n) => n.id.split(TYPE_CAST_TOKEN)[0] === node.id) !==
-          undefined))
+  // in the explorer tree, we represent subtype as a subtree, we want to flatten this to only
+  // the subtype that actually being used to make comparison simpler
+  const simplifiedNodeID = node.id.replaceAll(/(?:@[^.]+)+/g, (val) => {
+    const chunks = val.split(TYPE_CAST_TOKEN);
+    return `${TYPE_CAST_TOKEN}${chunks[chunks.length - 1]}`;
+  });
+  return queryBuilderState.fetchStructureState.implementation.usedExplorerTreePropertyNodeIDs.includes(
+    simplifiedNodeID,
   );
 };
 
@@ -466,10 +455,7 @@ const QueryBuilderExplorerTreeNodeContainer = observer(
 
               'query-builder-explorer-tree__node__container--highlighted':
                 explorerState.highlightUsedProperties &&
-                isNodeAlreadyUsed(
-                  node,
-                  explorerState.queryBuilderState.fetchStructureState,
-                ),
+                isExplorerTreeNodeAlreadyUsed(node, queryBuilderState),
             },
           )}
           title={
@@ -485,19 +471,18 @@ const QueryBuilderExplorerTreeNodeContainer = observer(
           }}
         >
           {node instanceof QueryBuilderExplorerTreeRootNodeData && (
-            // NOTE: since the root of the tree is the class, not the property, we want to display it differently
             <>
-              <div className="query-builder-explorer-tree__expand-icon">
-                {nodeExpandIcon}
-              </div>
-              <div className="tree-view__node__label query-builder-explorer-tree__root-node__label">
-                <div className="query-builder-explorer-tree__root-node__label__icon">
-                  <PURE_ClassIcon />
+              <div className="tree-view__node__icon query-builder-explorer-tree__node__icon">
+                <div className="query-builder-explorer-tree__expand-icon">
+                  {nodeExpandIcon}
                 </div>
-                <div className="query-builder-explorer-tree__root-node__label__text">
-                  {node.label}
+                <div className="query-builder-explorer-tree__type-icon">
+                  <PURE_ClassIcon />
                 </div>
               </div>
+              <div className="tree-view__node__label query-builder-explorer-tree__node__label">
+                {node.label}
+              </div>
             </>
           )}
           {(node instanceof QueryBuilderExplorerTreePropertyNodeData ||
@@ -767,7 +752,7 @@ export const QueryBuilderExplorerPanel = observer(
     const { queryBuilderState } = props;
     const searchButtonRef = useRef<HTMLButtonElement>(null);
     const explorerState = queryBuilderState.explorerState;
-    const propertySearchPanelState = explorerState.propertySearchPanelState;
+    const propertySearchPanelState = explorerState.propertySearchState;
     const applicationStore = useApplicationStore();
     const collapseTree = (): void => {
       if (explorerState.treeData) {

package/src/components/explorer/QueryBuilderPropertySearchPanel.tsx

@@ -115,7 +115,7 @@ const QueryBuilderTreeNodeViewer = observer(
     const { node, queryBuilderState, explorerState, level, stepPaddingInRem } =
       props;
     const [isExpandable, setIsExpandable] = useState(false);
-    const propertySearchPanelState = explorerState.propertySearchPanelState;
+    const propertySearchPanelState = explorerState.propertySearchState;
     const [, dragConnector, dragPreviewConnector] = useDrag<{
       node?: QueryBuilderExplorerTreePropertyNodeData;
     }>(
@@ -281,7 +281,7 @@ export const QueryBuilderPropertySearchPanel = observer(
   }) => {
     const { queryBuilderState, triggerElement } = props;
     const explorerState = queryBuilderState.explorerState;
-    const propertySearchPanelState = explorerState.propertySearchPanelState;
+    const propertySearchPanelState = explorerState.propertySearchState;
     const searchInputRef = useRef<HTMLInputElement>(null);
     const changePropertyName: React.ChangeEventHandler<HTMLInputElement> = (
       event,