@adaptabletools/adaptable-cjs 22.0.0-canary.12 → 22.0.0-canary.14

package/src/View/FormatColumn/Wizard/FormatColumnWizard.js

@@ -6,7 +6,8 @@ const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const Helper_1 = require("../../../Utilities/Helpers/Helper");
-const FormatColumnScopeWizardSection_1 = require("./FormatColumnScopeWizardSection");
+const FormatColumnColumnScopeWizardSection_1 = require("./FormatColumnColumnScopeWizardSection");
+const FormatColumnRowScopeWizardSection_1 = require("./FormatColumnRowScopeWizardSection");
 const FormatColumnStyleWizardSection_1 = require("./FormatColumnStyleWizardSection");
 const FormatColumnFormatWizardSection_1 = require("./FormatColumnFormatWizardSection");
 const AdaptableContext_1 = require("../../AdaptableContext");
@@ -21,11 +22,22 @@ const Utilities_1 = require("../../Components/EntityRulesEditor/Utilities");
 const FormatColumnRuleWizardSection_1 = require("./FormatColumnRuleWizardSection");
 const constants_1 = require("./constants");
 const ObjectExtensions_1 = require("../../../Utilities/Extensions/ObjectExtensions");
-const FormatColumnTargetWizardSection_1 = require("./FormatColumnTargetWizardSection");
 const Flex_1 = require("../../../components/Flex");
 const adjustDisplayFormat = (fc, api) => {
     const formatColumn = { ...fc };
     let formatDataType = (0, FormatColumnFormatWizardSection_1.getFormatDisplayTypeForScope)(formatColumn.Scope, api);
+    // Add RowScope and Target defaults for Format Columns that have been created in Initial State
+    if (!formatColumn.RowScope) {
+        formatColumn.RowScope = {
+            ExcludeDataRows: false,
+            ExcludeGroupRows: false,
+            ExcludeSummaryRows: false,
+            ExcludeTotalRows: false,
+        };
+    }
+    if (!formatColumn.Target) {
+        formatColumn.Target = 'cell';
+    }
     if (formatColumn.Target === 'columnHeader') {
         // Column Headers are always text
         formatDataType = 'text';
@@ -100,7 +112,7 @@ function FormatColumnWizard(props) {
     return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, modal: props.modal, data: formatColumn, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
             {
                 title: 'Settings',
-                details: 'Enter Name and set Additional Properties',
+                details: 'Enter Name and other Properties',
                 isValid: (formatColumnData) => {
                     if (!formatColumnData.Name) {
                         return 'Format Column Name cannot be blank';
@@ -117,22 +129,22 @@ function FormatColumnWizard(props) {
                 },
             },
             {
-                title: 'Scope',
+                title: 'Columns',
                 details: 'Select which Columns will be formatted',
                 isValid: NewScopeComponent_1.isScopeValid,
-                renderSummary: FormatColumnScopeWizardSection_1.renderFormatColumnScopeSummary,
+                renderSummary: FormatColumnColumnScopeWizardSection_1.renderFormatColumnScopeSummary,
                 render: () => {
                     return (React.createElement(Flex_1.Flex, { flexDirection: "column", className: "twa:p-2 twa:h-full" },
-                        React.createElement(FormatColumnScopeWizardSection_1.FormatColumnScopeWizardSection, { onChange: setFormatColumn })));
+                        React.createElement(FormatColumnColumnScopeWizardSection_1.FormatColumnScopeWizardSection, { onChange: setFormatColumn })));
                 },
             },
             {
-                title: 'Target',
-                details: 'Select which Columns Elements will be formatted',
-                renderSummary: FormatColumnTargetWizardSection_1.renderFormatColumnTargetSummary,
+                title: 'Rows',
+                details: 'Select which Rows will be formatted',
+                renderSummary: FormatColumnRowScopeWizardSection_1.renderFormatColumnRowScopeSummary,
                 render: () => {
                     return (React.createElement(Flex_1.Flex, { flexDirection: "column", className: "twa:p-2 twa:h-full" },
-                        React.createElement(FormatColumnTargetWizardSection_1.FormatColumnTargetWizardSection, { onChange: setFormatColumn })));
+                        React.createElement(FormatColumnRowScopeWizardSection_1.FormatColumnRowScopeWizardSection, { onChange: setFormatColumn })));
                 },
             },
             {

package/src/View/Layout/TransposedPopup.js

@@ -84,7 +84,6 @@ const TransposedPopup = (props) => {
     const transposeConfig = {
         transposedColumnId: rawConfig.transposedColumnId ?? primaryKey,
         hideTransposedColumn: rawConfig.hideTransposedColumn ?? true,
-        autosize: rawConfig.autosize ?? true,
         columnsToTranspose: rawConfig.columnsToTranspose,
         rowsToTranspose: rawConfig.rowsToTranspose,
     };

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

@@ -370,7 +370,7 @@ const ColumnsSection = (props) => {
     const visibleIds = layout.TableColumns.filter((colId) => {
         return (layout.ColumnVisibility?.[colId] !== false &&
             adaptable.api.columnApi.isSelectionColumn(colId) === false &&
-            !adaptable.api.columnApi.internalApi.isAlwaysHiddenColumn(colId));
+            !adaptable.api.columnApi.internalApi.isColumnUIHidden(colId));
     });
     const currentlyDisplayedColumnIds = searchInputValue
         ? currentOrder

package/src/View/StyledColumn/Wizard/StyledColumnBadgeRowsSection.d.ts

@@ -0,0 +1,8 @@
+import * as React from 'react';
+import { StyledColumn } from '../../../types';
+type StyledColumnBadgeRowsSectionProps = {
+    onChange: (data: StyledColumn) => void;
+};
+export declare const renderStyledColumnBadgeRowsSummary: (data: StyledColumn) => React.JSX.Element;
+export declare const StyledColumnBadgeRowsSection: (props: StyledColumnBadgeRowsSectionProps) => React.JSX.Element;
+export {};

package/src/View/StyledColumn/Wizard/{StyledColumnWizardSettingsSection.js → StyledColumnBadgeRowsSection.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StyledColumnWizardSettingsSection = exports.renderStyledColumnWizardSettingsSummary = void 0;
+exports.StyledColumnBadgeRowsSection = exports.renderStyledColumnBadgeRowsSummary = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const CheckBox_1 = require("../../../components/CheckBox");
@@ -9,7 +9,7 @@ const Tabs_1 = require("../../../components/Tabs");
 const Tag_1 = require("../../../components/Tag");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const Flex_1 = require("../../../components/Flex");
-const renderStyledColumnWizardSettingsSummary = (data) => {
+const renderStyledColumnBadgeRowsSummary = (data) => {
     const badgeStyle = data;
     return (React.createElement(Flex_1.Box, { className: "twa:p-2" },
         React.createElement(Flex_1.Box, { className: "twa:mt-3" },
@@ -26,82 +26,82 @@ const renderStyledColumnWizardSettingsSummary = (data) => {
             "Total Rows ",
             React.createElement(Tag_1.Tag, null, badgeStyle.RowScope?.ExcludeTotalRows ? 'no' : 'yes'))));
 };
-exports.renderStyledColumnWizardSettingsSummary = renderStyledColumnWizardSettingsSummary;
-const StyledColumnWizardSettingsSection = (props) => {
+exports.renderStyledColumnBadgeRowsSummary = renderStyledColumnBadgeRowsSummary;
+const StyledColumnBadgeRowsSection = (props) => {
     const { data } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    const onExcludeDataRowsChanged = (ExcludeDataRows) => {
+    const onExcludeDataRowsChanged = (includeDataRows) => {
         props.onChange({
             ...data,
             BadgeStyle: {
                 ...data.BadgeStyle,
                 RowScope: {
                     ...data.BadgeStyle.RowScope,
-                    ExcludeDataRows,
+                    ExcludeDataRows: !includeDataRows,
                 },
             },
         });
     };
-    const onExcludeGroupedRowsChanged = (ExcludeGroupedRows) => {
+    const onExcludeGroupedRowsChanged = (includeGroupedRows) => {
         props.onChange({
             ...data,
             BadgeStyle: {
                 ...data.BadgeStyle,
                 RowScope: {
                     ...data.BadgeStyle.RowScope,
-                    ExcludeGroupRows: ExcludeGroupedRows,
+                    ExcludeGroupRows: !includeGroupedRows,
                 },
             },
         });
     };
-    const onExcludeSummaryRowsChanged = (ExcludeSummaryRows) => {
+    const onExcludeSummaryRowsChanged = (includeSummaryRows) => {
         props.onChange({
             ...data,
             BadgeStyle: {
                 ...data.BadgeStyle,
                 RowScope: {
                     ...data.BadgeStyle.RowScope,
-                    ExcludeSummaryRows,
+                    ExcludeSummaryRows: !includeSummaryRows,
                 },
             },
         });
     };
-    const onExcludeTotalRowsChanged = (ExcludeTotalRows) => {
+    const onExcludeTotalRowsChanged = (includeTotalRows) => {
         props.onChange({
             ...data,
             BadgeStyle: {
                 ...data.BadgeStyle,
                 RowScope: {
                     ...data.BadgeStyle.RowScope,
-                    ExcludeTotalRows,
+                    ExcludeTotalRows: !includeTotalRows,
                 },
             },
         });
     };
     return (React.createElement(Tabs_1.Tabs, null,
-        React.createElement(Tabs_1.Tabs.Tab, null, "Settings"),
+        React.createElement(Tabs_1.Tabs.Tab, null, "Row Types"),
         React.createElement(Tabs_1.Tabs.Content, null,
             React.createElement(Flex_1.Flex, { flexDirection: "row" },
                 React.createElement(FormLayout_1.default, null,
-                    React.createElement(FormLayout_1.FormRow, { label: "Exclude Data Rows:" },
+                    React.createElement(FormLayout_1.FormRow, { label: "Data (leaf) Rows:" },
                         React.createElement(Flex_1.Flex, { alignItems: "center", className: "twa:ml-2" },
                             React.createElement(CheckBox_1.CheckBox, { "data-name": "exclude-data-rows-checkbox", className: "twa:mr-2", checked: 
                                 // @ts-ignore
-                                data.BadgeStyle.RowScope?.ExcludeDataRows, onChange: onExcludeDataRowsChanged }))),
-                    React.createElement(FormLayout_1.FormRow, { label: "Exclude Group Rows:" },
+                                !data.BadgeStyle.RowScope?.ExcludeDataRows, onChange: onExcludeDataRowsChanged }))),
+                    React.createElement(FormLayout_1.FormRow, { label: "Group Rows:" },
                         React.createElement(Flex_1.Flex, { alignItems: "center", className: "twa:ml-2" },
                             React.createElement(CheckBox_1.CheckBox, { className: "twa:mr-2", "data-name": "exclude-grouped-rows-checkbox", checked: 
                                 // @ts-ignore
-                                data.BadgeStyle.RowScope?.ExcludeGroupRows, onChange: onExcludeGroupedRowsChanged }))),
-                    React.createElement(FormLayout_1.FormRow, { label: "Exclude Row Summaries:" },
+                                !data.BadgeStyle.RowScope?.ExcludeGroupRows, onChange: onExcludeGroupedRowsChanged }))),
+                    React.createElement(FormLayout_1.FormRow, { label: "Summary Rows:" },
                         React.createElement(Flex_1.Flex, { alignItems: "center", className: "twa:ml-2" },
                             React.createElement(CheckBox_1.CheckBox, { "data-name": "exclude-summary-rows-checkbox", className: "twa:mr-2", checked: 
                                 // @ts-ignore
-                                data.BadgeStyle.RowScope?.ExcludeSummaryRows, onChange: onExcludeSummaryRowsChanged }))),
+                                !data.BadgeStyle.RowScope?.ExcludeSummaryRows, onChange: onExcludeSummaryRowsChanged }))),
                     ' ',
-                    React.createElement(FormLayout_1.FormRow, { label: "Exclude Total Rows:" },
+                    React.createElement(FormLayout_1.FormRow, { label: "Total Rows:" },
                         React.createElement(Flex_1.Flex, { alignItems: "center", className: "twa:ml-2" },
                             React.createElement(CheckBox_1.CheckBox, { "data-name": "exclude-total-rows-checkbox", className: "twa:mr-2", checked: 
                                 // @ts-ignore
-                                data.BadgeStyle.RowScope?.ExcludeTotalRows, onChange: onExcludeTotalRowsChanged }))))))));
+                                !data.BadgeStyle.RowScope?.ExcludeTotalRows, onChange: onExcludeTotalRowsChanged }))))))));
 };
-exports.StyledColumnWizardSettingsSection = StyledColumnWizardSettingsSection;
+exports.StyledColumnBadgeRowsSection = StyledColumnBadgeRowsSection;

package/src/View/StyledColumn/Wizard/StyledColumnWizard.js

@@ -12,7 +12,7 @@ const StyledColumnWizardTypeSection_1 = require("./StyledColumnWizardTypeSection
 const StyledColumnWizardColumnSection_1 = require("./StyledColumnWizardColumnSection");
 const StyledColumnWizardStyleSection_1 = require("./StyledColumnWizardStyleSection");
 const Helper_1 = require("../../../Utilities/Helpers/Helper");
-const StyledColumnWizardSettingsSection_1 = require("./StyledColumnWizardSettingsSection");
+const StyledColumnBadgeRowsSection_1 = require("./StyledColumnBadgeRowsSection");
 const StyledColumnSparklineSettingsSection_1 = require("./StyledColumnSparklineSettingsSection");
 const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
 const StyledColumnBadgeSection_1 = require("./StyledColumnBadgeSection");
@@ -52,15 +52,6 @@ const StyledColumnWizard = (props) => {
         }
         props.onFinishWizard(styledColumn);
     };
-    const AdditionalSettingSection = {
-        details: 'Apply Additional Settings',
-        renderSummary: StyledColumnWizardSettingsSection_1.renderStyledColumnWizardSettingsSummary,
-        render: () => {
-            return (React.createElement(Flex_1.Box, { className: "twa:p-2" },
-                React.createElement(StyledColumnWizardSettingsSection_1.StyledColumnWizardSettingsSection, { onChange: setStyledColumn })));
-        },
-        title: 'Settings',
-    };
     const specificSteps = [];
     if (styledColumn.SparklineStyle) {
         specificSteps.push({
@@ -97,6 +88,15 @@ const StyledColumnWizard = (props) => {
         );
     }
     else if (styledColumn.BadgeStyle) {
+        specificSteps.push({
+            details: 'Select the Rows where the Badge will be applied',
+            renderSummary: StyledColumnBadgeRowsSection_1.renderStyledColumnBadgeRowsSummary,
+            render: () => {
+                return (React.createElement(Flex_1.Box, { className: "twa:p-2" },
+                    React.createElement(StyledColumnBadgeRowsSection_1.StyledColumnBadgeRowsSection, { onChange: setStyledColumn })));
+            },
+            title: 'Rows',
+        });
         specificSteps.push({
             title: 'Badges',
             details: 'Create Badge Styles',
@@ -114,7 +114,6 @@ const StyledColumnWizard = (props) => {
             render: () => (React.createElement(Flex_1.Box, { className: "twa:p-2" },
                 React.createElement(StyledColumnBadgeSection_1.StyledColumnBadgeSection, { onChange: setStyledColumn }))),
         });
-        specificSteps.push(AdditionalSettingSection);
     }
     return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: styledColumn, onFinish: handleFinish, onHide: props.onCloseWizard, sections: [
             {

package/src/agGrid/AdaptableAgGrid.js

@@ -91,6 +91,7 @@ const Modal_1 = require("../components/Modal");
 const AdaptableLoadingScreen_1 = require("../View/Components/Popups/AdaptableLoadingScreen");
 const react_1 = require("react");
 const createAgStatusPanelComponent_1 = require("../Utilities/createAgStatusPanelComponent");
+const only_1 = require("../Utilities/only");
 const weightedAverage_1 = require("../Utilities/weightedAverage");
 const RowSummary_1 = require("../AdaptableState/Common/RowSummary");
 const FlashingCellService_1 = require("../Utilities/Services/FlashingCellService");
@@ -1084,6 +1085,9 @@ class AdaptableAgGrid {
          */
         this.agGridOptionsService.setGridOptionsProperty(gridOptions, 'aggFuncs', (original_aggFuncs) => {
             const aggregationFunctions = original_aggFuncs || {};
+            aggregationFunctions[AggregationColumns_1.ONLY_AGG_FN_NAME] = (params) => {
+                return (0, only_1.only)(params, params.column.getColId());
+            };
             aggregationFunctions[AggregationColumns_1.WEIGHTED_AVERAGE_AGG_FN_NAME] = (params) => {
                 const columnId = params.column.getColId();
                 const adaptableAggFunc = this.getActiveAdaptableAggFuncForCol(columnId);
@@ -1466,6 +1470,18 @@ class AdaptableAgGrid {
                 caseSensitive: !!this.adaptableOptions.quickSearchOptions.isQuickSearchCaseSensitive,
             };
         });
+        /**
+         * suppressOverlays
+         */
+        this.agGridOptionsService.setGridOptionsProperty(gridOptions, 'suppressOverlays', (original_suppressOverlays) => {
+            // we want to suppress the exporting overlay because having it enabled will turn api.exportDataAsExcel() and api.exportDataAsCsv() into async operations,
+            // see #export_data_synchronously
+            let suppressOverlays = original_suppressOverlays || [];
+            if (!suppressOverlays.includes('exporting')) {
+                suppressOverlays.push('exporting');
+            }
+            return suppressOverlays;
+        });
     }
     /**
      * Either initializes the AG Grid instance or delegates it to the framework wrappers (React/Anglar)

package/src/agGrid/AgGridAdapter.js

@@ -475,8 +475,8 @@ class AgGridAdapter {
             ? 'number'
             : this.deriveAdaptableColumnDataType(agGridColumn, false);
         const isTreeColumn = this.isTreeColumn(isGeneratedRowGroupColumn);
-        const alwaysHidden = this.adaptableApi.columnApi.internalApi.isAlwaysHiddenColumn(colDef);
-        const visible = !alwaysHidden || agGridColumn.isVisible();
+        const isUIHiddenColumn = this.adaptableApi.columnApi.internalApi.isColumnUIHidden(colDef);
+        const visible = !isUIHiddenColumn || agGridColumn.isVisible();
         const isGenerated = isGeneratedRowGroupColumn || isGeneratedPivotResultColumn || isGeneratedSelectionColumn;
         const abColumn = {
             Uuid: (0, Uuid_1.createUuid)(),
@@ -486,9 +486,9 @@ class AgGridAdapter {
             resizable: colDef.resizable !== false,
             friendlyName: friendlyName,
             isPrimaryKey: ColumnId === pkColumn,
-            dataType: dataType,
+            dataType,
             visible,
-            alwaysHidden,
+            isUIHiddenColumn,
             readOnly: this.isColumnReadonly(colDef),
             columnGroup: ColumnGroup,
             fieldOnly: isGenerated ? false : this.isColumnFieldonly(colDef),

package/src/agGrid/AgGridExportAdapter.d.ts

@@ -1,8 +1,8 @@
-import { AdaptableAgGrid } from './AdaptableAgGrid';
-import { Report, ReportFormatType } from '../AdaptableState/ExportState';
 import { CsvExportParams, ExcelExportParams, ExcelStyle } from 'ag-grid-enterprise';
 import { CustomExportParams, ExportDestinationType, ExportResultData } from '../AdaptableOptions/ExportOptions';
+import { Report, ReportFormatType } from '../AdaptableState/ExportState';
 import { Layout } from '../AdaptableState/LayoutState';
+import { AdaptableAgGrid } from './AdaptableAgGrid';
 export interface ExportConfig {
     report: Report;
     format: ReportFormatType;

package/src/agGrid/AgGridExportAdapter.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgGridExportAdapter = void 0;
 const tslib_1 = require("tslib");
-const ModuleConstants_1 = require("../Utilities/Constants/ModuleConstants");
-const waitForTimeout_1 = require("../Utilities/waitForTimeout");
-const StyleHelper_1 = require("../Utilities/Helpers/StyleHelper");
-const FormatHelper_1 = tslib_1.__importStar(require("../Utilities/Helpers/FormatHelper"));
 const tinycolor2_1 = tslib_1.__importDefault(require("tinycolor2"));
-const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
-const Uuid_1 = require("../AdaptableState/Uuid");
 const udsv_1 = require("udsv");
+const Uuid_1 = require("../AdaptableState/Uuid");
 const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
+const ModuleConstants_1 = require("../Utilities/Constants/ModuleConstants");
+const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
+const FormatHelper_1 = tslib_1.__importStar(require("../Utilities/Helpers/FormatHelper"));
+const StyleHelper_1 = require("../Utilities/Helpers/StyleHelper");
+const waitForTimeout_1 = require("../Utilities/waitForTimeout");
 class AgGridExportAdapter {
     _adaptableInstance;
     /**
@@ -91,6 +91,7 @@ class AgGridExportAdapter {
                 this.patchExcelStyles(exportContext);
                 excelStylesWerePatched = true;
             }
+            // see #export_data_synchronously
             // 1. easiest case, we download the file using AG Grid
             // these methods will automatically handle the file download
             if (exportContext.destination === 'Download' && exportContext.isExcelReport) {

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     NEXT_PUBLIC_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: 1771235615659 || Date.now(),
-    VERSION: "22.0.0-canary.12" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1771515655455 || Date.now(),
+    VERSION: "22.0.0-canary.14" || '--current-version--',
 };