@finos/legend-query-builder 0.1.0 → 0.1.2

package/src/index.ts

@@ -39,3 +39,4 @@ export type { ServiceExecutionAnalysisResult } from './graphManager/action/analy
 export type { MappingRuntimeCompatibilityAnalysisResult } from './graphManager/action/analytics/MappingRuntimeCompatibilityAnalysis.js';
 export * from './stores/ServiceInfo.js';
 export * from './components/ServiceQuerySetupUtils.js';
+export * from './components/QuerySetupUtils.js';

package/src/stores/QueryBuilderChangeDetectionState.ts

@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+import {
+  ActionAlertActionType,
+  ActionAlertType,
+} from '@finos/legend-application';
 import type { RawLambda } from '@finos/legend-graph';
 import {
   ActionState,
@@ -136,4 +140,31 @@ export class QueryBuilderChangeDetectionState {
     this.initialQuery = initialQuery;
     this.initState.complete();
   }
+
+  alertUnsavedChanges(onProceed: () => void): void {
+    if (this.hasChanged) {
+      this.querybuilderState.applicationStore.setActionAlertInfo({
+        message:
+          'Unsaved changes to your query will be lost if you continue. Do you still want to proceed?',
+        type: ActionAlertType.CAUTION,
+        actions: [
+          {
+            label: 'Proceed',
+            type: ActionAlertActionType.PROCEED_WITH_CAUTION,
+            handler:
+              this.querybuilderState.applicationStore.guardUnhandledError(
+                async () => onProceed(),
+              ),
+          },
+          {
+            label: 'Cancel',
+            type: ActionAlertActionType.PROCEED,
+            default: true,
+          },
+        ],
+      });
+    } else {
+      onProceed();
+    }
+  }
 }

package/src/stores/QueryBuilderParametersState.ts

@@ -33,11 +33,13 @@ export class QueryBuilderParametersState
   extends LambdaParametersState
   implements Hashable
 {
+  readonly queryBuilderState: QueryBuilderState;
+
   selectedParameter: LambdaParameterState | undefined;
-  queryBuilderState: QueryBuilderState;
 
   constructor(queryBuilderState: QueryBuilderState) {
     super();
+
     makeObservable(this, {
       parameterValuesEditorState: observable,
       parameterStates: observable,

package/src/stores/QueryBuilderState.ts

@@ -246,13 +246,14 @@ export abstract class QueryBuilderState {
     this.resetQueryContent();
     this.setClass(val);
     this.explorerState.refreshTreeData();
-    this.milestoningState.updateMilestoningConfiguration();
     this.fetchStructureState.implementation.onClassChange(val);
+    this.milestoningState.updateMilestoningConfiguration();
   }
 
   changeMapping(val: Mapping): void {
     this.resetQueryResult();
     this.resetQueryContent();
+    this.milestoningState.updateMilestoningConfiguration();
     this.setMapping(val);
   }
 

package/src/stores/QueryBuilderTypeaheadHelper.ts

@@ -36,9 +36,10 @@ import {
 } from './fetch-structure/projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderState } from './QueryBuilderState.js';
 import { QueryBuilderProjectionState } from './fetch-structure/projection/QueryBuilderProjectionState.js';
-
-const TYPEAHEAD_TAKE_LIMIT = 10;
-const START_LENGTH = 3;
+import {
+  DEFAULT_TYPEAHEAD_SEARCH_LIMIT,
+  DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH,
+} from '@finos/legend-application';
 
 const initializeQueryBuilderState = (
   queryBuilderState: QueryBuilderState,
@@ -49,7 +50,7 @@ const initializeQueryBuilderState = (
     QueryBuilderProjectionState,
   );
   projectionState.resultSetModifierState.distinct = true;
-  projectionState.resultSetModifierState.limit = TYPEAHEAD_TAKE_LIMIT;
+  projectionState.resultSetModifierState.limit = DEFAULT_TYPEAHEAD_SEARCH_LIMIT;
   return builderState;
 };
 
@@ -142,7 +143,7 @@ export const performTypeahead = (
     switch (_type.path) {
       case PRIMITIVE_TYPE.STRING: {
         const value = val.values[0] as string;
-        return value.length >= START_LENGTH;
+        return value.length >= DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH;
       }
       default:
         return false;

package/src/stores/fetch-structure/projection/QueryBuilderProjectionValueSpecificationBuilder.ts

@@ -20,7 +20,6 @@ import {
   extractElementNameFromPath,
   GenericType,
   GenericTypeExplicitReference,
-  Multiplicity,
   PrimitiveInstanceValue,
   PRIMITIVE_TYPE,
   SimpleFunctionExpression,
@@ -126,10 +125,11 @@ const appendResultSetModifier = (
             ),
             multiplicityOne,
           );
-          const multiplicity = new Multiplicity(
-            resultModifierState.sortColumns.length,
-            resultModifierState.sortColumns.length,
-          );
+          const multiplicity =
+            resultModifierState.projectionState.queryBuilderState.graphManagerState.graph.getMultiplicity(
+              resultModifierState.sortColumns.length,
+              resultModifierState.sortColumns.length,
+            );
           const collection = new CollectionInstanceValue(
             multiplicity,
             undefined,
@@ -215,7 +215,7 @@ export const appendProjection = (
     );
 
     const colLambdas = new CollectionInstanceValue(
-      new Multiplicity(
+      queryBuilderState.graphManagerState.graph.getMultiplicity(
         projectionState.columns.length -
           projectionState.aggregationState.columns.length,
         projectionState.columns.length -
@@ -223,13 +223,13 @@ export const appendProjection = (
       ),
     );
     const aggregateLambdas = new CollectionInstanceValue(
-      new Multiplicity(
+      queryBuilderState.graphManagerState.graph.getMultiplicity(
         projectionState.aggregationState.columns.length,
         projectionState.aggregationState.columns.length,
       ),
     );
     const colAliases = new CollectionInstanceValue(
-      new Multiplicity(
+      queryBuilderState.graphManagerState.graph.getMultiplicity(
         projectionState.columns.length,
         projectionState.columns.length,
       ),
@@ -330,13 +330,13 @@ export const appendProjection = (
       multiplicityOne,
     );
     const colLambdas = new CollectionInstanceValue(
-      new Multiplicity(
+      queryBuilderState.graphManagerState.graph.getMultiplicity(
         projectionState.columns.length,
         projectionState.columns.length,
       ),
     );
     const colAliases = new CollectionInstanceValue(
-      new Multiplicity(
+      queryBuilderState.graphManagerState.graph.getMultiplicity(
         projectionState.columns.length,
         projectionState.columns.length,
       ),

package/tsconfig.json

@@ -35,6 +35,7 @@
   "files": [
     "./src/index.ts",
     "./src/components/QueryBuilder_TestID.ts",
+    "./src/components/QuerySetupUtils.ts",
     "./src/graphManager/QueryBuilderHashUtils.ts",
     "./src/graphManager/QueryBuilderSupportedFunctions.ts",
     "./src/graphManager/QueryBuilder_GraphManagerPlugin.ts",