@adaptabletools/adaptable 16.0.9 → 16.1.0-canary.0

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SYSTEM_DISABLE_DELETE_CONFIRMATION = 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_CLEAR_ROW = 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.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryClearRow = 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_COMMENTS_HIDE = exports.SYSTEM_COMMENTS_SHOW = exports.SYSTEM_VISUAL_EXPORT_END = exports.SYSTEM_VISUAL_EXPORT_BEGIN = exports.SYSTEM_SET_QUICK_SEARCH_FLOATING_VISIBILITY = exports.SYSTEM_SET_PREVIOUS_GROUPED_COLUMN_INDEX = exports.SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS = exports.SYSTEM_DATA_SET_SELECT = exports.DASHBOARD_REFRESH = exports.SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS = void 0;
-exports.SystemReducer = exports.SystemCommentsEditModeSelector = exports.SystemCommentsSelector = exports.SystemQuickSearchFloatingVisibilitySelector = exports.SystemPreviousGroupedColumnsSelector = exports.SystemDisableDeleteConfirmationSelector = exports.SystemCommentsHide = exports.SystemCommentsShow = exports.SystemQuickSearchFloatingVisibility = exports.SystemVisualExportEnd = exports.SystemVisualExportBegin = exports.SystemDisableDeleteConfirmation = exports.SystemSetPreviousGroupedColumnsIndex = exports.SystemChartingCurrentChartModelsSelector = exports.SystemChartingSetCurrentChartModels = exports.SystemDataSetSelect = exports.SystemDashboardRefresh = exports.SystemLayoutShowNotAssociatedObjects = exports.SystemFilterFormHide = exports.SystemQuickFilterBarHide = exports.SystemQuickFilterBarShow = exports.SystemSettingsPanelSet = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = void 0;
+exports.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryClearRow = 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_NOTS_HIDE = exports.SYSTEM_NOTESS_SHOW = exports.SYSTEM_VISUAL_EXPORT_END = exports.SYSTEM_VISUAL_EXPORT_BEGIN = exports.SYSTEM_SET_QUICK_SEARCH_FLOATING_VISIBILITY = exports.SYSTEM_SET_PREVIOUS_GROUPED_COLUMN_INDEX = exports.SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS = exports.SYSTEM_DATA_SET_SELECT = exports.DASHBOARD_REFRESH = exports.SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS = void 0;
+exports.SystemReducer = exports.SystemNotesEditModeSelector = exports.SystemNotesSelector = exports.SystemQuickSearchFloatingVisibilitySelector = exports.SystemPreviousGroupedColumnsSelector = exports.SystemDisableDeleteConfirmationSelector = exports.SystemNoteHide = exports.SystemNotesShow = exports.SystemQuickSearchFloatingVisibility = exports.SystemVisualExportEnd = exports.SystemVisualExportBegin = exports.SystemDisableDeleteConfirmation = exports.SystemSetPreviousGroupedColumnsIndex = exports.SystemChartingCurrentChartModelsSelector = exports.SystemChartingSetCurrentChartModels = exports.SystemDataSetSelect = exports.SystemDashboardRefresh = exports.SystemLayoutShowNotAssociatedObjects = exports.SystemFilterFormHide = exports.SystemQuickFilterBarHide = exports.SystemQuickFilterBarShow = exports.SystemSettingsPanelSet = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const Helper_1 = require("../../Utilities/Helpers/Helper");
@@ -91,9 +91,9 @@ exports.SYSTEM_SET_QUICK_SEARCH_FLOATING_VISIBILITY = 'SYSTEM_SET_QUICK_SEARCH_F
 // Data Export (Report)
 exports.SYSTEM_VISUAL_EXPORT_BEGIN = 'SYSTEM_VISUAL_EXPORT_BEGIN';
 exports.SYSTEM_VISUAL_EXPORT_END = 'SYSTEM_VISUAL_EXPORT_END';
-// Comments
-exports.SYSTEM_COMMENTS_SHOW = 'SYSTEM_COMMENTS_SHOW';
-exports.SYSTEM_COMMENTS_HIDE = 'SYSTEM_COMMENTS_HIDE';
+// Notes
+exports.SYSTEM_NOTESS_SHOW = 'SYSTEM_NOTES_SHOW';
+exports.SYSTEM_NOTS_HIDE = 'SYSTEM_NOTES_HIDE';
 const SystemHighlightCellAdd = (cellHighlightInfo) => ({
     type: exports.SYSTEM_HIGHLIGHT_CELL_ADD,
     cellHighlightInfo: cellHighlightInfo,
@@ -365,16 +365,16 @@ const SystemQuickSearchFloatingVisibility = (visible) => ({
     visible,
 });
 exports.SystemQuickSearchFloatingVisibility = SystemQuickSearchFloatingVisibility;
-const SystemCommentsShow = (cellPosition, editMode) => ({
-    type: exports.SYSTEM_COMMENTS_SHOW,
+const SystemNotesShow = (cellPosition, editMode) => ({
+    type: exports.SYSTEM_NOTESS_SHOW,
     editMode,
     cellPosition,
 });
-exports.SystemCommentsShow = SystemCommentsShow;
-const SystemCommentsHide = () => ({
-    type: exports.SYSTEM_COMMENTS_HIDE,
+exports.SystemNotesShow = SystemNotesShow;
+const SystemNoteHide = () => ({
+    type: exports.SYSTEM_NOTS_HIDE,
 });
-exports.SystemCommentsHide = SystemCommentsHide;
+exports.SystemNoteHide = SystemNoteHide;
 const SystemDisableDeleteConfirmationSelector = (state) => {
     return state.DisableDeleteConfirmation;
 };
@@ -388,16 +388,16 @@ const SystemQuickSearchFloatingVisibilitySelector = (state) => {
     return (_a = state === null || state === void 0 ? void 0 : state.QuickSearch) === null || _a === void 0 ? void 0 : _a.floatingVisible;
 };
 exports.SystemQuickSearchFloatingVisibilitySelector = SystemQuickSearchFloatingVisibilitySelector;
-const SystemCommentsSelector = (state) => {
+const SystemNotesSelector = (state) => {
     var _a;
-    return (_a = state === null || state === void 0 ? void 0 : state.Comments) === null || _a === void 0 ? void 0 : _a.popupPosition;
+    return (_a = state === null || state === void 0 ? void 0 : state.Notes) === null || _a === void 0 ? void 0 : _a.popupPosition;
 };
-exports.SystemCommentsSelector = SystemCommentsSelector;
-const SystemCommentsEditModeSelector = (state) => {
+exports.SystemNotesSelector = SystemNotesSelector;
+const SystemNotesEditModeSelector = (state) => {
     var _a;
-    return (_a = state === null || state === void 0 ? void 0 : state.Comments) === null || _a === void 0 ? void 0 : _a.editMode;
+    return (_a = state === null || state === void 0 ? void 0 : state.Notes) === null || _a === void 0 ? void 0 : _a.editMode;
 };
-exports.SystemCommentsEditModeSelector = SystemCommentsEditModeSelector;
+exports.SystemNotesEditModeSelector = SystemNotesEditModeSelector;
 const initialState = {
     AdaptableAlerts: GeneralConstants_1.EMPTY_ARRAY,
     AdaptableFlashingCells: {},
@@ -435,6 +435,7 @@ const initialState = {
     CurrentDataSet: GeneralConstants_1.EMPTY_STRING,
     Charting: {
         currentChartModels: [],
+        externalChartingDefinitions: [],
     },
     Layout: {
         previousGroupedColumns: {},
@@ -785,15 +786,15 @@ const SystemReducer = (state = initialState, action) => {
             const typedAction = action;
             return Object.assign(Object.assign({}, state), { QuickSearch: Object.assign(Object.assign({}, state.QuickSearch), { floatingVisible: typedAction.visible }) });
         }
-        case exports.SYSTEM_COMMENTS_SHOW: {
+        case exports.SYSTEM_NOTESS_SHOW: {
             const typedAction = action;
-            return Object.assign(Object.assign({}, state), { Comments: {
+            return Object.assign(Object.assign({}, state), { Notes: {
                     editMode: typedAction.editMode,
-                    popupPosition: typedAction.cellPosition
+                    popupPosition: typedAction.cellPosition,
                 } });
         }
-        case exports.SYSTEM_COMMENTS_HIDE: {
-            return Object.assign(Object.assign({}, state), { Comments: {
+        case exports.SYSTEM_NOTS_HIDE: {
+            return Object.assign(Object.assign({}, state), { Notes: {
                     popupPosition: null,
                 } });
         }

package/src/Redux/Store/AdaptableStore.js

@@ -25,7 +25,7 @@ const QuickSearchRedux = tslib_1.__importStar(require("../ActionsReducers/QuickS
 const ThemeRedux = tslib_1.__importStar(require("../ActionsReducers/ThemeRedux"));
 const FormatColumnRedux = tslib_1.__importStar(require("../ActionsReducers/FormatColumnRedux"));
 const StyledColumnRedux = tslib_1.__importStar(require("../ActionsReducers/StyledColumnRedux"));
-const CommentsRedux = tslib_1.__importStar(require("../ActionsReducers/CommentsRedux"));
+const NotesRedux = tslib_1.__importStar(require("../ActionsReducers/NotesRedux"));
 const ApplicationRedux = tslib_1.__importStar(require("../ActionsReducers/ApplicationRedux"));
 const FreeTextColumnRedux = tslib_1.__importStar(require("../ActionsReducers/FreeTextColumnRedux"));
 const LayoutRedux = tslib_1.__importStar(require("../ActionsReducers/LayoutRedux"));
@@ -148,7 +148,7 @@ class AdaptableStore {
             Query: QueryRedux.QueryReducer,
             Charting: ChartingRedux.ChartingReducer,
             StyledColumn: StyledColumnRedux.StyledColumnReducer,
-            Comments: CommentsRedux.CommentsReducer,
+            Notes: NotesRedux.NotesReducer,
         };
         // allow plugins to participate in the root reducer
         adaptable.forPlugins((plugin) => {
@@ -838,20 +838,20 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     return returnAction;
                 }
                 /*******************
-                 * Comments ACTIONS
+                 * Note ACTIONS
                  *******************/
                 /**
-                 * Use Case: Comment has been edited/deleted/added
+                 * Use Case: Comments has been edited/deleted/added
                  * Action: Triangle can be removed/added
                  */
-                case CommentsRedux.COMMENTS_ADD:
-                case CommentsRedux.COMMENTS_EDIT:
-                case CommentsRedux.COMMENTS_DELETE: {
+                case NotesRedux.NOTES_ADD:
+                case NotesRedux.NOTES_EDIT:
+                case NotesRedux.NOTES_DELETE: {
                     let returnAction = next(action);
-                    const node = adaptable.api.gridApi.getRowNodeForPrimaryKey(returnAction.adaptableComment.PrimaryKeyValue);
-                    adaptable.refreshCells([node], [returnAction.adaptableComment.ColumnId], true);
-                    if (action.type == CommentsRedux.COMMENTS_DELETE) {
-                        adaptable.api.commentsApi.hideComment();
+                    const node = adaptable.api.gridApi.getRowNodeForPrimaryKey(returnAction.adaptableNote.PrimaryKeyValue);
+                    adaptable.refreshCells([node], [returnAction.adaptableNote.ColumnId], true);
+                    if (action.type == NotesRedux.NOTES_DELETE) {
+                        adaptable.api.notesApi.hideNote();
                     }
                     return returnAction;
                 }
@@ -1195,6 +1195,14 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     adaptable.ReportService.resetExcelStyleMemoization();
                     return returnAction;
                 }
+                /*******************
+                 * CHARTING ACTIONS
+                 *******************/
+                case ChartingRedux.CHARTING_DELETE_EXTERNAL_CHART: {
+                    const returnAction = next(action);
+                    adaptable.api.chartingApi.internalApi.onDeleteExternalChart(returnAction.chartDefinition);
+                    return returnAction;
+                }
                 /*******************
                  * TEAM SHARING ACTIONS
                  *******************/

package/src/Strategy/ChartingModule.d.ts

@@ -2,12 +2,15 @@ import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/I
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { ChartDefinition } from '../types';
+import { ExternalChartDefinition } from '../PredefinedConfig/ChartingState';
 export declare class ChartingModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     updateOldConfig(): void;
     isModuleAvailable(): boolean;
-    getModuleAdaptableObjects(): ChartDefinition[];
+    getModuleAdaptableObjects(): (ChartDefinition | ExternalChartDefinition)[];
     toViewAll(): AdaptableObjectView[];
-    toView(chart: ChartDefinition): AdaptableObjectView;
+    toView(chart: ChartDefinition | ExternalChartDefinition): AdaptableObjectView;
+    toViewExternalChartDefinition(chart: ExternalChartDefinition): AdaptableObjectView;
+    toViewChartDefinition(chart: ChartDefinition): AdaptableObjectView;
     getViewProperties(): AdaptableModuleView;
 }

package/src/Strategy/ChartingModule.js

@@ -5,16 +5,17 @@ const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const ShowChartButton_1 = require("../View/Charting/ShowChartButton");
-const ChartingWizard_1 = require("../View/Charting/ChartingWizard/ChartingWizard");
+const ChartingWizard_1 = require("../View/Charting/ChartingWizard");
 const ChartingRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/ChartingRedux"));
 const ChartingStatusBarPopover_1 = require("../View/Charting/ChartingStatusBarPopover");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
+const ChartingState_1 = require("../PredefinedConfig/ChartingState");
 class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ChartingModuleId, ModuleConstants.ChartingFriendlyName, 'chart', 'ChartPopup', 'Create AG Grid Charts in order to see Adaptable Data visually', api);
     }
     updateOldConfig() {
-        const allChartDefinitions = this.getModuleAdaptableObjects();
+        const allChartDefinitions = this.api.chartingApi.getChartDefinitions();
         const chartDefinitionsToUpdate = allChartDefinitions
             .filter((chartDefinition) => 'model' in chartDefinition || !('Name' in chartDefinition))
             .map((charDefinition) => {
@@ -34,16 +35,34 @@ class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
     }
     isModuleAvailable() {
-        return this.api.chartingApi.isChartingEnabled() && super.isModuleAvailable();
-        // return false;
+        const agChartsAvailable = this.api.chartingApi.isChartingEnabled() && super.isModuleAvailable();
+        const externalChartsAvailable = this.api.optionsApi.getChartingOptions().externalChartingOptions;
+        return Boolean(agChartsAvailable || externalChartsAvailable);
     }
     getModuleAdaptableObjects() {
-        return this.api.chartingApi.getChartDefinitions();
+        return [
+            ...this.api.chartingApi.getChartDefinitions(),
+            ...this.api.chartingApi.getExternalChartDefinitions(),
+        ];
     }
     toViewAll() {
-        return this.getModuleAdaptableObjects().map((layout) => this.toView(layout));
+        return this.getModuleAdaptableObjects().map((chartDef) => this.toView(chartDef));
     }
     toView(chart) {
+        if ((0, ChartingState_1.isExternalChartDefinition)(chart)) {
+            return this.toViewExternalChartDefinition(chart);
+        }
+        else {
+            return this.toViewChartDefinition(chart);
+        }
+    }
+    toViewExternalChartDefinition(chart) {
+        return {
+            items: [{ name: 'Name', values: [chart.Name] }],
+            abObject: chart,
+        };
+    }
+    toViewChartDefinition(chart) {
         var _a;
         return {
             items: [
@@ -96,7 +115,9 @@ class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             // not sure if charts should be created via adaptable wizard
             hideNewButton: true,
             getDeleteAction: (chartDefinition) => {
-                return ChartingRedux.ChartingDeleteChart(chartDefinition.Name);
+                return (0, ChartingState_1.isAgChartDefinition)(chartDefinition)
+                    ? ChartingRedux.ChartingDeleteChart(chartDefinition)
+                    : ChartingRedux.ChartingDeleteExternalChart(chartDefinition);
             },
             emptyView: 'To create a chart select a few cells and right click. Then select "Chart Range" from the context menu.',
             getStatusBarPanelProps: () => {

package/src/Strategy/ColumnInfoModule.d.ts

@@ -0,0 +1,11 @@
+import { AdaptableModuleBase } from './AdaptableModuleBase';
+import { IModule } from './Interface/IModule';
+import { AdaptableApi } from '../Api/AdaptableApi';
+import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
+import { AdaptableColumn, AdaptableMenuItem, ContextMenuContext } from '../types';
+export declare class ColumnInfoModule extends AdaptableModuleBase implements IModule {
+    constructor(api: AdaptableApi);
+    getViewAccessLevel(): AccessLevel;
+    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+}

package/src/Strategy/ColumnInfoModule.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ColumnInfoModule = void 0;
+const tslib_1 = require("tslib");
+const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
+const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
+class ColumnInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
+    constructor(api) {
+        super(ModuleConstants.ColumnInfoModuleId, ModuleConstants.ColumnInfoFriendlyName, 'columns', 'ColumnInfoPopup', 'Display information about Columns', api);
+    }
+    getViewAccessLevel() {
+        return 'Full';
+    }
+    addColumnMenuItems(column) {
+        if (this.isModuleAvailable()) {
+            const columnPopUpParams = {
+                source: 'ColumnMenu',
+                column: column,
+            };
+            return [
+                this.createMainMenuItemShowPopup({
+                    Label: 'Column Info',
+                    ComponentName: this.moduleInfo.Popup,
+                    Icon: this.moduleInfo.Glyph,
+                    PopupParams: columnPopUpParams,
+                }),
+            ];
+        }
+    }
+    addContextMenuItems(menuContext) {
+        if (this.isModuleAvailable()) {
+            const columnPopUpParams = {
+                source: 'ColumnMenu',
+                column: menuContext.adaptableColumn,
+            };
+            return [
+                this.createMainMenuItemShowPopup({
+                    Label: 'Column Info',
+                    ComponentName: this.moduleInfo.Popup,
+                    Icon: this.moduleInfo.Glyph,
+                    PopupParams: columnPopUpParams,
+                }),
+            ];
+        }
+    }
+}
+exports.ColumnInfoModule = ColumnInfoModule;

package/src/Strategy/DataImportModule.d.ts

@@ -0,0 +1,11 @@
+import { AdaptableApi } from '../Api/AdaptableApi';
+import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
+import { AdaptableModuleBase } from './AdaptableModuleBase';
+import { IModule } from './Interface/IModule';
+export declare class DataImportModule extends AdaptableModuleBase implements IModule {
+    constructor(api: AdaptableApi);
+    addModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
+    addContextMenuItems(): AdaptableMenuItem[] | undefined;
+    addColumnMenuItems(): AdaptableMenuItem[] | undefined;
+    private getOpenPopupMenuItem;
+}

package/src/Strategy/DataImportModule.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataImportModule = void 0;
+const tslib_1 = require("tslib");
+const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
+const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
+class DataImportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
+    constructor(api) {
+        super(ModuleConstants.DataImportModuleId, ModuleConstants.DataImportFriendyName, 'import', 'DataImportPopup', 'Import Data', api);
+    }
+    addModuleMenuItem(source) {
+        if (this.isModuleAvailable()) {
+            return this.getOpenPopupMenuItem(source);
+        }
+    }
+    addContextMenuItems() {
+        if (this.isModuleAvailable()) {
+            return [this.getOpenPopupMenuItem('ContextMenu')];
+        }
+        return undefined;
+    }
+    addColumnMenuItems() {
+        if (this.isModuleAvailable()) {
+            return [this.getOpenPopupMenuItem('ColumnMenu')];
+        }
+    }
+    getOpenPopupMenuItem(source) {
+        const moduleParams = {
+            action: 'New',
+            source: source,
+            maxWidth: this.getPopupMaxWidth(),
+        };
+        return this.createColumnMenuItemShowPopup('Import Data', this.moduleInfo.Popup, this.moduleInfo.Glyph, moduleParams);
+    }
+}
+exports.DataImportModule = DataImportModule;

package/src/Strategy/DataSetModule.js

@@ -51,6 +51,7 @@ class DataSetModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewProperties() {
         return {
             actions: [DataSetSelector_1.DataSetSelector],
+            emptyView: 'No DataSets are provided',
             getStatusBarPanelProps: () => {
                 var _a, _b;
                 const content = (_b = (_a = this.api.dataSetApi.getCurrentDataSet()) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : this.moduleInfo.FriendlyName;

package/src/Strategy/Fdc3Module.js

@@ -30,6 +30,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
             });
             if (contextMenuItems.length > 1) {
                 const groupMenuItem = {
+                    module: this.moduleInfo.ModuleName,
                     label: 'FDC3',
                     icon: {
                         name: 'fdc3',
@@ -51,7 +52,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
                 this.getFdc3Api().raiseIntentFromRow(rowNode, intentType, contextType);
             },
             isVisible: true,
-            module: 'Fdc3',
+            module: this.moduleInfo.ModuleName,
         };
         if ((_a = intentConfig.contextMenu) === null || _a === void 0 ? void 0 : _a.icon) {
             const menuItemIcon = ((_b = intentConfig.contextMenu) === null || _b === void 0 ? void 0 : _b.icon) === '_defaultFdc3'
@@ -70,7 +71,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
                 this.getFdc3Api().broadcastFromRow(rowNode, contextType);
             },
             isVisible: true,
-            module: 'Fdc3',
+            module: this.moduleInfo.ModuleName,
         };
         if ((_a = contextConfig.contextMenu) === null || _a === void 0 ? void 0 : _a.icon) {
             const menuItemIcon = ((_b = contextConfig.contextMenu) === null || _b === void 0 ? void 0 : _b.icon) === '_defaultFdc3'

package/src/Strategy/FilterModule.js

@@ -8,6 +8,7 @@ const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensio
 const LayoutRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/LayoutRedux"));
 const SystemRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/SystemRedux"));
 const FilterStatusBarSubPanelPopover_1 = require("../View/Filter/FilterStatusBarSubPanelPopover");
+const getLayoutFilterViewItems_1 = require("./Utilities/Layout/getLayoutFilterViewItems");
 class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FilterModuleId, ModuleConstants.FilterFriendlyName, 'filter-list', 'FilterPopup', 'Advanced filtering capability allows users to see precisely the data they want', api);
@@ -97,6 +98,10 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     name: 'Column',
                     values: [this.api.columnApi.getFriendlyNameForColumnId(filter.ColumnId)],
                 },
+                {
+                    name: 'Filter',
+                    values: [(0, getLayoutFilterViewItems_1.getFilterPreview)(filter, this.api)],
+                },
             ],
             abObject: filter,
         };

package/src/Strategy/GridInfoModule.js

@@ -6,100 +6,31 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 class GridInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.GridInfoModuleId, ModuleConstants.GridInfoFriendlyName, 'info', 'GridInfoPopup', 'Display information about the Grid, the Options selected and all columns', api);
+        super(ModuleConstants.GridInfoModuleId, ModuleConstants.GridInfoFriendlyName, 'align-justify', 'GridInfoPopup', 'Display information about the Grid, the Options selected and all columns', api);
     }
     getViewAccessLevel() {
         return 'Full';
     }
     addColumnMenuItems(column) {
         if (this.isModuleAvailable()) {
-            const showGridSection = this.api.internalApi
-                .getEntitlementService()
-                .isGridInfoSectionVisible('GridSummary');
-            const showColumnInfoSection = this.api.internalApi
-                .getEntitlementService()
-                .isGridInfoSectionVisible('ColumnInfo');
-            let selectMenuItems = [];
-            if (showGridSection) {
-                selectMenuItems.push(this.createMainMenuItemShowPopup({
-                    Label: 'Grid',
+            return [
+                this.createMainMenuItemShowPopup({
+                    Label: 'Grid Info',
                     ComponentName: this.moduleInfo.Popup,
-                    Icon: 'align-justify',
-                }));
-            }
-            if (column && showColumnInfoSection) {
-                selectMenuItems.push(this.createMainMenuItemShowPopup({
-                    Label: 'Column',
-                    ComponentName: this.moduleInfo.Popup,
-                    Icon: 'columns',
-                    PopupParams: {
-                        column: column,
-                        source: 'ColumnMenu',
-                    },
-                }));
-            }
-            if (showGridSection || showColumnInfoSection) {
-                return [
-                    {
-                        label: 'Show Info',
-                        module: this.moduleInfo.ModuleName,
-                        isVisible: true,
-                        icon: {
-                            name: this.moduleInfo.Glyph,
-                        },
-                        subItems: selectMenuItems,
-                    },
-                ];
-            }
+                    Icon: this.moduleInfo.Glyph,
+                }),
+            ];
         }
     }
     addContextMenuItems(menuContext) {
         if (this.isModuleAvailable()) {
-            let selectMenuItems = [];
-            const showGridSection = this.api.internalApi
-                .getEntitlementService()
-                .isGridInfoSectionVisible('GridSummary');
-            const showColumnInfoSection = this.api.internalApi
-                .getEntitlementService()
-                .isGridInfoSectionVisible('ColumnInfo');
-            let gridPopUpParams = {
-                source: 'ContextMenu',
-            };
-            if (showGridSection) {
-                selectMenuItems.push(this.createMainMenuItemShowPopup({
-                    Label: 'Grid',
+            return [
+                this.createMainMenuItemShowPopup({
+                    Label: 'Grid Info',
                     ComponentName: this.moduleInfo.Popup,
-                    Icon: 'align-justify',
-                    PopupParams: gridPopUpParams,
-                }));
-            }
-            if (showColumnInfoSection) {
-                if (!menuContext.isRowGroupColumn) {
-                    let columnPopUpParams = {
-                        source: 'ContextMenu',
-                        column: menuContext.adaptableColumn,
-                    };
-                    selectMenuItems.push(this.createMainMenuItemShowPopup({
-                        Label: 'Column',
-                        ComponentName: this.moduleInfo.Popup,
-                        Icon: 'columns',
-                        PopupParams: columnPopUpParams,
-                    }));
-                }
-            }
-            if (showGridSection || showColumnInfoSection) {
-                return [
-                    {
-                        label: 'Show Info',
-                        module: this.moduleInfo.ModuleName,
-                        isVisible: true,
-                        icon: {
-                            name: this.moduleInfo.Glyph,
-                        },
-                        subItems: selectMenuItems,
-                    },
-                ];
-            }
+                    Icon: this.moduleInfo.Glyph,
+                }),
+            ];
         }
     }
 }

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

@@ -113,6 +113,8 @@ export interface AdaptableModuleView {
     /**
      * Specifieds the types of objects the module manages.
      * When specified the new button will have these options.
+     * This is used for creating diffrent types of entites from the same module.
+     * E.g. Schedule
      */
     abObjectTypes?: {
         name: string;

package/src/Strategy/LayoutModule.js

@@ -291,6 +291,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             pivotColumnId,
         };
         return {
+            module: this.moduleInfo.ModuleName,
             isVisible: true,
             label: 'Expand Aggregated Value',
             onClick: () => {

package/src/Strategy/{CommentsModule.d.ts → NotesModule.d.ts}

@@ -1,23 +1,23 @@
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
-import { CommentGridCell } from '../types';
+import { NoteGridCell } from '../types';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
 /**
- * In the first iteration a cell can have only one comment, the
- * comments is a list to allow further development.
+ * In the first iteration a cell can have only one note, the
+ * notes is a list to allow further development.
  */
-export declare class CommentsModule extends AdaptableModuleBase implements IModule {
+export declare class NotesModule extends AdaptableModuleBase implements IModule {
     private adaptable;
     constructor(api: AdaptableApi);
     isModuleAvailable(): boolean;
     handleAdaptableReady(): void;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    private getAddRemoveCommentMenuItems;
+    private getAddRemoveNoteMenuItems;
     getCellPositionFromEvent(event: MouseEvent): null | {
         PrimaryKeyValue: string | number;
         ColumnId: string;
     };
     handleMouseEnter(event: MouseEvent): void;
-    handleCellSelected(commentGridCell: CommentGridCell): void;
+    handleCellSelected(noteGridCell: NoteGridCell): void;
 }