@adaptabletools/adaptable 11.1.1-canary.1 → 11.1.1-canary.2

package/index.css

@@ -3728,14 +3728,12 @@ html.ab--theme-dark .ab-ListBoxFilterForm--aggrid-style {
   width: 100%; }
 
 .ab-ActionColumn {
-  position: relative;
-  height: 100%; }
+  height: 100%;
+  display: flex;
+  column-gap: var(--ab-space-1); }
 
 .ab-ActionColumn > button.ab-SimpleButton {
-    height: 100%;
-    position: absolute;
-    top: 0;
-    left: 0; }
+    height: 100%; }
 
 .Toastify__toast-container {
   border-style: none;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "11.1.1-canary.1",
+  "version": "11.1.1-canary.2",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1648368512196;
+declare const _default: 1648502167403;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1648368512196;
+exports.default = 1648502167403;

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -33,29 +33,25 @@ export interface UserInterfaceOptions {
      */
     permittedValues?: PermittedValues[];
     /**
-     * Dropdown values displayed when column is being edited.
-     * When not defined it defaults to permittedValues.
+     * Dropdown values displayed when column is being edited; when not defined defaults to permittedValues
      */
     editLookUpItems?: EditLookUpPermittedValues[];
     /**
-     * Dropdown values for filter options inside floating and header filter.
-     * When not defined it defaults to permittedValues.
+     * Custom column values for 'IN' filter; when not defined defaults to permittedValues
      */
     filterPermittedValues?: FilterPermittedValues[];
     /**
-     * Custom column values for defining custom sort.
-     * When not defined it defaults to permittedValues.
+     * Custom column values for defining Custom Sort; when not defined defaults to permittedValues
      */
     customSortPermittedValues?: CustomSortPermittedValues[];
     /**
-     * Custom column values for editing via bulk-update.
-     * When not defined it defaults to permittedValues.
+     * Custom column values for editing via bulk-update; when not defined defaults to permittedValues
      */
     bulkUpdatePermittedValues?: BulkUpdatePermittedValues[];
     /**
-     * Colours to display in Colour Picker (in place of AdapTable's default set)
+     * Colours to display in Colour Picker (in place of AdapTable's default set); can be hardcoded list or function
      */
-    colorPalette?: string[] | (() => string[]);
+    colorPalette?: string[] | ((currentTheme: string) => string[]);
     /**
      * Columns which contain an AdapTable Button - used for performing Actions
      */
@@ -155,9 +151,9 @@ export interface ActionColumn extends AdaptableObject {
      */
     friendlyName?: string;
     /**
-     * Button to display in the Column
+     * Button (or list of buttons) to display in the Column
      */
-    actionColumnButton: AdaptableButton<ActionColumnButtonContext>;
+    actionColumnButton: AdaptableButton<ActionColumnButtonContext> | AdaptableButton<ActionColumnButtonContext>[];
     /**
      * Shows Action Column also in grouped rows
      */

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -8,7 +8,9 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         let colorPalette = this.getUserInterfaceOptions().colorPalette;
         // first do the function then get hardcoded items
         if (colorPalette != null && typeof colorPalette === 'function') {
-            return colorPalette();
+            const currentTheme = this.adaptable.api.themeApi.getCurrentTheme();
+            const colours = colorPalette(currentTheme);
+            return colours;
         }
         else {
             let arr = colorPalette;

package/src/Redux/Store/AdaptableStore.js

@@ -645,7 +645,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case QuickSearchRedux.QUICK_SEARCH_RUN: {
                     let returnAction = next(action);
                     adaptable.redrawBody();
-                    // if set then reun a query on the text
+                    // if set then return a query on the text
                     if (adaptable.adaptableOptions.searchOptions.filterResultsAfterQuickSearch) {
                         const actionTyped = action;
                         const searchText = actionTyped.quickSearchText;

package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.d.ts

@@ -1,5 +1,5 @@
 import { ExpressionFunction } from '../../parser/src/types';
-declare type AggregationFunctionName = 'WHERE' | 'COL' | AggregationFunction | ComparisonFunction;
+export declare type AggregationFunctionName = 'WHERE' | 'COL' | AggregationFunction | ComparisonFunction;
 declare type AggregationFunction = 'SUM';
 declare type ComparisonFunction = 'EQ' | 'NEQ' | 'LT' | 'GT' | 'LTE' | 'GTE';
 export declare const aggregatedBooleanExpressionFunctions: Record<AggregationFunctionName, ExpressionFunction>;

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.d.ts

@@ -1,5 +1,5 @@
 import { ExpressionFunction } from '../../parser/src/types';
-declare type ObservableFunctionName = 'WHERE' | 'COL' | 'TIMEFRAME' | ObservableFunction | ChangeFunction;
+export declare type ObservableFunctionName = 'WHERE' | 'COL' | 'TIMEFRAME' | ObservableFunction | ChangeFunction;
 declare type ObservableFunction = 'ROW_CHANGE' | 'GRID_CHANGE';
 declare type ChangeFunction = 'MAX' | 'MIN' | 'NONE' | 'COUNT';
 export declare const observableExpressionFunctions: Record<ObservableFunctionName, ExpressionFunction>;

package/src/agGrid/ActionColumnRenderer.d.ts

@@ -1,9 +1,4 @@
-import { ICellRendererComp, ICellRendererParams, ITooltipComp, ITooltipParams } from '@ag-grid-community/all-modules';
-export declare class CustomTooltip implements ITooltipComp {
-    private eGui;
-    init(params: ITooltipParams): void;
-    getGui(): any;
-}
+import { ICellRendererComp, ICellRendererParams } from '@ag-grid-community/all-modules';
 export declare class ActionColumnRenderer implements ICellRendererComp {
     private eGui;
     private eventListener;

package/src/agGrid/ActionColumnRenderer.js

@@ -1,85 +1,76 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActionColumnRenderer = exports.CustomTooltip = void 0;
+exports.ActionColumnRenderer = void 0;
 const tslib_1 = require("tslib");
 const SimpleButton_1 = tslib_1.__importDefault(require("../components/SimpleButton"));
 const react_dom_1 = require("react-dom");
 const React = tslib_1.__importStar(require("react"));
-class CustomTooltip {
-    init(params) {
-        this.eGui = document.createElement('div');
-        this.eGui.classList.add('custom-tooltip');
-        let { field, lastValidation, validationFailedMsg } = params.value;
-        this.eGui.innerHTML = `
-        <div class="validation-msg">
-          FIELD-${field.toUpperCase()} - invalid value:
-          "<span class="invalid-value"> ${lastValidation} </span>",
-          ${validationFailedMsg}
-        </div>
-    `;
-    }
-    getGui() {
-        return this.eGui;
-    }
-}
-exports.CustomTooltip = CustomTooltip;
+const uuid_1 = require("../components/utils/uuid");
 class ActionColumnRenderer {
     // gets called once before the renderer is used
     init(params) {
         var _a;
         const adaptable = params.api.__adaptable;
-        let actionCol = (_a = adaptable.api.userInterfaceApi
+        const actionCol = (_a = adaptable.api.userInterfaceApi
             .getAllActionColumn()) === null || _a === void 0 ? void 0 : _a.find((ac) => ac.columnId == params.colDef.colId);
-        if (actionCol) {
+        if (actionCol && actionCol.actionColumnButton) {
+            let actionButtons = Array.isArray(actionCol.actionColumnButton)
+                ? actionCol.actionColumnButton
+                : [actionCol.actionColumnButton];
+            if (!actionButtons.length) {
+                return;
+            }
+            // actionButtons don't have IDs, so we need to generate them to be used later as a react component key
+            actionButtons = actionButtons.map((actionButton) => (Object.assign(Object.assign({}, actionButton), { Uuid: uuid_1.createUuid() })));
             // create the cell
             this.eGui = document.createElement('div');
             this.eGui.className = 'ab-ActionColumn';
-            let pkValue = adaptable.getPrimaryKeyValueFromRowNode(params.node);
-            let button = actionCol.actionColumnButton;
-            let context = {
-                actionColumn: actionCol,
-                primaryKeyValue: pkValue,
-                rowNode: params.node,
-                adaptableApi: adaptable.api,
-            };
             // if its a group node then only show if set to do so
             if (adaptable.api.gridApi.isGroupRowNode(params.node) && !actionCol.includeGroupedRows) {
                 this.eGui.innerHTML = '';
                 return;
             }
-            if (button.hidden && button.hidden(button, context)) {
-                this.eGui.innerHTML = '';
-                return;
-            }
-            const disabled = button.disabled && button.disabled(button, context);
-            const renderButton = (adaptableApi, context) => {
-                var _a, _b;
-                const defaultIconProps = {
-                    style: {
-                        height: 15,
-                        width: 15,
-                    },
-                };
-                const iconProps = button.icon && Object.assign({}, defaultIconProps, button.icon);
-                let buttonStyle = adaptableApi.internalApi.getStyleForButton(button, context);
-                let buttonLabel = adaptableApi.internalApi.getLabelForButton(button, context);
-                let buttonTooltip = adaptableApi.internalApi.getTooltipForButton(button, context);
-                const handleClick = () => {
-                    button.onClick(button, context);
-                    // Timeout to let any updates to be done before re-rendering the component
-                    setTimeout(() => {
-                        // when called again it triggers a re-render
-                        // https:reactjs.org/docs/react-dom.html#render
-                        doRender();
-                    }, 16);
-                };
-                return (React.createElement(SimpleButton_1.default, { key: button.Uuid, variant: (_a = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.variant) !== null && _a !== void 0 ? _a : 'text', disabled: disabled, tooltip: buttonTooltip, 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' },
-                    button.icon ? React.createElement("img", Object.assign({}, iconProps)) : null,
-                    buttonLabel));
+            const pkValue = adaptable.getPrimaryKeyValueFromRowNode(params.node);
+            const buttonContext = {
+                actionColumn: actionCol,
+                primaryKeyValue: pkValue,
+                rowNode: params.node,
+                adaptableApi: adaptable.api,
+            };
+            const renderActionButtons = (buttons, adaptableApi, context) => {
+                return (React.createElement(React.Fragment, null, buttons.map((button) => {
+                    var _a, _b;
+                    if (button.hidden && button.hidden(button, context)) {
+                        return;
+                    }
+                    const defaultIconProps = {
+                        style: {
+                            height: 15,
+                            width: 15,
+                        },
+                    };
+                    const iconProps = button.icon && Object.assign({}, defaultIconProps, button.icon);
+                    const buttonStyle = adaptableApi.internalApi.getStyleForButton(button, context);
+                    const buttonLabel = adaptableApi.internalApi.getLabelForButton(button, context);
+                    const buttonTooltip = adaptableApi.internalApi.getTooltipForButton(button, context);
+                    const handleClick = () => {
+                        button.onClick(button, context);
+                        // Timeout to let any updates to be done before re-rendering the component
+                        setTimeout(() => {
+                            // when called again it triggers a re-render
+                            // https:reactjs.org/docs/react-dom.html#render
+                            doRender();
+                        }, 16);
+                    };
+                    const disabled = button.disabled && button.disabled(button, context);
+                    return (React.createElement(SimpleButton_1.default, { key: button.Uuid, variant: (_a = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.variant) !== null && _a !== void 0 ? _a : 'text', disabled: disabled, tooltip: buttonTooltip, 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' },
+                        button.icon ? React.createElement("img", Object.assign({}, iconProps)) : null,
+                        buttonLabel));
+                })));
             };
             const eGui = this.eGui;
             function doRender() {
-                react_dom_1.render(renderButton(adaptable.api, context), eGui);
+                react_dom_1.render(renderActionButtons(actionButtons, adaptable.api, buttonContext), eGui);
             }
             this.render = doRender;
             doRender();

package/src/agGrid/Adaptable.d.ts

@@ -74,6 +74,7 @@ export declare class Adaptable implements IAdaptable {
     private _id;
     private currentColumnDefs?;
     private rowListeners;
+    private isCheckedColumnDataType;
     _on: (eventName: string, callback: EmitterCallback) => (() => void);
     _onIncludeFired: (eventName: string, callback: EmitterCallback) => (() => void);
     _emit: (eventName: string, data?: any) => Promise<any>;

package/src/agGrid/Adaptable.js

@@ -100,6 +100,7 @@ class Adaptable {
     constructor() {
         this.colDefPropertyCache = new Map();
         this.gridOptionsPropertyCache = new Map();
+        this.isCheckedColumnDataType = false;
         // only for our private / internal events used within Adaptable
         // public events are emitted through the EventApi
         this._on = (eventName, callback) => {
@@ -3675,7 +3676,7 @@ class Adaptable {
     updateColumnDataTypeIfRowDataIsEmpty() {
         var _a, _b;
         // gridOptions?.rowData is not updated when setting data via the api
-        if (!((_b = (_a = this.gridOptions) === null || _a === void 0 ? void 0 : _a.rowData) === null || _b === void 0 ? void 0 : _b.length)) {
+        if (!this.isCheckedColumnDataType && !((_b = (_a = this.gridOptions) === null || _a === void 0 ? void 0 : _a.rowData) === null || _b === void 0 ? void 0 : _b.length)) {
             // the columns dataType is based on the rawData, when type is not set on the column
             // when data is loaded async, the dataType initially is dataType=unknown
             // to fix this, we need to update the columnDefs when we data is loaded
@@ -3683,6 +3684,8 @@ class Adaptable {
             // this influences the floating filter
             // need to trigger header redraw, if not, the columnDef update is not picked-up
             this.redrawHeader();
+            // ensures the check is performed only once
+            this.isCheckedColumnDataType = true;
         }
     }
     runAdaptableComparerFunction(columnId, columnValues) {

package/src/metamodel/adaptable.metamodel.js

@@ -15,7 +15,7 @@ exports.ADAPTABLE_METAMODEL = {
             {
                 "name": "actionColumnButton",
                 "kind": "unknown",
-                "description": "Button to display in the Column",
+                "description": "Button (or list of buttons) to display in the Column",
                 "uiLabel": "Action Column Button"
             },
             {
@@ -11486,14 +11486,14 @@ exports.ADAPTABLE_METAMODEL = {
             {
                 "name": "bulkUpdatePermittedValues",
                 "kind": "unknown",
-                "description": "Custom column values for editing via bulk-update. When not defined it defaults to permittedValues.",
+                "description": "Custom column values for editing via bulk-update; when not defined defaults to permittedValues",
                 "uiLabel": "Bulk Update Permitted Values",
                 "isOptional": true
             },
             {
                 "name": "colorPalette",
                 "kind": "unknown",
-                "description": "Colours to display in Colour Picker (in place of AdapTable's default set)",
+                "description": "Colours to display in Colour Picker (in place of AdapTable's default set); can be hardcoded list or function",
                 "uiLabel": "Color Palette",
                 "isOptional": true
             },
@@ -11507,7 +11507,7 @@ exports.ADAPTABLE_METAMODEL = {
             {
                 "name": "customSortPermittedValues",
                 "kind": "unknown",
-                "description": "Custom column values for defining custom sort. When not defined it defaults to permittedValues.",
+                "description": "Custom column values for defining Custom Sort; when not defined defaults to permittedValues",
                 "uiLabel": "Custom Sort Permitted Values",
                 "isOptional": true
             },
@@ -11530,14 +11530,14 @@ exports.ADAPTABLE_METAMODEL = {
             {
                 "name": "editLookUpItems",
                 "kind": "unknown",
-                "description": "Dropdown values displayed when column is being edited. When not defined it defaults to permittedValues.",
+                "description": "Dropdown values displayed when column is being edited; when not defined defaults to permittedValues",
                 "uiLabel": "Edit Look Up Items",
                 "isOptional": true
             },
             {
                 "name": "filterPermittedValues",
                 "kind": "unknown",
-                "description": "Dropdown values for filter options inside floating and header filter. When not defined it defaults to permittedValues.",
+                "description": "Custom column values for 'IN' filter; when not defined defaults to permittedValues",
                 "uiLabel": "Filter Permitted Values",
                 "isOptional": true
             },

package/src/types.d.ts

@@ -1,5 +1,10 @@
 export type { ExpressionFunction, ExpressionFunctionDocBlock, ExpressionFunctionHandler, ExpressionContext, ExpressionFunctionMap, } from './../src/parser/src/types';
 export type { AdaptableNoCodeWizardOptions, IAdaptableNoCodeWizard, } from './AdaptableInterfaces/AdaptableNoCodeWizard';
+export type { BooleanFunctionName } from './Utilities/ExpressionFunctions/booleanExpressionFunctions';
+export type { ScalarFunctionName } from './Utilities/ExpressionFunctions/scalarExpressionFunctions';
+export type { ObservableFunctionName } from './Utilities/ExpressionFunctions/observableExpressionFunctions';
+export type { AggregationFunctionName } from './Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions';
+export type { AggregatedScalarFunctionName } from './Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions';
 export type { AdaptableOptions } from './AdaptableOptions/AdaptableOptions';
 export { AdaptablePlugin } from './AdaptableOptions/AdaptablePlugin';
 export type { ContainerOptions } from './AdaptableOptions/ContainerOptions';

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "11.1.1-canary.1";
+declare const _default: "11.1.1-canary.2";
 export default _default;

package/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '11.1.1-canary.1'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version
+exports.default = '11.1.1-canary.2'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version