@adaptabletools/adaptable 11.0.0-canary.6 → 11.0.0-canary.7

package/src/PredefinedConfig/Common/AdaptableQuery.d.ts

@@ -18,5 +18,4 @@ export interface AdaptableAggregatedScalarQuery {
  * An AdaptableQuery can be either a Boolean, Scalar, Observable, AggregatedBoolean, or AggregatedScalar expression
  */
 export declare type AdaptableQuery = XOR<AdaptableBooleanQuery, XOR<AdaptableScalarQuery, XOR<AdaptableObservableQuery, XOR<AdaptableAggregatedBooleanQuery, AdaptableAggregatedScalarQuery>>>>;
-export declare const getAdaptableQueryExpression: (query: Partial<AdaptableQuery>) => string | undefined;
 export declare const isReactiveQuery: (query: Partial<AdaptableQuery>) => boolean;

package/src/PredefinedConfig/Common/AdaptableQuery.js

@@ -1,10 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isReactiveQuery = exports.getAdaptableQueryExpression = void 0;
-exports.getAdaptableQueryExpression = (query) => {
-    var _a, _b, _c, _d;
-    return ((_d = (_c = (_b = (_a = query.BooleanExpression) !== null && _a !== void 0 ? _a : query.ScalarExpression) !== null && _b !== void 0 ? _b : query.ObservableExpression) !== null && _c !== void 0 ? _c : query.AggregatedBooleanExpression) !== null && _d !== void 0 ? _d : query.AggregatedScalarExpression);
-};
+exports.isReactiveQuery = void 0;
 exports.isReactiveQuery = (query) => {
     return !!query.ObservableExpression || !!query.AggregatedBooleanExpression;
 };

package/src/PredefinedConfig/Common/SpecialColumnSettings.d.ts

@@ -1,5 +1,5 @@
 /**
- * Base Settings for SpecialColumns
+ * Base Settings for Calculated Columns and FreeText Columns
  */
 export interface SpecialColumnSettings {
     /**

package/src/PredefinedConfig/Common/Types.d.ts

@@ -27,3 +27,5 @@ export declare type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'Con
 export declare type TypeHint<Base, Literals> = (Base & {
     __subType?: true;
 }) | Literals;
+export declare type AdaptableQLModules = AdaptableQLModule[];
+export declare type AdaptableQLModule = 'Filter' | 'Query';

package/src/PredefinedConfig/Common/Types.js

@@ -41,3 +41,4 @@ exports.ALL_TOOL_PANELS = [
     'SystemStatus',
     'Theme',
 ];
+//  | 'QuickSearch'

package/src/PredefinedConfig/Selection/GridCellRange.d.ts

@@ -1,5 +1,7 @@
 export interface GridCellRange {
     columnIds: string[];
-    primaryKeyValueStart: any;
+    primaryKeyValueStart?: any;
     primaryKeyValueEnd?: any;
+    rowIndexStart?: any;
+    rowIndexEnd?: any;
 }

package/src/Redux/Store/AdaptableReduxMerger.js

@@ -64,7 +64,7 @@ function MergeStateFunction(oldState, newState) {
     }
     // any Module in config that doesn't exist in state will be added
     for (const configModuleName in config) {
-        (_a = state[configModuleName]) !== null && _a !== void 0 ? _a : (state[configModuleName] = config[configModuleName]);
+        state[configModuleName] = (_a = state[configModuleName]) !== null && _a !== void 0 ? _a : config[configModuleName];
     }
     // any Module in state that has an older revision then the config will be replaced
     for (const stateModuleName in state) {

package/src/Redux/Store/AdaptableStore.js

@@ -496,6 +496,21 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 /*******************
                  * SPECIAL COLUMN ACTIONS
                  *******************/
+                case CalculatedColumnRedux.CALCULATED_COLUMN_READY: {
+                    // create aggregated scalar columns at grid startup
+                    const aggregatedCalculatedColumns = adaptable.api.calculatedColumnApi
+                        .getAllCalculatedColumn()
+                        .filter((calculatedColumn) => { var _a; return (_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.AggregatedScalarExpression; });
+                    aggregatedCalculatedColumns.forEach((calculatedColumn) => {
+                        adaptable.api.internalApi
+                            .getCalculatedColumnExpressionService()
+                            .createAggregatedScalarCalculatedColumn(calculatedColumn);
+                    });
+                    // refresh calcualted columns
+                    const aggCalculatedColumnIds = aggregatedCalculatedColumns.map((calculatedColumn) => calculatedColumn.ColumnId);
+                    adaptable.refreshCells(null, aggCalculatedColumnIds, true);
+                    return;
+                }
                 /**
                  * Use Case: We have added / edited / deleted a Special Column (i.e. one not in initial ColumnDefs)
                  * Action: We update the Special ColumnDefs
@@ -504,7 +519,14 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case FreeTextColumnRedux.FREE_TEXT_COLUMN_EDIT:
                 case CalculatedColumnRedux.CALCULATED_COLUMN_ADD:
                 case CalculatedColumnRedux.CALCULATED_COLUMN_EDIT: {
-                    const returnAction = next(action);
+                    const actionTyped = action;
+                    const returnAction = next(actionTyped);
+                    if (returnAction.type === CalculatedColumnRedux.CALCULATED_COLUMN_ADD ||
+                        returnAction.type === CalculatedColumnRedux.CALCULATED_COLUMN_EDIT) {
+                        adaptable.api.internalApi
+                            .getCalculatedColumnExpressionService()
+                            .createAggregatedScalarCalculatedColumn(returnAction.calculatedColumn);
+                    }
                     adaptable.updateColDefsForSpecialColumns();
                     return returnAction;
                 }
@@ -524,7 +546,10 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         }));
                         return;
                     }
-                    const returnAction = next(action);
+                    const returnAction = next(actionTyped);
+                    adaptable.api.internalApi
+                        .getCalculatedColumnExpressionService()
+                        .destroyAggregatedScalarCalculatedColumn(returnAction.calculatedColumn);
                     adaptable.updateColDefsForSpecialColumns();
                     return returnAction;
                 }

package/src/Strategy/AlertModule.js

@@ -20,7 +20,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         super(ModuleConstants.AlertModuleId, 'Alert', 'alert', 'AlertPopup', 'Get notified when things happen in Adaptable that you need to know about', api);
         this.api.internalApi.getDataService().on('DataChanged', (dataChangedInfo) => {
             if (dataChangedInfo.trigger === 'undo' || dataChangedInfo.trigger === 'aggChange') {
-                // do NOT handle reverted changes
+                // do NOT handle reverted or aggregated changes
                 return;
             }
             if (this.api.internalApi.getAdaptableOptions().alertOptions.dataChangeDetectionPolicy ===
@@ -44,7 +44,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.api.alertApi.getAlertDefinitions();
     }
     getExplicitlyReferencedColumnIds(alertDefinition) {
-        const queryExpression = AdaptableQuery_1.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (queryExpression) {
             return this.api.queryLanguageApi.getColumnsFromExpression(queryExpression);
         }
@@ -56,7 +56,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return [];
     }
     getReferencedNamedQueryNames(alertDefinition) {
-        const queryExpression = AdaptableQuery_1.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (!queryExpression) {
             return [];
         }

package/src/Strategy/CalculatedColumnModule.js

@@ -33,12 +33,12 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.api.calculatedColumnApi.editCalculatedColumns(oldCalculatedColumns);
     }
     getExplicitlyReferencedColumnIds(calculatedColumn) {
-        var _a, _b;
-        return ((_b = this.api.queryLanguageApi.getColumnsFromExpression((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression)) !== null && _b !== void 0 ? _b : []);
+        var _a;
+        return ((_a = this.api.queryLanguageApi.getColumnsFromExpression(this.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query))) !== null && _a !== void 0 ? _a : []);
     }
     getReferencedNamedQueryNames(calculatedColumn) {
-        var _a, _b;
-        return ((_b = this.api.queryApi.getReferencedNamedQueryNames((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression)) !== null && _b !== void 0 ? _b : []);
+        var _a;
+        return ((_a = this.api.queryApi.getReferencedNamedQueryNames(this.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query))) !== null && _a !== void 0 ? _a : []);
     }
     addColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {

package/src/Strategy/ChartingModule.d.ts

@@ -1,6 +1,6 @@
-import { AdaptableModuleBase } from '@adaptabletools/adaptable/src/Strategy/AdaptableModuleBase';
-import { IModule } from '@adaptabletools/adaptable/src/Strategy/Interface/IModule';
-import { AdaptableApi } from '@adaptabletools/adaptable/src/Api/AdaptableApi';
+import { IModule } from './Interface/IModule';
+import { AdaptableModuleBase } from './AdaptableModuleBase';
+import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class ChartingModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     isModuleAvailable(): boolean;

package/src/Strategy/ChartingModule.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChartingModule = void 0;
 const tslib_1 = require("tslib");
-const AdaptableModuleBase_1 = require("@adaptabletools/adaptable/src/Strategy/AdaptableModuleBase");
-const ModuleConstants = tslib_1.__importStar(require("@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants"));
+const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
+const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ChartingModuleId, 'Charts', 'chart', 'ChartPopup', 'Create Charts in order to see Adaptable Data visually', api);

package/src/Strategy/FlashingCellModule.js

@@ -42,7 +42,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.api.flashingCellApi.getFlashingCellDefinitions();
     }
     getExplicitlyReferencedColumnIds(alertDefinition) {
-        const queryExpression = AdaptableQuery_1.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (queryExpression) {
             return this.api.queryLanguageApi.getColumnsFromExpression(queryExpression);
         }
@@ -54,7 +54,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return [];
     }
     getReferencedNamedQueryNames(alertDefinition) {
-        const queryExpression = AdaptableQuery_1.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (!queryExpression) {
             return [];
         }

package/src/Strategy/FreeTextColumnModule.js

@@ -27,6 +27,7 @@ class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         for (const freeTextColumn of allFreeTextColumns) {
             if (!freeTextColumn.DataType) {
                 const updatedFreeTextColumn = Object.assign(Object.assign({}, freeTextColumn), { DataType: 'String' });
+                // FIXME AFL add api method to edit multiple columns in one run
                 this.api.freeTextColumnApi.editFreeTextColumn(updatedFreeTextColumn);
             }
         }

package/src/Strategy/Utilities/getAlertPreviewViewItems.js

@@ -13,7 +13,7 @@ exports.getAlertPreviewViewItems = (alert, api) => {
             if (!((_a = alert === null || alert === void 0 ? void 0 : alert.AlertProperties) === null || _a === void 0 ? void 0 : _a.DisplayNotification)) {
                 return React.createElement(Tag_1.Tag, null, alert.MessageType);
             }
-            return React.createElement(AlertDisplayWizardSection_1.AlertPreview, { style: { maxWidth: 400 }, mt: 2, api: api, alertDefinition: alert });
+            return (React.createElement(AlertDisplayWizardSection_1.AlertPreview, { focusFirstButton: false, style: { maxWidth: 400 }, mt: 2, api: api, alertDefinition: alert }));
         },
     };
 };

package/src/Strategy/Utilities/getExpressionViewItems.d.ts

@@ -1,5 +1,5 @@
-import { AdaptableScalarQuery } from '../../PredefinedConfig/Common/AdaptableQuery';
-export declare const getExpressionViewItems: (query: AdaptableScalarQuery) => {
+import { AdaptableCalculatedColumnQuery } from '../../PredefinedConfig/CalculatedColumnState';
+export declare const getExpressionViewItems: (query: AdaptableCalculatedColumnQuery) => {
     name: string;
     values: string[];
 };

package/src/Strategy/Utilities/getExpressionViewItems.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpressionViewItems = void 0;
 exports.getExpressionViewItems = (query) => {
+    var _a;
     return {
         name: 'Expression',
-        values: [query === null || query === void 0 ? void 0 : query.ScalarExpression],
+        values: [(_a = query === null || query === void 0 ? void 0 : query.ScalarExpression) !== null && _a !== void 0 ? _a : query === null || query === void 0 ? void 0 : query.AggregatedScalarExpression],
     };
 };

package/src/Strategy/Utilities/getRuleViewItems.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRuleViewItems = void 0;
-const AdaptableQuery_1 = require("../../PredefinedConfig/Common/AdaptableQuery");
 exports.getRuleViewItems = (rule, api) => {
     return {
         name: 'Condition',
         values: [
             rule.Predicate
                 ? api.predicateApi.predicateToString(rule.Predicate)
-                : AdaptableQuery_1.getAdaptableQueryExpression(rule),
+                : api.queryLanguageApi.getAdaptableQueryExpression(rule),
         ],
     };
 };

package/src/Utilities/Constants/DocumentationLinkConstants.d.ts

@@ -3,7 +3,8 @@ export declare const ExpressionEditorDocsLink: string;
 export declare const BooleanQueryDocsLink: string;
 export declare const ScalarQueryDocsLink: string;
 export declare const ObservableQueryDocsLink: string;
-export declare const AggregationQueryDocsLink: string;
+export declare const AggregatedBooleanQueryDocsLink: string;
+export declare const AggregatedScalarQueryDocsLink: string;
 export declare const PredicateDocsLink: string;
 export declare const PrimaryKeyDocsLink: string;
 export declare const LicenseDocsLink: string;

package/src/Utilities/Constants/DocumentationLinkConstants.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LicenseDocsLink = exports.PrimaryKeyDocsLink = exports.PredicateDocsLink = exports.AggregationQueryDocsLink = exports.ObservableQueryDocsLink = exports.ScalarQueryDocsLink = exports.BooleanQueryDocsLink = exports.ExpressionEditorDocsLink = exports.HOST_URL_DOCS = void 0;
+exports.LicenseDocsLink = exports.PrimaryKeyDocsLink = exports.PredicateDocsLink = exports.AggregatedScalarQueryDocsLink = exports.AggregatedBooleanQueryDocsLink = exports.ObservableQueryDocsLink = exports.ScalarQueryDocsLink = exports.BooleanQueryDocsLink = exports.ExpressionEditorDocsLink = exports.HOST_URL_DOCS = void 0;
 exports.HOST_URL_DOCS = 'https://docs.adaptabletools.com/docs';
 exports.ExpressionEditorDocsLink = `${exports.HOST_URL_DOCS}/adaptableql/expression-editor`;
 exports.BooleanQueryDocsLink = `${exports.HOST_URL_DOCS}/adaptableql/expression/#boolean-expressions`;
 exports.ScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/adaptableql/expression/#scalar-expressions`;
 exports.ObservableQueryDocsLink = `${exports.HOST_URL_DOCS}/adaptableql/expression/#observable-expressions`;
-exports.AggregationQueryDocsLink = `${exports.HOST_URL_DOCS}/adaptableql/expression/#aggregation-expressions`;
+exports.AggregatedBooleanQueryDocsLink = `${exports.HOST_URL_DOCS}/adaptableql/expression/#aggregation-expressions`;
+exports.AggregatedScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/adaptableql/expression/#aggregation-expressions`;
 exports.PredicateDocsLink = `${exports.HOST_URL_DOCS}/adaptableql/predicate`;
 exports.PrimaryKeyDocsLink = `${exports.HOST_URL_DOCS}/key-topics/primary-key`;
 exports.LicenseDocsLink = `${exports.HOST_URL_DOCS}/getting-started/licence`;

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -11,6 +11,7 @@ const observableExpressionFunctions_1 = require("../ExpressionFunctions/observab
 const aggregatedBooleanExpressionFunctions_1 = require("../ExpressionFunctions/aggregatedBooleanExpressionFunctions");
 const AdaptablePredicate_1 = require("../../PredefinedConfig/Common/AdaptablePredicate");
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
+const aggregatedScalarExpressionFunctions_1 = require("../ExpressionFunctions/aggregatedScalarExpressionFunctions");
 exports.DefaultAdaptableOptions = {
     adaptableId: GeneralConstants.ADAPTABLE_ID,
     adaptableStateKey: undefined,
@@ -52,6 +53,21 @@ exports.DefaultAdaptableOptions = {
             BackColor: UIHelper_1.getHexForName(UIHelper_1.GRAY),
         },
     },
+    adaptableQLOptions: {
+        caseSensitiveTextComparisons: false,
+        externallyEvaluatedModules: [],
+        expressionOptions: {
+            defaultBooleanFunctions: booleanExpressionFunctions_1.booleanExpressionFunctions,
+            defaultScalarFunctions: scalarExpressionFunctions_1.scalarExpressionFunctions,
+            defaultObservableFunctions: observableExpressionFunctions_1.observableExpressionFunctions,
+            defaultAggregatedBooleanFunctions: aggregatedBooleanExpressionFunctions_1.aggregatedBooleanExpressionFunctions,
+            defaultAggregatedScalarFunctions: aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions,
+            moduleExpressionFunctions: undefined,
+            queryableColumns: undefined,
+            performExpressionValidation: true,
+            maxTimeframeSize: 28800000,
+        },
+    },
     containerOptions: {
         adaptableContainer: 'adaptable',
         agGridContainer: 'grid',
@@ -107,7 +123,6 @@ exports.DefaultAdaptableOptions = {
         currentCalendar: 'United Kingdom',
         cellSummaryOperations: undefined,
         customSortComparers: undefined,
-        caseSensitiveTextComparisons: false,
     },
     layoutOptions: {
         includeExpandedRowGroups: false,
@@ -155,7 +170,6 @@ exports.DefaultAdaptableOptions = {
     },
     searchOptions: {
         excludeColumnFromQuickSearch: undefined,
-        serverSearchOptions: undefined,
         clearSearchesOnStartUp: false,
         quickSearchPlaceholder: 'Search',
         filterResultsAfterQuickSearch: false,
@@ -208,16 +222,6 @@ exports.DefaultAdaptableOptions = {
         maxWidth: undefined,
         toolPanelOrder: ['filters', 'columns', 'adaptable'],
     },
-    queryLanguageOptions: {
-        defaultBooleanFunctions: booleanExpressionFunctions_1.booleanExpressionFunctions,
-        defaultScalarFunctions: scalarExpressionFunctions_1.scalarExpressionFunctions,
-        defaultObservableFunctions: observableExpressionFunctions_1.observableExpressionFunctions,
-        defaultAggregatedBooleanFunctions: aggregatedBooleanExpressionFunctions_1.aggregatedBooleanExpressionFunctions,
-        moduleExpressionFunctions: undefined,
-        queryableColumns: undefined,
-        performExpressionValidation: true,
-        maxTimeframeSize: 28800000,
-    },
     dataChangeHistoryOptions: {
         activeByDefault: false,
         showDataChange: undefined,

package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.js

@@ -46,7 +46,7 @@ exports.aggregatedBooleanExpressionFunctions = {
         handler(args, context) {
             return expressionFunctionUtils_1.handleColumnFunction(args, context);
         },
-        description: 'References a grid column by name',
+        description: 'References a column by its unique identifier',
         signatures: ['[colName]', 'COL(name: string)'],
         examples: ['[col1]', "COL('col1')"],
     },

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.d.ts

@@ -1,7 +1,24 @@
 import { ExpressionFunction } from '../../parser/src/types';
 import { BaseParameter } from './expressionFunctionUtils';
-export declare type AggregatedScalarFunctionName = 'CUMSUM' | 'OVER' | 'COL';
+import { RowNode } from '@ag-grid-community/all-modules';
+import { AggregateParams } from './scalarAggregationHelper';
+export declare type AggregatedScalarFunctionName = AggregationFunction | OperandFunction;
+declare type AggregationFunction = 'SUM' | 'PERCENTAGE' | 'AVG' | 'MIN' | 'MAX' | 'CUMUL';
+declare type OperandFunction = 'COL' | 'OVER' | 'GROUP_BY';
+export interface AggregationParameter extends BaseParameter<'aggregation', AggregationFunction> {
+    value: AggregatedScalarExpressionEvaluation;
+}
 export interface OverParameter extends BaseParameter<'operand', 'OVER'> {
     value: string;
 }
+export interface GroupByParameter extends BaseParameter<'operand', 'GROUP_BY'> {
+    value: string;
+}
+export interface AggregatedScalarExpressionEvaluation {
+    aggregationParams: AggregateParams<any, string | number>;
+    rowValueGetter?: (rowNode: RowNode, aggregationValue: number) => string | number | Date | boolean;
+    columnDependencies: string[];
+    cumulateOver?: string;
+}
 export declare const aggregatedScalarExpressionFunctions: Record<AggregatedScalarFunctionName, ExpressionFunction>;
+export {};