@adaptabletools/adaptable-cjs 18.0.0-canary.3 → 18.0.0-canary.31

package/src/View/{Notes/NotesPopup.js → Note/NotePopup.js}

@@ -1,14 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NotesPopup = void 0;
+exports.NotePopup = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const InfiniteTable_1 = require("../../components/InfiniteTable");
-const NotesRedux_1 = require("../../Redux/ActionsReducers/NotesRedux");
+const NoteRedux_1 = require("../../Redux/ActionsReducers/NoteRedux");
+const format_1 = tslib_1.__importDefault(require("date-fns/format"));
 const AdaptableContext_1 = require("../AdaptableContext");
 const AdaptableButton_1 = require("../Components/AdaptableButton");
 const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
+const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const tableDOMProps = {
     style: {
         height: '100%',
@@ -16,10 +18,13 @@ const tableDOMProps = {
         // minHeight: 600,
     },
 };
-const NotesPopup = (props) => {
+const NotePopup = (props) => {
+    var _a, _b, _c, _d;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const primaryKeyHeader = adaptable.api.columnApi.getFriendlyNameForColumnId(adaptable.api.columnApi.getPrimaryKeyColumn().columnId);
-    const allNotes = (0, react_redux_1.useSelector)((state) => (0, NotesRedux_1.GetNotesSelector)(state.Notes));
+    const dateFormat = (_d = (_c = (_b = (_a = adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNoteOptions) === null || _b === void 0 ? void 0 : _b.call(_a)) === null || _c === void 0 ? void 0 : _c.dateFormat) !== null && _d !== void 0 ? _d : GeneralConstants_1.DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME;
+    const allNotes = (0, react_redux_1.useSelector)((state) => (0, NoteRedux_1.GetAllNotesSelector)(state.Note));
+    const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Note') === 'ReadOnly';
     const columnsMap = React.useMemo(() => {
         const columns = {
             primaryKey: {
@@ -28,32 +33,29 @@ const NotesPopup = (props) => {
             },
             column: {
                 field: 'ColumnId',
+                header: 'Column',
                 valueGetter: (params) => {
                     return adaptable.api.columnApi.getFriendlyNameForColumnId(params.data.ColumnId);
                 },
             },
-            note: {
-                field: 'Value',
-                header: 'Note',
-                defaultEditable: true,
+            text: {
+                field: 'Text',
+                header: 'Text',
+                defaultEditable: !isReadOnlyModule,
                 defaultFlex: 3,
             },
             timestamp: {
                 field: 'Timestamp',
                 valueGetter: (params) => {
-                    return new Date(params.data.Timestamp).toDateString();
+                    return (0, format_1.default)(params.data.Timestamp, dateFormat);
                 },
             },
-            author: {
-                header: 'Author',
-                valueGetter: (params) => params.data.Author.UserName,
-            },
             delete: {
                 defaultWidth: 50,
                 render: (params) => {
-                    return (React.createElement(AdaptableButton_1.AdaptableButtonComponent, { variant: "text", icon: "delete", onClick: () => {
-                            const note = adaptable.api.notesApi.getNoteByUuid(params.data.Uuid);
-                            adaptable.api.notesApi.deleteNote(note);
+                    return (React.createElement(AdaptableButton_1.AdaptableButtonComponent, { disabled: isReadOnlyModule, variant: "text", icon: "delete", onClick: () => {
+                            const note = adaptable.api.noteApi.getNoteByUuid(params.data.Uuid);
+                            adaptable.api.noteApi.deleteNote(note);
                         } }));
                 },
             },
@@ -68,8 +70,8 @@ const NotesPopup = (props) => {
                         if (change.type === 'update') {
                             const data = change.data;
                             const prevNote = allNotes.find((x) => x.Uuid === uuid);
-                            if (prevNote.Value !== data.Value) {
-                                adaptable.api.notesApi.updateNoteText(data.Value, prevNote);
+                            if (prevNote.Text !== data.Text) {
+                                adaptable.api.noteApi.updateNoteText(data.Text, prevNote);
                             }
                         }
                     }
@@ -80,9 +82,10 @@ const NotesPopup = (props) => {
                         align: 'start',
                         defaultFlex: 1,
                         defaultSortable: false,
+                        style: { fontSize: 'var(--ab-font-size-3)' },
                     },
                 }, headerOptions: {
                     alwaysReserveSpaceForSortIcon: false,
                 }, rowHeight: 40, columnHeaderHeight: 65, domProps: tableDOMProps, columns: columnsMap }))));
 };
-exports.NotesPopup = NotesPopup;
+exports.NotePopup = NotePopup;

package/src/View/SpecialColumnSettingsWizardStep.js

@@ -11,10 +11,10 @@ const Tabs_1 = require("../components/Tabs");
 const ModuleConstants_1 = require("../Utilities/Constants/ModuleConstants");
 const AdaptableContext_1 = require("./AdaptableContext");
 const SpecialColumnSettingsWizardStep = (props) => {
-    var _a, _b;
+    var _a, _b, _c;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const possibleColumnTypes = adaptable.api.optionsApi.getColumnOptions().columnTypes;
-    const { Filterable, Resizable, Groupable, Sortable, Pivotable, Aggregatable, SuppressMenu, SuppressMovable, } = (_a = props.settings) !== null && _a !== void 0 ? _a : {};
+    const possibleColumnTypes = (_a = adaptable.api.columnApi.getColumnTypes()) !== null && _a !== void 0 ? _a : [];
+    const { Filterable, Resizable, Groupable, Sortable, Pivotable, Aggregatable, SuppressMenu, SuppressMovable, } = (_b = props.settings) !== null && _b !== void 0 ? _b : {};
     const handleColumnTypeChange = (columnType, checked) => {
         var _a, _b, _c;
         const columnTypes = (_b = (_a = props.settings) === null || _a === void 0 ? void 0 : _a.ColumnTypes) !== null && _b !== void 0 ? _b : [];
@@ -55,7 +55,7 @@ const SpecialColumnSettingsWizardStep = (props) => {
         Boolean(possibleColumnTypes === null || possibleColumnTypes === void 0 ? void 0 : possibleColumnTypes.length) && (React.createElement(Tabs_1.Tabs, { marginTop: 2, autoFocus: false },
             React.createElement(Tabs_1.Tabs.Tab, null, "Column Types"),
             React.createElement(Tabs_1.Tabs.Content, null,
-                React.createElement(FormLayout_1.default, { columns: [{ name: 'first', size: '30%' }, { name: 'second' }] }, (_b = (0, chunk_1.default)(possibleColumnTypes !== null && possibleColumnTypes !== void 0 ? possibleColumnTypes : [], 2)) === null || _b === void 0 ? void 0 : _b.map(([first, second]) => {
+                React.createElement(FormLayout_1.default, { columns: [{ name: 'first', size: '30%' }, { name: 'second' }] }, (_c = (0, chunk_1.default)(possibleColumnTypes !== null && possibleColumnTypes !== void 0 ? possibleColumnTypes : [], 2)) === null || _c === void 0 ? void 0 : _c.map(([first, second]) => {
                     var _a, _b, _c, _d, _e, _f;
                     return (React.createElement(FormLayout_1.FormRow, { key: first },
                         first && (React.createElement(CheckBox_1.CheckBox, { "data-name": first, onChange: (checked) => handleColumnTypeChange(first, checked), checked: (_c = (_b = (_a = props.settings) === null || _a === void 0 ? void 0 : _a.ColumnTypes) === null || _b === void 0 ? void 0 : _b.includes) === null || _c === void 0 ? void 0 : _c.call(_b, first) }, first)),

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

@@ -81,7 +81,7 @@ const StyledColumnWizard = (props) => {
                     React.createElement(StyledColumnWizardStyleSection_1.StyledColumnWizardStyleSection, { onChange: setStyledColumn })));
             },
             title: 'Style',
-        }, AdditionalSettingSection);
+        });
     }
     else if (styledColumn.BadgeStyle) {
         specificSteps.push({

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

@@ -4,35 +4,59 @@ exports.StyledColumnWizardSettingsSection = exports.renderStyledColumnWizardSett
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
-const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
 const CheckBox_1 = require("../../../components/CheckBox");
+const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
 const Tabs_1 = require("../../../components/Tabs");
-const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const Tag_1 = require("../../../components/Tag");
-let alignmentOptions = [
-    { value: 'Left', label: 'Left' },
-    { value: 'Right', label: 'Right' },
-    { value: 'Center', label: 'Center' },
-];
+const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const renderStyledColumnWizardSettingsSummary = (data) => {
+    var _a, _b, _c;
+    const badgeStyle = data;
     return (React.createElement(rebass_1.Box, { padding: 2 },
         React.createElement(rebass_1.Text, { mt: 3 },
-            "Include grouped rows ",
-            React.createElement(Tag_1.Tag, null, data.IncludeGroupedRows ? 'yes' : 'no'))));
+            "Data Rows ",
+            React.createElement(Tag_1.Tag, null, ((_a = badgeStyle.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeDataRows) ? 'no' : 'yes')),
+        ' ',
+        React.createElement(rebass_1.Text, { mt: 3 },
+            "Grouped Rows ",
+            React.createElement(Tag_1.Tag, null, ((_b = badgeStyle.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupedRows) ? 'no' : 'yes')),
+        React.createElement(rebass_1.Text, { mt: 3 },
+            "Summary Rows ",
+            React.createElement(Tag_1.Tag, null, ((_c = badgeStyle.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeSummaryRows) ? 'no' : 'yes'))));
 };
 exports.renderStyledColumnWizardSettingsSummary = renderStyledColumnWizardSettingsSummary;
 const StyledColumnWizardSettingsSection = (props) => {
-    const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    const onIncludeGroupedRowsChanged = (IncludeGroupedRows) => {
-        props.onChange(Object.assign(Object.assign({}, data), { IncludeGroupedRows }));
+    var _a, _b, _c;
+    const { data } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
+    const onExcludeDataRowsChanged = (ExcludeDataRows) => {
+        props.onChange(Object.assign(Object.assign({}, data), { BadgeStyle: Object.assign(Object.assign({}, data.BadgeStyle), { RowScope: Object.assign(Object.assign({}, data.BadgeStyle.RowScope), { ExcludeDataRows }) }) }));
+    };
+    const onExcludeGroupedRowsChanged = (ExcludeGroupedRows) => {
+        props.onChange(Object.assign(Object.assign({}, data), { BadgeStyle: Object.assign(Object.assign({}, data.BadgeStyle), { RowScope: Object.assign(Object.assign({}, data.BadgeStyle.RowScope), { ExcludeGroupedRows }) }) }));
+    };
+    const onExcludeSummaryRowsChanged = (ExcludeSummaryRows) => {
+        props.onChange(Object.assign(Object.assign({}, data), { BadgeStyle: Object.assign(Object.assign({}, data.BadgeStyle), { RowScope: Object.assign(Object.assign({}, data.BadgeStyle.RowScope), { ExcludeSummaryRows }) }) }));
     };
     return (React.createElement(Tabs_1.Tabs, null,
         React.createElement(Tabs_1.Tabs.Tab, null, "Settings"),
         React.createElement(Tabs_1.Tabs.Content, null,
             React.createElement(rebass_1.Flex, { flexDirection: "row" },
                 React.createElement(FormLayout_1.default, null,
-                    React.createElement(FormLayout_1.FormRow, { label: "Include Grouped Rows:" },
+                    React.createElement(FormLayout_1.FormRow, { label: "Exclude Data Rows:" },
+                        React.createElement(rebass_1.Flex, { alignItems: "center", marginLeft: 2 },
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "exclude-data-rows-checkbox", checked: 
+                                // @ts-ignore
+                                (_a = data.BadgeStyle.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeDataRows, onChange: onExcludeDataRowsChanged, mr: 2 }))),
+                    React.createElement(FormLayout_1.FormRow, { label: "Exclude Grouped Rows:" },
+                        React.createElement(rebass_1.Flex, { alignItems: "center", marginLeft: 2 },
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "exclude-grouped-rows-checkbox", checked: 
+                                // @ts-ignore
+                                (_b = data.BadgeStyle.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupedRows, onChange: onExcludeGroupedRowsChanged, mr: 2 }))),
+                    React.createElement(FormLayout_1.FormRow, { label: "Exclude Row Summaries:" },
                         React.createElement(rebass_1.Flex, { alignItems: "center", marginLeft: 2 },
-                            React.createElement(CheckBox_1.CheckBox, { "data-name": "include-grouped-rows-checkbox", checked: data.IncludeGroupedRows, onChange: onIncludeGroupedRowsChanged, mr: 2 }))))))));
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "exclude-summary-rows-checkbox", checked: 
+                                // @ts-ignore
+                                (_c = data.BadgeStyle.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeSummaryRows, onChange: onExcludeSummaryRowsChanged, mr: 2 }))),
+                    ' ')))));
 };
 exports.StyledColumnWizardSettingsSection = StyledColumnWizardSettingsSection;

package/src/View/Theme/ThemeSelector.js

@@ -12,6 +12,7 @@ const ThemeSelector = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const dispatch = (0, react_redux_1.useDispatch)();
     const availableThemes = adaptable.api.themeApi.getThemes();
+    const currentTheme = (0, react_redux_1.useSelector)((state) => state.Theme.CurrentTheme);
     const disabled = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(ModuleConstants_1.ThemeModuleId) === 'ReadOnly';
     const optionThemes = availableThemes.map((theme) => {
         if (typeof theme === 'string') {
@@ -26,8 +27,7 @@ const ThemeSelector = (props) => {
             label: theme.Description,
         };
     });
-    const theme = adaptable.api.themeApi.getCurrentThemeObject();
-    return (React.createElement(Select_1.Select, { "data-name": "select-theme-dropdown", options: optionThemes, value: theme.Name, disabled: disabled, size: props.size, onChange: (themeName) => {
+    return (React.createElement(Select_1.Select, { "data-name": "select-theme-dropdown", searchable: false, options: optionThemes, value: currentTheme, disabled: disabled, size: props.size, onChange: (themeName) => {
             dispatch(ThemeRedux.ThemeSelect(themeName));
         } }));
 };

package/src/agGrid/ActionColumnRenderer.js

@@ -6,10 +6,11 @@ const SimpleButton_1 = tslib_1.__importDefault(require("../components/SimpleButt
 const React = tslib_1.__importStar(require("react"));
 const useRerender_1 = require("../components/utils/useRerender");
 const renderWithAdaptableContext_1 = require("../View/renderWithAdaptableContext");
+const RowSummary_1 = require("../PredefinedConfig/Common/RowSummary");
 const ActionButtons = (props) => {
     const { buttons, adaptableApi, context, rerender } = props;
     return (React.createElement(React.Fragment, null, buttons.map((button, index) => {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f;
         if (button.hidden && button.hidden(button, context)) {
             return;
         }
@@ -31,21 +32,40 @@ const ActionButtons = (props) => {
             }, 16);
         };
         const disabled = button.disabled && button.disabled(button, context);
-        return (React.createElement(SimpleButton_1.default, { key: button.Uuid, "data-name": `action-button-${index + 1}`, variant: (_a = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.variant) !== null && _a !== void 0 ? _a : 'text', disabled: disabled, tooltip: buttonTooltip, icon: buttonIcon, tone: (_b = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.tone) !== null && _b !== void 0 ? _b : 'none', onClick: handleClick, className: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.className, accessLevel: 'Full' }, buttonLabel));
+        const identifier = (_d = (_c = (_a = button.label) !== null && _a !== void 0 ? _a : (_b = button.icon) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : button.tooltip) !== null && _d !== void 0 ? _d : `${index + 1}`;
+        return (React.createElement(SimpleButton_1.default, { key: button.Uuid, "data-name": `action-button-${identifier}`, variant: (_e = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.variant) !== null && _e !== void 0 ? _e : 'text', disabled: disabled, tooltip: buttonTooltip, icon: buttonIcon, tone: (_f = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.tone) !== null && _f !== void 0 ? _f : 'none', onClick: handleClick, className: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.className, accessLevel: 'Full' }, buttonLabel));
     })));
 };
 const ReactActionColumnRenderer = (props) => {
+    var _a, _b, _c, _d;
     const rerender = (0, useRerender_1.useRerender)();
-    const adaptable = props.api.__adaptable;
+    const adaptable = props.context.__adaptable;
     const { actionButtons, actionColumn } = adaptable.api.internalApi.getActionButtonsAndActionColumn(props.colDef);
     if (!actionColumn || !actionButtons.length) {
         return null;
     }
-    // TODO: see why types do not match
-    if (adaptable.api.gridApi.isGroupRowNode(props.node) && !actionColumn.includeGroupedRows) {
+    const isGroupedRow = adaptable.api.gridApi.isGroupRowNode(props.node);
+    const isSummaryRow = (_a = props === null || props === void 0 ? void 0 : props.data) === null || _a === void 0 ? void 0 : _a[RowSummary_1.ROW_SUMMARY_ROW_ID];
+    let shouldRender = true;
+    if (isGroupedRow) {
+        if ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupedRows) {
+            shouldRender = false;
+        }
+    }
+    else if (isSummaryRow) {
+        if ((_c = actionColumn.rowScope) === null || _c === void 0 ? void 0 : _c.ExcludeSummaryRows) {
+            shouldRender = false;
+        }
+    }
+    else {
+        if ((_d = actionColumn.rowScope) === null || _d === void 0 ? void 0 : _d.ExcludeDataRows) {
+            shouldRender = false;
+        }
+    }
+    if (!shouldRender) {
         return null;
     }
-    const pkValue = adaptable.getPrimaryKeyValueFromRowNode(props.node);
+    const pkValue = adaptable.getPrimaryKeyValueFromRowNode(props.node, props.api);
     const buttonContext = {
         actionColumn,
         primaryKeyValue: pkValue,
@@ -62,7 +82,8 @@ exports.ReactActionColumnRenderer = ReactActionColumnRenderer;
 class ActionColumnRenderer {
     // gets called once before the renderer is used
     init(params) {
-        const adaptable = params.api.__adaptable;
+        var _a, _b, _c, _d;
+        const adaptable = params.context.__adaptable;
         const { actionButtons, actionColumn } = adaptable.api.internalApi.getActionButtonsAndActionColumn(params.colDef);
         if (!actionColumn || !actionButtons.length) {
             return;
@@ -70,12 +91,29 @@ class ActionColumnRenderer {
         // create the cell
         this.eGui = document.createElement('div');
         this.eGui.className = 'ab-ActionColumn';
-        // if its a group node then only show if set to do so
-        if (adaptable.api.gridApi.isGroupRowNode(params.node) && !actionColumn.includeGroupedRows) {
+        const isGroupedRow = adaptable.api.gridApi.isGroupRowNode(params.node);
+        const isSummaryRow = (_a = params === null || params === void 0 ? void 0 : params.data) === null || _a === void 0 ? void 0 : _a[RowSummary_1.ROW_SUMMARY_ROW_ID];
+        let shouldRender = true;
+        if (isGroupedRow) {
+            if ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupedRows) {
+                shouldRender = false;
+            }
+        }
+        else if (isSummaryRow) {
+            if ((_c = actionColumn.rowScope) === null || _c === void 0 ? void 0 : _c.ExcludeSummaryRows) {
+                shouldRender = false;
+            }
+        }
+        else {
+            if ((_d = actionColumn.rowScope) === null || _d === void 0 ? void 0 : _d.ExcludeDataRows) {
+                shouldRender = false;
+            }
+        }
+        if (!shouldRender) {
             this.eGui.innerHTML = '';
             return;
         }
-        const pkValue = adaptable.getPrimaryKeyValueFromRowNode(params.node);
+        const pkValue = adaptable.getPrimaryKeyValueFromRowNode(params.node, params.api);
         const buttonContext = {
             actionColumn,
             primaryKeyValue: pkValue,