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

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/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/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: 1771243592812 || Date.now(),
+    VERSION: "22.0.0-canary.13" || '--current-version--',
 };