@adaptabletools/adaptable-cjs 17.0.0-canary.3 → 18.0.0-canary.0

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[];
 }

package/src/Strategy/LayoutModule.js

@@ -18,6 +18,7 @@ const AggregationColumns_1 = require("../PredefinedConfig/Common/AggregationColu
 const windowFactory_1 = require("../View/Components/Popups/WindowPopups/windowFactory");
 const flattenDeep_1 = tslib_1.__importDefault(require("lodash/flattenDeep"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
+const getGridFilterPreview_1 = require("../View/Layout/Wizard/getGridFilterPreview");
 class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.LayoutModuleId, ModuleConstants.LayoutFriendlyName, 'grid', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
@@ -127,7 +128,6 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             [
                 ...this.api.scheduleApi.getReportSchedules(loadConfig),
                 ...this.api.scheduleApi.getReminderSchedules(loadConfig),
-                ...this.api.scheduleApi.getGlue42Schedules(loadConfig),
                 ...this.api.scheduleApi.getIPushPullSchedules(loadConfig),
                 ...this.api.scheduleApi.getOpenFinSchedules(loadConfig),
             ].forEach((schedule) => layoutAssociatedObjectReferences.push({
@@ -139,7 +139,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return teamSharingReferences;
     }
     hasNamedQueryReferences() {
-        return false;
+        return true;
     }
     handleAdaptableReady() {
         requestAnimationFrame(() => {
@@ -242,11 +242,13 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return returnColumnMenuItems;
     }
     createViewPivotItemsMenuItem(menuContext) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         // current group => menuContext.rowNode.field;
-        if (((_b = (_a = menuContext.selectedCellInfo) === null || _a === void 0 ? void 0 : _a.gridCells) === null || _b === void 0 ? void 0 : _b.length) !== 1) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        const selectedCellInfo = (_a = menuContext.selectedCellInfo) !== null && _a !== void 0 ? _a : this.api.gridApi.getSelectedCellInfo();
+        if (((_b = selectedCellInfo === null || selectedCellInfo === void 0 ? void 0 : selectedCellInfo.gridCells) === null || _b === void 0 ? void 0 : _b.length) !== 1) {
             return;
         }
+        const gridCell = (_c = menuContext.gridCell) !== null && _c !== void 0 ? _c : selectedCellInfo.gridCells[0];
         const currentLayout = this.api.layoutApi.getCurrentLayout();
         if (!currentLayout.EnablePivot) {
             return;
@@ -265,11 +267,11 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
          */
         // pivot_status_Booked_price
         // price
-        const aggColumn = (_f = (_e = (_d = (_c = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef) === null || _c === void 0 ? void 0 : _c.call(agGridColumn).pivotValueColumn) === null || _d === void 0 ? void 0 : _d.getColDef) === null || _e === void 0 ? void 0 : _e.call(_d)) === null || _f === void 0 ? void 0 : _f.field;
+        const aggColumn = (_g = (_f = (_e = (_d = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef) === null || _d === void 0 ? void 0 : _d.call(agGridColumn).pivotValueColumn) === null || _e === void 0 ? void 0 : _e.getColDef) === null || _f === void 0 ? void 0 : _f.call(_e)) === null || _g === void 0 ? void 0 : _g.field;
         // Booked
-        const pivotValue = (_j = (_h = (_g = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef) === null || _g === void 0 ? void 0 : _g.call(agGridColumn)) === null || _h === void 0 ? void 0 : _h.pivotKeys) === null || _j === void 0 ? void 0 : _j[0];
+        const pivotValue = (_k = (_j = (_h = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef) === null || _h === void 0 ? void 0 : _h.call(agGridColumn)) === null || _j === void 0 ? void 0 : _j.pivotKeys) === null || _k === void 0 ? void 0 : _k[0];
         // status - the preview works only with one column
-        const pivotColumnId = (_k = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.PivotColumns) === null || _k === void 0 ? void 0 : _k[0];
+        const pivotColumnId = (_l = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.PivotColumns) === null || _l === void 0 ? void 0 : _l[0];
         function getData(rows) {
             return [
                 ...rows.map((row) => {
@@ -282,9 +284,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         const data = (0, flattenDeep_1.default)(getData(menuContext.rowNode.childrenAfterFilter));
         const rowGroups = currentLayout.RowGroupedColumns;
-        const cellValue = isPivotColumn
-            ? menuContext.rowNode.aggData[columnId]
-            : menuContext.gridCell.displayValue;
+        const cellValue = isPivotColumn ? menuContext.rowNode.aggData[columnId] : gridCell.displayValue;
         const popupProps = {
             hasPivotValue: isPivotColumn,
             columnId,
@@ -392,10 +392,8 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         .filter(Boolean),
                 },
                 (layout === null || layout === void 0 ? void 0 : layout.GridFilter) &&
-                    StringExtensions_1.default.IsNotNullOrEmpty(layout.GridFilter.Expression) && {
-                    name: 'Grid Filter',
-                    values: [layout.GridFilter.Expression],
-                },
+                    StringExtensions_1.default.IsNotNullOrEmpty(layout.GridFilter.Expression) &&
+                    (0, getGridFilterPreview_1.getGridFilterViewItems)(layout),
             ].filter(Boolean),
             abObject: layout,
         };
@@ -443,5 +441,12 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         // we need to refresh the column defs, as some configs may have changed
         this.api.internalApi.getAdaptableInstance().setupColumns();
     }
+    getReferencedNamedQueryNames(layout) {
+        var _a;
+        if (!((_a = layout.GridFilter) === null || _a === void 0 ? void 0 : _a.Expression)) {
+            return [];
+        }
+        return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(layout.GridFilter.Expression);
+    }
 }
 exports.LayoutModule = LayoutModule;

package/src/Strategy/NotesModule.d.ts

@@ -1,23 +1,10 @@
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
-import { NoteGridCell } from '../types';
 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 NotesModule extends AdaptableModuleBase implements IModule {
     private adaptable;
     constructor(api: AdaptableApi);
-    isModuleAvailable(): boolean;
-    handleAdaptableReady(): void;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private getAddRemoveNoteMenuItems;
-    getCellPositionFromEvent(event: MouseEvent): null | {
-        PrimaryKeyValue: string | number;
-        ColumnId: string;
-    };
-    handleMouseEnter(event: MouseEvent): void;
-    handleCellSelected(noteGridCell: NoteGridCell): void;
 }

package/src/Strategy/NotesModule.js

@@ -4,37 +4,15 @@ exports.NotesModule = void 0;
 const tslib_1 = require("tslib");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 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 NotesModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.NotesModuleId, ModuleConstants.NotesFriendlyName, 'note', 'NotesPopup', 'Notes', api);
         this.adaptable = api.internalApi.getAdaptableInstance();
-        this.adaptable.api.eventApi.on('AdaptableReady', () => this.handleAdaptableReady());
-    }
-    isModuleAvailable() {
-        // FIXME remove this once Notes feature is public
-        return false;
-    }
-    handleAdaptableReady() {
-        if (!this.isModuleAvailable()) {
-            return;
-        }
-        this.adaptable._on('MouseEnter', (event) => this.handleMouseEnter(event));
-        this.api.eventApi.on('SelectionChanged', (params) => {
-            const cells = params.selectedCellInfo.gridCells;
-            if ((cells === null || cells === void 0 ? void 0 : cells.length) === 1) {
-                const selectedCell = cells[0];
-                const cellSelected = {
-                    PrimaryKeyValue: selectedCell.primaryKeyValue,
-                    ColumnId: selectedCell.column.columnId,
-                };
-                this.handleCellSelected(cellSelected);
-            }
-        });
     }
+    // isModuleAvailable(): boolean {
+    //   // FIXME remove this once Notes feature is public
+    //   return true;
+    // }
     addContextMenuItems(menuContext) {
         var _a, _b;
         if (!this.isModuleAvailable()) {
@@ -45,8 +23,10 @@ class NotesModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!isCellNotable ||
             isCellNotable({
                 adaptableApi: this.adaptable.api,
-                primaryKeyValue: menuContext.primaryKeyValue,
-                columnId: menuContext.adaptableColumn.columnId,
+                address: {
+                    PrimaryKeyValue: menuContext.primaryKeyValue,
+                    ColumnId: menuContext.adaptableColumn.columnId,
+                },
                 userName: this.adaptable.api.optionsApi.getUserName(),
                 adaptableId: this.adaptable.adaptableOptions.adaptableId,
             }))
@@ -70,7 +50,7 @@ class NotesModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             items.push(this.createColumnMenuItemClickFunction('Add Note', this.moduleInfo.Glyph, () => {
                 // add an empty one
                 this.api.notesApi.addNote('', menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
-                this.api.notesApi.showNotes({
+                this.api.internalApi.getCellPopupService().showPopup({
                     PrimaryKeyValue: menuContext.primaryKeyValue,
                     ColumnId: menuContext.adaptableColumn.columnId,
                 }, true);
@@ -78,64 +58,5 @@ class NotesModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return items;
     }
-    getCellPositionFromEvent(event) {
-        var _a, _b;
-        const target = event.target;
-        if (!((_b = (_a = target === null || target === void 0 ? void 0 : target.classList) === null || _a === void 0 ? void 0 : _a.contains) === null || _b === void 0 ? void 0 : _b.call(_a, 'ag-cell'))) {
-            return null;
-        }
-        try {
-            return {
-                PrimaryKeyValue: target.parentElement.getAttribute('row-id'),
-                ColumnId: target.getAttribute('col-id'),
-            };
-        }
-        catch (e) {
-            return null;
-        }
-    }
-    handleMouseEnter(event) {
-        var _a;
-        const editMode = this.adaptable.api.notesApi.getNotePopupEditMode();
-        if (editMode) {
-            // ignore
-            return;
-        }
-        const cellPosition = this.getCellPositionFromEvent(event);
-        const openNoteGridCell = this.adaptable.api.notesApi.getOpenNoteGridCell();
-        // Hovering over someting that is not a cell and there is no open note
-        if (!cellPosition && openNoteGridCell) {
-            // need to close if the new cell does not have a note
-            this.adaptable.api.notesApi.hideNote();
-        }
-        else if ((_a = this.adaptable.api.notesApi.getCellNotes(cellPosition)) === null || _a === void 0 ? void 0 : _a.length) {
-            this.adaptable.api.notesApi.showNotes(cellPosition, false);
-        }
-    }
-    handleCellSelected(noteGridCell) {
-        // if already opened - do nothing
-        const openNoteGridCell = this.adaptable.api.notesApi.getOpenNoteGridCell();
-        if ((openNoteGridCell === null || openNoteGridCell === void 0 ? void 0 : openNoteGridCell.PrimaryKeyValue) === noteGridCell.PrimaryKeyValue &&
-            (openNoteGridCell === null || openNoteGridCell === void 0 ? void 0 : openNoteGridCell.ColumnId) === noteGridCell.ColumnId) {
-            return;
-        }
-        // if open but this has no note, close
-        const cellNotes = this.adaptable.api.notesApi.getCellNotes(noteGridCell);
-        if (openNoteGridCell && !(cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length)) {
-            // hide only if in edit mode
-            // because if you select a cell and move the mouse fast over another cell
-            // with a note, you do not want to close that note
-            // the selection is debounced, so the moment goes over the new cell this event is triggered
-            if (this.adaptable.api.notesApi.getNotePopupEditMode()) {
-                this.adaptable.api.notesApi.hideNote();
-            }
-            return;
-        }
-        // if open but the new selection has a note open that one in edit mode (because of click)
-        if (openNoteGridCell && (cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length)) {
-            this.adaptable.api.notesApi.showNotes(noteGridCell, true);
-            return;
-        }
-    }
 }
 exports.NotesModule = NotesModule;

package/src/Strategy/PlusMinusModule.js

@@ -12,6 +12,7 @@ const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
 const PlusMinusWizard_1 = require("../View/PlusMinus/Wizard/PlusMinusWizard");
 const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
+const MovePlusMinus_1 = require("../View/PlusMinus/MovePlusMinus");
 class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.PlusMinusModuleId, ModuleConstants.PlusMinusFriendlyName, 'add-circle', 'PlusMinusPopup', 'Configure how a cell value will edit when the + or - keys are pressed', api);
@@ -218,6 +219,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getViewProperties() {
         return {
+            actions: [MovePlusMinus_1.MovePlusMinus],
             getEditAction: PlusMinusRedux.PlusMinusNudgeEdit,
             getDeleteAction: PlusMinusRedux.PlusMinusNudgeDelete,
             getSuspendAction: PlusMinusRedux.PlusMinusNudgeSuspend,