@adaptabletools/adaptable 16.0.5-canary.0 → 16.0.6-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "16.0.5-canary.0",
+  "version": "16.0.6-canary.0",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1693239636896;
+declare const _default: 1693295550840;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableOptions/AdaptableOptions.d.ts

@@ -17,7 +17,7 @@ import { DataChangeHistoryOptions } from './DataChangeHistoryOptions';
 import { SettingsPanelOptions } from './SettingsPanelOptions';
 import { FlashingCellOptions } from './FlashingCellOptions';
 import { AlertOptions } from './AlertOptions';
-import { AdaptableQLOptions } from './AdaptableQLOptions';
+import { ExpressionOptions } from './ExpressionOptions';
 import { ColumnOptions } from './ColumnOptions';
 import { ActionRowOptions } from './ActionRowOptions';
 import { ChartingOptions } from './ChartingOptions';
@@ -31,6 +31,7 @@ import { QuickSearchOptions } from './QuickSearchOptions';
 import { FormatColumnOptions } from './FormatColumnOptions';
 import { Fdc3Options } from './Fdc3Options';
 import { CommentOptions } from './CommentsOptions';
+import { PredicateOptions } from './PredicateOptions';
 /**
  * Large group of options enabling developers to set up AdapTable at design time to fit precise requirements
  */
@@ -90,10 +91,10 @@ export interface AdaptableOptions<TData = any> {
      */
     actionRowOptions?: ActionRowOptions<TData>;
     /**
-     * Options for managing AdapTableQL
+     * Options for managing AdapTableQL Expressions
      * @noCodeContainer
      */
-    adaptableQLOptions?: AdaptableQLOptions<TData>;
+    expressionOptions?: ExpressionOptions<TData>;
     /**
      * Options for managing Alerts in AdapTable
      *
@@ -216,6 +217,10 @@ export interface AdaptableOptions<TData = any> {
      * @noCodeContainer
      */
     notificationsOptions?: NotificationsOptions;
+    /**
+     * Options for managing Predicates in AdapTableQL
+     */
+    predicateOptions?: PredicateOptions;
     /**
      * Options for managing Search related functions in AdapTable
      *

package/src/AdaptableOptions/ExpressionOptions.d.ts

@@ -1,14 +1,17 @@
-import { ExpressionFunction } from '../parser/src/types';
-import { BooleanFunctionName } from '../Utilities/ExpressionFunctions/booleanExpressionFunctions';
-import { ScalarFunctionName } from '../Utilities/ExpressionFunctions/scalarExpressionFunctions';
-import { ObservableFunctionName } from '../Utilities/ExpressionFunctions/observableExpressionFunctions';
-import { AggregatedBooleanFunctionName } from '../Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions';
-import { AggregatedScalarFunctionName } from '../Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions';
-import { AdaptableColumnBase, AdaptableModule, BaseContext } from '../types';
+import { AdaptablePredicate } from '../PredefinedConfig/Common/AdaptablePredicate';
+import { AdaptableModule, AdaptableQLModule } from '../PredefinedConfig/Common/Types';
+import { BaseContext } from '../PredefinedConfig/Common/BaseContext';
+import { AdaptableColumn, AdaptableColumnBase } from '../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableObject, AggregatedBooleanFunctionName, AggregatedScalarFunctionName, BooleanFunctionName, ExpressionFunction, ObservableFunctionName, ScalarFunctionName } from '../types';
 /**
- * Options for managing Expressions using AdapTableQL
+ * Options for managing Expressions in AdapTable's Query Language
  */
-export interface ExpressionOptions {
+export interface ExpressionOptions<TData = any> {
+    /**
+     * Whether a Module (or specific expression) should be evaluated by AdapTableQL
+     * @defaultValue All Modules are evaluated by AdapTable
+     */
+    evaluateAdaptableQLExternally?: (context: EvaluateExpressionExternallyContext<TData>) => boolean;
     /**
      * System Boolean Expression Functions available in AdapTableQL
      *
@@ -88,12 +91,45 @@ export interface ExpressionOptions {
      */
     customQueryVariables?: Record<string, string | number | boolean | Date | ((context: CustomQueryVariableContext) => string | number | boolean | Date)>;
     /**
-   * Reference a Column's Header (i.e. FriendlyName) in all Expression overviews (instead of ColumnId)
-   *
-   * @defaultValue true
-   * @noCodeItem
-   */
+     * Reference a Column's Header (i.e. FriendlyName) in all Expression overviews (instead of ColumnId)
+     *
+     * @defaultValue true
+     * @noCodeItem
+     */
     displayColumnFriendlyNamesForExpressions?: boolean;
+    /**
+     * Perform case-sensitive text comparisons when evaluating Expressions
+     *
+     * @defaultValue false
+     * @gridInfoItem
+     * @noCodeItem
+     */
+    caseSensitiveExpressions?: boolean;
+}
+/**
+ * Context passed when evaluating `expressionOptions.evaluateExpressionExternally()`
+ */
+export interface EvaluateExpressionExternallyContext<TData = any> extends BaseContext {
+    /**
+     * Module where Expression is being evaluated
+     */
+    module: AdaptableQLModule;
+    /**
+     * AdapTable Object which contains the Expression or Predicates
+     */
+    object?: AdaptableObject;
+    /**
+     * Expression to evaluate
+     */
+    expression?: string;
+    /**
+     * Any Predicates to evaluate
+     */
+    predicates?: AdaptablePredicate[];
+    /**
+     * Columns contained in Expression
+     */
+    referencedColumns?: AdaptableColumn<TData>[];
 }
 /**
  * Module specific Expression Functions
@@ -163,7 +199,7 @@ export interface GlobalExpressionFunctionsContext<T> extends BaseContext {
     availableExpressionFunctionNames: T[];
 }
 /**
- * Context provided to ExpressionOptions.moduleExpressionFunctions property callback
+ * Context provided to moduleExpressionFunctions property callback
  */
 export interface ModuleExpressionFunctionsContext extends BaseContext {
     /**
@@ -192,7 +228,7 @@ export interface ModuleExpressionFunctionsContext extends BaseContext {
     availableAggregatedScalarFunctionNames: AggregatedScalarFunctionName[];
 }
 /**
- * Context passed when evaluating `ExpressionOptions.customQueryVariables`
+ * Context passed when evaluating customQueryVariables
  */
 export interface CustomQueryVariableContext extends BaseContext {
     /**

package/src/AdaptableOptions/PredicateOptions.d.ts

@@ -12,8 +12,8 @@ export interface PredicateOptions {
      */
     systemFilterPredicates?: SystemFilterPredicateIds | ((context: SystemPredicatesContext) => SystemFilterPredicateIds);
     /**
-   * Which System Badge Style Predicates are available
-   */
+     * Which System Badge Style Predicates are available
+     */
     systemBadgeStylePredicates?: SystemBadgeStylePredicateIds | ((context: SystemPredicatesContext) => SystemBadgeStylePredicateIds);
     /**
      * Which System Alert Predicates are available
@@ -27,6 +27,14 @@ export interface PredicateOptions {
      * Which System Flashing Cell Predicates are available
      */
     systemFlashingCellPredicates?: SystemFlashingCellPredicateIds | ((context: SystemPredicatesContext) => SystemFlashingCellPredicateIds);
+    /**
+     * Perform case-sensitive text comparisons when evaluating Predicates
+     *
+     * @defaultValue false
+     * @gridInfoItem
+     * @noCodeItem
+     */
+    caseSensitivePredicates?: boolean;
 }
 /**
  * Context used for setting which System Predicates are available

package/src/AdaptableOptions/QuickSearchOptions.d.ts

@@ -39,4 +39,12 @@ export interface QuickSearchOptions<TData = any> {
      * @noCodeItem
      */
     runQuickSearchOnRowGroups?: boolean;
+    /**
+     * Run Quick Search using Case Sensitivity
+     *
+     * @defaultValue false
+     * @gridInfoItem
+     * @noCodeItem
+     */
+    runQuickSearchWithCaseSensitivity?: boolean;
 }

package/src/Api/ExpressionApi.d.ts

@@ -57,4 +57,8 @@ export interface ExpressionApi {
      * @param query - the AdaptableQuery
      */
     getAdaptableQueryExpressionWithColumnFriendlyNames(query: Partial<AdaptableQuery>): string | undefined;
+    /**
+     * Whether Expressions are evaluated using Case Sensitivity
+     */
+    useCaseSensitivity(): boolean;
 }

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

@@ -7,11 +7,10 @@ import { ModuleInfo } from '../../Strategy/Interface/IModule';
 import { AdaptableOptions } from '../../AdaptableOptions/AdaptableOptions';
 import { AdaptableApi } from '../AdaptableApi';
 import { ExportOptions } from '../../AdaptableOptions/ExportOptions';
-import { ActionColumnApi, ActionColumnOptions, ActionRowApi, ActionRowOptions, AlertApi, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, ConfigApi, ContainerOptions, CustomSortApi, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, FilterApi, FilterOptions, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, LayoutApi, LayoutAssociatedObject, LayoutOptions, MenuOptions, PluginsApi, PlusMinusApi, PredicateApi, QueryApi, QuickSearchApi, QuickSearchOptions, ScheduleApi, ScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, UserInterfaceApi, UserInterfaceOptions } from '../../types';
+import { ActionColumnApi, ActionColumnOptions, ActionRowApi, ActionRowOptions, AlertApi, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, ConfigApi, ContainerOptions, CustomSortApi, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, FilterApi, FilterOptions, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, LayoutApi, LayoutAssociatedObject, LayoutOptions, MenuOptions, PluginsApi, PlusMinusApi, PredicateApi, PredicateOptions, QueryApi, QuickSearchApi, QuickSearchOptions, ScheduleApi, ScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, UserInterfaceApi, UserInterfaceOptions } from '../../types';
 import { NotificationsOptions } from '../../AdaptableOptions/NotificationsOptions';
 import { ToolPanelOptions } from '../../AdaptableOptions/ToolPanelOptions';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableQLOptions } from '../../AdaptableOptions/AdaptableQLOptions';
 import { ExpressionOptions } from '../../AdaptableOptions/ExpressionOptions';
 import { AlertOptions } from '../../AdaptableOptions/AlertOptions';
 import { ColumnOptions } from '../../AdaptableOptions/ColumnOptions';
@@ -80,14 +79,14 @@ export declare abstract class ApiBase {
     protected getLayoutOptions(): LayoutOptions;
     protected getMenuOptions(): MenuOptions;
     protected getFilterOptions(): FilterOptions;
-    protected getAdaptableQLOptions(): AdaptableQLOptions;
+    protected getExpressionOptions(): ExpressionOptions;
+    protected getPredicateOptions(): PredicateOptions;
     protected getQuickSearchOptions(): QuickSearchOptions;
     protected getFormatColumnOptions(): FormatColumnOptions;
     protected getStateOptions(): StateOptions;
     protected getTeamSharingOptions(): TeamSharingOptions;
     protected getUserInterfaceOptions(): UserInterfaceOptions;
     protected getToolPanelOptions(): ToolPanelOptions;
-    protected getExpressionOptions(): ExpressionOptions;
     protected getChartingOptions(): ChartingOptions;
     protected getDataChangeHistoryOptions(): DataChangeHistoryOptions;
     protected getEntitlementOptions(): EntitlementOptions;

package/src/Api/Implementation/ApiBase.js

@@ -147,8 +147,11 @@ class ApiBase {
     getFilterOptions() {
         return this.getOptions().filterOptions;
     }
-    getAdaptableQLOptions() {
-        return this.getOptions().adaptableQLOptions;
+    getExpressionOptions() {
+        return this.getOptions().expressionOptions;
+    }
+    getPredicateOptions() {
+        return this.getOptions().predicateOptions;
     }
     getQuickSearchOptions() {
         return this.getOptions().quickSearchOptions;
@@ -168,9 +171,6 @@ class ApiBase {
     getToolPanelOptions() {
         return this.getOptions().toolPanelOptions;
     }
-    getExpressionOptions() {
-        return this.getAdaptableQLOptions().expressionOptions;
-    }
     getChartingOptions() {
         return this.adaptable.adaptableOptions.chartingOptions;
     }

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

@@ -17,4 +17,5 @@ export declare class ExpressionApiImpl extends ApiBase implements ExpressionApi
     isColumnQueryable(adaptableColumnBase: AdaptableColumnBase): boolean;
     getAdaptableQueryExpression(query: Partial<AdaptableQuery>): string | undefined;
     getAdaptableQueryExpressionWithColumnFriendlyNames(query: Partial<AdaptableQuery>): string | undefined;
+    useCaseSensitivity(): boolean;
 }

package/src/Api/Implementation/ExpressionApiImpl.js

@@ -92,5 +92,9 @@ class ExpressionApiImpl extends ApiBase_1.ApiBase {
             .getQueryLanguageService()
             .getExpressionWithColumnFriendlyNames(this.getAdaptableQueryExpression(query));
     }
+    useCaseSensitivity() {
+        return this.adaptable.adaptableOptions.expressionOptions
+            .caseSensitiveExpressions;
+    }
 }
 exports.ExpressionApiImpl = ExpressionApiImpl;

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

@@ -1,8 +1,9 @@
 import { ApiBase } from './ApiBase';
-import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AdaptableQLOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, CommentOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, DataSetOptions, EditOptions, EntitlementOptions, ExportOptions, FilterOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, MenuOptions, NotificationsOptions, OptionsApi, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../../types';
+import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, CommentOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, DataSetOptions, EditOptions, EntitlementOptions, ExportOptions, FilterOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, MenuOptions, NotificationsOptions, OptionsApi, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../../types';
 import { GroupingOptions } from '../../AdaptableOptions/GroupingOptions';
 import { CustomSortOptions } from '../../AdaptableOptions/CustomSortOptions';
 import { Fdc3Options } from '../../AdaptableOptions/Fdc3Options';
+import { ExpressionOptions } from '../../AdaptableOptions/ExpressionOptions';
 export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getAdaptableId(): string;
     getAdaptableStateKey(): string;
@@ -29,7 +30,7 @@ export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getLayoutOptions(): LayoutOptions;
     getMenuOptions(): MenuOptions;
     getFilterOptions(): FilterOptions;
-    getAdaptableQLOptions(): AdaptableQLOptions;
+    getExpressionOptions(): ExpressionOptions;
     getQuickSearchOptions(): QuickSearchOptions;
     getFormatColumnOptions(): FormatColumnOptions;
     getStateOptions(): StateOptions;

package/src/Api/Implementation/OptionsApiImpl.js

@@ -78,8 +78,8 @@ class OptionsApiImpl extends ApiBase_1.ApiBase {
     getFilterOptions() {
         return this.getOptions().filterOptions;
     }
-    getAdaptableQLOptions() {
-        return this.getOptions().adaptableQLOptions;
+    getExpressionOptions() {
+        return this.getOptions().expressionOptions;
     }
     getQuickSearchOptions() {
         return this.getOptions().quickSearchOptions;

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

@@ -21,4 +21,5 @@ export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
     handleColumnPredicates(predicates: AdaptableColumnPredicate[], context: Omit<PredicateDefHandlerContext, 'adaptableApi' | 'inputs'>, defaultReturn: boolean): boolean;
     handlePredicate(predicate: AdaptablePredicate | undefined, context: Omit<PredicateDefHandlerContext, 'adaptableApi' | 'inputs'>, defaultReturn: boolean): boolean;
     handlePredicates(predicates: AdaptablePredicate[], params: Omit<PredicateDefHandlerContext, 'adaptableApi' | 'inputs'>, defaultReturn: boolean): boolean;
+    useCaseSensitivity(): boolean;
 }

package/src/Api/Implementation/PredicateApiImpl.js

@@ -19,8 +19,7 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
         return AdaptablePredicate_1.SystemPredicateDefs;
     }
     getCustomPredicateDefs() {
-        var _a;
-        return (_a = this.getAdaptableQLOptions().predicateOptions) === null || _a === void 0 ? void 0 : _a.customPredicateDefs;
+        return this.getPredicateOptions().customPredicateDefs;
     }
     getPredicateDefsByModuleScope(moduleScope) {
         return this.getPredicateDefs().filter((p) => p.moduleScope.includes(moduleScope));
@@ -111,5 +110,8 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
         }
         return predicates === null || predicates === void 0 ? void 0 : predicates.every((p) => this.handlePredicate(p, params, defaultReturn));
     }
+    useCaseSensitivity() {
+        return this.adaptable.adaptableOptions.predicateOptions.caseSensitivePredicates;
+    }
 }
 exports.PredicateApiImpl = PredicateApiImpl;

package/src/Api/Internal/AdaptableInternalApi.d.ts

@@ -90,7 +90,6 @@ export declare class AdaptableInternalApi extends ApiBase {
     createFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar'): void;
     destroyFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar'): void;
     initializeDataChangeHistory(): void;
-    isTextComparisonCaseSensitive(): boolean;
     executeWithProgressIndicator(label: string, executeFn: () => void, errorHandlingFn?: () => void): void;
     hideProgressIndicator(): void;
     getCorrectEnglishVariant(wordToSpell: string): string;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -253,9 +253,6 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
             this.dispatchAction(SystemRedux.SystemDataChangeHistoryDisable());
         }
     }
-    isTextComparisonCaseSensitive() {
-        return this.adaptable.adaptableOptions.adaptableQLOptions.caseSensitiveTextComparisons;
-    }
     executeWithProgressIndicator(label, executeFn, errorHandlingFn) {
         this.dispatchReduxAction((0, SystemRedux_1.SystemProgressIndicatorShow)(label));
         // setTimeout required to give the ProgressIndicator rendering a head-start (see RAF in ProgressIndicator implementation)
@@ -352,11 +349,11 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         return adaptableObjectTag;
     }
     getAdaptableQueryExpressionText(query) {
-        var _a, _b;
+        var _a;
         if (!query) {
             return '';
         }
-        const displayColumnFriendlyNames = (_b = (_a = this.adaptable.adaptableOptions.adaptableQLOptions) === null || _a === void 0 ? void 0 : _a.expressionOptions) === null || _b === void 0 ? void 0 : _b.displayColumnFriendlyNamesForExpressions;
+        const displayColumnFriendlyNames = (_a = this.adaptable.adaptableOptions.expressionOptions) === null || _a === void 0 ? void 0 : _a.displayColumnFriendlyNamesForExpressions;
         return displayColumnFriendlyNames
             ? this.adaptable.api.expressionApi.getAdaptableQueryExpressionWithColumnFriendlyNames(query)
             : this.adaptable.api.expressionApi.getAdaptableQueryExpression(query);

package/src/Api/Internal/ExpressionnternalApi.js

@@ -14,7 +14,7 @@ class ExpressionInternalApi extends ApiBase_1.ApiBase {
     }
     evaluateExpressionInAdaptableQL(module, object, expression) {
         var _a;
-        const evaluateExpressionExternallyFn = (_a = this.getAdaptableQLOptions()) === null || _a === void 0 ? void 0 : _a.evaluateAdaptableQLExternally;
+        const evaluateExpressionExternallyFn = (_a = this.getExpressionOptions()) === null || _a === void 0 ? void 0 : _a.evaluateAdaptableQLExternally;
         if (typeof evaluateExpressionExternallyFn !== 'function') {
             return true;
         }
@@ -37,7 +37,7 @@ class ExpressionInternalApi extends ApiBase_1.ApiBase {
     }
     evaluatePredicatesInAdaptableQL(module, object, predicates) {
         var _a;
-        const evaluateExpressionExternallyFn = (_a = this.getAdaptableQLOptions()) === null || _a === void 0 ? void 0 : _a.evaluateAdaptableQLExternally;
+        const evaluateExpressionExternallyFn = (_a = this.getExpressionOptions()) === null || _a === void 0 ? void 0 : _a.evaluateAdaptableQLExternally;
         if (typeof evaluateExpressionExternallyFn !== 'function') {
             return true;
         }

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

@@ -50,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();
@@ -93,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();
@@ -262,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;
@@ -281,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;
@@ -300,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;
@@ -318,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;
@@ -336,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);
@@ -354,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/Strategy/Fdc3Module.js

@@ -49,6 +49,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
                 this.getFdc3Api().raiseIntentFromRow(rowNode, intentType, contextType);
             },
             isVisible: true,
+            module: 'Fdc3',
         };
         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'
@@ -67,6 +68,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
                 this.getFdc3Api().broadcastFromRow(rowNode, contextType);
             },
             isVisible: true,
+            module: 'Fdc3',
         };
         if ((_a = contextConfig.contextMenu) === null || _a === void 0 ? void 0 : _a.icon) {
             const menuItemIcon = ((_b = contextConfig.contextMenu) === null || _b === void 0 ? void 0 : _b.icon) === '_defaultFdc3'

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/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 },
@@ -223,12 +213,22 @@ exports.DefaultAdaptableOptions = {
         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,
         runQuickSearchOnRowGroups: false,
         clearSearchesOnStartUp: false,
         quickSearchPlaceholder: 'Search',
         filterResultsAfterQuickSearch: false,
+        runQuickSearchWithCaseSensitivity: false,
     },
     stateOptions: {
         debounceStateDelay: 400,