@adaptabletools/adaptable-cjs 22.0.0-canary.9 → 22.0.1-canary.0

package/src/Utilities/weightedAverage.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.weightedAverage = exports.getNumericValue = void 0;
 const tslib_1 = require("tslib");
-const toNumber_1 = tslib_1.__importDefault(require("lodash/toNumber"));
+const toNumber_1 = tslib_1.__importDefault(require("./utils/toNumber"));
 const getNumericValue = (input) => {
     if (typeof input === 'number') {
         return input;
@@ -11,56 +11,70 @@ const getNumericValue = (input) => {
     return isNaN(numericValue) ? null : numericValue;
 };
 exports.getNumericValue = getNumericValue;
-function getWeightedAverageLeafNodes(gridApi, groupRowNode, filteredOnly) {
-    const nodeList = (filteredOnly ? groupRowNode.childrenAfterFilter : groupRowNode.childrenAfterGroup) ?? [];
-    let leafNodes = [];
-    nodeList.forEach((rowNode) => {
-        if (rowNode.group === true) {
-            // Recursively extract leaf nodes from group
-            leafNodes = leafNodes.concat(getWeightedAverageLeafNodes(gridApi, rowNode, filteredOnly));
-        }
-        else {
-            leafNodes.push(rowNode);
-        }
-    });
-    return leafNodes;
-}
+/**
+ * Computes a weighted average aggregation: Σ(value × weight) / Σ(weight)
+ *
+ * AG Grid calls agg functions bottom-up through the group hierarchy. For each group:
+ * - Leaf children contribute their raw value × weight
+ * - Sub-group children already have partial sums from a previous pass,
+ *   so we combine those directly instead of re-traversing to leaves
+ *
+ * The returned object stores partial sums ([columnId] and [weightColumnId])
+ * so parent groups can combine sub-group results correctly.
+ */
 const weightedAverage = (params, columnId, weightColumnId) => {
-    const { api: gridApi, rowNode: groupRowNode } = params;
-    let weightedColumnValueSum = 0;
-    let columnValueSum = 0;
-    const filteredOnly = !gridApi.getGridOption('suppressAggFilteredOnly');
-    const leafNodes = getWeightedAverageLeafNodes(gridApi, groupRowNode, filteredOnly);
-    leafNodes.forEach((rowNode) => {
-        // when editing values might be converted to strings
-        const rawColumnValue = gridApi.getCellValue({ colKey: columnId, rowNode });
-        const columnValue = (0, exports.getNumericValue)(rawColumnValue);
-        const rawWeightedColumnValue = gridApi.getCellValue({ colKey: weightColumnId, rowNode });
-        const weightedColumnValue = (0, exports.getNumericValue)(rawWeightedColumnValue);
-        if (weightedColumnValue !== null) {
-            weightedColumnValueSum += weightedColumnValue;
+    const { api: gridApi, rowNode: groupRowNode, values } = params;
+    // numerator: Σ(value × weight)
+    let weightedValueSum = 0;
+    // denominator: Σ(weight)
+    let totalWeight = 0;
+    // params.values already respects suppressAggFilteredOnly.
+    // We need the matching child nodes only for leaf rows (to look up weight column values).
+    const childNodes = getMatchingChildNodes(groupRowNode, values.length);
+    for (let i = 0; i < values.length; i++) {
+        const value = values[i];
+        if (value != null && typeof value === 'object') {
+            // sub-group: partial sums already computed by a previous aggregation pass
+            weightedValueSum += value[columnId] ?? 0;
+            totalWeight += value[weightColumnId] ?? 0;
         }
-        if (columnValue !== null) {
-            columnValueSum += columnValue * weightedColumnValue;
+        else {
+            // leaf row: compute value × weight from cell data
+            const childNode = childNodes[i];
+            if (!childNode) {
+                continue;
+            }
+            // values might be strings during editing
+            const columnValue = (0, exports.getNumericValue)(value);
+            const weightValue = (0, exports.getNumericValue)(gridApi.getCellValue({ colKey: weightColumnId, rowNode: childNode }));
+            if (weightValue !== null) {
+                totalWeight += weightValue;
+            }
+            if (columnValue !== null && weightValue !== null) {
+                weightedValueSum += columnValue * weightValue;
+            }
         }
-    });
-    let result = columnValueSum / weightedColumnValueSum;
-    // 0 / 0 = NaN
-    if (isNaN(result)) {
-        result = 0;
     }
+    const result = totalWeight !== 0 ? weightedValueSum / totalWeight : 0;
     return {
-        // the grid by default uses toString to render values for an object, so this
-        // is a trick to get the default cellRenderer to display the avg value
-        toString: () => {
-            return String(result);
-        },
-        // used for sorting
-        toNumber: function () {
-            return result;
-        },
-        [columnId]: columnValueSum,
-        [weightColumnId]: weightedColumnValueSum,
+        // toString/toNumber let AG Grid's default cell renderer display and sort the value
+        toString: () => String(result),
+        toNumber: () => result,
+        // partial sums stored so parent groups can combine sub-group results
+        [columnId]: weightedValueSum,
+        [weightColumnId]: totalWeight,
     };
 };
 exports.weightedAverage = weightedAverage;
+/**
+ * Returns the child node list that corresponds to params.values.
+ * When suppressAggFilteredOnly is false, params.values comes from childrenAfterFilter.
+ * When true, it comes from childrenAfterGroup (all children).
+ * We match by length to pick the right list without checking the grid option directly.
+ */
+function getMatchingChildNodes(groupRowNode, valueCount) {
+    if (groupRowNode.childrenAfterFilter?.length === valueCount) {
+        return groupRowNode.childrenAfterFilter;
+    }
+    return groupRowNode.childrenAfterGroup ?? [];
+}

package/src/View/AdaptableComputedCSSVarsContext.js

@@ -4,7 +4,7 @@ exports.useAdaptableComputedCSSVar = exports.useAdaptableComputedCSSVars = expor
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const CSSNumericVariableWatch_1 = require("../components/Select/CSSNumericVariableWatch");
-const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
+const debounce_1 = tslib_1.__importDefault(require("../Utilities/utils/debounce"));
 const react_1 = require("react");
 const computedCSSVarNames = [
     '--ab-cmp-select-menu__max-width',

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ColumnsList.js

@@ -11,7 +11,7 @@ const react_1 = require("react");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/StringExtensions"));
 const InfiniteTable_1 = require("../../../components/InfiniteTable");
 const Flex_1 = require("../../../components/Flex");
-const throttle_1 = tslib_1.__importDefault(require("lodash/throttle"));
+const throttle_1 = tslib_1.__importDefault(require("../../../Utilities/utils/throttle"));
 const twMerge_1 = require("../../../twMerge");
 const dataTypes = [
     {

package/src/View/Alert/Wizard/AlertButtonsEditor.js

@@ -12,7 +12,7 @@ const StringExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/E
 const AdaptableIconSelector_1 = require("../../Components/AdaptableIconSelector");
 const Select_1 = require("../../../components/Select");
 const Flex_1 = require("../../../components/Flex");
-const sentence_case_1 = require("sentence-case");
+const sentenceCase_1 = tslib_1.__importDefault(require("../../../Utilities/utils/sentenceCase"));
 function renderCommand(command) {
     switch (command) {
         case 'highlight-cell':
@@ -225,7 +225,7 @@ const AlertButtonsEditor = (props) => {
                         buttonCommands.map((commandName) => {
                             return (React.createElement(CheckBox_1.CheckBox, { key: commandName, className: "twa:mr-3", onChange: (checked) => handleCommandChange(checked, commandName), checked: button.Command === commandName ||
                                     (Array.isArray(button.Command) && button.Command.includes(commandName)) },
-                                React.createElement(Flex_1.Box, { className: "twa:text-2" }, (0, sentence_case_1.sentenceCase)(commandName))));
+                                React.createElement(Flex_1.Box, { className: "twa:text-2" }, (0, sentenceCase_1.default)(commandName))));
                         }),
                         btnUserFunctions.length ? (React.createElement(CheckBox_1.CheckBox, { checked: true, disabled: true },
                             React.createElement(Flex_1.Box, { className: "twa:text-2" },

package/src/View/Charting/ChartingWizard/AgChargingWizard/PreviewChartSection.js

@@ -4,7 +4,7 @@ exports.PreviewChartSection = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
-const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
+const isEqual_1 = tslib_1.__importDefault(require("../../../../Utilities/utils/isEqual"));
 const InternalRedux = tslib_1.__importStar(require("../../../../Redux/ActionsReducers/InternalRedux"));
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const PreviewChartSection = (props) => {

package/src/View/Components/ColumnFilter/components/ColumnFilterInput.js

@@ -8,7 +8,7 @@ const AdaptableInput_1 = tslib_1.__importDefault(require("../../AdaptableInput")
 const AdaptableDateInlineInput_1 = require("../../AdaptableInput/AdaptableDateInlineInput");
 const PermittedValuesSelector_1 = require("../../Selectors/PermittedValuesSelector");
 const AdaptableContext_1 = require("../../../AdaptableContext");
-const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
+const debounce_1 = tslib_1.__importDefault(require("../../../../Utilities/utils/debounce"));
 const react_1 = require("react");
 function debounceOrImmediate(fn, time) {
     return time && time > 0 ? (0, debounce_1.default)(fn, time) : fn;

package/src/View/Components/ColumnFilter/components/ColumnFilterInputList.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ColumnFilterInputList = void 0;
 const tslib_1 = require("tslib");
-const lodash_1 = require("lodash");
+const debounce_1 = tslib_1.__importDefault(require("../../../../Utilities/utils/debounce"));
 const React = tslib_1.__importStar(require("react"));
 const utils_1 = require("../../../../components/ExpressionEditor/QueryBuilder/utils");
 const Panel_1 = tslib_1.__importDefault(require("../../../../components/Panel"));
@@ -21,7 +21,7 @@ const ColumnFilterInputList = (props) => {
     const matchingInputs = predicateDef
         ? (0, utils_1.getOperatorMatchingInputs)(fnTypeInput, predicateDef?.inputs, true)
         : [];
-    const debouncedPredicateChange = React.useCallback((0, lodash_1.debounce)((predicate) => {
+    const debouncedPredicateChange = React.useCallback((0, debounce_1.default)((predicate) => {
         props.onPredicateChange(predicate);
     }, 300), [props.predicate, props.columnId]);
     if (['date[]', 'number[]', 'text[]'].includes(matchingInputs[0])) {

package/src/View/Components/ColumnFilter/components/FloatingFilterInputList.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FloatingFilterInputList = void 0;
 const tslib_1 = require("tslib");
-const lodash_1 = require("lodash");
+const debounce_1 = tslib_1.__importDefault(require("../../../../Utilities/utils/debounce"));
 const React = tslib_1.__importStar(require("react"));
 const utils_1 = require("../../../../components/ExpressionEditor/QueryBuilder/utils");
 const adaptableQlUtils_1 = require("../../../../Utilities/adaptableQlUtils");
@@ -20,7 +20,7 @@ const FloatingFilterInputList = (props) => {
     const matchingInputs = predicateDef
         ? (0, utils_1.getOperatorMatchingInputs)(fnTypeInput, predicateDef?.inputs, true)
         : [];
-    const debouncedPredicateChange = React.useCallback((0, lodash_1.debounce)((predicate) => {
+    const debouncedPredicateChange = React.useCallback((0, debounce_1.default)((predicate) => {
         props.onPredicateChange(predicate);
     }, 300), [props.predicate, props.columnId]);
     if (['date[]', 'number[]', 'text[]'].includes(matchingInputs[0])) {

package/src/View/Components/RangesComponent.js

@@ -4,7 +4,7 @@ exports.RangesComponent = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const ColorPicker_1 = require("../../components/ColorPicker");
-const clamp_1 = tslib_1.__importDefault(require("lodash/clamp"));
+const clamp_1 = tslib_1.__importDefault(require("../../Utilities/utils/clamp"));
 const CheckBox_1 = require("../../components/CheckBox");
 const FormLayout_1 = tslib_1.__importStar(require("../../components/FormLayout"));
 const NumberInput_1 = require("../../components/Input/NumberInput");

package/src/View/Components/Selectors/PermittedValuesSelector.js

@@ -102,6 +102,6 @@ const PermittedValuesSelector = function (props) {
             reload();
         }
     };
-    return (React.createElement(Select_1.Select, { "aria-label": "Permitted Values Selector", searchable: props.searchable, size: props.size, isMulti: props.isMulti, className: props.className, disabled: props.disabled, closeMenuOnSelect: !props.isMulti, "data-name": "permitted-values-selector", placeholder: props.placeholder || (props.allowNewValues ? 'Select or type new value' : 'Select value'), isCreatable: isCreatable, isClearable: true, onMenuOpen: reload, options: options, isLoading: isLoading, onInputChange: onInputChange, onChange: handleOnChange, onFocus: props.onFocus, onBlur: props.onBlur, value: props.value }));
+    return (React.createElement(Select_1.Select, { "aria-label": "Permitted Values Selector", searchable: props.searchable ?? 'menulist', size: props.size, isMulti: props.isMulti, className: props.className, disabled: props.disabled, closeMenuOnSelect: !props.isMulti, "data-name": "permitted-values-selector", placeholder: props.placeholder || (props.allowNewValues ? 'Select or type new value' : 'Select value'), isCreatable: isCreatable, isClearable: true, onMenuOpen: reload, options: options, isLoading: isLoading, onInputChange: onInputChange, onChange: handleOnChange, onFocus: props.onFocus, onBlur: props.onBlur, value: props.value }));
 };
 exports.PermittedValuesSelector = PermittedValuesSelector;

package/src/View/Components/ToolPanel/AdaptableToolPanel.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAdaptableToolPanelAgGridComponent = exports.ConnectedAdaptableToolPanel = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const kebabCase_1 = tslib_1.__importDefault(require("lodash/kebabCase"));
+const kebabCase_1 = tslib_1.__importDefault(require("../../../Utilities/utils/kebabCase"));
 const ToolPanelRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/ToolPanelRedux"));
 const react_redux_1 = require("react-redux");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/ArrayExtensions"));

package/src/View/Components/ToolPanel/CustomToolPanelContent.js

@@ -7,7 +7,7 @@ const react_1 = require("react");
 const AdaptableContext_1 = require("../../AdaptableContext");
 const uuid_1 = require("../../../components/utils/uuid");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));
-const kebabCase_1 = tslib_1.__importDefault(require("lodash/kebabCase"));
+const kebabCase_1 = tslib_1.__importDefault(require("../../../Utilities/utils/kebabCase"));
 const CustomToolPanelContent = (props) => {
     const { customToolPanel } = props;
     const { api } = (0, AdaptableContext_1.useAdaptable)();

package/src/View/Components/ValueSelector/index.js

@@ -164,7 +164,12 @@ const renderSelectionSection = (props) => {
     const { value, options, disabled, singleSelect, toLabel, toIdentifier, } = props;
     const selectionBox = (React.createElement(Flex_1.Box, { className: "twa:flex twa:flex-col twa:gap-2 twa:py-2" },
         React.createElement(Flex_1.Box, { className: (0, clsx_1.default)('twa:flex twa:flex-row', 'twa:border-b twa:border-primarydark/30 twa:rounded-standard') },
-            React.createElement(CheckBox_1.CheckBox, { className: "twa:ml-0.5 twa:font-bold", checked: !value.length ? false : value.length === options.length ? true : null, onChange: (checked) => {
+            singleSelect ? (React.createElement(Flex_1.Box, { className: "twa:flex twa:flex-row twa:text-3 twa:font-normal" },
+                "(",
+                value.length,
+                " of ",
+                options.length,
+                " selected)")) : (React.createElement(CheckBox_1.CheckBox, { className: "twa:ml-0.5 twa:font-bold", checked: !value.length ? false : value.length === options.length ? true : null, onChange: (checked) => {
                     if (checked) {
                         props.onSelectAll();
                     }
@@ -179,7 +184,7 @@ const renderSelectionSection = (props) => {
                         value.length,
                         " of ",
                         options.length,
-                        " selected)"))),
+                        " selected)")))),
             React.createElement("div", { className: "twa:flex-1" }),
             React.createElement(Flex_1.Box, { className: "twa:mr-2 twa:text-2 twa:font-normal" }, props.showOnlySelectedCheckbox))));
     return React.createElement(Flex_1.Box, { className: (0, clsx_1.default)(`${baseClassName}__header `) }, selectionBox);

package/src/View/Dashboard/CustomDashboardButton.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
-const kebabCase_1 = tslib_1.__importDefault(require("lodash/kebabCase"));
+const kebabCase_1 = tslib_1.__importDefault(require("../../Utilities/utils/kebabCase"));
 const CustomDashboardButton = (props) => {
     const { button } = props;
     const [componentRevision, setComponentRevision] = (0, react_1.useState)(1);

package/src/View/Dashboard/Dashboard.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Dashboard = void 0;
 const tslib_1 = require("tslib");
-const kebabCase_1 = tslib_1.__importDefault(require("lodash/kebabCase"));
+const kebabCase_1 = tslib_1.__importDefault(require("../../Utilities/utils/kebabCase"));
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const Dashboard_1 = require("../../components/Dashboard");

package/src/View/Dashboard/DashboardPopup.js

@@ -75,9 +75,10 @@ class DashboardPopupComponent extends React.Component {
                     React.createElement(Card_1.Card, null,
                         React.createElement(Card_1.Card.Title, { gap: 8 }, "Display Settings"),
                         React.createElement(Card_1.Card.Body, { gap: 2, className: "twa:p-2" },
-                            React.createElement(ToggleButton_1.ToggleButton, { className: "twa:w-24", onChange: (visible) => this.props.onSetDashboardHidden(!visible), checked: !this.props.IsHidden, "data-name": "dashboard-visibility" }, this.props.IsHidden ? 'Hidden' : 'Visible'),
-                            this.props.DashboardState.Tabs?.length > 0 ? (React.createElement(ToggleButton_1.ToggleButton, { disabled: this.props.IsFloating, className: "twa:w-24", onChange: (expanded) => this.props.onSetDashboardCollapsed(!expanded), checked: !this.props.IsCollapsed, "data-name": "expand-state" }, this.props.IsCollapsed ? 'Collapsed' : 'Expanded')) : null,
-                            this.props.api.optionsApi.getDashboardOptions().canFloat ? (React.createElement(ToggleButton_1.ToggleButton, { className: "twa:w-24", onChange: (pinned) => this.props.onSetDashboardFloating(!pinned), checked: !this.props.IsFloating, "data-name": "floating" }, this.props.IsFloating ? 'Floating' : 'Pinned')) : null)))),
+                            React.createElement("div", { className: "twa:flex twa:flex-row twa:items-center twa:justify-start twa:gap-3" },
+                                React.createElement(ToggleButton_1.ToggleButton, { className: "twa:w-24", onChange: (visible) => this.props.onSetDashboardHidden(!visible), checked: !this.props.IsHidden, "data-name": "dashboard-visibility" }, this.props.IsHidden ? 'Hidden' : 'Visible'),
+                                this.props.DashboardState.Tabs?.length > 0 ? (React.createElement(ToggleButton_1.ToggleButton, { disabled: this.props.IsFloating, className: "twa:w-24", onChange: (expanded) => this.props.onSetDashboardCollapsed(!expanded), checked: !this.props.IsCollapsed, "data-name": "expand-state" }, this.props.IsCollapsed ? 'Collapsed' : 'Expanded')) : null,
+                                this.props.api.optionsApi.getDashboardOptions().canFloat ? (React.createElement(ToggleButton_1.ToggleButton, { className: "twa:w-24", onChange: (pinned) => this.props.onSetDashboardFloating(!pinned), checked: !this.props.IsFloating, "data-name": "floating" }, this.props.IsFloating ? 'Floating' : 'Pinned')) : null))))),
                 React.createElement(Card_1.Card, { className: "twa:flex-1 twa:overflow-hidden", gap: 0 },
                     React.createElement(Card_1.Card.Title, null, "Contents"),
                     React.createElement(Card_1.Card.Body, { className: "twa:p-2" },

package/src/View/DataImport/DataImportWizard/sections/DataPreview.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataPreview = void 0;
 const tslib_1 = require("tslib");
-const flatten_1 = tslib_1.__importDefault(require("lodash/flatten"));
+const flatten_1 = tslib_1.__importDefault(require("../../../../Utilities/utils/flatten"));
 const React = tslib_1.__importStar(require("react"));
 const HelpBlock_1 = tslib_1.__importDefault(require("../../../../components/HelpBlock"));
 const icons_1 = require("../../../../components/icons");

package/src/View/DataSet/DataSetViewPanel.d.ts

@@ -16,8 +16,8 @@ declare class DataSetViewPanelComponent extends React.Component<DataSetViewPanel
     onSelectedDataSetChanged(dataSetName: string): void;
 }
 export declare let DataSetViewPanelControl: import("react-redux").ConnectedComponent<typeof DataSetViewPanelComponent, {
-    ref?: React.Ref<DataSetViewPanelComponent>;
     key?: React.Key | null | undefined;
+    ref?: React.Ref<DataSetViewPanelComponent>;
     context?: React.Context<import("react-redux").ReactReduxContextValue<any, import("redux").UnknownAction>>;
     store?: import("redux").Store;
 }>;

package/src/View/Export/Wizard/NewReportWizard.js

@@ -39,6 +39,14 @@ const NewReportWizard = (props) => {
         props.onFinishWizard(report);
     };
     return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: report, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
+            {
+                title: 'Name',
+                details: 'Enter the name of the Report',
+                isValid: ReportNameWizardSection_1.isValidReportName,
+                renderSummary: ReportNameWizardSection_1.renderReportNameSummary,
+                render: () => (React.createElement(Flex_1.Box, { className: "twa:p-2" },
+                    React.createElement(ReportNameWizardSection_1.ReportNameWizardSection, { onChange: setReport }))),
+            },
             {
                 title: 'Columns',
                 details: 'Choose the Columns you want to include in the Report',
@@ -52,14 +60,6 @@ const NewReportWizard = (props) => {
                 renderSummary: ReportRowsWizardSection_1.renderReportRowsSummary,
                 render: () => React.createElement(ReportRowsWizardSection_1.ReportRowsWizardSection, { onChange: setReport }),
             },
-            {
-                title: 'Name',
-                details: 'Enter the name of the Report',
-                isValid: ReportNameWizardSection_1.isValidReportName,
-                renderSummary: ReportNameWizardSection_1.renderReportNameSummary,
-                render: () => (React.createElement(Flex_1.Box, { className: "twa:p-2" },
-                    React.createElement(ReportNameWizardSection_1.ReportNameWizardSection, { onChange: setReport }))),
-            },
             {
                 details: 'Select Report Tags',
                 title: 'Tags',

package/src/View/Filter/FilterViewPanel.d.ts

@@ -18,8 +18,8 @@ declare class FilterViewPanelComponent extends React.Component<FilterViewPanelCo
     private onClearFilters;
 }
 export declare const FilterViewPanelControl: import("react-redux").ConnectedComponent<typeof FilterViewPanelComponent, {
-    ref?: React.Ref<FilterViewPanelComponent>;
     key?: React.Key | null | undefined;
+    ref?: React.Ref<FilterViewPanelComponent>;
     context?: React.Context<import("react-redux").ReactReduxContextValue<any, import("redux").UnknownAction>>;
     store?: import("redux").Store;
 }>;

package/src/View/FlashingCell/Wizard/FlashingCellSettingsWizardSection.js

@@ -86,15 +86,12 @@ const FlashingAlertSettingsWizardSection = (props) => {
             React.createElement(Tabs_1.Tabs.Content, null,
                 React.createElement(FormLayout_1.default, null,
                     React.createElement(FormLayout_1.FormRow, { label: "Name" },
-                        React.createElement(Input_1.default, { "data-name": "flashing-cell-name", className: "twa:flex-1 twa:mr-3", onChange: handleNameChange, placeholder: "Enter Name", value: flashingCell.Name ?? '' })),
-                    React.createElement(FormLayout_1.FormRow, { label: "Flash Target" },
-                        React.createElement(CheckBox_1.CheckBox, { "data-name": "flashing-target", onChange: (checked) => handleTargetChange('cell', checked), className: "twa:mr-3", checked: flashingCell?.FlashTarget === 'cell' ||
-                                flashingCell?.FlashTarget?.includes?.('cell'), tabIndex: -1 }, "Cell"),
-                        React.createElement(CheckBox_1.CheckBox, { "data-name": "flashing-target-row", className: "twa:mr-3", onChange: (checked) => handleTargetChange('row', checked), checked: flashingCell?.FlashTarget === 'row' ||
-                                flashingCell?.FlashTarget?.includes?.('row'), tabIndex: -1 }, "Row"),
-                        React.createElement(CheckBox_1.CheckBox, { "data-name": "flashing-target-aggFuncCell", onChange: (checked) => handleTargetChange('aggFuncCell', checked), checked: flashingCell?.FlashTarget === 'aggFuncCell' ||
-                                flashingCell?.FlashTarget?.includes?.('aggFuncCell'), tabIndex: -1 }, "Aggregated Function Cell")),
-                    React.createElement(FormLayout_1.FormRow, { label: "Duration" },
+                        React.createElement(Input_1.default, { "data-name": "flashing-cell-name", className: "twa:flex-1 twa:mr-3", onChange: handleNameChange, placeholder: "Enter Name", value: flashingCell.Name ?? '' }))))),
+        React.createElement(Tabs_1.Tabs, { autoFocus: false, className: "twa:p-2" },
+            React.createElement(Tabs_1.Tabs.Tab, null, "Flash Duration"),
+            React.createElement(Tabs_1.Tabs.Content, null,
+                React.createElement(FormLayout_1.default, null,
+                    React.createElement(FormLayout_1.FormRow, { label: "" },
                         React.createElement(Flex_1.Flex, { alignItems: "center" },
                             React.createElement(CheckBox_1.CheckBox, { "data-name": "duration-always", checked: duration === 'always', onChange: (checked) => handleTypeChange(checked ? 'always' : 'number'), className: "twa:mr-4", tabIndex: -1 }, "Always"),
                             duration !== 'always' && (React.createElement(React.Fragment, null,
@@ -102,6 +99,18 @@ const FlashingAlertSettingsWizardSection = (props) => {
                                         const value = event.target.value;
                                         setDuration(isNaN(Number(value)) ? 500 : Number(value));
                                     } }),
-                                React.createElement(Flex_1.Box, { className: "twa:text-2" }, "ms"))))))))));
+                                React.createElement(Flex_1.Box, { className: "twa:text-2" }, "ms")))))))),
+        ' ',
+        React.createElement(Tabs_1.Tabs, { autoFocus: false, className: "twa:p-2" },
+            React.createElement(Tabs_1.Tabs.Tab, null, "Flash Target"),
+            React.createElement(Tabs_1.Tabs.Content, null,
+                React.createElement(FormLayout_1.default, null,
+                    React.createElement(FormLayout_1.FormRow, { label: "" },
+                        React.createElement(CheckBox_1.CheckBox, { "data-name": "flashing-target", onChange: (checked) => handleTargetChange('cell', checked), className: "twa:mr-3", checked: flashingCell?.FlashTarget === 'cell' ||
+                                flashingCell?.FlashTarget?.includes?.('cell'), tabIndex: -1 }, "Cell"),
+                        React.createElement(CheckBox_1.CheckBox, { "data-name": "flashing-target-row", className: "twa:mr-3", onChange: (checked) => handleTargetChange('row', checked), checked: flashingCell?.FlashTarget === 'row' ||
+                                flashingCell?.FlashTarget?.includes?.('row'), tabIndex: -1 }, "Row"),
+                        React.createElement(CheckBox_1.CheckBox, { "data-name": "flashing-target-aggFuncCell", onChange: (checked) => handleTargetChange('aggFuncCell', checked), checked: flashingCell?.FlashTarget === 'aggFuncCell' ||
+                                flashingCell?.FlashTarget?.includes?.('aggFuncCell'), tabIndex: -1 }, "Aggregated Function Cell")))))));
 };
 exports.FlashingAlertSettingsWizardSection = FlashingAlertSettingsWizardSection;

package/src/View/FlashingCell/Wizard/FlashingCellWizard.js

@@ -77,7 +77,7 @@ const FlashingCellWizard = (props) => {
                 isValid: NewScopeComponent_1.isScopeValid,
                 render: () => React.createElement(FlashingCellScopeWizardSection_1.FlashingAlertScopeWizardSection, { onChange: setFlashingCell }),
                 renderSummary: BaseAlertScopeWizardSection_1.renderScopeSummary,
-                title: 'Scope',
+                title: 'Columns',
             },
             {
                 details: 'Build the Rules for when Cells should Flash',

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormatColumnFormatWizardSection = exports.getFormatDisplayTypeForScope = exports.renderFormatColumnFormatSummary = exports.getFormatColumnFormatSummaryValue = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const uniq_1 = tslib_1.__importDefault(require("lodash/uniq"));
-const clamp_1 = tslib_1.__importDefault(require("lodash/clamp"));
+const uniq_1 = tslib_1.__importDefault(require("../../../Utilities/utils/uniq"));
+const clamp_1 = tslib_1.__importDefault(require("../../../Utilities/utils/clamp"));
 const HelpBlock_1 = tslib_1.__importDefault(require("../../../components/HelpBlock"));
 const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));

package/src/View/FormatColumn/Wizard/FormatColumnRowScopeWizardSection.d.ts

@@ -0,0 +1,8 @@
+import * as React from 'react';
+import { FormatColumn } from '../../../AdaptableState/FormatColumnState';
+type FormatColumnRowScopeWizardSectionProps = {
+    onChange: (data: FormatColumn) => void;
+};
+export declare const renderFormatColumnRowScopeSummary: (data: FormatColumn) => React.JSX.Element;
+export declare const FormatColumnRowScopeWizardSection: (props: FormatColumnRowScopeWizardSectionProps) => React.JSX.Element;
+export {};

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

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormatColumnRowScopeWizardSection = exports.renderFormatColumnRowScopeSummary = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
+const CheckBox_1 = require("../../../components/CheckBox");
+const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
+const Tag_1 = require("../../../components/Tag");
+const Flex_1 = require("../../../components/Flex");
+const Tabs_1 = require("../../../components/Tabs");
+const renderFormatColumnRowScopeSummary = (data) => {
+    return (React.createElement(Flex_1.Box, { className: "twa:p-2" },
+        React.createElement(Flex_1.Box, { className: "twa:mt-3" },
+            "Data Rows ",
+            React.createElement(Tag_1.Tag, null, data.RowScope?.ExcludeDataRows ? 'no' : 'yes')),
+        ' ',
+        React.createElement(Flex_1.Box, { className: "twa:mt-3" },
+            "Group Rows ",
+            React.createElement(Tag_1.Tag, null, data.RowScope?.ExcludeGroupRows ? 'no' : 'yes')),
+        React.createElement(Flex_1.Box, { className: "twa:mt-3" },
+            "Summary Rows ",
+            React.createElement(Tag_1.Tag, null, data.RowScope?.ExcludeSummaryRows ? 'no' : 'yes')),
+        React.createElement(Flex_1.Box, { className: "twa:mt-3" },
+            "Total Rows ",
+            React.createElement(Tag_1.Tag, null, data.RowScope?.ExcludeTotalRows ? 'no' : 'yes'))));
+};
+exports.renderFormatColumnRowScopeSummary = renderFormatColumnRowScopeSummary;
+const FormatColumnRowScopeWizardSection = (props) => {
+    const { data } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
+    const onExcludeDataRowsChanged = (includeDataRows) => {
+        props.onChange({
+            ...data,
+            RowScope: {
+                ...data.RowScope,
+                ExcludeDataRows: !includeDataRows,
+            },
+        });
+    };
+    const onExcludeGroupedRowsChanged = (includeGroupedRows) => {
+        props.onChange({
+            ...data,
+            RowScope: {
+                ...data.RowScope,
+                ExcludeGroupRows: !includeGroupedRows,
+            },
+        });
+    };
+    const onExcludeSummaryRowsChanged = (includeSummaryRows) => {
+        props.onChange({
+            ...data,
+            RowScope: {
+                ...data.RowScope,
+                ExcludeSummaryRows: !includeSummaryRows,
+            },
+        });
+    };
+    const onExcludeTotalRowsChanged = (includeTotalRows) => {
+        props.onChange({
+            ...data,
+            RowScope: {
+                ...data.RowScope,
+                ExcludeTotalRows: !includeTotalRows,
+            },
+        });
+    };
+    return (React.createElement(Flex_1.Flex, { flexDirection: "column", style: { height: '100%' } },
+        React.createElement(Tabs_1.Tabs, { className: "twa:mb-3" },
+            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, data.Target === 'cell' && (React.createElement(React.Fragment, null,
+                        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": "include-data-rows-checkbox", checked: !data.RowScope?.ExcludeDataRows, onChange: onExcludeDataRowsChanged, className: "twa:mr-2" }))),
+                        React.createElement(FormLayout_1.FormRow, { label: "Group Rows:" },
+                            React.createElement(Flex_1.Flex, { alignItems: "center", className: "twa:ml-2" },
+                                React.createElement(CheckBox_1.CheckBox, { "data-name": "include-grouped-rows-checkbox", checked: !data.RowScope?.ExcludeGroupRows, onChange: onExcludeGroupedRowsChanged, className: "twa:mr-2" }))),
+                        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": "include-summary-rows-checkbox", checked: !data.RowScope?.ExcludeSummaryRows, onChange: onExcludeSummaryRowsChanged, className: "twa:mr-2" }))),
+                        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": "include-total-rows-checkbox", checked: !data.RowScope?.ExcludeTotalRows, onChange: onExcludeTotalRowsChanged, className: "twa:mr-2" })))))))))));
+};
+exports.FormatColumnRowScopeWizardSection = FormatColumnRowScopeWizardSection;