@adaptabletools/adaptable 12.1.8-canary.1 → 12.2.0-canary.0

package/index.css

@@ -2544,6 +2544,23 @@ template {
   --ab-cmp-datepicker__font-family: var(--ab__font-family);
   --ab-cmp-datepicker__cell-size: 30px; }
 
+:root {
+  --ab-cmp-toggle-button__background: #ccc;
+  --ab-cmp-toggle-button--active__background: var(--ab-color-success);
+  --ab-cmp-toggle-button__font-size: var(--ab-font-size-1);
+  --ab-cmp-toggle-button__color: var(--ab-color-text-on-primary);
+  --ab-cmp-toggle-button--checked__color: var(--ab-color-accentlight); }
+
+:root {
+  --ab-cmp-module-module-selector__tab-item__border: 1px solid var(--ab-color-primarydark);
+  --ab-cmp-module-module-selector__tab-item__border-radius: var(--ab__border-radius);
+  --ab-cmp-module-module-selector__tab-item__width: 160px;
+  --ab-cmp-module-module-selector__tab-item__header-input__color: var(--ab-color-text-on-primary);
+  --ab-cmp-module-module-selector__toolbar-item__border: 1px solid var(--ab-color-primary);
+  --ab-cmp-module-selector__unused-panel__border: 1px solid var(--ab-color-primarydark);
+  --ab-cmp-module-selector__unused-panel__border-radius: var(--ab__border-radius);
+  --ab-cmp-module-selector__unused-panel__background: var(--ab-color-defaultbackground); }
+
 :root {
   --ab-cmp-loader__background: var(--ab-color-primarydark);
   --ab-cmp-loader__border: var(--ab-color-text-on-primary);
@@ -2564,6 +2581,10 @@ template {
   --ab-cmp-icon__height: 17px;
   --ab-cmp-icon__width: 17px; }
 
+:root {
+  --ab-cmp-listgroupitem__padding: var(--ab-space-2);
+  --ab-cmp-listgroupitem__margin: 0; }
+
 :root {
   --ab-cmp-wizard__padding: var(--ab-space-5);
   --ab-cmp-wizard__margin: var(--ab-space-1);
@@ -2934,12 +2955,19 @@ template {
 
 .ab-DropdownButton {
   position: relative;
+  overflow: visible;
+  outline: none;
   --ab-overlay-horizontal-align: left; }
 
 .ab-DropdownButton__list {
   text-align: start;
   padding: var(--ab-space-1) 0;
-  box-shadow: var(--ab-cmp-dropdownbutton-list__box-shadow); }
+  box-shadow: var(--ab-cmp-dropdownbutton-list__box-shadow);
+  overflow: auto;
+  border: var(--ab-cmp-dropdownbutton-list__border);
+  borderradius: var(--ab-cmp-dropdownbutton-list__border-radius);
+  zindex: var(--ab-cmp-dropdownbutton-list__z-index);
+  background: var(--ab-cmp-dropdownbutton-list__background); }
 
 .ab-DropdownButton__content {
   font-family: var(--ab__font-family);
@@ -2971,11 +2999,23 @@ template {
   border-bottom: var(--ab-cmp-dropdownbutton-list-separator__border); }
 
 .ab-EmptyContent {
-  text-align: center; }
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  font-size: var(--ab-font-size-3);
+  text-align: center;
+  padding: var(--ab-space-4); }
 
 .ab-EmptyContent p {
     color: var(--ab-color-text-on-primary); }
 
+.ab-EmptyContent__wrapper {
+  position: relative;
+  width: 100%;
+  height: 100%; }
+
 .ab-ErrorBox {
   padding: var(--ab-cmp-error-box__padding);
   border-radius: var(--ab-cmp-error-box__border-radius);
@@ -3692,13 +3732,6 @@ input[type='number'].ab-Input:hover::-webkit-inner-spin-button:active {
 .ab-Datepicker-Overlay .rdp.rdp-with_weeknumber .rdp-row td:nth-child(8) {
       display: table-cell; }
 
-:root {
-  --ab-cmp-toggle-button__background: #ccc;
-  --ab-cmp-toggle-button--active__background: var(--ab-color-success);
-  --ab-cmp-toggle-button__font-size: var(--ab-font-size-1);
-  --ab-cmp-toggle-button__color: var(--ab-color-text-on-primary);
-  --ab-cmp-toggle-button--checked__color: var(--ab-color-accentlight); }
-
 .ab-ToggleButton {
   position: relative;
   display: inline-block;
@@ -3825,6 +3858,49 @@ input[type='number'].ab-Input:hover::-webkit-inner-spin-button:active {
   font-size: var(--ab-cmp-Tag__font-size);
   max-width: 100%; }
 
+.ab-ModuleSelector__TabItem {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  margin-right: var(--ab-space-2);
+  width: var(--ab-cmp-module-module-selector__tab-item__width);
+  border: var(--ab-cmp-module-module-selector__tab-item__border);
+  border-radius: var(--ab-cmp-module-module-selector__tab-item__border-radius); }
+
+.ab-ModuleSelector__TabItem__header {
+  display: flex;
+  align-items: center;
+  padding: var(--ab-space-1);
+  border-bottom: var(--ab-cmp-module-module-selector__tab-item__border); }
+
+.ab-ModuleSelector__TabItem__header-input {
+  flex: 1;
+  width: 100%;
+  margin-left: var(--ab-space-1);
+  margin-right: var(--ab-space-1);
+  align-self: stretch;
+  background: transparent;
+  border: none;
+  color: var(--ab-cmp-module-module-selector__tab-item__header-input__color); }
+
+.ab-ModuleSelector__ToolbarList {
+  flex: 1;
+  padding: 4px;
+  padding-bottom: 0;
+  min-height: 200px; }
+
+.ab-ModuleSelector__ToolbarItem {
+  border: var(--ab-cmp-module-module-selector__toolbar-item__border);
+  padding-left: var(--ab-space-1);
+  margin-bottom: var(--ab-space-1); }
+
+.ab-ModuleSelector__UnusedPanel {
+  margin-bottom: var(--ab-space-2);
+  padding-bottom: var(--ab-space-1);
+  border: var(--ab-cmp-module-selector__unused-panel__border);
+  border-radius: var(--ab-cmp-module-selector__unused-panel__border-radius);
+  background-color: var(--ab-cmp-module-selector__unused-panel__background); }
+
 .ab-AdaptableOptions {
   background: var(--ab-cmp-adaptable-options__background-color); }
 
@@ -3846,6 +3922,9 @@ input[type='number'].ab-Input:hover::-webkit-inner-spin-button:active {
   color: var(--ab-cmp-listgroupitem--odd__color); }
 
 .ab-AdaptableObjectRow {
+  align-items: center;
+  padding: var(--ab-cmp-listgroupitem__padding);
+  margin: var(--ab-cmp-listgroupitem__margin);
   background: var(--ab-cmp-listgroupitem__background);
   color: var(--ab-cmp-listgroupitem__color);
   border-radius: var(--ab-cmp-listgroupitem__border-radius); }
@@ -3912,19 +3991,24 @@ html.ab--theme-dark .ab-ListBoxFilterForm--aggrid-style {
   bottom: -10px;
   transform: translate3d(-5px, 0px, 0px); }
 
-.ab-nocode-wizard {
+.ab-NocodeWizard {
   padding: var(--ab-cmp-wizard__padding);
   margin: var(--ab-cmp-wizard__margin);
   background: var(--ab-cmp-wizard__background);
   color: var(--ab-cmp-wizard__color);
   height: 100%; }
 
-.ab-nocode-wizard,
-  .ab-nocode-wizard *,
-  .ab-nocode-wizard *:before,
-  .ab-nocode-wizard *:after {
+.ab-NocodeWizard,
+  .ab-NocodeWizard *,
+  .ab-NocodeWizard *:before,
+  .ab-NocodeWizard *:after {
     box-sizing: border-box; }
 
+.ab-NocodeWizardFormBox {
+  border: 1px solid var(--ab-color-primarydark);
+  border-radius: var(--ab__border-radius);
+  background-color: var(--ab-color-defaultbackground); }
+
 .ab-AvailableDropZone .placeholder,
 .ab-SelectedDropZone .placeholder {
   width: 100%; }
@@ -4065,20 +4149,23 @@ html.ab--theme-dark .ab-ListBoxFilterForm--aggrid-style {
     padding: var(--ab-cmp-adaptable-popup--settings__padding);
     min-width: 0; }
 
+.ab-Adaptable-Popup__Panel {
+  width: 100%; }
+
 .ab-Adaptable-Popup__Panel__Header {
-  display: flex;
-  padding: 0 var(--ab-cmp-adaptable-popup-panel__padding);
-  margin-bottom: var(--ab-cmp-adaptable-popup-panel__margin-bottom);
-  margin-top: var(--ab-cmp-adaptable-popup-panel__margin-top); }
+    display: flex;
+    padding: 0 var(--ab-cmp-adaptable-popup-panel__padding);
+    margin-bottom: var(--ab-cmp-adaptable-popup-panel__margin-bottom);
+    margin-top: var(--ab-cmp-adaptable-popup-panel__margin-top); }
 
 .ab-Adaptable-Popup__Panel__Header__Title {
-    font-size: var(--ab-cmp-adaptable-popup-panel-title__font-size); }
+      font-size: var(--ab-cmp-adaptable-popup-panel-title__font-size); }
 
 .ab-Adaptable-Popup__Panel__Body {
-  padding: var(--ab-cmp-adaptable-popup-panel-body__padding);
-  flex: 1 1 0;
-  min-height: 0;
-  overflow: auto; }
+    padding: var(--ab-cmp-adaptable-popup-panel-body__padding);
+    flex: 1 1 0;
+    min-height: 0;
+    overflow: auto; }
 
 .ab-Adaptable-Popup--window .ab-Adaptable-Popup__TopBar {
   cursor: move; }
@@ -4211,6 +4298,28 @@ button.ab-StatusBar__SubPanel:hover {
   --ab-cmp-adaptable-permitted-values-selector__background-color: var(--ab-color-defaultbackground);
   --ab-cmp-adaptable-permitted-values-selector__padding: var(--ab-space-1); }
 
+.ab-ValueSelector {
+  overflow: hidden; }
+
+.ab-ValueSelector__option {
+    border-radius: 'var(--ab__border-radius)'; }
+
+.ab-ValueSelector__show-selected-only-checkbox {
+    position: sticky;
+    top: 0;
+    z-index: 10000; }
+
+.ab-ValueSelector__show-selected-only-checkbox__text {
+    position: absolute;
+    top: 2px;
+    right: 4px;
+    overflow: hidden;
+    border-radius: var(--ab__border-radius);
+    margin-right: var(--ab-space-1);
+    margin-top: var(--ab-space-1);
+    padding: 0 var(--ab-space-2);
+    font-size: var(--ab-font-size-2); }
+
 .ab-alert--error {
   background: var(--ab-color-error); }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "12.1.8-canary.1",
+  "version": "12.2.0-canary.0",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1661375016938;
+declare const _default: 1661462273542;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1661375016938;
+exports.default = 1661462273542;

package/src/AdaptableOptions/AdaptableQLOptions.d.ts

@@ -1,8 +1,10 @@
 import { ExpressionFunctionMap } from '../parser/src/types';
 import { AdaptablePredicateDef } from '../PredefinedConfig/Common/AdaptablePredicate';
-import { AdaptableModule, AdaptableQLModules } from '../PredefinedConfig/Common/Types';
+import { AdaptableModule, AdaptableQLModule, AdaptableQLModules } from '../PredefinedConfig/Common/Types';
+import { BaseContext } from '../PredefinedConfig/Common/BaseContext';
+import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 /**
- * Options for managing AdaptableQL - the Adaptable Query Lanaguage which evaluates Predicates and Expressions
+ * Options for managing AdaptableQL - the Adaptable Query Language which evaluates Predicates and Expressions
  */
 export interface AdaptableQLOptions {
     /**
@@ -17,10 +19,15 @@ export interface AdaptableQLOptions {
      *
      * @defaultValue undefined
      * @gridInfoItem
+     * @deprecated use `evaluateExpressionExternally()` instead
      */
     externallyEvaluatedModules?: AdaptableQLModules;
     /**
-     * Options for managing Expressions in AdapTableQL
+     * Whether a specific expression (or all expressions in a given module) must be evaluated on the server
+     */
+    evaluateExpressionExternally?: (context: EvaluateExpressionExternallyContext) => boolean;
+    /**
+     * Options for managing Expressions in AdaptableQL
      *
      */
     expressionOptions?: ExpressionOptions;
@@ -28,41 +35,47 @@ export interface AdaptableQLOptions {
      * Definitions for Custom provided Predicates
      */
     customPredicateDefs?: AdaptablePredicateDef[];
+    /**
+     * Whether to display the column friendly names in all expression overviews (instead of their technical IDs)
+     *
+     * @defaultValue true
+     */
+    displayColumnFriendlyNamesForExpressions?: boolean;
 }
 /**
- * Options for managing Expressions using AdapTableQL
+ * Options for managing Expressions using AdaptableQL
  */
 export interface ExpressionOptions {
     /**
-     * Boolean Expression Functions available in AdapTableQL
+     * Boolean Expression Functions available in AdaptableQL
      *
      * @defaultValue null (sets all)
      * @gridInfoItem
      */
     defaultBooleanFunctions?: ExpressionFunctionMap;
     /**
-     * Scalar Expression Functions available in AdapTableQL
+     * Scalar Expression Functions available in AdaptableQL
      *
      * @defaultValue null (sets all)
      * @gridInfoItem
      */
     defaultScalarFunctions?: ExpressionFunctionMap;
     /**
-     * Observable Expression Functions available in AdapTableQL
+     * Observable Expression Functions available in AdaptableQL
      *
      * @defaultValue null (sets all)
      * @gridInfoItem
      */
     defaultObservableFunctions?: ExpressionFunctionMap;
     /**
-     * Aggregated Boolean Expression Functions available in AdapTableQL
+     * Aggregated Boolean Expression Functions available in AdaptableQL
      *
      * @defaultValue null (sets all)
      * @gridInfoItem
      */
     defaultAggregatedBooleanFunctions?: ExpressionFunctionMap;
     /**
-     * Aggregated Scalar Expression Functions available in AdapTableQL
+     * Aggregated Scalar Expression Functions available in AdaptableQL
      *
      * @defaultValue null (sets all)
      * @gridInfoItem
@@ -78,7 +91,7 @@ export interface ExpressionOptions {
         [module in AdaptableModule]?: ModuleExpressionFunctions;
     };
     /**
-     * Columns that can be included in AdapTableQL Expressions; leave unset to include **ALL**, provide empty array to set **NONE**
+     * Columns that can be included in AdaptableQL Expressions; leave unset to include **ALL**, provide empty array to set **NONE**
      *
      * @defaultValue undefined
      * @gridInfoItem
@@ -98,6 +111,10 @@ export interface ExpressionOptions {
      * @gridInfoItem
      */
     maxTimeframeSize?: number;
+    /**
+     * Custom query variables allow values to be attached to variables so that a single value can easily be expressed multiple times within a query, or quickly changed to affect the results of a query. Variables are evaluated synchronously with each expression evaluation.
+     */
+    customQueryVariable?: Record<string, string | number | boolean | Date | ((context: CustomQueryVariableContext) => string | number | boolean | Date)>;
 }
 /**
  * Module specific Expression Functions
@@ -109,3 +126,20 @@ export interface ModuleExpressionFunctions {
     aggregatedBooleanFunctions?: ExpressionFunctionMap;
     aggregatedScalarFunctions?: ExpressionFunctionMap;
 }
+/**
+ * Context passed when evaluating `ExpressionOptions.customQueryVariable`
+ */
+export interface CustomQueryVariableContext extends BaseContext {
+    /**
+     * Optional variable arguments
+     */
+    args?: any[];
+}
+/**
+ * Context passed when evaluating `AdaptableQLOptions.evaluateExpressionExternally()`
+ */
+export interface EvaluateExpressionExternallyContext extends BaseContext {
+    module: AdaptableQLModule;
+    expression?: string;
+    referencedColumns?: AdaptableColumn[];
+}

package/src/AdaptableOptions/LayoutOptions.d.ts

@@ -9,7 +9,8 @@ import { BaseSchedule } from '../PredefinedConfig/Common/Schedule';
 import { Layout } from '../PredefinedConfig/LayoutState';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
-import { BaseContext } from '../../types';
+import { AdaptableColumn, BaseContext } from '../../types';
+import { KeyCreatorParams } from '@ag-grid-community/all-modules';
 /**
  * Options for configuring Layouts; these manage Column visibility, order, sorting, grouping and width
  *
@@ -64,6 +65,10 @@ export interface LayoutOptions {
      * Options for leveraging Object Tags to extend Layouts
      */
     layoutTagOptions?: LayoutTagOptions;
+    /**
+     * When defined ungrouped rows are grouped under this key.
+     */
+    groupUnbalancedGroupsUnderKey?: string | ((context: GroupUnbalancedGroupsUnderKeyContext) => string);
 }
 export interface LayoutTagOptions {
     /**
@@ -130,3 +135,7 @@ export interface AutoGenerateTagsForLayoutsContext extends BaseContext {
      */
     objectTags: AdaptableObjectTag[];
 }
+export interface GroupUnbalancedGroupsUnderKeyContext extends BaseContext {
+    adaptableColumn: AdaptableColumn;
+    params: KeyCreatorParams;
+}

package/src/AdaptableOptions/StateOptions.d.ts

@@ -51,7 +51,7 @@ export interface AdaptableStateFunctionConfig {
      */
     userName: string;
     /**
-     * optional url
+     * @deprecated unused will be removed in v.13
      */
     url?: string;
 }

package/src/Api/Implementation/AlertApiImpl.js

@@ -313,10 +313,9 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         return scopeDescription + ' - ' + ruleDescription;
     }
     getAlertRuleDescription(alert) {
-        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.AggregatedBooleanExpression;
+            : this.adaptable.api.internalApi.getAdaptableQueryExpressionText(alert.Rule);
         return ruleDescription;
     }
 }

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

@@ -11,7 +11,7 @@ import { SelectedRowInfo } from '../../PredefinedConfig/Selection/SelectedRowInf
 import { AdaptableModule, AdaptableQLModule } from '../../PredefinedConfig/Common/Types';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { AdaptableCellChangedAlert, AdaptableOptions, AdaptableRowChangedAlert, AdaptableState, AlertFormContext, BaseContext, Layout, LayoutAssociatedObject, SystemStatusMessageInfo, SharedEntity, AdaptableIcon } from '../../types';
+import { AdaptableCellChangedAlert, AdaptableOptions, AdaptableRowChangedAlert, AdaptableState, AlertFormContext, BaseContext, Layout, LayoutAssociatedObject, SystemStatusMessageInfo, SharedEntity, AdaptableIcon, AdaptableQuery } from '../../types';
 import { IValidationService } from '../../Utilities/Services/Interface/IValidationService';
 import { IModuleService } from '../../Utilities/Services/Interface/IModuleService';
 import { IReportService } from '../../Utilities/Services/Interface/IReportService';
@@ -102,6 +102,7 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     getModules(): IModuleCollection;
     getModuleFriendlyName(adaptableModule: AdaptableModule): string;
     runModuleInAdaptableQL(adaptableQLModule: AdaptableQLModule): boolean;
+    evaluateExpressionInAdaptableQL(module: AdaptableQLModule, expression?: string): boolean;
     forAllRowNodesDo(func: (rowNode: RowNode) => void): void;
     forAllVisibleRowNodesDo(func: (rowNode: RowNode) => void): void;
     buildStandaloneColumnHeader(column: AdaptableColumn): AdaptableMenuItem[];
@@ -140,4 +141,5 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     getLabelForTag(adaptableObjectTag: AdaptableObjectTag): string;
     getValueForTag(adaptableObjectTag: AdaptableObjectTag): string | number;
     getEditLookUpValuesForColumn(editLookUpItem: EditLookUpPermittedValues, column: AdaptableColumn, gridCell?: GridCell): any[] | undefined;
+    getAdaptableQueryExpressionText(query: Partial<AdaptableQuery>): string;
 }

package/src/Api/Implementation/InternalApiImpl.js

@@ -299,6 +299,30 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         const adaptableQLModules = this.getAdaptableQLOptions().externallyEvaluatedModules;
         return !adaptableQLModules.includes(adaptableQLModule);
     }
+    evaluateExpressionInAdaptableQL(module, expression) {
+        var _a;
+        // temporary, until `externallyEvaluatedModules` is removed completely
+        const externallyEvaluatedModules = this.getAdaptableQLOptions().externallyEvaluatedModules;
+        if (externallyEvaluatedModules === null || externallyEvaluatedModules === void 0 ? void 0 : externallyEvaluatedModules.length) {
+            // fallback to deprecated property
+            return this.runModuleInAdaptableQL(module);
+        }
+        const evaluateExpressionExternallyFn = (_a = this.getAdaptableQLOptions()) === null || _a === void 0 ? void 0 : _a.evaluateExpressionExternally;
+        if (typeof evaluateExpressionExternallyFn !== 'function') {
+            return true;
+        }
+        const context = {
+            adaptableApi: this.getAdaptableApi(),
+            module,
+        };
+        if (expression) {
+            context.expression = expression;
+            context.referencedColumns = this.getAdaptableApi()
+                .queryLanguageApi.getColumnsFromExpression(expression)
+                .map((columnId) => this.getAdaptableApi().columnApi.getColumnFromId(columnId));
+        }
+        return evaluateExpressionExternallyFn(context);
+    }
     forAllRowNodesDo(func) {
         this.adaptable.forAllRowNodesDo(func);
     }
@@ -616,5 +640,15 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         // this will use the columnApi method that first looks for permitted values and then distinct values
         return this.adaptable.api.columnApi.getDistinctDisplayValuesForColumn(column.columnId);
     }
+    getAdaptableQueryExpressionText(query) {
+        var _a;
+        if (!query) {
+            return '';
+        }
+        const displayColumnFriendlyNames = (_a = this.adaptable.adaptableOptions.adaptableQLOptions) === null || _a === void 0 ? void 0 : _a.displayColumnFriendlyNamesForExpressions;
+        return displayColumnFriendlyNames
+            ? this.adaptable.api.queryLanguageApi.getAdaptableQueryExpressionWithColumnFriendlyNames(query)
+            : this.adaptable.api.queryLanguageApi.getAdaptableQueryExpression(query);
+    }
 }
 exports.InternalApiImpl = InternalApiImpl;

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

@@ -13,4 +13,5 @@ export declare class QueryLanguageApiImpl extends ApiBase implements QueryLangua
     getQueryableColumnIds(): string[] | undefined;
     getModuleExpressionFunctionMap(): ExpressionFunctionMap;
     getAdaptableQueryExpression(query: Partial<AdaptableQuery>): string | undefined;
+    getAdaptableQueryExpressionWithColumnFriendlyNames(query: Partial<AdaptableQuery>): string | undefined;
 }

package/src/Api/Implementation/QueryLanguageApiImpl.js

@@ -90,5 +90,10 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
         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);
     }
+    getAdaptableQueryExpressionWithColumnFriendlyNames(query) {
+        return this.adaptable.api.internalApi
+            .getQueryLanguageService()
+            .getExpressionWithColumnFriendlyNames(this.getAdaptableQueryExpression(query));
+    }
 }
 exports.QueryLanguageApiImpl = QueryLanguageApiImpl;

package/src/Api/InternalApi.d.ts

@@ -17,7 +17,7 @@ import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
 import { Layout } from '../PredefinedConfig/LayoutState';
 import { AdaptableAlert, AdaptableCellChangedAlert, AdaptableRowChangedAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { IDataService } from '../Utilities/Services/Interface/IDataService';
-import { AdaptableIcon, AdaptableMessageType, AlertDefinition, BaseContext, CellDataChangedInfo, EditLookUpPermittedValues, LayoutAssociatedObject, SharedEntity, SystemStatusMessageInfo } from '../types';
+import { AdaptableIcon, AdaptableMessageType, AdaptableQuery, AlertDefinition, BaseContext, CellDataChangedInfo, EditLookUpPermittedValues, LayoutAssociatedObject, SharedEntity, SystemStatusMessageInfo } from '../types';
 import { IEntitlementService } from '../Utilities/Services/Interface/IEntitlementService';
 import { AdaptableFlashingCell } from '../PredefinedConfig/Common/AdaptableFlashingCell';
 import { IQueryLanguageService } from '../Utilities/Services/Interface/IQueryLanguageService';
@@ -104,7 +104,11 @@ export interface InternalApi {
     getRowEditService(): IRowEditService;
     getModules(): IModuleCollection;
     getModuleFriendlyName(adaptableModule: AdaptableModule): string;
+    /**
+     * @deprecated use `evaluateExpressionInAdaptableQL()` instead
+     */
     runModuleInAdaptableQL(adaptableQLModule: AdaptableQLModule): boolean;
+    evaluateExpressionInAdaptableQL(adaptableQLModule: AdaptableQLModule, expression?: string): boolean;
     forAllRowNodesDo(func: (rowNode: RowNode) => void): void;
     forAllVisibleRowNodesDo(func: (rowNode: RowNode) => void): void;
     buildStandaloneColumnHeader(column: AdaptableColumn): AdaptableMenuItem[];
@@ -139,4 +143,5 @@ export interface InternalApi {
     getLabelForTag(adaptableObjectTag: AdaptableObjectTag): string;
     getValueForTag(adaptableObjectTag: AdaptableObjectTag): string | number;
     getEditLookUpValuesForColumn(editLookUpItem: EditLookUpPermittedValues, column: AdaptableColumn, gridCell?: GridCell): any[] | undefined;
+    getAdaptableQueryExpressionText(query: Partial<AdaptableQuery>): string;
 }

package/src/Api/QueryLanguageApi.d.ts

@@ -56,4 +56,9 @@ export interface QueryLanguageApi {
      * @param query - the AdaptableQuery
      */
     getAdaptableQueryExpression(query: Partial<AdaptableQuery>): string | undefined;
+    /**
+     * Returns the Expression string of the given AdaptableQuery with the column friendly names (instead of their technical IDs)
+     * @param query - the AdaptableQuery
+     */
+    getAdaptableQueryExpressionWithColumnFriendlyNames(query: Partial<AdaptableQuery>): string | undefined;
 }

package/src/Strategy/BulkUpdateModule.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { IBulkUpdateModule, BulkUpdateValidationResult } from './Interface/IBulkUpdateModule';
+import { BulkUpdateValidationResult, IBulkUpdateModule } from './Interface/IBulkUpdateModule';
 import { PreviewInfo } from '../Utilities/Interface/Preview';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AccessLevel, AdaptableApi } from '../types';

package/src/Strategy/CalculatedColumnModule.js

@@ -81,7 +81,7 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 label: 'Column Name',
                 values: [calculateColumn.FriendlyName],
             },
-            getExpressionViewItems_1.getExpressionViewItems(calculateColumn.Query),
+            getExpressionViewItems_1.getExpressionViewItems(calculateColumn.Query, this.api),
         ].filter(Boolean);
         if (ArrayExtensions_1.default.IsNotNullOrEmpty(settingsTags)) {
             items.push({

package/src/Strategy/QueryModule.js

@@ -38,7 +38,7 @@ class QueryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 },
                 {
                     name: 'Expression',
-                    values: [query.BooleanExpression],
+                    values: [this.api.internalApi.getAdaptableQueryExpressionText(query)],
                 },
                 getObjectTagsViewItems_1.getObjectTagsViewItems(query, this.api),
             ],

package/src/Strategy/Utilities/Export/getExportRowsViewItems.js

@@ -2,19 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExportRowsViewItems = void 0;
 const getExportRowsViewItems = (report, api) => {
-    var _a;
-    const values = [];
-    switch (report.ReportRowScope) {
-        case 'AllRows':
-            values.push('All Rows');
-            break;
-        case 'VisibleRows':
-            values.push('Visible Rows');
-            break;
-        case 'ExpressionRows':
-            values.push((_a = report.Query) === null || _a === void 0 ? void 0 : _a.BooleanExpression);
-            break;
-    }
     return {
         name: 'Rows',
         values: [

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

@@ -1,5 +1,4 @@
 import { AdaptableCalculatedColumnQuery } from '../../PredefinedConfig/CalculatedColumnState';
-export declare const getExpressionViewItems: (query: AdaptableCalculatedColumnQuery) => {
-    name: string;
-    values: string[];
-};
+import { AdaptableApi } from '../../Api/AdaptableApi';
+import { AdaptableObjectItemView } from '../Interface/IModule';
+export declare const getExpressionViewItems: (query: AdaptableCalculatedColumnQuery, api: AdaptableApi) => AdaptableObjectItemView;

package/src/Strategy/Utilities/getExpressionViewItems.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpressionViewItems = void 0;
-const getExpressionViewItems = (query) => {
-    var _a;
+const getExpressionViewItems = (query, api) => {
+    const expressionText = api.internalApi.getAdaptableQueryExpressionText(query);
     return {
         name: 'Expression',
-        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],
+        values: [expressionText],
     };
 };
 exports.getExpressionViewItems = getExpressionViewItems;

package/src/Strategy/Utilities/getRuleViewItems.js

@@ -7,7 +7,7 @@ const getRuleViewItems = (rule, api) => {
         values: [
             rule.Predicate
                 ? api.predicateApi.predicateToString(rule.Predicate)
-                : api.queryLanguageApi.getAdaptableQueryExpression(rule),
+                : api.internalApi.getAdaptableQueryExpressionText(rule),
         ],
     };
 };