@adaptabletools/adaptable 23.0.0-canary.1 → 23.0.0-canary.10

package/src/Api/Internal/ThemeInternalApi.js

@@ -1,4 +1,3 @@
-import { SHOW_THEME_EDITOR } from '../../View/Components/Popups/WindowPopups/windowFactory';
 import { ApiBase } from '../Implementation/ApiBase';
 export class ThemeInternalApi extends ApiBase {
     isSystemTheme(themeName) {
@@ -12,13 +11,4 @@ export class ThemeInternalApi extends ApiBase {
     getDOMPreferredColorScheme() {
         return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
     }
-    openInWindow() {
-        this.getAdaptableInternalApi().showPopupWindow({
-            id: SHOW_THEME_EDITOR,
-            title: 'Theme',
-            icon: 'theme',
-            factoryId: SHOW_THEME_EDITOR,
-            popupProps: {},
-        });
-    }
 }

package/src/Api/LayoutApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableColumn, ColumnSort, ParameterizedAggFunc, PivotLayout, TableLayout } from '../../types';
+import { AdaptableColumn, ColumnSort, PivotLayout, TableLayout } from '../../types';
 import { ExtendedLayout } from '../AdaptableState/Common/ExtendedLayout';
 import { LayoutState, Layout } from '../AdaptableState/LayoutState';
 /**
@@ -180,11 +180,4 @@ export interface LayoutApi {
      * @param columnId Column to add
      */
     addColumnToCurrentLayout(columnId: string): void;
-    /**
-     * Sets a parameterized aggregation (e.g. Weighted Average with a weight column) on a value column
-     * in the current Layout and applies it to the grid.
-     * @param columnId Value column being aggregated
-     * @param parameterizedAgg Parameterized aggregation definition (must be complete)
-     */
-    setColumnParameterizedAggregation(columnId: string, parameterizedAgg: ParameterizedAggFunc): void;
 }

package/src/Api/ThemeApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableTheme, ThemeState } from '../AdaptableState/ThemeState';
+import { AdaptableTheme, SystemThemeEntry, ThemeState } from '../AdaptableState/ThemeState';
 /**
  * Provides run-time access to the Theme Module and associated state
  */
@@ -41,21 +41,24 @@ export interface ThemeApi {
      *
      * @param systemThemes system themes to use ('light', 'dark', both, or none)
      */
-    setSystemThemes(systemThemes: AdaptableTheme[]): void;
+    setSystemThemes(systemThemes: SystemThemeEntry[]): void;
     /**
      * Sets available User Themes
      *
      * @param userThemes User themes to set - each has name, description
+     * @deprecated Will be removed in the next major version.
      */
     setUserThemes(userThemes: AdaptableTheme[]): void;
     /**
      * Adds a User Theme to State
      * @param theme
+     * @deprecated Will be removed in the next major version.
      */
     addUserTheme(theme: AdaptableTheme): void;
     /**
      * Deletes a User Theme from State
      * @param theme
+     * @deprecated Will be removed in the next major version.
      */
     deleteUserTheme(theme: AdaptableTheme): void;
     /**
@@ -64,6 +67,7 @@ export interface ThemeApi {
     getSystemThemes(): AdaptableTheme[];
     /**
      * Retrieves User Themes in State
+     * @deprecated Will be removed in the next major version.
      */
     getUserThemes(): AdaptableTheme[];
     /**

package/src/Redux/ActionsReducers/ExportRedux.js

@@ -1,6 +1,6 @@
 import { EMPTY_ARRAY } from '../../Utilities/Constants/GeneralConstants';
 import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
-import { ensureExportStateSchedulesUuids, normalizeScheduledReportSchedule, replaceScheduledReportScheduleInList, } from '../../Utilities/Helpers/ScheduledReportHelper';
+import { ensureExportStateSchedulesUuids, normalizeScheduledReportSchedule, replaceScheduledReportScheduleInList, } from '../../Utilities/Helpers/Scheduling/ScheduledReportHelper';
 import { changeIsSuspendInList } from './utils';
 /**
  * @ReduxAction A Report has been selected

package/src/Redux/ActionsReducers/InternalRedux.js

@@ -2,7 +2,7 @@ import { EMPTY_ARRAY, EMPTY_STRING } from '../../Utilities/Constants/GeneralCons
 import { CELL_SUMMARY_DEFAULT_OPERATION } from '../../Utilities/Constants/ReduxConstants';
 import { MathOperation } from '../../AdaptableState/Common/Enums';
 import { cloneObject } from '../../Utilities/Helpers/Helper';
-import { getRuleAlertProperties } from '../../Utilities/Helpers/ScheduledAlertHelper';
+import { getRuleAlertProperties } from '../../Utilities/Helpers/Scheduling/ScheduledAlertHelper';
 import { AnnotationsService } from '../../Utilities/Services/AnnotationsService';
 /*
 Bit of a mixed bag of actions but essentially its those that are related to Strategies but where we DONT want to persist state

package/src/Redux/ActionsReducers/ThemeRedux.d.ts

@@ -1,5 +1,5 @@
 import * as Redux from 'redux';
-import { ThemeState, AdaptableTheme } from '../../AdaptableState/ThemeState';
+import { ThemeState, AdaptableTheme, SystemThemeEntry } from '../../AdaptableState/ThemeState';
 /**
  * @ReduxAction System Themes have been set
  */
@@ -29,7 +29,7 @@ export declare const THEME_ADD = "THEME_ADD";
  */
 export declare const THEME_DELETE = "THEME_DELETE";
 export interface ThemeSetSystemThemesAction extends Redux.Action {
-    SystemThemes: AdaptableTheme[];
+    SystemThemes: SystemThemeEntry[];
 }
 export interface ThemeSetUserThemesAction extends Redux.Action {
     UserThemes: AdaptableTheme[];
@@ -52,7 +52,7 @@ export interface ThemeAddUserThemeAction extends Redux.Action {
 export interface ThemeDeleteUserThemeAction extends Redux.Action {
     theme: AdaptableTheme;
 }
-export declare const ThemeSetSystemThemes: (SystemThemes: AdaptableTheme[]) => ThemeSetSystemThemesAction;
+export declare const ThemeSetSystemThemes: (SystemThemes: SystemThemeEntry[]) => ThemeSetSystemThemesAction;
 export declare const ThemeSetUserThemes: (UserThemes: AdaptableTheme[]) => ThemeSetUserThemesAction;
 export declare const ThemeSelect: (Theme: string) => ThemeSelectAction;
 export declare const ThemeReady: (themeState: ThemeState) => ThemeReadyAction;

package/src/Redux/Store/AdaptableReduxLocalStorageEngine.js

@@ -1,4 +1,4 @@
-import debounce from '../../Utilities/utils/debounce';
+import { debounce } from '../../Utilities/Helpers/TimingHelper';
 import { MergeStateFunction } from './AdaptableReduxMerger';
 import { AdaptableLogger } from '../../agGrid/AdaptableLogger';
 import { buildAdaptableStateFunctionConfig } from './buildAdaptableStateFunctionConfig';

package/src/Redux/Store/AdaptableReduxMerger.js

@@ -1,7 +1,5 @@
-import mergeWith from '../../Utilities/utils/mergeWith';
-import merge from '../../Utilities/utils/merge';
-import isArray from '../../Utilities/utils/isArray';
-import isObject from '../../Utilities/utils/isObject';
+import { isArray } from '../../Utilities/Extensions/ArrayExtensions';
+import { isObject, merge, mergeWith, } from '../../Utilities/Extensions/ObjectExtensions';
 import { AdaptableLogger } from '../../agGrid/AdaptableLogger';
 import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
 function customizer(objValue, srcValue) {

package/src/Redux/Store/AdaptableStore.js

@@ -5,9 +5,9 @@ import { PROGRESS_INDICATOR_HIDE, PROGRESS_INDICATOR_SHOW } from '../ActionsRedu
 import { createEngine as createEngineLocal } from './AdaptableReduxLocalStorageEngine';
 import { mergeReducer } from './AdaptableReduxMerger';
 import { isAdaptableCellChangedAlert, isAdaptableRowChangedAlert, } from '../../AdaptableState/Common/AdaptableAlert';
-import { closeAgChartDefinitionIfOpen, closeExternalChartDefinitionIfOpen, } from '../../Utilities/Helpers/chartingHelper';
-import { refreshScheduledAlertJobs, refreshScheduledReportJobs, } from '../../Utilities/Helpers/ScheduledJobsMiddlewareHelper';
-import { getRuleAlertProperties, isScheduledAlertDefinition, } from '../../Utilities/Helpers/ScheduledAlertHelper';
+import { closeAgChartDefinitionIfOpen, closeExternalChartDefinitionIfOpen, } from '../../Utilities/Helpers/ChartHelper';
+import { refreshScheduledAlertJobs, refreshScheduledReportJobs, } from '../../Utilities/Helpers/Scheduling/ScheduledJobsMiddlewareHelper';
+import { getRuleAlertProperties, isScheduledAlertDefinition, } from '../../Utilities/Helpers/Scheduling/ScheduledAlertHelper';
 import { ERROR_LAYOUT } from '../../Utilities/Constants/GeneralConstants';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import Emitter from '../../Utilities/Emitter';
@@ -905,10 +905,12 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 case InternalRedux.DATA_SET_SELECT: {
                     let returnAction = next(action);
                     const dataSet = adaptable.api.dataSetApi.getCurrentDataSet();
-                    adaptable.api.eventApi.internalApi.fireDataSetSelectedEvent(dataSet);
-                    requestAnimationFrame(() => {
-                        adaptable.api.dataSetApi.internalApi.showDataSetForm(dataSet);
-                    });
+                    if (dataSet) {
+                        adaptable.api.dataSetApi.internalApi.handleDataSetSelected(dataSet);
+                        requestAnimationFrame(() => {
+                            adaptable.api.dataSetApi.internalApi.showDataSetForm(dataSet);
+                        });
+                    }
                     return returnAction;
                 }
                 /*******************

package/src/Strategy/AdaptableModuleBase.d.ts

@@ -3,7 +3,7 @@ import { IModule, ModuleInfo, TeamSharingReferences } from './Interface/IModule'
 import { Action } from 'redux';
 import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
 import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
-import { MenuItemShowPopup, MenuItemDoReduxAction, MenuItemDoClickFunction } from '../Utilities/MenuItem';
+import { MenuItemShowPopup, MenuItemDoReduxAction, MenuItemDoClickFunction } from '../AdaptableState/Common/MenuItem';
 import { AdaptableMenuItem, AdaptableContextMenuItemName, ContextMenuContext, AdaptableColumnMenuItemName } from '../AdaptableState/Common/Menu';
 import { AdaptableModule } from '../AdaptableState/Common/Types';
 import { TeamSharingImportInfo } from '../AdaptableState/TeamSharingState';

package/src/Strategy/AdaptableModuleBase.js

@@ -1,4 +1,4 @@
-import { MenuItemShowPopup, MenuItemDoReduxAction, MenuItemDoClickFunction, } from '../Utilities/MenuItem';
+import { MenuItemShowPopup, MenuItemDoReduxAction, MenuItemDoClickFunction, } from '../AdaptableState/Common/MenuItem';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 import { ACCESS_LEVEL_FULL, ACCESS_LEVEL_HIDDEN, ACCESS_LEVEL_READ_ONLY, } from '../Utilities/Constants/GeneralConstants';
 /**

package/src/Strategy/AlertModule.d.ts

@@ -4,7 +4,7 @@ import { AdaptableAlert } from '../AdaptableState/Common/AdaptableAlert';
 import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
 import { ContextMenuContext } from '../AdaptableState/Common/Menu';
 import { TeamSharingImportInfo } from '../AdaptableState/TeamSharingState';
-import { MenuItemShowPopup } from '../Utilities/MenuItem';
+import { MenuItemShowPopup } from '../AdaptableState/Common/MenuItem';
 import { LayoutExtendedConfig } from '../types';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { ICellDataChangeListenerModule } from './Interface/ICellDataChangeListenerModule';

package/src/Strategy/AlertModule.js

@@ -15,8 +15,8 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { getAlertBehaviourViewItems } from './Utilities/Alert/getAlertBehaviourViewItems';
 import { getAlertPreviewViewItems } from './Utilities/Alert/getAlertPreviewViewItems';
 import { getAlertTypeViewItems } from './Utilities/Alert/getAlertTypeViewItems';
-import { getActiveScheduledAlertDefinitions, isRuleBasedAlertDefinition, isScheduledAlertDefinition, } from '../Utilities/Helpers/ScheduledAlertHelper';
-import { createScheduleJobManager } from '../Utilities/Helpers/ScheduleJobManager';
+import { getActiveScheduledAlertDefinitions, isRuleBasedAlertDefinition, isScheduledAlertDefinition, } from '../Utilities/Helpers/Scheduling/ScheduledAlertHelper';
+import { createScheduleJobManager } from '../Utilities/Helpers/Scheduling/ScheduleJobManager';
 import UIHelper from '../View/UIHelper';
 export class AlertModule extends AdaptableModuleBase {
     isListeningToCellDataChanges;

package/src/Strategy/BulkUpdateModule.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { BulkUpdateValidationResult, IBulkUpdateModule } from './Interface/IBulkUpdateModule';
 import { PreviewInfo } from '../Utilities/Interface/Preview';
-import { MenuItemShowPopup } from '../Utilities/MenuItem';
+import { MenuItemShowPopup } from '../AdaptableState/Common/MenuItem';
 import { ContextMenuContext } from '../AdaptableState/Common/Menu';
 import { AccessLevel, AdaptableApi } from '../types';
 export declare class BulkUpdateModule extends AdaptableModuleBase implements IBulkUpdateModule {

package/src/Strategy/CalculatedColumnModule.d.ts

@@ -20,8 +20,8 @@ export declare class CalculatedColumnModule extends AdaptableModuleBase implemen
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(calculatedColumn: CalculatedColumn): string[];
     getReferencedNamedQueryNames(calculatedColumn: CalculatedColumn): string[];
-    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
-    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
+    createColumnMenuItems(column: AdaptableColumn): import("../AdaptableState/Common/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
+    createContextMenuItems(menuContext: ContextMenuContext): import("../AdaptableState/Common/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
     getTeamSharingAction(): TeamSharingImportInfo<CalculatedColumn>;
     toView(calculateColumn: CalculatedColumn): {
         items: AdaptableObjectItemView[];

package/src/Strategy/CalculatedColumnModule.js

@@ -32,7 +32,9 @@ export class CalculatedColumnModule extends AdaptableModuleBase {
         this.api.internalApi
             .getDataService()
             .on('CellDataChanged', (cellDataChangedInfo) => {
-            if (cellDataChangedInfo.trigger !== 'aggChange' && !cellDataChangedInfo.preventEdit) {
+            if (cellDataChangedInfo.trigger !== 'aggChange' &&
+                cellDataChangedInfo.trigger !== 'calculatedColumnChange' &&
+                !cellDataChangedInfo.preventEdit) {
                 this.api.internalApi
                     .getCalculatedColumnExpressionService()
                     .listentoCellDataChange(cellDataChangedInfo);
@@ -113,6 +115,7 @@ export class CalculatedColumnModule extends AdaptableModuleBase {
                 name: 'Settings',
                 label: 'Column Id',
                 values: [calculateColumn.ColumnId],
+                tagVariant: 'column',
             },
             calculateColumn.FriendlyName && {
                 name: 'Settings',

package/src/Strategy/CellSummaryModule.d.ts

@@ -21,8 +21,8 @@ export declare class CellSummaryModule extends AdaptableModuleBase implements IC
     isModuleAvailable(): boolean;
     getModuleUnavailableMessage(): string | undefined;
     getViewAccessLevel(): AccessLevel;
-    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
-    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
+    createColumnMenuItems(column: AdaptableColumn): import("../AdaptableState/Common/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
+    createContextMenuItems(menuContext: ContextMenuContext): import("../AdaptableState/Common/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
     createCellSummaryInfo(selectedCellInfo: SelectedCellInfo): CellSummmaryInfo;
     private getNumberFormatOptions;
     private formatValue;

package/src/Strategy/ChartingModule.d.ts

@@ -9,7 +9,7 @@ export declare class ChartingModule extends AdaptableModuleBase implements IModu
     protected getAgGridModuleDependencies(): AgModuleName[];
     onAdaptableReady(): void;
     isModuleEnabled(): boolean;
-    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
+    createColumnMenuItems(column: AdaptableColumn): import("../AdaptableState/Common/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
     getModuleAdaptableObjects(): (ChartDefinition | ExternalChartDefinition)[];
     toViewAll(): AdaptableObjectView[];
     toView(chart: ChartDefinition | ExternalChartDefinition): AdaptableObjectView;

package/src/Strategy/ChartingModule.js

@@ -8,7 +8,7 @@ import { isAgChartDefinition, isExternalChartDefinition, } from '../AdaptableSta
 import Helper from '../Utilities/Helpers/Helper';
 import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
-import { openLayoutCharts, restoreChartsOnReady as restoreChartsOnReadyFromOptions, } from '../Utilities/Helpers/chartingHelper';
+import { openLayoutCharts, restoreChartsOnReady as restoreChartsOnReadyFromOptions, } from '../Utilities/Helpers/ChartHelper';
 export class ChartingModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ChartingModuleId, ModuleConstants.ChartingFriendlyName, 'chart', 'ChartPopup', 'Create AG Grid Charts in order to see Adaptable Data visually', api);

package/src/Strategy/ColumnFilterModule.js

@@ -153,6 +153,7 @@ export class ColumnFilterModule extends AdaptableModuleBase {
                 {
                     name: 'Column',
                     values: [this.api.columnApi.getFriendlyNameForColumnId(filter.ColumnId)],
+                    tagVariant: 'column',
                 },
                 {
                     name: 'Filter',

package/src/Strategy/ColumnInfoModule.d.ts

@@ -6,6 +6,6 @@ import { AdaptableColumn, ContextMenuContext } from '../types';
 export declare class ColumnInfoModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
-    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
+    createColumnMenuItems(column: AdaptableColumn): import("../AdaptableState/Common/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
+    createContextMenuItems(menuContext: ContextMenuContext): import("../AdaptableState/Common/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
 }

package/src/Strategy/CommentModule.d.ts

@@ -7,5 +7,5 @@ export declare class CommentModule extends AdaptableModuleBase implements IModul
     onAdaptableReady(): void;
     isModuleEnabled(): boolean;
     private loadComments;
-    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemDoClickFunction<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
+    createContextMenuItems(menuContext: ContextMenuContext): import("../AdaptableState/Common/MenuItem").MenuItemDoClickFunction<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
 }

package/src/Strategy/CustomSortModule.d.ts

@@ -11,7 +11,7 @@ export declare class CustomSortModule extends AdaptableModuleBase implements IMo
     getModuleAdaptableObjects(config?: LayoutExtendedConfig): AdaptableObject[];
     getExplicitlyReferencedColumnIds(customSort: CustomSort): string[];
     hasNamedQueryReferences(): boolean;
-    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"custom-sort-add" | "custom-sort-edit">[];
+    createColumnMenuItems(column: AdaptableColumn): import("../AdaptableState/Common/MenuItem").MenuItemShowPopup<"custom-sort-add" | "custom-sort-edit">[];
     getTeamSharingAction(): TeamSharingImportInfo<CustomSort>;
     toView(customSort: CustomSort): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];

package/src/Strategy/ExportModule.js

@@ -9,8 +9,8 @@ import { ExportSchedulesTab } from '../View/Export/ExportSchedulesTab';
 import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
 import { ExportStatusBar } from '../View/Export/ExportStatusBar';
 import { ReportListItem } from '../View/Export/ReportListItem';
-import { exportStateNeedsScheduleUuids, getScheduledReports, } from '../Utilities/Helpers/ScheduledReportHelper';
-import { createScheduleJobManager } from '../Utilities/Helpers/ScheduleJobManager';
+import { exportStateNeedsScheduleUuids, getScheduledReports, } from '../Utilities/Helpers/Scheduling/ScheduledReportHelper';
+import { createScheduleJobManager } from '../Utilities/Helpers/Scheduling/ScheduleJobManager';
 export class ExportModule extends AdaptableModuleBase {
     scheduledReportJobManager;
     constructor(api) {

package/src/Strategy/FlashingCellModule.d.ts

@@ -19,7 +19,7 @@ export declare class FlashingCellModule extends AdaptableModuleBase implements I
     getModuleAdaptableObjects(config?: LayoutExtendedConfig): AdaptableObject[];
     getExplicitlyReferencedColumnIds(alertDefinition: FlashingCellDefinition): string[];
     getReferencedNamedQueryNames(alertDefinition: FlashingCellDefinition): string[];
-    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemDoReduxAction<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
+    createColumnMenuItems(column: AdaptableColumn): import("../AdaptableState/Common/MenuItem").MenuItemDoReduxAction<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
     createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
     private isFlashingTargetOnlyAggChange;
     private isAlertPredicateTriggered;

package/src/Strategy/FlashingCellModule.js

@@ -7,8 +7,8 @@ import { getFlashingTargetViewItems } from './Utilities/FlashingCell/getFlashing
 import { getFlashingCellStyleViewItems } from './Utilities/FlashingCell/getFlashingCellStyleViewItems';
 import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
 import { getRuleViewItems } from '../Utilities/getRuleViewItems';
-import { getScopeViewItems } from '../Utilities/getScopeViewItems';
 import { FlashingCellWizard } from '../View/FlashingCell/Wizard/FlashingCellWizard';
+import { FlashingCellScopeSummaryView } from '../View/FlashingCell/Wizard/FlashingCellScopeWizardSection';
 import { getFlashingCellDurationViewItems } from './Utilities/FlashingCell/getFlashingCellDurationViewItems';
 import { errorOnce } from '../agGrid/AdaptableLogger';
 export class FlashingCellModule extends AdaptableModuleBase {
@@ -253,7 +253,11 @@ export class FlashingCellModule extends AdaptableModuleBase {
                     name: 'Name',
                     values: [flashingCell.Name],
                 },
-                { ...getScopeViewItems(flashingCell.Scope, this.api), label: 'Trigger' },
+                {
+                    label: 'Columns',
+                    name: 'Columns',
+                    view: FlashingCellScopeSummaryView,
+                },
                 {
                     ...getRuleViewItems(flashingCell.Rule, this.api),
                     label: 'Rule',

package/src/Strategy/FormatColumnModule.js

@@ -3,14 +3,16 @@ import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import * as FormatColumnRedux from '../Redux/ActionsReducers/FormatColumnRedux';
 import * as PopupRedux from '../Redux/ActionsReducers/PopupRedux';
 import { FormatColumnWizard } from '../View/FormatColumn/Wizard/FormatColumnWizard';
-import { getFormatColumnFormatSummaryValue } from '../View/FormatColumn/Wizard/FormatColumnFormatWizardSection';
+import { getFormatColumnFormatSummaryTagValues, hasFormatColumnDisplayFormat } from '../View/FormatColumn/Wizard/FormatColumnFormatWizardSection';
 import { getFormatColumnSettingsViewItems } from './Utilities/FormatColumn/getFormatColumnSettingsViewItems';
 import { MoveFormatColumn } from '../View/FormatColumn/MoveFormatColumn';
 import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
 import { getRuleViewItems } from '../Utilities/getRuleViewItems';
 import { getScopeViewItems } from '../Utilities/getScopeViewItems';
 import { getFormatColumnRowTargetItems } from './Utilities/FormatColumn/getFormatColumnRowTargetItems';
-import { renderFormatColumnStyleSummary } from '../View/FormatColumn/Wizard/FormatColumnStyleWizardSection';
+import { getFormatColumnStyleViewValues, hasFormatColumnStyle, } from '../View/FormatColumn/Wizard/FormatColumnStyleWizardSection';
+import { hasFormatColumnCondition } from '../View/FormatColumn/Wizard/FormatColumnRuleWizardSection';
+import { renderFormatColumnPreviewSummary } from '../View/FormatColumn/Wizard/FormatColumnPreview';
 export class FormatColumnModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FormatColumnModuleId, ModuleConstants.FormatColumnFriendlyName, 'color-palette', 'FormatColumnPopup', 'Create a column style, display format or cell alignment', api);
@@ -86,19 +88,24 @@ export class FormatColumnModule extends AdaptableModuleBase {
                     name: 'Name',
                     values: [formatColumn.Name],
                 },
+                getFormatColumnSettingsViewItems(formatColumn),
                 getScopeViewItems(formatColumn.Scope, this.api),
                 getFormatColumnRowTargetItems(formatColumn),
-                formatColumn.Rule && getRuleViewItems(formatColumn.Rule, this.api),
-                {
+                hasFormatColumnCondition(formatColumn) &&
+                    getRuleViewItems(formatColumn.Rule, this.api),
+                hasFormatColumnStyle(formatColumn) && {
                     name: 'Style',
-                    view: () => renderFormatColumnStyleSummary(formatColumn, this.api),
+                    values: getFormatColumnStyleViewValues(formatColumn),
                 },
-                {
+                hasFormatColumnDisplayFormat(formatColumn) && {
                     name: 'Display Format',
-                    values: [getFormatColumnFormatSummaryValue(formatColumn)],
+                    values: getFormatColumnFormatSummaryTagValues(formatColumn),
                 },
-                getFormatColumnSettingsViewItems(formatColumn),
                 getObjectTagsViewItems(formatColumn, this.api),
+                {
+                    name: 'Preview',
+                    view: () => renderFormatColumnPreviewSummary(formatColumn, this.api),
+                },
             ].filter(Boolean),
         };
     }

package/src/Strategy/FreeTextColumnModule.d.ts

@@ -15,7 +15,7 @@ export declare class FreeTextColumnModule extends AdaptableModuleBase implements
     isModuleEnabled(): boolean;
     getModuleAdaptableObjects(): FreeTextColumn[];
     hasNamedQueryReferences(): boolean;
-    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
+    createColumnMenuItems(column: AdaptableColumn): import("../AdaptableState/Common/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "select-column-group" | "select-grid-group" | "select-group" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "styled-column-bullet-chart-add" | "styled-column-bullet-chart-edit" | "styled-column-rating-add" | "styled-column-rating-edit" | "styled-column-range-bar-add" | "styled-column-range-bar-edit" | "styled-column-icon-add" | "styled-column-icon-edit" | "system-status-show" | "_navbar">[];
     getTeamSharingAction(): TeamSharingImportInfo<FreeTextColumn>;
     toView(freeTextColumn: FreeTextColumn): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];