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

package/src/Strategy/FreeTextColumnModule.js

@@ -2,6 +2,7 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import * as FreeTextColumnRedux from '../Redux/ActionsReducers/FreeTextColumnRedux';
 import { FreeTextColumnWizard } from '../View/FreeTextColumn/Wizard/FreeTextColumnWizard';
+import { getFreeTextColumnSettingsTags } from '../View/FreeTextColumn/Utilities/getFreeTextColumnSettingsTags';
 import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 export class FreeTextColumnModule extends AdaptableModuleBase {
@@ -65,36 +66,45 @@ export class FreeTextColumnModule extends AdaptableModuleBase {
         };
     }
     toView(freeTextColumn) {
+        const settingsTags = 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.IsNotNullOrEmpty(settingsTags)) {
+            items.push({
+                name: 'Settings',
+                values: settingsTags,
+            });
+        }
+        items.push(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],
-                },
-                getObjectTagsViewItems(freeTextColumn, this.api),
-            ].filter(Boolean),
+            items: items.filter(Boolean),
         };
     }
     toViewAll() {

package/src/Strategy/GridInfoModule.d.ts

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

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

@@ -8,11 +8,11 @@ import { EditCurrentLayoutButton } from '../View/Layout/EditCurrentLayoutButton'
 import { LayoutCloneButton } from '../View/Layout/LayoutCloneButton';
 import { LayoutWizard } from '../View/Layout/Wizard/LayoutWizard';
 import { getLayoutFilterViewItems } from './Utilities/Layout/getLayoutFilterViewItems';
-import { getLayoutSortViewItems } from './Utilities/Layout/getLayoutSortViewItems';
-import { isParameterizedAggregation } from '../Aggregation/ParameterizedAggregationRegistry';
-import { getParameterizedAggregationDisplayName } from '../Aggregation/parameterizedAggregationHeader';
+import { getLayoutTableColumnsViewItems, getLayoutPivotSortingViewItem } from './Utilities/Layout/columnsSummaryHelpers';
+import { getLayoutPivotRowGroupViewItems, getLayoutTableRowGroupViewItems, } from './Utilities/Layout/rowGroupSummaryHelpers';
+import { getLayoutTableAggregationViewItems, getLayoutPivotAggregationViewItems, } from './Utilities/Layout/aggregationSummaryHelpers';
 import { SHOW_PIVOT_COLUMN_DETAILS } from '../View/Components/Popups/WindowPopups/windowFactory';
-import flattenDeep from '../Utilities/utils/flattenDeep';
+import { flattenDeep } from '../Utilities/Extensions/ArrayExtensions';
 import StringExtensions from '../Utilities/Extensions/StringExtensions';
 import { getGridFilterViewItems } from '../View/Layout/Wizard/getGridFilterPreview';
 import { RowSummaryService } from '../Utilities/Services/RowSummaryService';
@@ -278,25 +278,9 @@ export class LayoutModule extends 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: [
                 {
@@ -313,53 +297,23 @@ export class LayoutModule extends 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.
                  */
-                !isPivotLayout(layout) && {
-                    name: 'Columns',
-                    values: columns,
-                },
-                layout.ColumnSorts?.length && getLayoutSortViewItems(layout, this.api),
+                ...(!isPivotLayout(layout)
+                    ? getLayoutTableColumnsViewItems(layout, this.api, {
+                        maxColumnsToDisplay: this.api.optionsApi.getAdaptableOptions()?.layoutOptions?.layoutViewOptions
+                            ?.maxColumnsToDisplay,
+                    })
+                    : []),
                 layout?.ColumnFilters?.length && getLayoutFilterViewItems(layout, this.api),
-                layout?.RowGroupedColumns?.length && {
-                    name: 'Row Groups',
-                    values: layout.RowGroupedColumns.map((colId) => columnIdToFriendlyName(colId)),
-                },
+                ...(!isPivotLayout(layout) ? 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 (isParameterizedAggregation(aggFn)) {
-                            return getParameterizedAggregationDisplayName(this.api, aggFn, ColumnId);
-                        }
-                        const aggFnName = typeof aggFn === 'string' ? aggFn : '';
-                        return `${aggFnName}(${columnIdToFriendlyName(ColumnId)})`;
-                    }).filter(Boolean),
-                },
-                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 (isParameterizedAggregation(aggFn)) {
-                            return getParameterizedAggregationDisplayName(this.api, aggFn, ColumnId);
-                        }
-                        const aggFnName = typeof aggFn === 'string' ? aggFn : '';
-                        return `${aggFnName}(${columnIdToFriendlyName(ColumnId)})`;
-                    }).filter(Boolean),
-                },
+                isPivotLayout(layout) && getLayoutPivotSortingViewItem(layout, this.api),
+                ...(isPivotLayout(layout) ? getLayoutPivotRowGroupViewItems(layout, this.api) : []),
+                ...(!isPivotLayout(layout) ? getLayoutTableAggregationViewItems(layout, this.api) : []),
+                ...(isPivotLayout(layout) ? getLayoutPivotAggregationViewItems(layout, this.api) : []),
                 layout?.GridFilter &&
                     StringExtensions.IsNotNullOrEmpty(layout.GridFilter.Expression) &&
                     getGridFilterViewItems(layout),

package/src/Strategy/NoteModule.d.ts

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

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

@@ -11,7 +11,7 @@ import { MovePlusMinus } from '../View/PlusMinus/MovePlusMinus';
 import { PlusMinusWizard } from '../View/PlusMinus/Wizard/PlusMinusWizard';
 import { errorOnce } from '../agGrid/AdaptableLogger';
 import NumberExtensions from '../Utilities/Extensions/NumberExtensions';
-import { buildPlusMinusTriggerKeyLookup, plusMinusKeyCouldTrigger, plusMinusKeyMatches, resolvePlusMinusTriggerKeysForNudge, } from '../Utilities/Helpers/plusMinusTriggerKeys';
+import { buildPlusMinusTriggerKeyLookup, plusMinusKeyCouldTrigger, plusMinusKeyMatches, resolvePlusMinusTriggerKeysForNudge, } from '../Utilities/Helpers/PlusMinusHelper';
 export class PlusMinusModule extends AdaptableModuleBase {
     shouldHandleKeyDown;
     adaptable;

package/src/Strategy/SettingsPanelModule.d.ts

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

@@ -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';

package/src/Strategy/StyledColumnModule.js

@@ -1,18 +1,27 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import * as StyledColumnRedux from '../Redux/ActionsReducers/StyledColumnRedux';
-import { StyledColumnWizard } from '../View/StyledColumn/Wizard/StyledColumnWizard';
-import { renderStyledColumnRangesSummary, renderStyledColumnStyleSummary, } from '../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/StyledColumnWizardStyleSection';
-import { renderStyledColumnGradientStyleSummary } from '../View/StyledColumn/Wizard/StyledColumnWizardGradientSection';
-import { renderStyledColumnBulletRangesSummary, renderStyledColumnBulletStyleSummary, } from '../View/StyledColumn/Wizard/StyledColumnWizardBulletSection';
-import { renderStyledColumnRatingSummary } from '../View/StyledColumn/Wizard/StyledColumnWizardRatingSection';
-import { renderStyledColumnRangeBarDisplayStepSummary, renderStyledColumnRangeBarRangeStepSummary, } from '../View/StyledColumn/Wizard/StyledColumnWizardRangeBarSection';
-import { renderStyledColumnIconStyleSummary, renderStyledColumnIconMappingsSummary, } from '../View/StyledColumn/Wizard/StyledColumnWizardIconSection';
+import { StyledColumnWizard, getStyledColumnEditDefaultSectionName } from '../View/StyledColumn/Wizard/StyledColumnWizard';
+import { summaryStringsToTagContents } from '../View/Wizard/SummaryColorTag';
+import { renderStyledColumnRangesSummary, getStyledColumnPercentBarStyleViewValues, } from '../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/StyledColumnWizardStyleSection';
+import { getStyledColumnGradientStyleViewValues } from '../View/StyledColumn/Wizard/StyledColumnWizardGradientSection';
+import { getStyledColumnBulletStyleViewValues, StyledColumnBulletRangesView, } from '../View/StyledColumn/Wizard/StyledColumnWizardBulletSection';
+import { StyledColumnBulletPreview } from '../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/Components/StyledColumnBulletPreview';
+import { getStyledColumnRatingStyleViewValues } from '../View/StyledColumn/Wizard/StyledColumnWizardRatingSection';
+import { StyledColumnRatingPreview } from '../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/Components/StyledColumnRatingPreview';
+import { getStyledColumnRangeBarDisplayViewValues, StyledColumnRangeBarRangeView, } from '../View/StyledColumn/Wizard/StyledColumnWizardRangeBarSection';
+import { StyledColumnRangeBarPreview } from '../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/Components/StyledColumnRangeBarPreview';
+import { getStyledColumnIconStyleViewValues, StyledColumnIconMappingsView, } from '../View/StyledColumn/Wizard/StyledColumnWizardIconSection';
+import { StyledColumnIconPreview } from '../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/Components/StyledColumnIconPreview';
 import { collectIncludedRowKindLabels } from '../View/StyledColumn/Wizard/StyledColumnWizardScopeSection';
 import ObjectFactory from '../Utilities/ObjectFactory';
 import { StyledColumnBadgePreview } from '../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/Components/StyledColumnBadgePreview';
+import { StyledColumnGradientPreview } from '../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/Components/StyledColumnGradientPreview';
+import { StyledColumnPercentBarPreview } from '../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/Components/StyledColumnPercentBarPreview';
+import { getStyledColumnBadgeStyleViewValues, StyledColumnBadgeDefinitionsView, } from '../View/StyledColumn/Wizard/StyledColumnBadgeSection';
+import { getStyledColumnSparklineStyleViewValues } from '../View/StyledColumn/Wizard/StyledColumnSparklineSettingsSection';
+import { StyledColumnSparklinePreview } from '../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/Components/StyledColumnSparklinePreview';
 import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
-import { StyledColumnBadgeSettings } from '../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/Components/StyledColumnBadgeSettings';
 export class StyledColumnModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.StyledColumnModuleId, ModuleConstants.StyledColumnFriendlyName, 'brush', 'StyledColumnPopup', // to change
@@ -72,26 +81,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
                 // Edit is common
                 if (styledColumn) {
                     if (!styledColumn.IsReadOnly) {
-                        let defaultCurrentSectionName = undefined;
-                        if (styledColumn.BadgeStyle) {
-                            defaultCurrentSectionName = 'Badges';
-                        }
-                        else if (styledColumn.GradientStyle || styledColumn.PercentBarStyle) {
-                            // Gradient + Percent Bar wizards now lead with the Ranges step.
-                            defaultCurrentSectionName = 'Ranges';
-                        }
-                        else if (styledColumn.BulletChartStyle) {
-                            defaultCurrentSectionName = 'Ranges';
-                        }
-                        else if (styledColumn.RangeBarStyle) {
-                            defaultCurrentSectionName = 'Style';
-                        }
-                        else if (styledColumn.IconStyle) {
-                            defaultCurrentSectionName = 'Mappings';
-                        }
-                        else {
-                            defaultCurrentSectionName = 'Style';
-                        }
+                        const defaultCurrentSectionName = getStyledColumnEditDefaultSectionName(styledColumn);
                         const popupParam = {
                             action: 'Edit',
                             source: 'ColumnMenu',
@@ -283,80 +273,100 @@ export class StyledColumnModule extends AdaptableModuleBase {
             if (styledColumn.PercentBarStyle) {
                 specificTypeItems.push({
                     name: 'Style',
-                    view: () => {
-                        return renderStyledColumnStyleSummary(styledColumn, this.api);
-                    },
+                    values: summaryStringsToTagContents(getStyledColumnPercentBarStyleViewValues(styledColumn)),
+                });
+                specificTypeItems.push({
+                    name: 'Preview',
+                    view: StyledColumnPercentBarPreview,
                 });
             }
             if (styledColumn.GradientStyle) {
                 specificTypeItems.push({
                     name: 'Style',
-                    view: () => {
-                        return renderStyledColumnGradientStyleSummary(styledColumn);
-                    },
+                    values: summaryStringsToTagContents(getStyledColumnGradientStyleViewValues(styledColumn)),
+                });
+                specificTypeItems.push({
+                    name: 'Preview',
+                    view: StyledColumnGradientPreview,
                 });
             }
         }
         if (styledColumn.BulletChartStyle) {
             specificTypeItems.push({
                 name: 'Ranges',
-                view: () => {
-                    return renderStyledColumnBulletRangesSummary(styledColumn);
-                },
+                view: StyledColumnBulletRangesView,
             });
             specificTypeItems.push({
                 name: 'Style',
-                view: () => {
-                    return renderStyledColumnBulletStyleSummary(styledColumn);
-                },
+                values: summaryStringsToTagContents(getStyledColumnBulletStyleViewValues(styledColumn)),
+            });
+            specificTypeItems.push({
+                name: 'Preview',
+                view: StyledColumnBulletPreview,
             });
         }
         if (styledColumn.RatingStyle) {
             specificTypeItems.push({
                 name: 'Style',
-                view: () => {
-                    return renderStyledColumnRatingSummary(styledColumn);
-                },
+                values: summaryStringsToTagContents(getStyledColumnRatingStyleViewValues(styledColumn)),
+            });
+            specificTypeItems.push({
+                name: 'Preview',
+                view: StyledColumnRatingPreview,
             });
         }
         if (styledColumn.RangeBarStyle) {
             specificTypeItems.push({
                 name: 'Style',
-                view: () => {
-                    return renderStyledColumnRangeBarRangeStepSummary(styledColumn);
-                },
+                view: StyledColumnRangeBarRangeView,
             });
             specificTypeItems.push({
                 name: 'Display',
-                view: () => {
-                    return renderStyledColumnRangeBarDisplayStepSummary(styledColumn);
-                },
+                values: summaryStringsToTagContents(getStyledColumnRangeBarDisplayViewValues(styledColumn)),
+            });
+            specificTypeItems.push({
+                name: 'Preview',
+                view: StyledColumnRangeBarPreview,
             });
         }
         if (styledColumn.IconStyle) {
             specificTypeItems.push({
                 name: 'Mappings',
-                view: () => {
-                    return renderStyledColumnIconMappingsSummary(styledColumn);
-                },
+                view: StyledColumnIconMappingsView,
             });
             specificTypeItems.push({
                 name: 'Style',
-                view: () => {
-                    return renderStyledColumnIconStyleSummary(styledColumn);
-                },
+                values: summaryStringsToTagContents(getStyledColumnIconStyleViewValues(styledColumn)),
+            });
+            specificTypeItems.push({
+                name: 'Preview',
+                view: StyledColumnIconPreview,
             });
         }
         if (styledColumn.BadgeStyle) {
             specificTypeItems.push({
-                name: 'Settings',
-                view: StyledColumnBadgeSettings,
+                name: 'Badges',
+                view: StyledColumnBadgeDefinitionsView,
+            });
+            specificTypeItems.push({
+                name: 'Style',
+                values: summaryStringsToTagContents(getStyledColumnBadgeStyleViewValues(styledColumn, this.api)),
             });
             specificTypeItems.push({
                 name: 'Preview',
                 view: StyledColumnBadgePreview,
             });
         }
+        if (styledColumn.SparklineStyle) {
+            specificTypeItems.push({
+                name: 'Style',
+                values: summaryStringsToTagContents(getStyledColumnSparklineStyleViewValues(styledColumn)),
+            });
+            specificTypeItems.push({
+                name: 'Preview',
+                view: StyledColumnSparklinePreview,
+            });
+        }
         const includedRowKinds = collectIncludedRowKindLabels(styledColumn);
         return {
             abObject: styledColumn,
@@ -372,6 +382,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
                 {
                     name: 'Column',
                     values: [this.api.columnApi.getFriendlyNameForColumnId(styledColumn.ColumnId)],
+                    tagVariant: 'column',
                 },
                 {
                     name: 'Rows',

package/src/Strategy/SystemStatusModule.d.ts

@@ -5,7 +5,7 @@ import { AdaptableModuleView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class SystemStatusModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    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">[];
     getViewProperties(): AdaptableModuleView;
 }

package/src/Strategy/TeamSharingModule.js

@@ -2,13 +2,13 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { TEAMSHARING_GET, TEAMSHARING_IMPORT_ITEM, TEAMSHARING_LINK_ITEM, TEAMSHARING_PROCESS_IMPORT, TEAMSHARING_REMOVE_ITEM, TEAMSHARING_SET, TEAMSHARING_SHARE, TEAMSHARING_UPDATE_ITEM, TeamSharingUpdateItem, } from '../Redux/ActionsReducers/TeamSharingRedux';
 import * as TeamSharingRedux from '../Redux/ActionsReducers/TeamSharingRedux';
-import isEqual from '../Utilities/utils/isEqual';
+import { isEqual } from '../Utilities/Extensions/ObjectExtensions';
 import { LAYOUT_SAVE } from '../Redux/ActionsReducers/LayoutRedux';
 import { getSharedEntityStaleDepsItemView, SharedEntityTypeItemView, getSharedEntityActiveStatusObjectView, } from '../View/TeamSharing/SharedEntityObjectView';
 import { TeamSharingApplyButton } from '../View/TeamSharing/TeamSharingApplyButton';
 import { SharedEntityDependencies } from '../View/TeamSharing/SharedEntityDependencies';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
-import flatten from '../Utilities/utils/flatten';
+import { flatten } from '../Utilities/Extensions/ArrayExtensions';
 import AdaptableHelper from '../Utilities/Helpers/AdaptableHelper';
 export class TeamSharingModule extends AdaptableModuleBase {
     SKIP_TEAMSHARING_UPDATE_ACTIONS = [

package/src/Strategy/Utilities/CustomSort/getCustomSortColumnViewItems.d.ts

@@ -2,4 +2,5 @@ import { AdaptableApi, CustomSort } from '../../../../types';
 export declare const getCustomSortColumnViewItems: (customSort: CustomSort, api: AdaptableApi) => {
     name: string;
     values: string[];
+    tagVariant: "column";
 };

package/src/Strategy/Utilities/CustomSort/getCustomSortColumnViewItems.js

@@ -2,5 +2,6 @@ export const getCustomSortColumnViewItems = (customSort, api) => {
     return {
         name: 'Column',
         values: [api.columnApi.getFriendlyNameForColumnId(customSort.ColumnId)],
+        tagVariant: 'column',
     };
 };

package/src/Strategy/Utilities/Export/getExportColumnsViewItems.d.ts

@@ -1,3 +1,5 @@
+import * as React from 'react';
 import { AdaptableObjectItemView } from '../../Interface/IModule';
 import { AdaptableApi, Report } from '../../../../types';
 export declare const getExportColumnsViewItems: (report: Report, api: AdaptableApi) => AdaptableObjectItemView;
+export declare const renderExportColumnsView: (report: Report, api: AdaptableApi) => React.ReactNode;

package/src/Strategy/Utilities/Export/getExportColumnsViewItems.js

@@ -1,6 +1,20 @@
+import * as React from 'react';
+import { TagList } from '../../../components/Tag/Tag';
+import { reportColumnTagsUseColumnVariant } from '../../../components/Tag/columnScopeTagHelpers';
 export const getExportColumnsViewItems = (report, api) => {
     return {
         name: 'Columns',
         values: [...api.exportApi.internalApi.getReportColumnScopeShortDescription(report)],
+        tagVariant: reportColumnTagsUseColumnVariant(report) ? 'column' : undefined,
     };
 };
+export const renderExportColumnsView = (report, api) => {
+    const { values } = getExportColumnsViewItems(report, api);
+    if (!values?.length) {
+        return null;
+    }
+    return React.createElement(TagList, {
+        tags: values,
+        variant: reportColumnTagsUseColumnVariant(report) ? 'column' : undefined,
+    });
+};