@adaptabletools/adaptable 13.0.0-canary.1 → 13.0.0-canary.3

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -27,7 +27,7 @@ exports.SystemPredicateDefs = [
         label: 'Values',
         icon: { text: 'IN' },
         columnScope: { DataTypes: ['String', 'Number', 'Date'] },
-        moduleScope: ['filter', 'conditionalstyle', 'alert'],
+        moduleScope: ['filter', 'conditionalstyle', 'formatColumn', 'alert'],
         handler: ({ inputs, column, value }) => {
             if (inputs.length === 0) {
                 return true;
@@ -53,7 +53,7 @@ exports.SystemPredicateDefs = [
         label: 'Exclude Values',
         icon: { text: '!IN' },
         columnScope: { DataTypes: ['String', 'Number', 'Date'] },
-        moduleScope: ['filter', 'conditionalstyle', 'alert'],
+        moduleScope: ['filter', 'conditionalstyle', 'formatColumn', 'alert'],
         handler: ({ inputs, column, value }) => {
             // basically negation of IN
             if (inputs.length === 0) {
@@ -79,7 +79,7 @@ exports.SystemPredicateDefs = [
         label: 'Blanks',
         icon: { name: 'blanks' },
         columnScope: { All: true },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value }) => Helper_1.default.IsInputNullOrEmpty(value),
     },
     {
@@ -87,7 +87,7 @@ exports.SystemPredicateDefs = [
         label: 'Non Blanks',
         icon: { name: 'non-blanks' },
         columnScope: { All: true },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value }) => Helper_1.default.IsInputNotNullOrEmpty(value),
     },
     // Numeric System Filters
@@ -96,7 +96,7 @@ exports.SystemPredicateDefs = [
         label: 'Greater Than',
         icon: { name: 'greater-than' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => Number(value) > Number(inputs[0]),
         toString: ({ inputs }) => `> ${inputs[0]}`,
@@ -107,7 +107,7 @@ exports.SystemPredicateDefs = [
         label: 'Less Than',
         icon: { name: 'less-than' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => Number(value) < Number(inputs[0]),
         toString: ({ inputs }) => `< ${inputs[0]}`,
@@ -118,7 +118,7 @@ exports.SystemPredicateDefs = [
         label: 'Positive',
         icon: { text: '>0' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value }) => Number(value) > 0,
     },
     {
@@ -126,7 +126,7 @@ exports.SystemPredicateDefs = [
         label: 'Negative',
         icon: { text: '<0' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value }) => Number(value) < 0,
     },
     {
@@ -134,7 +134,7 @@ exports.SystemPredicateDefs = [
         label: 'Zero',
         icon: { text: '=0' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value }) => {
             if (typeof value === 'string' && !StringExtensions_1.default.IsNumeric(value)) {
                 return false;
@@ -147,7 +147,7 @@ exports.SystemPredicateDefs = [
         label: 'Equals',
         icon: { name: 'equal' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => {
             const input = inputs[0];
@@ -165,7 +165,7 @@ exports.SystemPredicateDefs = [
         label: 'Not Equals',
         icon: { name: 'not-equal' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => {
             const input = inputs[0];
@@ -183,7 +183,7 @@ exports.SystemPredicateDefs = [
         label: 'Between',
         icon: { text: 'BE' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         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]}`,
@@ -194,7 +194,7 @@ exports.SystemPredicateDefs = [
         label: 'Not Between',
         icon: { text: '!BE' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         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]}`,
@@ -222,7 +222,7 @@ exports.SystemPredicateDefs = [
         label: 'Equals',
         icon: { name: 'equal' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -241,7 +241,7 @@ exports.SystemPredicateDefs = [
         label: 'Not Equals',
         icon: { name: 'not-equal' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -260,7 +260,7 @@ exports.SystemPredicateDefs = [
         label: 'Contains',
         icon: { name: 'contains' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -278,7 +278,7 @@ exports.SystemPredicateDefs = [
         label: 'Not Contains',
         icon: { name: 'not-contains' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -296,7 +296,7 @@ exports.SystemPredicateDefs = [
         label: 'Starts With',
         icon: { name: 'starts-with' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -314,7 +314,7 @@ exports.SystemPredicateDefs = [
         label: 'Ends With',
         icon: { name: 'ends-with' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -332,7 +332,7 @@ exports.SystemPredicateDefs = [
         label: 'Regex',
         icon: { name: 'regex' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs }) => new RegExp(inputs[0]).test(value),
         toString: ({ inputs }) => `Regex ${inputs[0]}`,
@@ -343,7 +343,7 @@ exports.SystemPredicateDefs = [
         label: 'Today',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value }) => (0, isToday_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -351,7 +351,7 @@ exports.SystemPredicateDefs = [
         label: 'Yesterday',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value }) => (0, isYesterday_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -359,7 +359,7 @@ exports.SystemPredicateDefs = [
         label: 'Tomorrow',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value }) => (0, isTomorrow_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -367,7 +367,7 @@ exports.SystemPredicateDefs = [
         label: 'This Week',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value }) => (0, isThisWeek_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -375,7 +375,7 @@ exports.SystemPredicateDefs = [
         label: 'This Month',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value }) => (0, isThisMonth_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -383,7 +383,7 @@ exports.SystemPredicateDefs = [
         label: 'This Quarter',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value }) => (0, isThisQuarter_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -391,7 +391,7 @@ exports.SystemPredicateDefs = [
         label: 'This Year',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value }) => (0, isThisYear_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -399,7 +399,7 @@ exports.SystemPredicateDefs = [
         label: 'In Past',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value }) => (0, isPast_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -407,7 +407,7 @@ exports.SystemPredicateDefs = [
         label: 'In Future',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value }) => (0, isFuture_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -415,7 +415,7 @@ exports.SystemPredicateDefs = [
         label: 'After',
         icon: { name: 'greater-than' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', '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]}`,
@@ -425,7 +425,7 @@ exports.SystemPredicateDefs = [
         label: 'Before',
         icon: { name: 'less-than' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', '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]}`,
@@ -435,7 +435,7 @@ exports.SystemPredicateDefs = [
         label: 'Equals',
         icon: { name: 'equal' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', '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]}`,
@@ -445,7 +445,7 @@ exports.SystemPredicateDefs = [
         label: 'NotEquals',
         icon: { name: 'not-equal' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', '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]}`,
@@ -455,7 +455,7 @@ exports.SystemPredicateDefs = [
         label: 'Next Work Day',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value, api }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), CalendarHelper_1.default.getNextWorkingDay()),
     },
     {
@@ -463,7 +463,7 @@ exports.SystemPredicateDefs = [
         label: 'Last Work Day',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value, api }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), CalendarHelper_1.default.getPreviousWorkingDay()),
     },
     {
@@ -482,7 +482,7 @@ exports.SystemPredicateDefs = [
         label: 'True',
         icon: { text: 'T' },
         columnScope: { DataTypes: ['Boolean'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value }) => Boolean(value) === true,
     },
     {
@@ -490,7 +490,7 @@ exports.SystemPredicateDefs = [
         label: 'False',
         icon: { text: 'F' },
         columnScope: { DataTypes: ['Boolean'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
         handler: ({ value }) => Boolean(value) === false,
     },
     {

package/src/PredefinedConfig/FormatColumnState.d.ts

@@ -3,6 +3,9 @@ import { AdaptableStyle } from './Common/AdaptableStyle';
 import { AdaptableFormat } from './Common/AdaptableFormat';
 import { AdaptableScope } from './Common/AdaptableScope';
 import { SuspendableObject } from './Common/SuspendableObject';
+import { XOR } from '../Utilities/Extensions/TypeExtensions';
+import { TypeHint } from './Common/Types';
+import { AdaptableBooleanQuery, AdaptablePredicate } from '../types';
 /**
  * Predefined Configuration for Format Column Module
  */
@@ -20,6 +23,11 @@ export interface FormatColumn extends SuspendableObject {
      * Where Format will be applied - whole Row, some Columns or all Columns of given DataType
      */
     Scope: AdaptableScope;
+    /**
+     * Predicate-based Rule to use for deciding if a format column needs to be applied.
+     * When not defined the format column is always applied.
+     */
+    Rule?: FormatColumnRule;
     /**
      * Style to apply
      */
@@ -48,6 +56,16 @@ export interface FormatColumn extends SuspendableObject {
      */
     IncludeGroupedRows?: boolean;
 }
+/**
+ * The Format Column Rule - can be either a Predicate or an Expression
+ */
+export declare type FormatColumnRule = XOR<{
+    Predicate: FormatColumnPredicate;
+}, AdaptableBooleanQuery>;
+export interface FormatColumnPredicate extends AdaptablePredicate {
+    PredicateId: TypeHint<string, SystemFormatColumnPredicateId>;
+}
+declare type SystemFormatColumnPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False';
 /**
  * Special Style used when Formatting Columns: Gradient, PercentBar or CheckBox
  */
@@ -150,3 +168,4 @@ export declare type CellTextOptions = CellTextOption[];
  * Text optionally to show in a Format Column special style: 'CellValue' or 'PercentageValue'
  */
 export declare type CellTextOption = 'CellValue' | 'PercentageValue';
+export {};

package/src/PredefinedConfig/PredefinedConfig.d.ts

@@ -36,6 +36,7 @@ export interface PredefinedConfig {
     CalculatedColumn?: CalculatedColumnState;
     /**
      * Supplies a collection of *ConditionalStyle* objects to provides columns and rows with a particular style when the data matches a given rule
+     * @deprecated use `FormatColumn` instead
      */
     ConditionalStyle?: ConditionalStyleState;
     /**

package/src/Redux/ActionsReducers/FormatColumnRedux.d.ts

@@ -4,6 +4,14 @@ import * as Redux from 'redux';
  * @ReduxAction A Format Column has been added
  */
 export declare const FORMAT_COLUMN_ADD = "FORMAT_COLUMN_ADD";
+/**
+ * @ReduxAction Format column was moved up
+ */
+export declare const FORMAT_COLUMN_MOVE_UP = "FORMAT_COLUMN_MOVE_UP";
+/**
+ * @ReduxAction Format column was moved down
+ */
+export declare const FORMAT_COLUMN_MOVE_DOWN = "FORMAT_COLUMN_MOVE_DOWN";
 /**
  * @ReduxAction A Format Column has been edited
  */
@@ -31,6 +39,10 @@ export interface FormatColumnAddAction extends FormatColumnAction {
 }
 export interface FormatColumnEditAction extends FormatColumnAction {
 }
+export interface FormatColumnMoveUpAction extends FormatColumnAction {
+}
+export interface FormatColumnMoveDownAction extends FormatColumnAction {
+}
 export interface FormatColumnDeleteAction extends FormatColumnAction {
 }
 export interface FormatColumnSuspendAction extends FormatColumnAction {
@@ -43,6 +55,8 @@ export interface FormatColumnReadyAction extends Redux.Action {
 export declare const FormatColumnAdd: (formatColumn: FormatColumn) => FormatColumnAddAction;
 export declare const FormatColumnEdit: (formatColumn: FormatColumn) => FormatColumnEditAction;
 export declare const FormatColumnDelete: (formatColumn: FormatColumn) => FormatColumnDeleteAction;
+export declare const FormatColumnMoveUp: (formatColumn: FormatColumn) => FormatColumnAddAction;
+export declare const FormatColumnMoveDown: (formatColumn: FormatColumn) => FormatColumnAddAction;
 export declare const FormatColumnSuspend: (formatColumn: FormatColumn) => FormatColumnSuspendAction;
 export declare const FormatColumnUnSuspend: (formatColumn: FormatColumn) => FormatColumnSuspendAction;
 export declare const FormatColumnReady: (formatColumnState: FormatColumnState) => FormatColumnReadyAction;

package/src/Redux/ActionsReducers/FormatColumnRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FormatColumnReducer = exports.FormatColumnReady = exports.FormatColumnUnSuspend = exports.FormatColumnSuspend = exports.FormatColumnDelete = exports.FormatColumnEdit = exports.FormatColumnAdd = exports.FORMAT_COLUMN_UNSUSPEND = exports.FORMAT_COLUMN_SUSPEND = exports.FORMAT_COLUMN_READY = exports.FORMAT_COLUMN_DELETE = exports.FORMAT_COLUMN_EDIT = exports.FORMAT_COLUMN_ADD = void 0;
+exports.FormatColumnReducer = exports.FormatColumnReady = exports.FormatColumnUnSuspend = exports.FormatColumnSuspend = exports.FormatColumnMoveDown = exports.FormatColumnMoveUp = exports.FormatColumnDelete = exports.FormatColumnEdit = exports.FormatColumnAdd = exports.FORMAT_COLUMN_UNSUSPEND = exports.FORMAT_COLUMN_SUSPEND = exports.FORMAT_COLUMN_READY = exports.FORMAT_COLUMN_DELETE = exports.FORMAT_COLUMN_EDIT = exports.FORMAT_COLUMN_MOVE_DOWN = exports.FORMAT_COLUMN_MOVE_UP = exports.FORMAT_COLUMN_ADD = void 0;
 const tslib_1 = require("tslib");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
@@ -9,6 +9,14 @@ const utils_1 = require("./utils");
  * @ReduxAction A Format Column has been added
  */
 exports.FORMAT_COLUMN_ADD = 'FORMAT_COLUMN_ADD';
+/**
+ * @ReduxAction Format column was moved up
+ */
+exports.FORMAT_COLUMN_MOVE_UP = 'FORMAT_COLUMN_MOVE_UP';
+/**
+ * @ReduxAction Format column was moved down
+ */
+exports.FORMAT_COLUMN_MOVE_DOWN = 'FORMAT_COLUMN_MOVE_DOWN';
 /**
  * @ReduxAction A Format Column has been edited
  */
@@ -44,6 +52,16 @@ const FormatColumnDelete = (formatColumn) => ({
     formatColumn,
 });
 exports.FormatColumnDelete = FormatColumnDelete;
+const FormatColumnMoveUp = (formatColumn) => ({
+    type: exports.FORMAT_COLUMN_MOVE_UP,
+    formatColumn,
+});
+exports.FormatColumnMoveUp = FormatColumnMoveUp;
+const FormatColumnMoveDown = (formatColumn) => ({
+    type: exports.FORMAT_COLUMN_MOVE_DOWN,
+    formatColumn,
+});
+exports.FormatColumnMoveDown = FormatColumnMoveDown;
 const FormatColumnSuspend = (formatColumn) => ({
     type: exports.FORMAT_COLUMN_SUSPEND,
     formatColumn,
@@ -85,6 +103,30 @@ const FormatColumnReducer = (state = initialState, action) => {
         case exports.FORMAT_COLUMN_UNSUSPEND: {
             return Object.assign(Object.assign({}, state), { FormatColumns: (0, utils_1.changeIsSuspendInList)(action.formatColumn, state.FormatColumns, false) });
         }
+        case exports.FORMAT_COLUMN_MOVE_UP: {
+            const index = state.FormatColumns.findIndex((formatColumn) => formatColumn.Uuid === action.formatColumn.Uuid);
+            let swapIndex = index - 1;
+            if (swapIndex < 0) {
+                swapIndex = state.FormatColumns.length - 1;
+            }
+            const formatColumnToSwap = state.FormatColumns[swapIndex];
+            const newFormatColumns = [...state.FormatColumns];
+            newFormatColumns[swapIndex] = state.FormatColumns[index];
+            newFormatColumns[index] = formatColumnToSwap;
+            return Object.assign(Object.assign({}, state), { FormatColumns: newFormatColumns });
+        }
+        case exports.FORMAT_COLUMN_MOVE_DOWN: {
+            const index = state.FormatColumns.findIndex((formatColumn) => formatColumn.Uuid === action.formatColumn.Uuid);
+            let swapIndex = index + 1;
+            if (swapIndex > state.FormatColumns.length - 1) {
+                swapIndex = 0;
+            }
+            const formatColumnToSwap = state.FormatColumns[swapIndex];
+            const newFormatColumns = [...state.FormatColumns];
+            newFormatColumns[swapIndex] = state.FormatColumns[index];
+            newFormatColumns[index] = formatColumnToSwap;
+            return Object.assign(Object.assign({}, state), { FormatColumns: newFormatColumns });
+        }
         default:
             return state;
     }

package/src/Redux/Store/AdaptableStore.js

@@ -657,6 +657,8 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case FormatColumnRedux.FORMAT_COLUMN_ADD:
                 case FormatColumnRedux.FORMAT_COLUMN_EDIT:
                 case FormatColumnRedux.FORMAT_COLUMN_DELETE:
+                case FormatColumnRedux.FORMAT_COLUMN_MOVE_DOWN:
+                case FormatColumnRedux.FORMAT_COLUMN_MOVE_UP:
                 case FormatColumnRedux.FORMAT_COLUMN_SUSPEND:
                 case FormatColumnRedux.FORMAT_COLUMN_UNSUSPEND:
                 case CustomSortRedux.CUSTOM_SORT_ADD:

package/src/Strategy/FormatColumnModule.d.ts

@@ -2,12 +2,10 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
-import * as FormatColumnRedux from '../Redux/ActionsReducers/FormatColumnRedux';
 import { FormatColumn } from '../PredefinedConfig/FormatColumnState';
-import { AdaptableObjectView, IModule } from './Interface/IModule';
+import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
-import { FormatColumnWizard } from '../View/FormatColumn/Wizard/FormatColumnWizard';
 export declare class FormatColumnModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     getModuleAdaptableObjects(config?: {
@@ -21,11 +19,6 @@ export declare class FormatColumnModule extends AdaptableModuleBase implements I
     getTeamSharingAction(): TeamSharingImportInfo<FormatColumn>;
     toView(formatColumn: FormatColumn): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
-    getViewProperties(): {
-        getDeleteAction: (formatColumn: FormatColumn) => FormatColumnRedux.FormatColumnDeleteAction;
-        getSuspendAction: (formatColumn: FormatColumn) => FormatColumnRedux.FormatColumnSuspendAction;
-        getUnSuspendAction: (formatColumn: FormatColumn) => FormatColumnRedux.FormatColumnSuspendAction;
-        getEditWizard(): typeof FormatColumnWizard;
-    };
+    getViewProperties(): AdaptableModuleView;
     canBeAssociatedWithLayouts(): boolean;
 }

package/src/Strategy/FormatColumnModule.js

@@ -13,6 +13,8 @@ const FormatColumnFormatWizardSection_1 = require("../View/FormatColumn/Wizard/F
 const getFormatColumnSettingsViewItems_1 = require("./Utilities/FormatColumn/getFormatColumnSettingsViewItems");
 const getFormatColumnStyleViewItems_1 = require("./Utilities/FormatColumn/getFormatColumnStyleViewItems");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
+const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
+const MoveFormatColumn_1 = require("../View/FormatColumn/MoveFormatColumn");
 class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FormatColumnModuleId, ModuleConstants.FormatColumnFriendlyName, 'format-column', 'FormatColumnPopup', 'Create a column style, display format or cell alignment', api);
@@ -241,6 +243,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             abObject: formatColumn,
             items: [
                 (0, getScopeViewItems_1.getScopeViewItems)(formatColumn.Scope, this.api),
+                formatColumn.Rule && (0, getRuleViewItems_1.getRuleViewItems)(formatColumn.Rule, this.api),
                 {
                     name: 'Style',
                     view: () => (0, getFormatColumnStyleViewItems_1.getFormatColumnStyleViewItems)(formatColumn, this.api),
@@ -251,7 +254,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 },
                 (0, getFormatColumnSettingsViewItems_1.getFormatColumnSettingsViewItems)(formatColumn),
                 (0, getObjectTagsViewItems_1.getObjectTagsViewItems)(formatColumn, this.api),
-            ],
+            ].filter(Boolean),
         };
     }
     toViewAll() {
@@ -261,6 +264,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getViewProperties() {
         return {
+            actions: [MoveFormatColumn_1.MoveFormatColumn],
             getDeleteAction: FormatColumnRedux.FormatColumnDelete,
             getSuspendAction: FormatColumnRedux.FormatColumnSuspend,
             getUnSuspendAction: FormatColumnRedux.FormatColumnUnSuspend,

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

@@ -34,17 +34,17 @@ export interface AdaptableObjectItemView {
     /**
      * Custom name for the property name
      */
-    label?: string | React.FunctionComponent<{
+    label?: string | React.FunctionComponent<React.PropsWithChildren<{
         data: AdaptableObject | SuspendableObject;
-    }>;
+    }>>;
     /**
      * How the item is rendered.
      * Defaults to tags.
      * Important to be a component so react can detect if it is the same component.
      */
-    view?: React.FunctionComponent<{
+    view?: React.FunctionComponent<React.PropsWithChildren<{
         data: AdaptableObject | SuspendableObject;
-    }>;
+    }>>;
     /**
      * Values used for the component.
      * Could be later extended to include an 'onChange' prop.
@@ -59,7 +59,7 @@ export interface AdaptableObjectView {
     /**
      * Used to render expanded content
      */
-    expand?: React.FunctionComponent;
+    expand?: React.FunctionComponent<React.PropsWithChildren<unknown>>;
     /**
      * Reference to the underling object.
      */
@@ -77,10 +77,10 @@ export interface AdaptableObjectCompactView {
     item: AdaptableObjectItemView;
     abObject: AdaptableObject;
 }
-export declare type AdaptableModuleViewAction = React.FunctionComponent<{
+export declare type AdaptableModuleViewAction = React.FunctionComponent<React.PropsWithChildren<{
     data: AdaptableObject;
     accessLevel: AccessLevel;
-}>;
+}>>;
 export interface AdaptableModuleView {
     /**
      * List of actions.
@@ -98,9 +98,9 @@ export interface AdaptableModuleView {
     getSuspendAllAction?: () => Redux.Action;
     getUnSuspendAllAction?: () => Redux.Action;
     getDeleteAllAction?: () => Redux.Action;
-    emptyView?: React.FunctionComponent<{
+    emptyView?: React.FunctionComponent<React.PropsWithChildren<{
         module: IModule;
-    }> | string;
+    }>> | string;
     newTooltipText?: string;
     /**
      * Specifieds the types of objects the module manages.
@@ -111,7 +111,7 @@ export interface AdaptableModuleView {
         label?: string;
         accessLevel?: AccessLevel;
     }[];
-    getEditWizard?(abObject?: AdaptableObject): React.FunctionComponent<AdaptableOnePageWizardProps<AdaptableObject>>;
+    getEditWizard?(abObject?: AdaptableObject): React.FunctionComponent<React.PropsWithChildren<AdaptableOnePageWizardProps<AdaptableObject>>>;
     /**
      * Specify status panel props.
      * Can be extended to include custom rendereres.

package/src/Strategy/Utilities/Alert/getAlertBehaviourViewItems.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { AdaptableApi, AlertDefinition } from '../../../types';
 export declare const getAlertBehaviourViewItems: (api: AdaptableApi) => {
     name: string;
-    view: React.FunctionComponent<{
+    view: React.FunctionComponent<React.PropsWithChildren<{
         data: AlertDefinition;
-    }>;
+    }>>;
 };

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -64,11 +64,11 @@ exports.DefaultAdaptableOptions = {
         customPredicateDefs: [],
         displayColumnFriendlyNamesForExpressions: true,
         expressionOptions: {
-            defaultBooleanFunctions: booleanExpressionFunctions_1.booleanExpressionFunctions,
-            defaultScalarFunctions: scalarExpressionFunctions_1.scalarExpressionFunctions,
-            defaultObservableFunctions: observableExpressionFunctions_1.observableExpressionFunctions,
-            defaultAggregatedBooleanFunctions: aggregatedBooleanExpressionFunctions_1.aggregatedBooleanExpressionFunctions,
-            defaultAggregatedScalarFunctions: aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions,
+            defaultBooleanFunctions: booleanExpressionFunctions_1.booleanExpressionFunctionsList,
+            defaultScalarFunctions: scalarExpressionFunctions_1.scalarExpressionFunctionsList,
+            defaultObservableFunctions: observableExpressionFunctions_1.observableExpressionFunctionsList,
+            defaultAggregatedBooleanFunctions: aggregatedBooleanExpressionFunctions_1.aggregatedBooleanExpressionFunctionsList,
+            defaultAggregatedScalarFunctions: aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctionsList,
             moduleExpressionFunctions: undefined,
             queryableColumns: undefined,
             performExpressionValidation: true,