@adaptabletools/adaptable 15.4.3 → 16.0.0-canary.1

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

@@ -62,7 +62,7 @@ const ShortcutSettingsWizard = (props) => {
         React.createElement(Tabs_1.Tabs, { autoFocus: false },
             React.createElement(Tabs_1.Tabs.Tab, null, "Shortcut Settings"),
             React.createElement(Tabs_1.Tabs.Content, null,
-                React.createElement(FormLayout_1.default, { width: 800 },
+                React.createElement(FormLayout_1.default, null,
                     React.createElement(FormLayout_1.FormRow, null,
                         ' ',
                         React.createElement(HelpBlock_1.default, { fontSize: 2, mb: 0 }, "Keyboard key that, when pressed, triggers the shortcut")),

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

@@ -10,11 +10,11 @@ const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/Dr
 const ErrorBox_1 = tslib_1.__importDefault(require("../../../components/ErrorBox"));
 const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
 const HelpBlock_1 = tslib_1.__importDefault(require("../../../components/HelpBlock"));
-const IconSelector_1 = require("../../../components/IconSelector");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));
 const Tabs_1 = require("../../../components/Tabs");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
 const AdaptablePopover_1 = require("../../AdaptablePopover");
+const AdaptableIconSelector_1 = require("../../Components/AdaptableIconSelector");
 const PredicateEditor_1 = require("../../Components/PredicateEditor/PredicateEditor");
 const StyleComponent_1 = require("../../Components/StyleComponent");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
@@ -51,7 +51,7 @@ const BadgeEditor = (props) => {
                     React.createElement(HelpBlock_1.default, { fontSize: 2, mb: 1, mt: 2 }, "Select (optional) Icon (and Icon position) to display in the Badge"),
                     ' ',
                     // for now, only show for system icons the
-                    !badge.Icon || 'name' in badge.Icon ? (React.createElement(IconSelector_1.IconSelector, { value: (badge === null || badge === void 0 ? void 0 : badge.Icon) && 'name' in (badge === null || badge === void 0 ? void 0 : badge.Icon) ? badge.Icon.name : undefined, onChange: (iconName) => {
+                    !badge.Icon || 'name' in badge.Icon ? (React.createElement(AdaptableIconSelector_1.AdaptableIconSelector, { value: (badge === null || badge === void 0 ? void 0 : badge.Icon) && 'name' in (badge === null || badge === void 0 ? void 0 : badge.Icon) ? badge.Icon.name : undefined, onChange: (iconName) => {
                             if (iconName) {
                                 onChange(Object.assign(Object.assign({}, badge), { Icon: {
                                         name: iconName,

package/src/View/StyledColumn/Wizard/StyledColumnWizardStyleSection/Components/StyledColumnBadgePreview.js

@@ -21,8 +21,15 @@ const StyledColumnBadgePreview = ({ data }) => {
         const predicateStr = badge.Predicate
             ? adaptable.api.predicateApi.predicateToString(badge.Predicate)
             : 'No Predicate';
+        let icon = badge.Icon;
+        const customIcon = badge.Icon &&
+            'name' in badge.Icon &&
+            adaptable.api.userInterfaceApi.getCustomIconDefinition(badge.Icon.name);
+        if (customIcon) {
+            icon = customIcon;
+        }
         return (React.createElement(rebass_1.Box, { mb: 1, key: index },
-            React.createElement(Badge_1.Badge, { icon: badge.Icon, adaptableStyle: badge.Style, iconPosition: badge.IconPosition }, value),
+            React.createElement(Badge_1.Badge, { icon: icon, adaptableStyle: badge.Style, iconPosition: badge.IconPosition }, value),
             React.createElement(Tag_1.Tag, { ml: 2 }, predicateStr)));
     })));
 };

package/src/agGrid/ActionColumnRenderer.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { ICellRendererComp, ICellRendererParams } from '@ag-grid-community/core';
-import { ActionColumn } from '../AdaptableOptions/ActionOptions';
+import { ActionColumn } from '../types';
 interface ActionColumnCellRendererParams extends ICellRendererParams {
     actionColumn?: ActionColumn;
 }

package/src/agGrid/ActionColumnRenderer.js

@@ -10,7 +10,7 @@ function getActionButtonsAndActionColumn(adaptable, actionColumn, colId) {
     var _a;
     const actionCol = actionColumn
         ? actionColumn
-        : (_a = adaptable.api.actionApi.getActionColumns()) === null || _a === void 0 ? void 0 : _a.find((ac) => ac.columnId == colId);
+        : (_a = adaptable.api.actionColumnApi.getActionColumns()) === null || _a === void 0 ? void 0 : _a.find((ac) => ac.columnId == colId);
     if (actionCol && actionCol.actionColumnButton) {
         let actionButtons = Array.isArray(actionCol.actionColumnButton)
             ? actionCol.actionColumnButton
@@ -71,6 +71,8 @@ const ReactActionColumnRenderer = (props) => {
         primaryKeyValue: pkValue,
         rowNode: props.node,
         adaptableApi: adaptable.api,
+        userName: adaptable.adaptableOptions.userName,
+        adaptableId: adaptable.adaptableOptions.adaptableId,
         data: props.data,
     };
     return (React.createElement("div", { className: "ab-ActionColumn" }, renderActionButtons(actionButtons, adaptable.api, buttonContext, rerender)));
@@ -98,6 +100,8 @@ class ActionColumnRenderer {
             primaryKeyValue: pkValue,
             rowNode: params.node,
             adaptableApi: adaptable.api,
+            userName: adaptable.adaptableOptions.userName,
+            adaptableId: adaptable.adaptableOptions.adaptableId,
             data: params.data,
         };
         const eGui = this.eGui;

package/src/agGrid/Adaptable.d.ts

@@ -1,6 +1,6 @@
 import { ChartRef, ColDef, ColGroupDef, Column, ColumnRowGroupChangedEvent, ExcelStyle, GridOptions, IRowNode, Module, ModuleNames } from '@ag-grid-community/core';
 import { AdaptableNoCodeWizardOptions, IAdaptableNoCodeWizard } from '../AdaptableInterfaces/AdaptableNoCodeWizard';
-import { AdaptableVariant, IAdaptable } from '../AdaptableInterfaces/IAdaptable';
+import { AdaptableVariant, AgGridConfig, IAdaptable } from '../AdaptableInterfaces/IAdaptable';
 import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
 import { AdaptablePlugin } from '../AdaptableOptions/AdaptablePlugin';
 import { AdaptableApi } from '../Api/AdaptableApi';
@@ -33,16 +33,18 @@ import { IQueryLanguageService } from '../Utilities/Services/Interface/IQueryLan
 import { IAlertService } from '../Utilities/Services/Interface/IAlertService';
 import { ColumnSetupInfo } from './ColumnSetupInfo';
 import { CustomSort } from '../PredefinedConfig/CustomSortState';
-import { ColumnValuesComparer } from '../AdaptableOptions/GeneralOptions';
+import { ColumnValuesComparer } from '../AdaptableOptions/CustomSortOptions';
 import { IMetamodelService } from '../Utilities/Services/Interface/IMetamodelService';
 import { IRowEditService } from '../Utilities/Services/Interface/IRowEditService';
 import { RenderReactRootFn } from '../renderReactRoot';
 import { AdaptableLogger } from './AdaptableLogger';
 declare type RuntimeConfig = {
+    gridOptions: GridOptions;
     waitForAgGrid?: boolean;
     supressReact18RenderWarning?: boolean;
     renderReactRoot?: RenderReactRootFn;
     variant?: AdaptableVariant;
+    agGridModules?: Module[];
 };
 export declare class Adaptable implements IAdaptable {
     api: AdaptableApi;
@@ -117,21 +119,19 @@ export declare class Adaptable implements IAdaptable {
      * @param runtimeConfig the list of all the provided AG Grid modules (which will be passed to the underlying AG Grid instance)
      * @returns a Promise containing the AdaptableAPI object in order to enable run-time access to Adaptable's properties and functions
      */
-    static init(adaptableOptions: AdaptableOptions, runtimeConfig: {
-        agGridModules: Module[];
-    }): Promise<AdaptableApi>;
+    static init(adaptableOptions: AdaptableOptions, agGridConfig: AgGridConfig): Promise<AdaptableApi>;
     /**
      * Lazy static constructor for Adaptable
      * Receives an AdaptableOptions object
      * Returns a Promise containing the AdaptableAPI object in order to enable run-time access to Adaptable's properties and functions
      * @param adaptableOptions an instance of AdaptableOptions
      */
-    static initInternal(adaptableOptions: AdaptableOptions, runtimeConfig?: RuntimeConfig): Promise<AdaptableApi>;
+    static initInternal(adaptableOptions: AdaptableOptions, runtimeConfig: RuntimeConfig): Promise<AdaptableApi>;
     private static collectInstance;
     static forEachAdaptable(fn: (adaptable: Adaptable) => void): void;
     private static dismissInstance;
     constructor();
-    init(adaptableOptions: AdaptableOptions, runtimeConfig?: RuntimeConfig, _staticInit?: boolean): Promise<AdaptableApi>;
+    init(adaptableOptions: AdaptableOptions, runtimeConfig: RuntimeConfig, _staticInit?: boolean): Promise<AdaptableApi>;
     forPlugins(callback: (plugin: AdaptablePlugin) => any): void;
     getPlugin(pluginId: string): AdaptablePlugin;
     getPluginProperty(pluginId: string, propertyName: string, ...args: any): any;
@@ -194,6 +194,15 @@ export declare class Adaptable implements IAdaptable {
     setColumnOrder(VisibleColumnList: string[]): void;
     private persistLayout;
     setLayout(layout?: Layout): void;
+    /**
+     * Setting layout works by modifing the column state.
+     * The column state is based on the current existing columns.
+     * At this point the column groups do not exist, and the widths from layout are not applied.
+     *
+     * After the col sate is applied and the column groups are created we need
+     * to apply the state again to update the widths of the group columns.
+     */
+    private applyGroupColumnWidth;
     updateRowGroupsExpandedState(layout?: Layout): void;
     private updateLayoutFromGrid;
     setSelectedCells(): SelectedCellInfo | undefined;
@@ -266,10 +275,10 @@ export declare class Adaptable implements IAdaptable {
      */
     private mapColumnDefs;
     private getColDefsForSpecialColumns;
-    getColDefsForFreeTextColumns(): ColDef<any>[];
+    getColDefsForFreeTextColumns(): ColDef<any, any>[];
     setupColumnValueGetter({ col }: ColumnSetupInfo): void;
     private getColDefsForRowEditColumns;
-    getColDefsForActionColumns(): ColDef<any>[];
+    getColDefsForActionColumns(): ColDef<any, any>[];
     updateColDefsForSpecialColumns(): void;
     private getColDefsForCalculatedColumns;
     private isRegularColDef;
@@ -307,6 +316,7 @@ export declare class Adaptable implements IAdaptable {
     setupAllowedAggFuncs({ col, abColumn }: ColumnSetupInfo): void;
     triggerSetupColumnKeyCreator(colId: string): void;
     setupColumnKeyCreator(columnSetupInfo: ColumnSetupInfo): void;
+    setupColumnCellDataType(columnSetupInfo: ColumnSetupInfo): void;
     setupColumnHeader({ col, abColumn }: ColumnSetupInfo): boolean;
     setupColumnFilter({ col, colDef }: ColumnSetupInfo): void;
     setupColumnFloatingFilter({ col, colDef }: ColumnSetupInfo): void;
@@ -317,7 +327,8 @@ export declare class Adaptable implements IAdaptable {
     private applyCurrentTheme;
     private applyFinalRendering;
     isAgGridModulePresent(moduleName: ModuleNames): boolean;
-    private getAgGridRegisteredModules;
+    getAgGridRegisteredModules(): Module[];
+    private getAgGridRegisteredModuleNames;
     private onRowDataChanged;
     private onCellDataChanged;
     private isUndoChange;