@adaptabletools/adaptable 16.0.4 → 16.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "16.0.4",
+  "version": "16.0.5",
   "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: 1692947568539;
+declare const _default: 1693243382800;
 export default _default;

package/publishTimestamp.js

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

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
  */
@@ -73,7 +74,7 @@ export interface AdaptableOptions<TData = any> {
      * @defaultValue n/a (Mandatory)
      * @gridInfoItem
      */
-    primaryKey: Extract<keyof TData, string>;
+    primaryKey: string;
     /**
      * Name of current AdapTable user
      *
@@ -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/Fdc3Options.d.ts

@@ -298,12 +298,28 @@ export interface BroadcastConfig {
     /**
      * Custom FDC3 Action Column definition to broadcast the Context
      */
-    actionColumn?: {
-        columnId: string;
-        friendlyName?: string;
-        button: Fdc3AdaptableButton;
-        defaultWidth?: number;
-    };
+    actionColumn?: FDC3ActionColumn;
+}
+/**
+ * Action Column used for FDC3 workflows
+ */
+export interface FDC3ActionColumn {
+    /**
+     * Id of the Column
+     */
+    columnId: string;
+    /**
+     * Column's friendly name
+     */
+    friendlyName?: string;
+    /**
+     * FDC3 Button to display
+     */
+    button: Fdc3AdaptableButton;
+    /**
+     * Default Width of column
+     */
+    defaultWidth?: number;
 }
 /**
  * Context provided in `handleIntentResolution` callback
@@ -352,7 +368,7 @@ export interface Fdc3AdaptableButton {
      */
     icon?: '_defaultFdc3' | AdaptableIcon | ((button: Fdc3AdaptableButton, context: Fdc3ButtonContext) => AdaptableIcon);
     /**
-     * Button' Label; can be string or function that provides string
+     * Button's Label; can be string or function that provides string
      */
     label?: '_defaultFdc3' | string | ((button: Fdc3AdaptableButton, context: Fdc3ButtonContext) => string);
     /**

package/src/AdaptableOptions/FilterOptions.d.ts

@@ -205,6 +205,13 @@ export interface FilterOptions<TData = any> {
      * @defaultValue '180'
      */
     quickFilterValuesWidth?: 'auto' | number;
+    /**
+     * Includes a [BLANKS] entry in Values filter
+     * @defaultValue  false
+     * @gridInfoItem
+     * @noCodeItem
+     */
+    includeBlankFilterValues?: boolean;
 }
 /**
  * Context provided when Filtering

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;
+    /**
+     * Perform case-sensitive text comparisons when Quick Search
+     *
+     * @defaultValue false
+     * @gridInfoItem
+     * @noCodeItem
+     */
+    runQuickSearchWithCaseSensitivity?: boolean;
 }

package/src/Api/ExportApi.d.ts

@@ -65,13 +65,22 @@ export interface ExportApi {
      * @returns report schedule
      */
     getReportSchedules(): ReportSchedule[];
+    /**
+     * @deprecated use runReport instead
+     */
+    sendReport(reportName: string, destination: 'Excel' | 'CSV' | 'Clipboard' | 'JSON' | string): void;
     /**
      * Sends a Report to a given destination
      * @param reportName name of Report to send
      * @param destination destination to which Report will be sent
-     * @param destinationData any custom destination data
      */
-    sendReport(reportName: string, destination: 'Excel' | 'CSV' | 'Clipboard' | 'JSON' | string): void;
+    runReport(reportName: string, destination: 'Excel' | 'CSV' | 'Clipboard' | 'JSON' | string): void;
+    /**
+     * Sends a Report to a given destination
+     * @param systemReportName name of System Report to send
+     * @param destination destination to which Report will be sent
+     */
+    runSystemReport(systemReportName: 'Visual Data' | 'All Data' | 'Current Data' | 'Selected Cells' | 'Selected Rows', destination: 'Excel' | 'CSV' | 'Clipboard' | 'JSON' | string): void;
     /**
      * Selects the report in the dashboard and statusbar UI
      *
@@ -138,7 +147,7 @@ export interface ExportApi {
     isExternalReport(report: Report): boolean;
     /**
      * Runs the report function of the ExternalReport with the given reportName
-     * @param reportName custom report name
+     * @param reportName external report name
      */
     runExternalReport(reportName: string): ReportData | undefined;
     /**

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/FilterApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableColumn, ColumnFilter } from '../types';
+import { AdaptableColumn, ColumnFilter, ColumnFilterConfig } from '../types';
 import { AdaptablePredicateDef, ColumnFilterDef } from '../PredefinedConfig/Common/AdaptablePredicate';
 /**
  * Provides run-time access to Filter section of Adaptable State.
@@ -119,4 +119,10 @@ export interface FilterApi {
      * @param columnFilters Column Filters to use
      */
     columnFiltersToString(columnFilters: ColumnFilter[]): string;
+    /**
+     * Sets the Column Filter for a given Column
+     * @param columnId - Column ID to set Column Filter for
+     * @param columnFilterConfig - Column Filter to set
+     */
+    setColumnFilterForColumn(columnId: string, columnFilterConfig: ColumnFilterConfig): void;
 }

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/ExportApiImpl.d.ts

@@ -21,6 +21,8 @@ export declare class ExportApiImpl extends ApiBase implements ExportApi {
     getReports(): Report[];
     getReportSchedules(): ReportSchedule[];
     sendReport(reportName: string, destination: 'Excel' | 'CSV' | 'Clipboard' | 'JSON' | string): void;
+    runReport(reportName: string, destination: 'Excel' | 'CSV' | 'Clipboard' | 'JSON' | string): void;
+    runSystemReport(systemReportName: 'Visual Data' | 'All Data' | 'Current Data' | 'Selected Cells' | 'Selected Rows', destination: 'Excel' | 'CSV' | 'Clipboard' | 'JSON' | string): void;
     selectReport(reportName: string): void;
     selectDestination(destinationName: string): void;
     getCustomDestinations(): CustomDestination[];

package/src/Api/Implementation/ExportApiImpl.js

@@ -77,11 +77,17 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().Schedule.ReportSchedules;
     }
     sendReport(reportName, destination) {
+        this.runReport(reportName, destination);
+    }
+    runReport(reportName, destination) {
         let report = this.getReportByName(reportName);
         if (this.checkItemExists(report, reportName, 'Report')) {
             this.dispatchAction(ExportRedux.ExportApply(report, destination));
         }
     }
+    runSystemReport(systemReportName, destination) {
+        this.runReport(systemReportName, destination);
+    }
     selectReport(reportName) {
         this.dispatchAction(ExportRedux.ReportSelect(reportName));
     }

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/FilterApiImpl.d.ts

@@ -2,7 +2,7 @@ import { ApiBase } from './ApiBase';
 import { FilterApi } from '../FilterApi';
 import { AdaptablePredicateDef, ColumnFilterDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { ColumnFilter } from '../../types';
+import { ColumnFilter, ColumnFilterConfig } from '../../types';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { FilterInternalApi } from '../Internal/FilterInternalApi';
 export declare class FilterApiImpl extends ApiBase implements FilterApi {
@@ -34,6 +34,7 @@ export declare class FilterApiImpl extends ApiBase implements FilterApi {
      * @param filter
      */
     isFilterActive(filter: ColumnFilter): boolean;
+    setColumnFilterForColumn(columnId: string, columnFilterConfig: ColumnFilterConfig): void;
     suspendColumnFilter(columnFilter: ColumnFilter): void;
     unSuspendColumnFilter(columnFilter: ColumnFilter): void;
     suspendAllColumnFilters(): void;

package/src/Api/Implementation/FilterApiImpl.js

@@ -14,7 +14,7 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
     }
     getFilterPredicateDefsForColumn(column) {
         const scope = {
-            ColumnIds: [column.columnId]
+            ColumnIds: [column.columnId],
         };
         return this.getAdaptableApi()
             .predicateApi.internalApi.getFilterPredicateDefs(scope)
@@ -138,6 +138,19 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         });
         return allInputsHaveValues;
     }
+    setColumnFilterForColumn(columnId, columnFilterConfig) {
+        const columnFilterPredicate = {
+            PredicateId: columnFilterConfig.PredicateId,
+        };
+        if (columnFilterConfig.PredicateInputs) {
+            columnFilterPredicate.Inputs = columnFilterConfig.PredicateInputs;
+        }
+        const columnFilter = {
+            ColumnId: columnId,
+            Predicate: columnFilterPredicate,
+        };
+        this.setColumnFilters([columnFilter]);
+    }
     suspendColumnFilter(columnFilter) {
         this.dispatchAction(LayoutRedux.LayoutColumnFilterSuspend(columnFilter));
     }

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/Implementation/ScheduleApiImpl.js

@@ -198,7 +198,7 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         }
         else if (scheduleType == 'Report') {
             const reportSchedule = schedule;
-            this.adaptable.api.exportApi.sendReport(reportSchedule.ReportName, reportSchedule.ExportDestination);
+            this.adaptable.api.exportApi.runReport(reportSchedule.ReportName, reportSchedule.ExportDestination);
         }
         else if (scheduleType == 'ipushpull') {
             const ippApi = this.adaptable.api.pluginsApi.getipushpullPluginApi();

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;
         }