@finos/legend-query-builder 4.14.52 → 4.14.54

package/src/components/explorer/QueryBuilderMilestoningParameterEditor.tsx

@@ -25,6 +25,7 @@ import {
   PrimitiveInstanceValue,
   PRIMITIVE_TYPE,
   PrimitiveType,
+  VariableExpression,
 } from '@finos/legend-graph';
 import { useDrop } from 'react-dnd';
 import { PanelEntryDropZonePlaceholder } from '@finos/legend-art';
@@ -33,16 +34,27 @@ import {
   BasicValueSpecificationEditor,
   type QueryBuilderVariableDragSource,
   QUERY_BUILDER_VARIABLE_DND_TYPE,
+  EditableBasicValueSpecificationEditor,
 } from '../shared/BasicValueSpecificationEditor.js';
 import { instanceValue_setValues } from '../../stores/shared/ValueSpecificationModifierHelper.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
+import { createSupportedFunctionExpression } from '../../stores/shared/ValueSpecificationEditorHelper.js';
 
 export const MilestoningParameterEditor = observer(
   (props: {
     queryBuilderState: QueryBuilderState;
     parameter: ValueSpecification;
     setParameter: (val: ValueSpecification) => void;
+    parameterValue: ValueSpecification | undefined;
+    setParameterValue: (val: ValueSpecification) => void;
   }) => {
-    const { queryBuilderState, parameter, setParameter } = props;
+    const {
+      queryBuilderState,
+      parameter,
+      setParameter,
+      parameterValue,
+      setParameterValue,
+    } = props;
     const handleDrop = useCallback(
       (item: QueryBuilderVariableDragSource): void => {
         setParameter(item.variable);
@@ -87,27 +99,53 @@ export const MilestoningParameterEditor = observer(
     };
 
     return (
-      <div ref={dropConnector} className="query-builder__variable-editor">
-        <PanelEntryDropZonePlaceholder
-          isDragOver={isDragOver}
-          label="Change Milestoning Parameter Value"
-        >
-          <BasicValueSpecificationEditor
-            valueSpecification={parameter}
-            graph={queryBuilderState.graphManagerState.graph}
-            observerContext={queryBuilderState.observerContext}
-            setValueSpecification={(val: ValueSpecification): void =>
-              setParameter(val)
-            }
-            typeCheckOption={{
-              expectedType: PrimitiveType.DATE,
-            }}
-            resetValue={resetMilestoningParameter}
-            isConstant={queryBuilderState.constantState.isValueSpecConstant(
-              parameter,
-            )}
-          />
-        </PanelEntryDropZonePlaceholder>
+      <div
+        ref={dropConnector}
+        className="query-builder__milestoning-panel__variable-editor"
+      >
+        <div className="query-builder__milestoning-panel__variable-editor__variable">
+          <PanelEntryDropZonePlaceholder
+            isDragOver={isDragOver}
+            label="Change Milestoning Parameter Value"
+          >
+            <BasicValueSpecificationEditor
+              valueSpecification={parameter}
+              graph={queryBuilderState.graphManagerState.graph}
+              observerContext={queryBuilderState.observerContext}
+              setValueSpecification={(val: ValueSpecification): void =>
+                setParameter(val)
+              }
+              typeCheckOption={{
+                expectedType: PrimitiveType.DATE,
+              }}
+              resetValue={resetMilestoningParameter}
+              isConstant={queryBuilderState.constantState.isValueSpecConstant(
+                parameter,
+              )}
+            />
+          </PanelEntryDropZonePlaceholder>
+        </div>
+        {parameter instanceof VariableExpression && parameterValue && (
+          <div className="query-builder__milestoning-panel__variable-editor__value">
+            <EditableBasicValueSpecificationEditor
+              valueSpecification={parameterValue}
+              setValueSpecification={setParameterValue}
+              graph={queryBuilderState.graphManagerState.graph}
+              observerContext={queryBuilderState.observerContext}
+              typeCheckOption={{
+                expectedType: PrimitiveType.DATE,
+              }}
+              resetValue={() => {
+                const now = createSupportedFunctionExpression(
+                  QUERY_BUILDER_SUPPORTED_FUNCTIONS.NOW,
+                  PrimitiveType.DATETIME,
+                );
+                setParameterValue(now);
+              }}
+              initializeAsEditable={true}
+            />
+          </div>
+        )}
       </div>
     );
   },

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

@@ -419,6 +419,22 @@ export const QueryResultModifierModal = observer(
     );
     const [startDate, setStartDate] = useState(milestoningState.startDate);
     const [endDate, setEndDate] = useState(milestoningState.endDate);
+    const [businessDateValue, setBusinessDateValue] = useState(
+      milestoningState.getMilestoningParameterValue(
+        milestoningState.businessDate,
+      ),
+    );
+    const [processingDateValue, setProcessingDateValue] = useState(
+      milestoningState.getMilestoningParameterValue(
+        milestoningState.processingDate,
+      ),
+    );
+    const [startDateValue, setStartDateValue] = useState(
+      milestoningState.getMilestoningParameterValue(milestoningState.startDate),
+    );
+    const [endDateValue, setEndDateValue] = useState(
+      milestoningState.getMilestoningParameterValue(milestoningState.endDate),
+    );
 
     const shouldFilterMilestoningParamIfNotUsed = (
       param: ValueSpecification | undefined,
@@ -491,28 +507,28 @@ export const QueryResultModifierModal = observer(
         );
         setParameterStates(allParamStates);
         if (!businessDate) {
-          setBusinessDate(
-            allParamStates.find(
-              (ps) =>
-                ps.variableName ===
-                (milestoningState.businessDate &&
-                milestoningState.businessDate instanceof VariableExpression
-                  ? milestoningState.businessDate.name
-                  : BUSINESS_DATE_MILESTONING_PROPERTY_NAME),
-            )?.parameter,
+          const lambdaParamState = allParamStates.find(
+            (ps) =>
+              ps.variableName ===
+              (milestoningState.businessDate &&
+              milestoningState.businessDate instanceof VariableExpression
+                ? milestoningState.businessDate.name
+                : BUSINESS_DATE_MILESTONING_PROPERTY_NAME),
           );
+          setBusinessDate(lambdaParamState?.parameter);
+          setBusinessDateValue(lambdaParamState?.value);
         }
         if (!processingDate) {
-          setProcessingDate(
-            allParamStates.find(
-              (ps) =>
-                ps.variableName ===
-                (milestoningState.businessDate &&
-                milestoningState.processingDate instanceof VariableExpression
-                  ? milestoningState.processingDate.name
-                  : PROCESSING_DATE_MILESTONING_PROPERTY_NAME),
-            )?.parameter,
+          const lambdaParamState = allParamStates.find(
+            (ps) =>
+              ps.variableName ===
+              (milestoningState.businessDate &&
+              milestoningState.processingDate instanceof VariableExpression
+                ? milestoningState.processingDate.name
+                : PROCESSING_DATE_MILESTONING_PROPERTY_NAME),
           );
+          setProcessingDate(lambdaParamState?.parameter);
+          setProcessingDateValue(lambdaParamState?.value);
         }
       }
       setIsAllVersionsEnabled(Boolean(value));
@@ -552,6 +568,7 @@ export const QueryResultModifierModal = observer(
           MILESTONING_START_DATE_PARAMETER_NAME,
         );
         setStartDate(startDateParameterState.parameter);
+        setStartDateValue(startDateParameterState.value);
       }
       if (!(endDate && endDate instanceof VariableExpression)) {
         endDateParameterState = getOrCreateNewLambdaParameterState(
@@ -559,6 +576,7 @@ export const QueryResultModifierModal = observer(
           MILESTONING_END_DATE_PARAMETER_NAME,
         );
         setEndDate(endDateParameterState.parameter);
+        setEndDateValue(endDateParameterState.value);
       }
       setParameterStates([
         ...new Set([
@@ -601,6 +619,24 @@ export const QueryResultModifierModal = observer(
       setParameterStates(
         milestoningState.queryBuilderState.parametersState.parameterStates,
       );
+      setStartDateValue(
+        milestoningState.getMilestoningParameterValue(
+          milestoningState.startDate,
+        ),
+      );
+      setEndDateValue(
+        milestoningState.getMilestoningParameterValue(milestoningState.endDate),
+      );
+      setProcessingDateValue(
+        milestoningState.getMilestoningParameterValue(
+          milestoningState.processingDate,
+        ),
+      );
+      setBusinessDateValue(
+        milestoningState.getMilestoningParameterValue(
+          milestoningState.businessDate,
+        ),
+      );
     };
 
     // Handle user actions
@@ -630,6 +666,11 @@ export const QueryResultModifierModal = observer(
         milestoningState.queryBuilderState.setGetAllFunction(
           QUERY_BUILDER_SUPPORTED_GET_ALL_FUNCTIONS.GET_ALL_VERSIONS_IN_RANGE,
         );
+        milestoningState.updateMilestoningParameterValue(
+          startDate,
+          startDateValue,
+        );
+        milestoningState.updateMilestoningParameterValue(endDate, endDateValue);
       } else if (isAllVersionsEnabled) {
         milestoningState.clearGetAllParameters();
         milestoningState.queryBuilderState.setGetAllFunction(
@@ -644,6 +685,14 @@ export const QueryResultModifierModal = observer(
         milestoningState.queryBuilderState.setGetAllFunction(
           QUERY_BUILDER_SUPPORTED_GET_ALL_FUNCTIONS.GET_ALL,
         );
+        milestoningState.updateMilestoningParameterValue(
+          processingDate,
+          processingDateValue,
+        );
+        milestoningState.updateMilestoningParameterValue(
+          businessDate,
+          businessDateValue,
+        );
       }
       milestoningState.updateQueryBuilderState();
     };
@@ -660,7 +709,26 @@ export const QueryResultModifierModal = observer(
       setParameterStates(
         milestoningState.queryBuilderState.parametersState.parameterStates,
       );
+      setStartDateValue(
+        milestoningState.getMilestoningParameterValue(
+          milestoningState.startDate,
+        ),
+      );
+      setEndDateValue(
+        milestoningState.getMilestoningParameterValue(milestoningState.endDate),
+      );
+      setProcessingDateValue(
+        milestoningState.getMilestoningParameterValue(
+          milestoningState.processingDate,
+        ),
+      );
+      setBusinessDateValue(
+        milestoningState.getMilestoningParameterValue(
+          milestoningState.businessDate,
+        ),
+      );
     }, [
+      milestoningState,
       milestoningState.isAllVersionsEnabled,
       milestoningState.isAllVersionsInRangeEnabled,
       milestoningState.queryBuilderState.parametersState.parameterStates,
@@ -724,24 +792,34 @@ export const QueryResultModifierModal = observer(
                                 <div className="panel__content__form__section__header__label">
                                   Start Date
                                 </div>
+                                <div className="panel__content__form__section__header__prompt">
+                                  Choose a value for this milestoning parameter
+                                </div>
                                 <MilestoningParameterEditor
                                   queryBuilderState={
                                     milestoningState.queryBuilderState
                                   }
                                   parameter={startDate}
                                   setParameter={setStartDate}
+                                  parameterValue={startDateValue}
+                                  setParameterValue={setStartDateValue}
                                 />
                               </PanelFormSection>
                               <PanelFormSection>
                                 <div className="panel__content__form__section__header__label">
                                   End Date
                                 </div>
+                                <div className="panel__content__form__section__header__prompt">
+                                  Choose a value for this milestoning parameter
+                                </div>
                                 <MilestoningParameterEditor
                                   queryBuilderState={
                                     milestoningState.queryBuilderState
                                   }
                                   parameter={endDate}
                                   setParameter={setEndDate}
+                                  parameterValue={endDateValue}
+                                  setParameterValue={setEndDateValue}
                                 />
                               </PanelFormSection>
                             </div>
@@ -755,12 +833,17 @@ export const QueryResultModifierModal = observer(
                           <div className="panel__content__form__section__header__label">
                             Processing Date
                           </div>
+                          <div className="panel__content__form__section__header__prompt">
+                            Choose a value for this milestoning parameter
+                          </div>
                           <MilestoningParameterEditor
                             queryBuilderState={
                               milestoningState.queryBuilderState
                             }
                             parameter={processingDate}
                             setParameter={setProcessingDate}
+                            parameterValue={processingDateValue}
+                            setParameterValue={setProcessingDateValue}
                           />
                         </PanelFormSection>
                       )}
@@ -769,58 +852,71 @@ export const QueryResultModifierModal = observer(
                           <div className="panel__content__form__section__header__label">
                             Business Date
                           </div>
+                          <div className="panel__content__form__section__header__prompt">
+                            Choose a value for this milestoning parameter
+                          </div>
                           <MilestoningParameterEditor
                             queryBuilderState={
                               milestoningState.queryBuilderState
                             }
                             parameter={businessDate}
                             setParameter={setBusinessDate}
+                            parameterValue={businessDateValue}
+                            setParameterValue={setBusinessDateValue}
                           />
                         </PanelFormSection>
                       )}
                     </>
                   )}
-                  <PanelFormSection>
-                    <div className="panel__content__form__section__header__label">
-                      List of compatible milestoning parameters
-                    </div>
-                  </PanelFormSection>
-                  <div className="panel__content__form__section__list__items">
-                    <PanelFormListItems title="Available parameters">
-                      {filteredParameterStates.length === 0 && (
-                        <> No available parameters </>
-                      )}
-                      {filteredParameterStates.map((pState) => (
-                        <VariableViewer
-                          key={pState.uuid}
-                          variable={pState.parameter}
-                          isReadOnly={true}
-                          queryBuilderState={milestoningState.queryBuilderState}
-                        />
-                      ))}
-                    </PanelFormListItems>
-                    {Boolean(filteredConstantState.length) && (
-                      <PanelFormListItems title="Available constants">
-                        {filteredConstantState.map((constantState) => (
-                          <VariableViewer
-                            key={constantState.uuid}
-                            variable={constantState.variable}
-                            value={{
-                              val:
-                                constantState instanceof
-                                QueryBuilderSimpleConstantExpressionState
-                                  ? constantState.value
-                                  : undefined,
-                            }}
-                            queryBuilderState={
-                              milestoningState.queryBuilderState
-                            }
-                            isReadOnly={true}
-                          />
-                        ))}
-                      </PanelFormListItems>
-                    )}
-                  </div>
+                  {!(isAllVersionsEnabled && !isAllVersionsInRangeEnabled) && (
+                    <>
+                      <PanelFormSection>
+                        <div className="panel__content__form__section__header__label">
+                          List of compatible milestoning parameters
+                        </div>
+                      </PanelFormSection>
+                      <div className="panel__content__form__section__list__items">
+                        {filteredParameterStates.length > 0 && (
+                          <PanelFormListItems title="Available parameters">
+                            {filteredParameterStates.map((pState) => (
+                              <VariableViewer
+                                key={pState.uuid}
+                                variable={pState.parameter}
+                                isReadOnly={true}
+                                queryBuilderState={
+                                  milestoningState.queryBuilderState
+                                }
+                                option={{
+                                  hideMilestoningParameterValueString: true,
+                                }}
+                              />
+                            ))}
+                          </PanelFormListItems>
+                        )}
+                        {Boolean(filteredConstantState.length) && (
+                          <PanelFormListItems title="Available constants">
+                            {filteredConstantState.map((constantState) => (
+                              <VariableViewer
+                                key={constantState.uuid}
+                                variable={constantState.variable}
+                                value={{
+                                  val:
+                                    constantState instanceof
+                                    QueryBuilderSimpleConstantExpressionState
+                                      ? constantState.value
+                                      : undefined,
+                                }}
+                                queryBuilderState={
+                                  milestoningState.queryBuilderState
+                                }
+                                isReadOnly={true}
+                              />
+                            ))}
+                          </PanelFormListItems>
+                        )}
+                      </div>
+                    </>
+                  )}
                   <div className="query-builder__projection__options__section-name">
                     Other
                   </div>

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

@@ -1353,7 +1353,17 @@ export const QueryBuilderTDSPanel = observer(
                     : 'Set Query Options'}
                 </div>
               </button>
-              <div className="query-builder__projection__result-modifier-prompt__divider">
+
+              <div
+                className={clsx(
+                  'query-builder__projection__result-modifier-prompt__divider',
+                  {
+                    'query-builder__projection__result-modifier-prompt__divider--light':
+                      applicationStore.layoutService
+                        .TEMPORARY__isLightColorThemeEnabled,
+                  },
+                )}
+              >
                 {tdsState.isQueryOptionsSet && ' - '}
               </div>
               {tdsState.queryBuilderState.milestoningState

package/src/components/shared/QueryBuilderVariableSelector.tsx

@@ -130,6 +130,9 @@ export const VariableViewer = observer(
           handler: () => void;
         }[]
       | undefined;
+    option?: {
+      hideMilestoningParameterValueString?: boolean;
+    };
   }) => {
     const {
       variable,
@@ -138,6 +141,7 @@ export const VariableViewer = observer(
       isReadOnly,
       queryBuilderState,
       extraContextMenuActions,
+      option,
     } = props;
     const isVariableUsed = queryBuilderState.isVariableUsed(variable);
     const [isSelectedFromContextMenu, setIsSelectedFromContextMenu] =
@@ -247,9 +251,11 @@ export const VariableViewer = observer(
                       <div className="query-builder__variables__variable__type__label query-builder__variables__variable__type__label--milestoning">
                         milestoning
                       </div>
-                      <div className="query-builder__constants__value">
-                        {milestoningParameterValueString}
-                      </div>
+                      {!option?.hideMilestoningParameterValueString && (
+                        <div className="query-builder__constants__value">
+                          {milestoningParameterValueString}
+                        </div>
+                      )}
                     </>
                   )}
                 </div>

package/src/index.ts

@@ -54,6 +54,7 @@ export {
   TDS_COLUMN_GETTER,
   COLUMN_SORT_TYPE,
   QUERY_BUILDER_SUPPORTED_FUNCTIONS,
+  QUERY_BUILDER_SUPPORTED_GET_ALL_FUNCTIONS,
 } from './graph/QueryBuilderMetaModelConst.js';
 export { getQueryBuilderGraphManagerExtension } from './graph-manager/protocol/pure/QueryBuilder_PureGraphManagerExtension.js';
 export type { ServiceExecutionAnalysisResult } from './graph-manager/action/analytics/ServiceExecutionAnalysis.js';

package/src/stores/QueryBuilderState.ts

@@ -516,6 +516,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
     this.resetQueryResult();
     if (!options?.keepQueryContent) {
       this.resetQueryContent();
+      this.setGetAllFunction(QUERY_BUILDER_SUPPORTED_GET_ALL_FUNCTIONS.GET_ALL);
       this.milestoningState.updateMilestoningConfiguration();
     }
     this.executionContextState.setMapping(val);

package/src/stores/QueryBuilder_LegendApplicationPlugin_Extension.ts

@@ -86,7 +86,7 @@ export type QueryBuilderHeaderActionConfiguration = {
 export type QueryBuilderMenuActionConfiguration = {
   key: string;
   title?: string;
-  disableFunc?: (queryBuilderState: QueryBuilderState) => void;
+  disableFunc?: (queryBuilderState: QueryBuilderState) => boolean;
   label: string;
   onClick: (queryBuilderState: QueryBuilderState) => void;
   icon?: React.ReactNode;

package/src/stores/milestoning/QueryBuilderMilestoningState.ts

@@ -482,20 +482,22 @@ export class QueryBuilderMilestoningState implements Hashable {
   }
 
   updateMilestoningParameterValue(
-    parameter: VariableExpression,
+    parameter: ValueSpecification | undefined,
     value: ValueSpecification | undefined,
   ): void {
-    const variableState =
-      this.queryBuilderState.parametersState.parameterStates.find(
-        (param) => param.parameter.name === parameter.name,
-      );
-    if (variableState) {
-      variableState.setValue(value);
+    if (parameter instanceof VariableExpression) {
+      const variableState =
+        this.queryBuilderState.parametersState.parameterStates.find(
+          (param) => param.parameter.name === parameter.name,
+        );
+      if (variableState) {
+        variableState.setValue(value);
+      }
     }
   }
 
   getMilestoningParameterValue(
-    milestoningParameter: ValueSpecification,
+    milestoningParameter: ValueSpecification | undefined,
   ): ValueSpecification | undefined {
     let value: ValueSpecification | undefined = milestoningParameter;
     if (milestoningParameter instanceof VariableExpression) {
@@ -515,7 +517,18 @@ export class QueryBuilderMilestoningState implements Hashable {
     const usedInProcessingDate = this.processingDate
       ? isValueExpressionReferencedInValue(variable, this.processingDate)
       : false;
-    return usedInBusiness || usedInProcessingDate;
+    const usedInStartDate = this.startDate
+      ? isValueExpressionReferencedInValue(variable, this.startDate)
+      : false;
+    const usedInEndState = this.endDate
+      ? isValueExpressionReferencedInValue(variable, this.endDate)
+      : false;
+    return (
+      usedInBusiness ||
+      usedInProcessingDate ||
+      usedInStartDate ||
+      usedInEndState
+    );
   }
 
   isMilestoningParameter(parameter: VariableExpression): boolean {