@adaptabletools/adaptable 12.0.3 → 12.0.6

package/package.json

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

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1656962682750;
+declare const _default: 1657449987893;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableOptions/ExportOptions.d.ts

@@ -72,15 +72,15 @@ export interface CustomReport {
  */
 export interface CustomDestination {
     /**
-     * Name of Custom Destination
+     * Name of Custom Destination (mandatory)
      */
     name: string;
     /**
-     * Optional Adaptable Form - if provided, it must include Buttons that will execute the export
+     * Optional Adaptable Form; if provided, it must include Buttons that will execute the Export
      */
     form?: AdaptableForm<ExportFormContext>;
     /**
-     * Function invoked when export is applied (used if no form is supplied)
+     * Optional Function invoked when Export is applied (used if no form is supplied)
      */
     onExport?: (reportContext: ReportContext) => void;
 }

package/src/Api/Events/SearchChanged.d.ts

@@ -7,7 +7,7 @@ import { ColumnFilter, DataSet } from '../../types';
  */
 export interface SearchChangedInfo extends BaseEventInfo {
     /**
-     * What search-related change caused the event to fire
+     * How Search was changed: 'CurrentQuery', 'Filter', 'DataChange' or 'Sort'
      */
     searchChangedTrigger: 'CurrentQuery' | 'Filter' | 'DataChange' | 'Sort';
     /**

package/src/Api/FormatColumnApi.d.ts

@@ -199,4 +199,9 @@ export interface FormatColumnApi {
      * @param options formatter options
      */
     getDateFormattedValue(value: any, node: RowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): string;
+    /**
+     * Checks if a Format Column contains a Custom Display Formatter
+     * @param formatColumn Format Column
+     */
+    hasCustomDisplayFormatter(formatColumn: FormatColumn): boolean;
 }

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

@@ -48,4 +48,5 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     getNumberFormattedValue(value: any, node: RowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): string;
     getStringFormattedValue(value: any, node: RowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): string;
     getDateFormattedValue(value: any, node: RowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): string;
+    hasCustomDisplayFormatter(formatColumn: FormatColumn): boolean;
 }

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -293,6 +293,9 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         }, customDisplayFormatterContext);
     }
     getNumberFormattedValue(value, node, abColumn, options) {
+        if (!value) {
+            return undefined;
+        }
         const preparedValue = this.applyCustomFormatters(value, node, abColumn, options);
         return FormatHelper_1.default.NumberFormatter(preparedValue, options);
     }
@@ -301,8 +304,27 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         return FormatHelper_1.default.StringFormatter(preparedValue, options);
     }
     getDateFormattedValue(value, node, abColumn, options) {
+        if (!value) {
+            return undefined;
+        }
         const preparedValue = this.applyCustomFormatters(value, node, abColumn, options);
-        return FormatHelper_1.default.DateFormatter(preparedValue, options);
+        const dateFormatterOptions = options;
+        // only use DateFormatter if we have a pattern
+        return dateFormatterOptions.Pattern
+            ? FormatHelper_1.default.DateFormatter(preparedValue, options)
+            : preparedValue;
+    }
+    hasCustomDisplayFormatter(formatColumn) {
+        var _a;
+        if (!formatColumn || !formatColumn.DisplayFormat || !formatColumn.DisplayFormat.Options) {
+            return false;
+        }
+        const options = formatColumn.DisplayFormat.Options;
+        const columnCustomFormatters = (_a = options === null || options === void 0 ? void 0 : options.CustomDisplayFormats) !== null && _a !== void 0 ? _a : [];
+        if (!(columnCustomFormatters === null || columnCustomFormatters === void 0 ? void 0 : columnCustomFormatters.length)) {
+            return false;
+        }
+        return true;
     }
 }
 exports.FormatColumnApiImpl = FormatColumnApiImpl;

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

@@ -14,6 +14,7 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     fireLayoutChangedEvent(trigger: string, oldSate: LayoutState, newState: LayoutState): void;
     getCurrentLayout(): Layout;
     getCurrentLayoutColumnSort(columnId: string): ColumnSort['SortOrder'] | null;
+    areDraftAndCurrentLayoutEqual(): boolean;
     getCurrentLayoutName(): string;
     getLayoutByName(layoutName: string): Layout | null;
     getAllLayout(): Layout[];

package/src/Api/Implementation/LayoutApiImpl.js

@@ -76,6 +76,12 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         const currentLayout = this.getCurrentLayout();
         return ((_d = (_c = (_b = (_a = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.ColumnSorts) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, (sort) => sort.ColumnId === columnId)) === null || _c === void 0 ? void 0 : _c.SortOrder) !== null && _d !== void 0 ? _d : null);
     }
+    areDraftAndCurrentLayoutEqual() {
+        const state = this.getAdaptableState();
+        const currentLayout = this.getLayoutByName(state.Layout.CurrentLayout);
+        const draftLayout = state.Grid.CurrentLayout;
+        return this.areLayoutsEqual(currentLayout, draftLayout);
+    }
     getCurrentLayoutName() {
         return this.getAdaptableState().Layout.CurrentLayout;
     }

package/src/Api/LayoutApi.d.ts

@@ -198,4 +198,9 @@ export interface LayoutApi {
      * @param layoutName layout from which to remove Column
      */
     removeColumnFromLayout(columnId: string, layoutName: string): void;
+    /**
+     * Checks if the draft layout and the current layout are the same.
+     * Useful when `autoSaveLayouts=true`
+     */
+    areDraftAndCurrentLayoutEqual(): boolean;
 }

package/src/PredefinedConfig/ChartingState.d.ts

@@ -10,7 +10,7 @@ export interface ChartDefinition {
     model: ChartModel;
 }
 /**
- * Predefined Configuration for Quick Search Module
+ * Used for persisting AG Grids in Adaptable State
  */
 export interface ChartingState extends ConfigState {
     /**

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

@@ -3,7 +3,7 @@
  */
 export interface SpecialColumnSettings {
     /**
-     * Preferred width (in pixels) for Column; if unset, calculated dynamically by AG Grid
+     * Preferred (pixel) Column Width; if unset, calculated dynamically by AG Grid
      */
     Width?: number;
     /**

package/src/Redux/Store/AdaptableStore.js

@@ -682,12 +682,18 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     if (adaptable.adaptableOptions.searchOptions.filterResultsAfterQuickSearch) {
                         const actionTyped = action;
                         const searchText = actionTyped.quickSearchText;
+                        //  const gridOptions = adaptable.api.gridApi.getAgGridInstance();
                         if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(searchText)) {
+                            // Currently using this but any searchable would allow us to limit the cols checked
                             const queryText = 'ANY_CONTAINS("' + searchText + '") ';
+                            // const queryText = 'ANY_SEARCHABLE_CONTAINS("' + searchText + '") ';
                             adaptable.api.queryApi.setCurrentQuery(queryText);
+                            // Better still would be to use ag grid if that is possible?
+                            //    gridOptions.api.setQuickFilter(searchText);
                         }
                         else {
                             adaptable.api.queryApi.clearCurrentQuery();
+                            //  gridOptions.api.setQuickFilter('');
                         }
                     }
                     return returnAction;

package/src/Strategy/FormatColumnModule.js

@@ -247,7 +247,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 },
                 {
                     name: 'Display Format',
-                    values: [FormatColumnFormatWizardSection_1.getFormatColumnFormatSummaryValue(formatColumn, this.api.formatColumnApi)],
+                    values: [FormatColumnFormatWizardSection_1.getFormatColumnFormatSummaryValue(formatColumn, this.api)],
                 },
                 getFormatColumnSettingsViewItems_1.getFormatColumnSettingsViewItems(formatColumn),
                 getObjectTagsViewItems_1.getObjectTagsViewItems(formatColumn, this.api),

package/src/Strategy/LayoutModule.js

@@ -10,6 +10,7 @@ const LayoutRadioSelector_1 = require("../View/Layout/LayoutRadioSelector");
 const LayoutStatusBarSubPanelPopover_1 = require("../View/Layout/LayoutStatusBarSubPanelPopover");
 const EditCurrentLayoutButton_1 = require("../View/Layout/EditCurrentLayoutButton");
 const LayoutCloneButton_1 = require("../View/Layout/LayoutCloneButton");
+const SaveLayoutButton_1 = require("../View/Layout/SaveLayoutButton");
 class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.LayoutModuleId, 'Layout', 'layout', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
@@ -293,7 +294,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     content: text,
                     popover: popover,
                     popoverMinWidth: 150,
-                    extraActions: [EditCurrentLayoutButton_1.EditCurrentLayoutButton],
+                    extraActions: [EditCurrentLayoutButton_1.EditCurrentLayoutButton, SaveLayoutButton_1.SaveLayoutButton],
                 };
             },
         };

package/src/Utilities/Constants/DocumentationLinkConstants.js

@@ -7,8 +7,8 @@ exports.ExpressionEditorDocsLink = `${exports.HOST_URL_DOCS}/guide/ui-expression
 exports.BooleanQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-boolean`;
 exports.ScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-scalar`;
 exports.ObservableQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-observable`;
-exports.AggregatedBooleanQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation#aggregated-boolean-expressions`;
-exports.AggregatedScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation#aggregated-scalar-expressions`;
+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.PredicateDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-predicate`;
 exports.PrimaryKeyDocsLink = `${exports.HOST_URL_DOCS}/guide/dev-guide-tutorial-primary-key`;
 exports.LicenseDocsLink = `${exports.HOST_URL_DOCS}/guide/licensing`;

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

@@ -28,6 +28,7 @@ export declare const AG_GRID_GROUPED_COLUMN: string;
 export declare const AG_GRID_PIVOT_COLUMN: string;
 export declare const ADAPTABLE_ROW_ACTION_BUTTONS = "adaptableRowActionButtons";
 export declare const ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = "(ActionRowButtons)";
+export declare const DEFAULT_DATE_FORMAT_PATTERN = "dd-MM-yyyy";
 export declare const SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE: number;
 export declare const QUICK_SEARCH_DEFAULT_BACK_COLOR: string;
 export declare const QUICK_SEARCH_DEFAULT_FORE_COLOR: string;

package/src/Utilities/Constants/GeneralConstants.js

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

package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.js

@@ -28,7 +28,7 @@ exports.aggregatedBooleanExpressionFunctions = {
     SUM: {
         handler(args, context) {
             const columnParameter = expressionFunctionUtils_1.extractColumnParameter('SUM', args);
-            expressionFunctionUtils_1.validateColumnType(columnParameter.value, ['Number'], 'SUM', context.api);
+            expressionFunctionUtils_1.validateColumnType(columnParameter.value, ['Number'], 'SUM', context.adaptableApi);
             const sumAggregationFn = (dataSource$) => getSumAggregation$(dataSource$, getColumnValueSum(columnParameter.value, context));
             const result = {
                 type: 'aggregation',
@@ -195,15 +195,15 @@ const getSumAggregation$ = (source$, initialSum) => {
 };
 const getColumnValueSum = (column, context) => {
     let sum = 0;
-    context.api.internalApi.forAllRowNodesDo((rowNode) => {
+    context.adaptableApi.internalApi.forAllRowNodesDo((rowNode) => {
         // if there is a WHERE clause defined, check if the current rowNode satisfies the condition
         if (context.filterFn && !context.filterFn(rowNode)) {
             return;
         }
-        if (context.api.gridApi.isGroupRowNode(rowNode)) {
+        if (context.adaptableApi.gridApi.isGroupRowNode(rowNode)) {
             return;
         }
-        const cellValue = context.api.gridApi.getRawValueFromRowNode(rowNode, column);
+        const cellValue = context.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, column);
         if (cellValue != undefined) {
             sum = sum + expressionFunctionUtils_1.getNumericValue(rowNode.data[column]);
         }

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -8,7 +8,7 @@ exports.aggregatedScalarExpressionFunctions = {
         handler(args, context) {
             const sumColumnParameter = expressionFunctionUtils_1.extractColumnParameter('SUM', args);
             const sumColumnName = sumColumnParameter.value;
-            expressionFunctionUtils_1.validateColumnType(sumColumnName, ['Number'], 'SUM', context.api);
+            expressionFunctionUtils_1.validateColumnType(sumColumnName, ['Number'], 'SUM', context.adaptableApi);
             const groupByParameter = expressionFunctionUtils_1.extractParameter('SUM', 'operand', ['GROUP_BY'], args, true);
             const aggregationExpressionEvaluation = {
                 aggregationParams: {
@@ -50,7 +50,7 @@ exports.aggregatedScalarExpressionFunctions = {
             var _a;
             const percentageColumnParameter = expressionFunctionUtils_1.extractColumnParameter('PERCENTAGE', args);
             const percentageColumnName = percentageColumnParameter.value;
-            expressionFunctionUtils_1.validateColumnType(percentageColumnName, ['Number'], 'PERCENTAGE', context.api);
+            expressionFunctionUtils_1.validateColumnType(percentageColumnName, ['Number'], 'PERCENTAGE', context.adaptableApi);
             const sumOperand = expressionFunctionUtils_1.extractParameter('PERCENTAGE', 'aggregation', ['SUM'], args, true);
             const groupByOperand = expressionFunctionUtils_1.extractParameter('PERCENTAGE', 'operand', ['GROUP_BY'], args, true);
             if (sumOperand && groupByOperand) {
@@ -79,7 +79,7 @@ exports.aggregatedScalarExpressionFunctions = {
                     },
                 },
                 rowValueGetter: (rowNode, aggregationValue) => {
-                    return ((context.api.gridApi.getRawValueFromRowNode(rowNode, percentageColumnName) /
+                    return ((context.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, percentageColumnName) /
                         aggregationValue) *
                         100);
                 },
@@ -118,7 +118,7 @@ exports.aggregatedScalarExpressionFunctions = {
         handler(args, context) {
             const avgColumnParameter = expressionFunctionUtils_1.extractColumnParameter('AVG', args);
             const avgColumnName = avgColumnParameter.value;
-            expressionFunctionUtils_1.validateColumnType(avgColumnName, ['Number'], 'AVG', context.api);
+            expressionFunctionUtils_1.validateColumnType(avgColumnName, ['Number'], 'AVG', context.adaptableApi);
             const groupByParameter = expressionFunctionUtils_1.extractParameter('AVG', 'operand', ['GROUP_BY'], args, true);
             const aggregationExpressionEvaluation = {
                 aggregationParams: {
@@ -162,7 +162,7 @@ exports.aggregatedScalarExpressionFunctions = {
         handler(args, context) {
             const minColumnParameter = expressionFunctionUtils_1.extractColumnParameter('MIN', args);
             const minColumnName = minColumnParameter.value;
-            expressionFunctionUtils_1.validateColumnType(minColumnName, ['Number'], 'MIN', context.api);
+            expressionFunctionUtils_1.validateColumnType(minColumnName, ['Number'], 'MIN', context.adaptableApi);
             const groupByParameter = expressionFunctionUtils_1.extractParameter('MIN', 'operand', ['GROUP_BY'], args, true);
             const aggregationExpressionEvaluation = {
                 aggregationParams: {
@@ -203,7 +203,7 @@ exports.aggregatedScalarExpressionFunctions = {
         handler(args, context) {
             const maxColumnParameter = expressionFunctionUtils_1.extractColumnParameter('MAX', args);
             const maxColumnName = maxColumnParameter.value;
-            expressionFunctionUtils_1.validateColumnType(maxColumnName, ['Number'], 'MAX', context.api);
+            expressionFunctionUtils_1.validateColumnType(maxColumnName, ['Number'], 'MAX', context.adaptableApi);
             const groupByParameter = expressionFunctionUtils_1.extractParameter('MAX', 'operand', ['GROUP_BY'], args, true);
             const aggregationExpressionEvaluation = {
                 aggregationParams: {
@@ -284,7 +284,7 @@ exports.aggregatedScalarExpressionFunctions = {
     OVER: {
         handler(args, context) {
             const columnParameter = expressionFunctionUtils_1.extractColumnParameter('OVER', args);
-            expressionFunctionUtils_1.validateColumnType(columnParameter.value, ['Number', 'Date'], 'OVER', context.api);
+            expressionFunctionUtils_1.validateColumnType(columnParameter.value, ['Number', 'Date'], 'OVER', context.adaptableApi);
             const result = {
                 type: 'operand',
                 name: 'OVER',

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js

@@ -225,18 +225,40 @@ exports.booleanExpressionFunctions = {
         handler(args, context) {
             var _a;
             const searchTerm = expressionFunctionUtils_1.getStringValue(context, String(args[0]));
-            return (_a = context.api) === null || _a === void 0 ? void 0 : _a.columnApi.getColumns().some((column) => {
+            return (_a = context.adaptableApi) === null || _a === void 0 ? void 0 : _a.columnApi.getColumns().some((column) => {
                 var _a;
-                const value = (_a = context.api) === null || _a === void 0 ? void 0 : _a.gridApi.getDisplayValueFromRowNode(context.node, column.columnId);
+                const value = (_a = context.adaptableApi) === null || _a === void 0 ? void 0 : _a.gridApi.getDisplayValueFromRowNode(context.node, column.columnId);
                 const columnValue = expressionFunctionUtils_1.getStringValue(context, String(value));
                 return columnValue.indexOf(searchTerm) !== -1;
             });
         },
         isPredicate: true,
-        description: 'Returns true if any column contains input',
+        description: 'Returns true if any Column contains input',
         signatures: ['ANY_CONTAINS(value)'],
         examples: ['ANY_CONTAINS("abc")'],
     },
+    /*
+    ANY_SEARCHABLE_CONTAINS: {
+      handler(args, context) {
+        const searchTerm = getStringValue(context, String(args[0]));
+        return context.api?.columnApi
+          .getVisibleColumns()
+          .filter((c) => !c.isExcludedFromQuickSearch)
+          .some((column) => {
+            const value = context.api?.gridApi.getDisplayValueFromRowNode(
+              context.node,
+              column.columnId
+            );
+            const columnValue = getStringValue(context, String(value));
+            return columnValue.indexOf(searchTerm) !== -1;
+          });
+      },
+      isPredicate: true,
+      description: 'Returns true if any Searchable Column contains input',
+      signatures: ['ANY_SEARCHABLE_CONTAINS(value)'],
+      examples: ['ANY_SEARCHABLE_CONTAINS("abc")'],
+    },
+  */
     QUERY: {
         handler(args, context) {
             var _a, _b;
@@ -244,7 +266,7 @@ exports.booleanExpressionFunctions = {
             if (StringExtensions_1.default.IsNullOrEmpty(namedQueryName)) {
                 return false;
             }
-            const namedQuery = (_a = context.api) === null || _a === void 0 ? void 0 : _a.queryApi.getNamedQueryByName(namedQueryName);
+            const namedQuery = (_a = context.adaptableApi) === null || _a === void 0 ? void 0 : _a.queryApi.getNamedQueryByName(namedQueryName);
             if (!namedQuery) {
                 throw new ExpressionEvaluationError_1.ExpressionEvaluationError('QUERY', `Named Query with name ${namedQueryName} not found!`);
             }

package/src/Utilities/ExpressionFunctions/expressionFunctionUtils.js

@@ -19,12 +19,12 @@ const getStringValue = (context, stringArgument) => {
     return exports.isTextSearchCaseInsensitive(context) ? stringArgument.toLowerCase() : stringArgument;
 };
 exports.getStringValue = getStringValue;
-const isTextSearchCaseInsensitive = (context) => !context.api.internalApi.isTextComparisonCaseSensitive();
+const isTextSearchCaseInsensitive = (context) => !context.adaptableApi.internalApi.isTextComparisonCaseSensitive();
 exports.isTextSearchCaseInsensitive = isTextSearchCaseInsensitive;
 // returns an observable which filters the source$ emissions and emits only if the CellDataChangedInfo relates to the given column
 // optionally, if a filter function (where clause) is provided, it is also evaluated
 const getDataChangeLog$ = (context, columnNameFilter) => {
-    let dataChangeLog$ = context.api.internalApi.getDataService().dataChangeLog$;
+    let dataChangeLog$ = context.adaptableApi.internalApi.getDataService().dataChangeLog$;
     // filter only the given column changes
     dataChangeLog$ = dataChangeLog$.pipe(operators_1.filter((dataChangeLog) => dataChangeLog.column.columnId === columnNameFilter));
     // filter based on the WHERE clause
@@ -41,14 +41,14 @@ const handleWhereFunction = (args, context) => {
         // whereClauseResult
         return evaluator_1.evaluateNode(whereClauseExpressionNode, {
             node: rowNode,
-            api: context.api,
+            adaptableApi: context.adaptableApi,
             functions: context.whereClauseFunctions,
         });
     };
     // observableExpressionResult
     return evaluator_1.evaluateNode(reactiveExpressionNode, {
         node: context.node,
-        api: context.api,
+        adaptableApi: context.adaptableApi,
         functions: context.functions,
         filterFn,
     });
@@ -76,7 +76,7 @@ const handleColumnFunction = (args, context) => {
     if (StringExtensions_1.default.IsNullOrEmpty(args[0])) {
         throw new ExpressionEvaluationError_1.ExpressionEvaluationError('COL', `no column name is provided`);
     }
-    validateColumnId(args[0], context.api);
+    validateColumnId(args[0], context.adaptableApi);
     const result = {
         type: 'config',
         name: 'COL',

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js

@@ -32,12 +32,12 @@ exports.observableExpressionFunctions = {
                     return getDataChangeCount$(dataChangeLog$, timeframeChange$, operandParameter.value);
                 }
                 case 'MIN': {
-                    expressionFunctionUtils_1.validateColumnType(operandParameter.column, ['Number'], 'MIN', context.api);
+                    expressionFunctionUtils_1.validateColumnType(operandParameter.column, ['Number'], 'MIN', context.adaptableApi);
                     const timeframeChange$ = getTrailingRowValueChange$(dataChangeLog$, timeframeParameter.value);
                     return getDataChangeMin$(dataChangeLog$, timeframeChange$);
                 }
                 case 'MAX': {
-                    expressionFunctionUtils_1.validateColumnType(operandParameter.column, ['Number'], 'MAX', context.api);
+                    expressionFunctionUtils_1.validateColumnType(operandParameter.column, ['Number'], 'MAX', context.adaptableApi);
                     const timeframeChange$ = getTrailingRowValueChange$(dataChangeLog$, timeframeParameter.value);
                     return getDataChangeMax$(dataChangeLog$, timeframeChange$);
                 }
@@ -71,12 +71,12 @@ exports.observableExpressionFunctions = {
                     return getDataChangeCount$(dataChangeLog$, timeframeChange$, operandParameter.value);
                 }
                 case 'MIN': {
-                    expressionFunctionUtils_1.validateColumnType(operandParameter.column, ['Number'], 'MIN', context.api);
+                    expressionFunctionUtils_1.validateColumnType(operandParameter.column, ['Number'], 'MIN', context.adaptableApi);
                     const timeframeChange$ = getTrailingGridValueChange$(dataChangeLog$, timeframeParameter.value);
                     return getDataChangeMin$(dataChangeLog$, timeframeChange$);
                 }
                 case 'MAX': {
-                    expressionFunctionUtils_1.validateColumnType(operandParameter.column, ['Number'], 'MAX', context.api);
+                    expressionFunctionUtils_1.validateColumnType(operandParameter.column, ['Number'], 'MAX', context.adaptableApi);
                     const timeframeChange$ = getTrailingGridValueChange$(dataChangeLog$, timeframeParameter.value);
                     return getDataChangeMax$(dataChangeLog$, timeframeChange$);
                 }
@@ -229,11 +229,11 @@ const getDataChangedInfoStub = (context) => {
     var _a;
     let rowNodeStub;
     if (!context.filterFn) {
-        rowNodeStub = context.api.gridApi.getFirstRowNode();
+        rowNodeStub = context.adaptableApi.gridApi.getFirstRowNode();
     }
     else {
         // if there is a WHERE clause defined, find the first rowNode which satisfies the condition
-        context.api.internalApi.forAllRowNodesDo((rowNode) => {
+        context.adaptableApi.internalApi.forAllRowNodesDo((rowNode) => {
             if (!rowNodeStub) {
                 if (context.filterFn(rowNode)) {
                     rowNodeStub = rowNode;
@@ -243,10 +243,10 @@ const getDataChangedInfoStub = (context) => {
     }
     const rowNode = rowNodeStub;
     if (rowNode) {
-        const primaryKeyValue = context.api.gridApi.getPrimaryKeyValueForRowNode(rowNode);
-        const columnId = (_a = context.api.columnApi.getQueryableColumns()[0]) === null || _a === void 0 ? void 0 : _a.columnId;
-        const oldValue = context.api.gridApi.getCellRawValue(primaryKeyValue, columnId);
-        const column = context.api.columnApi.getColumnFromId(columnId);
+        const primaryKeyValue = context.adaptableApi.gridApi.getPrimaryKeyValueForRowNode(rowNode);
+        const columnId = (_a = context.adaptableApi.columnApi.getQueryableColumns()[0]) === null || _a === void 0 ? void 0 : _a.columnId;
+        const oldValue = context.adaptableApi.gridApi.getCellRawValue(primaryKeyValue, columnId);
+        const column = context.adaptableApi.columnApi.getColumnFromId(columnId);
         const newValue = oldValue;
         return {
             changedAt: Date.now(),
@@ -417,7 +417,7 @@ const getSlidingTimeframe$ = (source$, timeframeDuration, onTimeframeEnter, onTi
     }));
 };
 const getMaxTimeframeSize = (expressionValue, context) => {
-    let maxTimeframeSize = context.api.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
+    let maxTimeframeSize = context.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
         .maxTimeframeSize;
     if (maxTimeframeSize > SYSTEM_MAX_TIMEFRAME_SIZE) {
         maxTimeframeSize = SYSTEM_MAX_TIMEFRAME_SIZE;

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -95,14 +95,14 @@ exports.scalarExpressionFunctions = {
         handler(args, context) {
             var _a, _b;
             const columnId = args[0];
-            const column = (_a = context.api) === null || _a === void 0 ? void 0 : _a.columnApi.getColumnFromId(columnId);
+            const column = (_a = context.adaptableApi) === null || _a === void 0 ? void 0 : _a.columnApi.getColumnFromId(columnId);
             if (!column) {
                 throw new ExpressionEvaluationError_1.ExpressionEvaluationError('COL', `Column name "${columnId}" is not found`);
             }
             if (!column.queryable) {
                 throw new ExpressionEvaluationError_1.ExpressionEvaluationError('COL', `Column name "${columnId}" is not queryable`);
             }
-            return (_b = context.api) === null || _b === void 0 ? void 0 : _b.gridApi.getRawValueFromRowNode(context.node, columnId);
+            return (_b = context.adaptableApi) === null || _b === void 0 ? void 0 : _b.gridApi.getRawValueFromRowNode(context.node, columnId);
         },
         description: 'Returns the value of a column',
         signatures: ['[colName]', 'COL(name: string)'],

package/src/Utilities/Helpers/FormatHelper.js

@@ -6,6 +6,7 @@ const tslib_1 = require("tslib");
 // import dateFnsFormat from 'date-fns/format';
 const format_1 = tslib_1.__importDefault(require("date-fns/format"));
 const sentence_case_1 = require("sentence-case");
+const GeneralConstants_1 = require("../Constants/GeneralConstants");
 function Format(input, format) {
     if (format.Formatter === 'NumberFormatter') {
         return NumberFormatter(input, format.Options);
@@ -79,7 +80,7 @@ function DateFormatter(input, options) {
         if (typeof input === 'string') {
             input = new Date(input);
         }
-        return format_1.default(input, options.Pattern || '');
+        return format_1.default(input, (options === null || options === void 0 ? void 0 : options.Pattern) || GeneralConstants_1.DEFAULT_DATE_FORMAT_PATTERN);
     }
     catch (error) {
         return input;

package/src/Utilities/Services/QueryLanguageService.js

@@ -19,7 +19,7 @@ class QueryLanguageService {
         const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctions);
         return parser.evaluate(expression, {
             node: rowNode,
-            api: this.adaptableApi,
+            adaptableApi: this.adaptableApi,
             functions: booleanAndScalarFunctions,
         });
     }
@@ -31,7 +31,7 @@ class QueryLanguageService {
         const aggregatedScalarFunctions = this.getModuleExpressionFunctions(module).aggregatedScalarFunctions;
         return parser.evaluate(expression, {
             node: null,
-            api: this.adaptableApi,
+            adaptableApi: this.adaptableApi,
             functions: aggregatedScalarFunctions,
         });
     }
@@ -40,7 +40,7 @@ class QueryLanguageService {
         const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctions);
         const reactiveExpression$ = parser.evaluate(reactiveExpression, {
             node: reactiveExpression,
-            api: this.adaptableApi,
+            adaptableApi: this.adaptableApi,
             functions: moduleExpressionFunctions.observableFunctions,
             whereClauseFunctions: booleanAndScalarFunctions,
         });
@@ -51,7 +51,7 @@ class QueryLanguageService {
         const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctions);
         const aggregationExpression$ = parser.evaluate(aggregationExpression, {
             node: aggregationExpression,
-            api: this.adaptableApi,
+            adaptableApi: this.adaptableApi,
             functions: moduleExpressionFunctions.aggregatedBooleanFunctions,
             whereClauseFunctions: booleanAndScalarFunctions,
         });

package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.d.ts

@@ -3,7 +3,6 @@ import { FormatColumn } from '../../../PredefinedConfig/FormatColumnState';
 import { AdaptableFormat } from '../../../PredefinedConfig/Common/AdaptableFormat';
 import { AdaptableScope } from '../../../PredefinedConfig/Common/AdaptableScope';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
-import { FormatColumnApi } from '../../../types';
 export declare type FormatColumnFormatWizardSectionProps = {
     onChange: (data: FormatColumn) => void;
 };
@@ -11,7 +10,7 @@ export interface FormatColumnFormatWizardState {
     DisplayFormat: AdaptableFormat;
     NumericFormat?: 'Percent' | 'Thousand' | 'Million' | 'Dollar' | 'Sterling' | undefined;
 }
-export declare const getFormatColumnFormatSummaryValue: (data: FormatColumn, formattedColumnApi: FormatColumnApi) => string;
+export declare const getFormatColumnFormatSummaryValue: (data: FormatColumn, api: AdaptableApi) => string;
 export declare const renderFormatColumnFormatSummary: (data: FormatColumn, api: AdaptableApi) => JSX.Element;
 export declare const getFormatDisplayTypeForScope: (scope: AdaptableScope, api: AdaptableApi) => 'Number' | 'Date' | 'String' | undefined;
 export declare const FormatColumnFormatWizardSection: (props: FormatColumnFormatWizardSectionProps) => JSX.Element;