npm - @adaptabletools/adaptable - Versions diffs - 22.1.1 → 23.0.0-canary.0 - Mend

@adaptabletools/adaptable 22.1.1 → 23.0.0-canary.0

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 (1028) hide show

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

@@ -11,6 +11,10 @@ import { LayoutExtendedConfig } from '../types';
 export declare class PlusMinusModule extends AdaptableModuleBase implements IPlusMinusModule {
     private shouldHandleKeyDown;
     private adaptable;
+    /** Unsubscribe from adaptable `KeyDown` when there is nothing to handle. */
+    private keyDownUnsubscribe;
+    /** Keys that might trigger an active nudge; rebuilt when Plus Minus state changes (via {@link checkListenToKeyDown}). */
+    private plusMinusTriggerLookup;
     constructor(api: AdaptableApi);
     isModuleAvailable(): boolean;
     getModuleUnavailableMessage(): string | undefined;
@@ -19,8 +23,9 @@ export declare class PlusMinusModule extends AdaptableModuleBase implements IPlu
     getReferencedNamedQueryNames(plusMinusNudge: PlusMinusNudge): string[];
     onAdaptableReady(): void;
     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" | "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" | "system-status-show" | "_navbar">[];
+    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">[];
     private handleKeyDown;
     applyPlusMinus(plusMinusNudges: PlusMinusNudge[], cellsToUpdate: GridCell[], direction: 'up' | 'down'): boolean;
     isPlusMinusNudgeApplied(plusMinusNudge: PlusMinusNudge, gridCell: GridCell): boolean;

package/src/Strategy/PlusMinusModule.js CHANGED Viewed

@@ -10,12 +10,17 @@ import { getScopeViewItems } from '../Utilities/getScopeViewItems';
 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 NumberExtensions from '../Utilities/Extensions/NumberExtensions';
+import { buildPlusMinusTriggerKeyLookup, plusMinusKeyCouldTrigger, plusMinusKeyMatches, resolvePlusMinusTriggerKeysForNudge, } from '../Utilities/Helpers/plusMinusTriggerKeys';
 export class PlusMinusModule extends AdaptableModuleBase {
     shouldHandleKeyDown;
     adaptable;
+    /** Unsubscribe from adaptable `KeyDown` when there is nothing to handle. */
+    keyDownUnsubscribe;
+    /** Keys that might trigger an active nudge; rebuilt when Plus Minus state changes (via {@link checkListenToKeyDown}). */
+    plusMinusTriggerLookup;
     constructor(api) {
-        super(ModuleConstants.PlusMinusModuleId, ModuleConstants.PlusMinusFriendlyName, 'add-circle', 'PlusMinusPopup', 'Configure how a cell value will edit when the + or - keys are pressed', api);
+        super(ModuleConstants.PlusMinusModuleId, ModuleConstants.PlusMinusFriendlyName, 'add-circle', 'PlusMinusPopup', 'Configure how a cell value will edit when increment / decrement keys are pressed (defaults + and −; per-rule keys in each nudge, with optional plusMinusOptions fallback)', api);
         this.shouldHandleKeyDown = false;
         this.adaptable = api.internalApi.getAdaptableInstance();
     }
@@ -50,26 +55,40 @@ export class PlusMinusModule extends AdaptableModuleBase {
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(plusMinusNudge.Rule?.BooleanExpression);
     }
     onAdaptableReady() {
-        const hasPlusMinusNudges = ArrayExtensions.IsNotNullOrEmpty(this.api.plusMinusApi.getAllPlusMinus());
-        this.shouldHandleKeyDown = this.isModuleAvailable() && hasPlusMinusNudges;
-        if (this.shouldHandleKeyDown) {
-            this.setupKeyDownListener();
-        }
-        else if (hasPlusMinusNudges && !this.api.gridApi.isGridRangeSelectable()) {
+        this.checkListenToKeyDown();
+        if (ArrayExtensions.IsNotNullOrEmpty(this.api.plusMinusApi.getAllPlusMinus()) &&
+            !this.api.gridApi.isGridRangeSelectable()) {
             this.api.consoleWarn('Plus/Minus module is not available because AG Grid is not selectable');
         }
     }
     setupKeyDownListener() {
-        this.adaptable._on('KeyDown', (keyDownEvent) => {
+        if (this.keyDownUnsubscribe) {
+            return;
+        }
+        this.keyDownUnsubscribe = this.adaptable._on('KeyDown', (keyDownEvent) => {
             this.handleKeyDown(keyDownEvent);
         });
     }
+    teardownKeyDownListener() {
+        if (this.keyDownUnsubscribe) {
+            this.keyDownUnsubscribe();
+            this.keyDownUnsubscribe = undefined;
+        }
+    }
     checkListenToKeyDown() {
-        const oldShouldHandleKeyDown = this.shouldHandleKeyDown;
-        const newShouldHandleKeyDown = ArrayExtensions.IsNotNullOrEmpty(this.api.plusMinusApi.getAllPlusMinus());
-        if (!oldShouldHandleKeyDown && newShouldHandleKeyDown) {
+        const moduleAvailable = this.isModuleAvailable();
+        const activeNudges = this.api.plusMinusApi.getAllActivePlusMinus();
+        const hasActiveNudges = ArrayExtensions.IsNotNullOrEmpty(activeNudges);
+        const newShouldHandleKeyDown = moduleAvailable && hasActiveNudges;
+        if (newShouldHandleKeyDown) {
+            const pmOpts = this.api.optionsApi.getEditOptions().plusMinusOptions ?? {};
+            this.plusMinusTriggerLookup = buildPlusMinusTriggerKeyLookup(activeNudges, pmOpts);
             this.setupKeyDownListener();
         }
+        else {
+            this.plusMinusTriggerLookup = undefined;
+            this.teardownKeyDownListener();
+        }
         this.shouldHandleKeyDown = newShouldHandleKeyDown;
     }
     createColumnMenuItems(column) {
@@ -85,20 +104,42 @@ export class PlusMinusModule extends AdaptableModuleBase {
         }
     }
     handleKeyDown(keyEvent) {
-        if (this.shouldHandleKeyDown) {
-            //it's a special key so we handle the string representation of the key '
-            let keyEventString = Helper.getStringRepresentionFromKey(keyEvent);
-            if (keyEventString == '-' || keyEventString == '+') {
-                let plusMinusNudges = this.api.plusMinusApi.getAllActivePlusMinus();
-                if (ArrayExtensions.IsNotNullOrEmpty(plusMinusNudges)) {
-                    let side = keyEventString == '-' ? 'down' : 'up';
-                    let selectedCellInfo = this.api.gridApi.getSelectedCellInfo();
-                    let isPlusMinusApplicable = this.applyPlusMinus(plusMinusNudges, selectedCellInfo.gridCells, side);
-                    if (isPlusMinusApplicable) {
-                        keyEvent.preventDefault();
-                    }
-                }
-            }
+        if (!this.shouldHandleKeyDown || !this.plusMinusTriggerLookup) {
+            return;
+        }
+        const keyEventString = Helper.getStringRepresentionFromKey(keyEvent);
+        if (!plusMinusKeyCouldTrigger(keyEventString, this.plusMinusTriggerLookup)) {
+            return;
+        }
+        const pmOpts = this.api.optionsApi.getEditOptions().plusMinusOptions ?? {};
+        const allActive = this.api.plusMinusApi.getAllActivePlusMinus();
+        if (!ArrayExtensions.IsNotNullOrEmpty(allActive)) {
+            return;
+        }
+        const decrementMatches = allActive.filter((nudge) => {
+            const { decrementKey } = resolvePlusMinusTriggerKeysForNudge(nudge, pmOpts);
+            return plusMinusKeyMatches(keyEventString, decrementKey);
+        });
+        const incrementMatches = allActive.filter((nudge) => {
+            const { incrementKey } = resolvePlusMinusTriggerKeysForNudge(nudge, pmOpts);
+            return plusMinusKeyMatches(keyEventString, incrementKey);
+        });
+        let side;
+        let plusMinusNudges;
+        if (decrementMatches.length) {
+            side = 'down';
+            plusMinusNudges = decrementMatches;
+        }
+        else if (incrementMatches.length) {
+            side = 'up';
+            plusMinusNudges = incrementMatches;
+        }
+        else {
+            return;
+        }
+        const isPlusMinusApplicable = this.applyPlusMinus(plusMinusNudges, this.api.gridApi.getSelectedCellInfo().gridCells, side);
+        if (isPlusMinusApplicable) {
+            keyEvent.preventDefault();
         }
     }
     applyPlusMinus(plusMinusNudges, cellsToUpdate, direction) {
@@ -219,6 +260,7 @@ export class PlusMinusModule extends AdaptableModuleBase {
         };
     }
     toView(plusMinus) {
+        const keys = resolvePlusMinusTriggerKeysForNudge(plusMinus, this.api.optionsApi.getEditOptions().plusMinusOptions ?? {});
         return {
             abObject: plusMinus,
             items: [
@@ -240,6 +282,16 @@ export class PlusMinusModule extends AdaptableModuleBase {
                     label: 'Nudge Value',
                     values: [plusMinus.NudgeValue],
                 },
+                {
+                    name: 'Settings',
+                    label: 'Increment Key',
+                    values: [keys.incrementKey],
+                },
+                {
+                    name: 'Settings',
+                    label: 'Decrement Key',
+                    values: [keys.decrementKey],
+                },
                 getObjectTagsViewItems(plusMinus, this.api),
             ].filter(Boolean),
         };

package/src/Strategy/QuickSearchModule.js CHANGED Viewed

@@ -1,7 +1,6 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { QuickSearchStatusBarContent } from '../View/QuickSearch/QuickSearchStatusBarContent';
-import { QUICK_SEARCH_SET_CELL_MATCHING_STYLE_DEFAULT, QuickSearchSetCellMatchingStyle, } from '../Redux/ActionsReducers/QuickSearchRedux';
 export class QuickSearchModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.QuickSearchModuleId, ModuleConstants.QuickSearchFriendlyName, 'search-table', 'QuickSearchPopup', 'Quickly highlight all cells in the grid that contain matching query text', api);
@@ -20,21 +19,10 @@ export class QuickSearchModule extends AdaptableModuleBase {
     }
     onAdaptableReady() {
         const { api } = this;
-        const { internalApi, agGridApi } = api;
-        // Check for AG Grid QuickFilterModule if running Filter After Quick Search
         if (api.optionsApi.getQuickSearchOptions().filterGridAfterQuickSearch) {
             if (!api.internalApi.getAgGridModulesAdapter().isAgGridModuleRegistered('QuickFilterModule')) {
                 api.consoleError('Quick Search with filterGridAfterQuickSearch requires the AG Grid "QuickFilterModule". Quick Search will run but grid filters will not be applied.');
             }
         }
-        const isServerSideRowModel = agGridApi.getGridOption('rowModelType') === 'serverSide';
-        if (isServerSideRowModel &&
-            internalApi.getAdaptableState().QuickSearch.CellMatchStyle === undefined) {
-            // for server side row model,
-            // let's setup some defaults if there are no styles set
-            // as there are no defaults in the AG Grid find functionality (as it only works for non ssrm)
-            // so we need to set the defaults here
-            this.api.internalApi.dispatchReduxAction(QuickSearchSetCellMatchingStyle(QUICK_SEARCH_SET_CELL_MATCHING_STYLE_DEFAULT));
-        }
     }
 }

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" | "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" | "system-status-show" | "_navbar">[];
+    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">[];
     createModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
 }

package/src/Strategy/ShortcutModule.js CHANGED Viewed

@@ -8,7 +8,7 @@ import { ShortcutWizard } from '../View/Shortcut/Wizard/ShortcutWizard';
 import { getShortcutSettingsViewItems } from './Utilities/Shortcut/getShortcutSettingsViewItems';
 import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
 import { getScopeViewItems } from '../Utilities/getScopeViewItems';
-import { NumberExtensions } from '../Utilities/Extensions/NumberExtensions';
+import NumberExtensions from '../Utilities/Extensions/NumberExtensions';
 export class ShortcutModule extends AdaptableModuleBase {
     shouldHandleKeyDown;
     adaptable;

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

@@ -12,7 +12,7 @@ export declare class StyledColumnModule extends AdaptableModuleBase implements I
     getModuleAdaptableObjects(config?: LayoutExtendedConfig): AdaptableObject[];
     getExplicitlyReferencedColumnIds(styledColumn: StyledColumn): string[];
     hasNamedQueryReferences(): boolean;
-    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem<"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" | "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" | "system-status-show" | "_navbar">[];
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem<"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 getGlyphForStyledColumn;
     getTeamSharingAction(): TeamSharingImportInfo<StyledColumn>;
     toView(styledColumn: StyledColumn): AdaptableObjectView;

package/src/Strategy/StyledColumnModule.js CHANGED Viewed

@@ -2,7 +2,13 @@ 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 { renderStyledColumnStyleSummary } from '../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/StyledColumnWizardStyleSection';
+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 { collectIncludedRowKindLabels } from '../View/StyledColumn/Wizard/StyledColumnWizardScopeSection';
 import ObjectFactory from '../Utilities/ObjectFactory';
 import { StyledColumnBadgePreview } from '../View/StyledColumn/Wizard/StyledColumnWizardStyleSection/Components/StyledColumnBadgePreview';
 import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
@@ -53,7 +59,9 @@ export class StyledColumnModule extends AdaptableModuleBase {
                         source: 'ColumnMenu',
                         value: styledColumn,
                         config: {
-                            defaultCurrentSectionName: 'Settings',
+                            // New Styled Columns must land on the Settings step so the user
+                            // can enter the (mandatory) Name. Edit jumps straight to Style.
+                            defaultCurrentSectionName: hasSparklineStyle ? 'Style' : 'Settings',
                         },
                     };
                     returnColumnMenuItems.push(this.createMenuItemShowPopup(name, label + 'Sparkline Column', this.moduleInfo.Popup, this.getGlyphForStyledColumn(styledColumn), popupParam));
@@ -68,6 +76,19 @@ export class StyledColumnModule extends AdaptableModuleBase {
                         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';
                         }
@@ -107,7 +128,21 @@ export class StyledColumnModule extends AdaptableModuleBase {
                             },
                         },
                         config: {
-                            defaultCurrentSectionName: 'Badges',
+                            defaultCurrentSectionName: 'Settings',
+                        },
+                    });
+                    // Icon Style resolves one key → glyph per cell; array columns are
+                    // unsupported (use Badge for per-element visuals).
+                    const newIconButton = this.createMenuItemShowPopup('styled-column-icon-add', 'Create Icon Column', this.moduleInfo.Popup, 'icon-style', {
+                        ...popupParam,
+                        value: {
+                            ...newStyledColumn,
+                            IconStyle: {
+                                Mappings: [],
+                            },
+                        },
+                        config: {
+                            defaultCurrentSectionName: 'Settings',
                         },
                     });
                     switch (column.dataType) {
@@ -126,7 +161,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
                                     },
                                 },
                                 config: {
-                                    defaultCurrentSectionName: 'Style',
+                                    defaultCurrentSectionName: 'Settings',
                                 },
                             });
                             const newPercentBarButton = this.createMenuItemShowPopup('styled-column-percent-bar-add', 'Create Percent Bar', this.moduleInfo.Popup, 'percent', {
@@ -138,12 +173,60 @@ export class StyledColumnModule extends AdaptableModuleBase {
                                     },
                                 },
                                 config: {
-                                    defaultCurrentSectionName: 'Style',
+                                    defaultCurrentSectionName: 'Settings',
+                                },
+                            });
+                            const newBulletChartButton = this.createMenuItemShowPopup('styled-column-bullet-chart-add', 'Create Bullet Chart', this.moduleInfo.Popup, 'bullet-chart', {
+                                ...popupParam,
+                                value: {
+                                    ...newStyledColumn,
+                                    BulletChartStyle: {
+                                        CellRanges: emptyRanges,
+                                    },
+                                },
+                                config: {
+                                    defaultCurrentSectionName: 'Settings',
                                 },
                             });
-                            returnColumnMenuItems.push(...[newGrandientButton, newPercentBarButton, newBadgeButton]);
+                            const newRatingButton = this.createMenuItemShowPopup('styled-column-rating-add', 'Create Rating Column', this.moduleInfo.Popup, 'star', {
+                                ...popupParam,
+                                value: {
+                                    ...newStyledColumn,
+                                    RatingStyle: {},
+                                },
+                                config: {
+                                    defaultCurrentSectionName: 'Settings',
+                                },
+                            });
+                            const newRangeBarButton = this.createMenuItemShowPopup('styled-column-range-bar-add', 'Create Range Bar', this.moduleInfo.Popup, 'range-bar', {
+                                ...popupParam,
+                                value: {
+                                    ...newStyledColumn,
+                                    // Seed with column-wide bounds so the Style step opens
+                                    // with a valid (renderable) configuration.
+                                    RangeBarStyle: {
+                                        Min: 'Col-Min',
+                                        Max: 'Col-Max',
+                                    },
+                                },
+                                config: {
+                                    defaultCurrentSectionName: 'Settings',
+                                },
+                            });
+                            returnColumnMenuItems.push(...[
+                                newGrandientButton,
+                                newPercentBarButton,
+                                newBulletChartButton,
+                                newRangeBarButton,
+                                newRatingButton,
+                                newBadgeButton,
+                                newIconButton,
+                            ]);
                             break;
                         case 'text':
+                            returnColumnMenuItems.push(newBadgeButton);
+                            returnColumnMenuItems.push(newIconButton);
+                            break;
                         case 'textArray':
                         case 'numberArray':
                             returnColumnMenuItems.push(newBadgeButton);
@@ -167,6 +250,18 @@ export class StyledColumnModule extends AdaptableModuleBase {
         else if (styledColumn.BadgeStyle) {
             return 'badge';
         }
+        else if (styledColumn.BulletChartStyle) {
+            return 'bullet-chart';
+        }
+        else if (styledColumn.RatingStyle) {
+            return 'star';
+        }
+        else if (styledColumn.RangeBarStyle) {
+            return 'range-bar';
+        }
+        else if (styledColumn.IconStyle) {
+            return 'icon-style';
+        }
         return this.moduleInfo.Glyph;
     }
     getTeamSharingAction() {
@@ -180,29 +275,76 @@ export class StyledColumnModule extends AdaptableModuleBase {
         const specificTypeItems = [];
         if (styledColumn.GradientStyle || styledColumn.PercentBarStyle) {
             specificTypeItems.push({
-                name: 'Style',
+                name: 'Ranges',
                 view: () => {
-                    return renderStyledColumnStyleSummary(styledColumn, this.api);
+                    return renderStyledColumnRangesSummary(styledColumn, this.api);
                 },
             });
-        }
-        if (styledColumn.BadgeStyle) {
-            let rowTypes = [];
-            if (!styledColumn.BadgeStyle?.RowScope?.ExcludeDataRows) {
-                rowTypes.push('Data');
+            if (styledColumn.PercentBarStyle) {
+                specificTypeItems.push({
+                    name: 'Style',
+                    view: () => {
+                        return renderStyledColumnStyleSummary(styledColumn, this.api);
+                    },
+                });
             }
-            if (!styledColumn.BadgeStyle?.RowScope?.ExcludeGroupRows) {
-                rowTypes.push('Group');
-            }
-            if (!styledColumn.BadgeStyle?.RowScope?.ExcludeSummaryRows) {
-                rowTypes.push('Summary');
-            }
-            if (!styledColumn.BadgeStyle?.RowScope?.ExcludeTotalRows) {
-                rowTypes.push('Total');
+            if (styledColumn.GradientStyle) {
+                specificTypeItems.push({
+                    name: 'Style',
+                    view: () => {
+                        return renderStyledColumnGradientStyleSummary(styledColumn);
+                    },
+                });
             }
+        }
+        if (styledColumn.BulletChartStyle) {
+            specificTypeItems.push({
+                name: 'Ranges',
+                view: () => {
+                    return renderStyledColumnBulletRangesSummary(styledColumn);
+                },
+            });
+            specificTypeItems.push({
+                name: 'Style',
+                view: () => {
+                    return renderStyledColumnBulletStyleSummary(styledColumn);
+                },
+            });
+        }
+        if (styledColumn.RatingStyle) {
+            specificTypeItems.push({
+                name: 'Style',
+                view: () => {
+                    return renderStyledColumnRatingSummary(styledColumn);
+                },
+            });
+        }
+        if (styledColumn.RangeBarStyle) {
+            specificTypeItems.push({
+                name: 'Style',
+                view: () => {
+                    return renderStyledColumnRangeBarRangeStepSummary(styledColumn);
+                },
+            });
             specificTypeItems.push({
-                name: 'Rows',
-                values: rowTypes
+                name: 'Display',
+                view: () => {
+                    return renderStyledColumnRangeBarDisplayStepSummary(styledColumn);
+                },
+            });
+        }
+        if (styledColumn.IconStyle) {
+            specificTypeItems.push({
+                name: 'Mappings',
+                view: () => {
+                    return renderStyledColumnIconMappingsSummary(styledColumn);
+                },
+            });
+            specificTypeItems.push({
+                name: 'Style',
+                view: () => {
+                    return renderStyledColumnIconStyleSummary(styledColumn);
+                },
             });
         }
         if (styledColumn.BadgeStyle) {
@@ -215,9 +357,14 @@ export class StyledColumnModule extends AdaptableModuleBase {
                 view: StyledColumnBadgePreview,
             });
         }
+        const includedRowKinds = collectIncludedRowKindLabels(styledColumn);
         return {
             abObject: styledColumn,
             items: [
+                {
+                    name: 'Name',
+                    values: [styledColumn.Name],
+                },
                 {
                     name: 'Type',
                     values: [this.getTypeLabel(styledColumn)],
@@ -226,6 +373,10 @@ export class StyledColumnModule extends AdaptableModuleBase {
                     name: 'Column',
                     values: [this.api.columnApi.getFriendlyNameForColumnId(styledColumn.ColumnId)],
                 },
+                {
+                    name: 'Rows',
+                    values: includedRowKinds.length === 4 ? ['All'] : includedRowKinds,
+                },
                 ...specificTypeItems,
                 ,
                 getObjectTagsViewItems(styledColumn, this.api),
@@ -256,7 +407,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
     getTypeLabel(styledColumn) {
         let type = null;
         if (styledColumn.GradientStyle) {
-            type = 'Gradient Column';
+            type = 'Gradient Style';
         }
         else if (styledColumn.PercentBarStyle) {
             type = 'Percent Bar';
@@ -267,6 +418,18 @@ export class StyledColumnModule extends AdaptableModuleBase {
         else if (styledColumn.BadgeStyle) {
             type = 'Badge Style';
         }
+        else if (styledColumn.BulletChartStyle) {
+            type = 'Bullet Chart';
+        }
+        else if (styledColumn.RatingStyle) {
+            type = 'Rating Style';
+        }
+        else if (styledColumn.RangeBarStyle) {
+            type = 'Range Bar';
+        }
+        else if (styledColumn.IconStyle) {
+            type = 'Icon Style';
+        }
         return type;
     }
     getTypeName(styledColumn) {
@@ -283,6 +446,18 @@ export class StyledColumnModule extends AdaptableModuleBase {
         else if (styledColumn.BadgeStyle) {
             type = 'styled-column-badge-edit';
         }
+        else if (styledColumn.BulletChartStyle) {
+            type = 'styled-column-bullet-chart-edit';
+        }
+        else if (styledColumn.RatingStyle) {
+            type = 'styled-column-rating-edit';
+        }
+        else if (styledColumn.RangeBarStyle) {
+            type = 'styled-column-range-bar-edit';
+        }
+        else if (styledColumn.IconStyle) {
+            type = 'styled-column-icon-edit';
+        }
         return type;
     }
 }

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

@@ -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" | "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" | "system-status-show" | "_navbar">[];
+    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">[];
     getViewProperties(): AdaptableModuleView;
 }

package/src/Strategy/Utilities/Alert/getAlertPreviewViewItems.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
 import { Tag } from '../../../components/Tag';
 import { AlertPreview } from '../../../View/Alert/Wizard/AlertNotificationWizardSection';
 export const getAlertPreviewViewItems = (alert, api) => {
@@ -6,9 +6,9 @@ export const getAlertPreviewViewItems = (alert, api) => {
         name: 'Type and Display',
         view: () => {
             if (!alert?.AlertProperties?.DisplayNotification) {
-                return React.createElement(Tag, null, alert.MessageType);
+                return _jsx(Tag, { children: alert.MessageType });
             }
-            return (React.createElement(AlertPreview, { focusFirstButton: false, className: "twa:max-w-[400px] twa:mt-2", api: api, alertDefinition: alert }));
+            return (_jsx(AlertPreview, { focusFirstButton: false, className: "twa:max-w-[400px] twa:mt-2", api: api, alertDefinition: alert }));
         },
     };
 };

package/src/Strategy/Utilities/Export/formatScheduledReportSummary.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ import { ReportSchedule } from '../../../AdaptableState/ExportState';
2	+ export declare function formatScheduledReportSummary(reportSchedule: ReportSchedule): string;

package/src/Strategy/Utilities/Export/formatScheduledReportSummary.js ADDED Viewed

@@ -0,0 +1,6 @@
+import UIHelper from '../../../View/UIHelper';
+export function formatScheduledReportSummary(reportSchedule) {
+    const scheduleText = UIHelper.getScheduleDescription(reportSchedule.Schedule);
+    const suspendedSuffix = reportSchedule.IsSuspended ? ' (Suspended)' : '';
+    return `${reportSchedule.ReportFormat} → ${reportSchedule.ExportDestination}: ${scheduleText}${suspendedSuffix}`;
+}