@adaptabletools/adaptable 16.0.4 → 16.0.5

package/src/Api/Internal/PredicateInternalApi.js

@@ -22,7 +22,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
         ].filter((predicateDef) => predicateDef.moduleScope.includes('filter'));
     }
     getSystemFilterPredicateIds(scope) {
-        const systemFilterPredicates = this.getAdaptableQLOptions().predicateOptions.systemFilterPredicates;
+        const systemFilterPredicates = this.getPredicateOptions().systemFilterPredicates;
         if (typeof systemFilterPredicates === 'function') {
             const systemPredicateContext = {
                 adaptableApi: this.adaptable.api,
@@ -49,7 +49,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
         ].filter((predicateDef) => predicateDef.moduleScope.includes('alert'));
     }
     getSystemAlertPredicateIds(scope) {
-        const systemAlertPredicates = this.getAdaptableQLOptions().predicateOptions.systemAlertPredicates;
+        const systemAlertPredicates = this.getPredicateOptions().systemAlertPredicates;
         if (typeof systemAlertPredicates === 'function') {
             const systemPredicateContext = {
                 adaptableApi: this.adaptable.api,
@@ -66,7 +66,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
         return systemAlertPredicates;
     }
     getSystemBadgeStylePredicateIds(scope) {
-        const systemBadgeStylePredicates = this.getAdaptableQLOptions().predicateOptions.systemBadgeStylePredicates;
+        const systemBadgeStylePredicates = this.getPredicateOptions().systemBadgeStylePredicates;
         if (typeof systemBadgeStylePredicates === 'function') {
             const systemPredicateContext = {
                 adaptableApi: this.adaptable.api,
@@ -93,7 +93,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
         ].filter((predicateDef) => predicateDef.moduleScope.includes('formatColumn'));
     }
     getSystemFormatColumnPredicateIds(scope) {
-        const systemFormatColumnPredicates = this.getAdaptableQLOptions().predicateOptions.systemFormatColumnPredicates;
+        const systemFormatColumnPredicates = this.getPredicateOptions().systemFormatColumnPredicates;
         if (typeof systemFormatColumnPredicates === 'function') {
             const systemPredicateContext = {
                 adaptableApi: this.adaptable.api,
@@ -120,7 +120,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
         ].filter((predicateDef) => predicateDef.moduleScope.includes('flashingcell'));
     }
     getSystemFlashingCellPredicateIds(scope) {
-        const systemFlashingCellPredicates = this.getAdaptableQLOptions().predicateOptions.systemFlashingCellPredicates;
+        const systemFlashingCellPredicates = this.getPredicateOptions().systemFlashingCellPredicates;
         if (typeof systemFlashingCellPredicates === 'function') {
             const systemPredicateContext = {
                 adaptableApi: this.adaptable.api,

package/src/Api/OptionsApi.d.ts

@@ -1,8 +1,9 @@
 import { CustomSortOptions } from '../AdaptableOptions/CustomSortOptions';
 import { DataSetOptions } from '../AdaptableOptions/DataSetOptions';
 import { GroupingOptions } from '../AdaptableOptions/GroupingOptions';
-import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AdaptableQLOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, CommentOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, EditOptions, EntitlementOptions, ExportOptions, FilterOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, MenuOptions, NotificationsOptions, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../types';
+import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, CommentOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, EditOptions, EntitlementOptions, ExportOptions, FilterOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, MenuOptions, NotificationsOptions, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../types';
 import { Fdc3Options } from '../AdaptableOptions/Fdc3Options';
+import { ExpressionOptions } from '../AdaptableOptions/ExpressionOptions';
 /**
  * Range of functions to access Adaptable Options
  */
@@ -48,9 +49,9 @@ export interface OptionsApi {
      */
     getAlertOptions(): Readonly<AlertOptions>;
     /**
-     * Returns `AdaptableOptions.adaptableQLOptions`
+     * Returns `AdaptableOptions.expressionOptions`
      */
-    getAdaptableQLOptions(): Readonly<AdaptableQLOptions>;
+    getExpressionOptions(): Readonly<ExpressionOptions>;
     /**
      * Returns `AdaptableOptions.calendarOptions`
      */

package/src/Api/PredicateApi.d.ts

@@ -81,4 +81,8 @@ export interface PredicateApi {
      * @param defaultReturn Whether to return the default
      */
     handlePredicates(predicates: AdaptablePredicate[], params: Omit<PredicateDefHandlerContext, 'adaptableApi' | 'inputs'>, defaultReturn: boolean): boolean;
+    /**
+     * Whether Predicates are evaluated using Case Sensitivity
+     */
+    useCaseSensitivity(): boolean;
 }

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -18,6 +18,7 @@ const isYesterday_1 = tslib_1.__importDefault(require("date-fns/isYesterday"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const DateHelper_1 = require("../../Utilities/Helpers/DateHelper");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
+const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 /**
  * Array of Predicate Defs which are shipped by AdapTable
  */
@@ -32,6 +33,9 @@ exports.SystemPredicateDefs = [
             if (inputs.length === 0) {
                 return true;
             }
+            if (inputs.includes(GeneralConstants_1.BLANK_DISTINCT_COLUMN_VALUE) && Helper_1.default.IsInputNullOrEmpty(value)) {
+                return true;
+            }
             if (column.dataType === 'Date') {
                 return inputs.some((input) => {
                     if (adaptableApi.optionsApi.getFilterOptions().filterUsingTime) {
@@ -46,7 +50,7 @@ exports.SystemPredicateDefs = [
                 return inputs.includes(value);
             }
             if (column.dataType === 'String') {
-                return adaptableApi.internalApi.isTextComparisonCaseSensitive()
+                return adaptableApi.predicateApi.useCaseSensitivity()
                     ? inputs
                         .map((i) => {
                         return i === null || i === void 0 ? void 0 : i.toLocaleLowerCase();
@@ -70,6 +74,9 @@ exports.SystemPredicateDefs = [
             if (inputs.length === 0) {
                 return true;
             }
+            if (inputs.includes(GeneralConstants_1.BLANK_DISTINCT_COLUMN_VALUE) && Helper_1.default.IsInputNullOrEmpty(value)) {
+                return false;
+            }
             if (column.dataType === 'Date') {
                 if (adaptableApi.optionsApi.getFilterOptions().filterUsingTime) {
                     return inputs.every((input) => {
@@ -86,7 +93,7 @@ exports.SystemPredicateDefs = [
                 return !inputs.includes(value);
             }
             if (column.dataType === 'String') {
-                return adaptableApi.internalApi.isTextComparisonCaseSensitive()
+                return adaptableApi.predicateApi.useCaseSensitivity()
                     ? !inputs
                         .map((i) => {
                         return i === null || i === void 0 ? void 0 : i.toLocaleLowerCase();
@@ -255,7 +262,7 @@ exports.SystemPredicateDefs = [
             if (!value) {
                 return false;
             }
-            const ignoreCase = !adaptableApi.internalApi.isTextComparisonCaseSensitive();
+            const ignoreCase = !adaptableApi.predicateApi.useCaseSensitivity();
             const v = ignoreCase ? String(value).toLocaleLowerCase() : String(value);
             const i = ignoreCase ? String(inputs[0]).toLocaleLowerCase() : String(inputs[0]);
             return v == i;
@@ -274,7 +281,7 @@ exports.SystemPredicateDefs = [
             if (!value) {
                 return true;
             }
-            const ignoreCase = !adaptableApi.internalApi.isTextComparisonCaseSensitive();
+            const ignoreCase = !adaptableApi.predicateApi.useCaseSensitivity();
             const v = ignoreCase ? String(value).toLocaleLowerCase() : String(value);
             const i = ignoreCase ? String(inputs[0]).toLocaleLowerCase() : String(inputs[0]);
             return v != i;
@@ -293,7 +300,7 @@ exports.SystemPredicateDefs = [
             if (!value) {
                 return false;
             }
-            const ignoreCase = !adaptableApi.internalApi.isTextComparisonCaseSensitive();
+            const ignoreCase = !adaptableApi.predicateApi.useCaseSensitivity();
             const v = ignoreCase ? String(value).toLocaleLowerCase() : String(value);
             const i = ignoreCase ? String(inputs[0]).toLocaleLowerCase() : String(inputs[0]);
             return v.indexOf(i) !== -1;
@@ -311,7 +318,7 @@ exports.SystemPredicateDefs = [
             if (!value) {
                 return true;
             }
-            const ignoreCase = !adaptableApi.internalApi.isTextComparisonCaseSensitive();
+            const ignoreCase = !adaptableApi.predicateApi.useCaseSensitivity();
             const v = ignoreCase ? String(value).toLocaleLowerCase() : String(value);
             const i = ignoreCase ? String(inputs[0]).toLocaleLowerCase() : String(inputs[0]);
             return v.indexOf(i) === -1;
@@ -329,7 +336,7 @@ exports.SystemPredicateDefs = [
             if (!value) {
                 return false;
             }
-            const ignoreCase = !adaptableApi.internalApi.isTextComparisonCaseSensitive();
+            const ignoreCase = !adaptableApi.predicateApi.useCaseSensitivity();
             const v = ignoreCase ? String(value).toLocaleLowerCase() : String(value);
             const i = ignoreCase ? String(inputs[0]).toLocaleLowerCase() : String(inputs[0]);
             return v.startsWith(i);
@@ -347,7 +354,7 @@ exports.SystemPredicateDefs = [
             if (!value) {
                 return false;
             }
-            const ignoreCase = !adaptableApi.internalApi.isTextComparisonCaseSensitive();
+            const ignoreCase = !adaptableApi.predicateApi.useCaseSensitivity();
             const v = ignoreCase ? String(value).toLocaleLowerCase() : String(value);
             const i = ignoreCase ? String(inputs[0]).toLocaleLowerCase() : String(inputs[0]);
             return v.endsWith(i);

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

@@ -1,5 +1,18 @@
 import { SuspendableObject, AdaptablePredicate } from '../../types';
 import { TypeHint } from './Types';
+/**
+ * Configuration for a Column Filter
+ */
+export interface ColumnFilterConfig {
+    /**
+     * The Predicate ID to use when filtering the column
+     */
+    PredicateId: TypeHint<string, SystemFilterPredicateId>;
+    /**
+     * Optional Inputs that might be needed for evaluation
+     */
+    PredicateInputs?: any[];
+}
 /**
  * Defines a Filter applied on a Column using a Predicate
  */

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

@@ -96,7 +96,7 @@ export declare const ContextConfiguration: {
     };
     readonly "fdc3.instrument": {
         readonly label: "Instrument";
-        readonly icon: "moneh";
+        readonly icon: "money";
     };
     readonly "fdc3.instrumentList": {
         readonly label: "InstrumentList";

package/src/PredefinedConfig/Common/Fdc3Context.js

@@ -47,7 +47,7 @@ exports.ContextConfiguration = {
     },
     [exports.InstrumentContextKey]: {
         label: 'Instrument',
-        icon: 'moneh',
+        icon: 'money',
     },
     [exports.InstrumentListContextKey]: {
         label: 'InstrumentList',

package/src/Strategy/Fdc3Module.js

@@ -52,7 +52,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
         };
         if ((_a = intentConfig.contextMenu) === null || _a === void 0 ? void 0 : _a.icon) {
             const menuItemIcon = ((_b = intentConfig.contextMenu) === null || _b === void 0 ? void 0 : _b.icon) === '_defaultFdc3'
-                ? this.getFdc3Api().internalApi.getDefaultIconForContext(contextType)
+                ? this.getFdc3Api().internalApi.getDefaultIconForIntent(intentType)
                 : (_c = intentConfig.contextMenu) === null || _c === void 0 ? void 0 : _c.icon;
             menuItem.icon = menuItemIcon;
         }

package/src/Utilities/Constants/DocumentationLinkConstants.js

@@ -10,7 +10,7 @@ exports.ObservableQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-e
 exports.AggregatedBooleanQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation-boolean`;
 exports.AggregatedScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation-scalar`;
 exports.CumulativeAggregatedScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-cumulative`;
-exports.PredicateDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-predicate`;
+exports.PredicateDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-predicate`;
 exports.PrimaryKeyDocsLink = `${exports.HOST_URL_DOCS}/guide/getting-started-primary-key`;
 exports.LicenseDocsLink = `${exports.HOST_URL_DOCS}/guide/licensing`;
 exports.AdaptableOptionsDocsLink = `${exports.HOST_URL_DOCS}/guide/reference-options-overview`;

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

@@ -33,6 +33,7 @@ export declare const ADAPTABLE_ROW_ACTION_BUTTONS = "adaptableRowActionButtons";
 export declare const ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = "(ActionRowButtons)";
 export declare const ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = "(FDC3ActionColumn)";
 export declare const DEFAULT_DATE_FORMAT_PATTERN = "dd-MM-yyyy";
+export declare const BLANK_DISTINCT_COLUMN_VALUE = "[BLANKS]";
 export declare const SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE: number;
 export declare const QUICK_SEARCH_DEFAULT_BACK_COLOR: string;
 export declare const QUICK_SEARCH_DEFAULT_FORE_COLOR: string;

package/src/Utilities/Constants/GeneralConstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.SERVER_VALIDATION_MESSAGE_TYPE = exports.SERVER_VALIDATION_HEADER = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS = exports.AG_GRID_CHART_WINDOW = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_FDC3_COLUMN = exports.AB_ROW_ACTIONS_COLUMN = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
-exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = void 0;
+exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.SERVER_VALIDATION_MESSAGE_TYPE = exports.SERVER_VALIDATION_HEADER = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.BLANK_DISTINCT_COLUMN_VALUE = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS = exports.AG_GRID_CHART_WINDOW = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_FDC3_COLUMN = exports.AB_ROW_ACTIONS_COLUMN = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
+exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = void 0;
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const UIHelper_1 = require("../../View/UIHelper");
 exports.AUTOGENERATED_PK_COLUMN = '__ADAPTABLE_PK__';
@@ -36,6 +36,7 @@ exports.ADAPTABLE_ROW_ACTION_BUTTONS = 'adaptableRowActionButtons';
 exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = '(ActionRowButtons)';
 exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = '(FDC3ActionColumn)';
 exports.DEFAULT_DATE_FORMAT_PATTERN = 'dd-MM-yyyy';
+exports.BLANK_DISTINCT_COLUMN_VALUE = '[BLANKS]';
 /*
 Redux / State Defaults
 Try to put all our Redux / State defaults here and ONLY reference from here - avoid magic numbers / strings.

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -54,28 +54,18 @@ exports.DefaultAdaptableOptions = {
             BackColor: (0, UIHelper_1.getHexForName)(UIHelper_1.GRAY),
         },
     },
-    adaptableQLOptions: {
-        caseSensitiveTextComparisons: false,
+    expressionOptions: {
         evaluateAdaptableQLExternally: undefined,
-        expressionOptions: {
-            displayColumnFriendlyNamesForExpressions: true,
-            systemBooleanFunctions: undefined,
-            systemScalarFunctions: undefined,
-            systemObservableFunctions: undefined,
-            systemAggregatedBooleanFunctions: undefined,
-            systemAggregatedScalarFunctions: undefined,
-            moduleExpressionFunctions: undefined,
-            performExpressionValidation: true,
-            maxTimeframeSize: 28800000, // 8 hours
-        },
-        predicateOptions: {
-            customPredicateDefs: [],
-            systemFilterPredicates: AdaptablePredicate_1.SystemFilterPredicateIds,
-            systemAlertPredicates: AdaptablePredicate_1.SystemAlertPredicateIds,
-            systemFormatColumnPredicates: AdaptablePredicate_1.SystemFormatColumnPredicateIds,
-            systemFlashingCellPredicates: AdaptablePredicate_1.SystemFlashingCellPredicateIds,
-            systemBadgeStylePredicates: AdaptablePredicate_1.SystemBadgeStylePredicateIds,
-        },
+        displayColumnFriendlyNamesForExpressions: true,
+        systemBooleanFunctions: undefined,
+        systemScalarFunctions: undefined,
+        systemObservableFunctions: undefined,
+        systemAggregatedBooleanFunctions: undefined,
+        systemAggregatedScalarFunctions: undefined,
+        moduleExpressionFunctions: undefined,
+        performExpressionValidation: true,
+        maxTimeframeSize: 28800000,
+        caseSensitiveExpressions: false,
     },
     calendarOptions: { holidays: undefined },
     cellSummaryOptions: { cellSummaryOperations: undefined },
@@ -221,6 +211,16 @@ exports.DefaultAdaptableOptions = {
         quickFilterWildcards: {},
         showValuesCount: undefined,
         quickFilterValuesWidth: 180,
+        includeBlankFilterValues: false,
+    },
+    predicateOptions: {
+        customPredicateDefs: [],
+        systemFilterPredicates: AdaptablePredicate_1.SystemFilterPredicateIds,
+        systemAlertPredicates: AdaptablePredicate_1.SystemAlertPredicateIds,
+        systemFormatColumnPredicates: AdaptablePredicate_1.SystemFormatColumnPredicateIds,
+        systemFlashingCellPredicates: AdaptablePredicate_1.SystemFlashingCellPredicateIds,
+        systemBadgeStylePredicates: AdaptablePredicate_1.SystemBadgeStylePredicateIds,
+        caseSensitivePredicates: false,
     },
     quickSearchOptions: {
         excludeColumnFromQuickSearch: undefined,
@@ -228,6 +228,7 @@ exports.DefaultAdaptableOptions = {
         clearSearchesOnStartUp: false,
         quickSearchPlaceholder: 'Search',
         filterResultsAfterQuickSearch: false,
+        runQuickSearchWithCaseSensitivity: false,
     },
     stateOptions: {
         debounceStateDelay: 400,

package/src/Utilities/ExpressionFunctions/expressionFunctionUtils.js

@@ -19,7 +19,7 @@ const getStringValue = (context, stringArgument) => {
     return (0, exports.isTextSearchCaseInsensitive)(context) ? stringArgument.toLowerCase() : stringArgument;
 };
 exports.getStringValue = getStringValue;
-const isTextSearchCaseInsensitive = (context) => !context.adaptableApi.internalApi.isTextComparisonCaseSensitive();
+const isTextSearchCaseInsensitive = (context) => !context.adaptableApi.expressionApi.useCaseSensitivity();
 exports.isTextSearchCaseInsensitive = isTextSearchCaseInsensitive;
 // returns an observable which filters the source$ emissions and emits only if the CellDataChangedInfo relates to the given column
 // optionally, if a filter function (where clause) is provided, it is also evaluated

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js

@@ -428,7 +428,7 @@ const getSlidingTimeframe$ = (source$, timeframeDuration, onTimeframeEnter, onTi
     }));
 };
 const getMaxTimeframeSize = (expressionValue, context) => {
-    let maxTimeframeSize = context.adaptableApi.optionsApi.getAdaptableQLOptions().expressionOptions.maxTimeframeSize;
+    let maxTimeframeSize = context.adaptableApi.optionsApi.getExpressionOptions().maxTimeframeSize;
     if (maxTimeframeSize > SYSTEM_MAX_TIMEFRAME_SIZE) {
         maxTimeframeSize = SYSTEM_MAX_TIMEFRAME_SIZE;
     }

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -11,14 +11,13 @@ function assignAdaptableOptions(adaptableOptions) {
     const returnedAdaptableOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions, adaptableOptions);
     returnedAdaptableOptions.adaptableStateKey =
         (_a = returnedAdaptableOptions.adaptableStateKey) !== null && _a !== void 0 ? _a : returnedAdaptableOptions.adaptableId;
-    returnedAdaptableOptions.adaptableQLOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.adaptableQLOptions, adaptableOptions.adaptableQLOptions);
+    returnedAdaptableOptions.expressionOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.expressionOptions, adaptableOptions.expressionOptions);
     returnedAdaptableOptions.calendarOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.calendarOptions, adaptableOptions.calendarOptions);
     returnedAdaptableOptions.columnOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.columnOptions, adaptableOptions.columnOptions);
     returnedAdaptableOptions.customSortOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.customSortOptions, adaptableOptions.customSortOptions);
     returnedAdaptableOptions.dataSetOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.dataSetOptions, adaptableOptions.dataSetOptions);
     returnedAdaptableOptions.cellSummaryOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.cellSummaryOptions, adaptableOptions.cellSummaryOptions);
-    returnedAdaptableOptions.adaptableQLOptions.expressionOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.adaptableQLOptions.expressionOptions, returnedAdaptableOptions.adaptableQLOptions.expressionOptions);
-    returnedAdaptableOptions.adaptableQLOptions.predicateOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.adaptableQLOptions.predicateOptions, returnedAdaptableOptions.adaptableQLOptions.predicateOptions);
+    returnedAdaptableOptions.predicateOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.predicateOptions, returnedAdaptableOptions.predicateOptions);
     returnedAdaptableOptions.layoutOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.layoutOptions, adaptableOptions.layoutOptions);
     returnedAdaptableOptions.notificationsOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.notificationsOptions, adaptableOptions.notificationsOptions);
     returnedAdaptableOptions.alertOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.alertOptions, adaptableOptions.alertOptions);

package/src/Utilities/Services/QueryLanguageService.js

@@ -93,7 +93,7 @@ class QueryLanguageService {
             }
             const force = (_a = config === null || config === void 0 ? void 0 : config.force) !== null && _a !== void 0 ? _a : false;
             // see if validation should be performed
-            if (!this.adaptableApi.optionsApi.getAdaptableQLOptions().expressionOptions
+            if (!this.adaptableApi.optionsApi.getExpressionOptions()
                 .performExpressionValidation &&
                 !force) {
                 const result = { isValid: true, errorMessage: '' };
@@ -283,7 +283,7 @@ class QueryLanguageService {
     // if there are no specific functions defined, it falls back to the default values
     getModuleExpressionFunctionsMap(module) {
         var _a, _b, _c;
-        const expressionOptions = this.adaptableApi.optionsApi.getAdaptableQLOptions().expressionOptions;
+        const expressionOptions = this.adaptableApi.optionsApi.getExpressionOptions();
         if (module) {
             let cachedResult = this.cacheModuleSpecificExpressionFunctions.get(module);
             if (cachedResult) {
@@ -369,14 +369,14 @@ class QueryLanguageService {
         return generalExpressionFunctions;
     }
     evaluateCustomQueryVariable(functionName, args) {
-        var _a, _b, _c;
+        var _a, _b;
         const context = {
             adaptableApi: this.adaptableApi,
             userName: this.adaptableApi.optionsApi.getUserName(),
             adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
             args,
         };
-        const customQueryVariableDefinition = (_c = (_b = (_a = this.adaptableApi.optionsApi.getAdaptableQLOptions()) === null || _a === void 0 ? void 0 : _a.expressionOptions) === null || _b === void 0 ? void 0 : _b.customQueryVariables) === null || _c === void 0 ? void 0 : _c[functionName];
+        const customQueryVariableDefinition = (_b = (_a = this.adaptableApi.optionsApi.getExpressionOptions()) === null || _a === void 0 ? void 0 : _a.customQueryVariables) === null || _b === void 0 ? void 0 : _b[functionName];
         return typeof customQueryVariableDefinition === 'function'
             ? customQueryVariableDefinition(context)
             : customQueryVariableDefinition;

package/src/View/Export/ExportSelector.js

@@ -63,10 +63,10 @@ const ExportSelector = () => {
     // export
     const handleExport = () => {
         if (isCustomDestination(currentDestination)) {
-            adaptable.api.exportApi.sendReport(currentReport.Name, currentDestination.name);
+            adaptable.api.exportApi.runReport(currentReport.Name, currentDestination.name);
         }
         else {
-            adaptable.api.exportApi.sendReport(currentReport.Name, currentDestination);
+            adaptable.api.exportApi.runReport(currentReport.Name, currentDestination);
         }
     };
     return (React.createElement(React.Fragment, null,

package/src/agGrid/Adaptable.js

@@ -1284,7 +1284,7 @@ class Adaptable {
             return false;
         }
         const displayValue = (_a = this.api.gridApi.getDisplayValueFromRowNode(params.node, abColumn.columnId)) !== null && _a !== void 0 ? _a : '';
-        const ignoreCase = !this.api.internalApi.isTextComparisonCaseSensitive();
+        const ignoreCase = !this.adaptableOptions.quickSearchOptions.runQuickSearchWithCaseSensitivity;
         const v = ignoreCase ? String(displayValue).toLocaleLowerCase() : String(displayValue);
         const i = ignoreCase ? String(quickSearchValue).toLocaleLowerCase() : String(quickSearchValue);
         return v.indexOf(i) !== -1;
@@ -1907,7 +1907,13 @@ class Adaptable {
             else {
                 this.gridOptions.api.forEachNode((rowNode) => {
                     const gridCell = this.addDistinctColumnValue(rowNode, column.columnId);
-                    if (gridCell && gridCell.rawValue != undefined && gridCell.rowNode !== skipRowNode) {
+                    if (gridCell && gridCell.rowNode !== skipRowNode) {
+                        if (gridCell.rawValue == undefined &&
+                            this.adaptableOptions.filterOptions.includeBlankFilterValues) {
+                            gridCell.rawValue = GeneralConstants_1.BLANK_DISTINCT_COLUMN_VALUE;
+                            gridCell.displayValue = GeneralConstants_1.BLANK_DISTINCT_COLUMN_VALUE;
+                            gridCell.normalisedValue = GeneralConstants_1.BLANK_DISTINCT_COLUMN_VALUE;
+                        }
                         returnValues.push(gridCell);
                     }
                 });
@@ -1920,7 +1926,7 @@ class Adaptable {
             }
             return value;
         });
-        if (column.dataType == 'String' && this.api.internalApi.isTextComparisonCaseSensitive()) {
+        if (column.dataType == 'String' && this.api.predicateApi.useCaseSensitivity()) {
             uniqueVals = (0, uniqBy_1.default)(uniqueVals, (d) => d.displayValue.toLowerCase());
         }
         return uniqueVals.slice(0, this.adaptableOptions.filterOptions.maxFilterValuesToDisplay);

package/src/components/ExpressionEditor/BaseEditorInput.js

@@ -46,13 +46,13 @@ const getCategoryOrder = (category) => {
     return predefinedOrder[category] || 0;
 };
 const VarEditorButton = () => {
-    var _a, _b;
+    var _a;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const expressionOptions = (_b = (_a = adaptable.api.optionsApi.getAdaptableQLOptions()) === null || _a === void 0 ? void 0 : _a.expressionOptions) === null || _b === void 0 ? void 0 : _b.customQueryVariables;
-    if (!expressionOptions || Object.keys(expressionOptions).length === 0) {
+    const customQueryVariables = (_a = adaptable.api.optionsApi.getExpressionOptions()) === null || _a === void 0 ? void 0 : _a.customQueryVariables;
+    if (!customQueryVariables || Object.keys(customQueryVariables).length === 0) {
         return React.createElement(React.Fragment, null);
     }
-    return (React.createElement(React.Fragment, null, Object.keys(expressionOptions).map((varOption) => {
+    return (React.createElement(React.Fragment, null, Object.keys(customQueryVariables).map((varOption) => {
         const varString = `VAR('${varOption}')`;
         return (React.createElement(EditorButton_1.default, { data: varString, key: varOption }, varString));
     })));