@finos/legend-query-builder 4.4.0 → 4.5.1

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

@@ -47,6 +47,7 @@ import {
   BufferIcon,
   CustomSelectorInput,
   FolderIcon,
+  PURE_UnknownElementTypeIcon,
 } from '@finos/legend-art';
 import { QUERY_BUILDER_TEST_ID } from '../../__lib__/QueryBuilderTesting.js';
 import {
@@ -80,6 +81,8 @@ import {
   Binding,
   Package,
   getDescendantsOfPackage,
+  PropertyGraphFetchTree,
+  RootGraphFetchTree,
 } from '@finos/legend-graph';
 import {
   ActionAlertActionType,
@@ -115,20 +118,26 @@ const getBindingFormatter = (props: {
     );
   };
 
-const QueryBuilderGraphFetchTreeNodeContainer: React.FC<
+export const QueryBuilderGraphFetchTreeNodeContainer: React.FC<
   TreeNodeContainerProps<
     QueryBuilderGraphFetchTreeNodeData,
     {
       isReadOnly: boolean;
-      removeNode: (node: QueryBuilderGraphFetchTreeNodeData) => void;
+      removeNode?: (node: QueryBuilderGraphFetchTreeNodeData) => void;
     }
   >
 > = (props) => {
   const { node, level, stepPaddingInRem, onNodeSelect, innerProps } = props;
-  const { removeNode } = innerProps;
-  const property = node.tree.property.value;
-  const type = property.genericType.value.rawType;
-  const subType = node.tree.subType?.value;
+  const { isReadOnly, removeNode } = innerProps;
+  let property, type, subType;
+  if (node.tree instanceof PropertyGraphFetchTree) {
+    property = node.tree.property.value;
+    type = property.genericType.value.rawType;
+    subType = node.tree.subType?.value;
+  } else if (node.tree instanceof RootGraphFetchTree) {
+    type = node.tree.class.value;
+  }
+
   const isExpandable = Boolean(node.childrenIds.length);
   const nodeExpandIcon = isExpandable ? (
     node.isOpen ? (
@@ -139,9 +148,13 @@ const QueryBuilderGraphFetchTreeNodeContainer: React.FC<
   ) : (
     <div />
   );
-  const nodeTypeIcon = getClassPropertyIcon(type);
+  const nodeTypeIcon = type ? (
+    getClassPropertyIcon(type)
+  ) : (
+    <PURE_UnknownElementTypeIcon />
+  );
   const toggleExpandNode = (): void => onNodeSelect?.(node);
-  const deleteNode = (): void => removeNode(node);
+  const deleteNode = (): void => removeNode?.(node);
 
   return (
     <div
@@ -184,7 +197,7 @@ const QueryBuilderGraphFetchTreeNodeContainer: React.FC<
           {
             <div className="query-builder-graph-fetch-tree__node__type">
               <div className="query-builder-graph-fetch-tree__node__type__label">
-                {type.name}
+                {type?.name}
               </div>
             </div>
           }
@@ -196,6 +209,7 @@ const QueryBuilderGraphFetchTreeNodeContainer: React.FC<
           title="Remove"
           tabIndex={-1}
           onClick={deleteNode}
+          disabled={isReadOnly}
         >
           <TimesIcon />
         </button>

package/src/components/filter/QueryBuilderFilterPanel.tsx

@@ -45,6 +45,7 @@ import {
   MoreVerticalIcon,
   MenuContentItemIcon,
   MenuContentItemLabel,
+  InfoCircleIcon,
 } from '@finos/legend-art';
 import {
   type QueryBuilderFilterConditionDragSource,
@@ -66,7 +67,10 @@ import {
   buildPropertyExpressionFromExplorerTreeNodeData,
   QUERY_BUILDER_EXPLORER_TREE_DND_TYPE,
 } from '../../stores/explorer/QueryBuilderExplorerState.js';
-import { QueryBuilderPropertyExpressionBadge } from '../QueryBuilderPropertyExpressionEditor.js';
+import {
+  QueryBuilderPropertyExpressionBadge,
+  QueryBuilderPropertyExpressionEditor,
+} from '../QueryBuilderPropertyExpressionEditor.js';
 import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import {
   assertErrorThrown,
@@ -242,9 +246,12 @@ export const buildFilterTreeWithExists = (
       const parentPropertyChainIndex = existsLambdaPropertyChains.findIndex(
         (p) =>
           p instanceof AbstractPropertyExpression &&
-          p.func.value === targetDropNode.propertyExpression.func.value &&
+          p.func.value ===
+            targetDropNode.propertyExpressionState.propertyExpression.func
+              .value &&
           p.func.ownerReference.value.path ===
-            targetDropNode.propertyExpression.func.ownerReference.value.path,
+            targetDropNode.propertyExpressionState.propertyExpression.func
+              .ownerReference.value.path,
       );
       if (parentPropertyChainIndex >= 0) {
         parentNode = targetDropNode;
@@ -281,9 +288,10 @@ export const buildFilterTreeWithExists = (
             cn instanceof QueryBuilderFilterTreeExistsNodeData &&
             p.func.value ===
               guaranteeType(cn, QueryBuilderFilterTreeExistsNodeData)
-                .propertyExpression.func.value &&
+                .propertyExpressionState.propertyExpression.func.value &&
             p.func.ownerReference.value.path ===
-              cn.propertyExpression.func.ownerReference.value.path,
+              cn.propertyExpressionState.propertyExpression.func.ownerReference
+                .value.path,
         );
         if (parentPropertyChainIndex >= 0) {
           parentNode = targetDropNode;
@@ -302,7 +310,7 @@ export const buildFilterTreeWithExists = (
   // 3. Create exists tree node for all the property chains and add them to the filter tree
   for (let i = 0; i < existsLambdaPropertyChains.length - 1; ++i) {
     const existsNode: QueryBuilderFilterTreeExistsNodeData =
-      new QueryBuilderFilterTreeExistsNodeData(parentNode?.id);
+      new QueryBuilderFilterTreeExistsNodeData(filterState, parentNode?.id);
     existsNode.setPropertyExpression(
       existsLambdaPropertyChains[i] as AbstractPropertyExpression,
     );
@@ -456,6 +464,15 @@ const QueryBuilderFilterExistsConditionEditor = observer(
     isDroppable: boolean;
   }) => {
     const { node, humanizePropertyName, isDragOver, isDroppable } = props;
+    const hasDerivedPropertyInExpression = Boolean(
+      node.propertyExpressionState.derivedPropertyExpressionStates.length,
+    );
+    const isValid = node.propertyExpressionState.isValid;
+    const setDerivedPropertyArguments = (): void => {
+      if (hasDerivedPropertyInExpression) {
+        node.propertyExpressionState.setIsEditingDerivedProperty(true);
+      }
+    };
 
     return (
       <div className="query-builder-filter-tree__node__label__content dnd__entry__container">
@@ -470,13 +487,32 @@ const QueryBuilderFilterExistsConditionEditor = observer(
           >
             <div className="query-builder-filter-tree__exists-node__label">
               {getPropertyChainName(
-                node.propertyExpression,
+                node.propertyExpressionState.propertyExpression,
                 humanizePropertyName,
               )}
             </div>
             <div className="query-builder-filter-tree__exists-node__exists--label">
               exists
             </div>
+            {hasDerivedPropertyInExpression && (
+              <button
+                className={clsx(
+                  'query-builder-filter-tree__exists-node__exists--label__action',
+                  {
+                    'query-builder-filter-tree__exists-node__exists--label__action--error':
+                      !isValid,
+                  },
+                )}
+                tabIndex={-1}
+                onClick={setDerivedPropertyArguments}
+                title="Set Derived Property Argument(s)..."
+              >
+                {!isValid && <InfoCircleIcon />} (...)
+              </button>
+            )}
+            <QueryBuilderPropertyExpressionEditor
+              propertyExpressionState={node.propertyExpressionState}
+            />
           </div>
         </PanelEntryDropZonePlaceholder>
       </div>

package/src/components/shared/CustomDatePicker.tsx

@@ -38,6 +38,7 @@ import {
   PrimitiveType,
 } from '@finos/legend-graph';
 import {
+  assertErrorThrown,
   guaranteeNonNullable,
   parseNumber,
   returnUndefOnError,
@@ -58,6 +59,13 @@ import {
   QUERY_BUILDER_PURE_PATH,
   QUERY_BUILDER_SUPPORTED_FUNCTIONS,
 } from '../../graph/QueryBuilderMetaModelConst.js';
+import {
+  useApplicationStore,
+  type ApplicationStore,
+  type LegendApplicationConfig,
+  type LegendApplicationPlugin,
+  type LegendApplicationPluginManager,
+} from '@finos/legend-application';
 
 export enum CUSTOM_DATE_PICKER_OPTION {
   ABSOLUTE_DATE = 'Absolute Date',
@@ -110,6 +118,7 @@ enum CUSTOM_DATE_OPTION_REFERENCE_MOMENT {
   FIRST_DAY_OF_QUARTER = 'Start of Quarter',
   FIRST_DAY_OF_MONTH = 'Start of Month',
   FIRST_DAY_OF_WEEK = 'Start of Week',
+  PERVIOUS_DAY_OF_WEEK = 'Previous Day of Week',
 }
 
 /**
@@ -599,6 +608,8 @@ const buildCustomDateOptionReferenceMomentValue = (
       return CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_MONTH;
     case QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK:
       return CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_WEEK;
+    case QUERY_BUILDER_SUPPORTED_FUNCTIONS.PREVIOUS_DAY_OF_WEEK:
+      return CUSTOM_DATE_OPTION_REFERENCE_MOMENT.PERVIOUS_DAY_OF_WEEK;
     default:
       throw new UnsupportedOperationError(
         `Can't build custom date option reference moment '${funcName}'`,
@@ -612,6 +623,10 @@ const buildCustomDateOptionReferenceMomentValue = (
  */
 const buildCustomDateOption = (
   valueSpecification: SimpleFunctionExpression | PrimitiveInstanceValue,
+  applicationStore: ApplicationStore<
+    LegendApplicationConfig,
+    LegendApplicationPluginManager<LegendApplicationPlugin>
+  >,
 ): CustomDateOption => {
   if (
     valueSpecification instanceof SimpleFunctionExpression &&
@@ -620,29 +635,36 @@ const buildCustomDateOption = (
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.ADJUST,
     )
   ) {
-    const customDateOption = new CustomDateOption(
-      '',
-      CUSTOM_DATE_PICKER_OPTION.CUSTOM_DATE,
-      buildCustomDateOptionDurationValue(valueSpecification),
-      buildCustomDateOptionUnitValue(valueSpecification),
-      buildCustomDateOptionDirectionValue(valueSpecification),
-      buildCustomDateOptionReferenceMomentValue(valueSpecification),
-    );
-    const matchedPreservedCustomAdjustDates = reservedCustomDateOptions.filter(
-      (t) =>
-        t.generateDisplayLabel() === customDateOption.generateDisplayLabel(),
-    );
-    if (matchedPreservedCustomAdjustDates.length > 0) {
-      customDateOption.label = guaranteeNonNullable(
-        matchedPreservedCustomAdjustDates[0]?.label,
-      );
-      customDateOption.value = guaranteeNonNullable(
-        matchedPreservedCustomAdjustDates[0]?.value,
+    try {
+      const customDateOption = new CustomDateOption(
+        '',
+        CUSTOM_DATE_PICKER_OPTION.CUSTOM_DATE,
+        buildCustomDateOptionDurationValue(valueSpecification),
+        buildCustomDateOptionUnitValue(valueSpecification),
+        buildCustomDateOptionDirectionValue(valueSpecification),
+        buildCustomDateOptionReferenceMomentValue(valueSpecification),
       );
+      const matchedPreservedCustomAdjustDates =
+        reservedCustomDateOptions.filter(
+          (t) =>
+            t.generateDisplayLabel() ===
+            customDateOption.generateDisplayLabel(),
+        );
+      if (matchedPreservedCustomAdjustDates.length > 0) {
+        customDateOption.label = guaranteeNonNullable(
+          matchedPreservedCustomAdjustDates[0]?.label,
+        );
+        customDateOption.value = guaranteeNonNullable(
+          matchedPreservedCustomAdjustDates[0]?.value,
+        );
+        return customDateOption;
+      }
+      customDateOption.updateLabel();
       return customDateOption;
+    } catch (error) {
+      assertErrorThrown(error);
+      applicationStore.notificationService.notifyError(error);
     }
-    customDateOption.updateLabel();
-    return customDateOption;
   }
   return new CustomDateOption('', '', 0, undefined, undefined, undefined);
 };
@@ -652,6 +674,10 @@ const buildCustomDateOption = (
  */
 export const buildDatePickerOption = (
   valueSpecification: SimpleFunctionExpression | PrimitiveInstanceValue,
+  applicationStore: ApplicationStore<
+    LegendApplicationConfig,
+    LegendApplicationPluginManager<LegendApplicationPlugin>
+  >,
 ): DatePickerOption => {
   if (valueSpecification instanceof SimpleFunctionExpression) {
     switch (getSupportedDateFunctionFullPath(valueSpecification.functionName)) {
@@ -694,7 +720,7 @@ export const buildDatePickerOption = (
             .values[0]?.value.name as CUSTOM_DATE_DAY_OF_WEEK,
         );
       case QUERY_BUILDER_SUPPORTED_FUNCTIONS.ADJUST:
-        return buildCustomDateOption(valueSpecification);
+        return buildCustomDateOption(valueSpecification, applicationStore);
       default:
         return new DatePickerOption('', '');
     }
@@ -1210,6 +1236,7 @@ export const CustomDatePicker: React.FC<{
     observerContext,
     typeCheckOption,
   } = props;
+  const applicationStore = useApplicationStore();
   // For some cases where types need to be matched strictly.
   // Some options need to be filtered out for DateTime.
   const targetDateOptionsEnum = typeCheckOption.match
@@ -1219,7 +1246,7 @@ export const CustomDatePicker: React.FC<{
       ])
     : Object.values(CUSTOM_DATE_PICKER_OPTION);
   const [datePickerOption, setDatePickerOption] = useState(
-    buildDatePickerOption(valueSpecification),
+    buildDatePickerOption(valueSpecification, applicationStore),
   );
 
   const [anchorEl, setAnchorEl] = useState<HTMLButtonElement | null>(null);
@@ -1229,10 +1256,14 @@ export const CustomDatePicker: React.FC<{
     setAnchorEl(event.currentTarget);
   };
   const handleEnter = (): void => {
-    setDatePickerOption(buildDatePickerOption(valueSpecification));
+    setDatePickerOption(
+      buildDatePickerOption(valueSpecification, applicationStore),
+    );
   };
   const closeCustomDatePickerPopover = (): void => {
-    setDatePickerOption(buildDatePickerOption(valueSpecification));
+    setDatePickerOption(
+      buildDatePickerOption(valueSpecification, applicationStore),
+    );
     setAnchorEl(null);
   };
   const handleDatePickerOptionChange = (
@@ -1311,7 +1342,10 @@ export const CustomDatePicker: React.FC<{
           <CustomDateInstanceValueEditor
             graph={graph}
             observerContext={observerContext}
-            customDateOptionValue={buildCustomDateOption(valueSpecification)}
+            customDateOptionValue={buildCustomDateOption(
+              valueSpecification,
+              applicationStore,
+            )}
             setValueSpecification={setValueSpecification}
             setDatePickerOption={setDatePickerOption}
           />
@@ -1323,6 +1357,7 @@ export const CustomDatePicker: React.FC<{
             observerContext={observerContext}
             customDateAdjustOptionValue={buildDatePickerOption(
               valueSpecification,
+              applicationStore,
             )}
             setValueSpecification={setValueSpecification}
             setDatePickerOption={setDatePickerOption}
@@ -1335,6 +1370,7 @@ export const CustomDatePicker: React.FC<{
             observerContext={observerContext}
             customDateAdjustOptionValue={buildDatePickerOption(
               valueSpecification,
+              applicationStore,
             )}
             setValueSpecification={setValueSpecification}
             setDatePickerOption={setDatePickerOption}
@@ -1347,8 +1383,10 @@ export const CustomDatePicker: React.FC<{
 
   // make sure the date picker label is updated when the value is reset or changed somehow
   useEffect(() => {
-    setDatePickerOption(buildDatePickerOption(valueSpecification));
-  }, [valueSpecification]);
+    setDatePickerOption(
+      buildDatePickerOption(valueSpecification, applicationStore),
+    );
+  }, [applicationStore, valueSpecification]);
 
   return (
     <>

package/src/components/shared/QueryBuilderVariableSelector.tsx

@@ -55,7 +55,10 @@ export const VariableViewer = observer(
 
     const getNameOfValue = (value: ValueSpecification): string | undefined => {
       if (value instanceof SimpleFunctionExpression) {
-        const possibleDateLabel = buildDatePickerOption(value).label;
+        const possibleDateLabel = buildDatePickerOption(
+          value,
+          queryBuilderState.applicationStore,
+        ).label;
         if (possibleDateLabel) {
           return possibleDateLabel;
         }

package/src/stores/execution-plan/ExecutionPlanState.ts

@@ -20,6 +20,8 @@ import {
   type GraphManagerState,
   ExecutionPlan,
   ExecutionNode,
+  StoreMappingGlobalGraphFetchExecutionNode,
+  RelationalGraphFetchExecutionNode,
 } from '@finos/legend-graph';
 import type { TreeNodeData, TreeData } from '@finos/legend-art';
 import type { GenericLegendApplicationStore } from '@finos/legend-application';
@@ -28,6 +30,7 @@ import {
   filterByType,
   guaranteeNonNullable,
 } from '@finos/legend-shared';
+import { generateExecutionNodeLabel } from '../../components/execution-plan/ExecutionPlanViewer.js';
 
 export class ExecutionPlanViewTreeNodeData implements TreeNodeData {
   id: string;
@@ -63,8 +66,14 @@ export class ExecutionNodeTreeNodeData implements TreeNodeData {
   isOpen?: boolean;
   childrenIds?: string[];
   executionNode: ExecutionNode;
+  parentNodeId: string | undefined;
 
-  constructor(id: string, label: string, executionNode: ExecutionNode) {
+  constructor(
+    id: string,
+    label: string,
+    executionNode: ExecutionNode,
+    parentNodeId: string | undefined,
+  ) {
     makeObservable(this, {
       isSelected: observable,
       isOpen: observable,
@@ -74,6 +83,7 @@ export class ExecutionNodeTreeNodeData implements TreeNodeData {
     this.id = id;
     this.label = label;
     this.executionNode = executionNode;
+    this.parentNodeId = parentNodeId;
   }
 
   setIsSelected(val: boolean): void {
@@ -96,6 +106,9 @@ export const generateExecutionNodeTreeNodeData = (
     executionNode._UUID,
     label,
     executionNode,
+    parentNode instanceof ExecutionNodeTreeNodeData
+      ? generateExecutionNodeLabel(parentNode.executionNode)
+      : undefined,
   );
 
   const childrenIds: string[] = [];
@@ -107,6 +120,27 @@ export const generateExecutionNodeTreeNodeData = (
       addUniqueEntry(childrenIds, childExecutionNode._UUID);
     });
 
+  if (executionNode instanceof StoreMappingGlobalGraphFetchExecutionNode) {
+    addUniqueEntry(
+      childrenIds,
+      executionNode.localGraphFetchExecutionNode._UUID,
+    );
+    executionNode.children
+      .slice()
+      .filter(filterByType(ExecutionNode))
+      .forEach((childExecutionNode) => {
+        addUniqueEntry(childrenIds, childExecutionNode._UUID);
+      });
+  }
+
+  if (executionNode instanceof RelationalGraphFetchExecutionNode) {
+    executionNode.children
+      .slice()
+      .filter(filterByType(ExecutionNode))
+      .forEach((childExecutionNode) => {
+        addUniqueEntry(childrenIds, childExecutionNode._UUID);
+      });
+  }
   executionNodeTreeNode.childrenIds = childrenIds;
 
   return executionNodeTreeNode;
@@ -149,6 +183,32 @@ export enum EXECUTION_PLAN_VIEW_MODE {
   JSON = 'JSON',
 }
 
+export enum PLAN_TABS {
+  GENERAL = 'GENERAL',
+  GLOBAL_IMPLEMENTATION_SUPPORT = 'GLOBAL_IMPLEMENTATION_SUPPORT',
+}
+
+class GlobalImplementationSupportState {
+  selectedTab: PLAN_TABS = PLAN_TABS.GENERAL;
+  selectedJavaClass: string | undefined = undefined;
+  constructor() {
+    makeObservable(this, {
+      selectedTab: observable,
+      selectedJavaClass: observable,
+      setSelectedTab: action,
+      setSelectedJavaClass: action,
+    });
+  }
+
+  setSelectedTab(tab: PLAN_TABS): void {
+    this.selectedTab = tab;
+  }
+
+  setSelectedJavaClass(javaClass: string | undefined): void {
+    this.selectedJavaClass = javaClass;
+  }
+}
+
 export class ExecutionPlanState {
   applicationStore: GenericLegendApplicationStore;
   graphManagerState: GraphManagerState;
@@ -165,6 +225,8 @@ export class ExecutionPlanState {
   rawPlan?: RawExecutionPlan | undefined;
   plan?: ExecutionPlan | undefined;
   debugText?: string | undefined;
+  globalImplementationSupportState: GlobalImplementationSupportState =
+    new GlobalImplementationSupportState();
 
   constructor(
     applicationStore: GenericLegendApplicationStore,
@@ -191,6 +253,7 @@ export class ExecutionPlanState {
       refreshTreeData: action,
       nonNullableTreeData: computed,
       initialize: action,
+      globalImplementationSupportState: observable,
     });
     this.applicationStore = applicationStore;
     this.graphManagerState = graphManagerState;

package/src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.ts

@@ -25,6 +25,7 @@ import {
   RootGraphFetchTree,
   getAllSuperclasses,
   type Binding,
+  PropertyGraphFetchTree,
 } from '@finos/legend-graph';
 import {
   type QueryBuilderGraphFetchTreeData,
@@ -323,12 +324,18 @@ export class QueryBuilderGraphFetchTreeState
         ? // since we traverse the nodes in order, parent node ID should already been computed
           guaranteeNonNullable(explorerTreeNodeIDIndex.get(node.parentId))
         : '';
+      let generateID = '';
+      if (node.tree instanceof RootGraphFetchTree) {
+        generateID = `root.${node.tree.class.valueForSerialization ?? ''}`;
+      } else if (node.tree instanceof PropertyGraphFetchTree) {
+        generateID = node.tree.property.value.name;
+      }
       const propertyNodeID = generateExplorerTreePropertyNodeID(
         parentNodeID,
-        node.tree.property.value.name,
+        generateID,
       );
       ids.push(propertyNodeID);
-      if (node.tree.subType) {
+      if (node.tree instanceof PropertyGraphFetchTree && node.tree.subType) {
         nodeID = generateExplorerTreeSubtypeNodeID(
           propertyNodeID,
           node.tree.subType.value.path,
@@ -502,11 +509,14 @@ export class QueryBuilderGraphFetchTreeState
 
   isVariableUsed(variable: VariableExpression): boolean {
     return Boolean(
-      Array.from(this.treeData?.nodes.values() ?? []).find((node) =>
-        node.tree.parameters.find((p) =>
-          isValueExpressionReferencedInValue(variable, p),
-        ),
-      ),
+      Array.from(this.treeData?.nodes.values() ?? []).find((node) => {
+        if (node.tree instanceof PropertyGraphFetchTree) {
+          return node.tree.parameters.find((p) =>
+            isValueExpressionReferencedInValue(variable, p),
+          );
+        }
+        return undefined;
+      }),
     );
   }