@finos/legend-query-builder 3.0.1 → 3.0.3

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

@@ -693,6 +693,12 @@ const QueryBuilderWindowColumnEditor = observer(
     const isDuplicatedColumnName =
       tdsState.isDuplicateColumn(windowColumnState);
 
+    const isInvalidColumnName = windowState.invalidWindowColumnNames.some(
+      (col) =>
+        col.invalidColumnName === windowColumnState.columnName ||
+        col.missingColumnName === windowColumnState.columnName,
+    );
+
     // window columns
     const windowOptions = windowColumnState.possibleReferencedColumns;
     const addWindowOptions = windowOptions.filter(
@@ -1082,7 +1088,11 @@ const QueryBuilderWindowColumnEditor = observer(
               value={windowColumnState.columnName}
               onChange={changeColumnName}
               validationErrorMessage={
-                isDuplicatedColumnName ? 'Duplicated column' : undefined
+                isDuplicatedColumnName
+                  ? 'Duplicated column'
+                  : isInvalidColumnName
+                  ? 'Invalid column order'
+                  : undefined
               }
             />
           </div>
@@ -1175,9 +1185,11 @@ export const QueryBuilderTDSWindowPanel = observer(
           <div className="panel__header">
             <div className="panel__header__title">
               <div className="panel__header__title__label">Window Function</div>
-              <QueryBuilderPanelIssueCountBadge
-                issues={tdsWindowState.validationIssues}
-              />
+              {tdsWindowState.windowValidationIssues.length && (
+                <QueryBuilderPanelIssueCountBadge
+                  issues={tdsWindowState.windowValidationIssues}
+                />
+              )}
             </div>
             <div className="panel__header__actions">
               <button

package/src/stores/QueryBuilderState.ts

@@ -145,7 +145,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
 
       sideBarClassName: computed,
       isQuerySupported: computed,
-      validationIssues: computed,
+      allValidationIssues: computed,
 
       setShowFunctionsExplorerPanel: action,
       setShowParametersPanel: action,
@@ -554,8 +554,8 @@ export abstract class QueryBuilderState implements CommandRegistrar {
     }
   }
 
-  get validationIssues(): string[] | undefined {
-    return this.fetchStructureState.implementation.validationIssues;
+  get allValidationIssues(): string[] {
+    return this.fetchStructureState.implementation.allValidationIssues;
   }
 
   /**

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

@@ -45,7 +45,8 @@ export abstract class QueryBuilderFetchStructureImplementationState
   ) {
     makeObservable(this, {
       usedExplorerTreePropertyNodeIDs: computed,
-      validationIssues: computed,
+      fetchStructureValidationIssues: computed,
+      allValidationIssues: computed,
       hashCode: computed,
     });
 
@@ -55,7 +56,8 @@ export abstract class QueryBuilderFetchStructureImplementationState
 
   abstract get type(): string;
   abstract get usedExplorerTreePropertyNodeIDs(): string[];
-  abstract get validationIssues(): string[] | undefined;
+  abstract get fetchStructureValidationIssues(): string[];
+  abstract get allValidationIssues(): string[];
 
   abstract onClassChange(_class: Class | undefined): void;
   abstract revealCompilationError(compilationError: CompilationError): boolean;

package/src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.ts

@@ -72,22 +72,15 @@ const DEFAULT_PURE_CONFIG_TYPE_NAME = '@type';
 
 export class PureSerializationConfig {
   typeKeyName: string;
-  includeType: boolean;
-  includeEnumType: boolean;
-  removePropertiesWithNullValues: boolean;
-  removePropertiesWithEmptySets: boolean;
-  fullyQualifiedTypePath: boolean;
-  includeObjectReference: boolean;
+  includeType: boolean | undefined;
+  includeEnumType: boolean | undefined;
+  removePropertiesWithNullValues: boolean | undefined;
+  removePropertiesWithEmptySets: boolean | undefined;
+  fullyQualifiedTypePath: boolean | undefined;
+  includeObjectReference: boolean | undefined;
 
   constructor() {
-    // default values
     this.typeKeyName = DEFAULT_PURE_CONFIG_TYPE_NAME;
-    this.includeType = true;
-    this.includeEnumType = true;
-    this.removePropertiesWithNullValues = true;
-    this.removePropertiesWithEmptySets = false;
-    this.fullyQualifiedTypePath = true;
-    this.includeObjectReference = false;
     makeObservable(this, {
       typeKeyName: observable,
       includeType: observable,
@@ -106,6 +99,17 @@ export class PureSerializationConfig {
     });
   }
 
+  static createDefault(): PureSerializationConfig {
+    const config = new PureSerializationConfig();
+    config.typeKeyName = DEFAULT_PURE_CONFIG_TYPE_NAME;
+    config.includeType = true;
+    config.includeEnumType = true;
+    config.removePropertiesWithNullValues = true;
+    config.removePropertiesWithEmptySets = false;
+    config.fullyQualifiedTypePath = true;
+    return config;
+  }
+
   setTypeName(val: string): void {
     this.typeKeyName = val;
   }
@@ -343,8 +347,12 @@ export class QueryBuilderGraphFetchTreeState
     return Array.from(new Set(ids).values());
   }
 
-  get validationIssues(): string[] | undefined {
-    return undefined;
+  get fetchStructureValidationIssues(): string[] {
+    return [];
+  }
+
+  get allValidationIssues(): string[] {
+    return [];
   }
 
   override initialize(): void {

package/src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.ts

@@ -122,7 +122,7 @@ export const buildPureSerializationConfig = (
     const property = Object.getOwnPropertyNames(config).find(
       (p) => p === classProperty.name,
     );
-    if (property) {
+    if (property && config[property] !== undefined) {
       const keyExpressionInstance = new KeyExpressionInstanceValue();
       // key expression
       const keyInstance = new PrimitiveInstanceValue(

package/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts

@@ -267,7 +267,7 @@ export class QueryBuilderTDSState
     return Array.from(new Set(nodeIDs).values());
   }
 
-  get validationIssues(): string[] | undefined {
+  get fetchStructureValidationIssues(): string[] {
     const hasDuplicatedProjectionColumns = this.projectionColumns.some(
       (column) =>
         this.projectionColumns.filter((c) => c.columnName === column.columnName)
@@ -280,7 +280,16 @@ export class QueryBuilderTDSState
     if (hasNoProjectionColumns) {
       return ['Query has no projection columns'];
     }
-    return undefined;
+    return [];
+  }
+
+  get allValidationIssues(): string[] {
+    const fetchStructureValidationIssues = [
+      ...this.fetchStructureValidationIssues,
+      ...this.windowState.windowValidationIssues,
+    ];
+
+    return fetchStructureValidationIssues;
   }
 
   get tdsColumns(): QueryBuilderTDSColumnState[] {

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,