@adaptabletools/adaptable 13.0.10 → 13.1.0-canary.1

package/src/Api/ChartingApi.d.ts

@@ -1,4 +1,5 @@
 import { ChartModel, ChartRef } from '@ag-grid-community/core';
+import { ChartDefinition } from '../types';
 /**
  * Provides run-time access to Charting Module and related State
  */
@@ -10,11 +11,24 @@ export interface ChartingApi {
     /**
      * Retrieves current user-generated Charts
      */
-    getCurrentCharts(): ChartModel[];
+    getCurrentChartModels(): ChartModel[];
     /**
      * Retrieves persisted Charts from Adaptable State
      */
     getPersistedCharts(): ChartModel[];
+    /**
+     * Retrieves all adaptable chart definitions
+     */
+    getAllChartDefinitions(): ChartDefinition[];
+    /**
+     * Retrieves chart definition by uuid
+     * @param uuid chart uuid
+     */
+    getChartDefinitionByUuid(uuid: string): ChartDefinition | undefined;
+    /**
+     * Retrieves chartRef by chartId
+     */
+    getChartRef(chartId: string): ChartRef | undefined;
     /**
      * Saves all current Charts into Adaptable State
      */
@@ -23,4 +37,27 @@ export interface ChartingApi {
      * Displays all persisted Charts
      */
     showPersistedCharts(): ChartRef[];
+    /**
+     * Opens a Chart Definition
+     *
+     * @param chartDefinition chart definition
+     */
+    showChartDefinition(chartDefinition: ChartDefinition, container?: HTMLElement): ChartRef;
+    /**
+     * Open a Chart definition.
+     * If the chart is already opened a second chart is not opened.
+     *
+     * @param chartDefinition chart definition
+     */
+    showChartDefinitionOnce(chartDefinition: ChartDefinition, container?: HTMLElement): ChartRef;
+    /**
+     * Edit existing chart
+     * @param chartDefinition
+     */
+    editChartDefinition(chartDefinition: ChartDefinition): void;
+    /**
+     * Add new chart
+     * @param chartDefinition
+     */
+    addChartDefinition(chartDefinition: ChartDefinition): void;
 }

package/src/Api/ColumnApi.d.ts

@@ -303,8 +303,7 @@ export interface ColumnApi {
      */
     isColumnReferencedInExpression(columnId: string, expression: string): boolean;
     /**
-     * Checks if a column is a ActionRowButton column (see UserInterfaceOptions.ActionOptions)
-     *
+     * Checks if a column is a ActionRowButton column
      * @param columnId Column to Check
      */
     isActionRowButtonColumn(columnId: string): boolean;

package/src/Api/Implementation/AlertApiImpl.js

@@ -53,6 +53,10 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
     executeAlertButton(button, context) {
         if (button.Action) {
             let actions = button.Action;
+            if (typeof actions === 'function') {
+                actions(context);
+                return;
+            }
             if (!Array.isArray(actions)) {
                 actions = [actions];
             }

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

@@ -2,10 +2,18 @@ import { ChartModel } from '@ag-grid-community/core';
 import { ChartingApi } from '../ChartingApi';
 import { ApiBase } from './ApiBase';
 import { ChartRef } from '@ag-grid-community/core';
+import { ChartDefinition } from '../../types';
 export declare class ChartingApiImpl extends ApiBase implements ChartingApi {
     isChartingEnabled(): boolean;
-    getCurrentCharts(): ChartModel[];
+    getCurrentChartModels(): ChartModel[];
+    getChartRef(chartId: string): ChartRef;
     saveCurrentCharts(): void;
     getPersistedCharts(): ChartModel[];
+    getAllChartDefinitions(): ChartDefinition[];
+    getChartDefinitionByUuid(uuid: string): ChartDefinition;
     showPersistedCharts(): ChartRef[];
+    showChartDefinition(chartDefiniton: ChartDefinition, container?: HTMLElement): ChartRef;
+    showChartDefinitionOnce(chartDefinition: ChartDefinition, container?: HTMLElement): ChartRef;
+    editChartDefinition(editedChartDefinition: ChartDefinition): void;
+    addChartDefinition(chart: ChartDefinition): void;
 }

package/src/Api/Implementation/ChartingApiImpl.js

@@ -5,23 +5,52 @@ const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const ChartingRedux = tslib_1.__importStar(require("./../../Redux/ActionsReducers/ChartingRedux"));
 const ChartingRedux_1 = require("./../../Redux/ActionsReducers/ChartingRedux");
+const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 class ChartingApiImpl extends ApiBase_1.ApiBase {
     isChartingEnabled() {
         return this.adaptable.canGenerateCharts();
     }
-    getCurrentCharts() {
+    getCurrentChartModels() {
         return this.adaptable.getChartModels();
     }
+    getChartRef(chartId) {
+        return this.adaptable.getChartRef(chartId);
+    }
     saveCurrentCharts() {
-        const currentCharts = this.getCurrentCharts();
-        this.dispatchAction(ChartingRedux.ChartingSetChartModels(currentCharts));
+        const currentCharts = this.getCurrentChartModels();
+        const chartDefinitions = currentCharts.map((chart) => ObjectFactory_1.default.CreateEmptyChartDefinition({
+            Name: chart.chartId,
+            Model: chart,
+        }));
+        this.dispatchAction(ChartingRedux.ChartingSetChartModels(chartDefinitions));
     }
     getPersistedCharts() {
-        return (0, ChartingRedux_1.ChartingGetChartModels)(this.getAdaptableState()).map((chart) => chart.model);
+        return this.getAllChartDefinitions().map((chart) => chart.Model);
+    }
+    getAllChartDefinitions() {
+        return (0, ChartingRedux_1.ChartingGetChartModels)(this.getAdaptableState());
+    }
+    getChartDefinitionByUuid(uuid) {
+        return this.getAllChartDefinitions().find((c) => c.Uuid == uuid);
     }
     showPersistedCharts() {
-        const persistedCharts = this.getPersistedCharts();
-        return this.adaptable.showCharts(persistedCharts);
+        return this.adaptable.showCharts(this.getAllChartDefinitions());
+    }
+    showChartDefinition(chartDefiniton, container) {
+        return this.adaptable.showChart(chartDefiniton, container);
+    }
+    showChartDefinitionOnce(chartDefinition, container) {
+        const chartRef = this.adaptable.api.chartingApi.getChartRef(chartDefinition.Model.chartId);
+        if (chartRef) {
+            return;
+        }
+        return this.showChartDefinition(chartDefinition, container);
+    }
+    editChartDefinition(editedChartDefinition) {
+        this.dispatchAction(ChartingRedux.ChartingEditChart(editedChartDefinition));
+    }
+    addChartDefinition(chart) {
+        this.dispatchAction(ChartingRedux.ChartingAddChart(chart));
     }
 }
 exports.ChartingApiImpl = ChartingApiImpl;

package/src/Api/Implementation/GridApiImpl.js

@@ -204,8 +204,9 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         return this.adaptable.getDisplayValueFromRawValue(rowNode, columnId, rawValue);
     }
     getNormalisedValueFromRowNode(rowNode, columnId) {
-        const gridCell = this.getGridCellFromRowNode(rowNode, columnId);
-        return gridCell ? gridCell.normalisedValue : undefined;
+        const rawValue = this.adaptable.getRawValueFromRowNode(rowNode, columnId);
+        const abColumn = this.adaptable.api.columnApi.getColumnFromId(columnId);
+        return this.adaptable.getNormalisedValueFromRawValue(rawValue, abColumn);
     }
     getRowNodesForPrimaryKeys(primaryKeyValues) {
         return this.adaptable.getRowNodesForPrimaryKeys(primaryKeyValues);

package/src/PredefinedConfig/AlertState.d.ts

@@ -10,7 +10,7 @@ import { AdaptableStyle } from './Common/AdaptableStyle';
 import { XOR } from '../Utilities/Extensions/TypeExtensions';
 import { AdaptableAggregatedBooleanQuery, AdaptableBooleanQuery, AdaptableObservableQuery } from './Common/AdaptableQuery';
 import { ButtonStyle } from './Common/ButtonStyle';
-import { AlertFormContext, BaseContext } from '../types';
+import { AlertFormContext, BaseContext, NotificationsOptions } from '../types';
 /**
  * Predefined Configuration for Alert Module
  */
@@ -49,7 +49,7 @@ export interface AlertDefinition extends SuspendableObject {
      */
     AlertForm?: string | AlertButtonForm;
 }
-export declare type AlertButtonForm = Omit<AdaptableForm<AlertFormContext>, 'title' | 'buttons' | 'fields' | 'description'> & {
+export declare type AlertButtonForm = Omit<AdaptableForm<AlertFormContext>, 'title' | 'buttons' | 'description'> & {
     Buttons?: AlertButton<AlertFormContext>[];
 };
 export interface AlertDefinitionPredicate extends AdaptablePredicate {
@@ -73,7 +73,7 @@ export interface AlertButton<AlertFormContext> extends Omit<AdaptableButton<Base
     /**
      * Predefined Action(s) to trigger when button is clicked; but the implementation in `actionHandlers` property of Alert Options
      */
-    Action?: AdaptableAlertAction | AdaptableAlertAction[] | string | string[];
+    Action?: AdaptableAlertAction | AdaptableAlertAction[] | string | string[] | ((context: AlertFormContext) => void);
     /**
      * Label to show in the Button
      */
@@ -96,6 +96,10 @@ export interface AlertProperties {
      * Displays a notification when Alert is triggered
      */
     DisplayNotification?: boolean;
+    /**
+     * Notifiction duration, it defaults to NotificationOptions.duration
+     */
+    NotificationDuration?: NotificationsOptions['duration'];
     /**
      * Colours updated cell using `MessageType` property of triggering Alert Definition
      */

package/src/PredefinedConfig/ChartingState.d.ts

@@ -1,20 +1,29 @@
 import { ChartModel } from '@ag-grid-community/core';
+import { AdaptableObject } from '../types';
 import { ConfigState } from './ConfigState';
 /**
  * Wraps an AG Grid Chart Model
  */
-export interface ChartDefinition {
+export interface ChartDefinition extends AdaptableObject {
+    /**
+     * Name of the Chart
+     */
+    Name: string;
     /**
      * AG Grid Chart Model
      */
-    model: ChartModel;
+    Model: ChartModel;
 }
 /**
- * Used for persisting AG Grids in Adaptable State
+ * Persists AG Grid Charts in Adaptable State
  */
 export interface ChartingState extends ConfigState {
     /**
-     * Charting Definitions - wrap AG Grid Chart Models
+     * Wrappers around AG Grid Chart Models
      */
     ChartDefinitions?: ChartDefinition[];
 }
+/**
+ * Aggregation function used in the Chart
+ */
+export declare type ChartingAggFunc = 'sum' | 'min' | 'max' | 'count' | 'avg' | 'first' | 'last';

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

@@ -51,4 +51,4 @@ export interface AdaptableBaseIcon {
 /**
  * All AdapTable internal icon names
  */
-export declare type AdaptableInternalIconName = 'add' | 'add-row' | 'alert' | 'align-justify' | 'analysis' | 'application' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrowexpand' | 'attach-file' | 'blanks' | 'boolean-list' | 'broadcast' | 'brush' | 'build' | 'bulk-update' | 'calculated-column' | 'calendar' | 'call' | 'campaign' | 'cell-summary' | 'cell-validation' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clear' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'column-chooser' | 'column-filter' | 'comment' | 'conditional-style' | 'contains' | 'custom-sort' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'drag' | 'edit' | 'ends-with' | 'equal' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'flashing-cell' | 'folder' | 'folder-open' | 'folder-shared' | 'format-column' | 'freetext-column' | 'function' | 'gradient-column' | 'greater-than' | 'greater-than-or-equal' | 'hide-column' | 'history' | 'home' | 'import-export' | 'info' | 'instrument' | 'invalid' | 'ipushpull' | 'justify' | 'layout' | 'less-than' | 'less-than-or-equal' | 'list' | 'login' | 'logout' | 'menu' | 'minus' | 'multiplication' | 'newpage' | 'news' | 'non-blanks' | 'not-contains' | 'not-equal' | 'ok' | 'pause' | 'percent' | 'percent-bar' | 'person' | 'pie-chart' | 'play' | 'plus' | 'plus-minus' | 'query' | 'quick-search' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'settings' | 'shortcut' | 'show-column' | 'smart-edit' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'starts-with' | 'state-management' | 'statusbar' | 'stop' | 'system-status' | 'tab-unselected' | 'team-share' | 'theme' | 'tool-panel' | 'track-changes' | 'trash' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'updated-row' | 'upload' | 'warning';
+export declare type AdaptableInternalIconName = 'add' | 'add-row' | 'alert' | 'align-justify' | 'analysis' | 'application' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrowexpand' | 'attach-file' | 'blanks' | 'boolean-list' | 'broadcast' | 'brush' | 'build' | 'bulk-update' | 'calculated-column' | 'calendar' | 'call' | 'campaign' | 'cell-summary' | 'cell-validation' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clear' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'column-chooser' | 'column-filter' | 'comment' | 'contains' | 'custom-sort' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'drag' | 'edit' | 'ends-with' | 'equal' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'flashing-cell' | 'folder' | 'folder-open' | 'folder-shared' | 'format-column' | 'freetext-column' | 'function' | 'gradient-column' | 'greater-than' | 'greater-than-or-equal' | 'hide-column' | 'history' | 'home' | 'import-export' | 'info' | 'instrument' | 'invalid' | 'ipushpull' | 'justify' | 'layout' | 'less-than' | 'less-than-or-equal' | 'list' | 'login' | 'logout' | 'menu' | 'minus' | 'multiplication' | 'newpage' | 'news' | 'non-blanks' | 'not-contains' | 'not-equal' | 'ok' | 'pause' | 'percent' | 'percent-bar' | 'person' | 'pie-chart' | 'play' | 'plus' | 'plus-minus' | 'query' | 'quick-search' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'settings' | 'shortcut' | 'show-column' | 'smart-edit' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'starts-with' | 'state-management' | 'statusbar' | 'stop' | 'system-status' | 'tab-unselected' | 'team-share' | 'theme' | 'tool-panel' | 'track-changes' | 'trash' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'updated-row' | 'upload' | 'warning';

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

@@ -3,13 +3,17 @@
  */
 export interface AdaptableStyle {
     /**
-     * Colour background of cell: provide hex value or name
+     * Colour background of cell: hex, rgb(a) or name
      */
     BackColor?: string;
     /**
-     * Font colour in cell: provide hex value or name
+     * Font colour in cell: hex, rgb(a) or name
      */
     ForeColor?: string;
+    /**
+     * Colour of cell border: hex, rgb(a) or name
+     */
+    BorderColor?: string;
     /**
      * Weight of font: `Normal` or `Bold`
      */
@@ -22,10 +26,6 @@ export interface AdaptableStyle {
      * Size of font: `XSmall`, `Small`, `Medium`, `Large` or `XLarge`
      */
     FontSize?: 'XSmall' | 'Small' | 'Medium' | 'Large' | 'XLarge';
-    /**
-     * Colour of cell border: provide hex value or name
-     */
-    BorderColor?: string;
     /**
      * Existing CSS Class; use instead of setting other object properties
      */

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

@@ -6,12 +6,12 @@ export declare type AdaptableDashboardToolbars = AdaptableDashboardToolbar[];
 /**
  * List of all the Toolbars that Adaptable provides
  */
-export declare type AdaptableDashboardToolbar = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'Glue42' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme';
+export declare type AdaptableDashboardToolbar = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'Glue42' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme' | 'Charting';
 export declare const ALL_TOOLBARS: AdaptableDashboardToolbar[];
-export declare type AdaptableStatusBarPanel = 'CellSummary' | 'Alert' | 'GridInfo' | 'Dashboard' | 'ToolPanel' | 'StatusBar' | 'StateManagement' | 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'SystemStatus' | 'DataChangeHistory' | 'TeamSharing' | 'Theme' | 'BulkUpdate' | 'SettingsPanel' | 'SmartEdit';
+export declare type AdaptableStatusBarPanel = 'CellSummary' | 'Alert' | 'GridInfo' | 'Dashboard' | 'ToolPanel' | 'StatusBar' | 'StateManagement' | 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'SystemStatus' | 'DataChangeHistory' | 'TeamSharing' | 'Theme' | 'BulkUpdate' | 'SettingsPanel' | 'SmartEdit' | 'Charting';
 export declare const ALL_STATUS_SUB_PANELS: AdaptableStatusBarPanel[];
 export declare type AdaptableToolPanels = AdaptableToolPanel[];
-export declare type AdaptableToolPanel = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'Dashboard' | 'DataChangeHistory' | 'Export' | 'Filter' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme';
+export declare type AdaptableToolPanel = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'Dashboard' | 'DataChangeHistory' | 'Export' | 'Filter' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme' | 'Charting';
 export declare const ALL_TOOL_PANELS: AdaptableToolPanels;
 /**
  * Adaptable Module Button collection
@@ -30,7 +30,7 @@ export declare type AdaptableStateKey = keyof AdaptablePersistentState | 'OpenFi
  */
 export declare type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
 export declare const ALL_MODULES: AdaptableModule[];
-export declare type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
+export declare type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Charting';
 export declare type TypeHint<Base, Literals> = (Base & {
     __subType?: true;
 }) | Literals;

package/src/PredefinedConfig/Common/Types.js

@@ -10,6 +10,7 @@ exports.ALL_TOOLBARS = [
     'Alert',
     'BulkUpdate',
     'CellSummary',
+    'Charting',
     'DataChangeHistory',
     'DataSet',
     'Export',
@@ -32,6 +33,7 @@ exports.ALL_STATUS_SUB_PANELS = [
     'CellSummary',
     'ConditionalStyle',
     'CustomSort',
+    'Charting',
     'Dashboard',
     'DataChangeHistory',
     'DataSet',
@@ -73,6 +75,7 @@ exports.ALL_TOOL_PANELS = [
     'StateManagement',
     'SystemStatus',
     'Theme',
+    'Charting',
 ];
 exports.ALL_MODULES = [
     ModuleConstants.AlertModuleId,

package/src/PredefinedConfig/PredefinedConfig.d.ts

@@ -36,7 +36,6 @@ 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;
@@ -57,7 +56,7 @@ export interface PredefinedConfig {
      */
     FlashingCell?: FlashingCellState;
     /**
-     * Supplies a collection of *FormatColumn* objects that will style an entire column in a single way (and not subject to a rule like with Conditional Style).
+     * Supplies a collection of *FormatColumn* objects that will style an entire column either fully or using a Condition
      */
     FormatColumn?: FormatColumnState;
     /**

package/src/PredefinedConfig/SystemState.d.ts

@@ -13,6 +13,7 @@ import { CachedQuery } from './QueryState';
 import { AdaptableFlashingCell } from './Common/AdaptableFlashingCell';
 import { TypeUuid } from './Uuid';
 import { SummaryOperation } from './Common/Enums';
+import { ChartModel } from '@ag-grid-community/core';
 export type { IPushPullReport, IPushPullDomain };
 export type { Glue42Report };
 export type { OpenFinReport };
@@ -71,6 +72,14 @@ export interface SystemState extends InternalState, IPushPullState, Glue42State,
     DashboardRevision: number;
     IsQuickFilterVisible: boolean;
     CurrentDataSet: string;
+    /**
+     * Chart modes are saved here for every chart event.
+     * This way any part of the application can listen to chart-model changes without
+     * directly listening to ag-grid events.
+     */
+    Charting: {
+        currentChartModels: ChartModel[];
+    };
 }
 export interface ProgressIndicator {
     active: boolean;

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

@@ -1,7 +1,6 @@
-import { ChartModel } from '@ag-grid-community/core';
 import * as Redux from 'redux';
 import { AdaptableState } from '../../../types';
-import { ChartingState } from '../../PredefinedConfig/ChartingState';
+import { ChartDefinition, ChartingState } from '../../PredefinedConfig/ChartingState';
 /**
  * @ReduxAction Set AG Grid Charting Models
  */
@@ -10,14 +9,38 @@ export declare const SET_CHARTING_CHARTS = "SET_CHARTING_CHARTS";
  * @ReduxAction Charting Module is ready
  */
 export declare const CHARTING_READY = "CHARTING_READY";
+/**
+ * @ReduxAction Edit chart definition
+ */
+export declare const CHARTING_EDIT_CHART = "CHARTING_EDIT_CHART";
+/**
+ * @ReduxAction Add chart definition
+ */
+export declare const CHARTING_ADD_CHART = "CHARTING_ADD_CHART";
+/**
+ * @ReduxAction Deelte chart definition
+ */
+export declare const CHARTING_DELETE_CHART = "CHARTING_DELETE_CHART";
 export interface ChartingSetChartModelsAction extends Redux.Action {
-    charts: ChartModel[];
+    charts: ChartDefinition[];
 }
 export interface ChartingReadyAction extends Redux.Action {
     chartingState: ChartingState;
 }
-export declare const ChartingSetChartModels: (charts: ChartModel[]) => ChartingSetChartModelsAction;
+export interface ChartingEditChartAction extends Redux.Action {
+    chartDefinition: ChartDefinition;
+}
+export interface ChartingAddChartAction extends Redux.Action {
+    chartDefinition: ChartDefinition;
+}
+export interface ChartingDeleteChartAction extends Redux.Action {
+    chartName: ChartDefinition['Name'];
+}
+export declare const ChartingSetChartModels: (charts: ChartDefinition[]) => ChartingSetChartModelsAction;
 export declare const ChartingReady: (chartingState: ChartingState) => ChartingReadyAction;
+export declare const ChartingEditChart: (chartDefinition: ChartDefinition) => ChartingEditChartAction;
+export declare const ChartingAddChart: (chartDefinition: ChartDefinition) => ChartingAddChartAction;
+export declare const ChartingDeleteChart: (chartName: ChartDefinition['Name']) => ChartingDeleteChartAction;
 export declare const initialState: ChartingState;
-export declare const ChartingGetChartModels: (state: AdaptableState) => ChartingState['ChartDefinitions'];
+export declare const ChartingGetChartModels: (state: AdaptableState) => ChartDefinition[];
 export declare const ChartingReducer: Redux.Reducer<ChartingState>;

package/src/Redux/ActionsReducers/ChartingRedux.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChartingReducer = exports.ChartingGetChartModels = exports.initialState = exports.ChartingReady = exports.ChartingSetChartModels = exports.CHARTING_READY = exports.SET_CHARTING_CHARTS = void 0;
+exports.ChartingReducer = exports.ChartingGetChartModels = exports.initialState = exports.ChartingDeleteChart = exports.ChartingAddChart = exports.ChartingEditChart = exports.ChartingReady = exports.ChartingSetChartModels = exports.CHARTING_DELETE_CHART = exports.CHARTING_ADD_CHART = exports.CHARTING_EDIT_CHART = exports.CHARTING_READY = exports.SET_CHARTING_CHARTS = void 0;
+const Uuid_1 = require("../../PredefinedConfig/Uuid");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 /**
  * @ReduxAction Set AG Grid Charting Models
@@ -10,6 +11,18 @@ exports.SET_CHARTING_CHARTS = 'SET_CHARTING_CHARTS';
  * @ReduxAction Charting Module is ready
  */
 exports.CHARTING_READY = 'CHARTING_READY';
+/**
+ * @ReduxAction Edit chart definition
+ */
+exports.CHARTING_EDIT_CHART = 'CHARTING_EDIT_CHART';
+/**
+ * @ReduxAction Add chart definition
+ */
+exports.CHARTING_ADD_CHART = 'CHARTING_ADD_CHART';
+/**
+ * @ReduxAction Deelte chart definition
+ */
+exports.CHARTING_DELETE_CHART = 'CHARTING_DELETE_CHART';
 const ChartingSetChartModels = (charts) => ({
     charts,
     type: exports.SET_CHARTING_CHARTS,
@@ -20,6 +33,21 @@ const ChartingReady = (chartingState) => ({
     chartingState,
 });
 exports.ChartingReady = ChartingReady;
+const ChartingEditChart = (chartDefinition) => ({
+    type: exports.CHARTING_EDIT_CHART,
+    chartDefinition,
+});
+exports.ChartingEditChart = ChartingEditChart;
+const ChartingAddChart = (chartDefinition) => ({
+    type: exports.CHARTING_ADD_CHART,
+    chartDefinition,
+});
+exports.ChartingAddChart = ChartingAddChart;
+const ChartingDeleteChart = (chartName) => ({
+    type: exports.CHARTING_DELETE_CHART,
+    chartName,
+});
+exports.ChartingDeleteChart = ChartingDeleteChart;
 exports.initialState = {
     ChartDefinitions: GeneralConstants_1.EMPTY_ARRAY,
 };
@@ -28,10 +56,22 @@ exports.ChartingGetChartModels = ChartingGetChartModels;
 const ChartingReducer = (state = exports.initialState, action) => {
     switch (action.type) {
         case exports.SET_CHARTING_CHARTS:
-            const newCharts = action.charts.map((chartModel) => ({
-                model: chartModel,
-            }));
-            return Object.assign(Object.assign({}, state), { ChartDefinitions: newCharts });
+            return Object.assign(Object.assign({}, state), { ChartDefinitions: action.charts });
+        case exports.CHARTING_EDIT_CHART:
+            return Object.assign(Object.assign({}, state), { ChartDefinitions: state.ChartDefinitions.map((chartDefinition) => {
+                    if (chartDefinition.Uuid === action.chartDefinition.Uuid) {
+                        return action.chartDefinition;
+                    }
+                    return chartDefinition;
+                }) });
+        case exports.CHARTING_ADD_CHART:
+            let chartDefinition = action.chartDefinition;
+            if (!('Uuid' in chartDefinition)) {
+                chartDefinition = Object.assign(Object.assign({}, chartDefinition), { Uuid: (0, Uuid_1.createUuid)() });
+            }
+            return Object.assign(Object.assign({}, state), { ChartDefinitions: [...state.ChartDefinitions, chartDefinition] });
+        case exports.CHARTING_DELETE_CHART:
+            return Object.assign(Object.assign({}, state), { ChartDefinitions: state.ChartDefinitions.filter((chartDefinition) => chartDefinition.Name !== action.chartName) });
     }
     return state;
 };

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

@@ -15,6 +15,7 @@ import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChang
 import { RowsHighlightInfo } from '../../PredefinedConfig/Common/RowsHighlightInfo';
 import { SmartEditOperation } from '../../AdaptableOptions/EditOptions';
 import { DataSet } from '../../types';
+import { ChartModel } from '@ag-grid-community/core';
 export declare const FLASHING_CELL_ROW_KEY = "__ROW";
 export declare const SYSTEM_ALERT_ADD = "SYSTEM_ALERT_ADD";
 export declare const SYSTEM_ALERT_DELETE = "SYSTEM_ALERT_DELETE";
@@ -66,6 +67,7 @@ export declare const SYSTEM_FILTER_FORM_HIDE = "SYSTEM_FILTER_FORM_HIDE";
 export declare const SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS = "SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS";
 export declare const DASHBOARD_REFRESH = "DASHBOARD_REFRESH";
 export declare const SYSTEM_DATA_SET_SELECT = "SYSTEM_DATA_SET_SELECT";
+export declare const SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS = "SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS";
 export interface SystemHighlightCellAddAction extends Redux.Action {
     cellHighlightInfo: CellHighlightInfo;
 }
@@ -225,6 +227,9 @@ export interface SystemLayoutShowNotAssociatedObjectsAction extends Redux.Action
 export interface SystemDataSetSelectAction extends Redux.Action {
     dataSet: DataSet;
 }
+export interface SystemChartingSetCurrentChartModelsAction extends Redux.Action {
+    chartModels: ChartModel[];
+}
 export declare const SystemHighlightCellAdd: (cellHighlightInfo: CellHighlightInfo) => SystemHighlightCellAddAction;
 export declare const SystemHighlightCellDelete: (primaryKeyValue: CellHighlightInfo['primaryKeyValue'], columnId: CellHighlightInfo['columnId']) => SystemHighlightCellDeleteAction;
 export declare const SystemHighlightCellDeleteAll: () => SystemHighlightCellDeleteAllAction;
@@ -274,4 +279,6 @@ export declare const SystemFilterFormHide: () => SystemFilterFormHideAction;
 export declare const SystemLayoutShowNotAssociatedObjects: (showNotAssociatedObjects: boolean) => SystemLayoutShowNotAssociatedObjectsAction;
 export declare const SystemDashboardRefresh: () => SystemDashboardRefreshAction;
 export declare const SystemDataSetSelect: (dataSet: DataSet) => SystemDataSetSelectAction;
+export declare const SystemChartingSetCurrentChartModels: (chartModels: ChartModel[]) => SystemChartingSetCurrentChartModelsAction;
+export declare const SystemChartingCurrentChartModelsSelector: (state: SystemState) => ChartModel[];
 export declare const SystemReducer: Redux.Reducer<SystemState>;

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DASHBOARD_REFRESH = exports.SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS = exports.SYSTEM_FILTER_FORM_HIDE = exports.SYSTEM_QUICK_FILTER_BAR_HIDE = exports.SYSTEM_QUICK_FILTER_BAR_SHOW = exports.SYSTEM_SETTINGS_PANEL_SET = exports.SYSTEM_DATA_CHANGE_HISTORY_RESUME = exports.SYSTEM_DATA_CHANGE_HISTORY_SUSPEND = exports.SYSTEM_DATA_CHANGE_HISTORY_DISABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_ENABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_UNDO = exports.SYSTEM_DATA_CHANGE_HISTORY_ADD = exports.SYSTEM_LICENSE_DISABLE_PERSISTENCE = exports.SYSTEM_LICENSE_SHOW_WATERMARK = exports.SYSTEM_PROGRESS_INDICATOR_HIDE = exports.SYSTEM_PROGRESS_INDICATOR_SHOW = exports.SYSTEM_CELL_SUMMARY_CHANGE_OPERATION = exports.SYSTEM_CACHED_QUERY_ADD = exports.SYSTEM_SET_LAST_APPLIED_SHORTCUT = exports.SYSTEM_SET_NEW_COLUMN_LIST_ORDER = exports.SYSTEM_HIGHLIGHT_ROW_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_ROWS_DELETE = exports.SYSTEM_HIGHLIGHT_ROW_DELETE = exports.SYSTEM_HIGHLIGHT_ROWS_ADD = exports.SYSTEM_HIGHLIGHT_ROW_ADD = exports.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_CELL_DELETE = exports.SYSTEM_HIGHLIGHT_CELL_ADD = exports.SYSTEM_BULK_UPDATE_CHANGE_VALUE = exports.SYSTEM_BULK_UPDATE_SET_PREVIEW = exports.SYSTEM_BULK_UPDATE_SET_VALID_SELECTION = exports.SYSTEM_BULK_UPDATE_CHECK_CELL_SELECTION = exports.SYSTEM_SMART_EDIT_CHANGE_OPERATION = exports.SYSTEM_SMART_EDIT_CHANGE_VALUE = exports.SYSTEM_SMARTEDIT_SET_PREVIEW = exports.SYSTEM_SMARTEDIT_SET_VALID_SELECTION = exports.SYSTEM_SMARTEDIT_FETCH_PREVIEW = exports.SYSTEM_SMARTEDIT_CHECK_CELL_SELECTION = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = exports.SYSTEM_FLASHING_CELL_DELETE_ALL = exports.SYSTEM_FLASHING_CELL_DELETE = exports.SYSTEM_FLASHING_CELL_ADD = exports.SYSTEM_ALERT_REMOVE_ROW_HIGHLIGHT = exports.SYSTEM_ALERT_REMOVE_CELL_HIGHLIGHT = exports.SYSTEM_ALERT_DELETE_ALL = exports.SYSTEM_ALERT_DELETE = exports.SYSTEM_ALERT_ADD = exports.FLASHING_CELL_ROW_KEY = void 0;
-exports.SystemDataSetSelect = exports.SystemDashboardRefresh = exports.SystemLayoutShowNotAssociatedObjects = exports.SystemFilterFormHide = exports.SystemQuickFilterBarHide = exports.SystemQuickFilterBarShow = exports.SystemSettingsPanelSet = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = exports.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryUndo = exports.SystemDataChangeHistoryAdd = exports.SystemLicenseDisablePersistence = exports.SystemLicenseShowWatermark = exports.SystemProgressIndicatorHide = exports.SystemProgressIndicatorShow = exports.SystemCellSummaryChangeOperation = exports.SystemCachedQueryAdd = exports.SetLastAppliedShortcut = exports.SetNewColumnListOrder = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingCellDeleteAll = exports.SystemFlashingCellDelete = exports.SystemFlashingCellAdd = exports.SystemAlertRemoveRowHighlight = exports.SystemAlertRemoveCellHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightRowDeleteAll = exports.SystemHighlightRowsDelete = exports.SystemHighlightRowDelete = exports.SystemHighlightRowsAdd = exports.SystemHighlightRowAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.SYSTEM_DATA_SET_SELECT = void 0;
-exports.SystemReducer = void 0;
+exports.SystemDashboardRefresh = exports.SystemLayoutShowNotAssociatedObjects = exports.SystemFilterFormHide = exports.SystemQuickFilterBarHide = exports.SystemQuickFilterBarShow = exports.SystemSettingsPanelSet = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = exports.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryUndo = exports.SystemDataChangeHistoryAdd = exports.SystemLicenseDisablePersistence = exports.SystemLicenseShowWatermark = exports.SystemProgressIndicatorHide = exports.SystemProgressIndicatorShow = exports.SystemCellSummaryChangeOperation = exports.SystemCachedQueryAdd = exports.SetLastAppliedShortcut = exports.SetNewColumnListOrder = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingCellDeleteAll = exports.SystemFlashingCellDelete = exports.SystemFlashingCellAdd = exports.SystemAlertRemoveRowHighlight = exports.SystemAlertRemoveCellHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightRowDeleteAll = exports.SystemHighlightRowsDelete = exports.SystemHighlightRowDelete = exports.SystemHighlightRowsAdd = exports.SystemHighlightRowAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS = exports.SYSTEM_DATA_SET_SELECT = void 0;
+exports.SystemReducer = exports.SystemChartingCurrentChartModelsSelector = exports.SystemChartingSetCurrentChartModels = exports.SystemDataSetSelect = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const Helper_1 = require("../../Utilities/Helpers/Helper");
@@ -79,6 +79,8 @@ exports.SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS = 'SYSTEM_LAYOUT_SHOW_NOT_ASSO
 exports.DASHBOARD_REFRESH = 'DASHBOARD_REFRESH';
 // DataSet
 exports.SYSTEM_DATA_SET_SELECT = 'SYSTEM_DATA_SET_SELECT';
+// Charting
+exports.SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS = 'SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS';
 const SystemHighlightCellAdd = (cellHighlightInfo) => ({
     type: exports.SYSTEM_HIGHLIGHT_CELL_ADD,
     cellHighlightInfo: cellHighlightInfo,
@@ -312,6 +314,15 @@ const SystemDataSetSelect = (dataSet) => ({
     dataSet: dataSet,
 });
 exports.SystemDataSetSelect = SystemDataSetSelect;
+const SystemChartingSetCurrentChartModels = (chartModels) => ({
+    type: exports.SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS,
+    chartModels,
+});
+exports.SystemChartingSetCurrentChartModels = SystemChartingSetCurrentChartModels;
+const SystemChartingCurrentChartModelsSelector = (state) => {
+    return state.Charting.currentChartModels;
+};
+exports.SystemChartingCurrentChartModelsSelector = SystemChartingCurrentChartModelsSelector;
 const initialState = {
     AdaptableAlerts: GeneralConstants_1.EMPTY_ARRAY,
     AdaptableFlashingCells: {},
@@ -347,6 +358,9 @@ const initialState = {
     DashboardRevision: 1,
     IsQuickFilterVisible: true,
     CurrentDataSet: GeneralConstants_1.EMPTY_STRING,
+    Charting: {
+        currentChartModels: [],
+    },
 };
 const SystemReducer = (state = initialState, action) => {
     let alerts;
@@ -401,7 +415,7 @@ const SystemReducer = (state = initialState, action) => {
             const AdaptableFlashingCells = Object.assign({}, state.AdaptableFlashingCells);
             AdaptableFlashingCells[rowPrimaryKey] = Object.assign({}, AdaptableFlashingCells[rowPrimaryKey]);
             const secondaryIds = Object.keys(FlashingCell.flashColumnIds);
-            if (FlashingCell.flashTarget === 'row') {
+            if (FlashingCell.flashTarget === 'row' || FlashingCell.flashTarget.includes('row')) {
                 secondaryIds.push(exports.FLASHING_CELL_ROW_KEY);
             }
             secondaryIds.forEach((COL_ID) => {
@@ -421,7 +435,7 @@ const SystemReducer = (state = initialState, action) => {
             const AdaptableFlashingCellsMap = Object.assign({}, state.AdaptableFlashingCellsMap);
             AdaptableFlashingCells[rowPrimaryKey] = Object.assign({}, AdaptableFlashingCells[rowPrimaryKey]);
             const secondaryIds = Object.keys(FlashingCell.flashColumnIds);
-            if (FlashingCell.flashTarget === 'row') {
+            if (FlashingCell.flashTarget === 'row' || FlashingCell.flashTarget.includes('row')) {
                 secondaryIds.push(exports.FLASHING_CELL_ROW_KEY);
             }
             secondaryIds.forEach((COL_ID) => {
@@ -646,6 +660,10 @@ const SystemReducer = (state = initialState, action) => {
         case exports.DASHBOARD_REFRESH: {
             return Object.assign(Object.assign({}, state), { DashboardRevision: state.DashboardRevision + 1 });
         }
+        case exports.SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS: {
+            const typedAction = action;
+            return Object.assign(Object.assign({}, state), { Charting: Object.assign(Object.assign({}, state.Charting), { currentChartModels: typedAction.chartModels }) });
+        }
         default:
             return state;
     }