@finos/legend-application-query 5.2.6 → 5.2.7

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

@@ -32,6 +32,8 @@ import {
   DragPreviewLayer,
   PanelEntryDropZonePlaceholder,
   useDragPreviewLayer,
+  OptionsIcon,
+  PlusIcon,
 } from '@finos/legend-art';
 import {
   type QueryBuilderExplorerTreeDragSource,
@@ -48,7 +50,6 @@ import {
   QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE,
 } from '../../stores/fetch-structure/projection/QueryBuilderProjectionColumnState.js';
 import { QueryBuilderPropertyExpressionBadge } from '../QueryBuilderPropertyExpressionEditor.js';
-import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import { QueryResultModifierModal } from './QueryBuilderResultModifierPanel.js';
 import { QUERY_BUILDER_TEST_ID } from '../QueryBuilder_TestID.js';
 import { QueryBuilderAggregateColumnState } from '../../stores/fetch-structure/projection/aggregation/QueryBuilderAggregationState.js';
@@ -73,6 +74,7 @@ import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../../QueryBuilder_Const.js';
 import { QueryBuilderPostFilterTreeConditionNodeData } from '../../stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterState.js';
 import { filterByType } from '@finos/legend-shared';
 import type { QueryBuilderAggregateOperator } from '../../stores/fetch-structure/projection/aggregation/QueryBuilderAggregateOperator.js';
+import type { QueryBuilderProjectionState } from '../../stores/fetch-structure/projection/QueryBuilderProjectionState.js';
 
 const QueryBuilderProjectionColumnContextMenu = observer(
   forwardRef<
@@ -234,10 +236,7 @@ const QueryBuilderProjectionColumnEditor = observer(
     const onContextMenuClose = (): void => setIsSelectedFromContextMenu(false);
 
     const { projectionColumnState } = props;
-    const queryBuilderState =
-      projectionColumnState.projectionState.queryBuilderState;
-    const projectionState =
-      queryBuilderState.fetchStructureState.projectionState;
+    const projectionState = projectionColumnState.projectionState;
     const postFilterColumnStates = Array.from(
       projectionState.postFilterState.nodes.values(),
     )
@@ -496,12 +495,18 @@ const QueryBuilderProjectionColumnEditor = observer(
 );
 
 export const QueryBuilderProjectionPanel = observer(
-  (props: { queryBuilderState: QueryBuilderState }) => {
+  (props: { projectionState: QueryBuilderProjectionState }) => {
     const applicationStore = useApplicationStore();
-    const { queryBuilderState } = props;
-    const projectionState =
-      queryBuilderState.fetchStructureState.projectionState;
+    const { projectionState } = props;
     const projectionColumns = projectionState.columns;
+
+    // Toolbar
+    const openResultSetModifierEditor = (): void =>
+      projectionState.resultSetModifierState.setShowModal(true);
+    const addNewBlankDerivation = (): void =>
+      projectionState.addNewBlankDerivation();
+
+    // Drag and Drop
     const handleDrop = useCallback(
       (
         item:
@@ -514,7 +519,7 @@ export const QueryBuilderProjectionPanel = observer(
             const derivationProjectionColumn =
               new QueryBuilderDerivationProjectionColumnState(
                 projectionState,
-                queryBuilderState.graphManagerState.graphManager.createDefaultBasicRawLambda(
+                projectionState.queryBuilderState.graphManagerState.graphManager.createDefaultBasicRawLambda(
                   { addDummyParameter: true },
                 ),
               );
@@ -533,13 +538,14 @@ export const QueryBuilderProjectionPanel = observer(
               new QueryBuilderSimpleProjectionColumnState(
                 projectionState,
                 buildPropertyExpressionFromExplorerTreeNodeData(
-                  queryBuilderState.explorerState.nonNullableTreeData,
+                  projectionState.queryBuilderState.explorerState
+                    .nonNullableTreeData,
                   (item as QueryBuilderExplorerTreeDragSource).node,
                   projectionState.queryBuilderState.graphManagerState.graph,
-                  queryBuilderState.explorerState.propertySearchPanelState
-                    .allMappedPropertyNodes,
+                  projectionState.queryBuilderState.explorerState
+                    .propertySearchState.allMappedPropertyNodes,
                 ),
-                queryBuilderState.explorerState.humanizePropertyName,
+                projectionState.queryBuilderState.explorerState.humanizePropertyName,
               ),
             );
             break;
@@ -547,7 +553,7 @@ export const QueryBuilderProjectionPanel = observer(
             break;
         }
       },
-      [queryBuilderState, projectionState],
+      [projectionState],
     );
 
     const [{ isDragOver }, dropTargetConnector] = useDrop<
@@ -582,41 +588,61 @@ export const QueryBuilderProjectionPanel = observer(
 
     return (
       <div className="panel__content">
-        <PanelDropZone
-          isDragOver={isDragOver}
-          dropTargetConnector={dropTargetConnector}
-        >
-          {!projectionColumns.length && (
-            <BlankPanelPlaceholder
-              text="Add a projection column"
-              tooltipText="Drag and drop properties here"
-            />
-          )}
-          {Boolean(projectionColumns.length) && (
-            <div
-              data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_PROJECTION}
-              className="query-builder__projection__columns"
-            >
-              <DragPreviewLayer
-                labelGetter={(
-                  item: QueryBuilderProjectionColumnDragSource,
-                ): string =>
-                  item.columnState.columnName === ''
-                    ? '(unknown)'
-                    : item.columnState.columnName
-                }
-                types={[QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE]}
+        <div className="query-builder__projection__toolbar">
+          <button
+            className="panel__header__action"
+            onClick={openResultSetModifierEditor}
+            tabIndex={-1}
+            title="Configure result set modifiers..."
+          >
+            <OptionsIcon className="query-builder__icon query-builder__icon__query-option" />
+          </button>
+          <button
+            className="panel__header__action"
+            onClick={addNewBlankDerivation}
+            tabIndex={-1}
+            title="Add a new derivation"
+          >
+            <PlusIcon />
+          </button>
+        </div>
+        <div className="query-builder__projection__content">
+          <PanelDropZone
+            isDragOver={isDragOver}
+            dropTargetConnector={dropTargetConnector}
+          >
+            {!projectionColumns.length && (
+              <BlankPanelPlaceholder
+                text="Add a projection column"
+                tooltipText="Drag and drop properties here"
               />
-              {projectionColumns.map((projectionColumnState) => (
-                <QueryBuilderProjectionColumnEditor
-                  key={projectionColumnState.uuid}
-                  projectionColumnState={projectionColumnState}
+            )}
+            {Boolean(projectionColumns.length) && (
+              <div
+                data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_PROJECTION}
+                className="query-builder__projection__columns"
+              >
+                <DragPreviewLayer
+                  labelGetter={(
+                    item: QueryBuilderProjectionColumnDragSource,
+                  ): string =>
+                    item.columnState.columnName === ''
+                      ? '(unknown)'
+                      : item.columnState.columnName
+                  }
+                  types={[QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE]}
                 />
-              ))}
-            </div>
-          )}
-          <QueryResultModifierModal queryBuilderState={queryBuilderState} />
-        </PanelDropZone>
+                {projectionColumns.map((projectionColumnState) => (
+                  <QueryBuilderProjectionColumnEditor
+                    key={projectionColumnState.uuid}
+                    projectionColumnState={projectionColumnState}
+                  />
+                ))}
+              </div>
+            )}
+            <QueryResultModifierModal projectionState={projectionState} />
+          </PanelDropZone>
+        </div>
       </div>
     );
   },

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

@@ -29,27 +29,23 @@ import {
   COLUMN_SORT_TYPE,
   SortColumnState,
 } from '../../stores/fetch-structure/projection/QueryResultSetModifierState.js';
-import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import type { QueryBuilderProjectionColumnState } from '../../stores/fetch-structure/projection/QueryBuilderProjectionColumnState.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import { useApplicationStore } from '@finos/legend-application';
+import type { QueryBuilderProjectionState } from '../../stores/fetch-structure/projection/QueryBuilderProjectionState.js';
 
 const ColumnSortEditor = observer(
   (props: {
-    queryBuilderState: QueryBuilderState;
-    columnSort: SortColumnState;
+    projectionState: QueryBuilderProjectionState;
+    sortState: SortColumnState;
   }) => {
-    const { queryBuilderState, columnSort } = props;
+    const { projectionState, sortState } = props;
     const applicationStore = useApplicationStore();
-    const projectionState =
-      queryBuilderState.fetchStructureState.projectionState;
-    const sortColumns =
-      queryBuilderState.fetchStructureState.projectionState
-        .resultSetModifierState.sortColumns;
+    const sortColumns = projectionState.resultSetModifierState.sortColumns;
     const projectionOptions = projectionState.columns
       .filter(
         (projectionCol) =>
-          projectionCol === columnSort.columnState ||
+          projectionCol === sortState.columnState ||
           !sortColumns.some((sortCol) => sortCol.columnState === projectionCol),
       )
       .map((projectionCol) => ({
@@ -57,28 +53,26 @@ const ColumnSortEditor = observer(
         value: projectionCol,
       }));
     const value = {
-      label: columnSort.columnState.columnName,
-      value: columnSort,
+      label: sortState.columnState.columnName,
+      value: sortState,
     };
     const onChange = (
       val: { label: string; value: QueryBuilderProjectionColumnState } | null,
     ): void => {
       if (val !== null) {
-        columnSort.setColumnState(val.value);
+        sortState.setColumnState(val.value);
       }
     };
-    const sortType = columnSort.sortType;
+    const sortType = sortState.sortType;
     const toggleSortType = (): void => {
-      columnSort.setSortType(
+      sortState.setSortType(
         sortType === COLUMN_SORT_TYPE.ASC
           ? COLUMN_SORT_TYPE.DESC
           : COLUMN_SORT_TYPE.ASC,
       );
     };
     const deleteColumnSort = (): void =>
-      queryBuilderState.fetchStructureState.projectionState.resultSetModifierState.deleteSortColumn(
-        columnSort,
-      );
+      projectionState.resultSetModifierState.deleteSortColumn(sortState);
 
     return (
       <div className="panel__content__form__section__list__item query-builder__projection__options__sort">
@@ -115,14 +109,10 @@ const ColumnSortEditor = observer(
 );
 
 const ColumnsSortEditor = observer(
-  (props: { queryBuilderState: QueryBuilderState }) => {
-    const { queryBuilderState } = props;
-    const resultModifier =
-      queryBuilderState.fetchStructureState.projectionState
-        .resultSetModifierState;
-    const sortColumns = resultModifier.sortColumns;
-    const projectionState =
-      queryBuilderState.fetchStructureState.projectionState;
+  (props: { projectionState: QueryBuilderProjectionState }) => {
+    const { projectionState } = props;
+    const resultSetModifierState = projectionState.resultSetModifierState;
+    const sortColumns = resultSetModifierState.sortColumns;
     const projectionOptions = projectionState.columns
       .filter(
         (projectionCol) =>
@@ -137,9 +127,10 @@ const ColumnsSortEditor = observer(
         const sortColumn = new SortColumnState(
           guaranteeNonNullable(projectionOptions[0]).value,
         );
-        resultModifier.addSortColumn(sortColumn);
+        resultSetModifierState.addSortColumn(sortColumn);
       }
     };
+
     return (
       <div className="panel__content__form__section">
         <div className="panel__content__form__section__header__label">
@@ -155,8 +146,8 @@ const ColumnsSortEditor = observer(
             {sortColumns.map((value) => (
               <ColumnSortEditor
                 key={value.columnState.uuid}
-                queryBuilderState={queryBuilderState}
-                columnSort={value}
+                projectionState={projectionState}
+                sortState={value}
               />
             ))}
           </div>
@@ -177,22 +168,23 @@ const ColumnsSortEditor = observer(
 );
 
 export const QueryResultModifierModal = observer(
-  (props: { queryBuilderState: QueryBuilderState }) => {
-    const { queryBuilderState } = props;
-    const resultModifier =
-      queryBuilderState.fetchStructureState.projectionState
-        .resultSetModifierState;
-    const limitResults = resultModifier.limit;
-    const distinct = resultModifier.distinct;
-    const close = (): void => resultModifier.setShowModal(false);
-    const toggleDistinct = (): void => resultModifier.toggleDistinct();
+  (props: { projectionState: QueryBuilderProjectionState }) => {
+    const { projectionState: projectionState } = props;
+    const resultSetModifierState = projectionState.resultSetModifierState;
+    const limitResults = resultSetModifierState.limit;
+    const distinct = resultSetModifierState.distinct;
+    const close = (): void => resultSetModifierState.setShowModal(false);
+    const toggleDistinct = (): void => resultSetModifierState.toggleDistinct();
     const changeValue: React.ChangeEventHandler<HTMLInputElement> = (event) => {
       const val = event.target.value;
-      resultModifier.setLimit(val === '' ? undefined : parseInt(val, 10));
+      resultSetModifierState.setLimit(
+        val === '' ? undefined : parseInt(val, 10),
+      );
     };
+
     return (
       <Dialog
-        open={Boolean(resultModifier.showModal)}
+        open={Boolean(resultSetModifierState.showModal)}
         onClose={close}
         classes={{
           root: 'editor-modal__root-container',
@@ -206,7 +198,7 @@ export const QueryResultModifierModal = observer(
           </div>
           <div className="modal__body query-builder__projection__modal__body">
             <div className="query-builder__projection__options">
-              <ColumnsSortEditor queryBuilderState={queryBuilderState} />
+              <ColumnsSortEditor projectionState={projectionState} />
               <div className="panel__content__form__section">
                 <div className="panel__content__form__section__header__label">
                   Eliminate Duplicate Rows

package/src/components/filter/QueryBuilderFilterPanel.tsx

@@ -153,7 +153,7 @@ const QueryBuilderFilterConditionEditor = observer(
           propertyNode,
           graph,
           node.condition.filterState.queryBuilderState.explorerState
-            .propertySearchPanelState.allMappedPropertyNodes,
+            .propertySearchState.allMappedPropertyNodes,
         ),
       );
     // Drag and Drop on filter condition value
@@ -405,8 +405,8 @@ const QueryBuilderFilterTreeNodeContainer = observer(
                 filterState.queryBuilderState.explorerState.nonNullableTreeData,
                 dropNode,
                 filterState.queryBuilderState.graphManagerState.graph,
-                filterState.queryBuilderState.explorerState
-                  .propertySearchPanelState.allMappedPropertyNodes,
+                filterState.queryBuilderState.explorerState.propertySearchState
+                  .allMappedPropertyNodes,
               ),
             );
           } catch (error) {
@@ -732,8 +732,8 @@ export const QueryBuilderFilterPanel = observer(
                 filterState.queryBuilderState.explorerState.nonNullableTreeData,
                 (item as QueryBuilderExplorerTreeDragSource).node,
                 filterState.queryBuilderState.graphManagerState.graph,
-                filterState.queryBuilderState.explorerState
-                  .propertySearchPanelState.allMappedPropertyNodes,
+                filterState.queryBuilderState.explorerState.propertySearchState
+                  .allMappedPropertyNodes,
               );
           }
           filterConditionState = new FilterConditionState(
@@ -788,7 +788,7 @@ export const QueryBuilderFilterPanel = observer(
     return (
       <div
         data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_FILTER}
-        className="panel query-builder__filter"
+        className="panel"
       >
         <div className="panel__header">
           <div className="panel__header__title">
@@ -860,7 +860,7 @@ export const QueryBuilderFilterPanel = observer(
             </button>
           </div>
         </div>
-        <div className="panel__content query-builder__filter__content">
+        <div className="panel__content">
           <PanelDropZone
             isDragOver={isDragOver}
             dropTargetConnector={dropTargetConnector}

package/src/components/shared/QueryBuilderPanelIssueCountBadge.tsx

@@ -32,7 +32,9 @@ export const QueryBuilderPanelIssueCountBadge: React.FC<{
         .join('\n')}`}
     >
       <TimesCircleIcon className="query-builder-panel-issue-count-badge__icon" />
-      {labelText}
+      <div className="query-builder-panel-issue-count-badge__text">
+        {labelText}
+      </div>
     </div>
   );
 };

package/src/graphManager/protocol/pure/QueryBuilder_PureProtocolProcessorPlugin.ts

@@ -70,14 +70,10 @@ export class QueryBuilder_PureProtocolProcessorPlugin extends PureProtocolProces
             processingContext,
           );
         } else if (
-          matchFunctionName(
-            functionName,
+          matchFunctionName(functionName, [
             QUERY_BUILDER_SUPPORTED_FUNCTIONS.FILTER,
-          ) ||
-          matchFunctionName(
-            functionName,
             QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_FILTER,
-          )
+          ])
         ) {
           return V1_buildFilterFunctionExpression(
             functionName,
@@ -126,8 +122,9 @@ export class QueryBuilder_PureProtocolProcessorPlugin extends PureProtocolProces
             processingContext,
           );
         } else if (
-          Object.values(QUERY_BUILDER_SUPPORTED_FUNCTIONS).some((fn) =>
-            matchFunctionName(functionName, fn),
+          matchFunctionName(
+            functionName,
+            Object.values(QUERY_BUILDER_SUPPORTED_FUNCTIONS),
           )
         ) {
           // NOTE: this is a catch-all builder that is only meant for basic function expression

package/src/stores/QueryBuilderPreviewDataHelper.ts

@@ -18,7 +18,7 @@ import type {
   RawLambda,
   AbstractPropertyExpression,
 } from '@finos/legend-graph';
-import { guaranteeNonNullable } from '@finos/legend-shared';
+import { guaranteeNonNullable, guaranteeType } from '@finos/legend-shared';
 import { QueryBuilderAggregateOperator_Average } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Average.js';
 import { QueryBuilderAggregateOperator_Count } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Count.js';
 import { QueryBuilderAggregateOperator_DistinctCount } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_DistinctCount.js';
@@ -34,6 +34,7 @@ import {
   SortColumnState,
 } from './fetch-structure/projection/QueryResultSetModifierState.js';
 import type { QueryBuilderAggregateOperator } from './fetch-structure/projection/aggregation/QueryBuilderAggregateOperator.js';
+import { QueryBuilderProjectionState } from './fetch-structure/projection/QueryBuilderProjectionState.js';
 
 const PREVIEW_DATA_TAKE_LIMIT = 10;
 const PREVIEW_DATA_NON_NUMERIC_VALUE_COLUMN_NAME = 'Value';
@@ -73,13 +74,13 @@ const NUMERIC_AGG_FUNC_TO_AGG_OP: [
   ],
 ];
 
-const createProjectionColumn = (
-  queryBuilderState: QueryBuilderState,
+const createSimpleProjectionColumn = (
+  projectionState: QueryBuilderProjectionState,
   propertyExpression: AbstractPropertyExpression,
   columnName: string,
 ): QueryBuilderSimpleProjectionColumnState => {
   const col = new QueryBuilderSimpleProjectionColumnState(
-    queryBuilderState.fetchStructureState.projectionState,
+    projectionState,
     propertyExpression,
     false,
   );
@@ -130,11 +131,14 @@ export const buildNumericPreviewDataQuery = (
   //   ]
   // )
   const builderState = createQueryBuilderState(queryBuilderState);
-  const projectionState = builderState.fetchStructureState.projectionState;
+  const projectionState = guaranteeType(
+    builderState.fetchStructureState.implementation,
+    QueryBuilderProjectionState,
+  );
   const aggregationState = projectionState.aggregationState;
   NUMERIC_AGG_FUNC_TO_AGG_OP.forEach((val) => {
-    const colState = createProjectionColumn(
-      builderState,
+    const colState = createSimpleProjectionColumn(
+      projectionState,
       propertyExpression,
       val[0],
     );
@@ -167,35 +171,40 @@ export const buildNonNumericPreviewDataQuery = (
   //   ]
   // )->sort([desc('Count'), asc('Value')])->take(10)
   const builderState = createQueryBuilderState(queryBuilderState);
-  const valueProjectionColState = createProjectionColumn(
-    builderState,
+  const projectionState = guaranteeType(
+    builderState.fetchStructureState.implementation,
+    QueryBuilderProjectionState,
+  );
+  const valueProjectionColState = createSimpleProjectionColumn(
+    projectionState,
     propertyExpression,
     PREVIEW_DATA_NON_NUMERIC_VALUE_COLUMN_NAME,
   );
-  const valueCountProjectionState = createProjectionColumn(
-    builderState,
+  const valueCountProjectionState = createSimpleProjectionColumn(
+    projectionState,
     propertyExpression,
     PREVIEW_DATA_NON_NUMERIC_COUNT_COLUMN_NAME,
   );
-  builderState.fetchStructureState.projectionState.columns = [
+  projectionState.columns = [
     valueProjectionColState,
     valueCountProjectionState,
   ];
   const distinctCountOp = guaranteeNonNullable(
-    builderState.fetchStructureState.projectionState.aggregationState.operators.find(
+    projectionState.aggregationState.operators.find(
       (t) => t instanceof QueryBuilderAggregateOperator_Count,
     ),
   );
-  builderState.fetchStructureState.projectionState.aggregationState.changeColumnAggregateOperator(
+  projectionState.aggregationState.changeColumnAggregateOperator(
     distinctCountOp,
     valueCountProjectionState,
   );
   // result set
-  builderState.fetchStructureState.projectionState.resultSetModifierState.limit =
-    PREVIEW_DATA_TAKE_LIMIT;
+  projectionState.resultSetModifierState.limit = PREVIEW_DATA_TAKE_LIMIT;
   const sortValueCount = new SortColumnState(valueCountProjectionState);
   sortValueCount.sortType = COLUMN_SORT_TYPE.DESC;
-  builderState.fetchStructureState.projectionState.resultSetModifierState.sortColumns =
-    [sortValueCount, new SortColumnState(valueProjectionColState)];
+  projectionState.resultSetModifierState.sortColumns = [
+    sortValueCount,
+    new SortColumnState(valueProjectionColState),
+  ];
   return builderState.resultState.buildExecutionRawLambda();
 };

package/src/stores/QueryBuilderPropertyEditorState.ts

@@ -312,21 +312,14 @@ export const getPropertyChainName = (
   const propertyNameDecorator = humanizePropertyName
     ? prettyPropertyName
     : (val: string): string => val;
-  const propertyNameChain = [
-    propertyNameDecorator(propertyExpression.func.name),
-  ];
+  const chunks = [propertyNameDecorator(propertyExpression.func.name)];
   let currentExpression: ValueSpecification | undefined = propertyExpression;
   while (currentExpression instanceof AbstractPropertyExpression) {
     currentExpression = getNullableFirstElement(
       currentExpression.parametersValues,
     );
-    if (currentExpression instanceof AbstractPropertyExpression) {
-      propertyNameChain.unshift(
-        propertyNameDecorator(currentExpression.func.name),
-      );
-    }
-    // Take care of chains of subtype (a pattern that is not useful, but we want to support and rectify)
-    // $x.employees->subType(@Person)->subType(@Staff)
+    // Take care of chain of subtypes (a pattern that is not useful, but we want to support and potentially rectify)
+    // $x.employees->subType(@Person)->subType(@Staff).department
     while (
       currentExpression instanceof SimpleFunctionExpression &&
       matchFunctionName(
@@ -334,23 +327,38 @@ export const getPropertyChainName = (
         QUERY_BUILDER_SUPPORTED_FUNCTIONS.SUBTYPE,
       )
     ) {
-      const propertyWithSubtype = `(${TYPE_CAST_TOKEN}${propertyNameDecorator(
+      const subtypeChunk = `${TYPE_CAST_TOKEN}(${propertyNameDecorator(
         currentExpression.parametersValues.filter(
           (param) => param instanceof InstanceValue,
         )[0]?.genericType?.value.rawType.name ?? '',
-      )})${propertyNameDecorator(
-        currentExpression.parametersValues[0] instanceof
-          AbstractPropertyExpression
-          ? currentExpression.parametersValues[0]?.func.name
-          : '',
-      )}`;
-      propertyNameChain.unshift(propertyWithSubtype);
+      )})`;
+      chunks.unshift(subtypeChunk);
       currentExpression = getNullableFirstElement(
         currentExpression.parametersValues,
       );
     }
+    if (currentExpression instanceof AbstractPropertyExpression) {
+      chunks.unshift(propertyNameDecorator(currentExpression.func.name));
+    }
   }
-  return propertyNameChain.join(humanizePropertyName ? '/' : '.');
+  const processedChunks: string[] = [];
+  for (const chunk of chunks) {
+    if (!processedChunks.length) {
+      processedChunks.push(chunk);
+    } else {
+      const latestProcessedChunk = guaranteeNonNullable(
+        processedChunks[processedChunks.length - 1],
+      );
+      if (latestProcessedChunk.startsWith(TYPE_CAST_TOKEN)) {
+        processedChunks[
+          processedChunks.length - 1
+        ] = `${latestProcessedChunk}${chunk}`;
+      } else {
+        processedChunks.push(chunk);
+      }
+    }
+  }
+  return processedChunks.join(humanizePropertyName ? '/' : '.');
 };
 
 export const getPropertyPath = (
@@ -373,16 +381,8 @@ export const generateValueSpecificationForParameter = (
   parameter: VariableExpression,
   graph: PureModel,
 ): ValueSpecification => {
-  const genericType = parameter.genericType;
-  if (genericType) {
-    const type = genericType.value.rawType;
-    // Clone the generic type reference and avoid directly using the
-    // reference of the parameter so when we edit the value specification
-    // we don't accidentally modify the type of the parameter which is constant
-    // See https://github.com/finos/legend-studio/issues/1099
-    const genericTypeExplicitReference = GenericTypeExplicitReference.create(
-      new GenericType(type),
-    );
+  if (parameter.genericType) {
+    const type = parameter.genericType.value.rawType;
     if (
       (
         [
@@ -400,7 +400,16 @@ export const generateValueSpecificationForParameter = (
       ).includes(type.name)
     ) {
       const primitiveInstanceValue = new PrimitiveInstanceValue(
-        genericTypeExplicitReference,
+        GenericTypeExplicitReference.create(
+          new GenericType(
+            // NOTE: since the default generated value for type Date is a StrictDate
+            // we need to adjust the generic type accordingly
+            // See https://github.com/finos/legend-studio/issues/1391
+            type.name === PRIMITIVE_TYPE.DATE
+              ? graph.getType(PRIMITIVE_TYPE.STRICTDATE)
+              : type,
+          ),
+        ),
         parameter.multiplicity,
       );
       if (type.name !== PRIMITIVE_TYPE.LATESTDATE) {
@@ -411,7 +420,7 @@ export const generateValueSpecificationForParameter = (
       return primitiveInstanceValue;
     } else if (type instanceof Enumeration) {
       const enumValueInstanceValue = new EnumValueInstanceValue(
-        genericTypeExplicitReference,
+        GenericTypeExplicitReference.create(new GenericType(type)),
         parameter.multiplicity,
       );
       if (type.values.length) {