@adaptabletools/adaptable-cjs 19.0.0-canary.0 → 19.0.1

package/src/PredefinedConfig/Common/AdaptableFormat.d.ts

@@ -43,7 +43,7 @@ export interface NumberFormatterOptions extends BaseFormatterOptions {
      */
     Suffix?: string;
     /**
-     * Replaces cell value with supplied value (that can contain placeholders)
+     * Replaces cell value with supplied value (that can contain Template Literals)
      */
     Content?: string | number;
     /**

package/src/PredefinedConfig/Common/RowScope.d.ts

@@ -1,5 +1,5 @@
 /**
- * Defines which types of Rows to exclude when rendering Format Columns, Action Columns, Badges
+ * Defines which types of Rows to exclude when rendering Format Columns, Action Columns and Badges
  */
 export type RowScope = {
     /**

package/src/PredefinedConfig/FormatColumnState.d.ts

@@ -45,10 +45,6 @@ export interface FormatColumn extends SuspendableObject {
      * Which types of Rows should be formatted (data, grouped, summary)
      */
     RowScope?: RowScope;
-    /**
-     * @deprecated FormatColumns now apply to Group Rows by default; use RowScope for more control
-     */
-    IncludeGroupedRows?: never;
 }
 /**
  * The Format Column Rule - can be either a Predicate or a BooleanExpression

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -536,10 +536,8 @@ const SystemReducer = (state = initialState, action) => {
             });
             const AdaptableFlashingCellsMap = Object.assign({}, state.AdaptableFlashingCellsMap);
             AdaptableFlashingCellsMap[FlashingCell.Uuid] = FlashingCell;
-            return Object.assign({}, state, {
-                AdaptableFlashingCells: AdaptableFlashingCells,
-                AdaptableFlashingCellsMap: AdaptableFlashingCellsMap,
-            });
+            return Object.assign(Object.assign({}, state), { AdaptableFlashingCells,
+                AdaptableFlashingCellsMap });
         }
         case exports.SYSTEM_FLASHING_CELL_DELETE: {
             const { flashingCell: FlashingCell } = action;
@@ -563,10 +561,7 @@ const SystemReducer = (state = initialState, action) => {
             return Object.assign(Object.assign({}, state), { AdaptableFlashingCells: AdaptableFlashingCells, AdaptableFlashingCellsMap: AdaptableFlashingCellsMap });
         }
         case exports.SYSTEM_FLASHING_CELL_DELETE_ALL: {
-            return Object.assign({}, state, {
-                AdaptableFlashingCells: {},
-                AdaptableFlashingCellsMap: {},
-            });
+            return Object.assign(Object.assign({}, state), { AdaptableFlashingCells: {}, AdaptableFlashingCellsMap: {} });
         }
         case exports.SYSTEM_HIGHLIGHT_CELL_ADD: {
             const actionTypedAdd = action;

package/src/Strategy/DashboardModule.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const DashboardRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/DashboardRedux"));
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.DashboardModuleId, ModuleConstants.DashboardFriendlyName, 'dashboard', 'DashboardPopup', 'The Dashboard - usually placed above the Grid - is designed to provide quick access to commonly required AdapTable functionalty', api);
@@ -30,22 +31,25 @@ class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     buildMenuItems() {
         if (this.isModuleAvailable()) {
             let menuItems = [];
+            const dashboardState = this.api.dashboardApi.getDashboardState();
             if (this.isModuleEditable()) {
                 menuItems.push(this.createMenuItemClickFunction('dashboard-configure', 'Configure', 'settings', () => this.api.dashboardApi.openDashboardSettingsPanel()));
             }
-            if (this.api.dashboardApi.getDashboardState().IsCollapsed) {
-                menuItems.push(this.createMenuItemReduxAction('dashboard-expand', 'Expand', 'expand', DashboardRedux.DashboardSetIsCollapsed(false)));
+            if (ArrayExtensions_1.default.IsNotNullOrEmpty(dashboardState.Tabs)) {
+                if (dashboardState.IsCollapsed) {
+                    menuItems.push(this.createMenuItemReduxAction('dashboard-expand', 'Expand', 'expand', DashboardRedux.DashboardSetIsCollapsed(false)));
+                }
+                else {
+                    menuItems.push(this.createMenuItemReduxAction('dashboard-collapse', 'Collapse', 'collapse', DashboardRedux.DashboardSetIsCollapsed(true)));
+                }
             }
-            else {
-                menuItems.push(this.createMenuItemReduxAction('dashboard-collapse', 'Collapse', 'collapse', DashboardRedux.DashboardSetIsCollapsed(true)));
-            }
-            if (this.api.dashboardApi.getDashboardState().IsFloating) {
+            if (dashboardState.IsFloating) {
                 menuItems.push(this.createMenuItemReduxAction('dashboard-dock', 'Dock', 'dock', DashboardRedux.DashboardSetIsFloating(false)));
             }
             else if (this.api.optionsApi.getDashboardOptions().canFloat) {
                 menuItems.push(this.createMenuItemReduxAction('dashboard-float', 'Float', 'dock', DashboardRedux.DashboardSetIsFloating(true)));
             }
-            if (this.api.dashboardApi.getDashboardState().IsHidden) {
+            if (dashboardState.IsHidden) {
                 menuItems.push(this.createMenuItemReduxAction('dashboard-show', 'Show', 'visibility-on-bold', DashboardRedux.DashboardSetIsHidden(false)));
             }
             else {

package/src/View/Dashboard/DashboardPopup.js

@@ -76,9 +76,10 @@ class DashboardPopupComponent extends React.Component {
                     React.createElement(CheckBox_1.CheckBox, { "data-name": "hidden", className: `${baseClassName}__settings-option`, checked: this.props.IsHidden, onChange: (checked) => this.props.onSetDashboardHidden(checked) }, "Hidden"))),
                 React.createElement(Panel_1.default, { header: 'Dashboard Contents', style: { borderBottom: '1px solid var(--ab-color-primary)' }, variant: "default", borderRadius: "none", marginTop: 4 },
                     React.createElement(rebass_1.Flex, { className: `${baseClassName}__contents-selector`, flexDirection: "row", padding: 2 },
-                        React.createElement(Radio_1.default, { marginLeft: 3, value: DashboardConfigView.Toolbars, checked: this.state.DashboardConfigView == DashboardConfigView.Toolbars, onChange: (_, e) => this.onDashboardConfigViewChanged(e) }, "Tabs & Toolbars"),
-                        React.createElement(Radio_1.default, { marginLeft: 3, value: DashboardConfigView.Buttons, checked: this.state.DashboardConfigView == DashboardConfigView.Buttons, onChange: (_, e) => this.onDashboardConfigViewChanged(e) }, "Buttons"),
-                        React.createElement(Radio_1.default, { marginLeft: 3, value: DashboardConfigView.PinnedToolbars, checked: this.state.DashboardConfigView == DashboardConfigView.PinnedToolbars, onChange: (_, e) => this.onDashboardConfigViewChanged(e) }, "Pinned Toolbars")),
+                        React.createElement(Radio_1.default, { marginLeft: 3, value: DashboardConfigView.Toolbars, checked: this.state.DashboardConfigView == DashboardConfigView.Toolbars, onChange: (_, e) => this.onDashboardConfigViewChanged(e) }, "Tabbed Toolbars"),
+                        React.createElement(Radio_1.default, { marginLeft: 3, value: DashboardConfigView.PinnedToolbars, checked: this.state.DashboardConfigView == DashboardConfigView.PinnedToolbars, onChange: (_, e) => this.onDashboardConfigViewChanged(e) }, "Pinned Toolbars"),
+                        ' ',
+                        React.createElement(Radio_1.default, { marginLeft: 3, value: DashboardConfigView.Buttons, checked: this.state.DashboardConfigView == DashboardConfigView.Buttons, onChange: (_, e) => this.onDashboardConfigViewChanged(e) }, "Buttons")),
                     React.createElement(rebass_1.Box, { className: `${baseClassName}__Module-Selector`, "data-name": this.state.DashboardConfigView === DashboardConfigView.Toolbars
                             ? 'toolbars'
                             : 'buttons', style: { minHeight: 0, flex: '1 1 0' }, padding: 2 },

package/src/View/Dashboard/DashboardViewPanel.js

@@ -7,6 +7,7 @@ const React = tslib_1.__importStar(require("react"));
 const CheckBox_1 = require("../../components/CheckBox");
 const react_redux_1 = require("react-redux");
 const rebass_1 = require("rebass");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 class DashboardViewPanelComponent extends React.Component {
     constructor(props) {
         super(props);
@@ -15,7 +16,7 @@ class DashboardViewPanelComponent extends React.Component {
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
         return (React.createElement(rebass_1.Flex, { flexDirection: "row", className: `ab-${elementType}__Dashboard__wrap`, flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
             ' ',
-            React.createElement(CheckBox_1.CheckBox, { className: `ab-${elementType}__Dashboard__collapsed-check`, marginTop: 0, fontSize: 2, padding: 1, checked: this.props.IsCollapsed, onChange: (checked) => this.props.onSetDashboardCollapsed(checked) }, "Collapse"),
+            ArrayExtensions_1.default.IsNotNullOrEmpty(this.props.api.dashboardApi.getDashboardState().Tabs) && (React.createElement(CheckBox_1.CheckBox, { className: `ab-${elementType}__Dashboard__collapsed-check`, marginTop: 0, fontSize: 2, padding: 1, checked: this.props.IsCollapsed, onChange: (checked) => this.props.onSetDashboardCollapsed(checked) }, "Collapse")),
             '',
             this.props.api.optionsApi.getDashboardOptions().canFloat && (React.createElement(CheckBox_1.CheckBox, { className: `ab-${elementType}__Dashboard__collapsed-check`, marginTop: 0, fontSize: 2, padding: 1, checked: this.props.IsFloating, onChange: (checked) => this.props.onSetDashboardFloating(checked) }, "Float")),
             ' ',

package/src/View/Layout/Wizard/getGridFilterPreview.js

@@ -8,7 +8,7 @@ const Tag_1 = require("../../../components/Tag");
 const getGridFilterViewItems = (layout) => {
     var _a;
     return {
-        name: 'Grid Filters',
+        name: 'Grid Filter',
         view: (React.createElement(Tag_1.Tag, null,
             React.createElement(ExpressionPreview_1.ExpressionPreview, { query: { BooleanExpression: (_a = layout.GridFilter) === null || _a === void 0 ? void 0 : _a.Expression } }))),
     };

package/src/View/Layout/Wizard/sections/ColumnsSection.js

@@ -190,7 +190,7 @@ const ColumnRow = (props) => {
 const ColumnsSection = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    const allColumns = adaptable.api.columnApi.getColumns();
+    const allColumns = adaptable.api.columnApi.getStandardColumns();
     const sortedColumns = React.useMemo(() => {
         return ArrayExtensions_1.default.sortArrayWithOrder(allColumns.map((col) => col.columnId), layout.Columns, { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
     }, [layout, allColumns]);

package/src/View/Layout/Wizard/sections/GridFilterSection.js

@@ -39,7 +39,7 @@ const GridFilterSection = (props) => {
             props.onChange(Object.assign(Object.assign({}, layout), { GridFilter: Object.assign(Object.assign({}, layout.GridFilter), { Expression: expression }) }));
         }, initialData: initialData, columns: api.columnApi.getQueryableColumns(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api })));
     return (React.createElement(Tabs_1.Tabs, { style: { height: '100%' } },
-        React.createElement(Tabs_1.Tabs.Tab, null, "Grid Filters"),
+        React.createElement(Tabs_1.Tabs.Tab, null, "Grid Filter"),
         React.createElement(Tabs_1.Tabs.Content, null,
             React.createElement(Panel_1.default, null, expressionEditorContent))));
 };

package/src/agGrid/AdaptableAgGrid.js

@@ -973,12 +973,13 @@ class AdaptableAgGrid {
         /**
          * `processPivotResultColDef`
          */
-        this.agGridOptionsService.setGridOptionsProperty(gridOptions, 'processPivotResultColDef', () => {
+        this.agGridOptionsService.setGridOptionsProperty(gridOptions, 'processPivotResultColDef', (original_processPivotResultColDef) => {
             return (colDef) => {
                 if (this.adaptableOptions.columnFilterOptions.useAdaptableColumnFiltering) {
                     colDef.floatingFilter = false;
                     colDef.filter = false;
                 }
+                original_processPivotResultColDef === null || original_processPivotResultColDef === void 0 ? void 0 : original_processPivotResultColDef(colDef);
             };
         });
         /**
@@ -3220,7 +3221,7 @@ class AdaptableAgGrid {
                 rawValue = dateRawValue;
             }
         }
-        return this.api.exportApi.internalApi.getCellExportValueFromRawValue(rowNode, rawValue, columnId);
+        return this.api.exportApi.internalApi.getCellExportValueFromRawValue(rowNode, rawValue, columnId, GeneralConstants.VISUAL_DATA_REPORT);
     }
     processCellForExcelExport(rowNode, columnId) {
         if (this.api.exportApi.internalApi.isVisualDataExportInProgress()) {
@@ -3231,7 +3232,7 @@ class AdaptableAgGrid {
                 return isoFormattedDate;
             }
         }
-        return this.api.exportApi.internalApi.getCellExportValueFromRowNode(rowNode, columnId);
+        return this.api.exportApi.internalApi.getCellExportValueFromRowNode(rowNode, columnId, GeneralConstants.VISUAL_DATA_REPORT);
     }
     isQuickFilterAvailable() {
         if (this.api.layoutApi.isCurrentLayoutPivot() &&

package/src/agGrid/AgGridColumnAdapter.js

@@ -701,7 +701,7 @@ class AgGridColumnAdapter {
         if (styledColumn && !(styledColumn === null || styledColumn === void 0 ? void 0 : styledColumn.IsSuspended)) {
             const styledCellStyle = this.getStyledColumnStyle(styledColumn, gridCell.column, params);
             // for percentbar we want to merge
-            if (styledColumn.PercentBarStyle || styledColumn.BadgeStyle) {
+            if (styledColumn.PercentBarStyle || styledColumn.BadgeStyle || styledColumn.GradientStyle) {
                 styledColumnStyle = styledCellStyle;
             }
             else {
@@ -710,6 +710,7 @@ class AgGridColumnAdapter {
             }
         }
         const activeFormatColumnsWithStyle = this.adaptableApi.formatColumnApi.internalApi.getFormatColumnsWithStyleForColumn(gridCell.column);
+        // background color of styledColumn.GradientStyle has precedence and wins over FormatColumn
         return Object.assign(Object.assign({}, this.getFormatColumnCellStyle(gridCell.column, activeFormatColumnsWithStyle, params)), styledColumnStyle);
     }
     getStyledColumnStyle(styledColumn, abColumn, params) {

package/src/agGrid/AgGridMenuAdapter.js

@@ -380,11 +380,11 @@ class AgGridMenuAdapter {
             icon: 'export-data',
         }));
         return this.normalizeMenuGroup(this.buildMenuGroupParent('Export', [
-            ...visualDataExportItems,
             ...allDataExportItems,
             ...currentDataExportItems,
             ...selectedCellsExportItems,
             ...selectedRowsExportItems,
+            ...visualDataExportItems,
         ], {
             label: 'Export',
             icon: 'export',
@@ -475,19 +475,19 @@ class AgGridMenuAdapter {
             ],
         };
         /*
-            const calculatedColumnMenuItem: AdaptableMenuItem = {
-              name: 'calculated-column-group',
-              label: 'Calculated Column',
-              module: 'CalculatedColumn',
-              isVisible: true,
-              icon: {
-                name: 'columns',
-              },
-              subItems: [
-                ...calculatedColumnMenuItems,
-              ],
-            };
-            */
+        const calculatedColumnMenuItem: AdaptableMenuItem = {
+          name: 'calculated-column-group',
+          label: 'Calculated Column',
+          module: 'CalculatedColumn',
+          isVisible: true,
+          icon: {
+            name: 'columns',
+          },
+          subItems: [
+            ...calculatedColumnMenuItems,
+          ],
+        };
+        */
         const columnMenuItem = {
             name: 'column-group',
             label: 'Column',

package/src/agGrid/PercentBarRenderer.js

@@ -67,7 +67,7 @@ const getPercentBarRendererForColumn = (styledColumn, abColumn, api) => {
                         textEl.innerText = (_b = (_a = params.formatValue) === null || _a === void 0 ? void 0 : _a.call(params, params.value)) !== null && _b !== void 0 ? _b : params.value;
                     }
                     if (percentBarStyle.CellText.includes('PercentageValue')) {
-                        textEl.innerText += ' ' + `(${percentageValue.toFixed(0)}%)`;
+                        textEl.innerText += ' ' + `${percentageValue.toFixed(0)}%`;
                     }
                     switch (percentBarStyle.CellTextPosition) {
                         case 'Above':

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1724333963891 || Date.now(),
-    VERSION: "19.0.0-canary.0" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1726230101609 || Date.now(),
+    VERSION: "19.0.1" || '--current-version--',
 };