@finos/legend-query-builder 4.14.39 → 4.14.41

package/src/components/QueryBuilderParametersPanel.tsx

@@ -29,9 +29,11 @@ import {
   ModalFooterButton,
   PanelFormValidatedTextField,
   QuestionCircleIcon,
+  PanelFormSection,
 } from '@finos/legend-art';
 import {
   type Type,
+  type ValueSpecification,
   VariableExpression,
   GenericTypeExplicitReference,
   GenericType,
@@ -53,6 +55,10 @@ import {
   getPackageableElementOptionFormatter,
   type PackageableElementOption,
 } from '@finos/legend-lego/graph-editor';
+import { deepClone } from '@finos/legend-shared';
+import { BasicValueSpecificationEditor } from './shared/BasicValueSpecificationEditor.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graph/QueryBuilderMetaModelConst.js';
+import { createSupportedFunctionExpression } from '../stores/shared/ValueSpecificationEditorHelper.js';
 
 type MultiplicityOption = { label: string; value: Multiplicity };
 
@@ -118,6 +124,13 @@ const VariableExpressionEditor = observer(
     const nameInputRef = useCallback((ref: HTMLInputElement | null): void => {
       ref?.focus();
     }, []);
+    const [defaultMilestoningValue, setDefaultMilestoningValue] = useState(
+      deepClone(lambdaParameterState.value),
+    );
+    const isMilestoningParameter =
+      queryBuilderState.milestoningState.isMilestoningParameter(
+        lambdaParameterState.parameter,
+      );
 
     const getValidationMessage = (input: string): string | undefined =>
       !hasEditedName
@@ -146,6 +159,13 @@ const VariableExpressionEditor = observer(
       if (isCreating) {
         queryParametersState.addParameter(lambdaParameterState);
       }
+      if (isMilestoningParameter) {
+        queryBuilderState.milestoningState.updateMilestoningParameterValue(
+          lambdaParameterState.parameter,
+          defaultMilestoningValue,
+        );
+      }
+
       handleCancel();
     };
 
@@ -231,6 +251,41 @@ const VariableExpressionEditor = observer(
                 }
               />
             </div>
+            {isMilestoningParameter && defaultMilestoningValue && (
+              <PanelFormSection>
+                <div className="panel__content__form__section__header__label">
+                  Value
+                </div>
+                <div className="panel__content__form__section__header__prompt">
+                  Choose a default value for this milestoning parameter
+                </div>
+                <div className="query-builder__variable-editor">
+                  <BasicValueSpecificationEditor
+                    valueSpecification={defaultMilestoningValue}
+                    setValueSpecification={(val: ValueSpecification): void => {
+                      setDefaultMilestoningValue(deepClone(val));
+                    }}
+                    graph={queryBuilderState.graphManagerState.graph}
+                    obseverContext={queryBuilderState.observerContext}
+                    typeCheckOption={{
+                      expectedType: selectedType.value,
+                      match: selectedType.value === PrimitiveType.DATETIME,
+                    }}
+                    resetValue={() => {
+                      const now = createSupportedFunctionExpression(
+                        QUERY_BUILDER_SUPPORTED_FUNCTIONS.NOW,
+                        PrimitiveType.DATETIME,
+                      );
+                      setDefaultMilestoningValue(now);
+                      queryBuilderState.milestoningState.updateMilestoningParameterValue(
+                        lambdaParameterState.parameter,
+                        now,
+                      );
+                    }}
+                  />
+                </div>
+              </PanelFormSection>
+            )}
           </ModalBody>
           <ModalFooter>
             <ModalFooterButton

package/src/components/QueryBuilderSideBar.tsx

@@ -18,7 +18,6 @@ import {
   CustomSelectorInput,
   createFilter,
   CogIcon,
-  ClockIcon,
   clsx,
   PanelHeader,
   compareLabelFn,
@@ -34,7 +33,6 @@ import {
   LATEST_DATE,
   PrimitiveInstanceValue,
   VariableExpression,
-  getMilestoneTemporalStereotype,
   PackageableElementExplicitReference,
   RuntimePointer,
   VARIABLE_REFERENCE_TOKEN,
@@ -75,23 +73,11 @@ const generateClassLabel = (
   val: Class,
   queryBuilderState: QueryBuilderState,
 ): React.ReactNode => {
-  const milestoneStereotype = getMilestoneTemporalStereotype(
-    val,
-    queryBuilderState.graphManagerState.graph,
-  );
-
   const isDeprecatedClass = isElementDeprecated(
     val,
     queryBuilderState.graphManagerState.graph,
   );
 
-  let milestoningTooltipText: string | undefined;
-  if (milestoneStereotype) {
-    milestoningTooltipText = queryBuilderState.milestoningState
-      .getMilestoningImplementation(milestoneStereotype)
-      .getMilestoningToolTipText();
-  }
-
   return (
     <div
       className={clsx('query-builder__setup__class-option-label', {
@@ -102,12 +88,6 @@ const generateClassLabel = (
       <div className="query-builder__setup__class-option-label__name">
         {val.name}
       </div>
-      {milestoningTooltipText && (
-        <ClockIcon
-          className="query-builder__setup__class-option-label__milestoning"
-          title={`This class is milestoned:\n${milestoningTooltipText}`}
-        />
-      )}
     </div>
   );
 };
@@ -151,10 +131,6 @@ export const QueryBuilderClassSelector = observer(
       onClassChange?.(val.value);
     };
 
-    // milestoning
-    const showMilestoningEditor = (): void =>
-      milestoningState.setShowMilestoningEditor(true);
-
     return (
       <div className="query-builder__setup__config-group query-builder__setup__config-group--class">
         <div className="query-builder__setup__config-group__item ">
@@ -192,17 +168,6 @@ export const QueryBuilderClassSelector = observer(
                   .TEMPORARY__isLightColorThemeEnabled,
             })}
           />
-          {queryBuilderState.isQuerySupported && (
-            <button
-              className="btn--dark btn__icon--dark query-builder__setup__milestoning"
-              tabIndex={-1}
-              onClick={showMilestoningEditor}
-              disabled={!milestoningState.isMilestonedQuery}
-              title="Edit Milestoning Parameters"
-            >
-              <ClockIcon />
-            </button>
-          )}
           {milestoningState.isMilestonedQuery && (
             <MilestoningParametersEditor
               queryBuilderState={queryBuilderState}

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

@@ -1163,8 +1163,12 @@ export const QueryBuilderTDSPanel = observer(
                   >
                     <div className="query-builder__projection__result-modifier-prompt__header__label__title">
                       {getNameOfValueSpecification(
-                        tdsState.queryBuilderState.milestoningState
-                          .businessDate,
+                        tdsState.queryBuilderState.milestoningState.getMilestoningParameterValue(
+                          tdsState.queryBuilderState.milestoningState
+                            .businessDate,
+                        ) ??
+                          tdsState.queryBuilderState.milestoningState
+                            .businessDate,
                         tdsState.queryBuilderState,
                       )}
                     </div>
@@ -1182,8 +1186,12 @@ export const QueryBuilderTDSPanel = observer(
                   >
                     <div className="query-builder__projection__result-modifier-prompt__header__label__title">
                       {getNameOfValueSpecification(
-                        tdsState.queryBuilderState.milestoningState
-                          .processingDate,
+                        tdsState.queryBuilderState.milestoningState.getMilestoningParameterValue(
+                          tdsState.queryBuilderState.milestoningState
+                            .processingDate,
+                        ) ??
+                          tdsState.queryBuilderState.milestoningState
+                            .processingDate,
                         tdsState.queryBuilderState,
                       )}
                     </div>
@@ -1223,12 +1231,20 @@ export const QueryBuilderTDSPanel = observer(
                       <div className="query-builder__projection__result-modifier-prompt__header__label__title">
                         (
                         {getNameOfValueSpecification(
-                          tdsState.queryBuilderState.milestoningState.startDate,
+                          tdsState.queryBuilderState.milestoningState.getMilestoningParameterValue(
+                            tdsState.queryBuilderState.milestoningState
+                              .startDate,
+                          ) ??
+                            tdsState.queryBuilderState.milestoningState
+                              .startDate,
                           tdsState.queryBuilderState,
                         )}{' '}
                         -{' '}
                         {getNameOfValueSpecification(
-                          tdsState.queryBuilderState.milestoningState.endDate,
+                          tdsState.queryBuilderState.milestoningState.getMilestoningParameterValue(
+                            tdsState.queryBuilderState.milestoningState.endDate,
+                          ) ??
+                            tdsState.queryBuilderState.milestoningState.endDate,
                           tdsState.queryBuilderState,
                         )}
                         )

package/src/components/filter/QueryBuilderFilterPanel.tsx

@@ -92,6 +92,7 @@ import {
   SimpleFunctionExpression,
   type ValueSpecification,
   VariableExpression,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   type QueryBuilderProjectionColumnDragSource,
@@ -111,6 +112,7 @@ import { getPropertyChainName } from '../../stores/QueryBuilderPropertyEditorSta
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
 import { buildPropertyExpressionChain } from '../../stores/QueryBuilderValueSpecificationBuilderHelper.js';
 import { QueryBuilderPanelIssueCountBadge } from '../shared/QueryBuilderPanelIssueCountBadge.js';
+import { convertTextToPrimitiveInstanceValue } from '../../stores/shared/ValueSpecificationEditorHelper.js';
 
 const isCollectionProperty = (
   propertyExpression: AbstractPropertyExpression,
@@ -771,11 +773,17 @@ const QueryBuilderFilterConditionEditor = observer(
     };
     const debouncedTypeaheadSearch = useMemo(
       () =>
-        debounce(
-          (inputVal: string) => node.condition.handleTypeaheadSearch(),
-          1000,
-        ),
-      [node],
+        debounce((inputValue: string) => {
+          const inputValueSpec = convertTextToPrimitiveInstanceValue(
+            PrimitiveType.STRING,
+            inputValue,
+            queryBuilderState.observerContext,
+          );
+          return node.condition.handleTypeaheadSearch(
+            inputValueSpec ?? undefined,
+          );
+        }, 1000),
+      [node, queryBuilderState.observerContext],
     );
     const cleanUpReloadValues = (): void => {
       node.condition.typeaheadSearchState.complete();

package/src/components/result/QueryBuilderResultPanel.tsx

@@ -204,7 +204,15 @@ export const QueryBuilderResultPanel = observer(
     const runQuery = (): void => {
       resultState.setSelectedCells([]);
       resultState.pressedRunQuery.inProgress();
-      if (queryParametersState.parameterStates.length) {
+      if (
+        queryParametersState.parameterStates.length &&
+        queryParametersState.parameterStates.find(
+          (param) =>
+            !queryBuilderState.milestoningState.isMilestoningParameter(
+              param.parameter,
+            ),
+        )
+      ) {
         queryParametersState.parameterValuesEditorState.open(
           (): Promise<void> =>
             flowResult(resultState.runQuery()).catch(