fix

finos · Jun 14, 2024 · d0864b6 · d0864b6
1 parent b111a37
commit d0864b6
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 49 deletions.
diff --git a/...xplorer/QueryBuilderMilestoningEditor.tsx → ...ueryBuilderMilestoningParameterEditor.tsx b/...xplorer/QueryBuilderMilestoningEditor.tsx → ...ueryBuilderMilestoningParameterEditor.tsx
diff --git a/...s/legend-query-builder/src/components/fetch-structure/QueryBuilderResultModifierPanel.tsx b/...s/legend-query-builder/src/components/fetch-structure/QueryBuilderResultModifierPanel.tsx
@@ -80,7 +80,7 @@ import {
   type QueryBuilderVariableDragSource,
 } from '../shared/BasicValueSpecificationEditor.js';
 import { useDrop } from 'react-dnd';
-import { MilestoningParameterEditor } from '../explorer/QueryBuilderMilestoningEditor.js';
+import { MilestoningParameterEditor } from '../explorer/QueryBuilderMilestoningParameterEditor.js';
 import { QueryBuilderSimpleConstantExpressionState } from '../../stores/QueryBuilderConstantsState.js';
 import { LambdaParameterState } from '../../stores/shared/LambdaParameterState.js';
 
@@ -518,56 +518,65 @@ export const QueryResultModifierModal = observer(
       setIsAllVersionsEnabled(Boolean(value));
     };
 
-    const buildAllVersionsInRangeParameters = (): void => {
-      let startDateParameterState;
-      let endDateParameterState;
-      if (!(startDate && startDate instanceof VariableExpression)) {
-        const startDateVar = new VariableExpression(
-          MILESTONING_START_DATE_PARAMETER_NAME,
+    const getOrCreateNewLambdaParameterState = (
+      lamdaStates: LambdaParameterState[],
+      varName: string,
+    ): LambdaParameterState => {
+      const lamdaState = lamdaStates.find((ls) => ls.variableName === varName);
+      if (lamdaState) {
+        return lamdaState;
+      } else {
+        const varExp = new VariableExpression(
+          varName,
           Multiplicity.ONE,
           GenericTypeExplicitReference.create(
             new GenericType(PrimitiveType.DATE),
           ),
         );
-        setStartDate(startDateVar);
-        startDateParameterState = new LambdaParameterState(
-          startDateVar,
+        const newParamState = new LambdaParameterState(
+          varExp,
           milestoningState.queryBuilderState.observerContext,
           milestoningState.queryBuilderState.graphManagerState.graph,
         );
-        startDateParameterState.mockParameterValue();
+        newParamState.mockParameterValue();
+        return newParamState;
+      }
+    };
+
+    const buildAllVersionsInRangeParameters = (): void => {
+      let startDateParameterState;
+      let endDateParameterState;
+      if (!(startDate && startDate instanceof VariableExpression)) {
+        startDateParameterState = getOrCreateNewLambdaParameterState(
+          parameterStates,
+          MILESTONING_START_DATE_PARAMETER_NAME,
+        );
+        setStartDate(startDateParameterState.parameter);
       }
       if (!(endDate && endDate instanceof VariableExpression)) {
-        const endDateVar = new VariableExpression(
+        endDateParameterState = getOrCreateNewLambdaParameterState(
+          parameterStates,
           MILESTONING_END_DATE_PARAMETER_NAME,
-          Multiplicity.ONE,
-          GenericTypeExplicitReference.create(
-            new GenericType(PrimitiveType.DATE),
-          ),
         );
-        setEndDate(endDateVar);
-        endDateParameterState = new LambdaParameterState(
-          endDateVar,
-          milestoningState.queryBuilderState.observerContext,
-          milestoningState.queryBuilderState.graphManagerState.graph,
-        );
-        endDateParameterState.mockParameterValue();
+        setEndDate(endDateParameterState.parameter);
       }
       setParameterStates([
-        ...parameterStates.filter(
-          (ps) =>
-            shouldFilterMilestoningParamIfNotUsed(
-              businessDate,
-              setBusinessDate,
-            )(ps) &&
-            shouldFilterMilestoningParamIfNotUsed(
-              processingDate,
-              setProcessingDate,
-            )(ps),
-        ),
-        ...[startDateParameterState, endDateParameterState].filter(
-          isNonNullable,
-        ),
+        ...new Set([
+          ...parameterStates.filter(
+            (ps) =>
+              shouldFilterMilestoningParamIfNotUsed(
+                businessDate,
+                setBusinessDate,
+              )(ps) &&
+              shouldFilterMilestoningParamIfNotUsed(
+                processingDate,
+                setProcessingDate,
+              )(ps),
+          ),
+          ...[startDateParameterState, endDateParameterState].filter(
+            isNonNullable,
+          ),
+        ]),
       ]);
     };
 
@@ -720,9 +729,7 @@ export const QueryResultModifierModal = observer(
                                     milestoningState.queryBuilderState
                                   }
                                   parameter={startDate}
-                                  setParameter={(
-                                    val: ValueSpecification,
-                                  ): void => setStartDate(val)}
+                                  setParameter={setStartDate}
                                 />
                               </PanelFormSection>
                               <PanelFormSection>
@@ -734,9 +741,7 @@ export const QueryResultModifierModal = observer(
                                     milestoningState.queryBuilderState
                                   }
                                   parameter={endDate}
-                                  setParameter={(
-                                    val: ValueSpecification,
-                                  ): void => setEndDate(val)}
+                                  setParameter={setEndDate}
                                 />
                               </PanelFormSection>
                             </div>
@@ -755,9 +760,7 @@ export const QueryResultModifierModal = observer(
                               milestoningState.queryBuilderState
                             }
                             parameter={processingDate}
-                            setParameter={(val: ValueSpecification): void =>
-                              setProcessingDate(val)
-                            }
+                            setParameter={setProcessingDate}
                           />
                         </PanelFormSection>
                       )}
@@ -771,9 +774,7 @@ export const QueryResultModifierModal = observer(
                               milestoningState.queryBuilderState
                             }
                             parameter={businessDate}
-                            setParameter={(val: ValueSpecification): void =>
-                              setBusinessDate(val)
-                            }
+                            setParameter={setBusinessDate}
                           />
                         </PanelFormSection>
                       )}