@adaptabletools/adaptable 11.1.15 → 11.1.16

package/src/Strategy/LayoutModule.js

@@ -9,9 +9,17 @@ const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensio
 const LayoutRadioSelector_1 = require("../View/Layout/LayoutRadioSelector");
 const LayoutStatusBarSubPanelPopover_1 = require("../View/Layout/LayoutStatusBarSubPanelPopover");
 const EditCurrentLayoutButton_1 = require("../View/Layout/EditCurrentLayoutButton");
+const LayoutCloneButton_1 = require("../View/Layout/LayoutCloneButton");
 class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.LayoutModuleId, 'Layout', 'layout', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
+        this.api.eventApi.on('LayoutChanged', (layoutChangedInfo) => {
+            var _a;
+            if (layoutChangedInfo.newLayoutState.CurrentLayout !== ((_a = layoutChangedInfo.oldLayoutState) === null || _a === void 0 ? void 0 : _a.CurrentLayout)) {
+                // we are interested only if current layout was changed (is different from the previous one)
+                this.handleLayoutChange();
+            }
+        });
     }
     getModuleAdaptableObjects() {
         return this.api.layoutApi.getAllLayout();
@@ -136,7 +144,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     toView(layout) {
         var _a, _b, _c, _d, _e, _f, _g;
-        const maxColumnsToDisplay = (_d = (_c = (_b = (_a = this.api.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.layoutOptions) === null || _b === void 0 ? void 0 : _b.view) === null || _c === void 0 ? void 0 : _c.maxColumnsToDisplay) !== null && _d !== void 0 ? _d : 10;
+        const maxColumnsToDisplay = (_d = (_c = (_b = (_a = this.api.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.layoutOptions) === null || _b === void 0 ? void 0 : _b.viewOptions) === null || _c === void 0 ? void 0 : _c.maxColumnsToDisplay) !== null && _d !== void 0 ? _d : 10;
         const columnIdToFriendlyName = (columnId) => {
             return this.api.columnApi.getFriendlyNameFromColumnId(columnId);
         };
@@ -181,7 +189,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getViewProperties() {
         return {
-            actions: [LayoutRadioSelector_1.LayoutRadioSelector],
+            actions: [LayoutRadioSelector_1.LayoutRadioSelector, LayoutCloneButton_1.LayoutCloneButton],
             getDeleteAction: (layout) => {
                 // make sure we do not delete the last layout
                 if (this.getModuleAdaptableObjects().length === 1) {
@@ -211,5 +219,30 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             },
         };
     }
+    handleLayoutChange() {
+        // update objects associated with the current layout via the LayoutOptions.isObjectAssociatedWithLayout() method
+        if (!this.api.internalApi.getAdaptableOptions().layoutOptions.isObjectAvailableInLayout) {
+            // no need if no callback implementation is provided
+            return;
+        }
+        // PlusMinus
+        this.api.internalApi
+            .getModuleService()
+            .getModuleById('PlusMinus')
+            .checkListenToKeyDown();
+        // Shortcut
+        this.api.internalApi
+            .getModuleService()
+            .getModuleById('Shortcut')
+            .checkListenToKeyDown();
+        // Schedule
+        this.api.internalApi
+            .getModuleService()
+            .getModuleById('Schedule')
+            .setUpScheduleJobs();
+        // ConditionalStyle, CustomSort, FlashingCell, FormatColumn
+        // we need to refresh the column defs, as some configs may have changed
+        this.api.internalApi.getAdaptableInstance().setupColumns();
+    }
 }
 exports.LayoutModule = LayoutModule;

package/src/Strategy/PlusMinusModule.js

@@ -12,6 +12,7 @@ const ModuleConstants_1 = require("../Utilities/Constants/ModuleConstants");
 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");
 class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.PlusMinusModuleId, 'Plus Minus', 'plus-minus', 'PlusMinusPopup', 'Configure how a cell value will edit when the + or - keys are pressed', api);
@@ -46,13 +47,14 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
     }
     checkListenToKeyDown() {
-        if (!this.shouldHandleKeyDown) {
+        const oldShouldHandleKeyDown = this.shouldHandleKeyDown;
+        const newShouldHandleKeyDown = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(this.api.plusMinusApi.getAllPlusMinus());
+        if (!oldShouldHandleKeyDown && newShouldHandleKeyDown) {
             this.adaptable._on('KeyDown', (keyDownEvent) => {
                 this.handleKeyDown(keyDownEvent);
             });
         }
-        let plusMinusNudges = this.api.plusMinusApi.getAllPlusMinus();
-        this.shouldHandleKeyDown = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(plusMinusNudges);
+        this.shouldHandleKeyDown = newShouldHandleKeyDown;
     }
     addColumnMenuItems(column) {
         if (column && this.isModuleEditable() && column.dataType == 'Number') {
@@ -68,7 +70,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     handleKeyDown(keyEvent) {
         if (this.shouldHandleKeyDown) {
-            //it's a speacial key so we handle the string representation of the key '
+            //it's a special key so we handle the string representation of the key '
             let keyEventString = Helper_1.Helper.getStringRepresentionFromKey(keyEvent);
             if (keyEventString == '-' || keyEventString == '+') {
                 let plusMinusNudges = this.api.plusMinusApi.getAllActivePlusMinus();
@@ -197,6 +199,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     label: 'Nudge Value',
                     values: [plusMinus.NudgeValue],
                 },
+                getObjectTagsViewItems_1.getObjectTagsViewItems(plusMinus, this.api),
             ].filter(Boolean),
         };
     }

package/src/Strategy/QueryModule.d.ts

@@ -15,17 +15,11 @@ export declare class QueryModule extends AdaptableModuleBase implements IModule
     getReferencedNamedQueryNames(namedQuery: NamedQuery): string[];
     toView(query: NamedQuery): {
         abObject: NamedQuery;
-        items: {
-            name: string;
-            values: string[];
-        }[];
+        items: import("./Interface/IModule").AdaptableObjectItemView[];
     };
     toViewAll(): {
         abObject: NamedQuery;
-        items: {
-            name: string;
-            values: string[];
-        }[];
+        items: import("./Interface/IModule").AdaptableObjectItemView[];
     }[];
     getViewProperties(): {
         getDeleteAction: (namedQuery: NamedQuery) => QueryRedux.NamedQueryDeleteAction;

package/src/Strategy/QueryModule.js

@@ -7,6 +7,7 @@ const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/Mod
 const QueryRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/QueryRedux"));
 const NamedQueryWizard_1 = require("../View/Query/Wizard/NamedQueryWizard");
 const EditCurrentQueryButton_1 = require("../View/Query/EditCurrentQueryButton");
+const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class QueryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.QueryModuleId, 'Query', 'query', 'QueryPopup', 'Run real-time text-based queries using a wealth of powerful functions and operators', api);
@@ -39,6 +40,7 @@ class QueryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     name: 'Expression',
                     values: [query.BooleanExpression],
                 },
+                getObjectTagsViewItems_1.getObjectTagsViewItems(query, this.api),
             ],
         };
     }

package/src/Strategy/ScheduleModule.d.ts

@@ -1,14 +1,15 @@
 /// <reference types="react" />
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { AdaptableObjectView, IModule } from './Interface/IModule';
+import { AdaptableObjectView } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { BaseSchedule } from '../PredefinedConfig/Common/Schedule';
 import * as ScheduleRedux from '../Redux/ActionsReducers/ScheduleRedux';
-export declare class ScheduleModule extends AdaptableModuleBase implements IModule {
+import { IScheduleModule } from './Interface/IScheduleModule';
+export declare class ScheduleModule extends AdaptableModuleBase implements IScheduleModule {
     private scheduleJobs;
     constructor(api: AdaptableApi);
     handleAdaptableReady(): void;
-    setUpSechduleJobs(): void;
+    setUpScheduleJobs(): void;
     private addSchedule;
     private addMidnightRefreshSchedule;
     private getDateFromSchedule;

package/src/Strategy/ScheduleModule.js

@@ -10,6 +10,7 @@ const ScheduleWizard_1 = require("../View/Schedule/Wizard/ScheduleWizard");
 const ScheduleSettingsSummary_1 = require("../View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsSummary");
 const UIHelper_1 = tslib_1.__importDefault(require("../View/UIHelper"));
 const ScheduleRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/ScheduleRedux"));
+const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 const dateTimeouts = {};
 const NodeSchedule = {
     scheduleJob: (date, fn) => {
@@ -39,9 +40,9 @@ class ScheduleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.addMidnightRefreshSchedule();
     }
     handleAdaptableReady() {
-        this.setUpSechduleJobs();
+        this.setUpScheduleJobs();
     }
-    setUpSechduleJobs() {
+    setUpScheduleJobs() {
         this.clearAllJobs();
         //add schedules
         this.api.scheduleApi
@@ -148,6 +149,7 @@ class ScheduleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     name: 'Schedule',
                     values: [UIHelper_1.default.getScheduleDescription(schedule.Schedule)],
                 },
+                getObjectTagsViewItems_1.getObjectTagsViewItems(schedule, this.api),
             ],
         };
     }

package/src/Strategy/ShortcutModule.js

@@ -11,6 +11,7 @@ const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensi
 const ShortcutWizard_1 = require("../View/Shortcut/Wizard/ShortcutWizard");
 const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
 const getShortcutSettingsViewItems_1 = require("./Utilities/getShortcutSettingsViewItems");
+const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class ShortcutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ShortcutModuleId, 'Shortcut', 'shortcut', 'ShortcutPopup', 'Set up rules so cells update mathematically when keys are pressed in numeric cells', api);
@@ -74,7 +75,11 @@ class ShortcutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     toView(shortcut) {
         return {
             abObject: shortcut,
-            items: [getScopeViewItems_1.getScopeViewItems(shortcut.Scope, this.api), getShortcutSettingsViewItems_1.getShortcutSettingsViewItems(shortcut)],
+            items: [
+                getScopeViewItems_1.getScopeViewItems(shortcut.Scope, this.api),
+                getShortcutSettingsViewItems_1.getShortcutSettingsViewItems(shortcut),
+                getObjectTagsViewItems_1.getObjectTagsViewItems(shortcut, this.api),
+            ],
         };
     }
     toViewAll() {

package/src/Strategy/StatusBarModule.d.ts

@@ -1,8 +1,9 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
+import { GridOptions } from '@ag-grid-community/all-modules';
 export declare class StatusBarModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    syncStateWithOptions(): void;
+    syncStateWithOptions(agGridAdaptablePanels: GridOptions['statusBar']['statusPanels']): void;
     isModuleAvailable(): boolean;
 }

package/src/Strategy/StatusBarModule.js

@@ -8,8 +8,7 @@ class StatusBarModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.StatusBarModuleId, 'Status Bar', 'statusbar', 'StatusBarPopup', 'Configure AdapTable Status Bar', api);
     }
-    syncStateWithOptions() {
-        const agGridStatusPanels = this.api.statusBarApi.getAgGridStatusPanels();
+    syncStateWithOptions(agGridAdaptablePanels) {
         const statusPanelsState = this.api.statusBarApi.getStatusPanels();
         /**
          * Grid config determines how many adaptable status panels are rendered.
@@ -17,7 +16,7 @@ class StatusBarModule extends AdaptableModuleBase_1.AdaptableModuleBase {
          * - if a status panel is removed from ag-grid, it's sub-panels are made available;
          * - if a new status panel is added it is added to state with an empty list
          */
-        const newStatusPanelsState = agGridStatusPanels.map((agGridStatusPanel) => {
+        const newStatusPanelsState = agGridAdaptablePanels.map((agGridStatusPanel) => {
             let statusPanelState = statusPanelsState.find((statusPanel) => statusPanel.Key === agGridStatusPanel.key);
             // no state found
             if (!statusPanelState) {

package/src/Strategy/Utilities/getObjectTagsViewItems.d.ts

@@ -0,0 +1,4 @@
+import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableApi } from '../../Api/AdaptableApi';
+import { AdaptableObjectItemView } from '../Interface/IModule';
+export declare const getObjectTagsViewItems: (object: AdaptableObject, api: AdaptableApi) => AdaptableObjectItemView;

package/src/Strategy/Utilities/getObjectTagsViewItems.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getObjectTagsViewItems = void 0;
+const ObjectTagsWizardSection_1 = require("../../View/Wizard/ObjectTagsWizardSection");
+exports.getObjectTagsViewItems = (object, api) => {
+    if (!api.internalApi.shouldDisplayTagSections()) {
+        return;
+    }
+    return {
+        name: 'Tags',
+        view: () => ObjectTagsWizardSection_1.renderObjectTagsSummary(object),
+    };
+};

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -25,6 +25,7 @@ exports.DefaultAdaptableOptions = {
         maxAlertsInStore: 20,
         cellHighlightDuration: 2000,
         rowHighlightDuration: 4000,
+        statusbarHighlightDuration: 2000,
         dataChangeDetectionPolicy: 'rawValue',
         actionHandlers: undefined,
     },
@@ -133,7 +134,7 @@ exports.DefaultAdaptableOptions = {
         autoSizeColumnsInLayout: false,
         autoSizeColumnsInPivotLayout: false,
         createDefaultLayout: false,
-        view: {
+        viewOptions: {
             maxColumnsToDisplay: 10,
         },
     },

package/src/Utilities/Emitter.d.ts

@@ -4,6 +4,7 @@ export declare type EmitterAnyCallback = (eventName: string, data?: any) => any;
 declare class Emittery {
     static mixin(emitteryPropertyName: string, methodNames: string[]): (target: any) => any;
     constructor();
+    destroy(): void;
     on(eventName: string, listener: EmitterCallback): any;
     off(eventName: string, listener: EmitterCallback): void;
     once(eventName: string): Promise<unknown>;

package/src/Utilities/Emitter.js

@@ -80,6 +80,15 @@ class Emittery {
         eventsMap.set(this, new Map());
         triggeredMap.set(this, new Map());
     }
+    destroy() {
+        this.clearListeners();
+        // should not be needed, since those maps are weak
+        // but let's do it anyway - some of our users suggested this Emitter class
+        // could be a source of memory leaks, so let's clean this up
+        anyMap.delete(this);
+        eventsMap.delete(this);
+        triggeredMap.delete(this);
+    }
     on(eventName, listener) {
         assertEventName(eventName);
         assertListener(listener);

package/src/Utilities/Extensions/TypeExtensions.d.ts

@@ -41,4 +41,6 @@ export declare type XOR<FirstType, SecondType> = FirstType | SecondType extends
 export declare type RequireAtLeastOne<T, Keys extends keyof T = keyof T> = Pick<T, Exclude<keyof T, Keys>> & {
     [K in Keys]-?: Required<Pick<T, K>> & Partial<Pick<T, Exclude<Keys, K>>>;
 }[Keys];
+/** Similar to the builtin Extract, but checks the filter strictly */
+export declare type StrictExtract<T, U extends Partial<T>> = Extract<T, U>;
 export {};

package/src/Utilities/Interface/MessagePopups.d.ts

@@ -3,7 +3,7 @@ import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupP
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
 import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
-import { AdaptableForm, ButtonContext } from '../../types';
+import { AdaptableForm, BaseContext } from '../../types';
 export interface UIConfirmation {
     Header: string;
     Msg: string;
@@ -79,7 +79,7 @@ export interface FormPopup {
         /**
          * Allows to customise the context before submitting the form
          */
-        prepareContext?: (context: ButtonContext) => Promise<ButtonContext> | ButtonContext;
-        Form: AdaptableForm<ButtonContext>;
+        prepareContext?: (context: BaseContext) => Promise<BaseContext> | BaseContext;
+        Form: AdaptableForm<BaseContext>;
     }[];
 }

package/src/Utilities/ObjectFactory.d.ts

@@ -19,7 +19,7 @@ import { IPushPullReport } from '../PredefinedConfig/SystemState';
 import { IPushPullSchedule } from '../PredefinedConfig/IPushPullState';
 import { OpenFinSchedule, OpenFinReport } from '../PredefinedConfig/OpenFinState';
 import { NamedQuery } from '../PredefinedConfig/QueryState';
-import { ColumnFilter } from '../PredefinedConfig/FilterState';
+import { ColumnFilter, SystemFilterPredicateId } from '../PredefinedConfig/FilterState';
 import { ReminderSchedule } from '../PredefinedConfig/ScheduleState';
 import { AdaptableCellChangedAlert, AdaptableGenericAlert, AdaptableRowChangedAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
@@ -63,7 +63,7 @@ export declare function CreateEmptyLayout(layout?: Partial<Layout> & {
 export declare function CreateEmptyStyle(): AdaptableStyle;
 export declare function CreateSystemStatusMessageInfo(message: string, type: AdaptableMessageType, furtherInfo?: string): SystemStatusMessageInfo;
 export declare function CreateEmptyCellSummmary(): CellSummmary;
-export declare function CreateColumnFilter(ColumnId: string, PredicateId: string, Inputs: any[]): ColumnFilter;
+export declare function CreateColumnFilter(ColumnId: string, PredicateId: SystemFilterPredicateId, Inputs: any[]): ColumnFilter;
 export declare function CreateToastOptions(notificationsOptions: NotificationsOptions, { onClose }?: {
     onClose?: VoidFunction;
 }): ToastOptions;

package/src/Utilities/Services/AlertService.js

@@ -52,7 +52,7 @@ class AlertService {
         }
     }
     destroy() {
-        this.emitter.clearListeners();
+        this.emitter.destroy();
         this.emitter = null;
         this.reactiveAlertsMap.forEach((alertsSubscriptionInfo) => alertsSubscriptionInfo.subscription.unsubscribe());
     }

package/src/Utilities/Services/DataService.js

@@ -58,7 +58,7 @@ class DataService {
         return result;
     }
     destroy() {
-        this.emitter.clearListeners();
+        this.emitter.destroy();
         this.emitter = null;
     }
     getUndoChangeKey(primaryKeyValue, columnId, previousValue, newValue) {

package/src/Utilities/Services/Interface/IModuleService.d.ts

@@ -8,7 +8,7 @@ export interface IModuleService extends IAdaptableService {
     isModuleEditable(adaptableModule: AdaptableModule): boolean;
     createModuleMenus(): void;
     getTeamSharingAction(adaptableModule: AdaptableModule): TeamSharingImportInfo<AdaptableObject> | undefined;
-    getModuleById(adaptableModule: AdaptableModule): IModule | undefined;
+    getModuleById<T = IModule>(adaptableModule: AdaptableModule): T | undefined;
     getModuleInfoByModule(adaptableModule: AdaptableModule): ModuleInfo | undefined;
     getModuleInfoByFriendlyName(friendlyName: string): ModuleInfo | undefined;
     getModuleDocumentationPageByModule(adaptableModule: AdaptableModule): string;

package/src/Utilities/Services/ModuleService.d.ts

@@ -11,7 +11,7 @@ export declare class ModuleService implements IModuleService {
     isModuleAvailable(adaptableModule: AdaptableModule): boolean;
     isModuleEditable(adaptableModule: AdaptableModule): boolean;
     getTeamSharingAction(adaptableModule: AdaptableModule): TeamSharingImportInfo<AdaptableObject> | undefined;
-    getModuleById(adaptableModule: AdaptableModule): IModule | undefined;
+    getModuleById<T = IModule>(adaptableModule: AdaptableModule): T | undefined;
     getModuleInfoByModule(adaptableModule: AdaptableModule): ModuleInfo | undefined;
     getModuleInfoByFriendlyName(friendlyName: string): ModuleInfo | undefined;
     getPopupMaxWidth(adaptableModule: AdaptableModule): number | undefined;

package/src/Utilities/Services/ModuleService.js

@@ -52,6 +52,7 @@ class ModuleService {
         return module.getTeamSharingAction();
     }
     getModuleById(adaptableModule) {
+        // @ts-ignore TODO: make modules generic
         return this.getModuleCollection().get(adaptableModule);
     }
     getModuleInfoByModule(adaptableModule) {

package/src/View/Alert/AlertStatusSubPanel.js

@@ -16,6 +16,7 @@ exports.AlertStatusPanel = () => {
     const [style, setStyle] = React.useState(initialStyle);
     const dispatch = react_redux_1.useDispatch();
     const module = adaptable.ModuleService.getModuleById(ModuleConstants.AlertModuleId);
+    const statusbarHighlightDuration = adaptable.adaptableOptions.alertOptions.statusbarHighlightDuration;
     /**
      * Using a selector to so the component updates each time an alert is triggered.
      */
@@ -46,7 +47,7 @@ exports.AlertStatusPanel = () => {
          */
         timeoutId.current = setTimeout(() => {
             setStyle(initialStyle);
-        }, 2000);
+        }, statusbarHighlightDuration);
     }, [alerts]);
     // Dropdown content
     const handleDeleteAlert = React.useCallback((alert) => dispatch(SystemRedux.SystemAlertDelete(alert)), []);

package/src/View/Alert/Wizard/AlertWizard.js

@@ -19,6 +19,7 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/Obje
 const react_redux_1 = require("react-redux");
 const AlertRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/AlertRedux"));
 const AdaptableContext_1 = require("../../AdaptableContext");
+const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
 exports.AlertWizard = (props) => {
     const [alertDefinition, setAlertDefinition] = react_1.useState(() => {
         var _a;
@@ -159,6 +160,14 @@ exports.AlertWizard = (props) => {
                     React.createElement(AlertBehaviourWizardSection_1.AlertBehaviourWizardSection, { onChange: setAlertDefinition }))),
                 renderSummary: AlertBehaviourWizardSection_1.renderAlertBehaviourSummary,
             },
+            {
+                details: 'Select Alert tags',
+                title: 'Tags',
+                isVisible: () => api.internalApi.shouldDisplayTagSections(),
+                render: () => (React.createElement(rebass_1.Box, { padding: 2 },
+                    React.createElement(ObjectTagsWizardSection_1.ObjectTagsWizardSection, { onChange: setAlertDefinition }))),
+                renderSummary: ObjectTagsWizardSection_1.renderObjectTagsSummary,
+            },
             '-',
             {
                 details: 'Review your Alert',

package/src/View/CalculatedColumn/Wizard/CalculatedColumnWizard.js

@@ -13,6 +13,7 @@ const AdaptableContext_1 = require("../../AdaptableContext");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
 const react_redux_1 = require("react-redux");
 const CalculatedColumnRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/CalculatedColumnRedux"));
+const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
 exports.CalculatedColumnWizard = (props) => {
     var _a;
     const adaptable = AdaptableContext_1.useAdaptable();
@@ -61,6 +62,14 @@ exports.CalculatedColumnWizard = (props) => {
                         React.createElement(CalculatedColumnSettingsWizardSection_1.CalculatedColumnSettingsWizardSection, { isEdit: isEdit, onChange: setCalculatedColumn })));
                 },
             },
+            {
+                details: 'Select Calculated Column tags',
+                title: 'Tags',
+                isVisible: () => adaptable.api.internalApi.shouldDisplayTagSections(),
+                render: () => (React.createElement(rebass_1.Box, { padding: 2 },
+                    React.createElement(ObjectTagsWizardSection_1.ObjectTagsWizardSection, { onChange: setCalculatedColumn }))),
+                renderSummary: ObjectTagsWizardSection_1.renderObjectTagsSummary,
+            },
             '-',
             {
                 render: () => {

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.js

@@ -53,6 +53,7 @@ exports.AdaptableObjectListItem = (props) => {
         return React.createElement(component, {
             data: props.data.abObject,
             key: index,
+            accessLevel,
         });
     });
     const isEditDisabled = !Boolean(EditWizard || viewOptions.onOpenEditPopup);

package/src/View/Components/FilterForm/FilterForm.js

@@ -146,7 +146,7 @@ class FilterFormComponent extends React.Component {
                 ' ',
                 this.state.showTab && React.createElement("hr", null),
                 predicateDefs
-                    .filter((p) => p.id != 'Values')
+                    .filter((p) => p.id !== 'Values' && p.id !== 'ExcludeValues')
                     .map((predicateDef, index) => this.renderColumnPredicate(predicateDef, index)))))))) : (React.createElement(HelpBlock_1.default, null, isFilterable))));
     }
     renderColumnPredicate(predicateDef, index) {

package/src/View/Components/FilterForm/QuickFilterForm.js

@@ -52,7 +52,7 @@ class QuickFilterFormComponent extends React.Component {
     }
     componentDidMount() {
         var _a, _b;
-        if (((_b = (_a = this.state) === null || _a === void 0 ? void 0 : _a.filter) === null || _b === void 0 ? void 0 : _b.Predicate.PredicateId) === 'Values') {
+        if (this.hasValuesPredicate((_b = (_a = this.state) === null || _a === void 0 ? void 0 : _a.filter) === null || _b === void 0 ? void 0 : _b.Predicate)) {
             this.loadPermittedValues();
         }
     }
@@ -65,7 +65,7 @@ class QuickFilterFormComponent extends React.Component {
             return;
         }
         this.setState({ filter });
-        if ((filter === null || filter === void 0 ? void 0 : filter.Predicate) && filter.Predicate.PredicateId === 'Values') {
+        if (this.hasValuesPredicate(filter === null || filter === void 0 ? void 0 : filter.Predicate)) {
             this.setState({ isDistinctColumnValuesLoading: true });
             this.loadPermittedValues();
         }
@@ -138,7 +138,7 @@ class QuickFilterFormComponent extends React.Component {
             showQuickFilterInput && this.renderPredicateInput(activePredicateDef, filter)));
     }
     renderLabel(filter, activePredicateDef) {
-        if ((filter === null || filter === void 0 ? void 0 : filter.Predicate.PredicateId) === 'Values') {
+        if (this.hasValuesPredicate(filter === null || filter === void 0 ? void 0 : filter.Predicate)) {
             if (ArrayExtensions_1.default.IsNullOrEmpty(filter.Predicate.Inputs) &&
                 ArrayExtensions_1.default.IsNullOrEmptyOrContainsSingleEmptyValue(this.state.distinctColumnValues)) {
                 return this.renderNoValuesDropdown(filter);
@@ -238,7 +238,7 @@ class QuickFilterFormComponent extends React.Component {
                         React.createElement(SimpleButton_1.default, { onClick: () => this.clearFilter() }, "Clear Filter"),
                         ((_a = this.props.api.internalApi.getAdaptableOptions().filterOptions) === null || _a === void 0 ? void 0 : _a.autoApplyFilter) ==
                             false && (React.createElement(SimpleButton_1.default, { ml: 2, onClick: () => this.updateFilter(this.state.filter) }, "Apply Filter"))),
-                    React.createElement(ListBoxFilterForm_1.ListBoxFilterForm, { suppressClientSideFilter: this.state.suppressClientSideFilter, isLoading: this.state.isDistinctColumnValuesLoading, onFilterChange: this.handleFilterChange, currentColumn: this.props.currentColumn, columns: [], columnDistinctValues: this.state.distinctColumnValues, dataType: this.props.currentColumn.dataType, uiSelectedColumnValues: this.state.filter.Predicate.Inputs, useAgGridStyle: true, onColumnValueSelectedChange: (list) => this.onColumnValuesChange(list) })));
+                    React.createElement(ListBoxFilterForm_1.ListBoxFilterForm, { suppressClientSideFilter: this.state.suppressClientSideFilter, isLoading: this.state.isDistinctColumnValuesLoading, onFilterChange: this.handleFilterChange, currentColumn: this.props.currentColumn, columns: [], columnDistinctValues: this.state.distinctColumnValues, dataType: this.props.currentColumn.dataType, uiSelectedColumnValues: this.state.filter.Predicate.Inputs.filter((input) => input !== ''), useAgGridStyle: true, onColumnValueSelectedChange: (list) => this.onColumnValuesChange(list) })));
             } },
             React.createElement(SimpleButton_1.default, { style: {
                     flex: 1,
@@ -248,12 +248,13 @@ class QuickFilterFormComponent extends React.Component {
                     borderRadius: 0,
                     borderLeftWidth: 0,
                     borderColor: 'var(--ab-color-primarydark)',
-                }, disabled: ArrayExtensions_1.default.IsNullOrEmptyOrContainsSingleEmptyValue(this.state.distinctColumnValues) }, filter.Predicate.Inputs.join(', ') || 'Select Values')));
+                }, disabled: ArrayExtensions_1.default.IsNullOrEmptyOrContainsSingleEmptyValue(this.state.distinctColumnValues) }, filter.Predicate.Inputs.join(', ') ||
+                (filter.Predicate.PredicateId === 'Values' ? 'Select Values' : 'Exclude Values'))));
     }
     onColumnValuesChange(columnValues) {
         var _a;
         const { filter } = this.state;
-        filter.Predicate = { PredicateId: 'Values', Inputs: columnValues };
+        filter.Predicate = { PredicateId: filter.Predicate.PredicateId, Inputs: columnValues };
         if ((_a = this.props.api.internalApi.getAdaptableOptions().filterOptions) === null || _a === void 0 ? void 0 : _a.autoApplyFilter) {
             this.updateFilter(filter);
         }
@@ -270,7 +271,7 @@ class QuickFilterFormComponent extends React.Component {
             Inputs: ((_a = predicateDef.inputs) !== null && _a !== void 0 ? _a : []).map((i) => { var _a; return (_a = i.defaultValue) !== null && _a !== void 0 ? _a : ''; }),
         };
         this.updateFilter(filter);
-        if (predicateId === 'Values') {
+        if (predicateId === 'Values' || predicateId === 'ExcludeValues') {
             this.loadPermittedValues();
             requestAnimationFrame(() => {
                 if (this.valuesDropdown) {
@@ -308,6 +309,9 @@ class QuickFilterFormComponent extends React.Component {
         const { filter } = this.state;
         this.props.api.filterApi.clearColumnFilterByColumn(filter.ColumnId);
     }
+    hasValuesPredicate(predicate) {
+        return (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'Values' || (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'ExcludeValues';
+    }
 }
 function mapStateToProps(state, ownProps) {
     return {

package/src/View/Components/FilterForm/getDefaultColumnFilterPredicate.d.ts

@@ -1,3 +1,3 @@
 import { AdaptableColumn } from '../../../PredefinedConfig/Common/AdaptableColumn';
 import { SystemFilterPredicateId } from '../../../PredefinedConfig/FilterState';
-export declare const getDefaultColumnFilterPredicate: (column: AdaptableColumn, defaultColumnFilter: "Before" | "After" | "Values" | "Blanks" | "NonBlanks" | "Equals" | "NotEquals" | "GreaterThan" | "LessThan" | "Positive" | "Negative" | "Zero" | "Between" | "NotBetween" | "Is" | "IsNot" | "Contains" | "NotContains" | "StartsWith" | "EndsWith" | "Regex" | "Today" | "Yesterday" | "Tomorrow" | "ThisWeek" | "ThisMonth" | "ThisQuarter" | "ThisYear" | "InPast" | "InFuture" | "InRange" | "On" | "NotOn" | "NextWorkDay" | "LastWorkDay" | "True" | "False" | "BooleanToggle" | ((column: AdaptableColumn) => SystemFilterPredicateId)) => SystemFilterPredicateId;
+export declare const getDefaultColumnFilterPredicate: (column: AdaptableColumn, defaultColumnFilter: "Before" | "After" | "Blanks" | "NonBlanks" | "Equals" | "NotEquals" | "GreaterThan" | "LessThan" | "Positive" | "Negative" | "Zero" | "Between" | "NotBetween" | "Is" | "IsNot" | "Contains" | "NotContains" | "StartsWith" | "EndsWith" | "Regex" | "Today" | "Yesterday" | "Tomorrow" | "ThisWeek" | "ThisMonth" | "ThisQuarter" | "ThisYear" | "InPast" | "InFuture" | "On" | "NotOn" | "NextWorkDay" | "LastWorkDay" | "True" | "False" | "Values" | "ExcludeValues" | "InRange" | "BooleanToggle" | ((column: AdaptableColumn) => SystemFilterPredicateId)) => SystemFilterPredicateId;

package/src/View/Components/Popups/AdaptableToaster.js

@@ -9,7 +9,9 @@ const react_toastify_1 = require("react-toastify");
 exports.showToast = (props) => {
     const toastProps = ObjectFactory_1.default.CreateToastOptions(props.api.internalApi.getAdaptableOptions().notificationsOptions, {
         onClose: () => {
-            props.api.internalApi.hidePopupAlert();
+            if (!props.api.isDestroyed()) {
+                props.api.internalApi.hidePopupAlert();
+            }
         },
     });
     const content = (React.createElement(AdaptablePopupAlert_1.AdaptablePopupAlert, Object.assign({ headless: true }, props, { onClose: () => {

package/src/View/Components/Popups/FormPopups/FormPopups.d.ts

@@ -1,10 +1,10 @@
 import * as React from 'react';
-import { AdaptableForm, ButtonContext } from '../../../../../types';
+import { AdaptableForm, BaseContext } from '../../../../../types';
 export interface FormDialogProps {
     id: string;
     formProps: any;
-    prepareContext: (context: ButtonContext) => Promise<ButtonContext> | ButtonContext;
-    form: AdaptableForm<ButtonContext>;
+    prepareContext: (context: BaseContext) => Promise<BaseContext> | BaseContext;
+    form: AdaptableForm<BaseContext>;
 }
 export declare const FormDialog: React.FunctionComponent<FormDialogProps>;
 export declare const FormPopups: React.FunctionComponent;

package/src/View/Components/TagValueSelector/index.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="react" />
+import { ValueSelectorProps } from '../ValueSelector';
+import { AdaptableObjectTag } from '../../../PredefinedConfig/Common/AdaptableObject';
+export interface TagsSelectorProps extends Omit<ValueSelectorProps<AdaptableObjectTag, string | number>, 'options' | 'value' | 'onChange' | 'allowReorder' | 'toIdentifier' | 'toLabel' | 'selectionBoxPosition' | 'noSelectionLabel' | 'xSelectedLabel'> {
+    availableTags?: AdaptableObjectTag[];
+    selectedTags?: AdaptableObjectTag[];
+    onChange: (selectedTags: AdaptableObjectTag[]) => void;
+}
+export declare const TagValueSelector: (props: TagsSelectorProps) => JSX.Element;
+export interface TagValueOptionsTagsProps {
+    tags?: AdaptableObjectTag[];
+}
+export declare const TagValueOptionsTags: (props: TagValueOptionsTagsProps) => JSX.Element;