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

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

@@ -16,6 +16,18 @@ export declare const THEME_SELECT = "THEME_SELECT";
  * @ReduxAction Theme Module is ready
  */
 export declare const THEME_READY = "THEME_READY";
+/**
+ * @ReduxAction Theme Module is edited
+ */
+export declare const THEME_EDIT = "THEME_EDIT";
+/**
+ * @ReduxAction A new theme is added
+ */
+export declare const THEME_ADD = "THEME_ADD";
+/**
+ * @ReduxAction A theme is deleted
+ */
+export declare const THEME_DELETE = "THEME_DELETE";
 export interface ThemeSetSystemThemesAction extends Redux.Action {
     SystemThemes: AdaptableTheme[];
 }
@@ -28,8 +40,23 @@ export interface ThemeSelectAction extends Redux.Action {
 export interface ThemeReadyAction extends Redux.Action {
     themeState: ThemeState;
 }
+export interface ThemeReadyAction extends Redux.Action {
+    themeState: ThemeState;
+}
+export interface ThemeEditAction extends Redux.Action {
+    theme: AdaptableTheme;
+}
+export interface ThemeAddUserThemeAction extends Redux.Action {
+    theme: AdaptableTheme;
+}
+export interface ThemeDeleteUserThemeAction extends Redux.Action {
+    theme: AdaptableTheme;
+}
 export declare const ThemeSetSystemThemes: (SystemThemes: AdaptableTheme[]) => ThemeSetSystemThemesAction;
 export declare const ThemeSetUserThemes: (UserThemes: AdaptableTheme[]) => ThemeSetUserThemesAction;
 export declare const ThemeSelect: (Theme: string) => ThemeSelectAction;
 export declare const ThemeReady: (themeState: ThemeState) => ThemeReadyAction;
+export declare const ThemeEdit: (theme: AdaptableTheme) => ThemeEditAction;
+export declare const ThemeAdd: (theme: AdaptableTheme) => ThemeAddUserThemeAction;
+export declare const ThemeDelete: (theme: AdaptableTheme) => ThemeDeleteUserThemeAction;
 export declare const ThemeReducer: Redux.Reducer<ThemeState>;

package/src/Redux/ActionsReducers/ThemeRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ThemeReducer = exports.ThemeReady = exports.ThemeSelect = exports.ThemeSetUserThemes = exports.ThemeSetSystemThemes = exports.THEME_READY = exports.THEME_SELECT = exports.THEME_SET_USER_THEMES = exports.THEME_SET_SYSTEM_THEMES = void 0;
+exports.ThemeReducer = exports.ThemeDelete = exports.ThemeAdd = exports.ThemeEdit = exports.ThemeReady = exports.ThemeSelect = exports.ThemeSetUserThemes = exports.ThemeSetSystemThemes = exports.THEME_DELETE = exports.THEME_ADD = exports.THEME_EDIT = exports.THEME_READY = exports.THEME_SELECT = exports.THEME_SET_USER_THEMES = exports.THEME_SET_SYSTEM_THEMES = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 /**
  * @ReduxAction System Themes have been set
@@ -18,6 +18,18 @@ exports.THEME_SELECT = 'THEME_SELECT';
  * @ReduxAction Theme Module is ready
  */
 exports.THEME_READY = 'THEME_READY';
+/**
+ * @ReduxAction Theme Module is edited
+ */
+exports.THEME_EDIT = 'THEME_EDIT';
+/**
+ * @ReduxAction A new theme is added
+ */
+exports.THEME_ADD = 'THEME_ADD';
+/**
+ * @ReduxAction A theme is deleted
+ */
+exports.THEME_DELETE = 'THEME_DELETE';
 const ThemeSetSystemThemes = (SystemThemes) => ({
     type: exports.THEME_SET_SYSTEM_THEMES,
     SystemThemes,
@@ -38,6 +50,21 @@ const ThemeReady = (themeState) => ({
     themeState,
 });
 exports.ThemeReady = ThemeReady;
+const ThemeEdit = (theme) => ({
+    type: exports.THEME_EDIT,
+    theme,
+});
+exports.ThemeEdit = ThemeEdit;
+const ThemeAdd = (theme) => ({
+    type: exports.THEME_ADD,
+    theme,
+});
+exports.ThemeAdd = ThemeAdd;
+const ThemeDelete = (theme) => ({
+    type: exports.THEME_DELETE,
+    theme,
+});
+exports.ThemeDelete = ThemeDelete;
 const initialState = {
     CurrentTheme: GeneralConstants_1.THEME_DEFAULT_CURRENT_THEME,
     SystemThemes: GeneralConstants_1.SYSTEM_THEMES,
@@ -57,6 +84,41 @@ const ThemeReducer = (state = initialState, action) => {
             return Object.assign({}, state, {
                 CurrentTheme: action.Theme,
             });
+        case exports.THEME_EDIT:
+            let newThemes = null;
+            // find by UUID, or by name
+            const themeToBeReplaced = action.theme;
+            let replaceIndex = state.UserThemes.findIndex((theme) => themeToBeReplaced.Uuid === theme.Uuid);
+            // try by name
+            if (replaceIndex === -1) {
+                replaceIndex = state.UserThemes.findIndex((theme) => themeToBeReplaced.Name === theme.Name);
+            }
+            // fond one, either by name or by uuid
+            if (replaceIndex !== -1) {
+                newThemes = [...state.UserThemes];
+                newThemes[replaceIndex] = themeToBeReplaced;
+            }
+            if (newThemes === null) {
+                return state;
+            }
+            // if name changed, need to update the current name
+            let currentTheme = state.CurrentTheme;
+            if (currentTheme !== themeToBeReplaced.Name) {
+                // need to update the current theme if it name has changed
+                currentTheme = themeToBeReplaced.Name;
+            }
+            return Object.assign({}, state, {
+                CurrentTheme: currentTheme,
+                UserThemes: newThemes,
+            });
+        case exports.THEME_ADD:
+            return Object.assign({}, state, {
+                UserThemes: [...state.UserThemes, action.theme],
+            });
+        case exports.THEME_DELETE:
+            return Object.assign({}, state, {
+                UserThemes: state.UserThemes.filter((theme) => theme.Uuid !== action.theme.Uuid),
+            });
         default:
             return state;
     }

package/src/Strategy/ExportModule.js

@@ -110,7 +110,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 switch (exportDestination) {
                     case Enums_1.ExportDestination.Excel:
                         if (report.Name === GeneralConstants_1.VISUAL_DATA_REPORT) {
-                            // WYSIWYG is fully delegated to the ag-grid excel export
+                            // WYSIWYG is fully delegated to the AG Grid excel export
                             this.api.exportApi.exportVisualDataToExcel();
                         }
                         else {

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

@@ -26,6 +26,7 @@ export declare const AB_SPECIAL_COLUMN: AdaptableColumnType;
 export declare const HALF_SECOND: number;
 export declare const AG_GRID_GROUPED_COLUMN: string;
 export declare const AG_GRID_PIVOT_COLUMN: string;
+export declare const AG_GRID_CHART_WINDOW = "AG Grid Window";
 export declare const ADAPTABLE_ROW_ACTION_BUTTONS = "adaptableRowActionButtons";
 export declare const ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = "(ActionRowButtons)";
 export declare const DEFAULT_DATE_FORMAT_PATTERN = "dd-MM-yyyy";

package/src/Utilities/Constants/GeneralConstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
-exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = void 0;
+exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS = exports.AG_GRID_CHART_WINDOW = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
+exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = void 0;
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const UIHelper_1 = require("../../View/UIHelper");
 exports.AUTOGENERATED_PK_COLUMN = '__ADAPTABLE_PK__';
@@ -29,6 +29,7 @@ exports.AB_SPECIAL_COLUMN = 'abSpecialColumn';
 exports.HALF_SECOND = 500;
 exports.AG_GRID_GROUPED_COLUMN = 'ag-Grid-AutoColumn';
 exports.AG_GRID_PIVOT_COLUMN = 'pivot_';
+exports.AG_GRID_CHART_WINDOW = 'AG Grid Window';
 exports.ADAPTABLE_ROW_ACTION_BUTTONS = 'adaptableRowActionButtons';
 exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = '(ActionRowButtons)';
 exports.DEFAULT_DATE_FORMAT_PATTERN = 'dd-MM-yyyy';

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -276,6 +276,6 @@ exports.DefaultAdaptableOptions = {
     },
     chartingOptions: {
         saveStrategy: 'none',
-        agGridContainerName: 'Ag Grid Window',
+        agGridContainerName: GeneralConstants.AG_GRID_CHART_WINDOW,
     },
 };

package/src/Utilities/Defaults/DefaultSettingsPanel.js

@@ -24,9 +24,9 @@ exports.DEFAULT_NAVIGATION_ITEMS = [
     'SystemStatus',
     '-',
     'FormatColumn',
+    'StyledColumn',
     'FlashingCell',
     'Theme',
-    'StyledColumn',
     '-',
     'QuickSearch',
     'Query',
@@ -37,8 +37,8 @@ exports.DEFAULT_NAVIGATION_ITEMS = [
     'Shortcut',
     'DataChangeHistory',
     '-',
+    'Charting',
     'Schedule',
     'StateManagement',
     'TeamSharing',
-    'Charting',
 ];

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

@@ -1,6 +1,6 @@
 import { ExpressionFunction } from '../../parser/src/types';
 import { BaseParameter } from './expressionFunctionUtils';
-import { RowNode } from '@ag-grid-community/core';
+import { IRowNode } from '@ag-grid-community/core';
 import { AggregateParams } from './scalarAggregationHelper';
 /**
  * List of all the AggregatedScalar Functions available in AdaptableQL
@@ -22,12 +22,12 @@ export interface WeightParameter extends BaseParameter<'operand', 'WEIGHT'> {
 }
 export interface AggregatedScalarExpressionEvaluation {
     aggregationParams: AggregateParams<any, string | number>;
-    rowValueGetter?: (rowNode: RowNode, aggregatedValue: any) => string | number | Date | boolean;
+    rowValueGetter?: (rowNode: IRowNode, aggregatedValue: any) => string | number | Date | boolean;
     context?: {
         weightParam?: WeightParameter;
     };
     sortByColumn?: string;
-    rowFilterFn?: (rowNode: RowNode) => boolean;
+    rowFilterFn?: (rowNode: IRowNode) => boolean;
 }
 export interface CumulatedAggregationValue {
     currentValue: number;

package/src/Utilities/Interface/Preview.d.ts

@@ -1,5 +1,5 @@
 import { AlertDefinition } from '../../PredefinedConfig/AlertState';
-import { RowNode } from '@ag-grid-community/core';
+import { IRowNode } from '@ag-grid-community/core';
 import { AdaptableColumn } from '../../../types';
 export interface PreviewInfo {
     column: AdaptableColumn;
@@ -14,5 +14,5 @@ export interface PreviewResult {
     initialValue: number;
     computedValue: number;
     validationRules: AlertDefinition[];
-    rowNode: RowNode;
+    rowNode: IRowNode;
 }

package/src/Utilities/ObjectFactory.d.ts

@@ -23,8 +23,8 @@ import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessag
 import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatusMessageInfo';
 import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
-import { ChartDefinition, ColumnFilter, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
-import { RowNode } from '@ag-grid-community/core';
+import { AdaptableTheme, ChartDefinition, ColumnFilter, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
+import { IRowNode } from '@ag-grid-community/core';
 import { AdaptableApi } from '../../types';
 import { ToastOptions } from '../components/Toastify';
 import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
@@ -65,7 +65,8 @@ export declare function CreateEmptyCellSummmary(): CellSummmary;
 export declare function CreateColumnFilter(ColumnId: string, PredicateId: SystemFilterPredicateId, Inputs: any[]): ColumnFilter;
 export declare function CreateEmptyStyledColumn(): StyledColumn;
 export declare function CreateEmptyChartDefinition(chartDefinition?: ChartDefinition): ChartDefinition;
-export declare function CreateCustomDisplayFormatterContext(value: any, node: RowNode, abColumn: AdaptableColumn, api: AdaptableApi): CustomDisplayFormatterContext;
+export declare function CreateCustomDisplayFormatterContext(value: any, node: IRowNode, abColumn: AdaptableColumn, api: AdaptableApi): CustomDisplayFormatterContext;
+export declare function CreateEmptyTheme(name?: string): AdaptableTheme;
 export declare function CreateToastOptions(notificationsOptions: NotificationsOptions, { onClose, containerId }: {
     onClose?: VoidFunction;
     containerId: string;
@@ -110,5 +111,6 @@ export declare const ObjectFactory: {
     CreateCustomDisplayFormatterContext: typeof CreateCustomDisplayFormatterContext;
     CreateEmptyStyledColumn: typeof CreateEmptyStyledColumn;
     CreateEmptyChartDefinition: typeof CreateEmptyChartDefinition;
+    CreateEmptyTheme: typeof CreateEmptyTheme;
 };
 export default ObjectFactory;

package/src/Utilities/ObjectFactory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectFactory = exports.CreateToastOptions = exports.CreateCustomDisplayFormatterContext = exports.CreateEmptyChartDefinition = exports.CreateEmptyStyledColumn = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateServerReport = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCustomSort = void 0;
+exports.ObjectFactory = exports.CreateToastOptions = exports.CreateEmptyTheme = exports.CreateCustomDisplayFormatterContext = exports.CreateEmptyChartDefinition = exports.CreateEmptyStyledColumn = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateServerReport = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCustomSort = void 0;
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
@@ -379,6 +379,14 @@ function CreateCustomDisplayFormatterContext(value, node, abColumn, api) {
     };
 }
 exports.CreateCustomDisplayFormatterContext = CreateCustomDisplayFormatterContext;
+function CreateEmptyTheme(name) {
+    return {
+        Uuid: (0, Uuid_1.createUuid)(),
+        Name: name || 'Custom Theme',
+        Description: name || 'Custom Theme',
+    };
+}
+exports.CreateEmptyTheme = CreateEmptyTheme;
 function CreateToastOptions(notificationsOptions, { onClose, containerId }, overides) {
     var _a;
     const adaptableToastPosition = notificationsOptions.position;
@@ -471,5 +479,6 @@ exports.ObjectFactory = {
     CreateCustomDisplayFormatterContext,
     CreateEmptyStyledColumn,
     CreateEmptyChartDefinition,
+    CreateEmptyTheme,
 };
 exports.default = exports.ObjectFactory;

package/src/Utilities/Services/AggregatedScalarLiveValue.d.ts

@@ -1,7 +1,7 @@
 import { AggregatedScalarExpressionEvaluation } from '../ExpressionFunctions/aggregatedScalarExpressionFunctions';
 import { AdaptableApi } from '../../Api/AdaptableApi';
 import { AdaptableModule as ModuleConstants } from '../../PredefinedConfig/Common/Types';
-import { RowNode } from '@ag-grid-community/core';
+import { IRowNode } from '@ag-grid-community/core';
 import { XOR } from '../Extensions/TypeExtensions';
 export declare class AggregatedScalarLiveValue {
     private source;
@@ -17,7 +17,7 @@ export declare class AggregatedScalarLiveValue {
         aggregatedScalarExpressionEvaluation: AggregatedScalarExpressionEvaluation;
     }>, requestingModule: ModuleConstants, adaptableApi: AdaptableApi);
     refresh(): void;
-    getAggregatedValueForRow(rowNode: RowNode): any;
+    getAggregatedValueForRow(rowNode: IRowNode): any;
     getAllAggregationValues(): number[];
     private getAggregationValue;
     private getGlobalAggregatedValue;

package/src/Utilities/Services/CalculatedColumnExpressionService.d.ts

@@ -1,5 +1,5 @@
 import { ICalculatedColumnExpressionService } from './Interface/ICalculatedColumnExpressionService';
-import { RowNode } from '@ag-grid-community/core';
+import { IRowNode } from '@ag-grid-community/core';
 import { AdaptableCalculatedColumnQuery, CalculatedColumn, CalculatedColumnSettings } from '../../PredefinedConfig/CalculatedColumnState';
 import { AdaptableApi } from '../../../types';
 export declare class CalculatedColumnExpressionService implements ICalculatedColumnExpressionService {
@@ -9,7 +9,7 @@ export declare class CalculatedColumnExpressionService implements ICalculatedCol
     destroy(): void;
     getCalculatedColumnDataType(calculatedColumnQuery: AdaptableCalculatedColumnQuery): CalculatedColumnSettings['DataType'];
     isCalculatedColumnQueryValid(calculatedColumnQuery: AdaptableCalculatedColumnQuery): boolean;
-    evaluateCalculatedColumnQuery(calculatedColumn: CalculatedColumn, rowNode: RowNode): any;
+    evaluateCalculatedColumnQuery(calculatedColumn: CalculatedColumn, rowNode: IRowNode): any;
     createAggregatedScalarLiveValue(calculatedColumn: CalculatedColumn): void;
     destroyAggregatedScalarLiveValue(calculatedColumn: CalculatedColumn): void;
 }

package/src/Utilities/Services/Interface/ICalculatedColumnExpressionService.d.ts

@@ -1,9 +1,9 @@
 import { IAdaptableService } from './IAdaptableService';
-import { RowNode } from '@ag-grid-community/core';
+import { IRowNode } from '@ag-grid-community/core';
 import { AdaptableCalculatedColumnQuery, CalculatedColumn, CalculatedColumnSettings } from '../../../PredefinedConfig/CalculatedColumnState';
 export interface ICalculatedColumnExpressionService extends IAdaptableService {
     isCalculatedColumnQueryValid(calculatedColumnQuery: AdaptableCalculatedColumnQuery): boolean;
-    evaluateCalculatedColumnQuery(calculatedColumn: CalculatedColumn, rowNode: RowNode): any;
+    evaluateCalculatedColumnQuery(calculatedColumn: CalculatedColumn, rowNode: IRowNode): any;
     getCalculatedColumnDataType(calculatedColumnQuery: AdaptableCalculatedColumnQuery): CalculatedColumnSettings['DataType'];
     createAggregatedScalarLiveValue(calculatedColumn: CalculatedColumn): void;
     destroyAggregatedScalarLiveValue(calculatedColumn: CalculatedColumn): void;

package/src/Utilities/Services/Interface/IQueryLanguageService.d.ts

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
 import { IAdaptableService } from './IAdaptableService';
-import { RowNode } from '@ag-grid-community/core';
+import { IRowNode } from '@ag-grid-community/core';
 import { CellDataChangedInfo } from '../../../PredefinedConfig/Common/CellDataChangedInfo';
 import { AdaptableModule } from '../../../PredefinedConfig/Common/Types';
 import { AggregatedScalarFunctionName, ScalarAggregationParameter } from '../../ExpressionFunctions/aggregatedScalarExpressionFunctions';
@@ -10,8 +10,8 @@ import { ScalarFunctionName } from '../../ExpressionFunctions/scalarExpressionFu
 import { ObservableFunctionName } from '../../ExpressionFunctions/observableExpressionFunctions';
 import { ExpressionFunctionMap } from '../../../parser/src/types';
 export interface IQueryLanguageService extends IAdaptableService {
-    evaluateBooleanExpression(expression: string, module: AdaptableModule, rowNode: RowNode): boolean;
-    evaluateScalarExpression(expression: string, module: AdaptableModule, rowNode: RowNode): any;
+    evaluateBooleanExpression(expression: string, module: AdaptableModule, rowNode: IRowNode): boolean;
+    evaluateScalarExpression(expression: string, module: AdaptableModule, rowNode: IRowNode): any;
     evaluateObservableExpression(expression: string, module: AdaptableModule): Observable<CellDataChangedInfo>;
     evaluateAggregatedBooleanExpression(expression: string, module: AdaptableModule): BooleanAggregationParameter;
     evaluateAggregatedScalarExpression(expression: string, module: AdaptableModule): ScalarAggregationParameter;

package/src/Utilities/Services/Interface/IReportService.d.ts

@@ -1,7 +1,7 @@
 import { Report, ReportData, SystemReportName } from '../../../PredefinedConfig/ExportState';
 import { AdaptableColumn } from '../../../PredefinedConfig/Common/AdaptableColumn';
 import { IAdaptableService } from './IAdaptableService';
-import { ExcelStyle, RowNode } from '@ag-grid-community/core';
+import { ExcelStyle, IRowNode } from '@ag-grid-community/core';
 import { SystemExportDestination } from '../../../types';
 export interface IReportService extends IAdaptableService {
     resetExcelStyleMemoization(): void;
@@ -22,7 +22,7 @@ export interface IReportService extends IAdaptableService {
     getReportData(report: Report, includePrimaryKey?: boolean): ReportData;
     getReportDataAsArray(report: Report, includePrimaryKey?: boolean): any[][];
     convertReportDataToArray(reportData: ReportData): any[][];
-    getCellExportValueFromRowNode(rowNode: RowNode, columnId: string): any;
-    getCellExportValueFromRawValue(rowNode: RowNode, rawValue: any, columnId: string): any;
+    getCellExportValueFromRowNode(rowNode: IRowNode, columnId: string): any;
+    getCellExportValueFromRawValue(rowNode: IRowNode, rawValue: any, columnId: string): any;
     getReportFileName(reportName: string): string;
 }

package/src/Utilities/Services/Interface/IThemeService.d.ts

@@ -0,0 +1,3 @@
+import { IAdaptableService } from './IAdaptableService';
+export interface IThemeService extends IAdaptableService {
+}

package/src/Utilities/Services/Interface/IThemeService.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/Utilities/Services/MetamodelService.d.ts

@@ -14,4 +14,6 @@ export declare class MetamodelService implements IMetamodelService {
     private getAdaptableOptionsDefaultValues;
     private getAdaptableMetamodel;
     private getAdaptableOptionsMetamodel;
+    private extractUiLabel;
+    private formatCamelCaseToHumanText;
 }

package/src/Utilities/Services/MetamodelService.js

@@ -7,14 +7,7 @@ const DefaultAdaptableOptions_1 = require("../Defaults/DefaultAdaptableOptions")
 const LoggingHelper_1 = require("../Helpers/LoggingHelper");
 const DocumentationLinkConstants_1 = require("../Constants/DocumentationLinkConstants");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
-const supportedMetamodelTypes = [
-    'string',
-    'number',
-    'boolean',
-    'array',
-    'function',
-    'REFERENCE',
-];
+const supportedMetamodelTypes = ['s', 'n', 'b', 'a', 'f', 'R'];
 class MetamodelService {
     constructor(getAdaptableOptions) {
         this.gridInfoOptions = new Map();
@@ -57,23 +50,23 @@ class MetamodelService {
     validateOptionsObject(validationErrors, optionsObjectName, optionsObject, optionsObjectMetamodel, optionsObjectDefaultValues) {
         Object.entries(optionsObject).forEach(([optionKey, optionValue]) => {
             var _a;
-            const optionMetamodel = (_a = optionsObjectMetamodel === null || optionsObjectMetamodel === void 0 ? void 0 : optionsObjectMetamodel.properties) === null || _a === void 0 ? void 0 : _a.find((metamodelProperty) => metamodelProperty.name === optionKey);
+            const optionMetamodel = (_a = optionsObjectMetamodel === null || optionsObjectMetamodel === void 0 ? void 0 : optionsObjectMetamodel.props) === null || _a === void 0 ? void 0 : _a.find((metamodelProperty) => metamodelProperty.name === optionKey);
             if (!optionMetamodel) {
                 validationErrors.push(`${optionsObjectName}.${optionKey} (value=${optionValue}) :: unknown/unsupported property, will be ignored`);
                 return;
             }
             // let's try to validate the type of the provided value
             const expectedOptionsValueType = this.getExpectedOptionsValueType(optionMetamodel);
-            const providedOptionsValueType = Array.isArray(optionValue) ? 'array' : typeof optionValue;
+            const providedOptionsValueType = Array.isArray(optionValue) ? 'a' : typeof optionValue;
             if (!expectedOptionsValueType) {
                 return;
             }
             // if it's a REFERENCE, we try to go (recursively) deeper
-            if (expectedOptionsValueType === 'REFERENCE') {
-                const referenceObjectName = optionMetamodel.reference;
+            if (expectedOptionsValueType === 'R') {
+                const referenceObjectName = optionMetamodel.ref;
                 const referenceObject = optionsObject[optionKey];
                 const referenceObjectMetamodel = this.getAdaptableMetamodel()[referenceObjectName];
-                if (referenceObject && (referenceObjectMetamodel === null || referenceObjectMetamodel === void 0 ? void 0 : referenceObjectMetamodel.kind) === 'Interface') {
+                if (referenceObject && (referenceObjectMetamodel === null || referenceObjectMetamodel === void 0 ? void 0 : referenceObjectMetamodel.kind) === 'I') {
                     this.validateOptionsObject(validationErrors, referenceObjectName, referenceObject, referenceObjectMetamodel, optionsObjectDefaultValues === null || optionsObjectDefaultValues === void 0 ? void 0 : optionsObjectDefaultValues[optionKey]);
                 }
             }
@@ -107,10 +100,10 @@ class MetamodelService {
             items: baseOptionsItems,
         });
         // map containers
-        adaptableOptionsMetamodel.properties
+        adaptableOptionsMetamodel.props
             .filter((optionItem) => optionItem.gridInfo === 'container')
             .forEach((containerOptionItem) => {
-            const containerMetamodelName = containerOptionItem.reference;
+            const containerMetamodelName = containerOptionItem.ref;
             const adaptableOptionsName = containerOptionItem.name;
             const containerOptionsMetamodel = adaptableMetamodel[containerMetamodelName];
             // @ts-ignore
@@ -125,21 +118,21 @@ class MetamodelService {
             }
             const optionItems = this.mapGridInfoContainerItems(containerOptionsMetamodel, containerOptionsValues, containerOptionsDefaultValues, filterItemProperty);
             gridInfoOptions.set(containerOptionItem.name, {
-                containerLabel: containerOptionItem.uiLabel,
+                containerLabel: this.extractUiLabel(containerOptionItem),
                 items: optionItems,
             });
         });
         return gridInfoOptions;
     }
     mapGridInfoContainerItems(optionItemContainer, adaptableOptionsValues, defaultAdaptableOptionsValues, filter = (itemProperty) => itemProperty.gridInfo === 'item') {
-        return optionItemContainer.properties.filter(filter).map((itemProperty) => {
+        return optionItemContainer.props.filter(filter).map((itemProperty) => {
             return {
                 name: itemProperty.name,
                 value: adaptableOptionsValues === null || adaptableOptionsValues === void 0 ? void 0 : adaptableOptionsValues[itemProperty.name],
                 defaultValue: defaultAdaptableOptionsValues[itemProperty.name],
                 kind: itemProperty.kind,
-                description: StringExtensions_1.default.UnescapeHtmlEntities(itemProperty.description),
-                uiLabel: itemProperty.uiLabel,
+                description: StringExtensions_1.default.UnescapeHtmlEntities(itemProperty.desc),
+                uiLabel: this.extractUiLabel(itemProperty),
             };
         });
     }
@@ -152,5 +145,19 @@ class MetamodelService {
     getAdaptableOptionsMetamodel() {
         return this.getAdaptableMetamodel()['AdaptableOptions'];
     }
+    extractUiLabel(item) {
+        return item.uiLabel || this.formatCamelCaseToHumanText(item.name);
+    }
+    formatCamelCaseToHumanText(camelCase) {
+        if (!camelCase || camelCase == null) {
+            return null;
+        }
+        const rex = /([A-Z])([A-Z])([a-z])|([a-z])([A-Z])/g;
+        const words = camelCase.replace(rex, '$1$4 $2$3$5').replace('.', ' ').split(' ');
+        return words
+            .map((word) => word.substring(0, 1).toUpperCase() +
+            (word.length > 1 ? word.substring(1, word.length) : ''))
+            .join(' ');
+    }
 }
 exports.MetamodelService = MetamodelService;

package/src/Utilities/Services/QueryLanguageService.d.ts

@@ -1,7 +1,7 @@
 import { IQueryLanguageService, ModuleExpressionFunctionsMap } from './Interface/IQueryLanguageService';
 import { Observable } from 'rxjs';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { RowNode } from '@ag-grid-community/core';
+import { IRowNode } from '@ag-grid-community/core';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { ScalarAggregationParameter } from '../ExpressionFunctions/aggregatedScalarExpressionFunctions';
 import { AdaptableApi } from '../../../types';
@@ -15,7 +15,7 @@ export declare class QueryLanguageService implements IQueryLanguageService {
     private cacheModuleSpecificExpressionFunctions;
     constructor(adaptableApi: AdaptableApi);
     evaluateBooleanExpression(expression: string, module: AdaptableModule, rowNode: any): any;
-    evaluateScalarExpression(expression: string, module: AdaptableModule, rowNode: RowNode): any;
+    evaluateScalarExpression(expression: string, module: AdaptableModule, rowNode: IRowNode): any;
     evaluateAggregatedScalarExpression(expression: string, module: AdaptableModule): ScalarAggregationParameter;
     evaluateObservableExpression(reactiveExpression: string, module: AdaptableModule): Observable<CellDataChangedInfo>;
     evaluateAggregatedBooleanExpression(aggregationExpression: string, module: AdaptableModule): BooleanAggregationParameter;

package/src/Utilities/Services/ReportService.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { Report, ReportData, SystemReportName } from '../../PredefinedConfig/ExportState';
 import { IReportService } from './Interface/IReportService';
-import { ExcelStyle, RowNode } from '@ag-grid-community/core';
+import { ExcelStyle, IRowNode } from '@ag-grid-community/core';
 import { SystemExportDestination } from '../../AdaptableOptions/ExportOptions';
 import { AdaptableApi } from '../../../types';
 export declare class ReportService implements IReportService {
@@ -27,10 +27,10 @@ export declare class ReportService implements IReportService {
     getReportData(report: Report, includePrimaryKey?: boolean): ReportData;
     getReportDataAsArray(report: Report, includePrimaryKey?: boolean): any[][];
     convertReportDataToArray(reportData: ReportData): any[][];
-    getRowObjectForColumnIds(rowNode: RowNode, columnIds: string[]): Record<string, any>;
+    getRowObjectForColumnIds(rowNode: IRowNode, columnIds: string[]): Record<string, any>;
     PublishLiveLiveDataChangedEvent(reportDestination: 'ipushpull' | 'Glue42', liveDataTrigger: 'Connected' | 'Disconnected' | 'LiveDataStarted' | 'LiveDataStopped' | 'LiveDataUpdated', liveReport?: any): void;
-    getCellExportValueFromRowNode(rowNode: RowNode, columnId: string): any;
-    getCellExportValueFromRawValue(rowNode: RowNode, cellRawValue: any, columnId: string): any;
+    getCellExportValueFromRowNode(rowNode: IRowNode, columnId: string): any;
+    getCellExportValueFromRawValue(rowNode: IRowNode, cellRawValue: any, columnId: string): any;
     getReportFileName(reportName: string): string;
     destroy(): void;
     private getCustomExportDateFormat;

package/src/Utilities/Services/ThemeService.d.ts

@@ -0,0 +1,12 @@
+import { AdaptableApi, AdaptableTheme } from '../../types';
+import { IThemeService } from './Interface/IThemeService';
+export declare class ThemeService implements IThemeService {
+    private api;
+    private unsubscribe;
+    private styleSheetObject;
+    constructor(api: AdaptableApi);
+    subscribe(): void;
+    onThemeChanged: () => void;
+    applyNewThemeVariables(theme: AdaptableTheme): void;
+    destroy(): void;
+}

package/src/Utilities/Services/ThemeService.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ThemeService = void 0;
+class ThemeService {
+    constructor(api) {
+        var _a;
+        this.unsubscribe = () => { };
+        this.onThemeChanged = () => {
+            const currentTheme = this.api.themeApi.getCurrentThemeObject();
+            this.applyNewThemeVariables(currentTheme);
+        };
+        this.api = api;
+        this.subscribe();
+        if (!this.styleSheetObject) {
+            this.styleSheetObject = new CSSStyleSheet();
+            // ts does not know about adoptedStyleSheets
+            document.adoptedStyleSheets = [
+                ...((_a = document.adoptedStyleSheets) !== null && _a !== void 0 ? _a : []),
+                this.styleSheetObject,
+            ];
+        }
+    }
+    subscribe() {
+        const themeChangedUnsubscribe = this.api.eventApi.on('ThemeChanged', this.onThemeChanged);
+        const themeEditedUnsubscribe = this.api.eventApi.on('ThemeEdited', this.onThemeChanged);
+        this.unsubscribe = () => {
+            themeChangedUnsubscribe();
+            themeEditedUnsubscribe();
+        };
+    }
+    applyNewThemeVariables(theme) {
+        var _a;
+        const variables = (_a = theme.CSSVariables) !== null && _a !== void 0 ? _a : {};
+        let str = ':root {';
+        for (const [key, value] of Object.entries(variables)) {
+            if (key.includes('--')) {
+                str += `${key}: ${value};`;
+            }
+        }
+        str += '}';
+        this.styleSheetObject.replaceSync(str);
+    }
+    destroy() {
+        this.api = null;
+        this.unsubscribe();
+        document.adoptedStyleSheets = [...document.adoptedStyleSheets].filter((sheet) => sheet !== this.styleSheetObject);
+    }
+}
+exports.ThemeService = ThemeService;