@adaptabletools/adaptable 11.0.0-canary.0 → 11.0.0-canary.1

package/index.css

@@ -3689,26 +3689,30 @@ html.ab--theme-dark .ab-ListBoxFilterForm--aggrid-style {
   border-style: none;
   --ab-toast-cmp__shadow-color: var(--ab-color-accent);
   box-shadow: 0 0 7px 2px var(--ab-toast-cmp__shadow-color);
-  background: var(--ab-toast-cmp__shadow-color); }
+  background: var(--ab-toast-cmp__shadow-color);
+  --toastify-text-color-info: var(--ab-color-text-on-primary);
+  --toastify-text-color-success: var(--ab-color-text-on-primary);
+  --toastify-text-color-warning: var(--ab-color-text-on-primary);
+  --toastify-text-color-error: var(--ab-color-text-on-primary);
+  --toastify-color-info: var(--ab-color-info);
+  --toastify-color-success: var(--ab-color-success);
+  --toastify-color-warning: var(--ab-color-warn);
+  --toastify-color-error: var(--ab-color-error); }
 
 .Toastify__toast-body {
   padding: 0; }
 
 .Toastify__toast--info {
-  --ab-toast-cmp__shadow-color: var(--ab-color-info);
-  color: var(--ab-color-text-on-primary); }
+  --ab-toast-cmp__shadow-color: var(--ab-color-info); }
 
 .Toastify__toast--success {
-  --ab-toast-cmp__shadow-color: var(--ab-color-success);
-  color: var(--ab-color-text-on-primary); }
+  --ab-toast-cmp__shadow-color: var(--ab-color-success); }
 
 .Toastify__toast--warning {
-  --ab-toast-cmp__shadow-color: var(--ab-color-warn);
-  color: var(--ab-color-text-on-primary); }
+  --ab-toast-cmp__shadow-color: var(--ab-color-warn); }
 
 .Toastify__toast--error {
-  --ab-toast-cmp__shadow-color: var(--ab-color-error);
-  color: var(--ab-color-text-on-primary); }
+  --ab-toast-cmp__shadow-color: var(--ab-color-error); }
 
 .ab--custom-mac-like-scrollbars .ab-Grid * ::-webkit-scrollbar,
 .ab--custom-mac-like-scrollbars .ag-root * ::-webkit-scrollbar,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "11.0.0-canary.0",
+  "version": "11.0.0-canary.1",
   "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",
   "main": "index.js",
   "typings": "index.d.ts",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1643291530490;
+declare const _default: 1643749744379;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -75,7 +75,6 @@ export interface IAdaptable {
     _on(eventName: 'GridRefreshed', callback: () => void): () => void;
     _on(eventName: 'GridFiltered', callback: () => void): () => void;
     _on(eventName: 'SortChanged', callback: (columnSorts: ColumnSort[]) => void): () => void;
-    _on(eventName: 'ColumnResized', callback: (colId: string) => void): () => void;
     _on(eventName: 'KeyDown', callback: (keyDownEvent: any) => void): () => void;
     _on(eventName: 'CellEditorKeyDown', callback: (param: {
         keyDownEvent: KeyboardEvent;

package/src/AdaptableOptions/DashboardOptions.d.ts

@@ -15,14 +15,14 @@ export interface DashboardOptions {
      */
     canFloat?: boolean;
     /**
-     * Shows Quick Search textbox in the Dashboard Header; the UI component is still subject to the QuickSearch Entitlements
+     * Shows Quick Search textbox in the Dashboard Header
      *
      * @defaultValue true
      * @gridInfoItem
      */
     showQuickSearchInHeader?: boolean;
     /**
-     * Custom Adaptable Buttons to appear in top corner of Dashboard - next to Module Buttons
+     * Custom Adaptable Buttons to appear in Dashboard (alongside Module Buttons)
      */
     customDashboardButtons?: AdaptableButton<DashboardButtonContext>[];
     /**
@@ -30,6 +30,7 @@ export interface DashboardOptions {
      */
     customToolbars?: CustomToolbar[];
     /**
+     * Position in the Dashboard to show the Module and Custom Buttons
      * @defaultValue 'right'
      */
     buttonsLocation?: 'left' | 'right';

package/src/AdaptableOptions/GeneralOptions.d.ts

@@ -71,7 +71,7 @@ export interface GeneralOptions {
      */
     customSortComparers?: ColumnValuesComparer[];
     /**
-     * Keep case sensitivity when AdapTableQL evaluates string-based Expressions and Predicates
+     * Perform case-sensitive text comparisons in all search and filter operations: QuickSearch, Filters, Query, Predicates
      *
      * @defaultValue false
      * @gridInfoItem

package/src/AdaptableOptions/TeamSharingOptions.d.ts

@@ -30,7 +30,7 @@ export interface TeamSharingOptions {
      */
     updateInterval?: number;
     /**
-     * How user is informed when Active Shared Entities have newer revisions: can be 'Alert', 'AlertWithNotification' or 'SystemStatus'
+     * How user is informed when Active Shared Entities have newer revisions
      *
      * @defaultValue null (none)
      * @gridInfoItem

package/src/Api/Events/SearchChanged.d.ts

@@ -8,7 +8,7 @@ import { BaseEventInfo } from './BaseEventInfo';
  */
 export interface SearchChangedInfo extends BaseEventInfo {
     /**
-     * What action caused event to fire: DataSource, CurrentQuery, Filter, DataChange or Sort
+     * What search-related change caused the event to fire
      */
     searchChangedTrigger: 'DataSource' | 'CurrentQuery' | 'Filter' | 'DataChange' | 'Sort';
     /**

package/src/Api/Implementation/InternalApiImpl.d.ts

@@ -73,7 +73,6 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     private createDataChangedInfoFromGridCell;
     setLastAppliedShortCut(gridCell: GridCell | undefined): void;
     updateCurrentDraftLayout(layout: Layout): void;
-    setDefaultDashboardTab(): void;
     getPrimaryKey(): any;
     getAdaptableInstance(): IAdaptable;
     getAgGridInstance(): any;

package/src/Api/Implementation/InternalApiImpl.js

@@ -7,7 +7,6 @@ const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/Sy
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
 const LayoutRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/LayoutRedux"));
-const DashboardRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/DashboardRedux"));
 const AlertRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/AlertRedux"));
 const DeadRedux = tslib_1.__importStar(require("../../Redux/DeadRedux"));
 const ApiBase_1 = require("./ApiBase");
@@ -187,13 +186,6 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     updateCurrentDraftLayout(layout) {
         this.dispatchAction(LayoutRedux.LayoutUpdateCurrentDraft(layout));
     }
-    setDefaultDashboardTab() {
-        const dashboardTabs = this.adaptable.api.dashboardApi.getDashboardState().Tabs;
-        if (ArrayExtensions_1.default.IsNull(dashboardTabs)) {
-            LoggingHelper_1.LogAdaptableInfo('Creating a default Dashboard tab');
-            this.dispatchAction(DashboardRedux.DashboardCreateDefaultTab());
-        }
-    }
     getPrimaryKey() {
         return this.adaptable.adaptableOptions.primaryKey;
     }

package/src/Api/InternalApi.d.ts

@@ -76,7 +76,6 @@ export interface InternalApi {
     getQueryPreviewData(): any;
     buildDataChangedInfo(config: Pick<DataChangedInfo, 'newValue' | 'oldValue' | 'column' | 'primaryKeyValue' | 'rowNode' | 'trigger'>): DataChangedInfo;
     setLastAppliedShortCut(gridCell: GridCell | undefined): void;
-    setDefaultDashboardTab(): void;
     updateCurrentDraftLayout(layout: Layout): void;
     getPrimaryKey(): any;
     getAdaptableInstance(): IAdaptable;

package/src/PredefinedConfig/DashboardState.d.ts

@@ -35,16 +35,16 @@ export interface DashboardState extends ConfigState {
      */
     IsHidden?: boolean;
     /**
-     * Position of Dashboard in 'floating mode' - set and stored by AdapTable
+     * Position of Dashboard when in 'floating mode'
      */
     FloatingPosition?: AdaptableCoordinate;
     /**
-     * Module Buttons visible in Dasbhoard Header when application loads - open popup screen for associated AdapTable Module
-     * @defaultValue Empty Array
+     * Module Buttons which open screen in Settings Panel for associated AdapTable Module
+     * @defaultValue ['SettingsPanel']
      */
     ModuleButtons?: AdaptableModuleButtons;
     /**
-     * Title to display in Dashboard Header; if missing, 'adaptableId' property in Adaptable Options is used
+     * Title to display in Dashboard Header
      * @defaultValue `adaptableId` in Adaptable Options
      */
     DashboardTitle?: string;

package/src/Redux/ActionsReducers/DashboardRedux.d.ts

@@ -35,10 +35,6 @@ export declare const DASHBOARD_SET_FLOATING_POSITION = "DASHBOARD_SET_FLOATING_P
  * @ReduxAction New Dashboard Tabs have been set
  */
 export declare const DASHBOARD_SET_TABS = "DASHBOARD_SET_TABS";
-/**
- * @ReduxAction A default Tab has been created
- */
-export declare const DASHBOARD_CREATE_DEFAULT_TAB = "DASHBOARD_CREATE_DEFAULT_TAB";
 /**
  * @ReduxAction A Toolbar has been closed
  */
@@ -85,8 +81,6 @@ export interface DashboardSetFloatingPositionAction extends Redux.Action {
 export interface DashboardCloseToolbarAction extends Redux.Action {
     toolbar: AdaptableDashboardToolbar;
 }
-export interface DashboardCreateDefaultTabAction extends Redux.Action {
-}
 export interface DashboardSetTabsAction extends Redux.Action {
     Tabs: DashboardTab[];
 }
@@ -109,7 +103,6 @@ export declare const DashboardSetIsHidden: (IsHidden: boolean) => DashboardSetIs
 export declare const DashboardSetIsInline: (IsInline: boolean) => DashboardSetIsInlineAction;
 export declare const DashboardSetFloatingPosition: (FloatingPosition: AdaptableCoordinate) => DashboardSetFloatingPositionAction;
 export declare const DashboardSetTabs: (Tabs: DashboardTab[]) => DashboardSetTabsAction;
-export declare const DashboardCreateDefaultTab: () => DashboardCreateDefaultTabAction;
 export declare const DashboardCloseToolbar: (toolbar: AdaptableDashboardToolbar) => DashboardCloseToolbarAction;
 export declare const DashboardSetTitle: (title: string) => DashboardSetTitleAction;
 export declare const DashboardReady: (dashboardState: DashboardState) => DashboardReadyAction;

package/src/Redux/ActionsReducers/DashboardRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DashboardReducer = exports.DashboardReady = exports.DashboardSetTitle = exports.DashboardCloseToolbar = exports.DashboardCreateDefaultTab = exports.DashboardSetTabs = exports.DashboardSetFloatingPosition = exports.DashboardSetIsInline = exports.DashboardSetIsHidden = exports.DashboardSetIsFloating = exports.DashboardSetIsCollapsed = exports.DashboardSetActiveTabIndex = exports.DashboardSetModuleButtons = exports.DASHBOARD_READY = exports.DASHBOARD_SET_TITLE = exports.DASHBOARD_CLOSE_TOOLBAR = exports.DASHBOARD_CREATE_DEFAULT_TAB = exports.DASHBOARD_SET_TABS = exports.DASHBOARD_SET_FLOATING_POSITION = exports.DASHBOARD_SET_IS_HIDDEN = exports.DASHBOARD_SET_IS_INLINE = exports.DASHBOARD_SET_IS_FLOATING = exports.DASHBOARD_SET_IS_COLLAPSED = exports.DASHBOARD_ACTIVE_TAB_INDEX_CHANGE = exports.DASHBOARD_SET_MODULE_BUTTONS = void 0;
+exports.DashboardReducer = exports.DashboardReady = exports.DashboardSetTitle = exports.DashboardCloseToolbar = exports.DashboardSetTabs = exports.DashboardSetFloatingPosition = exports.DashboardSetIsInline = exports.DashboardSetIsHidden = exports.DashboardSetIsFloating = exports.DashboardSetIsCollapsed = exports.DashboardSetActiveTabIndex = exports.DashboardSetModuleButtons = exports.DASHBOARD_READY = exports.DASHBOARD_SET_TITLE = exports.DASHBOARD_CLOSE_TOOLBAR = exports.DASHBOARD_SET_TABS = exports.DASHBOARD_SET_FLOATING_POSITION = exports.DASHBOARD_SET_IS_HIDDEN = exports.DASHBOARD_SET_IS_INLINE = exports.DASHBOARD_SET_IS_FLOATING = exports.DASHBOARD_SET_IS_COLLAPSED = exports.DASHBOARD_ACTIVE_TAB_INDEX_CHANGE = exports.DASHBOARD_SET_MODULE_BUTTONS = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 /**
  * @ReduxAction The Module Buttons have been set in the Dashboard
@@ -34,10 +34,6 @@ exports.DASHBOARD_SET_FLOATING_POSITION = 'DASHBOARD_SET_FLOATING_POSITION';
  * @ReduxAction New Dashboard Tabs have been set
  */
 exports.DASHBOARD_SET_TABS = 'DASHBOARD_SET_TABS';
-/**
- * @ReduxAction A default Tab has been created
- */
-exports.DASHBOARD_CREATE_DEFAULT_TAB = 'DASHBOARD_CREATE_DEFAULT_TAB';
 /**
  * @ReduxAction A Toolbar has been closed
  */
@@ -82,9 +78,6 @@ exports.DashboardSetTabs = (Tabs) => ({
     type: exports.DASHBOARD_SET_TABS,
     Tabs,
 });
-exports.DashboardCreateDefaultTab = () => ({
-    type: exports.DASHBOARD_CREATE_DEFAULT_TAB,
-});
 exports.DashboardCloseToolbar = (toolbar) => ({
     toolbar,
     type: exports.DASHBOARD_CLOSE_TOOLBAR,
@@ -146,9 +139,6 @@ exports.DashboardReducer = (state = initialState, action) => {
             const { Tabs } = action;
             return Object.assign(Object.assign({}, state), { Tabs });
         }
-        case exports.DASHBOARD_CREATE_DEFAULT_TAB: {
-            return Object.assign(Object.assign({}, state), { Tabs: [{ Name: 'Toolbars', Toolbars: ['Query', 'Layout', 'Export', 'Filter'] }] });
-        }
         case exports.DASHBOARD_CLOSE_TOOLBAR: {
             const actionTyped = action;
             const tabs = [].concat(state.Tabs);

package/src/Redux/Store/AdaptableStore.js

@@ -693,7 +693,6 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case DashboardRedux.DASHBOARD_SET_IS_HIDDEN:
                 case DashboardRedux.DASHBOARD_SET_FLOATING_POSITION:
                 case DashboardRedux.DASHBOARD_SET_TABS:
-                case DashboardRedux.DASHBOARD_CREATE_DEFAULT_TAB:
                 case DashboardRedux.DASHBOARD_CLOSE_TOOLBAR: {
                     const oldDashboardState = middlewareAPI.getState().Dashboard;
                     let returnAction = next(action);

package/src/View/AdaptableView.js

@@ -27,7 +27,7 @@ class AdaptableView extends React.Component {
             Boolean(this.props.PopupState.ScreenPopup.ShowScreenPopup) && (React.createElement(AdaptablePopup_1.AdaptablePopup, { componentName: this.props.PopupState.ScreenPopup.ComponentName, componentModule: this.props.PopupState.ScreenPopup.ComponentModule, onHide: this.props.onCloseScreenPopup, api: this.props.AdaptableApi, onClearParams: () => this.props.onClearPopupParams(), moduleParams: this.props.PopupState.ScreenPopup.Params, moduleProps: this.props.PopupState.ScreenPopup.PopupProps })),
             React.createElement(ExportCustomDestinationFormPopups_1.ExportCustomDestinationFormPopups, { api: this.props.AdaptableApi }),
             React.createElement(react_toastify_1.ToastContainer, { limit: this.props.AdaptableApi.internalApi.getAdaptableOptions().notificationsOptions
-                    .maxNotifications, closeButton: false }),
+                    .maxNotifications, closeButton: false, icon: false, theme: "colored" }),
             (watermark === null || watermark === void 0 ? void 0 : watermark.show) && React.createElement(License_1.LicenseWatermark, null, watermark === null || watermark === void 0 ? void 0 : watermark.text),
             React.createElement(ProgressIndicator_1.ProgressIndicator, null)));
     }

package/src/View/CalculatedColumn/Wizard/CalculatedColumnSettingsWizardSection.js

@@ -16,6 +16,7 @@ const Tabs_1 = require("../../../components/Tabs");
 const ValueSelector_1 = require("../../Components/ValueSelector");
 const Tag_1 = require("../../../components/Tag");
 const getCalculatedColumnSettingTags_1 = require("../Utilities/getCalculatedColumnSettingTags");
+const SpecialColumnSettingsWizardStep_1 = require("../../SpecialColumnSettingsWizardStep");
 exports.renderCalculatedColumnSettingsSummary = (data) => {
     var _a;
     const options = getCalculatedColumnSettingTags_1.getCalculatedColumnSettingTags(data.CalculatedColumnSettings);
@@ -72,17 +73,15 @@ exports.CalculatedColumnSettingsWizardSection = (props) => {
     const ColumnName = data.FriendlyName;
     const ColumnId = data.ColumnId;
     let { DataType: dataType } = (_a = data.CalculatedColumnSettings) !== null && _a !== void 0 ? _a : {};
-    const { Width, Filterable, ShowToolTip, Resizable, Groupable, Sortable, Pivotable, Aggregatable, } = (_b = data.CalculatedColumnSettings) !== null && _b !== void 0 ? _b : {};
-    const onSettingsChange = (values) => {
-        props.onChange(Object.assign(Object.assign({}, data), { CalculatedColumnSettings: Object.assign(Object.assign({}, data.CalculatedColumnSettings), values) }));
+    const { Width, ShowToolTip } = (_b = data.CalculatedColumnSettings) !== null && _b !== void 0 ? _b : {};
+    const handleSpecialColumnSettingsChange = (settings) => {
+        props.onChange(Object.assign(Object.assign({}, data), { CalculatedColumnSettings: Object.assign(Object.assign({}, data.CalculatedColumnSettings), settings) }));
     };
     React.useEffect(() => {
         var _a;
         if (!dataType) {
             const computedDataType = calculatedColumnExpressionService.GetCalculatedColumnDataType((_a = data.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression);
-            onSettingsChange({
-                DataType: computedDataType,
-            });
+            handleSpecialColumnSettingsChange(Object.assign(Object.assign({}, data === null || data === void 0 ? void 0 : data.CalculatedColumnSettings), { DataType: computedDataType }));
         }
     }, []);
     return (React.createElement(rebass_1.Box, { "data-name": 'calculated-column-settings' },
@@ -111,23 +110,11 @@ exports.CalculatedColumnSettingsWizardSection = (props) => {
                                     onClick: () => handleDataTypeChange(item.value),
                                 })) }, dataType ? dataType : 'Select Data Type')),
                         React.createElement(FormLayout_1.FormRow, { label: "Width" },
-                            React.createElement(Input_1.default, { type: "number", width: 300, value: Width || '', onChange: (e) => onSettingsChange({ Width: Number(e.target.value) }) })),
+                            React.createElement(Input_1.default, { type: "number", width: 300, value: Width || '', onChange: (e) => handleSpecialColumnSettingsChange({
+                                    Width: Number(e.target.value),
+                                }) })),
                         React.createElement(FormLayout_1.FormRow, { label: "" },
-                            React.createElement(CheckBox_1.CheckBox, { onChange: (checked) => onSettingsChange({ ShowToolTip: checked }), checked: ShowToolTip }, "Show Expression as Tooltip")))))),
+                            React.createElement(CheckBox_1.CheckBox, { onChange: (checked) => handleSpecialColumnSettingsChange({ ShowToolTip: checked }), checked: ShowToolTip }, "Show Expression as Tooltip")))))),
         ErrorMessage ? React.createElement(ErrorBox_1.default, { marginTop: 2 }, ErrorMessage) : null,
-        React.createElement(Tabs_1.Tabs, { marginTop: 2, autoFocus: false },
-            React.createElement(Tabs_1.Tabs.Tab, null, " Column Properties"),
-            React.createElement(Tabs_1.Tabs.Content, null,
-                React.createElement(rebass_1.Flex, { flexDirection: "row" },
-                    React.createElement(FormLayout_1.default, { style: { width: '100%' }, columns: [{ name: 'first', size: '30%' }, { name: 'second' }] },
-                        React.createElement(FormLayout_1.FormRow, null,
-                            React.createElement(CheckBox_1.CheckBox, { checked: Filterable, onChange: (Filterable) => onSettingsChange({ Filterable }), disabled: !api.internalApi.getAdaptableOptions().filterOptions
-                                    .enableFilterOnSpecialColumns }, "Filterable"),
-                            React.createElement(CheckBox_1.CheckBox, { checked: Resizable, onChange: (Resizable) => onSettingsChange({ Resizable }) }, "Resizable")),
-                        React.createElement(FormLayout_1.FormRow, null,
-                            React.createElement(CheckBox_1.CheckBox, { checked: Groupable, onChange: (Groupable) => onSettingsChange({ Groupable }) }, "Groupable"),
-                            React.createElement(CheckBox_1.CheckBox, { checked: Sortable, onChange: (Sortable) => onSettingsChange({ Sortable }) }, "Sortable")),
-                        React.createElement(FormLayout_1.FormRow, null,
-                            React.createElement(CheckBox_1.CheckBox, { checked: Pivotable, onChange: (Pivotable) => onSettingsChange({ Pivotable }) }, "Pivotable"),
-                            React.createElement(CheckBox_1.CheckBox, { checked: Aggregatable, onChange: (Aggregatable) => onSettingsChange({ Aggregatable }) }, "Aggregatable"))))))));
+        React.createElement(SpecialColumnSettingsWizardStep_1.SpecialColumnSettingsWizardStep, { isEditable: false, settings: data.CalculatedColumnSettings, onChange: handleSpecialColumnSettingsChange })));
 };

package/src/View/Components/Popups/AdaptablePopup/Navigation.js

@@ -53,7 +53,7 @@ exports.Navigation = (props) => {
             const className = join_1.default(baseClassName, isActive && `${baseClassName}--active`);
             let customIcon = (_f = (_e = (_d = (_c = props.customSettingsPanels) === null || _c === void 0 ? void 0 : _c.find) === null || _d === void 0 ? void 0 : _d.call(_c, (customSettingPanel) => customSettingPanel.name === menuItem.label)) === null || _e === void 0 ? void 0 : _e.icon) !== null && _f !== void 0 ? _f : null;
             return (React.createElement("li", { className: className, key: menuItem.label },
-                React.createElement("button", { className: `${baseClassName}__Button`, onClick: () => {
+                React.createElement("button", { type: "button", className: `${baseClassName}__Button`, onClick: () => {
                         dispatch(menuItem.reduxAction);
                     } },
                     menuItem.icon && (React.createElement(icons_1.Icon, { className: `${baseClassName}__Icon`, name: menuItem.icon })),

package/src/View/FlashingCell/Wizard/{FlashingCellDurationWizardSection.d.ts → FlashingCellSettingsWizardSection.d.ts}

@@ -2,9 +2,9 @@
 import { FlashingCellDefinition } from '../../../types';
 declare type FlashingAlertDurationWizardSectionProps = {
     readOnly?: boolean;
-    flashingAlert?: FlashingCellDefinition;
+    flashingCell?: FlashingCellDefinition;
     onChange: (data: FlashingCellDefinition) => void;
 };
-export declare const renderFlashingAlertDurationSummary: (flashingAlert: FlashingCellDefinition) => JSX.Element;
-export declare const FlashingAlertDurationWizardSection: (props: FlashingAlertDurationWizardSectionProps) => JSX.Element;
+export declare const renderFlashingAlertSettingsSummary: (flashingAlert: FlashingCellDefinition) => JSX.Element;
+export declare const FlashingAlertSettingsWizardSection: (props: FlashingAlertDurationWizardSectionProps) => JSX.Element;
 export {};

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

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FlashingAlertSettingsWizardSection = exports.renderFlashingAlertSettingsSummary = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const react_1 = require("react");
+const rebass_1 = require("rebass");
+const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
+const usePrevious_1 = tslib_1.__importDefault(require("../../../components/utils/usePrevious"));
+const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
+const Tabs_1 = require("../../../components/Tabs");
+const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
+const CodeBlock_1 = require("../../../components/CodeBlock");
+const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
+exports.renderFlashingAlertSettingsSummary = (flashingAlert) => {
+    return (React.createElement(React.Fragment, null,
+        React.createElement(rebass_1.Text, { fontSize: 2 }, flashingAlert.FlashDuration === 'always' ? (React.createElement(React.Fragment, null, "Flashing is never removed")) : (React.createElement(React.Fragment, null,
+            "Flashing is removed after ",
+            React.createElement(CodeBlock_1.CodeBlock, null, flashingAlert.FlashDuration),
+            ' ',
+            "milliseconds")))));
+};
+exports.FlashingAlertSettingsWizardSection = (props) => {
+    var _a;
+    let { data: flashingCell } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    flashingCell = flashingCell !== null && flashingCell !== void 0 ? flashingCell : props.flashingCell;
+    const setDuration = (FlashDuration) => {
+        props.onChange(Object.assign(Object.assign({}, flashingCell), { FlashDuration: FlashDuration }));
+    };
+    const duration = (_a = flashingCell.FlashDuration) !== null && _a !== void 0 ? _a : 500;
+    const numberDuration = React.useRef(typeof duration === 'number' ? duration : 500);
+    const inputRef = react_1.useRef(null);
+    const oldDuration = usePrevious_1.default(duration, duration);
+    React.useEffect(() => {
+        var _a;
+        if (oldDuration === 'always' && duration != oldDuration) {
+            (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+        }
+    }, [duration, oldDuration]);
+    const handleTypeChange = (type) => {
+        setDuration(type === 'number' ? numberDuration.current : 'always');
+    };
+    const handleTargetChange = (type) => {
+        props.onChange(Object.assign(Object.assign({}, flashingCell), { FlashTarget: type }));
+    };
+    return (React.createElement(rebass_1.Flex, { height: "100%", flexDirection: "column", "data-name": "plus-minus-column-settings" },
+        React.createElement(Tabs_1.Tabs, { autoFocus: false, padding: 2 },
+            React.createElement(Tabs_1.Tabs.Tab, null, "Flashing Cell Settings"),
+            React.createElement(Tabs_1.Tabs.Content, null,
+                React.createElement(FormLayout_1.default, null,
+                    React.createElement(FormLayout_1.FormRow, { label: "Duration Type" },
+                        React.createElement(Radio_1.default, { mr: 3, checked: duration == 'always', tabIndex: -1, onChange: () => handleTypeChange('always') }, "Always"),
+                        React.createElement(Radio_1.default, { checked: duration !== 'always', tabIndex: -1, onChange: () => handleTypeChange('number') }, "Limited (ms)")),
+                    React.createElement(FormLayout_1.FormRow, { label: "" },
+                        duration !== 'always' && (React.createElement(rebass_1.Flex, { flexDirection: "row", alignItems: "baseline" },
+                            React.createElement(rebass_1.Text, { fontSize: 2, mr: 2 }, "After"),
+                            React.createElement(Input_1.default, { readOnly: props.readOnly, type: "text", name: "value", ref: inputRef, mt: 2, mr: 1, value: duration, onChange: (event) => {
+                                    const value = event.target.value;
+                                    setDuration(isNaN(Number(value)) ? 500 : Number(value));
+                                } }),
+                            React.createElement(rebass_1.Text, { fontSize: 2 }, "milliseconds"))),
+                        duration === 'always' && (React.createElement(rebass_1.Text, { height: 43, fontSize: 3 }, "Persists the flashing style indeterminately - can be removed manually"))),
+                    React.createElement(FormLayout_1.FormRow, { label: "Flash Target" },
+                        React.createElement(Radio_1.default, { onChange: () => handleTargetChange('cell'), mr: 3, checked: (flashingCell === null || flashingCell === void 0 ? void 0 : flashingCell.FlashTarget) == 'cell', tabIndex: -1 }, "Cell"),
+                        React.createElement(Radio_1.default, { onChange: () => handleTargetChange('row'), checked: (flashingCell === null || flashingCell === void 0 ? void 0 : flashingCell.FlashTarget) == 'row', tabIndex: -1 }, "Row")))))));
+};

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

@@ -6,7 +6,7 @@ const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
 const rebass_1 = require("rebass");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
-const FlashingCellDurationWizardSection_1 = require("./FlashingCellDurationWizardSection");
+const FlashingCellSettingsWizardSection_1 = require("./FlashingCellSettingsWizardSection");
 const Helper_1 = require("../../../Utilities/Helpers/Helper");
 const FlashingCellRulesWizardSection_1 = require("./FlashingCellRulesWizardSection");
 const FlashingCellStyleWizardSection_1 = require("./FlashingCellStyleWizardSection");
@@ -74,9 +74,9 @@ exports.FlashingCellWizard = (props) => {
             {
                 details: 'Select the Duration of the Flash',
                 render: () => (React.createElement(rebass_1.Box, { padding: 2 },
-                    React.createElement(FlashingCellDurationWizardSection_1.FlashingAlertDurationWizardSection, { onChange: setFlashingCell }))),
-                renderSummary: FlashingCellDurationWizardSection_1.renderFlashingAlertDurationSummary,
-                title: 'Duration',
+                    React.createElement(FlashingCellSettingsWizardSection_1.FlashingAlertSettingsWizardSection, { onChange: setFlashingCell }))),
+                renderSummary: FlashingCellSettingsWizardSection_1.renderFlashingAlertSettingsSummary,
+                title: 'Settings',
             },
             {
                 details: 'Choose the Flashing Styles',

package/src/View/FreeTextColumn/Wizard/FreeTextColumnSettingsWizardSection.js

@@ -17,6 +17,7 @@ const CheckBox_1 = require("../../../components/CheckBox");
 const FormatHelper_1 = require("../../../Utilities/Helpers/FormatHelper");
 const DateHelper_1 = require("../../../Utilities/Helpers/DateHelper");
 const Tag_1 = require("../../../components/Tag");
+const SpecialColumnSettingsWizardStep_1 = require("../../SpecialColumnSettingsWizardStep");
 const options = [
     { value: Enums_1.DataType.Number, label: Enums_1.DataType.Number },
     { value: Enums_1.DataType.String, label: Enums_1.DataType.String },
@@ -59,8 +60,7 @@ exports.isValidFreeTextColumn = (data, api) => {
 };
 exports.FreeTextColumnSettingsWizardSection = (props) => {
     const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
-    const Pattern = api.internalApi.getAdaptableOptions().userInterfaceOptions.dateInputOptions
-        .dateFormat;
+    const Pattern = api.internalApi.getAdaptableOptions().userInterfaceOptions.dateInputOptions.dateFormat;
     const [ColumnNameFocused, setColumnNameFocused] = react_1.useState(false);
     const inEdit = props.isEdit;
     const validCheck = exports.isValidFreeTextColumn(data, api);
@@ -98,6 +98,9 @@ exports.FreeTextColumnSettingsWizardSection = (props) => {
         }
         props.onChange(Object.assign(Object.assign({}, data), { DefaultValue }));
     };
+    const handleSpecialColumnSettingsChange = (settings) => {
+        props.onChange(Object.assign(Object.assign({}, data), { FreeTextColumnSettings: Object.assign(Object.assign({}, data === null || data === void 0 ? void 0 : data.FreeTextColumnSettings), settings) }));
+    };
     return (React.createElement(React.Fragment, null,
         React.createElement(FormLayout_1.default, null,
             React.createElement(FormLayout_1.FormRow, { label: "ColumnId" },
@@ -127,5 +130,7 @@ exports.FreeTextColumnSettingsWizardSection = (props) => {
             data.DataType == 'String' && (React.createElement(FormLayout_1.FormRow, { label: "Editor Type" },
                 React.createElement(Radio_1.default, { value: "Inline", checked: data.TextEditor == 'Inline', onChange: (_, e) => onDynamicSelectChanged(e), marginRight: 2 }, "Inline Editor"),
                 React.createElement(Radio_1.default, { value: "Large", checked: data.TextEditor == 'Large', onChange: (_, e) => onDynamicSelectChanged(e) }, "Large Editor")))),
-        ErrorMessage ? React.createElement(ErrorBox_1.default, { marginTop: 2 }, ErrorMessage) : null));
+        ErrorMessage ? (React.createElement(ErrorBox_1.default, { mt: 2, mb: 2 }, ErrorMessage)) : null,
+        React.createElement(rebass_1.Box, { mt: 2 },
+            React.createElement(SpecialColumnSettingsWizardStep_1.SpecialColumnSettingsWizardStep, { isEditable: true, settings: data.FreeTextColumnSettings, onChange: handleSpecialColumnSettingsChange }))));
 };

package/src/View/FreeTextColumn/Wizard/FreeTextColumnWizard.js

@@ -32,6 +32,7 @@ exports.FreeTextColumnWizard = (props) => {
             {
                 title: 'Settings',
                 details: 'Configure the Free Text Column',
+                isValid: FreeTextColumnSettingsWizardSection_1.isValidFreeTextColumn,
                 render: () => {
                     return (React.createElement(rebass_1.Box, { padding: 2 },
                         React.createElement(FreeTextColumnSettingsWizardSection_1.FreeTextColumnSettingsWizardSection, { isEdit: Boolean(props.data), onChange: setFreeTextColumn })));

package/src/View/SpecialColumnSettingsWizardStep.d.ts

@@ -0,0 +1,9 @@
+import * as React from 'react';
+import { SpecialColumnSettings } from '../../types';
+interface SpecialColumnTypeSettingsProps {
+    settings: SpecialColumnSettings;
+    onChange: (settings: SpecialColumnSettings) => void;
+    isEditable?: boolean;
+}
+export declare const SpecialColumnSettingsWizardStep: React.FunctionComponent<SpecialColumnTypeSettingsProps>;
+export {};

package/src/View/SpecialColumnSettingsWizardStep.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SpecialColumnSettingsWizardStep = void 0;
+const tslib_1 = require("tslib");
+const chunk_1 = tslib_1.__importDefault(require("lodash-es/chunk"));
+const React = tslib_1.__importStar(require("react"));
+const rebass_1 = require("rebass");
+const CheckBox_1 = require("../components/CheckBox");
+const FormLayout_1 = tslib_1.__importStar(require("../components/FormLayout"));
+const Tabs_1 = require("../components/Tabs");
+const AdaptableContext_1 = require("./AdaptableContext");
+exports.SpecialColumnSettingsWizardStep = (props) => {
+    var _a, _b;
+    const adaptable = AdaptableContext_1.useAdaptable();
+    const possibleColumnTypes = adaptable.api.internalApi.getAdaptableOptions().userInterfaceOptions.columnTypes;
+    const { Filterable, Resizable, Groupable, Sortable, Pivotable, Aggregatable, SuppressMenu, SuppressMovable, } = (_a = props.settings) !== null && _a !== void 0 ? _a : {};
+    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 : [];
+        if (checked) {
+            props.onChange(Object.assign(Object.assign({}, props.settings), { ColumnTypes: [...columnTypes, columnType] }));
+        }
+        else {
+            props.onChange(Object.assign(Object.assign({}, props.settings), { ColumnTypes: (_c = columnTypes === null || columnTypes === void 0 ? void 0 : columnTypes.filter) === null || _c === void 0 ? void 0 : _c.call(columnTypes, (item) => item !== columnType) }));
+        }
+    };
+    const onSettingsChange = (values) => {
+        props.onChange(Object.assign(Object.assign({}, props.settings), values));
+    };
+    return (React.createElement(React.Fragment, null,
+        React.createElement(Tabs_1.Tabs, { marginTop: 2, autoFocus: false },
+            React.createElement(Tabs_1.Tabs.Tab, null, "Column Properties"),
+            React.createElement(Tabs_1.Tabs.Content, null,
+                React.createElement(rebass_1.Flex, { flexDirection: "row" },
+                    React.createElement(FormLayout_1.default, { style: { width: '100%' }, columns: [
+                            { name: 'first', size: '30%' },
+                            { size: '30%', name: 'second' },
+                            { size: '30%', name: 'third' },
+                        ] },
+                        React.createElement(FormLayout_1.FormRow, null,
+                            React.createElement(CheckBox_1.CheckBox, { checked: Filterable, onChange: (Filterable) => onSettingsChange({ Filterable }), disabled: !adaptable.api.internalApi.getAdaptableOptions().filterOptions
+                                    .enableFilterOnSpecialColumns }, "Filterable"),
+                            React.createElement(CheckBox_1.CheckBox, { checked: Resizable, onChange: (Resizable) => onSettingsChange({ Resizable }) }, "Resizable"),
+                            React.createElement(CheckBox_1.CheckBox, { checked: Groupable, onChange: (Groupable) => onSettingsChange({ Groupable }) }, "Groupable")),
+                        React.createElement(FormLayout_1.FormRow, null,
+                            React.createElement(CheckBox_1.CheckBox, { checked: Sortable, onChange: (Sortable) => onSettingsChange({ Sortable }) }, "Sortable"),
+                            React.createElement(CheckBox_1.CheckBox, { checked: Pivotable, onChange: (Pivotable) => onSettingsChange({ Pivotable }) }, "Pivotable"),
+                            React.createElement(CheckBox_1.CheckBox, { checked: Aggregatable, onChange: (Aggregatable) => onSettingsChange({ Aggregatable }) }, "Aggregatable")),
+                        React.createElement(FormLayout_1.FormRow, null,
+                            React.createElement(CheckBox_1.CheckBox, { checked: SuppressMenu, onChange: (SuppressMenu) => onSettingsChange({ SuppressMenu }) }, "Suppress Menu"),
+                            React.createElement(CheckBox_1.CheckBox, { checked: SuppressMovable, onChange: (SuppressMovable) => onSettingsChange({ SuppressMovable }) }, "Suppress Movable"),
+                            React.createElement(CheckBox_1.CheckBox, { disabled: true, checked: props.isEditable }, "Editable")))))),
+        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 = chunk_1.default(possibleColumnTypes !== null && possibleColumnTypes !== void 0 ? possibleColumnTypes : [], 2)) === null || _b === void 0 ? void 0 : _b.map(([first, second]) => {
+                    var _a, _b, _c, _d, _e, _f;
+                    return (React.createElement(FormLayout_1.FormRow, { key: first },
+                        first && (React.createElement(CheckBox_1.CheckBox, { 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)),
+                        second && (React.createElement(CheckBox_1.CheckBox, { onChange: (checked) => handleColumnTypeChange(second, checked), checked: (_f = (_e = (_d = props.settings) === null || _d === void 0 ? void 0 : _d.ColumnTypes) === null || _e === void 0 ? void 0 : _e.includes) === null || _f === void 0 ? void 0 : _f.call(_e, second) }, second))));
+                })))))));
+};

package/src/agGrid/Adaptable.js

@@ -1951,6 +1951,7 @@ class Adaptable {
         const specialColumnsAreFilterable = this.api.internalApi.getAdaptableOptions().filterOptions.enableFilterOnSpecialColumns;
         const defaultFreeTextColumnSettings = ObjectFactory_1.CreateEmptyFreeTextColumn(specialColumnsAreFilterable).FreeTextColumnSettings;
         return this.api.freeTextColumnApi.getAllFreeTextColumn().map((freeTextColumn) => {
+            var _a;
             const freeTextColumnSettings = Object.assign(Object.assign({}, defaultFreeTextColumnSettings), freeTextColumn.FreeTextColumnSettings);
             const dataTypeEditor = freeTextColumn.DataType === 'Number'
                 ? AdaptableNumberEditor_1.AdaptableNumberEditor
@@ -1962,8 +1963,7 @@ class Adaptable {
                 GeneralConstants_1.AB_SPECIAL_COLUMN,
                 this.agGridHelper.getAgGridDataType(freeTextColumn.DataType),
             ];
-            if (freeTextColumn.FreeTextColumnSettings &&
-                ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(freeTextColumn.FreeTextColumnSettings.ColumnTypes)) {
+            if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty((_a = freeTextColumn === null || freeTextColumn === void 0 ? void 0 : freeTextColumn.FreeTextColumnSettings) === null || _a === void 0 ? void 0 : _a.ColumnTypes)) {
                 columnTypes.push(...freeTextColumn.FreeTextColumnSettings.ColumnTypes);
             }
             return {
@@ -2443,7 +2443,6 @@ class Adaptable {
          */
         this.gridOptions.api.addEventListener(all_modules_1.Events.EVENT_COLUMN_RESIZED, (params) => {
             if (params.finished == true && params.type == 'columnResized' && params.column) {
-                this._emit('ColumnResized', params.column.getColId());
                 this.debouncedSaveGridLayout();
             }
         });

package/src/components/Dashboard/Dashboard.js

@@ -29,7 +29,7 @@ function Dashboard(props) {
         top: position.y,
     };
     const renderTabs = () => (React.createElement("div", { className: "ab-Dashboard__tabs" }, children &&
-        React.Children.map(children, (child, index) => (React.createElement("button", { className: join_1.default('ab-Dashboard__tab', !collapsed && activeTabIndex === index ? 'ab-Dashboard__tab--active' : ''), key: index, onClick: () => {
+        React.Children.map(children, (child, index) => (React.createElement("button", { type: "button", className: join_1.default('ab-Dashboard__tab', !collapsed && activeTabIndex === index ? 'ab-Dashboard__tab--active' : ''), key: index, onClick: () => {
                 if (activeTabIndex === index) {
                     setCollapsed(!collapsed);
                 }