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

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -38,6 +38,7 @@ const DataChangeHistoryApiImpl_1 = require("./DataChangeHistoryApiImpl");
 const QueryLanguageApiImpl_1 = require("./QueryLanguageApiImpl");
 const FlashingCellApiImpl_1 = require("./FlashingCellApiImpl");
 const ChartingApiImpl_1 = require("./ChartingApiImpl");
+const SettingsPanelApiImpl_1 = require("./SettingsPanelApiImpl");
 class AdaptableApiImpl {
     constructor(adaptable) {
         this.adaptable = adaptable;
@@ -69,6 +70,7 @@ class AdaptableApiImpl {
         this.smartEditApi = new SmartEditApiImpl_1.SmartEditApiImpl(adaptable);
         this.filterApi = new FilterApiImpl_1.FilterApiImpl(adaptable);
         this.systemStatusApi = new SystemStatusApiImpl_1.SystemStatusApiImpl(adaptable);
+        this.settingsPanelApi = new SettingsPanelApiImpl_1.SettingsPanelApiImpl(adaptable);
         this.themeApi = new ThemeApiImpl_1.ThemeApiImpl(adaptable);
         this.userInterfaceApi = new UserInterfaceApiImpl_1.UserInterfaceApiImpl(adaptable);
         this.queryApi = new QueryApiImpl_1.QueryApiImpl(adaptable);

package/src/Api/Implementation/AlertApiImpl.d.ts

@@ -6,8 +6,7 @@ import { AdaptableScope } from '../../PredefinedConfig/Common/AdaptableScope';
 import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableForm, AdaptableFormData } from '../../PredefinedConfig/Common/AdaptableForm';
-import { AlertButtonContext } from '../../AdaptableOptions/NotificationsOptions';
-import { AdaptableMessageType } from '../../types';
+import { AdaptableMessageType, AlertButtonContext } from '../../types';
 export declare class AlertApiImpl extends ApiBase implements AlertApi {
     getAlertState(): AlertState;
     getAdaptableFormByName(name: string): AdaptableForm<AlertButtonContext> | undefined;

package/src/Api/Implementation/AlertApiImpl.js

@@ -16,7 +16,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
     }
     getAdaptableFormByName(name) {
         var _a;
-        const alertForms = this.getNotificationsOptions().alertForms || [];
+        const alertForms = this.getAlertOptions().alertForms || [];
         return (_a = alertForms.find((f) => f.name === name)) === null || _a === void 0 ? void 0 : _a.form;
     }
     getAlertDefinitions() {
@@ -57,7 +57,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             }
             actions.forEach((action) => {
                 var _a;
-                const buttonOnClick = (_a = this.getNotificationsOptions().actionHandlers) === null || _a === void 0 ? void 0 : _a.find((x) => x.name === action);
+                const buttonOnClick = (_a = this.getAlertOptions().actionHandlers) === null || _a === void 0 ? void 0 : _a.find((x) => x.name === action);
                 buttonOnClick === null || buttonOnClick === void 0 ? void 0 : buttonOnClick.handler(button, context);
                 this.adaptable.api.alertApi.executeAlertAction(action, {
                     alertDefinition: context.alert.alertDefinition,
@@ -79,10 +79,13 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             switch (highhlightType) {
                 case 'Error':
                     backgroundColor = 'var(--ab-color-error)';
+                    break;
                 case 'Info':
                     backgroundColor = 'var(--ab-color-info)';
+                    break;
                 case 'Success':
                     backgroundColor = 'var(--ab-color-success)';
+                    break;
                 case 'Warning':
                     backgroundColor = 'var(--ab-color-warn)';
             }
@@ -92,7 +95,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
                 highlightStyle: {
                     BackColor: backgroundColor,
                 },
-                timeout: this.getNotificationsOptions().cellHighlightDuration,
+                timeout: this.getAlertOptions().cellHighlightDuration,
             });
             return;
         }
@@ -132,9 +135,12 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         // 3 things we always do with an alert are:
         // 1. Dispatch the Alert (so it appears in the toolbar)
         this.addUidToAdaptableObject(alertToShow);
-        this.dispatchAction(SystemRedux.SystemAlertAdd(alertToShow, this.getNotificationsOptions().maxAlertsInStore));
+        this.dispatchAction(SystemRedux.SystemAlertAdd(alertToShow, this.getAlertOptions().maxAlertsInStore));
         // 2. Publish the Alert Fired Event
-        const alertFiredInfo = { adaptableApi: this.adaptable.api, alert: alertToShow };
+        const alertFiredInfo = {
+            adaptableApi: this.adaptable.api,
+            alert: alertToShow,
+        };
         const results = await this.adaptable.api.eventApi.emit('AlertFired', alertFiredInfo);
         const showPopup = results.reduce((endResult, aResult) => {
             return endResult && aResult !== false;
@@ -175,7 +181,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
                     this.adaptable.api.gridApi.refreshCells([alertNode], [dataChangedInfo.column.columnId]);
                     setTimeout(() => {
                         this.dispatchAction(SystemRedux.SystemAlertRemoveHighlight(alertToShow));
-                    }, this.adaptable.adaptableOptions.notificationsOptions.cellHighlightDuration);
+                    }, this.adaptable.adaptableOptions.alertOptions.cellHighlightDuration);
                 }
             }
             if (alertProperties.HighlightRow && dataChangedInfo) {
@@ -187,7 +193,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
                     this.adaptable.api.gridApi.refreshRowNode(alertNode);
                     setTimeout(() => {
                         this.dispatchAction(SystemRedux.SystemAlertRemoveHighlight(alertToShow));
-                    }, this.adaptable.adaptableOptions.notificationsOptions.cellHighlightDuration);
+                    }, this.adaptable.adaptableOptions.alertOptions.cellHighlightDuration);
                 }
             }
             if (alertProperties.LogToConsole) {
@@ -196,7 +202,10 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         }
     }
     publishAlertFiredEvent(alertToFire) {
-        const alertFiredInfo = { adaptableApi: this.adaptable.api, alert: alertToFire };
+        const alertFiredInfo = {
+            adaptableApi: this.adaptable.api,
+            alert: alertToFire,
+        };
         this.adaptable.api.eventApi.emit('AlertFired', alertFiredInfo);
     }
     displayMessageAlertPopup(alertToDisplayAsPopup) {
@@ -242,7 +251,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
     }
     getAlertDescription(alertDefinition, dataChangedInfo) {
         var _a;
-        const alertMessageFunction = (_a = this.adaptable.adaptableOptions.notificationsOptions) === null || _a === void 0 ? void 0 : _a.alertMessageText;
+        const alertMessageFunction = (_a = this.adaptable.adaptableOptions.alertOptions) === null || _a === void 0 ? void 0 : _a.alertMessageText;
         if (alertMessageFunction) {
             const returnText = alertMessageFunction(alertDefinition, dataChangedInfo);
             if (returnText) {
@@ -260,7 +269,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         var _a, _b;
         let ruleDescription = alert.Rule.Predicate
             ? this.adaptable.api.predicateApi.predicateToString(alert.Rule.Predicate)
-            : (_b = (_a = alert.Rule.BooleanExpression) !== null && _a !== void 0 ? _a : alert.Rule.ObservableExpression) !== null && _b !== void 0 ? _b : alert.Rule.AggregationExpression;
+            : (_b = (_a = alert.Rule.BooleanExpression) !== null && _a !== void 0 ? _a : alert.Rule.ObservableExpression) !== null && _b !== void 0 ? _b : alert.Rule.AggregatedBooleanExpression;
         return ruleDescription;
     }
 }

package/src/Api/Implementation/ApiBase.d.ts

@@ -11,7 +11,8 @@ import { ContainerOptions, DashboardOptions, EditOptions, FilterOptions, General
 import { NotificationsOptions } from '../../AdaptableOptions/NotificationsOptions';
 import { ToolPanelOptions } from '../../AdaptableOptions/ToolPanelOptions';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
-import { QueryLanguageOptions } from '../../AdaptableOptions/QueryLanguageOptions';
+import { AdaptableQLOptions, ExpressionOptions } from '../../AdaptableOptions/AdaptableQLOptions';
+import { AlertOptions } from '../../AdaptableOptions/AlertOptions';
 export declare abstract class ApiBase {
     protected adaptable: IAdaptable;
     /**
@@ -46,6 +47,7 @@ export declare abstract class ApiBase {
     protected getOptions(): AdaptableOptions;
     protected getContainerOptions(): ContainerOptions;
     protected getNotificationsOptions(): NotificationsOptions;
+    protected getAlertOptions(): AlertOptions;
     protected getDashboardOptions(): DashboardOptions;
     protected getEditOptions(): EditOptions;
     protected getExportOptions(): ExportOptions;
@@ -53,11 +55,12 @@ export declare abstract class ApiBase {
     protected getLayoutOptions(): LayoutOptions;
     protected getMenuOptions(): MenuOptions;
     protected getFilterOptions(): FilterOptions;
+    protected getAdaptableQLOptions(): AdaptableQLOptions;
     protected getSearchOptions(): SearchOptions;
     protected getStateOptions(): StateOptions;
     protected getTeamSharingOptions(): TeamSharingOptions;
     protected getUserInterfaceOptions(): UserInterfaceOptions;
     protected getToolPanelOptions(): ToolPanelOptions;
-    protected getQueryLanguageOptions(): QueryLanguageOptions;
+    protected getExpressionOptions(): ExpressionOptions;
     protected getAdaptableApi(): AdaptableApi;
 }

package/src/Api/Implementation/ApiBase.js

@@ -77,6 +77,9 @@ class ApiBase {
     getNotificationsOptions() {
         return this.getOptions().notificationsOptions;
     }
+    getAlertOptions() {
+        return this.getOptions().alertOptions;
+    }
     getDashboardOptions() {
         return this.getOptions().dashboardOptions;
     }
@@ -98,6 +101,9 @@ class ApiBase {
     getFilterOptions() {
         return this.getOptions().filterOptions;
     }
+    getAdaptableQLOptions() {
+        return this.getOptions().adaptableQLOptions;
+    }
     getSearchOptions() {
         return this.getOptions().searchOptions;
     }
@@ -113,8 +119,8 @@ class ApiBase {
     getToolPanelOptions() {
         return this.getOptions().toolPanelOptions;
     }
-    getQueryLanguageOptions() {
-        return this.getOptions().queryLanguageOptions;
+    getExpressionOptions() {
+        return this.getAdaptableQLOptions().expressionOptions;
     }
     getAdaptableApi() {
         return this.adaptable.api;

package/src/Api/Implementation/CalculatedColumnApiImpl.js

@@ -29,6 +29,7 @@ class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getCalculatedColumnById(calculatedColumn.Uuid);
     }
     editCalculatedColumns(calculatedColumns) {
+        // FIXME AFL extend Redux to handle all the edits in one run
         calculatedColumns.forEach((cc) => {
             this.editCalculatedColumn(cc);
         });
@@ -63,16 +64,14 @@ class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
     getCalculatedColumnsReferencingColumnId(columnId) {
         var calcColumns = [];
         this.getAllCalculatedColumn().forEach((calculatedColumn) => {
-            var _a;
-            if (this.adaptable.api.columnApi.isColumnReferencedInExpression(columnId, (_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression)) {
+            if (this.adaptable.api.columnApi.isColumnReferencedInExpression(columnId, this.adaptable.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query))) {
                 calcColumns.push(calculatedColumn);
             }
         });
         return calcColumns;
     }
     getReferencedColumnIdsForCalculatedColumn(calculatedColumn) {
-        var _a;
-        const columnIds = this.adaptable.api.queryLanguageApi.getColumnsFromExpression((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression);
+        const columnIds = this.adaptable.api.queryLanguageApi.getColumnsFromExpression(this.adaptable.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query));
         return columnIds;
     }
     getReferencedColumnIdsForCalculatedColumnId(calculatedColumnId) {

package/src/Api/Implementation/ColumnApiImpl.d.ts

@@ -42,7 +42,6 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getColumnFromFriendlyName(columnName: string, logWarning?: boolean): AdaptableColumn;
     getColumnsOfType(dataType: DataType): AdaptableColumn[];
     getNumericColumns(): AdaptableColumn[];
-    getNumericArrayColumns(): AdaptableColumn[];
     getStringColumns(): AdaptableColumn[];
     getDateColumns(): AdaptableColumn[];
     getBooleanColumns(): AdaptableColumn[];

package/src/Api/Implementation/ColumnApiImpl.js

@@ -224,8 +224,6 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
                 return this.getDateColumns();
             case Enums_1.DataType.Number:
                 return this.getNumericColumns();
-            case Enums_1.DataType.NumberArray:
-                return this.getNumericArrayColumns();
             case Enums_1.DataType.String:
                 return this.getStringColumns();
             default:
@@ -235,9 +233,6 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     getNumericColumns() {
         return this.getColumns().filter((c) => c.dataType == Enums_1.DataType.Number);
     }
-    getNumericArrayColumns() {
-        return this.getColumns().filter((c) => c.dataType == Enums_1.DataType.NumberArray);
-    }
     getStringColumns() {
         return this.getColumns().filter((c) => c.dataType == Enums_1.DataType.String);
     }

package/src/Api/Implementation/FreeTextColumnApiImpl.d.ts

@@ -13,11 +13,6 @@ export declare class FreeTextColumnApiImpl extends ApiBase implements FreeTextCo
     }): FreeTextColumn;
     addEditFreeTextColumnStoredValue(freeTextColumn: FreeTextColumn, storedValue: FreeTextStoredValue): FreeTextColumn;
     addStoredValuesToFreeTextColumn(columnId: string, storedValues: FreeTextStoredValue[], replaceAction: 'All' | 'Conflicting' | 'None'): void;
-    createFreeTextColumn({ columnName, columnId, defaultValue, }: {
-        columnId: string;
-        columnName?: string;
-        defaultValue: string;
-    }): FreeTextColumn;
     deleteFreeTextColumn(columnId: string): void;
     showFreeTextColumnPopup(): void;
     getFreeTextColumnValueFromRowNode(freeTextColumn: FreeTextColumn, rowNode: RowNode): any;

package/src/Api/Implementation/FreeTextColumnApiImpl.js

@@ -4,7 +4,6 @@ exports.FreeTextColumnApiImpl = void 0;
 const tslib_1 = require("tslib");
 const FreeTextColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FreeTextColumnRedux"));
 const ApiBase_1 = require("./ApiBase");
-const ObjectFactory_1 = require("../../Utilities/ObjectFactory");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
@@ -67,14 +66,6 @@ class FreeTextColumnApiImpl extends ApiBase_1.ApiBase {
             this.dispatchAction(FreeTextColumnRedux.FreeTextColumnEdit(freeTextColumn));
         }
     }
-    createFreeTextColumn({ columnName, columnId, defaultValue = null, }) {
-        let freeTextColumn = ObjectFactory_1.ObjectFactory.CreateEmptyFreeTextColumn(this.adaptable.api.internalApi.getAdaptableOptions().filterOptions
-            .enableFilterOnSpecialColumns);
-        freeTextColumn.ColumnId = columnId;
-        freeTextColumn.FriendlyName = columnName || columnId;
-        freeTextColumn.DefaultValue = defaultValue;
-        return this.addFreeTextColumn(freeTextColumn);
-    }
     deleteFreeTextColumn(columnId) {
         let freeTextColumn = this.getAllFreeTextColumn().find((ftc) => ftc.ColumnId == columnId);
         if (this.checkItemExists(freeTextColumn, columnId, ModuleConstants.FreeTextColumnModuleId)) {

package/src/Api/Implementation/GridApiImpl.d.ts

@@ -7,7 +7,8 @@ import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
 import { DataUpdateConfig } from '../../PredefinedConfig/Common/DataUpdateConfig';
 import { DataChangedInfo, AccessLevel, AdaptableModule } from '../../types';
-import { CellHighlightInfo, RowHighlightInfo } from '../../PredefinedConfig/Common/CellHighlightInfo';
+import { CellHighlightInfo } from '../../PredefinedConfig/Common/CellHighlightInfo';
+import { RowHighlightInfo } from '../../PredefinedConfig/Common/RowHighlightInfo';
 import { GridOptions, RowNode } from '@ag-grid-community/all-modules';
 import { GridCellRange } from '../../PredefinedConfig/Selection/GridCellRange';
 export declare class GridApiImpl extends ApiBase implements GridApi {
@@ -50,6 +51,8 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     deSelectNode(rowNode: RowNode, clearSelection: boolean): void;
     deSelectNodes(rowNodes: RowNode[], clearSelection: boolean): void;
     selectCellRange(gridCellRange: GridCellRange): void;
+    selectColumn(columnId: string): void;
+    selectColumns(columnIds: string[]): void;
     getFirstRowNode(): RowNode;
     getVisibleRowNodes(): RowNode[];
     getGridCellFromRowNode(rowwNode: RowNode, columnId: string): GridCell | undefined;

package/src/Api/Implementation/GridApiImpl.js

@@ -149,14 +149,37 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.deSelectNodes(rowNodes, clearSelection);
     }
     selectCellRange(gridCellRange) {
-        const startNode = this.adaptable.getRowNodeForPrimaryKey(gridCellRange.primaryKeyValueStart);
-        const endNode = gridCellRange.primaryKeyValueEnd
-            ? this.adaptable.getRowNodeForPrimaryKey(gridCellRange.primaryKeyValueEnd)
-            : startNode;
+        if (gridCellRange == undefined) {
+            return;
+        }
+        if (gridCellRange.primaryKeyValueStart == undefined &&
+            gridCellRange.rowIndexStart == undefined) {
+            return;
+        }
+        let startNode;
+        let endNode;
+        startNode = gridCellRange.primaryKeyValueEnd
+            ? this.adaptable.getRowNodeForPrimaryKey(gridCellRange.primaryKeyValueStart)
+            : this.adaptable.getRowNodeByIndex(gridCellRange.rowIndexStart);
+        if (gridCellRange.primaryKeyValueEnd) {
+            endNode = this.adaptable.getRowNodeForPrimaryKey(gridCellRange.primaryKeyValueEnd);
+        }
+        else if (gridCellRange.rowIndexEnd) {
+            endNode = this.adaptable.getRowNodeByIndex(gridCellRange.rowIndexEnd);
+        }
+        else {
+            endNode = startNode;
+        }
         if (startNode && endNode) {
             this.adaptable.selectCells(gridCellRange.columnIds, startNode, endNode);
         }
     }
+    selectColumn(columnId) {
+        this.selectColumns([columnId]);
+    }
+    selectColumns(columnIds) {
+        this.adaptable.api.columnApi.selectColumns(columnIds);
+    }
     getFirstRowNode() {
         return this.adaptable.getFirstRowNode();
     }

package/src/Api/Implementation/InternalApiImpl.d.ts

@@ -8,7 +8,7 @@ import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableMenuItem } from '../../PredefinedConfig/Common/Menu';
 import { SelectedCellInfo } from '../../PredefinedConfig/Selection/SelectedCellInfo';
 import { SelectedRowInfo } from '../../PredefinedConfig/Selection/SelectedRowInfo';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
+import { AdaptableModule, AdaptableQLModule } from '../../PredefinedConfig/Common/Types';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 import { DataChangedInfo } from '../../PredefinedConfig/Common/DataChangedInfo';
 import { AdaptableOptions, AdaptableState, AlertButtonContext, Layout, SystemStatusMessageInfo } from '../../types';
@@ -16,7 +16,6 @@ import { IValidationService } from '../../Utilities/Services/Interface/IValidati
 import { IModuleService } from '../../Utilities/Services/Interface/IModuleService';
 import { IReportService } from '../../Utilities/Services/Interface/IReportService';
 import { ICalculatedColumnExpressionService } from '../../Utilities/Services/Interface/ICalculatedColumnExpressionService';
-import { ServerSearchOption } from '../../AdaptableOptions/SearchOptions';
 import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { IDataService } from '../../Utilities/Services/Interface/IDataService';
@@ -90,7 +89,7 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     getTeamSharingService(): ITeamSharingService;
     getMetamodelService(): IMetamodelService;
     getModuleFriendlyName(adaptableModule: AdaptableModule): string;
-    isServerSearchOptionSet(serverSearchOption: ServerSearchOption): boolean;
+    runModuleInAdaptableQL(adaptableQLModule: AdaptableQLModule): boolean;
     buildStandaloneColumnHeader(column: AdaptableColumn): AdaptableMenuItem[];
     clearFlashingCellState(): void;
     clearUpdatedRowState(): void;

package/src/Api/Implementation/InternalApiImpl.js

@@ -25,7 +25,7 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         let adaptableAlertForm;
         let isActionForm = false;
         if (typeof alertForm === 'string') {
-            const alertForms = this.getNotificationsOptions().alertForms || [];
+            const alertForms = this.getAlertOptions().alertForms || [];
             adaptableAlertForm = (_a = alertForms.find((f) => f.name === alertForm)) === null || _a === void 0 ? void 0 : _a.form;
         }
         else {
@@ -68,7 +68,7 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         const forPrimaryKey = (_a = AdaptableFlashingAlerts[primaryKey]) !== null && _a !== void 0 ? _a : {};
         const toFlashingAlert = (uuid) => { var _a; return uuid ? (_a = AdaptableFlashingAlertsMap[uuid]) !== null && _a !== void 0 ? _a : null : null; };
         if (!columnId) {
-            return toFlashingAlert(forPrimaryKey[SystemRedux_1.FLASHING_ALERT_ROW_KEY]);
+            return toFlashingAlert(forPrimaryKey[SystemRedux_1.FLASHING_CELL_ROW_KEY]);
         }
         return toFlashingAlert(forPrimaryKey[columnId]);
     }
@@ -238,9 +238,9 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         var _a, _b;
         return ((_b = (_a = this.adaptable.ModuleService.getModuleInfoByModule(adaptableModule)) === null || _a === void 0 ? void 0 : _a.FriendlyName) !== null && _b !== void 0 ? _b : adaptableModule);
     }
-    isServerSearchOptionSet(serverSearchOption) {
-        const serverSearchOptions = this.getSearchOptions().serverSearchOptions;
-        return serverSearchOptions != undefined && serverSearchOptions.includes(serverSearchOption);
+    runModuleInAdaptableQL(adaptableQLModule) {
+        const adaptableQLModules = this.getAdaptableQLOptions().externallyEvaluatedModules;
+        return !adaptableQLModules.includes(adaptableQLModule);
     }
     buildStandaloneColumnHeader(column) {
         return this.adaptable.buildStandaloneColumnHeader(column);
@@ -310,6 +310,7 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
                 .forEach((calculatedColumn) => {
                 firstRowData[calculatedColumn.ColumnId] = this.adaptable.api.gridApi.getCellRawValue(firstRowPrimaryKeyValue, calculatedColumn.ColumnId);
             });
+            // FIXME AFL shouldn't here be also the FreeTextColumn??
         }
         return firstRowData;
     }
@@ -379,7 +380,7 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         }
     }
     isTextComparisonCaseSensitive() {
-        return this.adaptable.adaptableOptions.generalOptions.caseSensitiveTextComparisons;
+        return this.adaptable.adaptableOptions.adaptableQLOptions.caseSensitiveTextComparisons;
     }
     executeWithProgressIndicator(label, executeFn) {
         this.dispatchReduxAction(SystemRedux_1.SystemProgressIndicatorShow(label));

package/src/Api/Implementation/LayoutApiImpl.d.ts

@@ -1,6 +1,7 @@
 import { ApiBase } from './ApiBase';
 import { LayoutApi } from '../LayoutApi';
 import { LayoutState, Layout } from '../../PredefinedConfig/LayoutState';
+import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     getLayoutState(): LayoutState;
     shouldAutoSaveLayout: (layout?: Layout) => boolean;
@@ -27,6 +28,7 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     getLayoutDescription(layout: Layout): string;
     private getColumnSort;
     createDefaultLayoutIfNeeded(): Layout | null;
+    showChangeColumnCaption(column: AdaptableColumn): void;
     showLayoutPopup(): void;
     isCurrentLayoutReadOnly(): boolean;
 }

package/src/Api/Implementation/LayoutApiImpl.js

@@ -14,6 +14,8 @@ const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const ArrayExtensions_1 = require("../../Utilities/Extensions/ArrayExtensions");
+const PopupRedux_1 = require("../../Redux/ActionsReducers/PopupRedux");
+const LayoutRedux_1 = require("../../Redux/ActionsReducers/LayoutRedux");
 class LayoutApiImpl extends ApiBase_1.ApiBase {
     constructor() {
         super(...arguments);
@@ -229,6 +231,15 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
             }
         }
     }
+    showChangeColumnCaption(column) {
+        this.dispatchAction(PopupRedux_1.PopupShowPrompt({
+            Header: `Change caption for '${column.friendlyName}'`,
+            Msg: '',
+            DefaultValue: column.friendlyName,
+            ConfirmActionCreator: (inputText) => inputText !== column.friendlyName &&
+                LayoutRedux_1.LayoutSetColumnCaption(this.getCurrentLayoutName(), column.columnId, inputText),
+        }));
+    }
     showLayoutPopup() {
         this.showModulePopup(ModuleConstants.LayoutModuleId);
     }

package/src/Api/Implementation/QueryApiImpl.js

@@ -25,7 +25,10 @@ class QueryApiImpl extends ApiBase_1.ApiBase {
         // check that there is no other existing named query with the same name
         const duplicate = this.getAllNamedQuery().find((q) => q.Name === namedQuery.Name && q.Uuid !== namedQuery.Uuid);
         if (duplicate) {
-            return { valid: false, message: 'A Named Query already exists with that name' };
+            return {
+                valid: false,
+                message: 'A Named Query already exists with that name',
+            };
         }
         return { valid: true, message: '' };
     }

package/src/Api/Implementation/QueryLanguageApiImpl.d.ts

@@ -2,12 +2,15 @@ import { ApiBase } from './ApiBase';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { QueryLanguageApi } from '../QueryLanguageApi';
 import { ExpressionFunctionMap } from '../../types';
+import { AdaptableQuery } from '../../PredefinedConfig/Common/AdaptableQuery';
 export declare class QueryLanguageApiImpl extends ApiBase implements QueryLanguageApi {
     isValidBooleanExpression(query: string, module: AdaptableModule, validationErrorMessage?: string): boolean;
     isValidObservableExpression(expression: string, module: AdaptableModule, validationErrorMessage?: string): boolean;
-    isValidAggregationExpression(expression: string, module: AdaptableModule, validationErrorMessage?: string): boolean;
+    isValidAggregatedBooleanExpression(expression: string, module: AdaptableModule, validationErrorMessage?: string): boolean;
+    isValidAggregatedScalarExpression(expression: string, module: AdaptableModule, validationErrorMessage?: string): boolean;
     getASTForExpression(query: string): any;
     getColumnsFromExpression(expression: string): string[];
     getQueryableColumnIds(): string[] | undefined;
     getModuleExpressionFunctionMap(): ExpressionFunctionMap;
+    getAdaptableQueryExpression(query: Partial<AdaptableQuery>): string | undefined;
 }

package/src/Api/Implementation/QueryLanguageApiImpl.js

@@ -8,7 +8,7 @@ const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Exten
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
     isValidBooleanExpression(query, module, validationErrorMessage) {
-        const { isValid, errorMessage, } = this.adaptable.api.internalApi
+        const { isValid, errorMessage } = this.adaptable.api.internalApi
             .getQueryLanguageService()
             .validateBoolean(query, module, { force: true });
         if (!isValid && validationErrorMessage) {
@@ -17,7 +17,7 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
         return isValid;
     }
     isValidObservableExpression(expression, module, validationErrorMessage) {
-        const { isValid, errorMessage, } = this.adaptable.api.internalApi
+        const { isValid, errorMessage } = this.adaptable.api.internalApi
             .getQueryLanguageService()
             .validateObservable(expression, module);
         if (!isValid && validationErrorMessage) {
@@ -25,10 +25,19 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
         }
         return isValid;
     }
-    isValidAggregationExpression(expression, module, validationErrorMessage) {
-        const { isValid, errorMessage, } = this.adaptable.api.internalApi
+    isValidAggregatedBooleanExpression(expression, module, validationErrorMessage) {
+        const { isValid, errorMessage } = this.adaptable.api.internalApi
             .getQueryLanguageService()
-            .validateAggregation(expression, module);
+            .validateAggregatedBoolean(expression, module);
+        if (!isValid && validationErrorMessage) {
+            LoggingHelper_1.LogAdaptableWarning(`${validationErrorMessage} :: ${errorMessage}`);
+        }
+        return isValid;
+    }
+    isValidAggregatedScalarExpression(expression, module, validationErrorMessage) {
+        const { isValid, errorMessage } = this.adaptable.api.internalApi
+            .getQueryLanguageService()
+            .validateAggregatedScalar(expression, module);
         if (!isValid && validationErrorMessage) {
             LoggingHelper_1.LogAdaptableWarning(`${validationErrorMessage} :: ${errorMessage}`);
         }
@@ -51,8 +60,7 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
         }
     }
     getQueryableColumnIds() {
-        let queryableColumns = this.getQueryLanguageOptions()
-            .queryableColumns;
+        let queryableColumns = this.getExpressionOptions().queryableColumns;
         if (!queryableColumns) {
             return undefined;
         }
@@ -68,7 +76,11 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
         }
     }
     getModuleExpressionFunctionMap() {
-        return this.getQueryLanguageOptions().moduleExpressionFunctions;
+        return this.getExpressionOptions().moduleExpressionFunctions;
+    }
+    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.QueryLanguageApiImpl = QueryLanguageApiImpl;

package/src/Api/Implementation/SettingsPanelApiImpl.d.ts

@@ -0,0 +1,7 @@
+import { SettingsPanelApi } from '../SettingsPanelApi';
+import { ApiBase } from './ApiBase';
+import { AdaptableModule } from '../../../types';
+export declare class SettingsPanelApiImpl extends ApiBase implements SettingsPanelApi {
+    showSettingsPanel(moduleName?: AdaptableModule): void;
+    showCustomSettingsPanel(name: string): void;
+}

package/src/Api/Implementation/SettingsPanelApiImpl.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SettingsPanelApiImpl = void 0;
+const tslib_1 = require("tslib");
+const ApiBase_1 = require("./ApiBase");
+const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
+class SettingsPanelApiImpl extends ApiBase_1.ApiBase {
+    showSettingsPanel(moduleName) {
+        this.dispatchAction(PopupRedux.PopupShowScreen(moduleName));
+    }
+    showCustomSettingsPanel(name) {
+        this.dispatchAction(PopupRedux.PopupShowScreen('CustomSettingsPanelModule', name));
+    }
+}
+exports.SettingsPanelApiImpl = SettingsPanelApiImpl;

package/src/Api/InternalApi.d.ts

@@ -6,7 +6,7 @@ import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
 import { SelectedCellInfo } from '../PredefinedConfig/Selection/SelectedCellInfo';
 import { SelectedRowInfo } from '../PredefinedConfig/Selection/SelectedRowInfo';
-import { AdaptableModule } from '../PredefinedConfig/Common/Types';
+import { AdaptableModule, AdaptableQLModule } from '../PredefinedConfig/Common/Types';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 import { IAdaptable } from '../AdaptableInterfaces/IAdaptable';
 import { IValidationService } from '../Utilities/Services/Interface/IValidationService';
@@ -15,7 +15,6 @@ import { IReportService } from '../Utilities/Services/Interface/IReportService';
 import { ICalculatedColumnExpressionService } from '../Utilities/Services/Interface/ICalculatedColumnExpressionService';
 import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
 import { Layout } from '../PredefinedConfig/LayoutState';
-import { ServerSearchOption } from '../AdaptableOptions/SearchOptions';
 import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { IDataService } from '../Utilities/Services/Interface/IDataService';
 import { AdaptableMessageType, DataChangedInfo, SystemStatusMessageInfo } from '../types';
@@ -94,7 +93,7 @@ export interface InternalApi {
     getTeamSharingService(): ITeamSharingService;
     getMetamodelService(): IMetamodelService;
     getModuleFriendlyName(adaptableModule: AdaptableModule): string;
-    isServerSearchOptionSet(serverSearchOption: ServerSearchOption): boolean;
+    runModuleInAdaptableQL(adaptableQLModule: AdaptableQLModule): boolean;
     buildStandaloneColumnHeader(column: AdaptableColumn): AdaptableMenuItem[];
     getCustomSortComparer(column: AdaptableColumn): ColumnValuesComparer | undefined;
     clearFlashingCellState(): void;

package/src/Api/LayoutApi.d.ts

@@ -1,3 +1,4 @@
+import { AdaptableColumn } from '../../types';
 import { LayoutState, Layout } from '../PredefinedConfig/LayoutState';
 /**
  * Provides run-time access to the Layout Module and associated state
@@ -128,4 +129,10 @@ export interface LayoutApi {
      */
     setColumnCaption(columnId: string, caption: string): void;
     isCurrentLayoutReadOnly(): boolean;
+    /**
+     * Opens change column caption popup
+     *
+     * @param column AdaptableColumn
+     */
+    showChangeColumnCaption(column: AdaptableColumn): void;
 }