@finos/legend-query-builder 3.0.2 → 3.0.4

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

@@ -38,6 +38,11 @@ export interface QueryBuilderWindowColumnDragSource {
   columnState: QueryBuilderTDSColumnState;
 }
 
+interface QueryBuilderInvalidWindowColumnName {
+  invalidColumnName: string;
+  missingColumnName: string;
+}
+
 export type QueryBuilderWindowDropTarget =
   | QueryBuilderProjectionColumnDragSource
   | QueryBuilderWindowColumnDragSource;
@@ -333,7 +338,8 @@ export class QueryBuilderWindowState implements Hashable {
     makeObservable(this, {
       windowColumns: observable,
       editColumn: observable,
-      validationIssues: computed,
+      invalidWindowColumnNames: computed,
+      windowValidationIssues: computed,
       addWindowColumn: action,
       removeColumn: action,
       moveColumn: action,
@@ -347,16 +353,53 @@ export class QueryBuilderWindowState implements Hashable {
     return !this.windowColumns.length;
   }
 
-  get validationIssues(): string[] | undefined {
+  get invalidWindowColumnNames(): QueryBuilderInvalidWindowColumnName[] {
+    const invalidColNames: QueryBuilderInvalidWindowColumnName[] = [];
+    const windowCols = this.windowColumns;
+    windowCols.forEach((item, index) => {
+      if (
+        item.operationState instanceof
+        QueryBuilderTDS_WindowAggreationOperatorState
+      ) {
+        if (
+          item.operationState.columnState instanceof
+          QueryBuilderWindowColumnState
+        ) {
+          const windowColumnName = item.operationState.columnState.columnName;
+          const hasExistingColumn = item.windowState.isColumnOrderValid(
+            windowColumnName,
+            index,
+          );
+          if (!hasExistingColumn) {
+            invalidColNames.push({
+              invalidColumnName: item.columnName,
+              missingColumnName: windowColumnName,
+            });
+          }
+        }
+      }
+    });
+    return invalidColNames;
+  }
+
+  get windowValidationIssues(): string[] {
+    const invalidWindowColumnNames = this.invalidWindowColumnNames;
+    const issues = [];
+    invalidWindowColumnNames.forEach((item) => {
+      issues.push(
+        `Column '${item.invalidColumnName}' cannot exist before column name '${item.missingColumnName}'`,
+      );
+    });
+
     const hasDuplicatedWindowColumns = this.windowColumns.some(
       (column) =>
         this.windowColumns.filter((c) => c.columnName === column.columnName)
           .length > 1,
     );
     if (hasDuplicatedWindowColumns) {
-      return ['Query has duplicated window columns'];
+      issues.push(`Query has duplicated window columns`);
     }
-    return undefined;
+    return issues;
   }
 
   get referencedTDSColumns(): QueryBuilderTDSColumnState[] {
@@ -388,6 +431,12 @@ export class QueryBuilderWindowState implements Hashable {
     }
   }
 
+  isColumnOrderValid(columnName: string, indexRange: number): boolean {
+    return this.windowColumns
+      .slice(0, indexRange)
+      .some((col) => col.columnName === columnName);
+  }
+
   get hashCode(): string {
     return hashArray([
       QUERY_BUILDER_STATE_HASH_STRUCTURE.TDS_WINDOW_GROUPBY_STATE,

package/src/stores/filter/QueryBuilderFilterState.ts

@@ -19,7 +19,7 @@ import type { TreeNodeData, TreeData } from '@finos/legend-art';
 import {
   type GeneratorFn,
   assertTrue,
-  getNullableFirstElement,
+  getNullableFirstEntry,
   guaranteeNonNullable,
   guaranteeType,
   IllegalStateError,
@@ -456,7 +456,7 @@ export class QueryBuilderFilterState
       this.rootIds.length < 2,
       'Query builder filter tree cannot have more than 1 root',
     );
-    const rootId = getNullableFirstElement(this.rootIds);
+    const rootId = getNullableFirstEntry(this.rootIds);
     return rootId ? this.getNode(rootId) : undefined;
   }
 

package/src/stores/workflows/ClassQueryBuilderState.ts

@@ -22,7 +22,7 @@ import {
   RuntimePointer,
   PackageableElementExplicitReference,
 } from '@finos/legend-graph';
-import { getNullableFirstElement } from '@finos/legend-shared';
+import { getNullableFirstEntry } from '@finos/legend-shared';
 import type React from 'react';
 import { renderClassQueryBuilderSetupPanelContent } from '../../components/workflows/ClassQueryBuilder.js';
 import { QueryBuilderState } from '../QueryBuilderState.js';
@@ -49,7 +49,7 @@ export class ClassQueryBuilderState extends QueryBuilderState {
       return;
     }
     // try to select the first compatible mapping
-    const possibleNewMapping = getNullableFirstElement(compatibleMappings);
+    const possibleNewMapping = getNullableFirstEntry(compatibleMappings);
     if (possibleNewMapping) {
       this.changeMapping(possibleNewMapping);
       this.propagateMappingChange(possibleNewMapping);
@@ -68,7 +68,7 @@ export class ClassQueryBuilderState extends QueryBuilderState {
       mapping,
       this.graphManagerState.usableRuntimes,
     );
-    const possibleNewRuntime = getNullableFirstElement(compatibleRuntimes);
+    const possibleNewRuntime = getNullableFirstEntry(compatibleRuntimes);
     if (possibleNewRuntime) {
       this.changeRuntime(
         new RuntimePointer(

package/src/stores/workflows/MappingQueryBuilderState.ts

@@ -24,7 +24,7 @@ import {
   PackageableElementExplicitReference,
   getMappingCompatibleClasses,
 } from '@finos/legend-graph';
-import { getNullableFirstElement } from '@finos/legend-shared';
+import { getNullableFirstEntry } from '@finos/legend-shared';
 import { renderMappingQueryBuilderSetupPanelContent } from '../../components/workflows/MappingQueryBuilder.js';
 import { QueryBuilderState } from '../QueryBuilderState.js';
 
@@ -61,7 +61,7 @@ export class MappingQueryBuilderState extends QueryBuilderState {
       mapping,
       this.graphManagerState.usableRuntimes,
     );
-    const possibleNewRuntime = getNullableFirstElement(compatibleRuntimes);
+    const possibleNewRuntime = getNullableFirstEntry(compatibleRuntimes);
     if (possibleNewRuntime) {
       this.changeRuntime(
         new RuntimePointer(
@@ -77,7 +77,7 @@ export class MappingQueryBuilderState extends QueryBuilderState {
     // if there is no chosen class or the chosen one is not compatible
     // with the mapping then pick a compatible class if possible
     if (!this.class || !compatibleClasses.includes(this.class)) {
-      const possibleNewClass = getNullableFirstElement(compatibleClasses);
+      const possibleNewClass = getNullableFirstEntry(compatibleClasses);
       if (possibleNewClass) {
         this.changeClass(possibleNewClass);
       }

package/src/stores/workflows/ServiceQueryBuilderState.ts

@@ -26,7 +26,7 @@ import {
 } from '@finos/legend-graph';
 import {
   assertTrue,
-  getNullableFirstElement,
+  getNullableFirstEntry,
   guaranteeNonNullable,
   IllegalStateError,
 } from '@finos/legend-shared';
@@ -159,7 +159,7 @@ export class ServiceQueryBuilderState extends QueryBuilderState {
     // if there is no chosen class or the chosen one is not compatible
     // with the mapping then pick a compatible class if possible
     if (!this.class || !compatibleClasses.includes(this.class)) {
-      const possibleNewClass = getNullableFirstElement(compatibleClasses);
+      const possibleNewClass = getNullableFirstEntry(compatibleClasses);
       if (possibleNewClass) {
         this.changeClass(possibleNewClass);
       }