@adaptabletools/adaptable 18.0.0-canary.1 → 18.0.0-canary.11

package/src/View/License/LicenseWatermark.js

@@ -1,61 +1 @@
-import * as React from 'react';
-import { Logo } from '../../components/Logo';
-import { Flex } from 'rebass';
-const style = {
-    border: '1px solid var(--ab-color-error)',
-    padding: '5px',
-    fontWeight: 600,
-    margin: '5px',
-    fontSize: '14px',
-    alignItems: 'center',
-    color: 'var(--ab-color-text-on-defaultbackground)',
-    background: 'var(--ab-color-defaultbackground)',
-};
-const isStyleValid = (element) => {
-    const notAllowedProperties = [
-        ['display', 'none'],
-        ['opacity', '0'],
-        ['position', 'absolute'],
-        ['position', 'fixed'],
-        ['position', 'relative'],
-        ['visibility', 'hidden'],
-    ];
-    for (const [prop, value] of notAllowedProperties) {
-        if (element.style[prop] === value) {
-            return false;
-        }
-    }
-    return true;
-};
-export const LicenseWatermark = (props) => {
-    const ref = React.useRef(null);
-    React.useEffect(() => {
-        const checkWatermark = () => {
-            var _a, _b;
-            if (!((_a = ref.current) === null || _a === void 0 ? void 0 : _a.isConnected)) {
-                alert('It is not allowed to remove the Adaptable watermark.');
-            }
-            if (!isStyleValid(ref.current)) {
-                alert('It is not allowed to modify the Adaptable watermark.');
-            }
-            if ((_b = ref === null || ref === void 0 ? void 0 : ref.current) === null || _b === void 0 ? void 0 : _b.style) {
-                ref.current.style.border = style.border;
-                ref.current.style.padding = style.padding;
-                ref.current.style.fontWeight = `${style.fontWeight}`;
-                ref.current.style.margin = style.margin;
-                ref.current.style.fontSize = style.fontSize;
-                ref.current.style.color = style.color;
-                ref.current.style.background = style.background;
-                ref.current.style.display = 'flex';
-                ref.current.style.position = 'static';
-                ref.current.style.opacity = '1';
-                ref.current.style.visibility = 'visible';
-            }
-        };
-        const timerId = setInterval(checkWatermark, 5000);
-        return () => clearTimeout(timerId);
-    }, []);
-    return (React.createElement(Flex, { style: style, ref: ref },
-        React.createElement(Logo, { style: { marginRight: 10 } }),
-        React.createElement("div", null, props.children)));
-};
+import*as e from"react";import{Logo as t}from"../../components/Logo";import{Flex as r}from"rebass";const o={border:"1px solid var(--ab-color-error)",padding:"5px",fontWeight:600,margin:"5px",fontSize:"14px",alignItems:"center",color:"var(--ab-color-text-on-defaultbackground)",background:"var(--ab-color-defaultbackground)"},n=e=>{const t=[["display","none"],["opacity","0"],["position","absolute"],["position","fixed"],["position","relative"],["visibility","hidden"]];for(const[r,o]of t)if(e.style[r]===o)return!1;return!0};export const LicenseWatermark=i=>{const l=e.useRef(null);return e.useEffect((()=>{const e=setInterval((()=>{var e,t;(null===(e=l.current)||void 0===e?void 0:e.isConnected)||alert("It is not allowed to remove the Adaptable watermark."),n(l.current)||alert("It is not allowed to modify the Adaptable watermark."),(null===(t=null==l?void 0:l.current)||void 0===t?void 0:t.style)&&(l.current.style.border=o.border,l.current.style.padding=o.padding,l.current.style.fontWeight=`${o.fontWeight}`,l.current.style.margin=o.margin,l.current.style.fontSize=o.fontSize,l.current.style.color=o.color,l.current.style.background=o.background,l.current.style.display="flex",l.current.style.position="static",l.current.style.opacity="1",l.current.style.visibility="visible")}),5e3);return()=>clearTimeout(e)}),[]),e.createElement(r,{style:o,ref:l},e.createElement(t,{style:{marginRight:10}}),e.createElement("div",null,i.children))};

package/src/View/Notes/NotesPopup.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useSelector } from 'react-redux';
 import { DataSource, InfiniteTable } from '../../components/InfiniteTable';
-import { GetNotesSelector } from '../../Redux/ActionsReducers/NotesRedux';
+import { GetAllNotesSelector } from '../../Redux/ActionsReducers/NotesRedux';
 import { useAdaptable } from '../AdaptableContext';
 import { AdaptableButtonComponent } from '../Components/AdaptableButton';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';
@@ -15,7 +15,7 @@ const tableDOMProps = {
 export const NotesPopup = (props) => {
     const adaptable = useAdaptable();
     const primaryKeyHeader = adaptable.api.columnApi.getFriendlyNameForColumnId(adaptable.api.columnApi.getPrimaryKeyColumn().columnId);
-    const allNotes = useSelector((state) => GetNotesSelector(state.Notes));
+    const allNotes = useSelector((state) => GetAllNotesSelector(state.Notes));
     const columnsMap = React.useMemo(() => {
         const columns = {
             primaryKey: {
@@ -24,13 +24,14 @@ export const NotesPopup = (props) => {
             },
             column: {
                 field: 'ColumnId',
+                header: 'Column',
                 valueGetter: (params) => {
                     return adaptable.api.columnApi.getFriendlyNameForColumnId(params.data.ColumnId);
                 },
             },
-            note: {
-                field: 'Value',
-                header: 'Note',
+            text: {
+                field: 'Text',
+                header: 'Text',
                 defaultEditable: true,
                 defaultFlex: 3,
             },
@@ -40,10 +41,6 @@ export const NotesPopup = (props) => {
                     return new Date(params.data.Timestamp).toDateString();
                 },
             },
-            author: {
-                header: 'Author',
-                valueGetter: (params) => params.data.Author.UserName,
-            },
             delete: {
                 defaultWidth: 50,
                 render: (params) => {
@@ -64,8 +61,8 @@ export 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.notesApi.updateNoteText(data.Text, prevNote);
                             }
                         }
                     }
@@ -76,6 +73,7 @@ export const NotesPopup = (props) => {
                         align: 'start',
                         defaultFlex: 1,
                         defaultSortable: false,
+                        style: { fontSize: 'var(--ab-font-size-3)' },
                     },
                 }, headerOptions: {
                     alwaysReserveSpaceForSortIcon: false,

package/src/View/SpecialColumnSettingsWizardStep.js

@@ -7,10 +7,10 @@ import { Tabs } from '../components/Tabs';
 import { ColumnFilterModuleId } from '../Utilities/Constants/ModuleConstants';
 import { useAdaptable } from './AdaptableContext';
 export const SpecialColumnSettingsWizardStep = (props) => {
-    var _a, _b;
+    var _a, _b, _c;
     const adaptable = 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.optionsApi.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 : [];
@@ -51,7 +51,7 @@ export const SpecialColumnSettingsWizardStep = (props) => {
         Boolean(possibleColumnTypes === null || possibleColumnTypes === void 0 ? void 0 : possibleColumnTypes.length) && (React.createElement(Tabs, { marginTop: 2, autoFocus: false },
             React.createElement(Tabs.Tab, null, "Column Types"),
             React.createElement(Tabs.Content, null,
-                React.createElement(FormLayout, { columns: [{ name: 'first', size: '30%' }, { name: 'second' }] }, (_b = chunk(possibleColumnTypes !== null && possibleColumnTypes !== void 0 ? possibleColumnTypes : [], 2)) === null || _b === void 0 ? void 0 : _b.map(([first, second]) => {
+                React.createElement(FormLayout, { columns: [{ name: 'first', size: '30%' }, { name: 'second' }] }, (_c = chunk(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(FormRow, { key: first },
                         first && (React.createElement(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/Theme/ThemeSelector.js

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { Select } from '../../components/Select';
 import * as ThemeRedux from '../../Redux/ActionsReducers/ThemeRedux';
 import { ThemeModuleId } from '../../Utilities/Constants/ModuleConstants';
@@ -8,6 +8,7 @@ export const ThemeSelector = (props) => {
     const adaptable = useAdaptable();
     const dispatch = useDispatch();
     const availableThemes = adaptable.api.themeApi.getThemes();
+    const currentTheme = useSelector((state) => state.Theme.CurrentTheme);
     const disabled = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(ThemeModuleId) === 'ReadOnly';
     const optionThemes = availableThemes.map((theme) => {
         if (typeof theme === 'string') {
@@ -22,8 +23,7 @@ export const ThemeSelector = (props) => {
             label: theme.Description,
         };
     });
-    const theme = adaptable.api.themeApi.getCurrentThemeObject();
-    return (React.createElement(Select, { "data-name": "select-theme-dropdown", options: optionThemes, value: theme.Name, disabled: disabled, size: props.size, onChange: (themeName) => {
+    return (React.createElement(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

@@ -5,7 +5,7 @@ import { renderWithAdaptableContext } from '../View/renderWithAdaptableContext';
 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;
         }
@@ -27,12 +27,13 @@ const ActionButtons = (props) => {
             }, 16);
         };
         const disabled = button.disabled && button.disabled(button, context);
-        return (React.createElement(SimpleButton, { 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, { 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));
     })));
 };
 export const ReactActionColumnRenderer = (props) => {
     const rerender = 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;
@@ -41,7 +42,7 @@ export const ReactActionColumnRenderer = (props) => {
     if (adaptable.api.gridApi.isGroupRowNode(props.node) && !actionColumn.includeGroupedRows) {
         return null;
     }
-    const pkValue = adaptable.getPrimaryKeyValueFromRowNode(props.node);
+    const pkValue = adaptable.getPrimaryKeyValueFromRowNode(props.node, props.api);
     const buttonContext = {
         actionColumn,
         primaryKeyValue: pkValue,
@@ -57,7 +58,7 @@ export const ReactActionColumnRenderer = (props) => {
 export class ActionColumnRenderer {
     // gets called once before the renderer is used
     init(params) {
-        const adaptable = params.api.__adaptable;
+        const adaptable = params.context.__adaptable;
         const { actionButtons, actionColumn } = adaptable.api.internalApi.getActionButtonsAndActionColumn(params.colDef);
         if (!actionColumn || !actionButtons.length) {
             return;
@@ -70,7 +71,7 @@ export class ActionColumnRenderer {
             this.eGui.innerHTML = '';
             return;
         }
-        const pkValue = adaptable.getPrimaryKeyValueFromRowNode(params.node);
+        const pkValue = adaptable.getPrimaryKeyValueFromRowNode(params.node, params.api);
         const buttonContext = {
             actionColumn,
             primaryKeyValue: pkValue,