@finos/legend-query-builder 0.2.1 → 0.2.2

package/src/components/workflows/ServiceQueryBuilder.tsx

@@ -14,24 +14,15 @@
  * limitations under the License.
  */
 
-import {
-  CustomSelectorInput,
-  PURE_MappingIcon,
-  PURE_RuntimeIcon,
-  PlayIcon,
-} from '@finos/legend-art';
+import { CustomSelectorInput, PlayIcon, RobotIcon } from '@finos/legend-art';
 import { observer } from 'mobx-react-lite';
-import { getMappingCompatibleClasses } from '@finos/legend-graph';
+import { getMappingCompatibleClasses, type Service } from '@finos/legend-graph';
 import {
-  getPackageableElementOptionFormatter,
   buildElementOption,
   useApplicationStore,
+  type PackageableElementOption,
 } from '@finos/legend-application';
-import {
-  buildRuntimeValueOption,
-  getRuntimeOptionFormatter,
-  QueryBuilderClassSelector,
-} from '../QueryBuilderSideBar.js';
+import { QueryBuilderClassSelector } from '../QueryBuilderSideBar.js';
 import type {
   ServiceExecutionContext,
   ServiceQueryBuilderState,
@@ -49,7 +40,7 @@ const buildExecutionContextOption = (
 });
 
 /**
- * This setup panel supports cascading in order: Execution Context -> Class
+ * This setup panel supports cascading in order: Service -> Execution Context -> Class
  *
  * In other words, we will only show:
  * - For class selector: the list of compatible classes with the selected mapping
@@ -61,15 +52,18 @@ const ServiceQueryBuilderSetupPanelContent = observer(
     const { queryBuilderState } = props;
     const applicationStore = useApplicationStore();
 
-    // mapping
-    const selectedMappingOption = queryBuilderState.mapping
-      ? buildElementOption(queryBuilderState.mapping)
-      : null;
-
-    // runtime
-    const selectedRuntimeOption = queryBuilderState.runtimeValue
-      ? buildRuntimeValueOption(queryBuilderState.runtimeValue)
-      : null;
+    // execution context
+    const serviceOptions =
+      queryBuilderState.usableServices?.map(buildElementOption) ?? [];
+    const selectedServiceOption = buildElementOption(queryBuilderState.service);
+    const onServiceOptionChange = (
+      option: PackageableElementOption<Service>,
+    ): void => {
+      if (option.value === queryBuilderState.service) {
+        return;
+      }
+      queryBuilderState.onServiceChange?.(option.value);
+    };
 
     // execution context
     const executionContextOptions = queryBuilderState.executionContexts.map(
@@ -109,6 +103,23 @@ const ServiceQueryBuilderSetupPanelContent = observer(
             </div>
           </div>
           <div className="query-builder__setup__config-group__content">
+            <div className="query-builder__setup__config-group__item">
+              <div
+                className="btn--sm query-builder__setup__config-group__item__label"
+                title="service"
+              >
+                <RobotIcon className="query-builder__setup__service__icon__service" />
+              </div>
+              <CustomSelectorInput
+                className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
+                placeholder="Choose a service..."
+                options={serviceOptions}
+                disabled={serviceOptions.length <= 1}
+                onChange={onServiceOptionChange}
+                value={selectedServiceOption}
+                darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
+              />
+            </div>
             {/* We will display mapping and runtime selector for single-execution and execution context for multi-execution */}
             {Boolean(queryBuilderState.executionContexts.length) && (
               <>
@@ -131,48 +142,6 @@ const ServiceQueryBuilderSetupPanelContent = observer(
                 </div>
               </>
             )}
-            {!queryBuilderState.executionContexts.length && (
-              <>
-                <div className="query-builder__setup__config-group__item">
-                  <div
-                    className="btn--sm query-builder__setup__config-group__item__label"
-                    title="mapping"
-                  >
-                    <PURE_MappingIcon />
-                  </div>
-                  <CustomSelectorInput
-                    className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
-                    disabled={true}
-                    options={[]}
-                    value={selectedMappingOption}
-                    darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
-                    formatOptionLabel={getPackageableElementOptionFormatter({
-                      darkMode:
-                        !applicationStore.TEMPORARY__isLightThemeEnabled,
-                    })}
-                  />
-                </div>
-                <div className="query-builder__setup__config-group__item">
-                  <div
-                    className="btn--sm query-builder__setup__config-group__item__label"
-                    title="runtime"
-                  >
-                    <PURE_RuntimeIcon />
-                  </div>
-                  <CustomSelectorInput
-                    className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
-                    disabled={true}
-                    options={[]}
-                    value={selectedRuntimeOption}
-                    darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
-                    formatOptionLabel={getRuntimeOptionFormatter({
-                      darkMode:
-                        !applicationStore.TEMPORARY__isLightThemeEnabled,
-                    })}
-                  />
-                </div>
-              </>
-            )}
           </div>
         </div>
         <QueryBuilderClassSelector

package/src/index.ts

@@ -17,9 +17,14 @@
 export * from './stores/QueryBuilderBootstraper.js';
 export { QueryBuilder_GraphManagerPreset } from './graphManager/QueryBuilder_GraphManagerPreset.js';
 
-export { QUERY_BUILDER_TEST_ID } from './components//QueryBuilder_TestID.js';
-export { QueryBuilder } from './components//QueryBuilder.js';
-export { QueryBuilderState } from './stores//QueryBuilderState.js';
+export { QUERY_BUILDER_TEST_ID } from './components/QueryBuilder_TestID.js';
+export { QueryBuilder_LegendApplicationPlugin } from './components/QueryBuilder_LegendApplicationPlugin.js';
+export { QueryBuilderNavigationBlocker } from './components/QueryBuilderNavigationBlocker.js';
+export {
+  QueryBuilder,
+  QUERY_BUILDER_BACKDROP_CONTAINER_ID,
+} from './components/QueryBuilder.js';
+export { QueryBuilderState } from './stores/QueryBuilderState.js';
 
 export { QueryBuilderPropertySearchState } from './stores/explorer/QueryBuilderPropertySearchState.js';
 export {
@@ -32,7 +37,7 @@ export { MappingQueryBuilderState } from './stores/workflows/MappingQueryBuilder
 export {
   type ServiceExecutionContext,
   ServiceQueryBuilderState,
-} from './stores//workflows/ServiceQueryBuilderState.js';
+} from './stores/workflows/ServiceQueryBuilderState.js';
 
 export { getQueryBuilderGraphManagerExtension } from './graphManager/protocol/pure/QueryBuilder_PureGraphManagerExtension.js';
 export type { ServiceExecutionAnalysisResult } from './graphManager/action/analytics/ServiceExecutionAnalysis.js';

package/src/stores/QueryBuilderChangeDetectionState.ts

@@ -157,7 +157,7 @@ export class QueryBuilderChangeDetectionState {
               ),
           },
           {
-            label: 'Cancel',
+            label: 'Abort',
             type: ActionAlertActionType.PROCEED,
             default: true,
           },

package/src/stores/QueryBuilderCommand.ts

@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { CommandConfigData } from '@finos/legend-application';
+
+export enum QUERY_BUILDER_COMMAND_KEY {
+  COMPILE = 'query-builder.compile',
+}
+
+export const QUERY_BUILDER_COMMAND_CONFIG: CommandConfigData = {
+  [QUERY_BUILDER_COMMAND_KEY.COMPILE]: {
+    title: 'Query Builder: Compile query',
+    defaultKeyboardShortcut: 'f9',
+  },
+};

package/src/stores/QueryBuilderPreviewDataHelper.ts

@@ -19,22 +19,22 @@ import type {
   AbstractPropertyExpression,
 } from '@finos/legend-graph';
 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';
-import { QueryBuilderAggregateOperator_Max } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Max.js';
-import { QueryBuilderAggregateOperator_Min } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Min.js';
-import { QueryBuilderAggregateOperator_StdDev_Population } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Population.js';
-import { QueryBuilderAggregateOperator_StdDev_Sample } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Sample.js';
-import { QueryBuilderAggregateOperator_Sum } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Sum.js';
-import { QueryBuilderSimpleProjectionColumnState } from './fetch-structure/projection/QueryBuilderProjectionColumnState.js';
+import { QueryBuilderAggregateOperator_Average } from './fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Average.js';
+import { QueryBuilderAggregateOperator_Count } from './fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Count.js';
+import { QueryBuilderAggregateOperator_DistinctCount } from './fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_DistinctCount.js';
+import { QueryBuilderAggregateOperator_Max } from './fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Max.js';
+import { QueryBuilderAggregateOperator_Min } from './fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Min.js';
+import { QueryBuilderAggregateOperator_StdDev_Population } from './fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Population.js';
+import { QueryBuilderAggregateOperator_StdDev_Sample } from './fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Sample.js';
+import { QueryBuilderAggregateOperator_Sum } from './fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Sum.js';
+import { QueryBuilderSimpleProjectionColumnState } from './fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderState } from './QueryBuilderState.js';
 import {
   COLUMN_SORT_TYPE,
   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';
+} from './fetch-structure/tds/QueryResultSetModifierState.js';
+import type { QueryBuilderAggregateOperator } from './fetch-structure/tds/aggregation/QueryBuilderAggregateOperator.js';
+import { QueryBuilderTDSState } from './fetch-structure/tds/QueryBuilderTDSState.js';
 
 const PREVIEW_DATA_TAKE_LIMIT = 10;
 const PREVIEW_DATA_NON_NUMERIC_VALUE_COLUMN_NAME = 'Value';
@@ -75,12 +75,12 @@ const NUMERIC_AGG_FUNC_TO_AGG_OP: [
 ];
 
 const createSimpleProjectionColumn = (
-  projectionState: QueryBuilderProjectionState,
+  tdsState: QueryBuilderTDSState,
   propertyExpression: AbstractPropertyExpression,
   columnName: string,
 ): QueryBuilderSimpleProjectionColumnState => {
   const col = new QueryBuilderSimpleProjectionColumnState(
-    projectionState,
+    tdsState,
     propertyExpression,
     false,
   );
@@ -123,18 +123,18 @@ export const buildNumericPreviewDataQuery = (
   //   ]
   // )
   const builderState = queryBuilderState.INTERNAL__toBasicQueryBuilderState();
-  const projectionState = guaranteeType(
+  const tdsState = guaranteeType(
     builderState.fetchStructureState.implementation,
-    QueryBuilderProjectionState,
+    QueryBuilderTDSState,
   );
-  const aggregationState = projectionState.aggregationState;
+  const aggregationState = tdsState.aggregationState;
   NUMERIC_AGG_FUNC_TO_AGG_OP.forEach((val) => {
     const colState = createSimpleProjectionColumn(
-      projectionState,
+      tdsState,
       propertyExpression,
       val[0],
     );
-    projectionState.columns.push(colState);
+    tdsState.projectionColumns.push(colState);
     const valAggOp = guaranteeNonNullable(
       aggregationState.operators.find((t) => t instanceof val[1]),
     );
@@ -163,38 +163,38 @@ export const buildNonNumericPreviewDataQuery = (
   //   ]
   // )->sort([desc('Count'), asc('Value')])->take(10)
   const builderState = queryBuilderState.INTERNAL__toBasicQueryBuilderState();
-  const projectionState = guaranteeType(
+  const tdsState = guaranteeType(
     builderState.fetchStructureState.implementation,
-    QueryBuilderProjectionState,
+    QueryBuilderTDSState,
   );
   const valueProjectionColState = createSimpleProjectionColumn(
-    projectionState,
+    tdsState,
     propertyExpression,
     PREVIEW_DATA_NON_NUMERIC_VALUE_COLUMN_NAME,
   );
   const valueCountProjectionState = createSimpleProjectionColumn(
-    projectionState,
+    tdsState,
     propertyExpression,
     PREVIEW_DATA_NON_NUMERIC_COUNT_COLUMN_NAME,
   );
-  projectionState.columns = [
+  tdsState.projectionColumns = [
     valueProjectionColState,
     valueCountProjectionState,
   ];
   const distinctCountOp = guaranteeNonNullable(
-    projectionState.aggregationState.operators.find(
+    tdsState.aggregationState.operators.find(
       (t) => t instanceof QueryBuilderAggregateOperator_Count,
     ),
   );
-  projectionState.aggregationState.changeColumnAggregateOperator(
+  tdsState.aggregationState.changeColumnAggregateOperator(
     distinctCountOp,
     valueCountProjectionState,
   );
   // result set
-  projectionState.resultSetModifierState.limit = PREVIEW_DATA_TAKE_LIMIT;
+  tdsState.resultSetModifierState.limit = PREVIEW_DATA_TAKE_LIMIT;
   const sortValueCount = new SortColumnState(valueCountProjectionState);
   sortValueCount.sortType = COLUMN_SORT_TYPE.DESC;
-  projectionState.resultSetModifierState.sortColumns = [
+  tdsState.resultSetModifierState.sortColumns = [
     sortValueCount,
     new SortColumnState(valueProjectionColState),
   ];

package/src/stores/QueryBuilderState.ts

@@ -14,7 +14,14 @@
  * limitations under the License.
  */
 
-import { action, flow, observable, makeObservable, computed } from 'mobx';
+import {
+  action,
+  flow,
+  observable,
+  makeObservable,
+  computed,
+  flowResult,
+} from 'mobx';
 import {
   type GeneratorFn,
   LogEvent,
@@ -56,7 +63,10 @@ import {
   buildRawLambdaFromLambdaFunction,
 } from '@finos/legend-graph';
 import { buildLambdaFunction } from './QueryBuilderValueSpecificationBuilder.js';
-import type { GenericLegendApplicationStore } from '@finos/legend-application';
+import type {
+  CommandRegistrar,
+  GenericLegendApplicationStore,
+} from '@finos/legend-application';
 import { QueryFunctionsExplorerState } from './explorer/QueryFunctionsExplorerState.js';
 import { QueryBuilderParametersState } from './QueryBuilderParametersState.js';
 import type { QueryBuilderFilterOperator } from './filter/QueryBuilderFilterOperator.js';
@@ -64,8 +74,9 @@ import { getQueryBuilderCoreFilterOperators } from './filter/QueryBuilderFilterO
 import { QueryBuilderChangeDetectionState } from './QueryBuilderChangeDetectionState.js';
 import { QueryBuilderMilestoningState } from './QueryBuilderMilestoningState.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_COMMAND_KEY } from './QueryBuilderCommand.js';
 
-export abstract class QueryBuilderState {
+export abstract class QueryBuilderState implements CommandRegistrar {
   applicationStore: GenericLegendApplicationStore;
   graphManagerState: GraphManagerState;
 
@@ -84,7 +95,6 @@ export abstract class QueryBuilderState {
   observableContext: ObserverContext;
 
   queryCompileState = ActionState.create();
-  showBackdrop = false;
   showFunctionsExplorerPanel = false;
   showParametersPanel = false;
 
@@ -109,7 +119,6 @@ export abstract class QueryBuilderState {
       resultState: observable,
       textEditorState: observable,
       unsupportedQueryState: observable,
-      showBackdrop: observable,
       showFunctionsExplorerPanel: observable,
       showParametersPanel: observable,
       changeDetectionState: observable,
@@ -121,7 +130,6 @@ export abstract class QueryBuilderState {
       isQuerySupported: computed,
       validationIssues: computed,
 
-      setShowBackdrop: action,
       setShowFunctionsExplorerPanel: action,
       setShowParametersPanel: action,
       setClass: action,
@@ -185,10 +193,6 @@ export abstract class QueryBuilderState {
     return true;
   }
 
-  setShowBackdrop(val: boolean): void {
-    this.showBackdrop = val;
-  }
-
   setShowFunctionsExplorerPanel(val: boolean): void {
     this.showFunctionsExplorerPanel = val;
   }
@@ -213,6 +217,23 @@ export abstract class QueryBuilderState {
     return !this.unsupportedQueryState.rawLambda;
   }
 
+  registerCommands(): void {
+    this.applicationStore.commandCenter.registerCommand({
+      key: QUERY_BUILDER_COMMAND_KEY.COMPILE,
+      action: () => {
+        flowResult(this.compileQuery()).catch(
+          this.applicationStore.alertUnhandledError,
+        );
+      },
+    });
+  }
+
+  deregisterCommands(): void {
+    [QUERY_BUILDER_COMMAND_KEY.COMPILE].forEach((key) =>
+      this.applicationStore.commandCenter.deregisterCommand(key),
+    );
+  }
+
   resetQueryResult(): void {
     const resultState = new QueryBuilderResultState(this);
     resultState.setPreviewLimit(this.resultState.previewLimit);

package/src/stores/QueryBuilderStateBuilder.ts

@@ -49,12 +49,12 @@ import {
   type INTERNAL__PropagatedValue,
   type ValueSpecification,
 } from '@finos/legend-graph';
-import { processTDSPostFilterExpression } from './fetch-structure/projection/post-filter/QueryBuilderPostFilterStateBuilder.js';
+import { processTDSPostFilterExpression } from './fetch-structure/tds/post-filter/QueryBuilderPostFilterStateBuilder.js';
 import { processFilterExpression } from './filter/QueryBuilderFilterStateBuilder.js';
 import {
   processTDSAggregateExpression,
   processTDSGroupByExpression,
-} from './fetch-structure/projection/aggregation/QueryBuilderAggregationStateBuilder.js';
+} from './fetch-structure/tds/aggregation/QueryBuilderAggregationStateBuilder.js';
 import {
   processGraphFetchExpression,
   processGraphFetchSerializeExpression,
@@ -67,7 +67,7 @@ import {
   processTDSSortDirectionExpression,
   processTDSSortExpression,
   processTDSTakeExpression,
-} from './fetch-structure/projection/QueryBuilderProjectionStateBuilder.js';
+} from './fetch-structure/tds/projection/QueryBuilderProjectionStateBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graphManager/QueryBuilderSupportedFunctions.js';
 import { LambdaParameterState } from './shared/LambdaParameterState.js';
 

package/src/stores/QueryBuilderTypeaheadHelper.ts

@@ -24,18 +24,18 @@ import {
   type RawLambda,
 } from '@finos/legend-graph';
 import { guaranteeType, isNonNullable, isString } from '@finos/legend-shared';
-import { QueryBuilderPostFilterOperator_StartWith } from './fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.js';
-import type { QueryBuilderAggregateColumnState } from './fetch-structure/projection/aggregation/QueryBuilderAggregationState.js';
+import { QueryBuilderPostFilterOperator_StartWith } from './fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.js';
+import type { QueryBuilderAggregateColumnState } from './fetch-structure/tds/aggregation/QueryBuilderAggregationState.js';
 import {
   PostFilterConditionState,
   QueryBuilderPostFilterTreeConditionNodeData,
-} from './fetch-structure/projection/post-filter/QueryBuilderPostFilterState.js';
+} from './fetch-structure/tds/post-filter/QueryBuilderPostFilterState.js';
 import {
   QueryBuilderProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
-} from './fetch-structure/projection/QueryBuilderProjectionColumnState.js';
+} from './fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderState } from './QueryBuilderState.js';
-import { QueryBuilderProjectionState } from './fetch-structure/projection/QueryBuilderProjectionState.js';
+import { QueryBuilderTDSState } from './fetch-structure/tds/QueryBuilderTDSState.js';
 import {
   DEFAULT_TYPEAHEAD_SEARCH_LIMIT,
   DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH,
@@ -45,12 +45,12 @@ const initializeQueryBuilderState = (
   queryBuilderState: QueryBuilderState,
 ): QueryBuilderState => {
   const builderState = queryBuilderState.INTERNAL__toBasicQueryBuilderState();
-  const projectionState = guaranteeType(
+  const tdsState = guaranteeType(
     builderState.fetchStructureState.implementation,
-    QueryBuilderProjectionState,
+    QueryBuilderTDSState,
   );
-  projectionState.resultSetModifierState.distinct = true;
-  projectionState.resultSetModifierState.limit = DEFAULT_TYPEAHEAD_SEARCH_LIMIT;
+  tdsState.resultSetModifierState.distinct = true;
+  tdsState.resultSetModifierState.limit = DEFAULT_TYPEAHEAD_SEARCH_LIMIT;
   return builderState;
 };
 
@@ -61,21 +61,21 @@ const buildColumnTypeaheadQuery = (
     | QueryBuilderAggregateColumnState,
   value: ValueSpecification | undefined,
 ): RawLambda => {
-  const projectionState = guaranteeType(
+  const tdsState = guaranteeType(
     builderState.fetchStructureState.implementation,
-    QueryBuilderProjectionState,
+    QueryBuilderTDSState,
   );
   let projectionColumnState;
   if (columnState instanceof QueryBuilderProjectionColumnState) {
     projectionColumnState = columnState;
   } else {
     projectionColumnState = columnState.projectionColumnState;
-    const aggregationState = projectionState.aggregationState;
+    const aggregationState = tdsState.aggregationState;
     aggregationState.columns = [columnState];
   }
-  projectionState.columns = [projectionColumnState];
+  tdsState.projectionColumns = [projectionColumnState];
   const postConditionState = new PostFilterConditionState(
-    projectionState.postFilterState,
+    tdsState.postFilterState,
     columnState,
     value,
     new QueryBuilderPostFilterOperator_StartWith(),
@@ -84,7 +84,7 @@ const buildColumnTypeaheadQuery = (
     undefined,
     postConditionState,
   );
-  projectionState.postFilterState.addNodeFromNode(postFilterNode, undefined);
+  tdsState.postFilterState.addNodeFromNode(postFilterNode, undefined);
   return builderState.resultState.buildExecutionRawLambda();
 };
 
@@ -94,12 +94,12 @@ export const buildPropertyTypeaheadQuery = (
   value: ValueSpecification | undefined,
 ): RawLambda => {
   const builderState = initializeQueryBuilderState(queryBuilderState);
-  const projectionState = guaranteeType(
+  const tdsState = guaranteeType(
     builderState.fetchStructureState.implementation,
-    QueryBuilderProjectionState,
+    QueryBuilderTDSState,
   );
   const columnState = new QueryBuilderSimpleProjectionColumnState(
-    projectionState,
+    tdsState,
     propertyExpression,
     false,
   );

package/src/stores/QueryBuilderValueSpecificationHelper.ts

@@ -44,13 +44,13 @@ import {
 } from '@finos/legend-graph';
 import {
   addUniqueEntry,
+  formatDate,
   guaranteeNonNullable,
   guaranteeType,
   isNumber,
   isString,
   UnsupportedOperationError,
 } from '@finos/legend-shared';
-import { format } from 'date-fns';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graphManager/QueryBuilderSupportedFunctions.js';
 import { getDerivedPropertyMilestoningSteoreotype } from './QueryBuilderPropertyEditorState.js';
 
@@ -220,9 +220,9 @@ export const generateDefaultValueForPrimitiveType = (
       return 0;
     case PRIMITIVE_TYPE.DATE:
     case PRIMITIVE_TYPE.STRICTDATE:
-      return format(new Date(Date.now()), DATE_FORMAT);
+      return formatDate(new Date(Date.now()), DATE_FORMAT);
     case PRIMITIVE_TYPE.DATETIME:
-      return format(new Date(Date.now()), DATE_TIME_FORMAT);
+      return formatDate(new Date(Date.now()), DATE_TIME_FORMAT);
     default:
       throw new UnsupportedOperationError(
         `Can't generate default value for primitive type '${type}'`,

package/src/stores/fetch-structure/QueryBuilderFetchStructureImplementationState.ts

@@ -27,7 +27,7 @@ import type { LambdaFunctionBuilderOption } from '../QueryBuilderValueSpecificat
 import type { QueryBuilderFetchStructureState } from './QueryBuilderFetchStructureState.js';
 
 export enum FETCH_STRUCTURE_IMPLEMENTATION {
-  PROJECTION = 'PROJECTION',
+  TABULAR_DATA_STRUCTURE = 'TABULAR_DATA_STRUCTURE',
   GRAPH_FETCH = 'GRAPH_FETCH',
 }
 

package/src/stores/fetch-structure/QueryBuilderFetchStructureState.ts

@@ -17,7 +17,7 @@
 import { action, makeObservable, observable } from 'mobx';
 import type { QueryBuilderState } from '../QueryBuilderState.js';
 import { QueryBuilderGraphFetchTreeState } from './graph-fetch/QueryBuilderGraphFetchTreeState.js';
-import { QueryBuilderProjectionState } from './projection/QueryBuilderProjectionState.js';
+import { QueryBuilderTDSState } from './tds/QueryBuilderTDSState.js';
 import {
   type QueryBuilderExplorerTreeNodeData,
   QueryBuilderExplorerTreePropertyNodeData,
@@ -46,7 +46,7 @@ export class QueryBuilderFetchStructureState {
      * graph-fetch since `getAll()` naturally works for graph-fetch case
      * and graph-fetch allows somewhat an empty tree
      */
-    this.implementation = new QueryBuilderProjectionState(
+    this.implementation = new QueryBuilderTDSState(
       this.queryBuilderState,
       this,
     );
@@ -54,8 +54,8 @@ export class QueryBuilderFetchStructureState {
 
   changeImplementation(type: string): void {
     switch (type) {
-      case FETCH_STRUCTURE_IMPLEMENTATION.PROJECTION: {
-        this.implementation = new QueryBuilderProjectionState(
+      case FETCH_STRUCTURE_IMPLEMENTATION.TABULAR_DATA_STRUCTURE: {
+        this.implementation = new QueryBuilderTDSState(
           this.queryBuilderState,
           this,
         );