@adaptabletools/adaptable-cjs 17.0.0-canary.4 → 18.0.0-canary.1

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -1,11 +1,12 @@
 "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_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;
+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.DATA_IMPORT_COMPLETED = exports.SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY = exports.SYSTEM_CELL_POPUP_HIDE = exports.SYSTEM_CELL_POPUP_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.DataImportCompleted = exports.SystemCommentsAndNotesFocusedEntitySelector = exports.SystemCommentsAndNotesEditModeSelector = exports.SystemCommentsAndNotesSelector = exports.SystemQuickSearchFloatingVisibilitySelector = exports.SystemPreviousGroupedColumnsSelector = exports.SystemDisableDeleteConfirmationSelector = exports.SystemCellPopupHide = exports.SystemCellPopupEditFocusedEntity = exports.SystemCellPopupShow = 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 = exports.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryClearRow = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const Helper_1 = require("../../Utilities/Helpers/Helper");
+const CellPopupService_1 = require("../../Utilities/Services/CellPopupService");
 /*
 Bit of a mixed bag of actions but essentially its those that are related to Strategies but where we DONT want to persist state
 This allows us to keep the other reducers pure in terms of everything persists
@@ -92,8 +93,11 @@ exports.SYSTEM_SET_QUICK_SEARCH_FLOATING_VISIBILITY = 'SYSTEM_SET_QUICK_SEARCH_F
 exports.SYSTEM_VISUAL_EXPORT_BEGIN = 'SYSTEM_VISUAL_EXPORT_BEGIN';
 exports.SYSTEM_VISUAL_EXPORT_END = 'SYSTEM_VISUAL_EXPORT_END';
 // Notes
-exports.SYSTEM_NOTESS_SHOW = 'SYSTEM_NOTES_SHOW';
-exports.SYSTEM_NOTS_HIDE = 'SYSTEM_NOTES_HIDE';
+exports.SYSTEM_CELL_POPUP_SHOW = 'SYSTEM_CELL_POPUP_SHOW';
+exports.SYSTEM_CELL_POPUP_HIDE = 'SYSTEM_CELL_POPUP_HIDE';
+exports.SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY = 'SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY';
+// Data Import
+exports.DATA_IMPORT_COMPLETED = 'DATA_IMPORT_COMPLETED';
 const SystemHighlightCellAdd = (cellHighlightInfo) => ({
     type: exports.SYSTEM_HIGHLIGHT_CELL_ADD,
     cellHighlightInfo: cellHighlightInfo,
@@ -365,16 +369,21 @@ const SystemQuickSearchFloatingVisibility = (visible) => ({
     visible,
 });
 exports.SystemQuickSearchFloatingVisibility = SystemQuickSearchFloatingVisibility;
-const SystemNotesShow = (cellPosition, editMode) => ({
-    type: exports.SYSTEM_NOTESS_SHOW,
+const SystemCellPopupShow = (cellPosition, editMode) => ({
+    type: exports.SYSTEM_CELL_POPUP_SHOW,
     editMode,
     cellPosition,
 });
-exports.SystemNotesShow = SystemNotesShow;
-const SystemNoteHide = () => ({
-    type: exports.SYSTEM_NOTS_HIDE,
+exports.SystemCellPopupShow = SystemCellPopupShow;
+const SystemCellPopupEditFocusedEntity = (focusedEntity) => ({
+    type: exports.SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY,
+    focusedEntity,
 });
-exports.SystemNoteHide = SystemNoteHide;
+exports.SystemCellPopupEditFocusedEntity = SystemCellPopupEditFocusedEntity;
+const SystemCellPopupHide = () => ({
+    type: exports.SYSTEM_CELL_POPUP_HIDE,
+});
+exports.SystemCellPopupHide = SystemCellPopupHide;
 const SystemDisableDeleteConfirmationSelector = (state) => {
     return state.DisableDeleteConfirmation;
 };
@@ -388,16 +397,26 @@ 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 SystemNotesSelector = (state) => {
+const SystemCommentsAndNotesSelector = (state) => {
+    var _a;
+    return (_a = state === null || state === void 0 ? void 0 : state.NotesAndComments) === null || _a === void 0 ? void 0 : _a.popupPosition;
+};
+exports.SystemCommentsAndNotesSelector = SystemCommentsAndNotesSelector;
+const SystemCommentsAndNotesEditModeSelector = (state) => {
     var _a;
-    return (_a = state === null || state === void 0 ? void 0 : state.Notes) === null || _a === void 0 ? void 0 : _a.popupPosition;
+    return (_a = state === null || state === void 0 ? void 0 : state.NotesAndComments) === null || _a === void 0 ? void 0 : _a.editMode;
 };
-exports.SystemNotesSelector = SystemNotesSelector;
-const SystemNotesEditModeSelector = (state) => {
+exports.SystemCommentsAndNotesEditModeSelector = SystemCommentsAndNotesEditModeSelector;
+const SystemCommentsAndNotesFocusedEntitySelector = (state) => {
     var _a;
-    return (_a = state === null || state === void 0 ? void 0 : state.Notes) === null || _a === void 0 ? void 0 : _a.editMode;
+    return (_a = state === null || state === void 0 ? void 0 : state.NotesAndComments) === null || _a === void 0 ? void 0 : _a.focusedEntity;
 };
-exports.SystemNotesEditModeSelector = SystemNotesEditModeSelector;
+exports.SystemCommentsAndNotesFocusedEntitySelector = SystemCommentsAndNotesFocusedEntitySelector;
+const DataImportCompleted = (dataImportedInfo) => ({
+    type: exports.DATA_IMPORT_COMPLETED,
+    dataImportedInfo: dataImportedInfo,
+});
+exports.DataImportCompleted = DataImportCompleted;
 const initialState = {
     AdaptableAlerts: GeneralConstants_1.EMPTY_ARRAY,
     AdaptableFlashingCells: {},
@@ -446,6 +465,7 @@ const initialState = {
     },
 };
 const SystemReducer = (state = initialState, action) => {
+    var _a;
     let alerts;
     let systemStatusMessages;
     switch (action.type) {
@@ -786,15 +806,27 @@ 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_NOTESS_SHOW: {
+        case exports.SYSTEM_CELL_POPUP_SHOW: {
             const typedAction = action;
-            return Object.assign(Object.assign({}, state), { Notes: {
-                    editMode: typedAction.editMode,
-                    popupPosition: typedAction.cellPosition,
-                } });
+            // reuse address refrence if we are editing the same cell
+            let newAddress = typedAction === null || typedAction === void 0 ? void 0 : typedAction.cellPosition;
+            const oldAddress = (_a = state === null || state === void 0 ? void 0 : state.NotesAndComments) === null || _a === void 0 ? void 0 : _a.popupPosition;
+            if (CellPopupService_1.CellPopupService.isSameAddress(oldAddress, typedAction.cellPosition)) {
+                newAddress = oldAddress;
+                // if edit mode is the same, just exist
+                if (typedAction.editMode === state.NotesAndComments.editMode) {
+                    return state;
+                }
+            }
+            return Object.assign(Object.assign({}, state), { NotesAndComments: Object.assign(Object.assign({}, state.NotesAndComments), { editMode: typedAction.editMode, popupPosition: newAddress }) });
+        }
+        case exports.SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY: {
+            const typedAction = action;
+            return Object.assign(Object.assign({}, state), { NotesAndComments: Object.assign(Object.assign({}, state.NotesAndComments), { focusedEntity: typedAction.focusedEntity }) });
         }
-        case exports.SYSTEM_NOTS_HIDE: {
-            return Object.assign(Object.assign({}, state), { Notes: {
+        case exports.SYSTEM_CELL_POPUP_HIDE: {
+            return Object.assign(Object.assign({}, state), { NotesAndComments: {
+                    editMode: false,
                     popupPosition: null,
                 } });
         }

package/src/Redux/Store/AdaptableStore.d.ts

@@ -1,9 +1,9 @@
 import * as Redux from 'redux';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { IAdaptableStore } from './Interface/IAdaptableStore';
-import { ConfigState } from '../../PredefinedConfig/ConfigState';
 import { AdaptableState } from '../../PredefinedConfig/AdaptableState';
+import { ConfigState } from '../../PredefinedConfig/ConfigState';
 import { PredefinedConfig } from '../../PredefinedConfig/PredefinedConfig';
+import { IAdaptableStore } from './Interface/IAdaptableStore';
 type EmitterCallback = (data?: any) => any;
 type EmitterAnyCallback = (eventName: string, data?: any) => any;
 export declare const INIT_STATE = "INIT_STATE";

package/src/Redux/Store/AdaptableStore.js

@@ -2,50 +2,51 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptableStore = exports.LoadState = exports.InitState = exports.LOAD_STATE = exports.INIT_STATE = void 0;
 const tslib_1 = require("tslib");
-const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const Redux = tslib_1.__importStar(require("redux"));
-const AdaptableReduxLocalStorageEngine_1 = require("./AdaptableReduxLocalStorageEngine");
-const AdaptableReduxMerger_1 = require("./AdaptableReduxMerger");
+const Enums_1 = require("../../PredefinedConfig/Common/Enums");
+const PluginsRedux = tslib_1.__importStar(require("../ActionsReducers/PluginsRedux"));
 const PopupRedux = tslib_1.__importStar(require("../ActionsReducers/PopupRedux"));
 const PopupRedux_1 = require("../ActionsReducers/PopupRedux");
-const PluginsRedux = tslib_1.__importStar(require("../ActionsReducers/PluginsRedux"));
+const AdaptableReduxLocalStorageEngine_1 = require("./AdaptableReduxLocalStorageEngine");
+const AdaptableReduxMerger_1 = require("./AdaptableReduxMerger");
+const AdaptableAlert_1 = require("../../PredefinedConfig/Common/AdaptableAlert");
+const ConfigConstants = tslib_1.__importStar(require("../../Utilities/Constants/ConfigConstants"));
+const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
+const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
+const Emitter_1 = tslib_1.__importDefault(require("../../Utilities/Emitter"));
+const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
+const PreviewHelper_1 = require("../../Utilities/Helpers/PreviewHelper");
+const ObjectFactory_1 = require("../../Utilities/ObjectFactory");
+const AdaptableToaster_1 = require("../../View/Components/Popups/AdaptableToaster");
 const AlertRedux = tslib_1.__importStar(require("../ActionsReducers/AlertRedux"));
-const FlashingCellRedux = tslib_1.__importStar(require("../ActionsReducers/FlashingCellRedux"));
-const SmartEditRedux = tslib_1.__importStar(require("../ActionsReducers/SmartEditRedux"));
+const ApplicationRedux = tslib_1.__importStar(require("../ActionsReducers/ApplicationRedux"));
 const BulkUpdateRedux = tslib_1.__importStar(require("../ActionsReducers/BulkUpdateRedux"));
-const CustomSortRedux = tslib_1.__importStar(require("../ActionsReducers/CustomSortRedux"));
 const CalculatedColumnRedux = tslib_1.__importStar(require("../ActionsReducers/CalculatedColumnRedux"));
-const ShortcutRedux = tslib_1.__importStar(require("../ActionsReducers/ShortcutRedux"));
-const GridRedux = tslib_1.__importStar(require("../ActionsReducers/GridRedux"));
-const SystemRedux = tslib_1.__importStar(require("../ActionsReducers/SystemRedux"));
-const SystemRedux_1 = require("../ActionsReducers/SystemRedux");
-const PlusMinusRedux = tslib_1.__importStar(require("../ActionsReducers/PlusMinusRedux"));
+const ChartingRedux = tslib_1.__importStar(require("../ActionsReducers/ChartingRedux"));
+const CommentsRedux = tslib_1.__importStar(require("../ActionsReducers/CommentsRedux"));
+const CustomSortRedux = tslib_1.__importStar(require("../ActionsReducers/CustomSortRedux"));
+const DashboardRedux = tslib_1.__importStar(require("../ActionsReducers/DashboardRedux"));
 const ExportRedux = tslib_1.__importStar(require("../ActionsReducers/ExportRedux"));
-const QuickSearchRedux = tslib_1.__importStar(require("../ActionsReducers/QuickSearchRedux"));
-const ThemeRedux = tslib_1.__importStar(require("../ActionsReducers/ThemeRedux"));
+const FlashingCellRedux = tslib_1.__importStar(require("../ActionsReducers/FlashingCellRedux"));
 const FormatColumnRedux = tslib_1.__importStar(require("../ActionsReducers/FormatColumnRedux"));
-const StyledColumnRedux = tslib_1.__importStar(require("../ActionsReducers/StyledColumnRedux"));
-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 GridRedux = tslib_1.__importStar(require("../ActionsReducers/GridRedux"));
 const LayoutRedux = tslib_1.__importStar(require("../ActionsReducers/LayoutRedux"));
-const DashboardRedux = tslib_1.__importStar(require("../ActionsReducers/DashboardRedux"));
-const ToolPanelRedux = tslib_1.__importStar(require("../ActionsReducers/ToolPanelRedux"));
-const ScheduleRedux = tslib_1.__importStar(require("../ActionsReducers/ScheduleRedux"));
-const TeamSharingRedux = tslib_1.__importStar(require("../ActionsReducers/TeamSharingRedux"));
 const NamedQueryRedux = tslib_1.__importStar(require("../ActionsReducers/NamedQueryRedux"));
+const NotesRedux = tslib_1.__importStar(require("../ActionsReducers/NotesRedux"));
+const PlusMinusRedux = tslib_1.__importStar(require("../ActionsReducers/PlusMinusRedux"));
 const QueryRedux = tslib_1.__importStar(require("../ActionsReducers/QueryRedux"));
+const QuickSearchRedux = tslib_1.__importStar(require("../ActionsReducers/QuickSearchRedux"));
+const ScheduleRedux = tslib_1.__importStar(require("../ActionsReducers/ScheduleRedux"));
+const ShortcutRedux = tslib_1.__importStar(require("../ActionsReducers/ShortcutRedux"));
+const SmartEditRedux = tslib_1.__importStar(require("../ActionsReducers/SmartEditRedux"));
 const StatusBarRedux = tslib_1.__importStar(require("../ActionsReducers/StatusBarRedux"));
-const ChartingRedux = tslib_1.__importStar(require("../ActionsReducers/ChartingRedux"));
-const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const ConfigConstants = tslib_1.__importStar(require("../../Utilities/Constants/ConfigConstants"));
-const ObjectFactory_1 = require("../../Utilities/ObjectFactory");
-const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
-const PreviewHelper_1 = require("../../Utilities/Helpers/PreviewHelper");
-const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
-const Emitter_1 = tslib_1.__importDefault(require("../../Utilities/Emitter"));
-const AdaptableAlert_1 = require("../../PredefinedConfig/Common/AdaptableAlert");
-const AdaptableToaster_1 = require("../../View/Components/Popups/AdaptableToaster");
+const StyledColumnRedux = tslib_1.__importStar(require("../ActionsReducers/StyledColumnRedux"));
+const SystemRedux = tslib_1.__importStar(require("../ActionsReducers/SystemRedux"));
+const SystemRedux_1 = require("../ActionsReducers/SystemRedux");
+const TeamSharingRedux = tslib_1.__importStar(require("../ActionsReducers/TeamSharingRedux"));
+const ThemeRedux = tslib_1.__importStar(require("../ActionsReducers/ThemeRedux"));
+const ToolPanelRedux = tslib_1.__importStar(require("../ActionsReducers/ToolPanelRedux"));
 const TeamSharingState_1 = require("../../PredefinedConfig/TeamSharingState");
 exports.INIT_STATE = 'INIT_STATE';
 exports.LOAD_STATE = 'LOAD_STATE';
@@ -149,6 +150,7 @@ class AdaptableStore {
             Charting: ChartingRedux.ChartingReducer,
             StyledColumn: StyledColumnRedux.StyledColumnReducer,
             Notes: NotesRedux.NotesReducer,
+            Comment: CommentsRedux.CommentsReducer,
             Query: QueryRedux.QueryReducer,
             NamedQuery: NamedQueryRedux.NamedQueryReducer,
         };
@@ -201,6 +203,7 @@ class AdaptableStore {
             ConfigConstants.GRID,
             ConfigConstants.POPUP,
             ConfigConstants.PLUGINS,
+            ConfigConstants.COMMENT,
         ];
         const didPersistentStateChange = (state, newState) => {
             return Object.keys(newState).some((key) => {
@@ -279,7 +282,7 @@ exports.AdaptableStore = AdaptableStore;
 const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
     return function (next) {
         return function (action) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
             switch (action.type) {
                 /*******************
                  * NAMED QUERY ACTIONS
@@ -598,6 +601,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         adaptable.api.internalApi
                             .getCalculatedColumnExpressionService()
                             .createAggregatedScalarLiveValue(returnAction.calculatedColumn);
+                        adaptable.api.calculatedColumnApi.internalApi.fireCalculatedColumnChangedEvent(action.type, actionTyped.calculatedColumn);
                     }
                     adaptable.updateColDefsForSpecialColumns();
                     return returnAction;
@@ -623,6 +627,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     adaptable.api.internalApi
                         .getCalculatedColumnExpressionService()
                         .destroyAggregatedScalarLiveValue(returnAction.calculatedColumn);
+                    adaptable.api.calculatedColumnApi.internalApi.fireCalculatedColumnChangedEvent(action.type, actionTyped.calculatedColumn);
                     adaptable.updateColDefsForSpecialColumns();
                     return returnAction;
                 }
@@ -871,7 +876,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  * Note ACTIONS
                  *******************/
                 /**
-                 * Use Case: Comments has been edited/deleted/added
+                 * Use Case: Notes has been edited/deleted/added
                  * Action: Triangle can be removed/added
                  */
                 case NotesRedux.NOTES_ADD:
@@ -880,9 +885,72 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     let returnAction = next(action);
                     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;
+                }
+                /*******************
+                 * Comment ACTIONS
+                 *******************/
+                /**
+                 * 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 CommentsRedux.COMMENTS_CELL_DELETE:
+                case CommentsRedux.COMMENTS_CELL_ADD: {
+                    let returnAction = next(action);
+                    let node = null;
+                    let columnId = null;
+                    if ('cellAddress' in returnAction) {
+                        node = adaptable.api.gridApi.getRowNodeForPrimaryKey(returnAction.cellAddress.PrimaryKeyValue);
+                        columnId = returnAction.cellAddress.ColumnId;
                     }
+                    else if ('cellComments' in returnAction) {
+                        node = adaptable.api.gridApi.getRowNodeForPrimaryKey(returnAction.cellComments.PrimaryKeyValue);
+                        columnId = returnAction.cellComments.ColumnId;
+                    }
+                    if (node && columnId) {
+                        adaptable.refreshCells([node], [columnId], true);
+                        requestAnimationFrame(() => {
+                            var _a, _b;
+                            const commentThreads = adaptable.api.commentApi.getCommentThreads();
+                            adaptable.api.eventApi.emit('CommentsChanged', adaptable.api.commentApi.getCommentThreads());
+                            (_b = (_a = adaptable.api.optionsApi
+                                .getCommentsOptions()) === null || _a === void 0 ? void 0 : _a.persistCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, commentThreads);
+                        });
+                    }
+                    return returnAction;
+                }
+                case CommentsRedux.COMMENTS_LOAD: {
+                    const previousCommentThreads = adaptable.api.commentApi.getCommentThreads();
+                    let returnAction = next(action);
+                    const newCommentThreads = (_j = adaptable.api.commentApi.getCommentThreads()) !== null && _j !== void 0 ? _j : [];
+                    requestAnimationFrame(() => {
+                        let addedCommentThreads = [];
+                        let deletedCommentThreads = [];
+                        const prevCommentThreadsSet = new Set((previousCommentThreads !== null && previousCommentThreads !== void 0 ? previousCommentThreads : []).map((c) => c.Uuid));
+                        const newCommentThreadsSet = new Set((newCommentThreads !== null && newCommentThreads !== void 0 ? newCommentThreads : []).map((c) => c.Uuid));
+                        for (const commentThread of newCommentThreads) {
+                            if (!prevCommentThreadsSet.has(commentThread.Uuid)) {
+                                addedCommentThreads.push(commentThread);
+                            }
+                        }
+                        for (const commentThread of previousCommentThreads) {
+                            if (!newCommentThreadsSet.has(commentThread.Uuid)) {
+                                deletedCommentThreads.push(commentThread);
+                            }
+                        }
+                        // This cannot be called because it would trigger an infinite loop
+                        // adaptable.api.eventApi.emit('CommentsChanged', commentThreads);
+                        // refresh all comments cells to show or hide the triangle
+                        [...addedCommentThreads, ...deletedCommentThreads].forEach((commentThread) => {
+                            const node = adaptable.api.gridApi.getRowNodeForPrimaryKey(commentThread.PrimaryKeyValue);
+                            if (node && commentThread.ColumnId) {
+                                adaptable.refreshCells([node], [commentThread.ColumnId], true);
+                            }
+                        });
+                    });
                     return returnAction;
                 }
                 /*******************
@@ -913,13 +981,6 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 case ScheduleRedux.IPUSHPULL_SCHEDULE_UNSUSPEND:
                 case ScheduleRedux.IPUSHPULL_SCHEDULE_SUSPEND_ALL:
                 case ScheduleRedux.IPUSHPULL_SCHEDULE_UNSUSPEND_ALL:
-                case ScheduleRedux.GLUE42_SCHEDULE_ADD:
-                case ScheduleRedux.GLUE42_SCHEDULE_EDIT:
-                case ScheduleRedux.GLUE42_SCHEDULE_DELETE:
-                case ScheduleRedux.GLUE42_SCHEDULE_SUSPEND:
-                case ScheduleRedux.GLUE42_SCHEDULE_UNSUSPEND:
-                case ScheduleRedux.GLUE42_SCHEDULE_SUSPEND_ALL:
-                case ScheduleRedux.GLUE42_SCHEDULE_UNSUSPEND_ALL:
                 case ScheduleRedux.OPENFIN_SCHEDULE_ADD:
                 case ScheduleRedux.OPENFIN_SCHEDULE_EDIT:
                 case ScheduleRedux.OPENFIN_SCHEDULE_DELETE:
@@ -965,8 +1026,8 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     let returnAction = next(action);
                     const newLayoutState = middlewareAPI.getState().Layout;
                     adaptable.api.layoutApi.internalApi.fireLayoutChangedEvent(action.type, oldLayoutState, newLayoutState);
-                    const oldFilters = (_j = oldLayoutState.Layouts.find((l) => l.Name == oldLayoutState.CurrentLayout)) === null || _j === void 0 ? void 0 : _j.ColumnFilters;
-                    const newFilters = (_k = newLayoutState.Layouts.find((l) => l.Name == newLayoutState.CurrentLayout)) === null || _k === void 0 ? void 0 : _k.ColumnFilters;
+                    const oldFilters = (_k = oldLayoutState.Layouts.find((l) => l.Name == oldLayoutState.CurrentLayout)) === null || _k === void 0 ? void 0 : _k.ColumnFilters;
+                    const newFilters = (_l = newLayoutState.Layouts.find((l) => l.Name == newLayoutState.CurrentLayout)) === null || _l === void 0 ? void 0 : _l.ColumnFilters;
                     // Tell Grid to apply filtering if filters have been changed in a loaded Layout
                     if (adaptable.api.columnFilterApi.internalApi.areColumnFiltersDifferent(oldFilters, newFilters)) {
                         adaptable.applyColumnFiltering();
@@ -983,7 +1044,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             // tell grid the layout has been selected
                             adaptable.setLayout(currentLayout);
                         }
-                        if (!((_l = adaptable.adaptableOptions.layoutOptions) === null || _l === void 0 ? void 0 : _l.autoSaveLayouts)) {
+                        if (!((_m = adaptable.adaptableOptions.layoutOptions) === null || _m === void 0 ? void 0 : _m.autoSaveLayouts)) {
                             middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(currentLayout));
                         }
                     }
@@ -991,7 +1052,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         returnAction.type == LayoutRedux.LAYOUT_SAVE) {
                         const actionTyped = action;
                         // if autosave is false
-                        if (!((_m = adaptable.adaptableOptions.layoutOptions) === null || _m === void 0 ? void 0 : _m.autoSaveLayouts)) {
+                        if (!((_o = adaptable.adaptableOptions.layoutOptions) === null || _o === void 0 ? void 0 : _o.autoSaveLayouts)) {
                             // and the current layout is saved, make sure we also update the draft
                             if (actionTyped.layout.Name === newLayoutState.CurrentLayout) {
                                 middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(actionTyped.layout));

package/src/Strategy/CommentsModule.d.ts

@@ -0,0 +1,16 @@
+import { AdaptableApi } from '../Api/AdaptableApi';
+import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableModuleBase } from './AdaptableModuleBase';
+import { IModule } from './Interface/IModule';
+/**
+ * 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 {
+    private adaptable;
+    constructor(api: AdaptableApi);
+    isModuleAvailable(): boolean;
+    private loadComments;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    private getAddRemoveCommentsMenuItems;
+}

package/src/Strategy/CommentsModule.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CommentsModule = void 0;
+const tslib_1 = require("tslib");
+const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
+const ObjectFactory_1 = require("../Utilities/ObjectFactory");
+const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
+/**
+ * In the first iteration a cell can have only one note, the
+ * notes is a list to allow further development.
+ */
+class CommentsModule extends AdaptableModuleBase_1.AdaptableModuleBase {
+    constructor(api) {
+        super(ModuleConstants.CommentsModuleId, ModuleConstants.CommentsFriendlyName, 'comments', 'CommentsPopup', 'comments', api);
+        this.adaptable = api.internalApi.getAdaptableInstance();
+        this.adaptable.api.eventApi.on('AdaptableReady', () => this.handleAdaptableReady());
+        this.loadComments();
+    }
+    isModuleAvailable() {
+        const options = this.adaptable.api.optionsApi.getCommentsOptions();
+        if (!options || !options.persistCommentThreads || !options.loadCommentThreads) {
+            return false;
+        }
+        return super.isModuleAvailable();
+    }
+    async loadComments() {
+        var _a, _b;
+        const commentThreads = await ((_b = (_a = this.api.optionsApi
+            .getCommentsOptions()) === null || _a === void 0 ? void 0 : _a.loadCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        this.api.commentApi.loadCommentThreads(commentThreads);
+    }
+    addContextMenuItems(menuContext) {
+        var _a, _b;
+        if (!this.isModuleAvailable()) {
+            return undefined;
+        }
+        const items = [];
+        const isCellCommentable = (_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getCommentsOptions()) === null || _b === void 0 ? void 0 : _b.isCellCommentable;
+        if (!isCellCommentable ||
+            isCellCommentable({
+                adaptableApi: this.adaptable.api,
+                address: {
+                    PrimaryKeyValue: menuContext.primaryKeyValue,
+                    ColumnId: menuContext.adaptableColumn.columnId,
+                },
+                userName: this.adaptable.api.optionsApi.getUserName(),
+                adaptableId: this.adaptable.adaptableOptions.adaptableId,
+            })) {
+            items.push(...this.getAddRemoveCommentsMenuItems(menuContext));
+        }
+        return items;
+    }
+    getAddRemoveCommentsMenuItems(menuContext) {
+        const items = [];
+        // does not have note
+        const cellAddress = {
+            PrimaryKeyValue: menuContext.primaryKeyValue,
+            ColumnId: menuContext.adaptableColumn.columnId,
+        };
+        const comments = this.adaptable.api.commentApi.getComments(cellAddress);
+        if (comments) {
+            items.push(this.createColumnMenuItemClickFunction('Remove Comments', this.moduleInfo.Glyph, () => {
+                this.api.commentApi.deleteCommentThread(cellAddress);
+            }));
+        }
+        else {
+            items.push(this.createColumnMenuItemClickFunction('Add Comment', this.moduleInfo.Glyph, () => {
+                // add an empty one
+                this.api.commentApi.addCommentThread(Object.assign(Object.assign({}, cellAddress), { Comments: [] }));
+                requestAnimationFrame(() => {
+                    this.api.internalApi.getCellPopupService().showPopup({
+                        PrimaryKeyValue: menuContext.primaryKeyValue,
+                        ColumnId: menuContext.adaptableColumn.columnId,
+                    }, true);
+                    this.api.internalApi.getCellPopupService().editFocusedEntity('Comment');
+                });
+            }));
+        }
+        return items;
+    }
+}
+exports.CommentsModule = CommentsModule;

package/src/Strategy/LayoutModule.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { LayoutState, Layout } from '../PredefinedConfig/LayoutState';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
@@ -21,19 +22,26 @@ export declare class LayoutModule extends AdaptableModuleBase implements IModule
     private createViewPivotItemsMenuItem;
     getTeamSharingAction(): TeamSharingImportInfo<Layout>;
     toViewAll(): {
-        items: {
+        items: ({
             name: string;
             values: string[];
-        }[];
+        } | {
+            name: string;
+            view: JSX.Element;
+        })[];
         abObject: Layout;
     }[];
     toView(layout: Layout): {
-        items: {
+        items: ({
             name: string;
             values: string[];
-        }[];
+        } | {
+            name: string;
+            view: JSX.Element;
+        })[];
         abObject: Layout;
     };
     getViewProperties(): AdaptableModuleView;
     handleLayoutChange(): void;
+    getReferencedNamedQueryNames(layout: Layout): string[];
 }