npm - @adaptabletools/adaptable-cjs - Versions diffs - 23.0.0-canary.1 → 23.0.0-canary.10 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (753) hide show

package/src/Strategy/ChartingModule.js CHANGED Viewed

@@ -12,7 +12,7 @@ const ChartingState_1 = require("../AdaptableState/ChartingState");
 const Helper_1 = tslib_1.__importDefault(require("../Utilities/Helpers/Helper"));
 const getObjectTagsViewItems_1 = require("../Utilities/getObjectTagsViewItems");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
-const chartingHelper_1 = require("../Utilities/Helpers/chartingHelper");
+const ChartHelper_1 = require("../Utilities/Helpers/ChartHelper");
 class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ChartingModuleId, ModuleConstants.ChartingFriendlyName, 'chart', 'ChartPopup', 'Create AG Grid Charts in order to see Adaptable Data visually', api);
@@ -26,7 +26,7 @@ class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 layoutChangedInfo.newLayoutState.CurrentLayout !==
                     layoutChangedInfo.oldLayoutState?.CurrentLayout) {
                 const layout = this.api.layoutApi.getCurrentLayout();
-                (0, chartingHelper_1.openLayoutCharts)(this.api, layout);
+                (0, ChartHelper_1.openLayoutCharts)(this.api, layout);
             }
         });
         requestAnimationFrame(() => {
@@ -35,10 +35,10 @@ class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
             const layout = this.api.layoutApi.getCurrentLayout();
             if (layout?.OpenCharts !== undefined) {
-                (0, chartingHelper_1.openLayoutCharts)(this.api, layout);
+                (0, ChartHelper_1.openLayoutCharts)(this.api, layout);
             }
             else {
-                (0, chartingHelper_1.restoreChartsOnReady)(this.api);
+                (0, ChartHelper_1.restoreChartsOnReady)(this.api);
             }
         });
     }

package/src/Strategy/ColumnFilterModule.js CHANGED Viewed

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

package/src/Strategy/ColumnInfoModule.d.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -13,8 +13,8 @@ const ExportSchedulesTab_1 = require("../View/Export/ExportSchedulesTab");
 const getObjectTagsViewItems_1 = require("../Utilities/getObjectTagsViewItems");
 const ExportStatusBar_1 = require("../View/Export/ExportStatusBar");
 const ReportListItem_1 = require("../View/Export/ReportListItem");
-const ScheduledReportHelper_1 = require("../Utilities/Helpers/ScheduledReportHelper");
-const ScheduleJobManager_1 = require("../Utilities/Helpers/ScheduleJobManager");
+const ScheduledReportHelper_1 = require("../Utilities/Helpers/Scheduling/ScheduledReportHelper");
+const ScheduleJobManager_1 = require("../Utilities/Helpers/Scheduling/ScheduleJobManager");
 class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     scheduledReportJobManager;
     constructor(api) {

package/src/Strategy/FlashingCellModule.d.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -11,8 +11,8 @@ const getFlashingTargetViewItems_1 = require("./Utilities/FlashingCell/getFlashi
 const getFlashingCellStyleViewItems_1 = require("./Utilities/FlashingCell/getFlashingCellStyleViewItems");
 const getObjectTagsViewItems_1 = require("../Utilities/getObjectTagsViewItems");
 const getRuleViewItems_1 = require("../Utilities/getRuleViewItems");
-const getScopeViewItems_1 = require("../Utilities/getScopeViewItems");
 const FlashingCellWizard_1 = require("../View/FlashingCell/Wizard/FlashingCellWizard");
+const FlashingCellScopeWizardSection_1 = require("../View/FlashingCell/Wizard/FlashingCellScopeWizardSection");
 const getFlashingCellDurationViewItems_1 = require("./Utilities/FlashingCell/getFlashingCellDurationViewItems");
 const AdaptableLogger_1 = require("../agGrid/AdaptableLogger");
 class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
@@ -257,7 +257,11 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     name: 'Name',
                     values: [flashingCell.Name],
                 },
-                { ...(0, getScopeViewItems_1.getScopeViewItems)(flashingCell.Scope, this.api), label: 'Trigger' },
+                {
+                    label: 'Columns',
+                    name: 'Columns',
+                    view: FlashingCellScopeWizardSection_1.FlashingCellScopeSummaryView,
+                },
                 {
                     ...(0, getRuleViewItems_1.getRuleViewItems)(flashingCell.Rule, this.api),
                     label: 'Rule',

package/src/Strategy/FormatColumnModule.js CHANGED Viewed

@@ -15,6 +15,8 @@ const getRuleViewItems_1 = require("../Utilities/getRuleViewItems");
 const getScopeViewItems_1 = require("../Utilities/getScopeViewItems");
 const getFormatColumnRowTargetItems_1 = require("./Utilities/FormatColumn/getFormatColumnRowTargetItems");
 const FormatColumnStyleWizardSection_1 = require("../View/FormatColumn/Wizard/FormatColumnStyleWizardSection");
+const FormatColumnRuleWizardSection_1 = require("../View/FormatColumn/Wizard/FormatColumnRuleWizardSection");
+const FormatColumnPreview_1 = require("../View/FormatColumn/Wizard/FormatColumnPreview");
 class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FormatColumnModuleId, ModuleConstants.FormatColumnFriendlyName, 'color-palette', 'FormatColumnPopup', 'Create a column style, display format or cell alignment', api);
@@ -90,19 +92,24 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     name: 'Name',
                     values: [formatColumn.Name],
                 },
+                (0, getFormatColumnSettingsViewItems_1.getFormatColumnSettingsViewItems)(formatColumn),
                 (0, getScopeViewItems_1.getScopeViewItems)(formatColumn.Scope, this.api),
                 (0, getFormatColumnRowTargetItems_1.getFormatColumnRowTargetItems)(formatColumn),
-                formatColumn.Rule && (0, getRuleViewItems_1.getRuleViewItems)(formatColumn.Rule, this.api),
-                {
+                (0, FormatColumnRuleWizardSection_1.hasFormatColumnCondition)(formatColumn) &&
+                    (0, getRuleViewItems_1.getRuleViewItems)(formatColumn.Rule, this.api),
+                (0, FormatColumnStyleWizardSection_1.hasFormatColumnStyle)(formatColumn) && {
                     name: 'Style',
-                    view: () => (0, FormatColumnStyleWizardSection_1.renderFormatColumnStyleSummary)(formatColumn, this.api),
+                    values: (0, FormatColumnStyleWizardSection_1.getFormatColumnStyleViewValues)(formatColumn),
                 },
-                {
+                (0, FormatColumnFormatWizardSection_1.hasFormatColumnDisplayFormat)(formatColumn) && {
                     name: 'Display Format',
-                    values: [(0, FormatColumnFormatWizardSection_1.getFormatColumnFormatSummaryValue)(formatColumn)],
+                    values: (0, FormatColumnFormatWizardSection_1.getFormatColumnFormatSummaryTagValues)(formatColumn),
                 },
-                (0, getFormatColumnSettingsViewItems_1.getFormatColumnSettingsViewItems)(formatColumn),
                 (0, getObjectTagsViewItems_1.getObjectTagsViewItems)(formatColumn, this.api),
+                {
+                    name: 'Preview',
+                    view: () => (0, FormatColumnPreview_1.renderFormatColumnPreviewSummary)(formatColumn, this.api),
+                },
             ].filter(Boolean),
         };
     }

package/src/Strategy/FreeTextColumnModule.d.ts CHANGED Viewed

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

package/src/Strategy/FreeTextColumnModule.js CHANGED Viewed

@@ -6,6 +6,7 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const FreeTextColumnRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/FreeTextColumnRedux"));
 const FreeTextColumnWizard_1 = require("../View/FreeTextColumn/Wizard/FreeTextColumnWizard");
+const getFreeTextColumnSettingsTags_1 = require("../View/FreeTextColumn/Utilities/getFreeTextColumnSettingsTags");
 const getObjectTagsViewItems_1 = require("../Utilities/getObjectTagsViewItems");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
@@ -69,36 +70,45 @@ class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         };
     }
     toView(freeTextColumn) {
+        const settingsTags = (0, getFreeTextColumnSettingsTags_1.getFreeTextColumnSettingsTags)(freeTextColumn.FreeTextColumnSettings);
+        const items = [
+            {
+                name: 'Settings',
+                label: 'Column Id',
+                values: [freeTextColumn.ColumnId],
+                tagVariant: 'column',
+            },
+            freeTextColumn.FriendlyName && {
+                name: 'Settings',
+                label: 'Column Name',
+                values: [freeTextColumn.FriendlyName],
+            },
+            {
+                name: 'Settings',
+                label: 'Data Type',
+                values: [freeTextColumn.FreeTextColumnSettings.DataType ?? 'Not specified'],
+            },
+            Boolean(freeTextColumn.DefaultValue) && {
+                name: 'Settings',
+                label: 'Default Value',
+                values: [freeTextColumn.DefaultValue],
+            },
+            freeTextColumn.TextEditor && {
+                name: 'Settings',
+                label: 'Editor Type',
+                values: [freeTextColumn.TextEditor],
+            },
+        ].filter(Boolean);
+        if (ArrayExtensions_1.default.IsNotNullOrEmpty(settingsTags)) {
+            items.push({
+                name: 'Settings',
+                values: settingsTags,
+            });
+        }
+        items.push((0, getObjectTagsViewItems_1.getObjectTagsViewItems)(freeTextColumn, this.api));
         return {
             abObject: freeTextColumn,
-            items: [
-                {
-                    name: 'Settings',
-                    label: 'Column Id',
-                    values: [freeTextColumn.ColumnId],
-                },
-                freeTextColumn.FriendlyName && {
-                    name: 'Settings',
-                    label: 'Column Name',
-                    values: [freeTextColumn.FriendlyName],
-                },
-                {
-                    name: 'Settings',
-                    label: 'Data Type',
-                    values: [freeTextColumn.FreeTextColumnSettings.DataType ?? 'Not specified'],
-                },
-                Boolean(freeTextColumn.DefaultValue) && {
-                    name: 'Settings',
-                    label: 'Default Value',
-                    values: [freeTextColumn.DefaultValue],
-                },
-                freeTextColumn.TextEditor && {
-                    name: 'Editor Type',
-                    label: 'Editor',
-                    values: [freeTextColumn.TextEditor],
-                },
-                (0, getObjectTagsViewItems_1.getObjectTagsViewItems)(freeTextColumn, this.api),
-            ].filter(Boolean),
+            items: items.filter(Boolean),
         };
     }
     toViewAll() {

package/src/Strategy/GridInfoModule.d.ts CHANGED Viewed

@@ -7,6 +7,6 @@ import { AccessLevel } from '../AdaptableState/Common/Entitlement';
 export declare class GridInfoModule 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/Interface/IModule.d.ts CHANGED Viewed

@@ -58,7 +58,9 @@ export interface AdaptableObjectItemView {
      * Values used for the component.
      * Could be later extended to include an 'onChange' prop.
      */
-    values?: (string | number)[];
+    values?: (string | number | React.ReactNode)[];
+    /** When `'column'`, tag values render with column styling. */
+    tagVariant?: 'default' | 'column';
 }
 export interface AdaptableObjectView {
     /**

package/src/Strategy/LayoutModule.js CHANGED Viewed

@@ -12,11 +12,11 @@ const EditCurrentLayoutButton_1 = require("../View/Layout/EditCurrentLayoutButto
 const LayoutCloneButton_1 = require("../View/Layout/LayoutCloneButton");
 const LayoutWizard_1 = require("../View/Layout/Wizard/LayoutWizard");
 const getLayoutFilterViewItems_1 = require("./Utilities/Layout/getLayoutFilterViewItems");
-const getLayoutSortViewItems_1 = require("./Utilities/Layout/getLayoutSortViewItems");
-const ParameterizedAggregationRegistry_1 = require("../Aggregation/ParameterizedAggregationRegistry");
-const parameterizedAggregationHeader_1 = require("../Aggregation/parameterizedAggregationHeader");
+const columnsSummaryHelpers_1 = require("./Utilities/Layout/columnsSummaryHelpers");
+const rowGroupSummaryHelpers_1 = require("./Utilities/Layout/rowGroupSummaryHelpers");
+const aggregationSummaryHelpers_1 = require("./Utilities/Layout/aggregationSummaryHelpers");
 const windowFactory_1 = require("../View/Components/Popups/WindowPopups/windowFactory");
-const flattenDeep_1 = tslib_1.__importDefault(require("../Utilities/utils/flattenDeep"));
+const ArrayExtensions_2 = require("../Utilities/Extensions/ArrayExtensions");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
 const getGridFilterPreview_1 = require("../View/Layout/Wizard/getGridFilterPreview");
 const RowSummaryService_1 = require("../Utilities/Services/RowSummaryService");
@@ -236,7 +236,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 }),
             ];
         }
-        const data = (0, flattenDeep_1.default)(getData(menuContext.rowNode.childrenAfterFilter));
+        const data = (0, ArrayExtensions_2.flattenDeep)(getData(menuContext.rowNode.childrenAfterFilter));
         const rowGroups = currentLayout.RowGroupedColumns;
         const cellValue = isPivotColumn
             ? menuContext.rowNode?.aggData?.[columnId]
@@ -282,25 +282,9 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.getModuleAdaptableObjects().map((layout) => this.toView(layout));
     }
     toView(layout) {
-        const maxColumnsToDisplay = this.api.optionsApi.getLayoutOptions().layoutViewOptions?.maxColumnsToDisplay ?? 10;
         const columnIdToFriendlyName = (columnId) => {
             return this.api.columnApi.getFriendlyNameForColumnId(columnId);
         };
-        let columns = (layout.TableColumns || [])
-            .filter((c) => !this.api.columnApi.isAutoRowGroupColumn(c))
-            .filter((c) => !this.api.columnApi.isPivotResultColumn(c))
-            .filter((c) => !this.api.columnApi.isSelectionColumn(c));
-        if (columns.length >
-            maxColumnsToDisplay + 1 /* +1 is to show tag only beginning with 2, 'other 2' */) {
-            const extraColumns = columns.length - maxColumnsToDisplay;
-            const firstNColumns = columns
-                .slice(0, maxColumnsToDisplay)
-                .map((column) => columnIdToFriendlyName(column));
-            columns = [...firstNColumns, `and ${extraColumns} more`];
-        }
-        else {
-            columns = columns.map((column) => columnIdToFriendlyName(column));
-        }
         return {
             items: [
                 {
@@ -317,53 +301,23 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                  * The generated pivot columns cannot be prevented from beeing on the layout object.
                  * When they are removed/not added, they no longer appear in the grid.
                  */
-                !(0, LayoutHelpers_1.isPivotLayout)(layout) && {
-                    name: 'Columns',
-                    values: columns,
-                },
-                layout.ColumnSorts?.length && (0, getLayoutSortViewItems_1.getLayoutSortViewItems)(layout, this.api),
+                ...(!(0, LayoutHelpers_1.isPivotLayout)(layout)
+                    ? (0, columnsSummaryHelpers_1.getLayoutTableColumnsViewItems)(layout, this.api, {
+                        maxColumnsToDisplay: this.api.optionsApi.getAdaptableOptions()?.layoutOptions?.layoutViewOptions
+                            ?.maxColumnsToDisplay,
+                    })
+                    : []),
                 layout?.ColumnFilters?.length && (0, getLayoutFilterViewItems_1.getLayoutFilterViewItems)(layout, this.api),
-                layout?.RowGroupedColumns?.length && {
-                    name: 'Row Groups',
-                    values: layout.RowGroupedColumns.map((colId) => columnIdToFriendlyName(colId)),
-                },
+                ...(!(0, LayoutHelpers_1.isPivotLayout)(layout) ? (0, rowGroupSummaryHelpers_1.getLayoutTableRowGroupViewItems)(layout, this.api) : []),
                 layout?.PivotColumns?.length && {
                     name: 'Pivot Columns',
                     values: layout.PivotColumns.map((colId) => columnIdToFriendlyName(colId)),
+                    tagVariant: 'column',
                 },
-                layout?.PivotGroupedColumns?.length && {
-                    name: 'Pivot Row Groups',
-                    values: layout.PivotGroupedColumns.map((colId) => columnIdToFriendlyName(colId)),
-                },
-                layout?.TableAggregationColumns &&
-                    layout.TableAggregationColumns.length && {
-                    name: 'Aggregations',
-                    values: layout.TableAggregationColumns.map(({ ColumnId, AggFunc: aggFn }) => {
-                        if (ColumnId === 'Source' || ColumnId === 'Uuid' || ColumnId === 'AdaptableVersion') {
-                            return '';
-                        }
-                        if ((0, ParameterizedAggregationRegistry_1.isParameterizedAggregation)(aggFn)) {
-                            return (0, parameterizedAggregationHeader_1.getParameterizedAggregationDisplayName)(this.api, aggFn, ColumnId);
-                        }
-                        const aggFnName = typeof aggFn === 'string' ? aggFn : '';
-                        return `${aggFnName}(${columnIdToFriendlyName(ColumnId)})`;
-                    }).filter(Boolean),
-                },
-                (0, LayoutHelpers_1.isPivotLayout)(layout) &&
-                    layout?.PivotAggregationColumns &&
-                    layout.PivotAggregationColumns.length && {
-                    name: 'Pivot Aggregations',
-                    values: layout.PivotAggregationColumns.map(({ ColumnId, AggFunc: aggFn }) => {
-                        if (ColumnId === 'Source' || ColumnId === 'Uuid' || ColumnId === 'AdaptableVersion') {
-                            return '';
-                        }
-                        if ((0, ParameterizedAggregationRegistry_1.isParameterizedAggregation)(aggFn)) {
-                            return (0, parameterizedAggregationHeader_1.getParameterizedAggregationDisplayName)(this.api, aggFn, ColumnId);
-                        }
-                        const aggFnName = typeof aggFn === 'string' ? aggFn : '';
-                        return `${aggFnName}(${columnIdToFriendlyName(ColumnId)})`;
-                    }).filter(Boolean),
-                },
+                (0, LayoutHelpers_1.isPivotLayout)(layout) && (0, columnsSummaryHelpers_1.getLayoutPivotSortingViewItem)(layout, this.api),
+                ...((0, LayoutHelpers_1.isPivotLayout)(layout) ? (0, rowGroupSummaryHelpers_1.getLayoutPivotRowGroupViewItems)(layout, this.api) : []),
+                ...(!(0, LayoutHelpers_1.isPivotLayout)(layout) ? (0, aggregationSummaryHelpers_1.getLayoutTableAggregationViewItems)(layout, this.api) : []),
+                ...((0, LayoutHelpers_1.isPivotLayout)(layout) ? (0, aggregationSummaryHelpers_1.getLayoutPivotAggregationViewItems)(layout, this.api) : []),
                 layout?.GridFilter &&
                     StringExtensions_1.default.IsNotNullOrEmpty(layout.GridFilter.Expression) &&
                     (0, getGridFilterPreview_1.getGridFilterViewItems)(layout),

package/src/Strategy/NoteModule.d.ts CHANGED Viewed

@@ -7,5 +7,5 @@ export declare class NoteModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     isModuleEnabled(): boolean;
     getModuleAdaptableObjects(): AdaptableObject[];
-    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/PlusMinusModule.d.ts CHANGED Viewed

@@ -25,7 +25,7 @@ export declare class PlusMinusModule extends AdaptableModuleBase implements IPlu
     private setupKeyDownListener;
     private teardownKeyDownListener;
     checkListenToKeyDown(): void;
-    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">[];
     private handleKeyDown;
     applyPlusMinus(plusMinusNudges: PlusMinusNudge[], cellsToUpdate: GridCell[], direction: 'up' | 'down'): boolean;
     isPlusMinusNudgeApplied(plusMinusNudge: PlusMinusNudge, gridCell: GridCell): boolean;

package/src/Strategy/PlusMinusModule.js CHANGED Viewed

@@ -15,7 +15,7 @@ const MovePlusMinus_1 = require("../View/PlusMinus/MovePlusMinus");
 const PlusMinusWizard_1 = require("../View/PlusMinus/Wizard/PlusMinusWizard");
 const AdaptableLogger_1 = require("../agGrid/AdaptableLogger");
 const NumberExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/NumberExtensions"));
-const plusMinusTriggerKeys_1 = require("../Utilities/Helpers/plusMinusTriggerKeys");
+const PlusMinusHelper_1 = require("../Utilities/Helpers/PlusMinusHelper");
 class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     shouldHandleKeyDown;
     adaptable;
@@ -86,7 +86,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const newShouldHandleKeyDown = moduleAvailable && hasActiveNudges;
         if (newShouldHandleKeyDown) {
             const pmOpts = this.api.optionsApi.getEditOptions().plusMinusOptions ?? {};
-            this.plusMinusTriggerLookup = (0, plusMinusTriggerKeys_1.buildPlusMinusTriggerKeyLookup)(activeNudges, pmOpts);
+            this.plusMinusTriggerLookup = (0, PlusMinusHelper_1.buildPlusMinusTriggerKeyLookup)(activeNudges, pmOpts);
             this.setupKeyDownListener();
         }
         else {
@@ -112,7 +112,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return;
         }
         const keyEventString = Helper_1.Helper.getStringRepresentionFromKey(keyEvent);
-        if (!(0, plusMinusTriggerKeys_1.plusMinusKeyCouldTrigger)(keyEventString, this.plusMinusTriggerLookup)) {
+        if (!(0, PlusMinusHelper_1.plusMinusKeyCouldTrigger)(keyEventString, this.plusMinusTriggerLookup)) {
             return;
         }
         const pmOpts = this.api.optionsApi.getEditOptions().plusMinusOptions ?? {};
@@ -121,12 +121,12 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return;
         }
         const decrementMatches = allActive.filter((nudge) => {
-            const { decrementKey } = (0, plusMinusTriggerKeys_1.resolvePlusMinusTriggerKeysForNudge)(nudge, pmOpts);
-            return (0, plusMinusTriggerKeys_1.plusMinusKeyMatches)(keyEventString, decrementKey);
+            const { decrementKey } = (0, PlusMinusHelper_1.resolvePlusMinusTriggerKeysForNudge)(nudge, pmOpts);
+            return (0, PlusMinusHelper_1.plusMinusKeyMatches)(keyEventString, decrementKey);
         });
         const incrementMatches = allActive.filter((nudge) => {
-            const { incrementKey } = (0, plusMinusTriggerKeys_1.resolvePlusMinusTriggerKeysForNudge)(nudge, pmOpts);
-            return (0, plusMinusTriggerKeys_1.plusMinusKeyMatches)(keyEventString, incrementKey);
+            const { incrementKey } = (0, PlusMinusHelper_1.resolvePlusMinusTriggerKeysForNudge)(nudge, pmOpts);
+            return (0, PlusMinusHelper_1.plusMinusKeyMatches)(keyEventString, incrementKey);
         });
         let side;
         let plusMinusNudges;
@@ -264,7 +264,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         };
     }
     toView(plusMinus) {
-        const keys = (0, plusMinusTriggerKeys_1.resolvePlusMinusTriggerKeysForNudge)(plusMinus, this.api.optionsApi.getEditOptions().plusMinusOptions ?? {});
+        const keys = (0, PlusMinusHelper_1.resolvePlusMinusTriggerKeysForNudge)(plusMinus, this.api.optionsApi.getEditOptions().plusMinusOptions ?? {});
         return {
             abObject: plusMinus,
             items: [

package/src/Strategy/SettingsPanelModule.d.ts CHANGED Viewed

@@ -5,7 +5,7 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
 export declare class SettingsPanelModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    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">[];
-    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemDoReduxAction<"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").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): import("../AdaptableState/Common/MenuItem").MenuItemDoReduxAction<"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">[];
     createModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
 }

package/src/Strategy/SmartEditModule.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModuleActionReturn } from './Interface/IModuleActionReturn';
 import { ISmartEditModule } from './Interface/ISmartEditModule';
 import { PreviewInfo } from '../Utilities/Interface/Preview';
-import { MenuItemShowPopup } from '../Utilities/MenuItem';
+import { MenuItemShowPopup } from '../AdaptableState/Common/MenuItem';
 import { ContextMenuContext } from '../AdaptableState/Common/Menu';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AccessLevel } from '../AdaptableState/Common/Entitlement';