@adaptabletools/adaptable 10.0.4-canary.5 → 11.0.0-canary.0

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -23,7 +23,6 @@ const PlusMinusApiImpl_1 = require("./PlusMinusApiImpl");
 const QuickSearchApiImpl_1 = require("./QuickSearchApiImpl");
 const ShortcutApiImpl_1 = require("./ShortcutApiImpl");
 const SmartEditApiImpl_1 = require("./SmartEditApiImpl");
-const SparklineColumnApiImpl_1 = require("./SparklineColumnApiImpl");
 const FilterApiImpl_1 = require("./FilterApiImpl");
 const SystemStatusApiImpl_1 = require("./SystemStatusApiImpl");
 const ThemeApiImpl_1 = require("./ThemeApiImpl");
@@ -38,6 +37,7 @@ const ScopeApiImpl_1 = require("./ScopeApiImpl");
 const DataChangeHistoryApiImpl_1 = require("./DataChangeHistoryApiImpl");
 const QueryLanguageApiImpl_1 = require("./QueryLanguageApiImpl");
 const FlashingCellApiImpl_1 = require("./FlashingCellApiImpl");
+const ChartingApiImpl_1 = require("./ChartingApiImpl");
 class AdaptableApiImpl {
     constructor(adaptable) {
         this.adaptable = adaptable;
@@ -67,7 +67,6 @@ class AdaptableApiImpl {
         this.scheduleApi = new ScheduleApiImpl_1.ScheduleApiImpl(adaptable);
         this.shortcutApi = new ShortcutApiImpl_1.ShortcutApiImpl(adaptable);
         this.smartEditApi = new SmartEditApiImpl_1.SmartEditApiImpl(adaptable);
-        this.sparklineColumnApi = new SparklineColumnApiImpl_1.SparklineColumnApiImpl(adaptable);
         this.filterApi = new FilterApiImpl_1.FilterApiImpl(adaptable);
         this.systemStatusApi = new SystemStatusApiImpl_1.SystemStatusApiImpl(adaptable);
         this.themeApi = new ThemeApiImpl_1.ThemeApiImpl(adaptable);
@@ -78,6 +77,7 @@ class AdaptableApiImpl {
         this.teamSharingApi = new TeamSharingApiImpl_1.TeamSharingApiImpl(adaptable);
         this.scopeApi = new ScopeApiImpl_1.ScopeApiImpl(adaptable);
         this.dataChangeHistoryApi = new DataChangeHistoryApiImpl_1.DataChangeHistoryApiImpl(adaptable);
+        this.chartingApi = new ChartingApiImpl_1.ChartingApiImpl(adaptable);
         this.internalApi = new InternalApiImpl_1.InternalApiImpl(adaptable);
     }
     destroy(config) {

package/src/Api/Implementation/CalculatedColumnApiImpl.js

@@ -51,7 +51,7 @@ class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
     }
     getCalculatedColumnModuleReferences(calculatedColumn) {
         const references = [];
-        this.adaptable.modules.forEach((module) => {
+        this.adaptable.adaptableModules.forEach((module) => {
             if (module
                 .getModuleCalculatedColumnReferences()
                 .some((moduleReference) => moduleReference.Uuid === calculatedColumn.Uuid)) {

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

@@ -0,0 +1,5 @@
+import { ChartingApi } from '../ChartingApi';
+import { ApiBase } from './ApiBase';
+export declare class ChartingApiImpl extends ApiBase implements ChartingApi {
+    isChartingEnabled(): boolean;
+}

package/src/Api/Implementation/ChartingApiImpl.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChartingApiImpl = void 0;
+const ApiBase_1 = require("./ApiBase");
+class ChartingApiImpl extends ApiBase_1.ApiBase {
+    isChartingEnabled() {
+        return this.adaptable.canGenerateCharts();
+    }
+}
+exports.ChartingApiImpl = ChartingApiImpl;

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

@@ -8,11 +8,13 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getColumns(): AdaptableColumn[];
     getVisibleColumns(): AdaptableColumn[];
     selectColumn(columnId: string): void;
+    selectColumns(columnIds: string[]): void;
+    addColumnToSelection(columnId: string): void;
+    addColumnsToSelection(columnIds: string[]): void;
     selectAllColumns(): void;
     autosizeColumn(columnId: string): void;
     autosizeColumns(columnIds: string[]): void;
     autosizeAllColumns(): void;
-    selectColumns(columnIds: string[]): void;
     hideColumn(columnId: string): void;
     showColumn(columnId: string): void;
     getAgGridColumnType(columnId: string): string | string[];

package/src/Api/Implementation/ColumnApiImpl.js

@@ -23,6 +23,15 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     selectColumn(columnId) {
         this.adaptable.selectColumn(columnId);
     }
+    selectColumns(columnIds) {
+        this.adaptable.selectColumns(columnIds);
+    }
+    addColumnToSelection(columnId) {
+        this.adaptable.selectColumn(columnId, { keepExistingSelection: true });
+    }
+    addColumnsToSelection(columnIds) {
+        this.adaptable.selectColumns(columnIds, { keepExistingSelection: true });
+    }
     selectAllColumns() {
         this.adaptable.selectAll();
     }
@@ -35,9 +44,6 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     autosizeAllColumns() {
         this.adaptable.autoSizeAllColumns();
     }
-    selectColumns(columnIds) {
-        this.adaptable.selectColumns(columnIds);
-    }
     hideColumn(columnId) {
         this.adaptable.hideColumn(columnId);
     }

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

@@ -1,4 +1,3 @@
-import { ChartState } from '../../PredefinedConfig/ChartState';
 import { ThemeState } from '../../PredefinedConfig/ThemeState';
 import { ShortcutState } from '../../PredefinedConfig/ShortcutState';
 import { QuickSearchState } from '../../PredefinedConfig/QuickSearchState';
@@ -16,7 +15,6 @@ import { ConfigState } from '../../PredefinedConfig/ConfigState';
 import { AdaptableState } from '../../PredefinedConfig/AdaptableState';
 import { ApiBase } from './ApiBase';
 import { ApplicationState } from '../../PredefinedConfig/ApplicationState';
-import { SparklineColumnState } from '../../PredefinedConfig/SparklineColumnState';
 import { FreeTextColumnState } from '../../PredefinedConfig/FreeTextColumnState';
 import { FilterState } from '../../PredefinedConfig/FilterState';
 import { ToolPanelState } from '../../PredefinedConfig/ToolPanelState';
@@ -51,7 +49,6 @@ export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     getAlertState(returnJson?: boolean): AlertState;
     getApplicationState(returnJson?: boolean): ApplicationState;
     getCalculatedColumnState(returnJson?: boolean): CalculatedColumnState;
-    getChartState(returnJson?: boolean): ChartState;
     getConditionalStyleState(returnJson?: boolean): ConditionalStyleState;
     getCustomSortState(returnJson?: boolean): CustomSortState;
     getDashboardState(returnJson?: boolean): DashboardState;
@@ -66,7 +63,6 @@ export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     getQuickSearchState(returnJson?: boolean): QuickSearchState;
     getScheduleState(returnJson?: boolean): ScheduleState;
     getShortcutState(returnJson?: boolean): ShortcutState;
-    getSparklineColumnState(returnJson?: boolean): SparklineColumnState;
     getThemeState(returnJson?: boolean): ThemeState;
     getToolPanelState(returnJson?: boolean): ToolPanelState;
     dispatchStateReadyAction(module: AdaptableModule): void;

package/src/Api/Implementation/ConfigApiImpl.js

@@ -77,7 +77,6 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
             'Alert',
             'Application',
             'CalculatedColumn',
-            'Chart',
             'ConditionalStyle',
             'CustomSort',
             'Dashboard',
@@ -92,7 +91,6 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
             'Query',
             'QuickSearch',
             'Shortcut',
-            'SparklineColumn',
             'Theme',
             'ToolPanel',
         ];
@@ -178,10 +176,6 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().CalculatedColumn)
                     : this.getAdaptableState().CalculatedColumn;
-            case 'Chart':
-                return returnJson
-                    ? JSON.stringify(this.getAdaptableState().Chart)
-                    : this.getAdaptableState().Chart;
             case 'ConditionalStyle':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().ConditionalStyle)
@@ -238,10 +232,6 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Shortcut)
                     : this.getAdaptableState().Shortcut;
-            case 'SparklineColumn':
-                return returnJson
-                    ? JSON.stringify(this.getAdaptableState().SparklineColumn)
-                    : this.getAdaptableState().SparklineColumn;
             case 'Theme':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Theme)
@@ -266,9 +256,6 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
     getCalculatedColumnState(returnJson = false) {
         return this.getUserStateByStateKey('CalculatedColumn', returnJson);
     }
-    getChartState(returnJson = false) {
-        return this.getUserStateByStateKey('Chart', returnJson);
-    }
     getConditionalStyleState(returnJson = false) {
         return this.getUserStateByStateKey('ConditionalStyle', returnJson);
     }
@@ -311,9 +298,6 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
     getShortcutState(returnJson = false) {
         return this.getUserStateByStateKey('Shortcut', returnJson);
     }
-    getSparklineColumnState(returnJson = false) {
-        return this.getUserStateByStateKey('SparklineColumn', returnJson);
-    }
     getThemeState(returnJson = false) {
         return this.getUserStateByStateKey('Theme', returnJson);
     }

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

@@ -2,19 +2,23 @@ import { ApiBase } from './ApiBase';
 import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFlashingCell';
 import { FlashingCellApi } from '../FlashingCellApi';
 import { FlashingCellDefinition, FlashingCellState } from '../../PredefinedConfig/FlashingCellState';
+import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
+import { AdaptableScope } from '../../PredefinedConfig/Common/AdaptableScope';
 export declare class FlashingCellApiImpl extends ApiBase implements FlashingCellApi {
     getFlashingCellState(): FlashingCellState;
+    mergeFlashingCellDefinitionWithDefaults(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
     getFlashingCellDefinitions(): FlashingCellDefinition[];
     getFlashingCellDefinitionById(id: FlashingCellDefinition['Uuid']): FlashingCellDefinition;
-    getNonReactiveFlashingCellDefinitions(): FlashingCellDefinition[];
-    getActiveNonReactiveFlashingCellDefinitions(): FlashingCellDefinition[];
+    getActiveFlashingCellDefinitions(): FlashingCellDefinition[];
     getFlashingCellFlashTarget(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition['FlashTarget'];
-    showFlashingCell(alertToShow: AdaptableFlashingCell): void;
+    showFlashingCell(flashingCellToShow: AdaptableFlashingCell): void;
     addFlashingCellDefinition(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
-    setFlashingCellDefinition(flashingCellDefinitions: FlashingCellDefinition[]): void;
+    setFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): void;
     editFlashingCellDefinition(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
     suspendFlashingCellDefinition(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
     unSuspendFlashingCellDefinition(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
     addFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): FlashingCellDefinition[];
     editFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): FlashingCellDefinition[];
+    getFlashingCellPredicateDefs(): AdaptablePredicateDef[];
+    getFlashingCellPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
 }

package/src/Api/Implementation/FlashingCellApiImpl.js

@@ -5,58 +5,67 @@ const tslib_1 = require("tslib");
 const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
 const FlashingCellRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FlashingCellRedux"));
 const ApiBase_1 = require("./ApiBase");
-const AdaptableQuery_1 = require("../../PredefinedConfig/Common/AdaptableQuery");
 class FlashingCellApiImpl extends ApiBase_1.ApiBase {
     getFlashingCellState() {
         return this.getAdaptableState().FlashingCell;
     }
+    mergeFlashingCellDefinitionWithDefaults(flashingCellDefinition) {
+        const flashingDefaults = this.adaptable.adaptableOptions.flashingCellOptions;
+        if (!flashingDefaults) {
+            return flashingCellDefinition;
+        }
+        if (!flashingCellDefinition.DownChangeStyle && flashingDefaults.defaultDownChangeStyle) {
+            flashingCellDefinition.DownChangeStyle = flashingDefaults.defaultDownChangeStyle;
+        }
+        if (!flashingCellDefinition.UpChangeStyle && flashingDefaults.defaultUpChangeStyle) {
+            flashingCellDefinition.UpChangeStyle = flashingDefaults.defaultUpChangeStyle;
+        }
+        if (!flashingCellDefinition.NeutralChangeStyle && flashingDefaults.defaultNeutralChangeStyle) {
+            flashingCellDefinition.NeutralChangeStyle = flashingDefaults.defaultNeutralChangeStyle;
+        }
+        if (!flashingCellDefinition.FlashDuration && flashingDefaults.defaultFlashDuration) {
+            flashingCellDefinition.FlashDuration = flashingDefaults.defaultFlashDuration;
+        }
+        if (!flashingCellDefinition.FlashTarget && flashingDefaults.defaultFlashTarget) {
+            flashingCellDefinition.FlashTarget = flashingDefaults.defaultFlashTarget;
+        }
+        return flashingCellDefinition;
+    }
     getFlashingCellDefinitions() {
-        var _a, _b;
         const flashingCellDefinitions = this.getFlashingCellState().FlashingCellDefinitions;
-        const flashingDefaults = (_b = (_a = this.adaptable.adaptableOptions.notificationsOptions) === null || _a === void 0 ? void 0 : _a.flashingCellDefaultProperties) !== null && _b !== void 0 ? _b : {};
         return flashingCellDefinitions.map((flashingCellDefinition) => {
-            return Object.assign(Object.assign({}, flashingDefaults), flashingCellDefinition);
+            return this.mergeFlashingCellDefinitionWithDefaults(flashingCellDefinition);
         });
     }
     getFlashingCellDefinitionById(id) {
         var _a;
-        return (_a = this.getFlashingCellDefinitions()) === null || _a === void 0 ? void 0 : _a.find((alert) => (alert === null || alert === void 0 ? void 0 : alert.Uuid) === id);
-    }
-    getNonReactiveFlashingCellDefinitions() {
-        var _a, _b;
-        const flashingCellDefinitions = this.getFlashingCellState().FlashingCellDefinitions.filter((alertDef) => !AdaptableQuery_1.isReactiveQuery(alertDef.Rule));
-        const flashingDefaults = (_b = (_a = this.adaptable.adaptableOptions.notificationsOptions) === null || _a === void 0 ? void 0 : _a.flashingCellDefaultProperties) !== null && _b !== void 0 ? _b : {};
-        return flashingCellDefinitions.map((flashingCellDefinition) => {
-            return Object.assign(Object.assign({}, flashingDefaults), flashingCellDefinition);
-        });
+        return (_a = this.getFlashingCellDefinitions()) === null || _a === void 0 ? void 0 : _a.find((fc) => (fc === null || fc === void 0 ? void 0 : fc.Uuid) === id);
     }
-    getActiveNonReactiveFlashingCellDefinitions() {
-        return this.getNonReactiveFlashingCellDefinitions().filter((alertDef) => !alertDef.IsSuspended);
+    getActiveFlashingCellDefinitions() {
+        return this.getFlashingCellDefinitions().filter((fc) => !fc.IsSuspended);
     }
     getFlashingCellFlashTarget(flashingCellDefinition) {
-        //   const scopeApi = this.adaptable.api.scopeApi;
-        // const isScopeAll = scopeApi.scopeIsAll(flashingCellDefinition.Scope);
         const flashTarget = flashingCellDefinition.FlashTarget === 'cell' || !flashingCellDefinition.FlashTarget
             ? 'cell'
             : 'row';
         return flashTarget;
     }
-    showFlashingCell(alertToShow) {
-        this.addUidToAdaptableObject(alertToShow);
+    showFlashingCell(flashingCellToShow) {
+        this.addUidToAdaptableObject(flashingCellToShow);
         const flashingCellFiredInfo = {
             adaptableApi: this.adaptable.api,
-            flashingCell: alertToShow,
+            flashingCell: flashingCellToShow,
         };
         const results = this.adaptable.api.eventApi.emitSync('FlashingCellDisplayed', flashingCellFiredInfo);
         const shouldShow = results.reduce((endResult, aResult) => {
             return endResult && aResult !== false;
         }, true);
         if (shouldShow) {
-            this.dispatchAction(SystemRedux.SystemFlashingCellAdd(alertToShow));
-            const { FlashDuration } = alertToShow.flashingCellDefinition;
+            this.dispatchAction(SystemRedux.SystemFlashingCellAdd(flashingCellToShow));
+            const { FlashDuration: FlashDuration } = flashingCellToShow.flashingCellDefinition;
             if (FlashDuration && FlashDuration !== 'always') {
                 setTimeout(() => {
-                    this.dispatchAction(SystemRedux.SystemFlashingCellDelete(alertToShow));
+                    this.dispatchAction(SystemRedux.SystemFlashingCellDelete(flashingCellToShow));
                 }, FlashDuration);
             }
         }
@@ -65,7 +74,7 @@ class FlashingCellApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(FlashingCellRedux.FlashingCellDefinitionAdd(flashingCellDefinition));
         return this.getFlashingCellDefinitionById(flashingCellDefinition.Uuid);
     }
-    setFlashingCellDefinition(flashingCellDefinitions) {
+    setFlashingCellDefinitions(flashingCellDefinitions) {
         this.dispatchAction(FlashingCellRedux.FlashingCellDefinitionSet(flashingCellDefinitions));
     }
     editFlashingCellDefinition(flashingCellDefinition) {
@@ -92,5 +101,11 @@ class FlashingCellApiImpl extends ApiBase_1.ApiBase {
         });
         return flashingCellDefinitions === null || flashingCellDefinitions === void 0 ? void 0 : flashingCellDefinitions.map((flashingCell) => this.getFlashingCellDefinitionById(flashingCell === null || flashingCell === void 0 ? void 0 : flashingCell.Uuid));
     }
+    getFlashingCellPredicateDefs() {
+        return this.adaptable.api.predicateApi.getPredicateDefsByModuleScope('flashingcell');
+    }
+    getFlashingCellPredicateDefsForScope(scope) {
+        return this.getFlashingCellPredicateDefs().filter((predicateDef) => this.adaptable.api.scopeApi.isScopeInScope(scope, predicateDef.columnScope));
+    }
 }
 exports.FlashingCellApiImpl = FlashingCellApiImpl;

package/src/Api/Implementation/FreeTextColumnApiImpl.js

@@ -121,7 +121,7 @@ class FreeTextColumnApiImpl extends ApiBase_1.ApiBase {
     }
     getFreeTextColumnModuleReferences(freeTextColumn) {
         const references = [];
-        this.adaptable.modules.forEach((module) => {
+        this.adaptable.adaptableModules.forEach((module) => {
             if (module
                 .getModuleFreeTextColumnReferences()
                 .some((moduleReference) => moduleReference.Uuid === freeTextColumn.Uuid)) {

package/src/Api/Implementation/GridApiImpl.js

@@ -89,7 +89,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.api.filterApi.clearAllColumnFilter();
     }
     getAgGridInstance() {
-        return this.adaptable.adaptableOptions.agGridOptions;
+        return this.adaptable.adaptableOptions.gridOptions;
     }
     getColumnSorts() {
         return this.getAdaptableState().Grid.ColumnSorts;

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

@@ -2,8 +2,6 @@ import { ApiBase } from './ApiBase';
 import { InternalApi } from '../InternalApi';
 import { UIConfirmation } from '../../Utilities/Interface/MessagePopups';
 import { SystemState } from '../../PredefinedConfig/SystemState';
-import { ChartData } from '../../PredefinedConfig/ChartState';
-import { ChartVisibility } from '../../PredefinedConfig/Common/ChartEnums';
 import { Action } from 'redux';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
@@ -37,13 +35,11 @@ import { AdaptableFrameworkComponent } from '../../AdaptableOptions/AdaptableFra
 import { IMetamodelService } from '../../Utilities/Services/Interface/IMetamodelService';
 export declare class InternalApiImpl extends ApiBase implements InternalApi {
     getSystemState(): SystemState;
-    setChartData(chartData: ChartData): void;
     getAdaptableFormFromAlertForm(alertForm: string | AlertButtonForm, context: any, defaultMessageType?: AdaptableMessageType): (Omit<AdaptableForm<AlertButtonContext>, 'buttons'> & {
         buttons?: (Omit<AdaptableButton<AlertButtonContext>, 'buttonStyle'> & {
             buttonStyle?: ButtonStyle;
         })[];
     }) | undefined;
-    setChartVisibility(chartVisbility: ChartVisibility): void;
     getAdaptableAlerts(): AdaptableAlert[];
     getAdaptableFlashingCellFor(primaryKey: string, columnId?: string): AdaptableFlashingCell | null;
     addSystemStatusMessageInfo(systemStatusMessageInfo: SystemStatusMessageInfo): void;

package/src/Api/Implementation/InternalApiImpl.js

@@ -20,9 +20,6 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     getSystemState() {
         return this.getAdaptableState().System;
     }
-    setChartData(chartData) {
-        this.dispatchAction(SystemRedux.ChartSetChartData(chartData));
-    }
     getAdaptableFormFromAlertForm(alertForm, context, defaultMessageType) {
         var _a, _b;
         const api = this.adaptable.api;
@@ -63,9 +60,6 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         }
         return adaptableAlertForm;
     }
-    setChartVisibility(chartVisbility) {
-        this.dispatchAction(SystemRedux.ChartSetChartVisibility(chartVisbility));
-    }
     getAdaptableAlerts() {
         return this.getSystemState().AdaptableAlerts;
     }
@@ -207,7 +201,7 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         return this.adaptable;
     }
     getAgGridInstance() {
-        return this.adaptable.adaptableOptions.agGridOptions;
+        return this.adaptable.adaptableOptions.gridOptions;
     }
     getPredefinedConfig() {
         return this.adaptable.adaptableOptions.predefinedConfig;

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

@@ -4,7 +4,6 @@ import { PluginsState } from '../../Redux/ActionsReducers/PluginsRedux';
 import { IPushPullApi } from '../IPushPullApi';
 import { Glue42Api } from '../Glue42Api';
 import { OpenFinApi } from '../OpenFinApi';
-import { ChartApi } from '../ChartApi';
 import { FinanceApi } from '../FinanceApi';
 export declare class PluginsApiImpl extends ApiBase implements PluginsApi {
     getPluginsState(): PluginsState;
@@ -15,6 +14,5 @@ export declare class PluginsApiImpl extends ApiBase implements PluginsApi {
     getipushpullPluginApi(): IPushPullApi;
     getGlue42PluginApi(): Glue42Api;
     getOpenFinPluginApi(): OpenFinApi;
-    getChartsPluginApi(): ChartApi;
     getFinancePluginApi(): FinanceApi;
 }

package/src/Api/Implementation/PluginsApiImpl.js

@@ -32,9 +32,6 @@ class PluginsApiImpl extends ApiBase_1.ApiBase {
             if (pluginId === 'openfin') {
                 return api;
             }
-            if (pluginId === 'charts') {
-                return api;
-            }
             return api;
         }
         catch (ex) {
@@ -50,9 +47,6 @@ class PluginsApiImpl extends ApiBase_1.ApiBase {
     getOpenFinPluginApi() {
         return this.getPluginApi('openfin');
     }
-    getChartsPluginApi() {
-        return this.getPluginApi('charts');
-    }
     getFinancePluginApi() {
         return this.getPluginApi('finance');
     }

package/src/Api/Implementation/PlusMinusApiImpl.js

@@ -27,7 +27,7 @@ class PlusMinusApiImpl extends ApiBase_1.ApiBase {
         return this.getAllPlusMinus().filter((plusMinusNudge) => plusMinusNudge.IsSuspended);
     }
     runPlusMinusNudge(plusMinusNudge, cellsToUpdate, direction) {
-        let plusMinusModule = (this.adaptable.modules.get(ModuleConstants.PlusMinusModuleId));
+        let plusMinusModule = (this.adaptable.adaptableModules.get(ModuleConstants.PlusMinusModuleId));
         plusMinusModule.applyPlusMinus([plusMinusNudge], cellsToUpdate, direction);
     }
     applyPlusMinus(gridCells) {

package/src/Api/Implementation/QueryApiImpl.js

@@ -64,7 +64,7 @@ class QueryApiImpl extends ApiBase_1.ApiBase {
     }
     getNamedQueryModuleReferences(namedQueryName) {
         const references = [];
-        this.adaptable.modules.forEach((module) => {
+        this.adaptable.adaptableModules.forEach((module) => {
             if (module
                 .getModuleNamedQueryReferences()
                 .some((moduleReference) => moduleReference === namedQueryName)) {

package/src/Api/Implementation/ToolPanelApiImpl.js

@@ -13,13 +13,13 @@ class ToolPanelApiImpl extends ApiBase_1.ApiBase {
         this.showModulePopup(ModuleConstants.ToolPanelModuleId, popupParams);
     }
     openAdapTableToolPanel() {
-        let gridOptions = this.getOptions().agGridOptions;
+        let gridOptions = this.getOptions().gridOptions;
         if (gridOptions) {
             gridOptions.api.openToolPanel('adaptable');
         }
     }
     closeAdapTableToolPanel() {
-        let gridOptions = this.getOptions().agGridOptions;
+        let gridOptions = this.getOptions().gridOptions;
         if (gridOptions) {
             gridOptions.api.closeToolPanel();
         }

package/src/Api/InternalApi.d.ts

@@ -1,7 +1,5 @@
 import { UIConfirmation } from '../Utilities/Interface/MessagePopups';
 import { SystemState } from '../PredefinedConfig/SystemState';
-import { ChartData } from '../PredefinedConfig/ChartState';
-import { ChartVisibility } from '../PredefinedConfig/Common/ChartEnums';
 import { Action } from 'redux';
 import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
@@ -46,8 +44,6 @@ export interface InternalApi {
             buttonStyle?: ButtonStyle;
         })[];
     };
-    setChartData(chartData: ChartData): void;
-    setChartVisibility(chartVisbility: ChartVisibility): void;
     getAdaptableAlerts(): AdaptableAlert[];
     showPopupConfirmation(confirmation: UIConfirmation): void;
     getAdaptableFlashingCellFor(primaryKey: string, columnId?: string): AdaptableFlashingCell | null;

package/src/Api/PluginsApi.d.ts

@@ -2,7 +2,6 @@ import { PluginsState } from '../Redux/ActionsReducers/PluginsRedux';
 import { IPushPullApi } from './IPushPullApi';
 import { Glue42Api } from './Glue42Api';
 import { OpenFinApi } from './OpenFinApi';
-import { ChartApi } from './ChartApi';
 import { FinanceApi } from './FinanceApi';
 /**
  * API methods dealing with AdapTable plugins
@@ -15,6 +14,5 @@ export interface PluginsApi {
     getipushpullPluginApi(): IPushPullApi;
     getGlue42PluginApi(): Glue42Api;
     getOpenFinPluginApi(): OpenFinApi;
-    getChartsPluginApi(): ChartApi;
     getFinancePluginApi(): FinanceApi;
 }

package/src/PredefinedConfig/AdaptableState.d.ts

@@ -3,7 +3,6 @@ import { GridState } from './GridState';
 import { SystemState } from './SystemState';
 import { AlertState } from './AlertState';
 import { CalculatedColumnState } from './CalculatedColumnState';
-import { ChartState } from './ChartState';
 import { ConditionalStyleState } from './ConditionalStyleState';
 import { CustomSortState } from './CustomSortState';
 import { DashboardState } from './DashboardState';
@@ -20,7 +19,6 @@ import { TeamSharingState } from './TeamSharingState';
 import { ThemeState } from './ThemeState';
 import { ConfigState } from './ConfigState';
 import { FilterState } from './FilterState';
-import { SparklineColumnState } from './SparklineColumnState';
 import { ApplicationState } from './ApplicationState';
 import { ToolPanelState } from './ToolPanelState';
 import { QueryState } from './QueryState';
@@ -37,11 +35,9 @@ export interface AdaptableState {
         [key: string]: any;
     };
     Application: ApplicationState;
-    SparklineColumn: SparklineColumnState;
     Alert: AlertState;
     FlashingCell: FlashingCellState;
     CalculatedColumn: CalculatedColumnState;
-    Chart: ChartState;
     ConditionalStyle: ConditionalStyleState;
     CustomSort: CustomSortState;
     Dashboard: DashboardState;

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

@@ -32,7 +32,7 @@ export interface AdaptablePredicateDef {
      */
     columnScope: AdaptableScope;
     /**
-     * Modules where Predicate can run: 'filter', 'alert', 'conditionalstyle'
+     * Modules where the Predicate can run
      */
     moduleScope: ModuleScope[];
     /**
@@ -86,7 +86,7 @@ export interface PredicateDefHandlerParams {
      */
     displayValue: any;
     /**
-     * Row node which contains the cell
+     * AG Grid Row node which contains the cell
      */
     node: RowNode;
     /**
@@ -94,7 +94,7 @@ export interface PredicateDefHandlerParams {
      */
     inputs: any[];
     /**
-     * Column which contains the cell
+     * Adaptable Column which contains the cell
      */
     column: AdaptableColumn;
     /**
@@ -105,7 +105,7 @@ export interface PredicateDefHandlerParams {
 export interface PredicateDefToStringParams {
     inputs: any[];
 }
-export declare type ModuleScope = 'filter' | 'alert' | 'conditionalstyle';
+export declare type ModuleScope = 'filter' | 'alert' | 'conditionalstyle' | 'flashingcell';
 /**
  * Array of Predicate Defs which are shipped by AdapTable
  */