@adaptabletools/adaptable 16.0.9 → 16.0.10-canary.0

package/src/View/ColumnInfo/ColumnInfo.js

@@ -0,0 +1,185 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ColumnInfo = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const react_redux_1 = require("react-redux");
+const rebass_1 = require("rebass");
+const FormLayout_1 = tslib_1.__importStar(require("../../components/FormLayout"));
+const InfiniteTable_1 = require("../../components/InfiniteTable");
+const Panel_1 = tslib_1.__importDefault(require("../../components/Panel"));
+const Tabs_1 = require("../../components/Tabs");
+const Enums_1 = require("../../PredefinedConfig/Common/Enums");
+const AdaptableContext_1 = require("../AdaptableContext");
+const AdaptableObjectList_1 = require("../Components/AdaptableObjectList");
+const ButtonNew_1 = require("../Components/Buttons/ButtonNew");
+const ColumnSelector_1 = require("../Components/Selectors/ColumnSelector");
+const BASE_CLASS_NAME = 'ab-AdaptableColumns';
+// TODOS:
+// - use column from props as initial value
+// - table summary
+// - access level for edit/new buttons
+const MODULES_WITH_COLUMN = [
+    'Alert',
+    'CalculatedColumn',
+    'CustomSort',
+    'Filter',
+    'FormatColumn',
+    'FlashingCell',
+    'PlusMinus',
+    'Shortcut',
+    'StyledColumn', // Scope
+];
+const MODULES_WITH_SCOPE = [
+    'Alert',
+    'FormatColumn',
+    'PlusMinus',
+    'Shortcut',
+    'StyledColumn',
+];
+// These modules are shown only if they have objects defiend
+const MODULES_WITH_VIEW_ONLY = ['CalculatedColumn', 'Filter'];
+const MODULES_WITHOUT_NEW = ['CalculatedColumn', 'Filter'];
+const ColumnDefPreview = (props) => {
+    const keyValuePairs = [
+        {
+            Key: 'Column Id',
+            Value: props.column ? props.column.columnId : null,
+        },
+        {
+            Key: 'Header',
+            Value: props.column ? props.column.friendlyName : null,
+        },
+        {
+            Key: 'Aggregatable',
+            Value: props.column ? props.column.aggregatable : null,
+        },
+        {
+            Key: 'DataType',
+            Value: props.column ? props.column.dataType : null,
+        },
+        {
+            Key: 'Groupable',
+            Value: props.column ? props.column.groupable : null,
+        },
+        {
+            Key: 'Filterable',
+            Value: props.column ? props.column.filterable : null,
+        },
+        {
+            Key: 'Hideable',
+            Value: props.column ? props.column.hideable : null,
+        },
+        {
+            Key: 'Editable',
+            Value: props.column ? !props.column.IsReadOnly : null,
+        },
+        {
+            Key: 'Moveable',
+            Value: props.column ? props.column.moveable : null,
+        },
+        {
+            Key: 'Pivotable',
+            Value: props.column ? props.column.pivotable : null,
+        },
+        {
+            Key: 'Queryable',
+            Value: props.column ? props.column.queryable : null,
+        },
+        {
+            Key: 'Sortable',
+            Value: props.column ? props.column.sortable : null,
+        },
+        {
+            Key: 'Visible',
+            Value: props.column ? props.column.visible : null,
+        },
+        {
+            Key: 'Grouped',
+            Value: props.column ? props.column.isGrouped : null,
+        },
+    ]
+        .map((keyValuePair) => {
+        return {
+            Key: keyValuePair.Key,
+            Value: keyValuePair.Value === true ? 'Yes' : keyValuePair.Value,
+        };
+    })
+        .filter((x) => x.Value);
+    const columnsMap = {
+        Key: { field: 'Key', header: 'Property', defaultFlex: 1 },
+        Value: { field: 'Value', header: 'Value', defaultFlex: 3 },
+    };
+    return (React.createElement(InfiniteTable_1.DataSource, { data: keyValuePairs, primaryKey: "Key" },
+        React.createElement(InfiniteTable_1.InfiniteTable, { domProps: {
+                style: {
+                    height: '460px',
+                    width: '100%',
+                },
+            }, columns: columnsMap })));
+};
+const ModuleView = (props) => {
+    var _a, _b, _c, _d;
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const module = adaptable.ModuleService.getModuleById(props.moduleName);
+    if (!module.isModuleAvailable()) {
+        return null;
+    }
+    const moduleInfo = module.moduleInfo;
+    const [isWizardOpen, setIsWizardOpen] = React.useState(false);
+    const EditWizard = (_c = (_b = (_a = module === null || module === void 0 ? void 0 : module.getViewProperties) === null || _a === void 0 ? void 0 : _a.call(module)) === null || _b === void 0 ? void 0 : _b.getEditWizard) === null || _c === void 0 ? void 0 : _c.call(_b);
+    const column = adaptable.api.columnApi.getColumnWithColumnId(props.selectedColumnId);
+    const allItems = (_d = module === null || module === void 0 ? void 0 : module.toViewAll) === null || _d === void 0 ? void 0 : _d.call(module);
+    if (MODULES_WITH_VIEW_ONLY.includes(props.moduleName) && !(allItems === null || allItems === void 0 ? void 0 : allItems.length)) {
+        return React.createElement(React.Fragment, null);
+    }
+    const itemsInScope = allItems.filter((item) => {
+        var _a;
+        if ('Scope' in item.abObject) {
+            const abColumn = adaptable.api.columnApi.getColumnWithColumnId(props.selectedColumnId);
+            return adaptable.api.scopeApi.isColumnInScope(abColumn, item.abObject.Scope);
+        }
+        if ('ColumnId' in item.abObject) {
+            return ((_a = item.abObject) === null || _a === void 0 ? void 0 : _a.ColumnId) === props.selectedColumnId;
+        }
+        return false;
+    });
+    if (!itemsInScope) {
+        return null;
+    }
+    const handleWizardClose = React.useCallback(() => {
+        setIsWizardOpen(false);
+    }, []);
+    // filter out items with scope
+    return (React.createElement(rebass_1.Box, { "data-name": module.moduleInfo.ModuleName, className: `${BASE_CLASS_NAME}__module-list`, key: module.moduleInfo.ModuleName, mb: 4 },
+        React.createElement(rebass_1.Flex, null,
+            React.createElement("b", { className: `${BASE_CLASS_NAME}__header` }, module.moduleInfo.FriendlyName),
+            React.createElement(rebass_1.Box, { flex: 1 }),
+            !MODULES_WITHOUT_NEW.includes(props.moduleName) && (React.createElement(ButtonNew_1.ButtonNew, { onClick: () => setIsWizardOpen(true) }, "New"))),
+        (itemsInScope === null || itemsInScope === void 0 ? void 0 : itemsInScope.length) ? React.createElement(AdaptableObjectList_1.AdaptableObjectList, { items: itemsInScope, module: module }) : null,
+        isWizardOpen && EditWizard && (React.createElement(EditWizard, { popupParams: {
+                column,
+                action: 'New',
+                source: 'ModuleButton',
+            }, moduleInfo: moduleInfo, data: null, configEntities: null, onCloseWizard: handleWizardClose, onFinishWizard: handleWizardClose }))));
+};
+const ColumnInfo = (props) => {
+    const state = (0, react_redux_1.useSelector)((state) => state);
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const [selectedColumnId, setSelectedColumnId] = React.useState(props.selectedColumnId);
+    const column = adaptable.api.columnApi.getColumnWithColumnId(selectedColumnId);
+    return (React.createElement(Panel_1.default, { flex: 1 },
+        React.createElement(rebass_1.Box, { mb: 3 },
+            React.createElement(FormLayout_1.default, null,
+                React.createElement(FormLayout_1.FormRow, { label: "Select Column" },
+                    React.createElement(ColumnSelector_1.ColumnSelector, { SelectedColumnIds: [selectedColumnId], ColumnList: adaptable.api.columnApi.getColumns(), onColumnChange: (columns) => { var _a, _b; return setSelectedColumnId((_b = (_a = columns === null || columns === void 0 ? void 0 : columns[0]) === null || _a === void 0 ? void 0 : _a.columnId) !== null && _b !== void 0 ? _b : undefined); }, SelectionMode: Enums_1.SelectionMode.Single })))),
+        selectedColumnId && (React.createElement(Tabs_1.Tabs, { mb: 3 },
+            React.createElement(Tabs_1.Tabs.Tab, null, "Config"),
+            React.createElement(Tabs_1.Tabs.Tab, null, "Info"),
+            React.createElement(Tabs_1.Tabs.Content, null, selectedColumnId && (React.createElement(rebass_1.Box, { className: BASE_CLASS_NAME }, MODULES_WITH_COLUMN.map((moduleName) => {
+                return (React.createElement(ModuleView, { key: moduleName, moduleName: moduleName, selectedColumnId: selectedColumnId }));
+            })))),
+            React.createElement(Tabs_1.Tabs.Content, null,
+                React.createElement(rebass_1.Flex, { flex: 1 }, selectedColumnId && React.createElement(ColumnDefPreview, { column: column })))))));
+};
+exports.ColumnInfo = ColumnInfo;

package/src/View/ColumnInfo/ColumnInfoPopup.d.ts

@@ -0,0 +1,3 @@
+import * as React from 'react';
+import { ModuleViewPopupProps } from '../Components/SharedProps/ModuleViewPopupProps';
+export declare const ColumnInfoPopup: React.FunctionComponent<ModuleViewPopupProps<any>>;

package/src/View/ColumnInfo/ColumnInfoPopup.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ColumnInfoPopup = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const rebass_1 = require("rebass");
+const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
+const ColumnInfo_1 = require("./ColumnInfo");
+const ColumnInfoPopup = (props) => {
+    var _a, _b;
+    return (React.createElement(PopupPanel_1.PopupPanel, { headerText: 'Column Info', glyphicon: 'info' },
+        React.createElement(rebass_1.Flex, { flexDirection: "column", flex: 1, height: "100%" },
+            React.createElement(ColumnInfo_1.ColumnInfo, { selectedColumnId: (_b = (_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.column) === null || _b === void 0 ? void 0 : _b.columnId }))));
+};
+exports.ColumnInfoPopup = ColumnInfoPopup;

package/src/View/Components/AdaptableIconSelector/index.d.ts

@@ -3,4 +3,4 @@ import { IconSelectorProps } from '../../../components/IconSelector';
 /**
  * This component connects to adaptable to retrieve custom icons
  */
-export declare const AdaptableIconSelector: React.FunctionComponent<IconSelectorProps>;
+export declare const AdaptableIconSelector: React.FunctionComponent<Omit<IconSelectorProps, 'customIcons'>>;

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

@@ -41,7 +41,7 @@ class ColumnSelector extends React.Component {
         return (React.createElement("div", { "data-name": 'column-selector' },
             React.createElement(FormLayout_1.default, { columns: [{ name: 'columnSelector', style: { display: 'flex' } }], style: this.props.style },
                 React.createElement(FormLayout_1.FormRow, null,
-                    React.createElement(DropdownButton_1.default, { marginRight: 2, columns: ['label'], showClearButton: currentColumnName != 'Select a column', onClear: () => this.onClearButton(), style: { width: '100%', fontSize: 'small' }, className: "ab-DashboardToolbar__Layout__select", items: sortedColumnOptions, disabled: this.props.disabled || sortedColumnOptions.length == 0 }, currentColumnName)))));
+                    React.createElement(DropdownButton_1.default, { marginRight: 2, columns: ['label'], showClearButton: currentColumnName != 'Select a column', onClear: () => this.onClearButton(), style: { width: '100%', fontSize: 'small' }, items: sortedColumnOptions, disabled: this.props.disabled || sortedColumnOptions.length == 0 }, currentColumnName)))));
     }
     onClearButton() {
         this.props.onColumnChange([]);

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

@@ -22,7 +22,7 @@ const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection"
 const FlashingCellWizard = (props) => {
     const { api } = (0, AdaptableContext_1.useAdaptable)();
     const [flashingCell, setFlashingCell] = (0, react_1.useState)(() => {
-        var _a, _b;
+        var _a, _b, _c, _d;
         let flashingCell = props.data
             ? (0, Helper_1.cloneObject)(props.data)
             : ObjectFactory_1.default.CreateEmptyFlashingCellDefinition();
@@ -31,6 +31,11 @@ const FlashingCellWizard = (props) => {
         if (!flashingCell.Rule.BooleanExpression && !((_b = (_a = flashingCell.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.length)) {
             flashingCell.Rule.BooleanExpression = '';
         }
+        if (((_c = props.popupParams) === null || _c === void 0 ? void 0 : _c.column) && ((_d = props.popupParams) === null || _d === void 0 ? void 0 : _d.action) === 'New') {
+            flashingCell.Scope = {
+                ColumnIds: [props.popupParams.column.columnId],
+            };
+        }
         return flashingCell;
     });
     const updateProperty = (propName) => {

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

@@ -20,6 +20,7 @@ const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection"
 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 adjustDisplayFormat = (formatColumn, api) => {
     formatColumn = Object.assign({}, formatColumn);
     const formatDataType = (0, FormatColumnFormatWizardSection_1.getFormatDisplayTypeForScope)(formatColumn.Scope, api);
@@ -76,6 +77,14 @@ function FormatColumnWizard(props) {
     }, []);
     const dispatch = (0, react_redux_1.useDispatch)();
     const handleFinish = () => {
+        var _a, _b;
+        if (((_a = formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.DisplayFormat) === null || _a === void 0 ? void 0 : _a.Options) &&
+            (0, ObjectExtensions_1.isObjectEmpty)((_b = formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.DisplayFormat) === null || _b === void 0 ? void 0 : _b.Options)) {
+            delete formatColumn.DisplayFormat;
+        }
+        if (formatColumn.Style && (0, ObjectExtensions_1.isObjectEmpty)(formatColumn.Style)) {
+            delete formatColumn.Style;
+        }
         if (data) {
             dispatch(FormatColumnRedux.FormatColumnEdit(formatColumn));
         }

package/src/View/GridInfo/{AdaptableObjectsSummary.js → GridInfoPopup/AdaptableObjectsSummary.js}

@@ -5,8 +5,8 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const rebass_1 = require("rebass");
-const AdaptableContext_1 = require("../AdaptableContext");
-const AdaptableObjectList_1 = require("../Components/AdaptableObjectList");
+const AdaptableContext_1 = require("../../AdaptableContext");
+const AdaptableObjectList_1 = require("../../Components/AdaptableObjectList");
 const AdaptableObjectsSummary = () => {
     const state = (0, react_redux_1.useSelector)((state) => state);
     const adaptable = (0, AdaptableContext_1.useAdaptable)();

package/src/View/GridInfo/{AdaptableOptionsComponent.d.ts → GridInfoPopup/AdaptableOptionsComponent.d.ts}

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { AdaptableApi } from '../../Api/AdaptableApi';
+import { AdaptableApi } from '../../../Api/AdaptableApi';
 interface AdaptableOptionsComponentProps {
     api: AdaptableApi;
 }

package/src/View/GridInfo/{AdaptableOptionsComponent.js → GridInfoPopup/AdaptableOptionsComponent.js}

@@ -4,12 +4,12 @@ exports.AdaptableOptionsComponent = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
-const PanelWithButton_1 = require("../Components/Panels/PanelWithButton");
-const ButtonMinimise_1 = require("../Components/Buttons/ButtonMinimise");
-const ButtonMaximise_1 = require("../Components/Buttons/ButtonMaximise");
-const AdaptableObjectCollection_1 = require("../Components/AdaptableObjectCollection");
-const AdaptableObjectRow_1 = require("../Components/AdaptableObjectRow");
-const AdaptablePopover_1 = require("../AdaptablePopover");
+const PanelWithButton_1 = require("../../Components/Panels/PanelWithButton");
+const ButtonMinimise_1 = require("../../Components/Buttons/ButtonMinimise");
+const ButtonMaximise_1 = require("../../Components/Buttons/ButtonMaximise");
+const AdaptableObjectCollection_1 = require("../../Components/AdaptableObjectCollection");
+const AdaptableObjectRow_1 = require("../../Components/AdaptableObjectRow");
+const AdaptablePopover_1 = require("../../AdaptablePopover");
 const rebass_1 = require("rebass");
 const AdaptableOptionsComponent = (props) => {
     const { api } = props;

package/src/View/GridInfo/GridInfoPopup/GridInfoPopup.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+import { ModuleViewPopupProps } from '../../Components/SharedProps/ModuleViewPopupProps';
+interface GridInfoPopupProps extends ModuleViewPopupProps<any> {
+}
+export declare const GridInfoPopup: (props: GridInfoPopupProps) => JSX.Element;
+export {};

package/src/View/GridInfo/GridInfoPopup/GridInfoPopup.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GridInfoPopup = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const rebass_1 = require("rebass");
+const version_1 = tslib_1.__importDefault(require("../../../../version"));
+const Panel_1 = tslib_1.__importDefault(require("../../../components/Panel"));
+const Tabs_1 = require("../../../components/Tabs");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/ArrayExtensions"));
+const Helper_1 = tslib_1.__importDefault(require("../../../Utilities/Helpers/Helper"));
+const AdaptablePopover_1 = require("../../AdaptablePopover");
+const AdaptableObjectCollection_1 = require("../../Components/AdaptableObjectCollection");
+const AdaptableObjectRow_1 = require("../../Components/AdaptableObjectRow");
+const PopupPanel_1 = require("../../Components/Popups/AdaptablePopup/PopupPanel");
+const AdaptableObjectsSummary_1 = require("./AdaptableObjectsSummary");
+const GridInfoPopup = (props) => {
+    const CreateGridSummaries = (colItems) => {
+        var _a;
+        const returnRows = [];
+        const calcColumns = props.api.calculatedColumnApi
+            .getCalculatedColumns()
+            .map((c) => c.ColumnId);
+        const actionColumns = props.api.actionColumnApi
+            .getActionColumns()
+            .map((ac) => ac.columnId);
+        const freeTextColumns = props.api.freeTextColumnApi
+            .getFreeTextColumns()
+            .map((c) => c.ColumnId);
+        const columnFilterDescription = props.api.filterApi.internalApi.columnFiltersToString(props.api.filterApi.getColumnFilters());
+        const sorts = ArrayExtensions_1.default.IsNotNullOrEmpty(props.api.gridApi.getColumnSorts())
+            ? props.api.gridApi.getColumnSorts().map((gs) => {
+                return props.api.columnApi.getFriendlyNameForColumnId(gs.ColumnId) + ': ' + gs.SortOrder;
+            })
+            : null;
+        const selectedRowInfo = props.api.gridApi.getSelectedRowInfo();
+        if ((_a = props.api.optionsApi.getUserInterfaceOptions()) === null || _a === void 0 ? void 0 : _a.showAdapTableVersion) {
+            returnRows.push(createReadOnlyColItem(colItems, 'AdapTable Version', version_1.default));
+        }
+        returnRows.push(createReadOnlyColItem(colItems, 'Sorted Columns', ArrayExtensions_1.default.IsNotNullOrEmpty(sorts) ? sorts.join('; ') : 'None'));
+        returnRows.push(createReadOnlyColItem(colItems, 'Column Filters', columnFilterDescription));
+        returnRows.push(createReadOnlyColItem(colItems, 'All Rows', props.api.gridApi.getRowCount()));
+        returnRows.push(createReadOnlyColItem(colItems, 'Visible Rows', props.api.gridApi.getVisibleRowCount()));
+        returnRows.push(createReadOnlyColItem(colItems, 'Selected Rows', selectedRowInfo === null || selectedRowInfo === void 0 ? void 0 : selectedRowInfo.gridRows.length));
+        returnRows.push(createReadOnlyColItem(colItems, 'Visible Selected Rows', selectedRowInfo === null || selectedRowInfo === void 0 ? void 0 : selectedRowInfo.gridRows.filter((gr) => { var _a; return ((_a = gr.rowNode) === null || _a === void 0 ? void 0 : _a.displayed) == true; }).length));
+        returnRows.push(createReadOnlyColItem(colItems, 'All Columns', props.api.gridApi.getColumnCount()));
+        returnRows.push(createReadOnlyColItem(colItems, 'Visible Columns', props.api.gridApi.getVisibleColumnCount()));
+        returnRows.push(createReadOnlyColItem(colItems, 'Calculated Columns', ArrayExtensions_1.default.IsNotNullOrEmpty(calcColumns) ? calcColumns : 'None'));
+        returnRows.push(createReadOnlyColItem(colItems, 'Free Text Columns', ArrayExtensions_1.default.IsNotNullOrEmpty(freeTextColumns) ? freeTextColumns : 'None'));
+        returnRows.push(createReadOnlyColItem(colItems, 'Action Columns', ArrayExtensions_1.default.IsNotNullOrEmpty(actionColumns) ? actionColumns : 'None'));
+        return returnRows;
+    };
+    const createReadOnlyColItem = (colItems, item1, item2, item3) => {
+        let rowColItems = Helper_1.default.cloneObject(colItems);
+        rowColItems[0].Content = item1;
+        rowColItems[1].Content = item2;
+        if (item3) {
+            let infoButton = React.createElement(AdaptablePopover_1.AdaptablePopover, { headerText: null, bodyText: [item3] });
+            rowColItems[2].Content = infoButton;
+        }
+        return rowColItems;
+    };
+    let propValueColItems = [
+        { Content: 'Property', Size: 5 },
+        { Content: 'Value', Size: 7 },
+    ];
+    let gridSummaries = CreateGridSummaries(propValueColItems).map((x, index) => {
+        return React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { key: index, colItems: x });
+    });
+    const baseClassName = 'ab-GridInfo';
+    return (React.createElement(PopupPanel_1.PopupPanel, { className: baseClassName, headerText: 'Grid Info', glyphicon: 'info' },
+        React.createElement(rebass_1.Flex, { flexDirection: "column", flex: 1, height: "100%" },
+            React.createElement(Panel_1.default, { flex: 1 },
+                React.createElement(Tabs_1.Tabs, null,
+                    React.createElement(Tabs_1.Tabs.Tab, null, "Info"),
+                    React.createElement(Tabs_1.Tabs.Tab, null, "Objects"),
+                    React.createElement(Tabs_1.Tabs.Content, null,
+                        React.createElement(AdaptableObjectCollection_1.AdaptableObjectCollection, { margin: 2, colItems: propValueColItems, items: gridSummaries })),
+                    React.createElement(Tabs_1.Tabs.Content, null,
+                        React.createElement(AdaptableObjectsSummary_1.AdaptableObjectsSummary, null)))))));
+};
+exports.GridInfoPopup = GridInfoPopup;

package/src/View/GridInfo/GridInfoPopup/index.d.ts

@@ -0,0 +1 @@
+export * from './GridInfoPopup';

package/src/View/GridInfo/GridInfoPopup/index.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./GridInfoPopup"), exports);

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

@@ -151,7 +151,7 @@ const AggregationsSection = (props) => {
         props.onChange(Object.assign(Object.assign({}, layout), { SuppressAggFuncInHeader: checked }));
     };
     return (React.createElement(Tabs_1.Tabs, { style: { height: '100%' } },
-        React.createElement(Tabs_1.Tabs.Tab, null, "Columns Aggregations"),
+        React.createElement(Tabs_1.Tabs.Tab, null, "Column Aggregations"),
         React.createElement(Tabs_1.Tabs.Content, null,
             React.createElement(rebass_1.Flex, null,
                 React.createElement(FormLayout_1.default, null,

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

@@ -163,7 +163,7 @@ const ColumnRow = (props) => {
         React.createElement(rebass_1.Flex, { className: "ab-Layout-Wizard__ColumnRow__Header", mt: 1, mb: 1, onClick: () => setIsExpanded(!isExpanded) },
             React.createElement(rebass_1.Flex, { mr: 2, alignItems: "center" }, initialHeader),
             props.column.columnGroup && props.column.columnGroup.groupCount > 1 ? (React.createElement(rebass_1.Box, { className: "ab-Layout-Wizard__ColumnRow__Title", ml: 2, mr: 2, padding: 1 },
-                "Group: ",
+                "Column Group: ",
                 props.column.columnGroup.friendlyName)) : null,
             React.createElement(rebass_1.Flex, { mr: 2 },
                 React.createElement(ColumnLabels_1.ColumnLabels, { showTitle: false, sortable: props.column.sortable, filterable: props.column.filterable, pivotable: props.column.pivotable, moveable: props.column.moveable, groupable: props.column.groupable, aggregatable: props.column.aggregatable })),

package/src/View/Notes/NotesListing.d.ts

@@ -0,0 +1,2 @@
+import * as React from 'react';
+export declare const NotesListing: React.FunctionComponent;

package/src/View/{Comments/CommentListing.js → Notes/NotesListing.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommentsListing = void 0;
+exports.NotesListing = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const rebass_1 = require("rebass");
 const InfiniteTable_1 = require("../../components/InfiniteTable");
-const CommentsRedux_1 = require("../../Redux/ActionsReducers/CommentsRedux");
+const NotesRedux_1 = require("../../Redux/ActionsReducers/NotesRedux");
 const AdaptableContext_1 = require("../AdaptableContext");
 const AdaptableButton_1 = require("../Components/AdaptableButton");
 const tableDOMProps = {
@@ -16,11 +16,10 @@ const tableDOMProps = {
         minHeight: 600,
     },
 };
-const CommentsListing = () => {
+const NotesListing = () => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const primaryKeyHeader = adaptable.api.columnApi.getFriendlyNameForColumnId(adaptable.api.columnApi.getPrimaryKeyColumn().columnId);
-    const columnHeader = adaptable.api.columnApi.getFriendlyNameForColumnId(adaptable.api.columnApi.getPrimaryKeyColumn().columnId);
-    const allComments = (0, react_redux_1.useSelector)((state) => (0, CommentsRedux_1.GetCommentsSelector)(state.Comments));
+    const allNotes = (0, react_redux_1.useSelector)((state) => (0, NotesRedux_1.GetNotesSelector)(state.Notes));
     const columnsMap = React.useMemo(() => {
         const columns = {
             primaryKey: {
@@ -33,9 +32,9 @@ const CommentsListing = () => {
                     return adaptable.api.columnApi.getFriendlyNameForColumnId(params.data.ColumnId);
                 },
             },
-            comment: {
+            note: {
                 field: 'Value',
-                header: 'Comment',
+                header: 'Note',
                 defaultEditable: true,
                 defaultFlex: 3,
             },
@@ -53,8 +52,8 @@ const CommentsListing = () => {
                 defaultWidth: 50,
                 render: (params) => {
                     return (React.createElement(AdaptableButton_1.AdaptableButtonComponent, { variant: "text", icon: "delete", onClick: () => {
-                            const comment = adaptable.api.commentsApi.getCommentByUuid(params.data.Uuid);
-                            adaptable.api.commentsApi.deleteComment(comment);
+                            const note = adaptable.api.notesApi.getNoteByUuid(params.data.Uuid);
+                            adaptable.api.notesApi.deleteNote(note);
                         } }));
                 },
             },
@@ -62,15 +61,15 @@ const CommentsListing = () => {
         return columns;
     }, []);
     return (React.createElement(rebass_1.Box, { p: 2, style: { height: '100%', width: '100%' } },
-        React.createElement(InfiniteTable_1.DataSource, { data: allComments, primaryKey: "Uuid", onDataMutations: (params) => {
+        React.createElement(InfiniteTable_1.DataSource, { data: allNotes, primaryKey: "Uuid", onDataMutations: (params) => {
                 for (const mutation of params.mutations) {
                     const [uuid, changes] = mutation;
                     for (const change of changes) {
                         if (change.type === 'update') {
                             const data = change.data;
-                            const prevComment = allComments.find((x) => x.Uuid === uuid);
-                            if (prevComment.Value !== data.Value) {
-                                adaptable.api.commentsApi.updateCommentText(data.Value, prevComment);
+                            const prevNote = allNotes.find((x) => x.Uuid === uuid);
+                            if (prevNote.Value !== data.Value) {
+                                adaptable.api.notesApi.updateNoteText(data.Value, prevNote);
                             }
                         }
                     }
@@ -86,4 +85,4 @@ const CommentsListing = () => {
                     alwaysReserveSpaceForSortIcon: false,
                 }, rowHeight: 40, columnHeaderHeight: 65, domProps: tableDOMProps, columns: columnsMap }))));
 };
-exports.CommentsListing = CommentsListing;
+exports.NotesListing = NotesListing;

package/src/View/Notes/NotesPopup.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare const NotePopup: () => JSX.Element;

package/src/View/{Comments/CommentPopup.js → Notes/NotesPopup.js}

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommentPopup = void 0;
+exports.NotePopup = void 0;
 const tslib_1 = require("tslib");
 const lodash_1 = require("lodash");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const rebass_1 = require("rebass");
 const Textarea_1 = tslib_1.__importDefault(require("../../components/Textarea"));
-const CommentsRedux_1 = require("../../Redux/ActionsReducers/CommentsRedux");
+const NotesRedux_1 = require("../../Redux/ActionsReducers/NotesRedux");
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const AdaptableContext_1 = require("../AdaptableContext");
 const CellPopup_1 = require("../Components/CellPopup");
-const CommentEditor = ({ comment, onCommentChange, onClose, editMode, isReadonly }) => {
+const NoteEditor = ({ note, onNoteChange, onClose, editMode, isReadonly }) => {
     const textAreaRef = React.useRef(null);
-    const [liveValue, setLiveValue] = React.useState(comment || '');
+    const [liveValue, setLiveValue] = React.useState(note || '');
     const throttledOnChange = React.useMemo(() => {
-        const throttled = (0, lodash_1.throttle)((value) => onCommentChange(value), 300);
+        const throttled = (0, lodash_1.throttle)((value) => onNoteChange(value), 300);
         return (value) => {
             setLiveValue(value);
             throttled(value);
@@ -33,33 +33,33 @@ const CommentEditor = ({ comment, onCommentChange, onClose, editMode, isReadonly
             }
         }, onChange: (event) => throttledOnChange(event.target.value) }));
 };
-const CommentPopup = () => {
+const NotePopup = () => {
     var _a;
     const { api } = (0, AdaptableContext_1.useAdaptable)();
     const cellPopupRef = React.useRef(null);
-    const editMode = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemCommentsEditModeSelector)(state.System));
-    const commentGridCell = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemCommentsSelector)(state.System));
+    const editMode = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemNotesEditModeSelector)(state.System));
+    const noteGridCell = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemNotesSelector)(state.System));
     const [
-    // Only handle first comment for now
-    // Later we can handle multiple comments
-    comment,] = (0, react_redux_1.useSelector)((state) => {
-        return commentGridCell ? (0, CommentsRedux_1.GetCommentsSelector)(state.Comments, commentGridCell) : [];
+    // Only handle first note for now
+    // Later we can handle multiple notes
+    note,] = (0, react_redux_1.useSelector)((state) => {
+        return noteGridCell ? (0, NotesRedux_1.GetNotesSelector)(state.Notes, noteGridCell) : [];
     });
-    const handleCommentChange = (value) => {
-        api.commentsApi.updateCommentText(value, comment);
+    const handleNoteChange = (value) => {
+        api.notesApi.updateNoteText(value, note);
     };
-    const isReadonly = api.entitlementApi.isModuleReadOnlyEntitlement('Comments');
+    const isReadonly = api.entitlementApi.isModuleReadOnlyEntitlement('Notes');
     const enableEditMode = () => {
         if (!editMode) {
-            api.commentsApi.showComment(commentGridCell, true);
+            api.notesApi.showNotes(noteGridCell, true);
             cellPopupRef === null || cellPopupRef === void 0 ? void 0 : cellPopupRef.current.refreshContent();
         }
     };
-    if (!commentGridCell) {
+    if (!noteGridCell) {
         return React.createElement(React.Fragment, null);
     }
-    return (React.createElement(CellPopup_1.CellPopup, { ref: cellPopupRef, key: `${commentGridCell.PrimaryKeyValue}-${commentGridCell.ColumnId}`, isOpen: true, primaryKeyValue: commentGridCell.PrimaryKeyValue, columnId: commentGridCell.ColumnId },
-        React.createElement(rebass_1.Flex, { onClick: () => enableEditMode(), flexDirection: "column", className: "ab-CommentPopup" },
-            React.createElement(CommentEditor, { isReadonly: isReadonly, editMode: editMode, key: comment === null || comment === void 0 ? void 0 : comment.Uuid, onClose: () => api.commentsApi.hideComment(), comment: (_a = comment === null || comment === void 0 ? void 0 : comment.Value) !== null && _a !== void 0 ? _a : '', onCommentChange: (value) => handleCommentChange(value) }))));
+    return (React.createElement(CellPopup_1.CellPopup, { ref: cellPopupRef, key: `${noteGridCell.PrimaryKeyValue}-${noteGridCell.ColumnId}`, isOpen: true, primaryKeyValue: noteGridCell.PrimaryKeyValue, columnId: noteGridCell.ColumnId },
+        React.createElement(rebass_1.Flex, { onClick: () => enableEditMode(), flexDirection: "column", className: "ab-NotesPopup" },
+            React.createElement(NoteEditor, { isReadonly: isReadonly, editMode: editMode, key: note === null || note === void 0 ? void 0 : note.Uuid, onClose: () => api.notesApi.hideNote(), note: (_a = note === null || note === void 0 ? void 0 : note.Value) !== null && _a !== void 0 ? _a : '', onNoteChange: (value) => handleNoteChange(value) }))));
 };
-exports.CommentPopup = CommentPopup;
+exports.NotePopup = NotePopup;

package/src/View/Shortcut/Wizard/ShortcutWizard.js

@@ -17,9 +17,14 @@ const AdaptableContext_1 = require("../../AdaptableContext");
 const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
 const ShortcutWizard = (props) => {
     const [shortcut, setShortcut] = React.useState(() => {
-        var _a;
+        var _a, _b, _c;
         const shortcut = props.data ? (0, Helper_1.cloneObject)(props.data) : ObjectFactory_1.default.CreateEmptyShortcut();
         shortcut.Scope = (_a = shortcut.Scope) !== null && _a !== void 0 ? _a : { All: true };
+        if (((_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.column) && ((_c = props.popupParams) === null || _c === void 0 ? void 0 : _c.action) === 'New') {
+            shortcut.Scope = {
+                ColumnIds: [props.popupParams.column.columnId],
+            };
+        }
         return shortcut;
     });
     const adaptable = (0, AdaptableContext_1.useAdaptable)();