@adaptabletools/adaptable 17.0.0-canary.0 → 17.0.0-canary.2

package/src/Strategy/ColumnFilterModule.js

@@ -9,6 +9,16 @@ export class ColumnFilterModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ColumnFilterModuleId, ModuleConstants.ColumnFilterFriendlyName, 'filter', 'FilterPopup', 'Advanced filtering capability allows users to see precisely the data they want', api);
     }
+    setModuleEntitlement() {
+        if (!this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
+            this.AccessLevel = 'Hidden';
+        }
+        else {
+            this.AccessLevel = this.api.internalApi
+                .getEntitlementService()
+                .getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
+        }
+    }
     getModuleAdaptableObjects() {
         return this.api.columnFilterApi.getColumnFilters();
     }
@@ -19,7 +29,7 @@ export class ColumnFilterModule extends AdaptableModuleBase {
         return false;
     }
     updateOldConfig() {
-        // Note: have updated Dasbhoard and Status bar but NOT Tool Panels
+        // Note: have updated Dashboard and Status bar but NOT Tool Panels
         // Update Module Buttons
         let updateModuleButtons = false;
         let moduleButtons = this.api.dashboardApi.getModuleButtons();
@@ -78,12 +88,11 @@ export class ColumnFilterModule extends AdaptableModuleBase {
                 }) });
         });
         if (updateStatusBars) {
-            console.log('wat', statusBars);
             this.api.statusBarApi.setStatusBarPanels(statusBars);
         }
     }
     handleAdaptableReady() {
-        if (this.api.optionsApi.getColumnFilterOptions().showQuickFilter == false) {
+        if (this.api.optionsApi.getColumnFilterOptions().quickFilterOptions.showQuickFilter == false) {
             this.api.columnFilterApi.hideQuickFilterBar();
         }
         const columnFilters = this.api.columnFilterApi.getColumnFilters();
@@ -94,61 +103,90 @@ export class ColumnFilterModule extends AdaptableModuleBase {
         });
     }
     addContextMenuItems(menuContext) {
-        let menuItemClickFunction = undefined;
         if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
             if (menuContext.adaptableColumn &&
                 menuContext.adaptableColumn.filterable &&
                 menuContext.isSingleSelectedColumn &&
-                menuContext.gridCell != null) {
-                let isMultiple = menuContext.selectedCellInfo.gridCells.length > 1;
-                let clickFunction = isMultiple
-                    ? () => {
-                        this.api.columnFilterApi.internalApi.createValuesColumnFilterForCells(menuContext.selectedCellInfo.gridCells);
-                    }
-                    : () => {
-                        this.api.columnFilterApi.internalApi.createEqualityColumnFilterForCell(menuContext.selectedCellInfo.gridCells[0]);
-                    };
-                menuItemClickFunction = this.createColumnMenuItemClickFunction(isMultiple ? 'Filter on Cell Values' : 'Filter on Cell Value', this.moduleInfo.Glyph, clickFunction);
+                menuContext.gridCell != null &&
+                this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
+                const existingColumnFilter = this.getExistingColumnFilter(menuContext.adaptableColumn);
+                if (!existingColumnFilter) {
+                    let isMultiple = menuContext.selectedCellInfo.gridCells.length > 1;
+                    let clickFunction = isMultiple
+                        ? () => {
+                            this.api.columnFilterApi.internalApi.createValuesColumnFilterForCells(menuContext.selectedCellInfo.gridCells);
+                        }
+                        : () => {
+                            this.api.columnFilterApi.internalApi.createEqualityColumnFilterForCell(menuContext.selectedCellInfo.gridCells[0]);
+                        };
+                    return [
+                        this.createColumnMenuItemClickFunction(isMultiple ? 'Filter on Cell Values' : 'Filter on Cell Value', this.moduleInfo.Glyph, clickFunction),
+                    ];
+                }
+                else {
+                    let filterSubMenuItems = [];
+                    filterSubMenuItems.push(this.createColumnMenuItemReduxAction('Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
+                    filterSubMenuItems.push(this.createColumnMenuItemClickFunction(existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
+                        ? () => {
+                            this.api.columnFilterApi.unSuspendColumnFilter(existingColumnFilter);
+                        }
+                        : () => {
+                            this.api.columnFilterApi.suspendColumnFilter(existingColumnFilter);
+                        }));
+                    return [
+                        {
+                            label: this.moduleInfo.FriendlyName,
+                            isVisible: true,
+                            module: this.moduleInfo.ModuleName,
+                            icon: {
+                                name: this.moduleInfo.Glyph,
+                            },
+                            subItems: filterSubMenuItems,
+                        },
+                    ];
+                }
             }
         }
-        return [menuItemClickFunction];
     }
     addColumnMenuItems(column) {
         let filterSubMenuItems = [];
-        if (column && this.api.gridApi.isQuickFilterAvailable()) {
-            const isFilterVisible = this.api.columnFilterApi.isQuickFilterVisible();
-            if (this.isModuleEditable() &&
-                this.api.columnApi.internalApi.usesAdaptableQuickFilter(column.columnId)) {
-                filterSubMenuItems.push(this.createColumnMenuItemReduxAction(isFilterVisible ? 'Hide Filter Bar' : 'Show Filter Bar', isFilterVisible ? 'unchecked' : 'check', isFilterVisible
-                    ? SystemRedux.SystemQuickFilterBarHide()
-                    : SystemRedux.SystemQuickFilterBarShow()));
+        if (column &&
+            column.filterable &&
+            this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
+            if (this.api.gridApi.isQuickFilterAvailable()) {
+                const isFilterVisible = this.api.columnFilterApi.isQuickFilterVisible();
+                if (this.isModuleEditable() &&
+                    this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
+                    filterSubMenuItems.push(this.createColumnMenuItemReduxAction(isFilterVisible ? 'Hide Filter Bar' : 'Show Filter Bar', isFilterVisible ? 'unchecked' : 'check', isFilterVisible
+                        ? SystemRedux.SystemQuickFilterBarHide()
+                        : SystemRedux.SystemQuickFilterBarShow()));
+                }
             }
-        }
-        if (column && this.canCreateColumnMenuItem(column, 'ReadOnly', 'filter')) {
-            const existingColumnFilter = this.api.columnFilterApi
-                .getColumnFilters()
-                .find((x) => x.ColumnId == column.columnId);
+            const existingColumnFilter = this.getExistingColumnFilter(column);
             if (existingColumnFilter) {
                 filterSubMenuItems.push(this.createColumnMenuItemReduxAction('Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
-                filterSubMenuItems.push(this.createColumnMenuItemReduxAction(existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'play' : 'pause', existingColumnFilter.IsSuspended
+                filterSubMenuItems.push(this.createColumnMenuItemReduxAction(existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
                     ? LayoutRedux.LayoutColumnFilterUnSuspend(existingColumnFilter)
                     : LayoutRedux.LayoutColumnFilterSuspend(existingColumnFilter)));
             }
-        }
-        if (ArrayExtensions.IsNotNullOrEmpty(filterSubMenuItems)) {
-            return [
-                {
-                    label: this.moduleInfo.FriendlyName,
-                    isVisible: true,
-                    module: this.moduleInfo.ModuleName,
-                    icon: {
-                        name: this.moduleInfo.Glyph,
+            if (ArrayExtensions.IsNotNullOrEmpty(filterSubMenuItems)) {
+                return [
+                    {
+                        label: this.moduleInfo.FriendlyName,
+                        isVisible: true,
+                        module: this.moduleInfo.ModuleName,
+                        icon: {
+                            name: this.moduleInfo.Glyph,
+                        },
+                        subItems: filterSubMenuItems,
                     },
-                    subItems: filterSubMenuItems,
-                },
-            ];
+                ];
+            }
         }
     }
+    getExistingColumnFilter(column) {
+        return this.api.columnFilterApi.getColumnFilters().find((x) => x.ColumnId == column.columnId);
+    }
     getTeamSharingAction() {
         return {
             ModuleEntities: this.api.columnFilterApi.getColumnFilters(),

package/src/Strategy/CustomSortModule.js

@@ -69,7 +69,7 @@ export class CustomSortModule extends AdaptableModuleBase {
             getUnSuspendAction: CustomSortRedux.CustomSortUnSuspend,
             getSuspendAllAction: CustomSortRedux.CustomSortSuspendAll,
             getUnSuspendAllAction: CustomSortRedux.CustomSortUnSuspendAll,
-            emptyView: "Click 'New' to create a custom Sort Order for a selected Column.",
+            emptyView: "Click 'New' to create a custom Sort Order for a selected Column",
             getEditWizard() {
                 return CustomSortWizard;
             },

package/src/Strategy/FlashingCellModule.js

@@ -91,7 +91,7 @@ export class FlashingCellModule extends AdaptableModuleBase {
                             ColumnIds: [column.columnId],
                         },
                         Rule: {
-                            Predicates: [{ PredicateId: 'Any' }],
+                            Predicates: [{ PredicateId: 'AnyChange' }],
                         },
                     })),
                 ];

package/src/Strategy/Interface/IModule.d.ts

@@ -20,8 +20,8 @@ export interface ModuleInfo {
     Description: string;
     HelpPage: string;
 }
-export declare type TeamSharingReferences = TeamSharingReference[];
-export declare type TeamSharingReference = {
+export type TeamSharingReferences = TeamSharingReference[];
+export type TeamSharingReference = {
     Module: StrictExtract<AdaptableModule, 'CalculatedColumn' | 'FreeTextColumn' | 'NamedQuery' | 'Alert' | 'CustomSort' | 'FlashingCell' | 'FormatColumn' | 'PlusMinus' | 'Shortcut' | 'Schedule'>;
     Reference: AdaptableObject;
 };
@@ -82,7 +82,7 @@ export interface AdaptableObjectCompactView {
     item: AdaptableObjectItemView;
     abObject: AdaptableObject;
 }
-export declare type AdaptableModuleViewAction = React.FunctionComponent<React.PropsWithChildren<{
+export type AdaptableModuleViewAction = React.FunctionComponent<React.PropsWithChildren<{
     data: AdaptableObject;
     accessLevel: AccessLevel;
 }>>;

package/src/Strategy/LayoutModule.js

@@ -13,6 +13,7 @@ import { getLayoutSortViewItems } from './Utilities/Layout/getLayoutSortViewItem
 import { WEIGHTED_AVERAGE_AGG_FN_NAME } from '../PredefinedConfig/Common/AggregationColumns';
 import { SHOW_PIVOT_COLUMN_DETAILS } from '../View/Components/Popups/WindowPopups/windowFactory';
 import flattenDeep from 'lodash/flattenDeep';
+import StringExtensions from '../Utilities/Extensions/StringExtensions';
 export class LayoutModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.LayoutModuleId, ModuleConstants.LayoutFriendlyName, 'grid', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
@@ -386,6 +387,10 @@ export class LayoutModule extends AdaptableModuleBase {
                     })
                         .filter(Boolean),
                 },
+                (layout === null || layout === void 0 ? void 0 : layout.GridFilter) && StringExtensions.IsNotNullOrEmpty(layout.GridFilter.Expression) && {
+                    name: 'Grid Filter',
+                    values: [layout.GridFilter.Expression],
+                },
             ].filter(Boolean),
             abObject: layout,
         };

package/src/Strategy/StyledColumnModule.js

@@ -10,27 +10,6 @@ export class StyledColumnModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.StyledColumnModuleId, ModuleConstants.StyledColumnFriendlyName, 'brush', 'StyledColumnPopup', // to change
         'Create a Special Column Style e.g Gradient or Percent Bar', api);
-        /**
-         * Use Case: Data (cell/row) has changed
-         * Action: Any CheckboxColumns need to be updated, as their disabled state may have changed
-         */
-        this.api.internalApi
-            .getDataService()
-            .on('CellDataChanged', (cellDataChangedInfo) => {
-            const activeCheckboxColumnIds = this.api.columnApi
-                .getColumns()
-                .filter((aColumn) => {
-                const checkboxColumn = this.api.styledColumnApi.internalApi.getCheckBoxStyleStyledColumn(aColumn);
-                return checkboxColumn && !checkboxColumn.IsSuspended;
-            })
-                .map((aColumn) => aColumn.columnId);
-            // no need to refresh the CheckboxColumns if the change was triggered by one of them
-            if (!activeCheckboxColumnIds.includes(cellDataChangedInfo.column.columnId)) {
-                this.api.internalApi
-                    .getAdaptableInstance()
-                    .refreshCells(null, activeCheckboxColumnIds, true, true);
-            }
-        });
     }
     updateOldConfig() {
         const formatColumnsWithColumnStyles = this.api.formatColumnApi
@@ -102,7 +81,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
             else if (!column.isSparkline) {
                 // Edit is common
                 if (styledColumn) {
-                    if (!styledColumn.IsReadOnly && !styledColumn.CheckBoxStyle) {
+                    if (!styledColumn.IsReadOnly) {
                         let defaultCurrentSectionName = undefined;
                         if (styledColumn.BadgeStyle) {
                             defaultCurrentSectionName = 'Badges';
@@ -170,30 +149,6 @@ export class StyledColumnModule extends AdaptableModuleBase {
                             break;
                     }
                 }
-                // Then do Checkbox - now removed as AG Grid 30 offers this
-                /*
-                if (column.dataType == 'Boolean' && !this.api.columnApi.isFreeTextColumn(column.columnId)) {
-                  const hasCheckBox: boolean = styledColumn && styledColumn?.CheckBoxStyle;
-                  if (hasCheckBox) {
-                    returnColumnMenuItems.push(
-                      this.createColumnMenuItemClickFunction('Remove Checkbox', 'unchecked', () => {
-                        this.api.styledColumnApi.deleteStyledColumn(styledColumn);
-                      })
-                    );
-                  } else {
-                    returnColumnMenuItems.push(
-                      this.createColumnMenuItemClickFunction('Show as Checkbox', 'checked', () => {
-                        const styledColumn = ObjectFactory.CreateEmptyStyledColumn();
-                        this.api.styledColumnApi.addStyledColumn({
-                          ...styledColumn,
-                          ColumnId: column.columnId,
-                          CheckBoxStyle: true,
-                        });
-                      })
-                    );
-                  }
-                }
-                */
             }
         }
         return returnColumnMenuItems;
@@ -205,9 +160,6 @@ export class StyledColumnModule extends AdaptableModuleBase {
         else if (styledColumn.PercentBarStyle) {
             return 'percent';
         }
-        else if (styledColumn.CheckBoxStyle) {
-            return 'check-circle';
-        }
         else if (styledColumn.SparkLineStyle) {
             return 'spark-line';
         }
@@ -225,7 +177,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
     }
     toView(styledColumn) {
         const specificTypeItems = [];
-        if (styledColumn.GradientStyle || styledColumn.PercentBarStyle || styledColumn.CheckBoxStyle) {
+        if (styledColumn.GradientStyle || styledColumn.PercentBarStyle) {
             specificTypeItems.push({
                 name: 'Style',
                 view: () => {
@@ -291,9 +243,6 @@ export class StyledColumnModule extends AdaptableModuleBase {
         else if (styledColumn.PercentBarStyle) {
             type = 'Percent Bar';
         }
-        else if (styledColumn.CheckBoxStyle) {
-            type = 'Check Box';
-        }
         else if (styledColumn.SparkLineStyle) {
             type = 'Spark Line';
         }

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

@@ -34,6 +34,9 @@ export declare const ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = "(ActionRowBut
 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 DEFAULT_STRING_DISPLAY_VALUE = "Hello World";
+export declare const DEFAULT_INTEGER_DISPLAY_VALUE = 12345;
+export declare const DEFAULT_DOUBLE_DISPLAY_VALUE = 12345.6789;
 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

@@ -33,6 +33,9 @@ export const ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = '(ActionRowButtons)';
 export const ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = '(FDC3ActionColumn)';
 export const DEFAULT_DATE_FORMAT_PATTERN = 'dd-MM-yyyy';
 export const BLANK_DISTINCT_COLUMN_VALUE = '[BLANKS]';
+export const DEFAULT_STRING_DISPLAY_VALUE = 'Hello World';
+export const DEFAULT_INTEGER_DISPLAY_VALUE = 12345;
+export const DEFAULT_DOUBLE_DISPLAY_VALUE = 12345.6789;
 /*
 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

@@ -178,17 +178,32 @@ export const DefaultAdaptableOptions = {
         contextMenuItems: undefined,
     },
     columnFilterOptions: {
-        hideQuickFilterDropdown: undefined,
-        hideQuickFilterInput: undefined,
+        quickFilterOptions: {
+            hideQuickFilterDropdown: undefined,
+            hideQuickFilterInput: undefined,
+            quickFilterTrigger: 'mouseenter',
+            quickFilterValuesTrigger: 'mouseenter',
+            quickFilterDebounce: 250,
+            quickFilterHeight: null,
+            showQuickFilter: true,
+            quickFilterWildcards: {},
+            quickFilterValuesWidth: 180,
+        },
+        filterFormOptions: {
+            useAgGridFilterFormStyle: true,
+            defaultFilterFormTab: 'Values',
+        },
+        valuesFilterOptions: {
+            sortValuesFilter: false,
+            filterValuesUsingTime: false,
+            showDistinctFilteredValuesOnly: false,
+            maxFilterValuesToDisplay: 2000,
+            includeBlankFilterValues: false,
+            showValuesCount: undefined,
+        },
         indicateFilteredColumns: true,
-        useAdaptableFilterForm: true,
-        useAgGridFilterFormStyle: true,
-        useAdaptableQuickFilter: true,
-        clearFiltersOnStartUp: false,
-        quickFilterTrigger: 'mouseenter',
-        quickFilterValuesTrigger: 'mouseenter',
-        quickFilterDebounce: 250,
-        quickFilterHeight: null,
+        useAdaptableColumnFiltering: true,
+        clearColumnFiltersOnStartUp: false,
         filterActionOnUserDataChange: {
             applyFilter: GeneralConstants.FILTER_ALWAYS,
             throttleDelay: 0,
@@ -198,22 +213,16 @@ export const DefaultAdaptableOptions = {
             throttleDelay: 0,
         },
         autoApplyFilter: true,
-        sortColumnValuesInFilter: false,
         defaultNumericColumnFilter: 'Equals',
         defaultStringColumnFilter: 'Contains',
         defaultDateColumnFilter: 'On',
-        defaultFilterFormTab: 'Values',
         enableFilterOnSpecialColumns: true,
-        filterUsingTime: false,
-        maxFilterValuesToDisplay: 2000,
-        showQuickFilter: true,
-        showDistinctFilteredValuesOnly: false,
         showClearFilterButton: false,
         showSuspendFilterButton: false,
-        quickFilterWildcards: {},
-        showValuesCount: undefined,
-        quickFilterValuesWidth: 180,
-        includeBlankFilterValues: false,
+    },
+    gridFilterOptions: {
+        availableFilterEditors: 'Both',
+        clearGridFilterOnStartUp: false,
     },
     predicateOptions: {
         customPredicateDefs: [],
@@ -228,11 +237,11 @@ export const DefaultAdaptableOptions = {
         excludeColumnFromQuickSearch: undefined,
         runQuickSearchOnRowGroups: true,
         runQuickSearchOnPivotColumns: true,
-        clearSearchesOnStartUp: false,
+        clearQuickSearchOnStartUp: false,
         quickSearchPlaceholder: 'Search',
         filterResultsAfterQuickSearch: false,
         runQuickSearchWithCaseSensitivity: false,
-        shouldApplyQuickSearch: undefined,
+        runBespokeQuickSearch: undefined,
     },
     stateOptions: {
         debounceStateDelay: 400,
@@ -275,7 +284,6 @@ export const DefaultAdaptableOptions = {
         permittedValues: undefined,
         editLookUpItems: undefined,
         showDocumentationLinks: true,
-        gridInfoSections: ['GridSummary', 'AdaptableOptions', 'ColumnInfo', 'AdaptableObjects'],
         showAdapTableVersion: true,
     },
     toolPanelOptions: {

package/src/Utilities/Defaults/DefaultSettingsPanel.d.ts

@@ -4,4 +4,4 @@ export declare const STANDALONE_MODULE_POPUPS: AdaptableModule[];
 /**
  * This constants determines the order and the items that appear in the navigation.
  */
-export declare const DEFAULT_NAVIGATION_ITEMS: (AdaptableSettingsPanel | '-')[];
+export declare const DEFAULT_SETTINGS_PANEL_NAVIGATION_ITEMS: (AdaptableSettingsPanel | '-')[];

package/src/Utilities/Defaults/DefaultSettingsPanel.js

@@ -6,7 +6,7 @@ export const STANDALONE_MODULE_POPUPS = [
 /**
  * This constants determines the order and the items that appear in the navigation.
  */
-export const DEFAULT_NAVIGATION_ITEMS = [
+export const DEFAULT_SETTINGS_PANEL_NAVIGATION_ITEMS = [
     'GridInfo',
     'ColumnInfo',
     'Dashboard',
@@ -29,7 +29,6 @@ export const DEFAULT_NAVIGATION_ITEMS = [
     'QuickSearch',
     'GridFilter',
     'ColumnFilter',
-    'NamedQuery',
     'DataSet',
     '-',
     'PlusMinus',
@@ -39,6 +38,7 @@ export const DEFAULT_NAVIGATION_ITEMS = [
     'Charting',
     'DataImport',
     'Schedule',
+    'NamedQuery',
     'StateManagement',
     'TeamSharing',
     'Notes',

package/src/Utilities/Emitter.d.ts

@@ -1,6 +1,6 @@
 /** based on emittery npm package, which is MIT */
-export declare type EmitterCallback = (data?: any) => any;
-export declare type EmitterAnyCallback = (eventName: string, data?: any) => any;
+export type EmitterCallback = (data?: any) => any;
+export type EmitterAnyCallback = (eventName: string, data?: any) => any;
 declare class Emittery {
     static mixin(emitteryPropertyName: string, methodNames: string[]): (target: any) => any;
     constructor();

package/src/Utilities/Emitter.js

@@ -66,9 +66,9 @@ class Emittery {
                 enumerable: false,
                 get: getEmitteryProperty,
             });
-            const emitteryMethodCaller = (methodName) => function (...args) {
+            const emitteryMethodCaller = (methodName) => (function(...args) {
                 return this[emitteryPropertyName][methodName](...args);
-            };
+            });
             for (const methodName of methodNames) {
                 Object.defineProperty(target.prototype, methodName, {
                     enumerable: false,

package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.d.ts

@@ -4,9 +4,9 @@ import { AggregatedScalarExpressionEvaluation } from './aggregatedScalarExpressi
 /**
  * List of all the Aggregation Functions available in AdaptableQL
  */
-export declare type AggregatedBooleanFunctionName = 'WHERE' | 'COL' | 'GROUP_BY' | 'WEIGHT' | AggregationFunction | ComparisonFunction;
-declare type AggregationFunction = 'SUM' | 'MIN' | 'MAX' | 'AVG' | 'COUNT';
-declare type ComparisonFunction = 'EQ' | 'NEQ' | 'LT' | 'GT' | 'LTE' | 'GTE';
+export type AggregatedBooleanFunctionName = 'WHERE' | 'COL' | 'GROUP_BY' | 'WEIGHT' | AggregationFunction | ComparisonFunction;
+type AggregationFunction = 'SUM' | 'MIN' | 'MAX' | 'AVG' | 'COUNT';
+type ComparisonFunction = 'EQ' | 'NEQ' | 'LT' | 'GT' | 'LTE' | 'GTE';
 export interface BooleanAggregationParameter extends BaseParameter<'aggregationBoolean', AggregationFunction> {
     scalarAggregation: ScalarAggregationOperand;
     conditionValue: number;

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.d.ts

@@ -5,9 +5,9 @@ import { AggregateParams } from './scalarAggregationHelper';
 /**
  * List of all the AggregatedScalar Functions available in AdaptableQL
  */
-export declare type AggregatedScalarFunctionName = ScalarAggregationFunction | OperandFunction;
-export declare type ScalarAggregationFunction = 'SUM' | 'PERCENTAGE' | 'QUANT' | 'QUARTILE' | 'PERCENTILE' | 'AVG' | 'MIN' | 'MAX' | 'COUNT' | 'CUMUL';
-declare type OperandFunction = 'COL' | 'OVER' | 'GROUP_BY' | 'WEIGHT';
+export type AggregatedScalarFunctionName = ScalarAggregationFunction | OperandFunction;
+export type ScalarAggregationFunction = 'SUM' | 'PERCENTAGE' | 'QUANT' | 'QUARTILE' | 'PERCENTILE' | 'AVG' | 'MIN' | 'MAX' | 'COUNT' | 'CUMUL';
+type OperandFunction = 'COL' | 'OVER' | 'GROUP_BY' | 'WEIGHT';
 export interface ScalarAggregationParameter extends BaseParameter<'aggregationScalar', ScalarAggregationFunction> {
     value: AggregatedScalarExpressionEvaluation;
 }

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.d.ts

@@ -2,7 +2,7 @@ import { ExpressionFunction } from '../../parser/src/types';
 /**
  * List of all the Boolean Functions available in AdaptableQL
  */
-export declare type BooleanFunctionName = 'EQ' | 'NEQ' | 'GT' | 'LT' | 'GTE' | 'LTE' | 'AND' | 'OR' | 'NOT' | 'BETWEEN' | 'IN' | 'CONTAINS' | 'STARTS_WITH' | 'ENDS_WITH' | 'ANY_CONTAINS' | 'TRUE' | 'FALSE';
+export type BooleanFunctionName = 'EQ' | 'NEQ' | 'GT' | 'LT' | 'GTE' | 'LTE' | 'AND' | 'OR' | 'NOT' | 'BETWEEN' | 'IN' | 'CONTAINS' | 'STARTS_WITH' | 'ENDS_WITH' | 'ANY_CONTAINS' | 'IS_NUMERIC' | 'REGEX' | 'IS_HOLIDAY' | 'IS_WORKDAY' | 'TRUE' | 'FALSE';
 export declare const booleanExpressionFunctions: Record<BooleanFunctionName, ExpressionFunction>;
 export declare const booleanExpressionFunctionsNames: BooleanFunctionName[];
 export declare const isBooleanAdaptableQlFunction: (functionName: string) => functionName is BooleanFunctionName;

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js

@@ -4,6 +4,7 @@ import isEqual from 'date-fns/isEqual';
 import { ExpressionEvaluationError } from '../../parser/src/ExpressionEvaluationError';
 import { getStringValue, getStringValues } from './expressionFunctionUtils';
 import { getTypedKeys } from '../Extensions/TypeExtensions';
+import { normalizeDateParam } from './dateUtils';
 export const booleanExpressionFunctions = {
     TRUE: {
         handler: () => {
@@ -134,7 +135,6 @@ export const booleanExpressionFunctions = {
         inputs: [
             ['number', 'number'],
             ['date', 'date'],
-            ['text', 'text'],
         ],
     },
     LTE: {
@@ -162,7 +162,6 @@ export const booleanExpressionFunctions = {
         inputs: [
             ['number', 'number'],
             ['date', 'date'],
-            ['text', 'text'],
         ],
     },
     GT: {
@@ -190,7 +189,6 @@ export const booleanExpressionFunctions = {
         inputs: [
             ['number', 'number'],
             ['date', 'date'],
-            ['text', 'text'],
         ],
     },
     GTE: {
@@ -218,7 +216,6 @@ export const booleanExpressionFunctions = {
         inputs: [
             ['number', 'number'],
             ['date', 'date'],
-            ['text', 'text'],
         ],
     },
     BETWEEN: {
@@ -230,7 +227,7 @@ export const booleanExpressionFunctions = {
         category: 'comparison',
         description: 'Returns true if 1st input is between 2nd and 3rd inputs',
         signatures: ['BETWEEN(input: number, lower: number, upper: number)'],
-        examples: ['BETWEEN(5, [col1], [col2])'],
+        examples: ['BETWEEN([col1], 10, 30)'],
         returnType: 'boolean',
         inputs: ['number', 'number', 'number'],
     },
@@ -297,6 +294,59 @@ export const booleanExpressionFunctions = {
         examples: ['ANY_CONTAINS("abc")'],
         returnType: 'boolean',
     },
+    IS_NUMERIC: {
+        handler(args) {
+            return !isNaN(Number(args[0]));
+        },
+        isHiddenFromMenu: false,
+        description: 'Returns true if input is numeric',
+        signatures: ['IS_NUMERIC(a: number)'],
+        examples: ['IS_NUMERIC([columnName])'],
+        category: 'maths',
+        returnType: 'boolean',
+        inputs: ['number'],
+    },
+    REGEX: {
+        handler(args) {
+            // dont need context as here we always want case insenstivity in the Regex
+            const firstInput = String(args[0]);
+            const regex = String(args[1]);
+            return RegExp(regex).test(firstInput);
+        },
+        isHiddenFromMenu: false,
+        description: 'Returns true if Regular Expression matches',
+        signatures: ['REGEX(a: string, b: pattern)'],
+        examples: ['REGEX([col1], "[A-Z]+")'],
+        inputs: ['text', 'text'],
+        category: 'strings',
+        returnType: 'boolean',
+    },
+    IS_HOLIDAY: {
+        handler(args, context) {
+            const dateToCheck = normalizeDateParam(args[0]);
+            return context.adaptableApi.calendarApi.isHoliday(dateToCheck);
+        },
+        isHiddenFromMenu: false,
+        description: 'Returns true if input date is a Holiday',
+        signatures: ['IS_HOLIDAY(a: date)'],
+        examples: ['IS_HOLIDAY([columnName])'],
+        category: 'dates',
+        returnType: 'boolean',
+        inputs: ['date'],
+    },
+    IS_WORKDAY: {
+        handler(args, context) {
+            const dateToCheck = normalizeDateParam(args[0]);
+            return context.adaptableApi.calendarApi.isWorkingDay(dateToCheck);
+        },
+        isHiddenFromMenu: false,
+        description: 'Returns true if input date is a Working Day',
+        signatures: ['IS_WORKDAY(a: date)'],
+        examples: ['IS_WORKDAY([columnName])'],
+        category: 'dates',
+        returnType: 'boolean',
+        inputs: ['date'],
+    },
 };
 export const booleanExpressionFunctionsNames = getTypedKeys(booleanExpressionFunctions);
 export const isBooleanAdaptableQlFunction = (functionName) => {

package/src/Utilities/ExpressionFunctions/dateUtils.d.ts

@@ -1 +1,2 @@
 export declare const normalizeDateParams: (args: [string | number | Date, string | number | Date]) => [number | Date, number | Date];
+export declare const normalizeDateParam: (args: string | number | Date) => Date;