@finos/legend-query-builder 3.2.1 → 3.2.3

package/src/stores/data-access/DataAccessState.ts

@@ -24,6 +24,8 @@ import {
   DatasetEntitlementAccessRequestedReport,
   DatasetEntitlementAccessNotGrantedReport,
   DatasetEntitlementUnsupportedReport,
+  type RawLambda,
+  type GraphData,
 } from '@finos/legend-graph';
 import {
   ActionState,
@@ -71,12 +73,12 @@ export class DataAccessState {
   readonly applicationStore: GenericLegendApplicationStore;
   readonly graphManagerState: BasicGraphManagerState;
 
-  readonly surveyDatasets: () => Promise<DatasetSpecification[]>;
-  readonly checkDatasetEntitlements: (
-    datasets: DatasetSpecification[],
-  ) => Promise<DatasetEntitlementReport[]>;
-
   readonly initialDatasets?: DatasetSpecification[] | undefined;
+  readonly mapping: string;
+  readonly runtime: string;
+  readonly graphData: GraphData;
+  readonly getQuery: () => Promise<RawLambda | undefined>;
+
   readonly surveyDatasetsState = ActionState.create();
   readonly checkEntitlementsState = ActionState.create();
 
@@ -87,10 +89,10 @@ export class DataAccessState {
     graphManagerState: BasicGraphManagerState,
     options: {
       initialDatasets?: DatasetSpecification[] | undefined;
-      surveyDatasets: () => Promise<DatasetSpecification[]>;
-      checkDatasetEntitlements: (
-        datasets: DatasetSpecification[],
-      ) => Promise<DatasetEntitlementReport[]>;
+      mapping: string;
+      runtime: string;
+      graphData: GraphData;
+      getQuery: () => Promise<RawLambda | undefined>;
     },
   ) {
     makeObservable(this, {
@@ -106,8 +108,10 @@ export class DataAccessState {
     this.datasets = (options.initialDatasets ?? []).map(
       (dataset) => new DatasetAccessInfo(dataset),
     );
-    this.surveyDatasets = options.surveyDatasets;
-    this.checkDatasetEntitlements = options.checkDatasetEntitlements;
+    this.mapping = options.mapping;
+    this.runtime = options.runtime;
+    this.graphData = options.graphData;
+    this.getQuery = options.getQuery;
   }
 
   get entitlementCheckInfo(): EntitlementCheckInfo {
@@ -249,7 +253,13 @@ export class DataAccessState {
     this.surveyDatasetsState.inProgress();
 
     try {
-      const datasets = (yield this.surveyDatasets()) as DatasetSpecification[];
+      const datasets =
+        (yield this.graphManagerState.graphManager.surveyDatasets(
+          this.mapping,
+          this.runtime,
+          (yield this.getQuery()) as RawLambda | undefined,
+          this.graphData,
+        )) as DatasetSpecification[];
       this.datasets = datasets.map((dataset) => {
         const existingDataset = this.datasets.find(
           (ds) => ds.specification.hashCode === dataset.hashCode,
@@ -271,9 +281,14 @@ export class DataAccessState {
     this.checkEntitlementsState.inProgress();
 
     try {
-      const reports = (yield this.checkDatasetEntitlements(
-        this.datasets.map((dataset) => dataset.specification),
-      )) as DatasetEntitlementReport[];
+      const reports =
+        (yield this.graphManagerState.graphManager.checkDatasetEntitlements(
+          this.datasets.map((dataset) => dataset.specification),
+          this.mapping,
+          this.runtime,
+          (yield this.getQuery()) as RawLambda | undefined,
+          this.graphData,
+        )) as DatasetEntitlementReport[];
       this.datasets.forEach((dataset) => {
         const matchingReport = reports.find(
           (report) =>

package/src/stores/entitlements/QueryBuilderCheckEntitlementsState.ts

@@ -19,12 +19,7 @@ import { makeObservable, observable, action, computed } from 'mobx';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../QueryBuilderStateHashUtils.js';
 import type { QueryBuilderState } from '../QueryBuilderState.js';
 import { DataAccessState } from '../data-access/DataAccessState.js';
-import {
-  RuntimePointer,
-  type DatasetEntitlementReport,
-  type DatasetSpecification,
-  InMemoryGraphData,
-} from '@finos/legend-graph';
+import { RuntimePointer, InMemoryGraphData } from '@finos/legend-graph';
 
 export class QueryBuilderCheckEntitlementsState implements Hashable {
   readonly queryBuilderState: QueryBuilderState;
@@ -51,34 +46,17 @@ export class QueryBuilderCheckEntitlementsState implements Hashable {
       this.queryBuilderState.mapping &&
       this.queryBuilderState.runtimeValue instanceof RuntimePointer
     ) {
-      const mappingPath = this.queryBuilderState.mapping.path;
-      const runtimePath =
-        this.queryBuilderState.runtimeValue.packageableRuntime.value.path;
       this.dataAccessState = new DataAccessState(
         this.queryBuilderState.applicationStore,
         this.queryBuilderState.graphManagerState,
         {
-          surveyDatasets: async (): Promise<DatasetSpecification[]> =>
-            this.queryBuilderState.graphManagerState.graphManager.surveyDatasets(
-              mappingPath,
-              runtimePath,
-              this.queryBuilderState.buildQuery(),
-              new InMemoryGraphData(
-                this.queryBuilderState.graphManagerState.graph,
-              ),
-            ),
-          checkDatasetEntitlements: async (
-            datasets: DatasetSpecification[],
-          ): Promise<DatasetEntitlementReport[]> =>
-            this.queryBuilderState.graphManagerState.graphManager.checkDatasetEntitlements(
-              datasets,
-              mappingPath,
-              runtimePath,
-              this.queryBuilderState.buildQuery(),
-              new InMemoryGraphData(
-                this.queryBuilderState.graphManagerState.graph,
-              ),
-            ),
+          mapping: this.queryBuilderState.mapping.path,
+          runtime:
+            this.queryBuilderState.runtimeValue.packageableRuntime.value.path,
+          getQuery: async () => this.queryBuilderState.buildQuery(),
+          graphData: new InMemoryGraphData(
+            this.queryBuilderState.graphManagerState.graph,
+          ),
         },
       );
     }

package/src/stores/fetch-structure/tds/window/QueryBuilderWindowState.ts

@@ -284,6 +284,9 @@ export class QueryBuilderWindowColumnState
               compatibleAggCol,
             ),
           );
+          this.setColumnName(
+            `${windowOp.getLabel()} of ${compatibleAggCol.columnName}`,
+          );
         }
       } else {
         this.setOperatorState(
@@ -292,6 +295,7 @@ export class QueryBuilderWindowColumnState
             windowOp,
           ),
         );
+        this.setColumnName(`${windowOp.getLabel()}`);
       }
     }
   }