@adaptabletools/adaptable 16.2.3 → 17.0.0-canary.0

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -1,13 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FormatColumnInternalApi = void 0;
-const tslib_1 = require("tslib");
-const ApiBase_1 = require("../Implementation/ApiBase");
-const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
-const FormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/FormatHelper"));
-const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
-const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-class FormatColumnInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+import StringExtensions from '../../Utilities/Extensions/StringExtensions';
+import FormatHelper from '../../Utilities/Helpers/FormatHelper';
+import ObjectFactory from '../../Utilities/ObjectFactory';
+import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
+export class FormatColumnInternalApi extends ApiBase {
     /**
      * Retrieves all Format Columns in Adaptable State with the `Style` property set
      * @returns format columns
@@ -60,7 +56,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
      * @returns format columns
      */
     getFormatColumnWithStyleClassNameForColumn(column, config) {
-        return this.getFormatColumnsWithStyleForColumn(column, config).filter((formatColumn) => { var _a; return StringExtensions_1.default.IsNotNullOrEmpty((_a = formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.Style) === null || _a === void 0 ? void 0 : _a.ClassName); });
+        return this.getFormatColumnsWithStyleForColumn(column, config).filter((formatColumn) => { var _a; return StringExtensions.IsNotNullOrEmpty((_a = formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.Style) === null || _a === void 0 ? void 0 : _a.ClassName); });
     }
     getFormatColumnWithColumnInScope(formatColumns, column) {
         return this.getFormatColumnInColumnScope(formatColumns).filter((scopedFormatColumn) => this.adaptable.api.scopeApi.isColumnInScope(column, scopedFormatColumn.Scope));
@@ -96,7 +92,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
      */
     getNumberFormattedValue(value, node, abColumn, options) {
         const preparedValue = this.applyCustomFormatters(value, node, abColumn, options);
-        return FormatHelper_1.default.NumberFormatter(preparedValue, options);
+        return FormatHelper.NumberFormatter(preparedValue, options);
     }
     /**
      * Format value according to format options.
@@ -106,7 +102,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
      */
     getStringFormattedValue(value, node, abColumn, options) {
         const preparedValue = this.applyCustomFormatters(value, node, abColumn, options);
-        return FormatHelper_1.default.StringFormatter(preparedValue, options);
+        return FormatHelper.StringFormatter(preparedValue, options);
     }
     /**
      * Format value according to format options.
@@ -119,7 +115,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
         const dateFormatterOptions = options;
         // only use DateFormatter if we have a pattern
         return dateFormatterOptions.Pattern
-            ? FormatHelper_1.default.DateFormatter(preparedValue, options)
+            ? FormatHelper.DateFormatter(preparedValue, options)
             : preparedValue;
     }
     applyCustomFormatters(value, node, abColumn, options) {
@@ -132,7 +128,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
         const customFormattersFromOptions = (_c = (_b = adaptableOptions === null || adaptableOptions === void 0 ? void 0 : adaptableOptions.formatColumnOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters) !== null && _c !== void 0 ? _c : [];
         // formatters are applied in the order they are defined in the options
         const customFormatters = customFormattersFromOptions.filter((customFormatterOption) => columnCustomFormatters.includes(customFormatterOption.id));
-        const customDisplayFormatterContext = ObjectFactory_1.default.CreateCustomDisplayFormatterContext(value, node, abColumn, this.getAdaptableApi());
+        const customDisplayFormatterContext = ObjectFactory.CreateCustomDisplayFormatterContext(value, node, abColumn, this.getAdaptableApi());
         return customFormatters.reduce((context, formatter) => {
             if (formatter && formatter.handler) {
                 return formatter.handler(context);
@@ -254,4 +250,3 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
         return [...columnsThatNeedRefresh];
     }
 }
-exports.FormatColumnInternalApi = FormatColumnInternalApi;

package/src/Api/Internal/FreeTextColumnInternalApi.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FreeTextColumnInternalApi = void 0;
-const ApiBase_1 = require("../Implementation/ApiBase");
-class FreeTextColumnInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+export class FreeTextColumnInternalApi extends ApiBase {
     /**
      * Checks if a User Edit was in a Free Text Column
      * @param cellDataChangedInfo change to check
@@ -41,4 +38,3 @@ class FreeTextColumnInternalApi extends ApiBase_1.ApiBase {
         return references;
     }
 }
-exports.FreeTextColumnInternalApi = FreeTextColumnInternalApi;

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

@@ -0,0 +1,4 @@
+import { ApiBase } from '../Implementation/ApiBase';
+export declare class GridFilterInternalApi extends ApiBase {
+    fireGridFilterApplied(): void;
+}

package/src/Api/Internal/GridFilterInternalApi.js

@@ -0,0 +1,19 @@
+import { ApiBase } from '../Implementation/ApiBase';
+export class GridFilterInternalApi extends ApiBase {
+    fireGridFilterApplied() {
+        if (this.adaptable.isLive) {
+            const currentQuery = this.getGridFilterApi().getCurrentGridFilterExpression();
+            const adaptableApi = this.getAdaptableApi();
+            const gridFilterAppliedInfo = {
+                gridFilter: currentQuery,
+                gridFilterExpressionAST: currentQuery
+                    ? adaptableApi.expressionApi.getASTForExpression(currentQuery)
+                    : null,
+                adaptableApi: adaptableApi,
+                userName: adaptableApi.optionsApi.getUserName(),
+                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
+            };
+            adaptableApi.eventApi.emit('GridFilterApplied', gridFilterAppliedInfo);
+        }
+    }
+}

package/src/Api/Internal/GridInternalApi.js

@@ -1,13 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GridInternalApi = void 0;
-const tslib_1 = require("tslib");
-const ApiBase_1 = require("../Implementation/ApiBase");
-const Enums_1 = require("../../PredefinedConfig/Common/Enums");
-const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
-const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
-const NumberExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/NumberExtensions"));
-class GridInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+import { SortOrder } from '../../PredefinedConfig/Common/Enums';
+import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
+import * as GridRedux from '../../Redux/ActionsReducers/GridRedux';
+import NumberExtensions from '../../Utilities/Extensions/NumberExtensions';
+export class GridInternalApi extends ApiBase {
     /**
      * Fires Grid Sorted Event
      */
@@ -85,7 +81,7 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         }
         const { gridCells, suppressClientSideFilter } = await this.adaptable.getDistinctFilterValuesForColumn(abColumn, showFilteredRowsOnly, filter);
         let showValuesCount = false;
-        const showValuesCountFunction = this.getFilterOptions().showValuesCount;
+        const showValuesCountFunction = this.getColumnFilterOptions().showValuesCount;
         if (showValuesCountFunction) {
             showValuesCount = showValuesCountFunction(abColumn);
         }
@@ -93,7 +89,7 @@ class GridInternalApi extends ApiBase_1.ApiBase {
             values: this.sortDistinctValues(gridCells, abColumn).map((cv) => {
                 const label = showValuesCount
                     ? cv.displayValue +
-                        NumberExtensions_1.default.WrapInParentheses(this.getGridApi().getCellDisplayValueCount(abColumn.columnId, cv.displayValue))
+                        NumberExtensions.WrapInParentheses(this.getGridApi().getCellDisplayValueCount(abColumn.columnId, cv.displayValue))
                     : cv.displayValue;
                 return {
                     label: label,
@@ -188,21 +184,21 @@ class GridInternalApi extends ApiBase_1.ApiBase {
     }
     sortDistinctValues(returnValues, column) {
         // this does NOT into account Custom Sort - far too hard for now...
-        let sortOrder = Enums_1.SortOrder.Asc;
-        if (this.getFilterOptions().sortColumnValuesInFilter) {
+        let sortOrder = SortOrder.Asc;
+        if (this.getColumnFilterOptions().sortColumnValuesInFilter) {
             let columnSort = this.adaptable.api.gridApi.getColumnSortForColumn(column.columnId);
             if (columnSort && columnSort.SortOrder == 'Desc') {
-                sortOrder = Enums_1.SortOrder.Desc;
+                sortOrder = SortOrder.Desc;
             }
         }
         if (this.getColumnApi().hasNumberDataType(column === null || column === void 0 ? void 0 : column.columnId)) {
-            returnValues = ArrayExtensions_1.default.sortCellValueArrayNumeric(returnValues, sortOrder);
+            returnValues = ArrayExtensions.sortCellValueArrayNumeric(returnValues, sortOrder);
         }
         else if (this.getColumnApi().hasDateDataType(column === null || column === void 0 ? void 0 : column.columnId)) {
-            returnValues = ArrayExtensions_1.default.sortCellValueArrayDates(returnValues, sortOrder);
+            returnValues = ArrayExtensions.sortCellValueArrayDates(returnValues, sortOrder);
         }
         else {
-            returnValues = ArrayExtensions_1.default.sortCellValueArray(returnValues, sortOrder);
+            returnValues = ArrayExtensions.sortCellValueArray(returnValues, sortOrder);
         }
         return returnValues;
     }
@@ -236,7 +232,7 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         }
         else {
             let arr = editLookUpValues;
-            if (arr && ArrayExtensions_1.default.IsNotNullOrEmpty(arr)) {
+            if (arr && ArrayExtensions.IsNotNullOrEmpty(arr)) {
                 return arr;
             }
         }
@@ -245,4 +241,3 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         return this.getDistinctDisplayValuesForColumn(column.columnId);
     }
 }
-exports.GridInternalApi = GridInternalApi;

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

@@ -39,6 +39,7 @@ export declare class LayoutInternalApi extends ApiBase {
         AggregationColumns: boolean;
         PivotColumns: boolean;
         ColumnFilters: boolean;
+        GridFilter: boolean;
         ColumnSorts: boolean;
     };
     updateCurrentDraftLayout(layout: Layout): void;

package/src/Api/Internal/LayoutInternalApi.js

@@ -1,14 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LayoutInternalApi = void 0;
-const tslib_1 = require("tslib");
-const ApiBase_1 = require("../Implementation/ApiBase");
-const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
-const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
-const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
-const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
-const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
-class LayoutInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+import isEqual from 'lodash/isEqual';
+import { DEFAULT_LAYOUT } from '../../Utilities/Constants/GeneralConstants';
+import ObjectFactory from '../../Utilities/ObjectFactory';
+import * as GridRedux from '../../Redux/ActionsReducers/GridRedux';
+import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
+export class LayoutInternalApi extends ApiBase {
     /**
      * Fires the `LayoutChanged` event
      * @param trigger what caused event to fire
@@ -25,7 +21,7 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
             userName: adaptableApi.optionsApi.getUserName(),
             adaptableId: adaptableApi.optionsApi.getAdaptableId(),
         };
-        if (!skipEqualityCheck && (0, isEqual_1.default)(oldSate, newState)) {
+        if (!skipEqualityCheck && isEqual(oldSate, newState)) {
             return;
         }
         this.adaptable.api.eventApi.emit('LayoutChanged', layoutChangedInfo);
@@ -50,7 +46,7 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
         };
         layout1 = Object.assign(Object.assign({}, defaults), layout1);
         layout2 = Object.assign(Object.assign({}, defaults), layout2);
-        return (0, isEqual_1.default)(layout1, layout2);
+        return isEqual(layout1, layout2);
     }
     /**
      * Creates a Default Layout (when none provided in Config)
@@ -70,9 +66,9 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
             shouldCreateDefaultLayout = true;
         }
         if (shouldCreateDefaultLayout) {
-            if (!layoutState.Layouts || !isLayoutDefined(GeneralConstants_1.DEFAULT_LAYOUT)) {
-                let defaultLayout = ObjectFactory_1.default.CreateEmptyLayout({
-                    Name: GeneralConstants_1.DEFAULT_LAYOUT,
+            if (!layoutState.Layouts || !isLayoutDefined(DEFAULT_LAYOUT)) {
+                let defaultLayout = ObjectFactory.CreateEmptyLayout({
+                    Name: DEFAULT_LAYOUT,
                     Columns: defaultLayoutColumns.map((c) => c.columnId),
                     AggregationColumns: defaultLayoutColumns.reduce((acc, col) => {
                         if (col.aggregationFunction) {
@@ -119,6 +115,7 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
             PivotColumns: true,
             ColumnFilters: true,
             ColumnSorts: true,
+            GridFilter: true,
         };
         if (this.getGridApi().getAgGridRowModelType() === 'viewport') {
             layoutSupportedFeatures.RowGroupedColumns = false;
@@ -148,7 +145,7 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
         }
         const layoutTagOptions = this.getLayoutOptions().layoutTagOptions;
         if ((layoutTagOptions === null || layoutTagOptions === void 0 ? void 0 : layoutTagOptions.autoCheckTagsForLayouts) == true) {
-            return ArrayExtensions_1.default.IsNullOrEmpty(object.Tags) ? true : (_a = object.Tags) === null || _a === void 0 ? void 0 : _a.includes(layout.Name);
+            return ArrayExtensions.IsNullOrEmpty(object.Tags) ? true : (_a = object.Tags) === null || _a === void 0 ? void 0 : _a.includes(layout.Name);
         }
         const context = {
             adaptableObject: object,
@@ -171,4 +168,3 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
         return ((_a = layout === null || layout === void 0 ? void 0 : layout.RowGroupedColumns) === null || _a === void 0 ? void 0 : _a.length) > 0;
     }
 }
-exports.LayoutInternalApi = LayoutInternalApi;

package/src/Api/Internal/{QueryInternalApi.d.ts → NamedQueryInternalApi.d.ts}

@@ -1,5 +1,5 @@
 import { ApiBase } from '../Implementation/ApiBase';
-export declare class QueryInternalApi extends ApiBase {
+export declare class NamedQueryInternalApi extends ApiBase {
     /**
      * Returns the name of all the referenced Named Queries as an array of strings
      * @param expression query string
@@ -10,8 +10,5 @@ export declare class QueryInternalApi extends ApiBase {
      * @param namedQueryName namedQuery name
      */
     getNamedQueryModuleReferences(namedQueryName: string): string[];
-    /**
-     * Fires Query Run Event - typically used to enable querying on the server
-     */
-    fireQueryRunEvent(): void;
+    cleanupQueryRedux(): void;
 }

package/src/Api/Internal/{QueryInternalApi.js → NamedQueryInternalApi.js}

@@ -1,8 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryInternalApi = void 0;
-const ApiBase_1 = require("../Implementation/ApiBase");
-class QueryInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+import * as QueryRedux from '../../Redux/ActionsReducers/QueryRedux';
+export class NamedQueryInternalApi extends ApiBase {
     /**
      * Returns the name of all the referenced Named Queries as an array of strings
      * @param expression query string
@@ -35,24 +33,7 @@ class QueryInternalApi extends ApiBase_1.ApiBase {
         });
         return references;
     }
-    /**
-     * Fires Query Run Event - typically used to enable querying on the server
-     */
-    fireQueryRunEvent() {
-        if (this.adaptable.isLive) {
-            const currentQuery = this.getQueryApi().getCurrentQuery();
-            const adaptableApi = this.getAdaptableApi();
-            const queryRunInfo = {
-                currentQuery,
-                queryAST: currentQuery
-                    ? adaptableApi.expressionApi.getASTForExpression(currentQuery)
-                    : null,
-                adaptableApi: adaptableApi,
-                userName: adaptableApi.optionsApi.getUserName(),
-                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
-            };
-            adaptableApi.eventApi.emit('QueryRun', queryRunInfo);
-        }
+    cleanupQueryRedux() {
+        this.dispatchAction(QueryRedux.QueryCleanup());
     }
 }
-exports.QueryInternalApi = QueryInternalApi;

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

@@ -40,4 +40,9 @@ export declare class PredicateInternalApi extends ApiBase {
      * Get all Badge Style Predicate Definitions - System and Custom
      */
     getBadgeStylePredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
+    /**
+     * Merges System and Custom Predicate Definitions but ensures that Custom ones take precedence
+     * (i.e. if there is a Custom Predicate with the same Id as a System one, the Custom one is used)
+     */
+    mergeSystemAndCustomPredicates(systemDefs: AdaptablePredicateDef[], customDefs: AdaptablePredicateDef[]): AdaptablePredicateDef[];
 }

package/src/Api/Internal/PredicateInternalApi.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PredicateInternalApi = void 0;
-const ApiBase_1 = require("../Implementation/ApiBase");
-class PredicateInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+export class PredicateInternalApi extends ApiBase {
     /**
      * Returns true if the predicate has a dropdown.
      *
@@ -16,10 +13,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
      */
     getFilterPredicateDefs(scope) {
         var _a;
-        return [
-            ...(_a = this.getSystemFilterPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
-            ...this.getPredicateApi().getCustomPredicateDefs(),
-        ].filter((predicateDef) => predicateDef.moduleScope.includes('filter'));
+        return this.mergeSystemAndCustomPredicates((_a = this.getSystemFilterPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)), this.getPredicateApi().getCustomPredicateDefs()).filter((predicateDef) => predicateDef.moduleScope.includes('filter'));
     }
     getSystemFilterPredicateIds(scope) {
         const systemFilterPredicates = this.getPredicateOptions().systemFilterPredicates;
@@ -28,9 +22,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
                 adaptableApi: this.adaptable.api,
                 userName: this.getOptions().userName,
                 adaptableId: this.getOptions().adaptableId,
-                systemPredicateDefs: this.getPredicateApi()
-                    .getSystemPredicateDefs()
-                    .filter((p) => p.moduleScope.includes('filter')),
+                systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('filter'),
                 moduleScope: 'filter',
                 columnScope: scope,
             };
@@ -43,10 +35,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
      */
     getAlertPredicateDefs(scope) {
         var _a;
-        return [
-            ...(_a = this.getSystemAlertPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
-            ...this.getPredicateApi().getCustomPredicateDefs(),
-        ].filter((predicateDef) => predicateDef.moduleScope.includes('alert'));
+        return this.mergeSystemAndCustomPredicates((_a = this.getSystemAlertPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)), this.getPredicateApi().getCustomPredicateDefs()).filter((predicateDef) => predicateDef.moduleScope.includes('alert'));
     }
     getSystemAlertPredicateIds(scope) {
         const systemAlertPredicates = this.getPredicateOptions().systemAlertPredicates;
@@ -55,9 +44,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
                 adaptableApi: this.adaptable.api,
                 userName: this.getOptions().userName,
                 adaptableId: this.getOptions().adaptableId,
-                systemPredicateDefs: this.getPredicateApi()
-                    .getSystemPredicateDefs()
-                    .filter((p) => p.moduleScope.includes('alert')),
+                systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('alert'),
                 moduleScope: 'alert',
                 columnScope: scope,
             };
@@ -72,9 +59,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
                 adaptableApi: this.adaptable.api,
                 userName: this.getOptions().userName,
                 adaptableId: this.getOptions().adaptableId,
-                systemPredicateDefs: this.getPredicateApi()
-                    .getSystemPredicateDefs()
-                    .filter((p) => p.moduleScope.includes('badgeStyle')),
+                systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('badgeStyle'),
                 moduleScope: 'badgeStyle',
                 columnScope: scope,
             };
@@ -87,10 +72,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
      */
     getFormatColumnPredicateDefs(scope) {
         var _a;
-        return [
-            ...(_a = this.getSystemFormatColumnPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
-            ...this.getPredicateApi().getCustomPredicateDefs(),
-        ].filter((predicateDef) => predicateDef.moduleScope.includes('formatColumn'));
+        return this.mergeSystemAndCustomPredicates((_a = this.getSystemFormatColumnPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)), this.getPredicateApi().getCustomPredicateDefs()).filter((predicateDef) => predicateDef.moduleScope.includes('formatColumn'));
     }
     getSystemFormatColumnPredicateIds(scope) {
         const systemFormatColumnPredicates = this.getPredicateOptions().systemFormatColumnPredicates;
@@ -99,9 +81,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
                 adaptableApi: this.adaptable.api,
                 userName: this.getOptions().userName,
                 adaptableId: this.getOptions().adaptableId,
-                systemPredicateDefs: this.getPredicateApi()
-                    .getSystemPredicateDefs()
-                    .filter((p) => p.moduleScope.includes('formatColumn')),
+                systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('formatColumn'),
                 moduleScope: 'formatColumn',
                 columnScope: scope,
             };
@@ -114,10 +94,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
      */
     getFlashingCellPredicateDefs(scope) {
         var _a;
-        return [
-            ...(_a = this.getSystemFlashingCellPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
-            ...this.getPredicateApi().getCustomPredicateDefs(),
-        ].filter((predicateDef) => predicateDef.moduleScope.includes('flashingcell'));
+        return this.mergeSystemAndCustomPredicates((_a = this.getSystemFlashingCellPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)), this.getPredicateApi().getCustomPredicateDefs()).filter((predicateDef) => predicateDef.moduleScope.includes('flashingcell'));
     }
     getSystemFlashingCellPredicateIds(scope) {
         const systemFlashingCellPredicates = this.getPredicateOptions().systemFlashingCellPredicates;
@@ -126,9 +103,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
                 adaptableApi: this.adaptable.api,
                 userName: this.getOptions().userName,
                 adaptableId: this.getOptions().adaptableId,
-                systemPredicateDefs: this.getPredicateApi()
-                    .getSystemPredicateDefs()
-                    .filter((p) => p.moduleScope.includes('flashingcell')),
+                systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('flashingcell'),
                 moduleScope: 'flashingcell',
                 columnScope: scope,
             };
@@ -163,10 +138,18 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
      */
     getBadgeStylePredicateDefs(scope) {
         var _a;
-        return [
-            ...(_a = this.getSystemBadgeStylePredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
-            ...this.getPredicateApi().getCustomPredicateDefs(),
-        ].filter((predicateDef) => predicateDef.moduleScope.includes('badgeStyle'));
+        return this.mergeSystemAndCustomPredicates((_a = this.getSystemBadgeStylePredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)), this.getPredicateApi().getCustomPredicateDefs()).filter((predicateDef) => predicateDef.moduleScope.includes('badgeStyle'));
+    }
+    /**
+     * Merges System and Custom Predicate Definitions but ensures that Custom ones take precedence
+     * (i.e. if there is a Custom Predicate with the same Id as a System one, the Custom one is used)
+     */
+    mergeSystemAndCustomPredicates(systemDefs, customDefs) {
+        const systemDefsToUse = systemDefs.map((systemDef) => {
+            const customDef = customDefs.find((customDef) => customDef.id === systemDef.id);
+            return customDef ? customDef : systemDef;
+        });
+        const customDefsToUse = customDefs.filter((customDef) => !systemDefsToUse.find((systemDef) => systemDef.id === customDef.id));
+        return [...systemDefsToUse, ...customDefsToUse];
     }
 }
-exports.PredicateInternalApi = PredicateInternalApi;

package/src/Api/Internal/ScheduleInternalApi.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ScheduleInternalApi = void 0;
-const ApiBase_1 = require("../Implementation/ApiBase");
-class ScheduleInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+export class ScheduleInternalApi extends ApiBase {
     /**
      * Fires Schedule Triggered event
      */
@@ -17,4 +14,3 @@ class ScheduleInternalApi extends ApiBase_1.ApiBase {
         adaptableApi.eventApi.emit('ScheduleTriggered', scheduleTriggeredInfo);
     }
 }
-exports.ScheduleInternalApi = ScheduleInternalApi;

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

@@ -58,7 +58,7 @@ export declare class StyledColumnInternalApi extends ApiBase {
      */
     hasStyledColumnRelativeCellRange(styledColumn: StyledColumn): boolean;
     getApplicableBadge(styledColumn: StyledColumn, context: PredicateDefHandlerContext): BadgeStyleDefinition | null;
-    getBadgePredicateDefsForColumn(columnId: string): import("../../types").AdaptablePredicateDef[];
+    getBadgePredicateDefsForColumn(columnId: string): import("../../types").AdaptablePredicateDef<string>[];
     getCheckBoxStyleStyledColumn(column: AdaptableColumn): StyledColumn | undefined;
     isCheckBoxStyleStyledColumn(column: AdaptableColumn): boolean;
     fireCheckboxColumnClickedEvent(columnId: string, rowData: any, primaryKeyValue: any, isChecked: boolean): void;

package/src/Api/Internal/StyledColumnInternalApi.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StyledColumnInternalApi = void 0;
-const tslib_1 = require("tslib");
-const ApiBase_1 = require("../Implementation/ApiBase");
-const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
-const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
-class StyledColumnInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
+import Helper from '../../Utilities/Helpers/Helper';
+export class StyledColumnInternalApi extends ApiBase {
     getMinValueForNumericColumn(column) {
         if (column.dataType !== 'Number') {
             return undefined;
@@ -197,13 +193,13 @@ class StyledColumnInternalApi extends ApiBase_1.ApiBase {
         let returnValues = [];
         if (typeof columnComparison.MinValue === 'string') {
             let minIds = this.getDependentColumnIds(columnComparison.MinValue);
-            if (ArrayExtensions_1.default.IsNotNullOrEmpty(minIds)) {
+            if (ArrayExtensions.IsNotNullOrEmpty(minIds)) {
                 returnValues.push(...minIds);
             }
         }
         if (typeof columnComparison.MaxValue === 'string') {
             let maxIds = this.getDependentColumnIds(columnComparison.MaxValue);
-            if (ArrayExtensions_1.default.IsNotNullOrEmpty(maxIds)) {
+            if (ArrayExtensions.IsNotNullOrEmpty(maxIds)) {
                 returnValues.push(...maxIds);
             }
         }
@@ -294,7 +290,7 @@ class StyledColumnInternalApi extends ApiBase_1.ApiBase {
     }
     isCheckBoxStyleStyledColumn(column) {
         const styledColumn = this.getCheckBoxStyleStyledColumn(column);
-        return Helper_1.default.objectExists(styledColumn);
+        return Helper.objectExists(styledColumn);
     }
     fireCheckboxColumnClickedEvent(columnId, rowData, primaryKeyValue, isChecked) {
         let checkboxColumnClickedInfo = {
@@ -309,4 +305,3 @@ class StyledColumnInternalApi extends ApiBase_1.ApiBase {
         this.adaptable.api.eventApi.emit('CheckboxColumnClicked', checkboxColumnClickedInfo);
     }
 }
-exports.StyledColumnInternalApi = StyledColumnInternalApi;

package/src/Api/Internal/SystemStatusInternalApi.js

@@ -1,10 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SystemStatusInternalApi = void 0;
-const tslib_1 = require("tslib");
-const ApiBase_1 = require("../Implementation/ApiBase");
-const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
-class SystemStatusInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+export class SystemStatusInternalApi extends ApiBase {
     /**
      * Fires SystemStatusMessageDisplayed Event
      * @param systemStatusMessageInfo Info about new System Status Message
@@ -27,4 +23,3 @@ class SystemStatusInternalApi extends ApiBase_1.ApiBase {
         return this.getAdaptableState().System.SystemStatusMessages;
     }
 }
-exports.SystemStatusInternalApi = SystemStatusInternalApi;

package/src/Api/Internal/TeamSharingInternalApi.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TeamSharingInternalApi = void 0;
-const ApiBase_1 = require("../Implementation/ApiBase");
-class TeamSharingInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+export class TeamSharingInternalApi extends ApiBase {
     /**
      * Fires the Team Sharing Entity Changed Event
      * @param sharedEntity Entity that has been changed
@@ -53,4 +50,3 @@ class TeamSharingInternalApi extends ApiBase_1.ApiBase {
         });
     }
 }
-exports.TeamSharingInternalApi = TeamSharingInternalApi;

package/src/Api/Internal/ThemeInternalApi.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ThemeInternalApi = void 0;
-const windowFactory_1 = require("../../View/Components/Popups/WindowPopups/windowFactory");
-const ApiBase_1 = require("../Implementation/ApiBase");
-class ThemeInternalApi extends ApiBase_1.ApiBase {
+import { SHOW_THEME_EDITOR } from '../../View/Components/Popups/WindowPopups/windowFactory';
+import { ApiBase } from '../Implementation/ApiBase';
+export class ThemeInternalApi extends ApiBase {
     isSystemTheme(themeName) {
         return this.getThemeApi()
             .getSystemThemes()
@@ -14,12 +11,11 @@ class ThemeInternalApi extends ApiBase_1.ApiBase {
     }
     openInWindow() {
         this.adaptable.api.internalApi.showPopupWindow({
-            id: windowFactory_1.SHOW_THEME_EDITOR,
+            id: SHOW_THEME_EDITOR,
             title: 'Theme',
             icon: 'theme',
-            factoryId: windowFactory_1.SHOW_THEME_EDITOR,
+            factoryId: SHOW_THEME_EDITOR,
             popupProps: {},
         });
     }
 }
-exports.ThemeInternalApi = ThemeInternalApi;

package/src/Api/Internal/UserInterfaceInternalApi.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserInterfaceInternalApi = void 0;
-const ApiBase_1 = require("../Implementation/ApiBase");
-class UserInterfaceInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+export class UserInterfaceInternalApi extends ApiBase {
     prepareAdaptableIconDef(icon) {
         if (icon && 'name' in icon) {
             let customIcon = icon && 'name' in icon
@@ -15,4 +12,3 @@ class UserInterfaceInternalApi extends ApiBase_1.ApiBase {
         return icon;
     }
 }
-exports.UserInterfaceInternalApi = UserInterfaceInternalApi;