@finos/legend-query-builder 4.14.41 → 4.14.44

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

@@ -46,7 +46,7 @@ import { useApplicationStore } from '@finos/legend-application';
 import type { QueryBuilderTDSState } from '../../stores/fetch-structure/tds/QueryBuilderTDSState.js';
 import type { QueryBuilderTDSColumnState } from '../../stores/fetch-structure/tds/QueryBuilderTDSColumnState.js';
 import { COLUMN_SORT_TYPE } from '../../graph/QueryBuilderMetaModelConst.js';
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import type { QueryBuilderProjectionColumnState } from '../../stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
 import { QUERY_BUILDER_TEST_ID } from '../../__lib__/QueryBuilderTesting.js';
 import { VariableSelector } from '../shared/QueryBuilderVariableSelector.js';
@@ -63,7 +63,6 @@ import {
   type QueryBuilderVariableDragSource,
 } from '../shared/BasicValueSpecificationEditor.js';
 import { useDrop } from 'react-dnd';
-import { MilestoningParametersEditorContent } from '../explorer/QueryBuilderMilestoningEditor.js';
 
 const ColumnSortEditor = observer(
   (props: {
@@ -260,31 +259,6 @@ export const QueryResultModifierModal = observer(
       deepClone(watermarkState.value),
     );
 
-    //milestoning config
-    const milestoningState = tdsState.queryBuilderState.milestoningState;
-    const businessDate = useRef(milestoningState.businessDate);
-    const processingDate = useRef(milestoningState.processingDate);
-    const isAllVersionsEnabled = useRef(milestoningState.isAllVersionsEnabled);
-    const isAllVersionsInRangeEnabled = useRef(
-      milestoningState.isAllVersionsInRangeEnabled,
-    );
-    const startDate = useRef(milestoningState.startDate);
-    const endDate = useRef(milestoningState.endDate);
-
-    const resetMilestoningToInitial = (): void => {
-      if (isAllVersionsInRangeEnabled.current) {
-        milestoningState.setAllVersionsInRange(
-          isAllVersionsInRangeEnabled.current,
-        );
-        milestoningState.setStartDate(startDate.current);
-        milestoningState.setEndDate(endDate.current);
-      } else {
-        milestoningState.setAllVersions(isAllVersionsEnabled.current);
-      }
-      milestoningState.setBusinessDate(businessDate.current);
-      milestoningState.setProcessingDate(processingDate.current);
-    };
-
     // Sync temp state with tdsState when modal is opened/closed
     useEffect(() => {
       setSortColumns(cloneSortColumnStateArray(stateSortColumns));
@@ -302,10 +276,7 @@ export const QueryResultModifierModal = observer(
     ]);
 
     // Handle user actions
-    const closeModal = (): void => {
-      resetMilestoningToInitial();
-      resultSetModifierState.setShowModal(false);
-    };
+    const closeModal = (): void => resultSetModifierState.setShowModal(false);
     const applyChanges = (): void => {
       resultSetModifierState.setSortColumns(sortColumns);
       resultSetModifierState.setDistinct(distinct);
@@ -317,13 +288,6 @@ export const QueryResultModifierModal = observer(
       }
       resultSetModifierState.setShowModal(false);
       watermarkState.setValue(watermarkValue);
-      businessDate.current = milestoningState.businessDate;
-      processingDate.current = milestoningState.processingDate;
-      isAllVersionsEnabled.current = milestoningState.isAllVersionsEnabled;
-      isAllVersionsInRangeEnabled.current =
-        milestoningState.isAllVersionsInRangeEnabled;
-      startDate.current = milestoningState.startDate;
-      endDate.current = milestoningState.endDate;
     };
 
     const handleLimitResultsChange: React.ChangeEventHandler<
@@ -433,23 +397,9 @@ export const QueryResultModifierModal = observer(
           }
           className="editor-modal query-builder__projection__modal"
         >
-          <ModalHeader title="Query Options" />
+          <ModalHeader title="Result Set Modifier" />
           <ModalBody className="query-builder__projection__modal__body">
             <div className="query-builder__projection__options">
-              {tdsState.queryBuilderState.milestoningState
-                .isMilestonedQuery && (
-                <>
-                  <div className="query-builder__projection__options__section-name">
-                    Milestoning
-                  </div>
-                  <MilestoningParametersEditorContent
-                    queryBuilderState={tdsState.queryBuilderState}
-                  />
-                  <div className="query-builder__projection__options__section-name">
-                    Other
-                  </div>
-                </>
-              )}
               <ColumnsSortEditor
                 projectionColumns={tdsState.projectionColumns}
                 sortColumns={sortColumns}

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

@@ -1138,134 +1138,27 @@ export const QueryBuilderTDSPanel = observer(
           >
             <div className="query-builder__projection__result-modifier-prompt__header">
               <button
-                className="query-builder__projection__result-modifier-prompt__header__label editable-value"
+                className="query-builder__projection__result-modifier-prompt__header__label"
                 onClick={openResultSetModifierEditor}
-                title="Configure Query Options..."
+                title="Configure result set modifiers..."
               >
                 <CogIcon className="query-builder__projection__result-modifier-prompt__header__label__icon" />
                 <div className="query-builder__projection__result-modifier-prompt__header__label__title">
-                  {tdsState.isQueryOptionsSet
-                    ? 'Query Options'
-                    : 'Set Query Options'}
+                  Query Options
                 </div>
               </button>
-              <div className="query-builder__projection__result-modifier-prompt__divider">
-                {tdsState.isQueryOptionsSet && ' - '}
-              </div>
-              {tdsState.queryBuilderState.milestoningState.businessDate && (
-                <div className="query-builder__projection__result-modifier-prompt__group">
-                  <div className="query-builder__projection__result-modifier-prompt__group__label">
-                    Business Date
-                  </div>
-                  <button
-                    className="query-builder__projection__result-modifier-prompt__header__label editable-value"
-                    onClick={openResultSetModifierEditor}
-                  >
-                    <div className="query-builder__projection__result-modifier-prompt__header__label__title">
-                      {getNameOfValueSpecification(
-                        tdsState.queryBuilderState.milestoningState.getMilestoningParameterValue(
-                          tdsState.queryBuilderState.milestoningState
-                            .businessDate,
-                        ) ??
-                          tdsState.queryBuilderState.milestoningState
-                            .businessDate,
-                        tdsState.queryBuilderState,
-                      )}
-                    </div>
-                  </button>
-                </div>
-              )}
-              {tdsState.queryBuilderState.milestoningState.processingDate && (
-                <div className="query-builder__projection__result-modifier-prompt__group">
-                  <div className="query-builder__projection__result-modifier-prompt__group__label">
-                    Processing Date
-                  </div>
-                  <button
-                    className="query-builder__projection__result-modifier-prompt__header__label editable-value"
-                    onClick={openResultSetModifierEditor}
-                  >
-                    <div className="query-builder__projection__result-modifier-prompt__header__label__title">
-                      {getNameOfValueSpecification(
-                        tdsState.queryBuilderState.milestoningState.getMilestoningParameterValue(
-                          tdsState.queryBuilderState.milestoningState
-                            .processingDate,
-                        ) ??
-                          tdsState.queryBuilderState.milestoningState
-                            .processingDate,
-                        tdsState.queryBuilderState,
-                      )}
-                    </div>
-                  </button>
-                </div>
-              )}
-              {tdsState.queryBuilderState.milestoningState
-                .isAllVersionsEnabled &&
-                !tdsState.queryBuilderState.milestoningState
-                  .isAllVersionsInRangeEnabled && (
-                  <div className="query-builder__projection__result-modifier-prompt__group">
-                    <div className="query-builder__projection__result-modifier-prompt__group__label">
-                      All Versions
-                    </div>
-                    <button
-                      className="query-builder__projection__result-modifier-prompt__header__label editable-value"
-                      onClick={openResultSetModifierEditor}
-                    >
-                      <div className="query-builder__projection__result-modifier-prompt__header__label__title">
-                        Yes
-                      </div>
-                    </button>
-                  </div>
-                )}
-              {tdsState.queryBuilderState.milestoningState
-                .isAllVersionsInRangeEnabled &&
-                tdsState.queryBuilderState.milestoningState.startDate &&
-                tdsState.queryBuilderState.milestoningState.endDate && (
-                  <div className="query-builder__projection__result-modifier-prompt__group">
-                    <div className="query-builder__projection__result-modifier-prompt__group__label">
-                      All Versions
-                    </div>
-                    <button
-                      className="query-builder__projection__result-modifier-prompt__header__label editable-value"
-                      onClick={openResultSetModifierEditor}
-                    >
-                      <div className="query-builder__projection__result-modifier-prompt__header__label__title">
-                        (
-                        {getNameOfValueSpecification(
-                          tdsState.queryBuilderState.milestoningState.getMilestoningParameterValue(
-                            tdsState.queryBuilderState.milestoningState
-                              .startDate,
-                          ) ??
-                            tdsState.queryBuilderState.milestoningState
-                              .startDate,
-                          tdsState.queryBuilderState,
-                        )}{' '}
-                        -{' '}
-                        {getNameOfValueSpecification(
-                          tdsState.queryBuilderState.milestoningState.getMilestoningParameterValue(
-                            tdsState.queryBuilderState.milestoningState.endDate,
-                          ) ??
-                            tdsState.queryBuilderState.milestoningState.endDate,
-                          tdsState.queryBuilderState,
-                        )}
-                        )
-                      </div>
-                    </button>
-                  </div>
-                )}
             </div>
             {tdsState.resultSetModifierState.limit && (
               <div className="query-builder__projection__result-modifier-prompt__group">
                 <div className="query-builder__projection__result-modifier-prompt__group__label">
                   Max Rows
                 </div>
-                <button
-                  className="query-builder__projection__result-modifier-prompt__header__label editable-value"
+                <div
+                  className="query-builder__projection__result-modifier-prompt__group__content"
                   onClick={openResultSetModifierEditor}
                 >
-                  <div className="query-builder__projection__result-modifier-prompt__header__label__title">
-                    {tdsState.resultSetModifierState.limit}
-                  </div>
-                </button>
+                  {tdsState.resultSetModifierState.limit}
+                </div>
               </div>
             )}
             {tdsState.resultSetModifierState.distinct && (
@@ -1273,14 +1166,12 @@ export const QueryBuilderTDSPanel = observer(
                 <div className="query-builder__projection__result-modifier-prompt__group__label">
                   Eliminate Duplicate Rows
                 </div>
-                <button
-                  className="query-builder__projection__result-modifier-prompt__header__label editable-value"
+                <div
+                  className="query-builder__projection__result-modifier-prompt__group__content"
                   onClick={openResultSetModifierEditor}
                 >
-                  <div className="query-builder__projection__result-modifier-prompt__header__label__title">
-                    Yes
-                  </div>
-                </button>
+                  Yes
+                </div>
               </div>
             )}
             {tdsState.resultSetModifierState.sortColumns.length > 0 && (
@@ -1290,15 +1181,13 @@ export const QueryBuilderTDSPanel = observer(
                 </div>
                 {tdsState.resultSetModifierState.sortColumns.map(
                   (columnState) => (
-                    <button
+                    <div
+                      className="query-builder__projection__result-modifier-prompt__group__content"
                       key={columnState.columnState.uuid}
-                      className="query-builder__projection__result-modifier-prompt__header__label editable-value"
                       onClick={openResultSetModifierEditor}
                     >
-                      <div className="query-builder__projection__result-modifier-prompt__header__label__title">
-                        {`${columnState.columnState.columnName} ${columnState.sortType}`}
-                      </div>
-                    </button>
+                      {`${columnState.columnState.columnName} ${columnState.sortType}`}
+                    </div>
                   ),
                 )}
               </div>
@@ -1308,14 +1197,12 @@ export const QueryBuilderTDSPanel = observer(
                 <div className="query-builder__projection__result-modifier-prompt__group__label">
                   Slice
                 </div>
-                <button
-                  className="query-builder__projection__result-modifier-prompt__header__label editable-value"
+                <div
+                  className="query-builder__projection__result-modifier-prompt__group__content"
                   onClick={openResultSetModifierEditor}
                 >
-                  <div className="query-builder__projection__result-modifier-prompt__header__label__title">
-                    {`${tdsState.resultSetModifierState.slice[0]},${tdsState.resultSetModifierState.slice[1]}`}
-                  </div>
-                </button>
+                  {`${tdsState.resultSetModifierState.slice[0]},${tdsState.resultSetModifierState.slice[1]}`}
+                </div>
               </div>
             )}
             {tdsState.queryBuilderState.watermarkState.value && (

package/src/components/result/QueryBuilderResultPanel.tsx

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

package/src/components/shared/BasicValueSpecificationEditor.tsx

@@ -727,16 +727,26 @@ const PrimitiveCollectionInstanceValueEditor = observer(
     const convertInputValueToValueSpec = (): ValueSpecification | null => {
       const trimmedInputValue = inputValue.trim();
 
-      if (isValueAlreadySelected(trimmedInputValue)) {
-        return null;
-      }
-
       if (trimmedInputValue.length) {
-        return convertTextToPrimitiveInstanceValue(
+        const newValueSpec = convertTextToPrimitiveInstanceValue(
           expectedType,
           trimmedInputValue,
           observerContext,
         );
+
+        if (
+          newValueSpec === null ||
+          getValueSpecificationStringValue(newValueSpec) === undefined ||
+          isValueAlreadySelected(
+            guaranteeNonNullable(
+              getValueSpecificationStringValue(newValueSpec),
+            ),
+          )
+        ) {
+          return null;
+        }
+
+        return newValueSpec;
       }
       return null;
     };
@@ -830,19 +840,20 @@ const PrimitiveCollectionInstanceValueEditor = observer(
       if (!parsedData) {
         return;
       }
-      const newValues = uniq(parsedData)
-        .map((value) => {
-          const newValueSpec = convertTextToPrimitiveInstanceValue(
-            expectedType,
-            value,
-            observerContext,
-          );
-          return newValueSpec
-            ? getValueSpecificationStringValue(newValueSpec)
-            : null;
-        })
-        .filter(isNonNullable)
-        .filter((value) => !isValueAlreadySelected(value));
+      const newValues = uniq(
+        uniq(parsedData)
+          .map((value) => {
+            const newValueSpec = convertTextToPrimitiveInstanceValue(
+              expectedType,
+              value,
+              observerContext,
+            );
+            return newValueSpec
+              ? getValueSpecificationStringValue(newValueSpec)
+              : null;
+          })
+          .filter(isNonNullable),
+      ).filter((value) => !isValueAlreadySelected(value));
       setSelectedOptions([
         ...selectedOptions,
         ...newValues.map((value) => ({ label: value, value })),

package/src/components/shared/QueryBuilderVariableSelector.tsx

@@ -149,18 +149,6 @@ export const VariableViewer = observer(
     const variableTypeName =
       variable.genericType?.value.rawType.name ??
       (isConstant ? CALCULATED : undefined);
-    const isMilestoningParameter =
-      queryBuilderState.milestoningState.isMilestoningParameter(variable);
-    const milestoningParameterValue =
-      queryBuilderState.milestoningState.getMilestoningParameterValue(variable);
-    const milestoningParameterValueString = isMilestoningParameter
-      ? milestoningParameterValue
-        ? getNameOfValueSpecification(
-            milestoningParameterValue,
-            queryBuilderState,
-          )
-        : undefined
-      : undefined;
     const deleteDisabled = isReadOnly || isVariableUsed;
     const deleteTitle = isVariableUsed ? 'Used in query' : 'Remove';
     const editVariable = (): void => {
@@ -239,16 +227,6 @@ export const VariableViewer = observer(
                   <div className="query-builder__variables__variable__type__label">
                     {variableTypeName ?? 'unknown'}
                   </div>
-                  {isMilestoningParameter && (
-                    <>
-                      <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>
-                    </>
-                  )}
                 </div>
               )}
             </div>

package/src/stores/QueryBuilderPreviewDataHelper.ts

@@ -136,7 +136,7 @@ export const buildNumericPreviewDataQuery = (
     const valAggOp = guaranteeNonNullable(
       aggregationState.operators.find((t) => t instanceof val[1]),
     );
-    aggregationState.changeColumnAggregateOperator(valAggOp, colState);
+    aggregationState.changeColumnAggregateOperator(valAggOp, colState, true);
   });
 
   return builderState.resultState.buildExecutionRawLambda({
@@ -189,6 +189,7 @@ export const buildNonNumericPreviewDataQuery = (
   tdsState.aggregationState.changeColumnAggregateOperator(
     distinctCountOp,
     valueCountProjectionState,
+    true,
   );
   // result set
   tdsState.resultSetModifierState.limit = PREVIEW_DATA_TAKE_LIMIT;

package/src/stores/QueryBuilderPropertyEditorState.ts

@@ -161,8 +161,7 @@ export const generateValueSpecificationForParameter = (
   return createNullishValue(graph);
 };
 
-//here
-export const fillDerivedPropertyParameterValues = (
+const fillDerivedPropertyParameterValues = (
   derivedPropertyExpressionState: QueryBuilderDerivedPropertyExpressionState,
 ): void => {
   const parameterValues: ValueSpecification[] =

package/src/stores/QueryBuilderState.ts

@@ -110,8 +110,6 @@ import type { QueryBuilderConfig } from '../graph-manager/QueryBuilderConfig.js'
 import { QUERY_BUILDER_EVENT } from '../__lib__/QueryBuilderEvent.js';
 import { QueryBuilderChangeHistoryState } from './QueryBuilderChangeHistoryState.js';
 import { type QueryBuilderWorkflowState } from './query-workflow/QueryBuilderWorkFlowState.js';
-import { initializeMilestoningStateFromDerivedProperty } from './milestoning/QueryBuilderMilestoningHelper.js';
-import { QueryBuilderSimpleProjectionColumnState } from './fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
 
 export interface QuerySDLC {}
 
@@ -699,18 +697,6 @@ export abstract class QueryBuilderState implements CommandRegistrar {
         );
       }
       if (this.parametersState.parameterStates.length > 0) {
-        const fetchStructureStateImp = this.fetchStructureState.implementation;
-        if (fetchStructureStateImp instanceof QueryBuilderTDSState) {
-          fetchStructureStateImp.projectionColumns.forEach((colState) => {
-            if (colState instanceof QueryBuilderSimpleProjectionColumnState) {
-              colState.propertyExpressionState.derivedPropertyExpressionStates.forEach(
-                (state) => {
-                  initializeMilestoningStateFromDerivedProperty(state);
-                },
-              );
-            }
-          });
-        }
         this.setShowParametersPanel(true);
       }
       this.fetchStructureState.initializeWithQuery();

package/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts

@@ -146,7 +146,6 @@ export class QueryBuilderTDSState
       TEMPORARY__showPostFetchStructurePanel: computed,
       derivations: computed,
       hasParserError: computed,
-      isQueryOptionsSet: computed,
       addColumn: action,
       moveColumn: action,
       removeAllColumns: action,
@@ -357,16 +356,6 @@ export class QueryBuilderTDSState
     return fetchStructureValidationIssues;
   }
 
-  get isQueryOptionsSet(): boolean {
-    return (
-      this.resultSetModifierState.limit !== undefined ||
-      this.queryBuilderState.milestoningState.isMilestonedQuery ||
-      this.resultSetModifierState.slice !== undefined ||
-      this.resultSetModifierState.sortColumns.length > 0 ||
-      this.resultSetModifierState.distinct
-    );
-  }
-
   get tdsColumns(): QueryBuilderTDSColumnState[] {
     const aggregationStateCols = this.aggregationState.columns.map(
       (c) => c.projectionColumnState,

package/src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationState.ts

@@ -155,6 +155,7 @@ export class QueryBuilderAggregationState implements Hashable {
   changeColumnAggregateOperator(
     val: QueryBuilderAggregateOperator | undefined,
     projectionColumnState: QueryBuilderProjectionColumnState,
+    hideOperatorInColumnName?: boolean,
   ): void {
     const aggregateColumnState = this.columns.find(
       (column) => column.projectionColumnState === projectionColumnState,
@@ -167,8 +168,24 @@ export class QueryBuilderAggregationState implements Hashable {
         return;
       }
       if (aggregateColumnState) {
+        if (!hideOperatorInColumnName) {
+          const colName =
+            aggregateColumnState.projectionColumnState.columnName.split(
+              `(${aggregateColumnState.operator.getLabel(
+                aggregateColumnState.projectionColumnState,
+              )})`,
+            )[0] ?? '';
+          aggregateColumnState.projectionColumnState.setColumnName(
+            `${colName} (${val.getLabel(projectionColumnState)})`,
+          );
+        }
         aggregateColumnState.setOperator(val);
       } else {
+        if (!hideOperatorInColumnName) {
+          projectionColumnState.setColumnName(
+            `${projectionColumnState.columnName} (${val.getLabel(projectionColumnState)})`,
+          );
+        }
         const newAggregateColumnState = new QueryBuilderAggregateColumnState(
           this,
           projectionColumnState,
@@ -190,11 +207,19 @@ export class QueryBuilderAggregationState implements Hashable {
       if (aggregateColumnState) {
         // automatically move the column to the last position before the aggregate columns
         // NOTE: `moveColumn` will take care of this placement calculation
+        if (!hideOperatorInColumnName) {
+          const colName =
+            aggregateColumnState.projectionColumnState.columnName.split(
+              `(${aggregateColumnState.operator.getLabel(
+                aggregateColumnState.projectionColumnState,
+              )})`,
+            )[0] ?? '';
+          aggregateColumnState.projectionColumnState.setColumnName(colName);
+        }
         this.tdsState.moveColumn(
           this.tdsState.projectionColumns.indexOf(projectionColumnState),
           0,
         );
-
         this.removeColumn(aggregateColumnState);
       }
     }

package/src/stores/milestoning/QueryBuilderMilestoningHelper.ts

@@ -290,30 +290,6 @@ export const generateMilestonedPropertyParameterValue = (
     );
 };
 
-export const initializeMilestoningStateFromDerivedProperty = (
-  derivedPropertyExpressionState: QueryBuilderDerivedPropertyExpressionState,
-): void => {
-  const milestoningState =
-    derivedPropertyExpressionState.queryBuilderState.milestoningState;
-  const temporalTarget =
-    derivedPropertyExpressionState.propertyExpression.func.value.genericType
-      .value.rawType instanceof Class &&
-    derivedPropertyExpressionState.propertyExpression.func.value._OWNER
-      ._generatedMilestonedProperties.length !== 0
-      ? getMilestoneTemporalStereotype(
-          derivedPropertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType,
-          derivedPropertyExpressionState.queryBuilderState.graphManagerState
-            .graph,
-        )
-      : undefined;
-  if (temporalTarget) {
-    milestoningState
-      .getMilestoningImplementation(temporalTarget)
-      .initializeMilestoningParameters();
-  }
-};
-
 export const validateMilestoningPropertyExpressionChain = (
   sourceStereotype: MILESTONING_STEREOTYPE | undefined,
   targetStereotype: MILESTONING_STEREOTYPE,