@adaptabletools/adaptable-cjs 19.2.3 → 20.0.0-canary.0

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -18,16 +18,15 @@ const isYesterday_1 = tslib_1.__importDefault(require("date-fns/isYesterday"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const DateHelper_1 = require("../../Utilities/Helpers/DateHelper");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
-const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 /**
  * Array of Predicate Defs which are shipped by AdapTable
  */
 exports.SystemPredicateDefs = [
     {
-        id: 'Values',
-        label: 'Values',
+        id: 'In',
+        label: 'In',
         icon: { text: 'IN' },
-        columnScope: { DataTypes: ['String', 'Number', 'Date'] },
+        columnScope: { DataTypes: ['text', 'number', 'date'] },
         moduleScope: ['columnFilter', 'flashingcell', 'formatColumn', 'alert', 'badgeStyle'],
         handler: (context) => {
             const { inputs, column, value, adaptableApi } = context;
@@ -39,7 +38,7 @@ exports.SystemPredicateDefs = [
                 return acc;
             }, []);
             if (predicateInputs.length) {
-                const nestedContext = Object.assign({}, context);
+                const nestedContext = { ...context };
                 delete nestedContext.inputs;
                 const predicateResult = predicateInputs.some((predicate) => {
                     return adaptableApi.predicateApi.handlePredicate({
@@ -54,13 +53,9 @@ exports.SystemPredicateDefs = [
             if (inputs.length === 0) {
                 return true;
             }
-            if (inputs.includes(GeneralConstants_1.BLANK_DISTINCT_COLUMN_VALUE) && Helper_1.default.isInputNullOrEmpty(value)) {
-                return true;
-            }
-            if (column.dataType === 'Date') {
+            if (column.dataType === 'date') {
                 return inputs.some((input) => {
-                    if (adaptableApi.optionsApi.getColumnFilterOptions().valuesFilterOptions
-                        .filterValuesUsingTime) {
+                    if (adaptableApi.optionsApi.getPredicateOptions().evaluateValuesPredicateUsingTime) {
                         return (0, isEqual_1.default)(input, value);
                     }
                     else {
@@ -68,16 +63,16 @@ exports.SystemPredicateDefs = [
                     }
                 });
             }
-            if (column.dataType === 'Number') {
+            if (column.dataType === 'number') {
                 return inputs.includes(value);
             }
-            if (column.dataType === 'String') {
+            if (column.dataType === 'text') {
                 return adaptableApi.predicateApi.useCaseSensitivity()
                     ? inputs
                         .map((i) => {
-                        return i === null || i === void 0 ? void 0 : i.toLocaleLowerCase();
+                        return i?.toLocaleLowerCase();
                     })
-                        .includes(value === null || value === void 0 ? void 0 : value.toLocaleLowerCase())
+                        .includes(value?.toLocaleLowerCase())
                     : inputs.includes(value);
             }
             return true;
@@ -86,21 +81,40 @@ exports.SystemPredicateDefs = [
         shortcuts: ['#', '['],
     },
     {
-        id: 'ExcludeValues',
-        label: 'Exclude Values',
+        id: 'NotIn',
+        label: 'Not In',
         icon: { text: '!IN' },
-        columnScope: { DataTypes: ['String', 'Number', 'Date'] },
+        columnScope: { DataTypes: ['text', 'number', 'date'] },
         moduleScope: ['columnFilter', 'flashingcell', 'formatColumn', 'alert', 'badgeStyle'],
-        handler: ({ inputs, column, value, adaptableApi }) => {
+        handler: (context) => {
+            const { inputs, column, value, adaptableApi } = context;
+            const predicateInputs = context.inputs.reduce((acc, input) => {
+                const predicate = adaptableApi.predicateApi.getPredicateDefById(input);
+                if (predicate) {
+                    acc.push(predicate);
+                }
+                return acc;
+            }, []);
+            if (predicateInputs.length) {
+                const nestedContext = { ...context };
+                delete nestedContext.inputs;
+                const predicateResult = predicateInputs.every((predicate) => {
+                    const res = adaptableApi.predicateApi.handlePredicate({
+                        PredicateId: predicate.id,
+                    }, nestedContext, false);
+                    return res === false;
+                });
+                if (!predicateResult) {
+                    // We want to use the only true values, to allow for multiple predicates to be used
+                    return false;
+                }
+            }
             // basically negation of IN
             if (inputs.length === 0) {
                 return true;
             }
-            if (inputs.includes(GeneralConstants_1.BLANK_DISTINCT_COLUMN_VALUE) && Helper_1.default.isInputNullOrEmpty(value)) {
-                return false;
-            }
-            if (column.dataType === 'Date') {
-                if (adaptableApi.optionsApi.getColumnFilterOptions().valuesFilterOptions.filterValuesUsingTime) {
+            if (column.dataType === 'date') {
+                if (adaptableApi.optionsApi.getPredicateOptions().evaluateValuesPredicateUsingTime) {
                     return inputs.every((input) => {
                         return !(0, isEqual_1.default)(input, value);
                     });
@@ -111,16 +125,16 @@ exports.SystemPredicateDefs = [
                     });
                 }
             }
-            if (column.dataType === 'Number') {
+            if (column.dataType === 'number') {
                 return !inputs.includes(value);
             }
-            if (column.dataType === 'String') {
+            if (column.dataType === 'text') {
                 return adaptableApi.predicateApi.useCaseSensitivity()
                     ? !inputs
                         .map((i) => {
-                        return i === null || i === void 0 ? void 0 : i.toLocaleLowerCase();
+                        return i?.toLocaleLowerCase();
                     })
-                        .includes(value === null || value === void 0 ? void 0 : value.toLocaleLowerCase())
+                        .includes(value?.toLocaleLowerCase())
                     : !inputs.includes(value);
             }
             return true;
@@ -148,29 +162,29 @@ exports.SystemPredicateDefs = [
         id: 'GreaterThan',
         label: 'Greater Than',
         icon: { name: 'greater-than' },
-        columnScope: { DataTypes: ['Number'] },
+        columnScope: { DataTypes: ['number'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => Number(value) > Number(inputs[0]),
-        toString: ({ inputs }) => `> ${inputs[0]}`,
+        toString: ({ inputs }) => `> ${inputs[0] ?? ''}`,
         shortcuts: ['>'],
     },
     {
         id: 'LessThan',
         label: 'Less Than',
         icon: { name: 'less-than' },
-        columnScope: { DataTypes: ['Number'] },
+        columnScope: { DataTypes: ['number'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => Number(value) < Number(inputs[0]),
-        toString: ({ inputs }) => `< ${inputs[0]}`,
+        toString: ({ inputs }) => `< ${inputs[0] ?? ''}`,
         shortcuts: ['<'],
     },
     {
         id: 'Positive',
         label: 'Positive',
         icon: { text: '>0' },
-        columnScope: { DataTypes: ['Number'] },
+        columnScope: { DataTypes: ['number'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         handler: ({ value }) => Number(value) > 0,
     },
@@ -178,7 +192,7 @@ exports.SystemPredicateDefs = [
         id: 'Negative',
         label: 'Negative',
         icon: { text: '<0' },
-        columnScope: { DataTypes: ['Number'] },
+        columnScope: { DataTypes: ['number'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         handler: ({ value }) => Number(value) < 0,
     },
@@ -186,7 +200,7 @@ exports.SystemPredicateDefs = [
         id: 'Zero',
         label: 'Zero',
         icon: { text: '=0' },
-        columnScope: { DataTypes: ['Number'] },
+        columnScope: { DataTypes: ['number'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         handler: ({ value }) => {
             if (typeof value === 'string' && !StringExtensions_1.default.IsNumeric(value)) {
@@ -202,7 +216,7 @@ exports.SystemPredicateDefs = [
         id: 'Equals',
         label: 'Equals',
         icon: { name: 'equals' },
-        columnScope: { DataTypes: ['Number'] },
+        columnScope: { DataTypes: ['number'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => {
@@ -213,14 +227,14 @@ exports.SystemPredicateDefs = [
             }
             return Number(value) === Number(inputs[0]);
         },
-        toString: ({ inputs }) => `= ${inputs[0]}`,
+        toString: ({ inputs }) => `= ${inputs[0] ?? ''}`,
         shortcuts: ['='],
     },
     {
         id: 'NotEquals',
         label: 'Not Equals',
         icon: { name: 'not-equal' },
-        columnScope: { DataTypes: ['Number'] },
+        columnScope: { DataTypes: ['number'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => {
@@ -231,36 +245,36 @@ exports.SystemPredicateDefs = [
             }
             return Number(value) !== Number(inputs[0]);
         },
-        toString: ({ inputs }) => `!= ${inputs[0]}`,
+        toString: ({ inputs }) => `!= ${inputs[0] ?? ''}`,
         shortcuts: ['!='],
     },
     {
         id: 'Between',
         label: 'Between',
         icon: { text: 'BE' },
-        columnScope: { DataTypes: ['Number'] },
+        columnScope: { DataTypes: ['number'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'number' }, { type: 'number' }],
         handler: ({ value, inputs }) => Number(value) >= Number(inputs[0]) && Number(value) <= Number(inputs[1]),
-        toString: ({ inputs }) => `Between ${inputs[0]}:${inputs[1]}`,
+        toString: ({ inputs }) => `Between ${inputs[0] ?? ''}:${inputs[1]}`,
         shortcuts: [':'],
     },
     {
         id: 'NotBetween',
         label: 'Not Between',
         icon: { text: '!BE' },
-        columnScope: { DataTypes: ['Number'] },
+        columnScope: { DataTypes: ['number'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'number' }, { type: 'number' }],
         handler: ({ value, inputs }) => Number(value) < Number(inputs[0]) || Number(value) > Number(inputs[1]),
-        toString: ({ inputs }) => `Not Between ${inputs[0]}:${inputs[1]}`,
+        toString: ({ inputs }) => `Not Between ${inputs[0] ?? ''}:${inputs[1]}`,
         shortcuts: ['!:'],
     },
     {
         id: 'IsNumeric',
         label: 'Is Numeric',
         icon: { text: '1' },
-        columnScope: { DataTypes: ['Number'] },
+        columnScope: { DataTypes: ['number'] },
         moduleScope: ['alert', 'flashingcell'],
         handler: ({ value }) => !isNaN(Number(value)),
     },
@@ -268,7 +282,7 @@ exports.SystemPredicateDefs = [
         id: 'IsNotNumeric',
         label: 'Is Not Numeric',
         icon: { text: '1' },
-        columnScope: { DataTypes: ['Number'] },
+        columnScope: { DataTypes: ['number'] },
         moduleScope: ['alert', 'flashingcell'],
         handler: ({ value }) => isNaN(Number(value)),
     },
@@ -277,7 +291,7 @@ exports.SystemPredicateDefs = [
         id: 'Is',
         label: 'Equals',
         icon: { name: 'equals' },
-        columnScope: { DataTypes: ['String'] },
+        columnScope: { DataTypes: ['text'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, adaptableApi }) => {
@@ -289,14 +303,14 @@ exports.SystemPredicateDefs = [
             const i = ignoreCase ? String(inputs[0]).toLocaleLowerCase() : String(inputs[0]);
             return v == i;
         },
-        toString: ({ inputs }) => `= ${inputs[0]}`,
+        toString: ({ inputs }) => `= ${inputs[0] ?? ''}`,
         shortcuts: ['='],
     },
     {
         id: 'IsNot',
         label: 'Not Equals',
         icon: { name: 'not-equal' },
-        columnScope: { DataTypes: ['String'] },
+        columnScope: { DataTypes: ['text'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, adaptableApi }) => {
@@ -308,14 +322,14 @@ exports.SystemPredicateDefs = [
             const i = ignoreCase ? String(inputs[0]).toLocaleLowerCase() : String(inputs[0]);
             return v != i;
         },
-        toString: ({ inputs }) => `!= ${inputs[0]}`,
+        toString: ({ inputs }) => `!= ${inputs[0] ?? ''}`,
         shortcuts: ['!='],
     },
     {
         id: 'Contains',
         label: 'Contains',
         icon: { name: 'contains' },
-        columnScope: { DataTypes: ['String'] },
+        columnScope: { DataTypes: ['text'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, adaptableApi }) => {
@@ -327,13 +341,13 @@ exports.SystemPredicateDefs = [
             const i = ignoreCase ? String(inputs[0]).toLocaleLowerCase() : String(inputs[0]);
             return v.indexOf(i) !== -1;
         },
-        toString: ({ inputs }) => `Contains ${inputs[0]}`,
+        toString: ({ inputs }) => `Contains ${inputs[0] ?? ''}`,
     },
     {
         id: 'NotContains',
         label: 'Not Contains',
         icon: { name: 'not-contains' },
-        columnScope: { DataTypes: ['String'] },
+        columnScope: { DataTypes: ['text'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, adaptableApi }) => {
@@ -345,13 +359,13 @@ exports.SystemPredicateDefs = [
             const i = ignoreCase ? String(inputs[0]).toLocaleLowerCase() : String(inputs[0]);
             return v.indexOf(i) === -1;
         },
-        toString: ({ inputs }) => `Not Contains ${inputs[0]}`,
+        toString: ({ inputs }) => `Not Contains ${inputs[0] ?? ''}`,
     },
     {
         id: 'StartsWith',
         label: 'Starts With',
         icon: { name: 'starts-with' },
-        columnScope: { DataTypes: ['String'] },
+        columnScope: { DataTypes: ['text'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, adaptableApi }) => {
@@ -363,13 +377,13 @@ exports.SystemPredicateDefs = [
             const i = ignoreCase ? String(inputs[0]).toLocaleLowerCase() : String(inputs[0]);
             return v.startsWith(i);
         },
-        toString: ({ inputs }) => `Starts With ${inputs[0]}`,
+        toString: ({ inputs }) => `Starts With ${inputs[0] ?? ''}`,
     },
     {
         id: 'EndsWith',
         label: 'Ends With',
         icon: { name: 'ends-with' },
-        columnScope: { DataTypes: ['String'] },
+        columnScope: { DataTypes: ['text'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, adaptableApi }) => {
@@ -381,24 +395,24 @@ exports.SystemPredicateDefs = [
             const i = ignoreCase ? String(inputs[0]).toLocaleLowerCase() : String(inputs[0]);
             return v.endsWith(i);
         },
-        toString: ({ inputs }) => `Ends With ${inputs[0]}`,
+        toString: ({ inputs }) => `Ends With ${inputs[0] ?? ''}`,
     },
     {
         id: 'Regex',
         label: 'Regex',
         icon: { name: 'regex' },
-        columnScope: { DataTypes: ['String'] },
+        columnScope: { DataTypes: ['text'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs }) => new RegExp(inputs[0]).test(value),
-        toString: ({ inputs }) => `Regex ${inputs[0]}`,
+        toString: ({ inputs }) => `Regex ${inputs[0] ?? ''}`,
     },
     // Date System Filters
     {
         id: 'Today',
         label: 'Today',
         icon: { name: 'calendar' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isToday_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
@@ -406,7 +420,7 @@ exports.SystemPredicateDefs = [
         id: 'Yesterday',
         label: 'Yesterday',
         icon: { name: 'calendar' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isYesterday_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
@@ -414,7 +428,7 @@ exports.SystemPredicateDefs = [
         id: 'Tomorrow',
         label: 'Tomorrow',
         icon: { name: 'calendar' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isTomorrow_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
@@ -422,7 +436,7 @@ exports.SystemPredicateDefs = [
         id: 'ThisWeek',
         label: 'This Week',
         icon: { name: 'calendar' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isThisWeek_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
@@ -430,7 +444,7 @@ exports.SystemPredicateDefs = [
         id: 'ThisMonth',
         label: 'This Month',
         icon: { name: 'calendar' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isThisMonth_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
@@ -438,7 +452,7 @@ exports.SystemPredicateDefs = [
         id: 'ThisQuarter',
         label: 'This Quarter',
         icon: { name: 'calendar' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isThisQuarter_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
@@ -446,7 +460,7 @@ exports.SystemPredicateDefs = [
         id: 'ThisYear',
         label: 'This Year',
         icon: { name: 'calendar' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isThisYear_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
@@ -454,7 +468,7 @@ exports.SystemPredicateDefs = [
         id: 'InPast',
         label: 'In Past',
         icon: { name: 'calendar' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isPast_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
@@ -462,7 +476,7 @@ exports.SystemPredicateDefs = [
         id: 'InFuture',
         label: 'In Future',
         icon: { name: 'calendar' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isFuture_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
@@ -470,47 +484,47 @@ exports.SystemPredicateDefs = [
         id: 'After',
         label: 'After',
         icon: { name: 'greater-than' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
         handler: ({ value, inputs }) => (0, isAfter_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
-        toString: ({ inputs }) => `> ${inputs[0]}`,
+        toString: ({ inputs }) => `> ${inputs[0] ?? ''}`,
     },
     {
         id: 'Before',
         label: 'Before',
         icon: { name: 'less-than' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
         handler: ({ value, inputs }) => (0, isBefore_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
-        toString: ({ inputs }) => `< ${inputs[0]}`,
+        toString: ({ inputs }) => `< ${inputs[0] ?? ''}`,
     },
     {
         id: 'On',
         label: 'Equals',
         icon: { name: 'equals' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
         handler: ({ value, inputs }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
-        toString: ({ inputs }) => `= ${inputs[0]}`,
+        toString: ({ inputs }) => `= ${inputs[0] ?? ''}`,
     },
     {
         id: 'NotOn',
         label: 'NotEquals',
         icon: { name: 'not-equal' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
         handler: ({ value, inputs }) => !(0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
-        toString: ({ inputs }) => `!= ${inputs[0]}`,
+        toString: ({ inputs }) => `!= ${inputs[0] ?? ''}`,
     },
     {
         id: 'NextWorkDay',
         label: 'Next Work Day',
         icon: { name: 'calendar' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value, adaptableApi }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), adaptableApi.calendarApi.getNextWorkingDay()),
     },
@@ -518,7 +532,7 @@ exports.SystemPredicateDefs = [
         id: 'LastWorkDay',
         label: 'Last Work Day',
         icon: { name: 'calendar' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value, adaptableApi }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), adaptableApi.calendarApi.getPreviousWorkingDay()),
     },
@@ -526,7 +540,7 @@ exports.SystemPredicateDefs = [
         id: 'WorkDay',
         label: 'Working Day',
         icon: { name: 'calendar' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value, adaptableApi }) => adaptableApi.calendarApi.isWorkingDay(value),
     },
@@ -534,7 +548,7 @@ exports.SystemPredicateDefs = [
         id: 'Holiday',
         label: 'Holiday',
         icon: { name: 'calendar' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value, adaptableApi }) => adaptableApi.calendarApi.isHoliday(value),
     },
@@ -542,7 +556,7 @@ exports.SystemPredicateDefs = [
         id: 'InRange',
         label: 'Range',
         icon: { name: 'date-range' },
-        columnScope: { DataTypes: ['Date'] },
+        columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter'],
         inputs: [{ type: 'date' }, { type: 'date' }],
         handler: ({ value, inputs }) => new Date(value) >= new Date(inputs[0]) && new Date(value) <= new Date(inputs[1]),
@@ -552,7 +566,7 @@ exports.SystemPredicateDefs = [
         id: 'True',
         label: 'True',
         icon: { text: 'T' },
-        columnScope: { DataTypes: ['Boolean'] },
+        columnScope: { DataTypes: ['boolean'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Boolean(value) === true,
     },
@@ -560,7 +574,7 @@ exports.SystemPredicateDefs = [
         id: 'False',
         label: 'False',
         icon: { text: 'F' },
-        columnScope: { DataTypes: ['Boolean'] },
+        columnScope: { DataTypes: ['boolean'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Boolean(value) === false,
     },
@@ -568,7 +582,7 @@ exports.SystemPredicateDefs = [
         id: 'BooleanToggle',
         label: 'BooleanToggle',
         icon: { name: 'boolean-list' },
-        columnScope: { DataTypes: ['Boolean'] },
+        columnScope: { DataTypes: ['boolean'] },
         moduleScope: ['columnFilter'],
         inputs: [{ type: 'boolean' }],
         // working with string aliases instead of booleans because the ColumnFilterAPI cannot handle falsy filter values (it ignores them)
@@ -592,7 +606,7 @@ exports.SystemPredicateDefs = [
     {
         id: 'PercentChange',
         label: 'Percent Change',
-        columnScope: { DataTypes: ['Number'] },
+        columnScope: { DataTypes: ['number'] },
         moduleScope: ['alert', 'flashingcell'],
         inputs: [{ type: 'number' }],
         handler: ({ value, oldValue, inputs }) => {
@@ -602,50 +616,6 @@ exports.SystemPredicateDefs = [
             return (change / base) * 100 > threshold;
         },
     },
-    {
-        id: 'ExistingValuesOnly',
-        label: 'Existing Values Only',
-        columnScope: { All: true },
-        moduleScope: ['alert'],
-        handler: ({ value, adaptableApi, column, node }) => {
-            const distinctValues = column
-                ? adaptableApi.gridApi.internalApi.getDistinctRawValuesForColumn(column.columnId, node)
-                : [];
-            return !distinctValues.includes(value);
-        },
-    },
-    {
-        id: 'NoDuplicateValues',
-        label: 'No Duplicate Values',
-        columnScope: { All: true },
-        moduleScope: ['alert'],
-        handler: ({ value, adaptableApi, column, node }) => {
-            const distinctValues = column
-                ? adaptableApi.gridApi.internalApi.getDistinctRawValuesForColumn(column.columnId, node)
-                : [];
-            return distinctValues.includes(value);
-        },
-    },
-    {
-        id: 'AddedRow',
-        label: 'Added Row(s)',
-        columnScope: { All: true },
-        moduleScope: ['alert'],
-        handler: () => {
-            // handled in AlertModule as an eventHandler
-            return false;
-        },
-    },
-    {
-        id: 'RemovedRow',
-        label: 'Removed Row(s)',
-        columnScope: { All: true },
-        moduleScope: ['alert'],
-        handler: () => {
-            // handled in AlertModule as an eventHandler
-            return false;
-        },
-    },
 ];
 exports.SystemFilterPredicateIds = exports.SystemPredicateDefs.filter((p) => p.moduleScope.includes('columnFilter')).map((p) => p.id);
 exports.SystemAlertPredicateIds = exports.SystemPredicateDefs.filter((p) => p.moduleScope.includes('alert')).map((p) => p.id);

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

@@ -0,0 +1,15 @@
+import { CustomSort } from '../CustomSortState';
+import { ColumnSort } from './ColumnSort';
+/**
+ * Overview of current sorting state in the grid
+ */
+export interface AdaptableSortState {
+    /**
+     * Which columns have sorting applied and,if so, which direction
+     */
+    columnSorts: ColumnSort[];
+    /**
+     * All Custom Sorts in State (note: this is always sent, even if no custom sorts are active)
+     */
+    customSorts: CustomSort[];
+}