@adaptabletools/adaptable 11.2.4-canary.0 → 12.0.0-canary.0

package/src/Strategy/FilterModule.js

@@ -5,7 +5,8 @@ const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
-const FilterRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/FilterRedux"));
+const LayoutRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/LayoutRedux"));
+const SystemRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/SystemRedux"));
 const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const FilterStatusBarSubPanelPopover_1 = require("../View/Filter/FilterStatusBarSubPanelPopover");
 class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
@@ -13,7 +14,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         super(ModuleConstants.FilterModuleId, 'Filter', 'column-filter', 'FilterPopup', 'Advanced filtering capability allows users to see precisely the data they want', api);
     }
     getModuleAdaptableObjects() {
-        return this.api.filterApi.getAllColumnFilter();
+        return this.api.layoutApi.getAllColumnFilter();
     }
     getExplicitlyReferencedColumnIds(columnFilter) {
         return [columnFilter.ColumnId];
@@ -22,7 +23,10 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return false;
     }
     handleAdaptableReady() {
-        const columnFilters = this.api.filterApi.getAllColumnFilter();
+        if (this.api.internalApi.getAdaptableOptions().filterOptions.showQuickFilter == false) {
+            this.api.filterApi.hideQuickFilterBar();
+        }
+        const columnFilters = this.api.layoutApi.getAllColumnFilter();
         columnFilters.forEach((cf) => {
             if (!this.api.columnApi.doesColumnExist(cf.ColumnId)) {
                 LoggingHelper_1.LogAdaptableError('Column Filter contains missing column: ' + cf.ColumnId);
@@ -43,7 +47,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     })
                     : [menuContext.gridCell.primaryKeyValue];
                 let clickFunction = () => {
-                    this.api.filterApi.createColumnFilterForCell(menuContext.adaptableColumn.columnId, pkValues);
+                    this.api.layoutApi.createColumnFilterForCell(menuContext.adaptableColumn.columnId, pkValues);
                 };
                 menuItemClickFunction = this.createColumnMenuItemClickFunction(isMultiple ? 'Filter on Cell Values' : 'Filter on Cell Value', this.moduleInfo.Glyph, clickFunction);
             }
@@ -55,15 +59,17 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (column && this.api.gridApi.isQuickFilterAvailable()) {
             const isFilterVisible = this.api.filterApi.isQuickFilterVisible();
             if (this.isModuleEditable() && this.api.columnApi.usesAdaptableQuickFilter(column.columnId)) {
-                baseMenuItems.push(this.createColumnMenuItemReduxAction(isFilterVisible ? 'Hide Quick Filter Bar' : 'Show Quick Filter Bar', isFilterVisible ? 'unchecked' : 'check', isFilterVisible ? FilterRedux.QuickFilterBarHide() : FilterRedux.QuickFilterBarShow()));
+                baseMenuItems.push(this.createColumnMenuItemReduxAction(isFilterVisible ? 'Hide Quick Filter Bar' : 'Show Quick Filter Bar', isFilterVisible ? 'unchecked' : 'check', isFilterVisible
+                    ? SystemRedux.SystemQuickFilterBarHide()
+                    : SystemRedux.SystemQuickFilterBarShow()));
             }
         }
         if (column && this.canCreateColumnMenuItem(column, 'ReadOnly', 'filter')) {
-            let existingColumnFilter = this.api.filterApi
+            let existingColumnFilter = this.api.layoutApi
                 .getAllColumnFilter()
                 .find((x) => x.ColumnId == column.columnId);
             if (existingColumnFilter) {
-                baseMenuItems.push(this.createColumnMenuItemReduxAction('Clear Filter', this.moduleInfo.Glyph, FilterRedux.ColumnFilterClear(existingColumnFilter)));
+                baseMenuItems.push(this.createColumnMenuItemReduxAction('Clear Filter', this.moduleInfo.Glyph, LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
             }
         }
         if (ArrayExtensions_1.default.IsNotNullOrEmpty(baseMenuItems)) {
@@ -72,16 +78,17 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getTeamSharingAction() {
         return {
-            ModuleEntities: this.api.filterApi.getAllColumnFilter(),
-            AddAction: FilterRedux.ColumnFilterAdd,
-            EditAction: FilterRedux.ColumnFilterEdit,
+            ModuleEntities: this.api.layoutApi.getAllColumnFilter(),
+            AddAction: LayoutRedux.LayoutColumnFilterAdd,
+            EditAction: LayoutRedux.LayoutColumnFilterEdit,
         };
     }
     toViewCompact(filter) {
         return {
             item: {
-                name: this.api.columnApi.getFriendlyNameFromColumnId(filter.ColumnId),
-                values: [this.api.filterApi.columnFilterToString(filter)],
+                // we dont really need the name here - is there way to return a single vlaue that takes up the whole line?
+                // name: this.api.columnApi.getFriendlyNameFromColumnId(filter.ColumnId),
+                values: [this.api.layoutApi.columnFilterToString(filter)],
             },
             abObject: filter,
         };
@@ -95,7 +102,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 },
                 {
                     name: 'Filter',
-                    values: [this.api.filterApi.columnFilterToString(filter)],
+                    values: [this.api.layoutApi.columnFilterToString(filter)],
                 },
             ],
             abObject: filter,
@@ -107,7 +114,9 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewProperties() {
         const api = this.api;
         return {
-            getDeleteAction: FilterRedux.ColumnFilterClear,
+            getDeleteAction: LayoutRedux.LayoutColumnFilterClear,
+            getCompactDeleteAction: LayoutRedux.LayoutColumnFilterClear,
+            getDeleteAllAction: LayoutRedux.LayoutColumnFilterClearAll,
             emptyView: `
         There are currently no column filters applied. \n
 
@@ -115,7 +124,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
       `,
             getStatusBarPanelProps() {
                 let text;
-                const filters = api.filterApi.getAllColumnFilter();
+                const filters = api.layoutApi.getAllColumnFilter();
                 if (filters.length === 0) {
                     text = '0 Filters';
                 }

package/src/Strategy/FlashingCellModule.d.ts

@@ -18,7 +18,7 @@ export declare class FlashingCellModule extends AdaptableModuleBase implements I
     getReferencedNamedQueryNames(alertDefinition: FlashingCellDefinition): string[];
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    protected handleDataSourceChanged(cellDataChangedInfo: CellDataChangedInfo): void;
+    protected handleCellDataChanged(cellDataChangedInfo: CellDataChangedInfo): void;
     private showFlashingCellsForDefinitions;
     private isFlashingTargetOnlyAggChange;
     private getFlashingCellDefinitionsForDataChange;

package/src/Strategy/FlashingCellModule.js

@@ -38,7 +38,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     return;
                 }
             }
-            this.handleDataSourceChanged(cellDataChangedInfo);
+            this.handleCellDataChanged(cellDataChangedInfo);
         });
     }
     getModuleAdaptableObjects(config) {
@@ -104,7 +104,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return items;
     }
-    handleDataSourceChanged(cellDataChangedInfo) {
+    handleCellDataChanged(cellDataChangedInfo) {
         const flashingCellDefinitions = this.getFlashingCellDefinitionsForDataChange(cellDataChangedInfo);
         if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(flashingCellDefinitions)) {
             this.showFlashingCellsForDefinitions(cellDataChangedInfo, flashingCellDefinitions);

package/src/Strategy/FormatColumnModule.js

@@ -247,7 +247,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 },
                 {
                     name: 'Display Format',
-                    values: [FormatColumnFormatWizardSection_1.getFormatColumnFormatSummaryValue(formatColumn)],
+                    values: [FormatColumnFormatWizardSection_1.getFormatColumnFormatSummaryValue(formatColumn, this.api.formatColumnApi)],
                 },
                 getFormatColumnSettingsViewItems_1.getFormatColumnSettingsViewItems(formatColumn),
                 getObjectTagsViewItems_1.getObjectTagsViewItems(formatColumn, this.api),

package/src/Strategy/Interface/IModule.d.ts

@@ -29,7 +29,7 @@ export interface AdaptableObjectItemView {
      * Should match property in wizard.
      * Used to Link to wizard edit step.
      */
-    name: string;
+    name?: string;
     /**
      * Custom name for the property name
      */
@@ -78,8 +78,10 @@ export interface AdaptableModuleView {
     actions?: AdaptableModuleViewAction[];
     onOpenEditPopup?: (abObject?: AdaptableObject) => void;
     getDeleteAction?: (abObject: AdaptableObject) => Redux.Action;
+    getCompactDeleteAction?: (abObject: AdaptableObject) => Redux.Action;
     getSuspendAction?: (abObject: AdaptableObject) => Redux.Action;
     getUnSuspendAction?: (abObject: AdaptableObject) => Redux.Action;
+    getDeleteAllAction?: () => Redux.Action;
     emptyView?: React.FunctionComponent<{
         module: IModule;
     }> | string;

package/src/Strategy/LayoutModule.js

@@ -21,6 +21,26 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
         });
     }
+    /*
+  // commenting this out as it doesnt make sense we dont know which filters should be applied to which layout
+  // for this we will jsut say they need to reapply them
+    updateOldConfig() {
+      // @ts-ignore ignore reading deprecated state
+      const oldColumnFilters = this.api.filterApi.getFilterState().ColumnFilters;
+      if (ArrayExtensions.IsNotNullOrEmpty(oldColumnFilters)) {
+        ConsoleLogWarning(
+          `DEPRECATED: The 'Filter.ColumnFilters' property is deprecated; use 'Layout.ColumnFilters' instead'!`
+        );
+  
+        this.api.internalApi.clearColumnFilterState();
+        const currentLayout = this.api.layoutApi.getCurrentLayout();
+  
+        if (ArrayExtensions.IsNullOrEmpty(currentLayout.ColumnFilters)) {
+          this.api.layoutApi.setColumnFilter(oldColumnFilters);
+        }
+      }
+    }
+    */
     getModuleAdaptableObjects() {
         return this.api.layoutApi.getAllLayout();
     }
@@ -154,10 +174,12 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             const extraColumns = columns.length - maxColumnsToDisplay;
             const firstNColumns = columns
                 .slice(0, maxColumnsToDisplay)
-                .map((colId) => columnIdToFriendlyName(colId));
+                .map((column) => columnIdToFriendlyName(column));
             columns = [...firstNColumns, `and other ${extraColumns}`];
         }
-        columns = columns.map((column) => this.api.columnApi.getFriendlyNameFromColumnId(column));
+        else {
+            columns = columns.map((column) => columnIdToFriendlyName(column));
+        }
         return {
             items: [
                 {

package/src/Strategy/SmartEditModule.d.ts

@@ -6,7 +6,7 @@ import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
-import { SmartEditOperation } from '../AdaptableOptions/SmartEdit';
+import { SmartEditOperation } from '../AdaptableOptions/EditOptions';
 export declare class SmartEditModule extends AdaptableModuleBase implements ISmartEditModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;

package/src/Strategy/SmartEditModule.js

@@ -123,13 +123,12 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     selectedCellInfo.gridCells.forEach((selectedCell) => {
                         let newValue;
                         if (typeof smartEditOperation === 'object') {
-                            newValue = smartEditOperation.Operation({
-                                smartEditValue,
-                                column,
-                                adaptableApi: this.api,
+                            const context = {
+                                smartEditValue: smartEditValue,
                                 currentCell: selectedCell,
-                                value: selectedCell.rawValue,
-                            });
+                                adaptableApi: this.api,
+                            };
+                            newValue = smartEditOperation.operation(context);
                         }
                         else {
                             switch (smartEditOperation) {

package/src/Strategy/StatusBarModule.js

@@ -30,9 +30,7 @@ class StatusBarModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.api.statusBarApi.setStatusPanels(newStatusPanelsState);
     }
     isModuleAvailable() {
-        return false;
-        // TODO: replace with this like when we release Status Bar properly
-        // return super.isModuleAvailable() && this.api.statusBarApi.getAgGridStatusPanels().length > 0;
+        return super.isModuleAvailable() && this.api.statusBarApi.getAgGridStatusPanels().length > 0;
     }
 }
 exports.StatusBarModule = StatusBarModule;

package/src/Strategy/TeamSharingModule.js

@@ -49,7 +49,7 @@ class TeamSharingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return;
         }
         // check if the changed adaptable object is active in TeamSharing
-        const activeSharedEntity = this.api.teamSharingApi.getTeamSharingState().ActiveSharedEntityMap[changedAdaptableObject.Uuid];
+        const activeSharedEntity = this.api.internalApi.getState().TeamSharing.ActiveSharedEntityMap[changedAdaptableObject.Uuid];
         if (!activeSharedEntity) {
             return;
         }

package/src/Strategy/ToolPanelModule.js

@@ -15,10 +15,7 @@ class ToolPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!super.isModuleAvailable()) {
             return false;
         }
-        const toolPanelOptions = this.api.internalApi.getAdaptableOptions().toolPanelOptions;
-        return (toolPanelOptions &&
-            toolPanelOptions.showAdaptableToolPanel &&
-            toolPanelOptions.showAdaptableToolPanel == true);
+        return this.api.internalApi.getAdaptableInstance().hasAdaptableToolPanel;
     }
     updateOldConfig() {
         const deprecatedToolPanelConfigs = this.api.toolPanelApi.getToolPanelState().VisibleToolPanels;

package/src/Utilities/Constants/GeneralConstants.d.ts

@@ -1,6 +1,7 @@
 import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
 import { AdaptableTheme } from '../../PredefinedConfig/ThemeState';
 import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
+import { AdaptableColumnType } from '../../PredefinedConfig/Common/Types';
 export declare const AUTOGENERATED_PK_COLUMN: string;
 export declare const MISSING_COLUMN: string;
 export declare const DEFAULT_LAYOUT: string;
@@ -9,6 +10,10 @@ export declare const DARK_THEME: string;
 export declare const USER_NAME: string;
 export declare const ADAPTABLE_ID: string;
 export declare const ADAPTABLE: string;
+export declare const ADAPTABLE_TOOLPANEL_ID: string;
+export declare const ADAPTABLE_TOOLPANEL_COMPONENT: string;
+export declare const AGGRID_TOOLPANEL_FILTERS: string;
+export declare const AGGRID_TOOLPANEL_COLUMNS: string;
 export declare const MENU_PREFIX: string;
 export declare const READ_ONLY_STYLE: string;
 export declare const ALL_COLUMN_VALUES: string;
@@ -17,7 +22,7 @@ export declare const FILTER_NEVER: 'Always' | 'Never' | 'Throttle';
 export declare const FILTER_THROTTLE: 'Always' | 'Never' | 'Throttle';
 export declare const EMPTY_STRING: string;
 export declare const EMPTY_ARRAY: any[];
-export declare const AB_SPECIAL_COLUMN = "abSpecialColumn";
+export declare const AB_SPECIAL_COLUMN: AdaptableColumnType;
 export declare const HALF_SECOND: number;
 export declare const AG_GRID_GROUPED_COLUMN: string;
 export declare const AG_GRID_PIVOT_COLUMN: string;
@@ -40,7 +45,6 @@ export declare const ALERT_DEFAULT_SHOW_POPUP: boolean;
  */
 export declare const SUMMARY_OPERATION_STATE_PROPERTY: string;
 export declare const CURRENT_LAYOUT_STATE_PROPERTY: string;
-export declare const CURRENT_DATA_SOURCE_STATE_PROPERTY: string;
 export declare const CURRENT_REPORT_STATE_PROPERTY: string;
 export declare const FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY: string;
 export declare const FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY: string;

package/src/Utilities/Constants/GeneralConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_DATA_SOURCE_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
+exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const UIHelper_1 = require("../../View/UIHelper");
 exports.AUTOGENERATED_PK_COLUMN = '__ADAPTABLE_PK__';
@@ -11,6 +11,11 @@ exports.DARK_THEME = 'dark';
 exports.USER_NAME = 'anonymous';
 exports.ADAPTABLE_ID = 'adaptable_id';
 exports.ADAPTABLE = 'AdapTable';
+exports.ADAPTABLE_TOOLPANEL_ID = 'adaptable';
+exports.ADAPTABLE_TOOLPANEL_COMPONENT = 'AdaptableToolPanel';
+// from https://www.ag-grid.com/javascript-data-grid/side-bar/#string-configuration
+exports.AGGRID_TOOLPANEL_FILTERS = 'filters';
+exports.AGGRID_TOOLPANEL_COLUMNS = 'columns';
 exports.MENU_PREFIX = 'ab_';
 exports.READ_ONLY_STYLE = 'ab_readonly';
 exports.ALL_COLUMN_VALUES = 'ALL_COLUMN_VALUES';
@@ -54,7 +59,6 @@ exports.ALERT_DEFAULT_SHOW_POPUP = true;
  */
 exports.SUMMARY_OPERATION_STATE_PROPERTY = 'SummaryOperation';
 exports.CURRENT_LAYOUT_STATE_PROPERTY = 'CurrentLayout';
-exports.CURRENT_DATA_SOURCE_STATE_PROPERTY = 'CurrentDataSource';
 exports.CURRENT_REPORT_STATE_PROPERTY = 'CurrentReport';
 exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = 'DefaultUpColor';
 exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = 'DefautDownColor';

package/src/Utilities/Constants/ModuleConstants.d.ts

@@ -9,7 +9,7 @@ export declare const ConditionalStyleModuleId: ModuleConstants;
 export declare const CustomSortModuleId: ModuleConstants;
 export declare const DashboardModuleId: ModuleConstants;
 export declare const DataChangeHistoryModuleId: ModuleConstants;
-export declare const DataSourceModuleId: ModuleConstants;
+export declare const DataSetModuleId: ModuleConstants;
 export declare const ExportModuleId: ModuleConstants;
 export declare const FilterModuleId: ModuleConstants;
 export declare const FormatColumnModuleId: ModuleConstants;

package/src/Utilities/Constants/ModuleConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StatusBarModuleId = exports.SettingsPanelModuleId = exports.ToolPanelModuleId = exports.ThemeModuleId = exports.TeamSharingModuleId = exports.SystemStatusModuleId = exports.StateManagementModuleId = exports.SmartEditModuleId = exports.ShortcutModuleId = exports.ScheduleModuleId = exports.QuickSearchModuleId = exports.QueryModuleId = exports.PlusMinusModuleId = exports.OpenFinModuleId = exports.LayoutModuleId = exports.IPushPullModuleId = exports.GridInfoModuleId = exports.Glue42ModuleId = exports.FreeTextColumnModuleId = exports.FormatColumnModuleId = exports.FilterModuleId = exports.ExportModuleId = exports.DataSourceModuleId = exports.DataChangeHistoryModuleId = exports.DashboardModuleId = exports.CustomSortModuleId = exports.ConditionalStyleModuleId = exports.ChartingModuleId = exports.CellSummaryModuleId = exports.CalculatedColumnModuleId = exports.BulkUpdateModuleId = exports.FlashingCellModuleId = exports.AlertModuleId = void 0;
+exports.StatusBarModuleId = exports.SettingsPanelModuleId = exports.ToolPanelModuleId = exports.ThemeModuleId = exports.TeamSharingModuleId = exports.SystemStatusModuleId = exports.StateManagementModuleId = exports.SmartEditModuleId = exports.ShortcutModuleId = exports.ScheduleModuleId = exports.QuickSearchModuleId = exports.QueryModuleId = exports.PlusMinusModuleId = exports.OpenFinModuleId = exports.LayoutModuleId = exports.IPushPullModuleId = exports.GridInfoModuleId = exports.Glue42ModuleId = exports.FreeTextColumnModuleId = exports.FormatColumnModuleId = exports.FilterModuleId = exports.ExportModuleId = exports.DataSetModuleId = exports.DataChangeHistoryModuleId = exports.DashboardModuleId = exports.CustomSortModuleId = exports.ConditionalStyleModuleId = exports.ChartingModuleId = exports.CellSummaryModuleId = exports.CalculatedColumnModuleId = exports.BulkUpdateModuleId = exports.FlashingCellModuleId = exports.AlertModuleId = void 0;
 exports.AlertModuleId = 'Alert';
 exports.FlashingCellModuleId = 'FlashingCell';
 exports.BulkUpdateModuleId = 'BulkUpdate';
@@ -11,7 +11,7 @@ exports.ConditionalStyleModuleId = 'ConditionalStyle';
 exports.CustomSortModuleId = 'CustomSort';
 exports.DashboardModuleId = 'Dashboard';
 exports.DataChangeHistoryModuleId = 'DataChangeHistory';
-exports.DataSourceModuleId = 'DataSource';
+exports.DataSetModuleId = 'DataSet';
 exports.ExportModuleId = 'Export';
 exports.FilterModuleId = 'Filter';
 exports.FormatColumnModuleId = 'FormatColumn';

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -58,6 +58,7 @@ exports.DefaultAdaptableOptions = {
     adaptableQLOptions: {
         caseSensitiveTextComparisons: false,
         externallyEvaluatedModules: [],
+        customPredicateDefs: [],
         expressionOptions: {
             defaultBooleanFunctions: booleanExpressionFunctions_1.booleanExpressionFunctions,
             defaultScalarFunctions: scalarExpressionFunctions_1.scalarExpressionFunctions,
@@ -78,6 +79,12 @@ exports.DefaultAdaptableOptions = {
         systemStatusContainer: undefined,
         alertContainer: undefined,
     },
+    columnOptions: {
+        columnTypes: GeneralConstants_1.EMPTY_ARRAY,
+        showMissingColumnsWarning: true,
+        autoOrderGroupedColumns: true,
+        hideColumnWhenGrouped: false,
+    },
     dashboardOptions: {
         canFloat: true,
         showQuickSearchInHeader: true,
@@ -89,6 +96,13 @@ exports.DefaultAdaptableOptions = {
         validateOnServer: undefined,
         displayServerValidationMessages: true,
         isCellEditable: undefined,
+        rowFormOptions: {
+            formTitle: undefined,
+            formDescription: undefined,
+            formFieldLabel: undefined,
+            formButtons: undefined,
+            onFormSubmit: undefined,
+        },
     },
     entitlementOptions: {
         defaultAccessLevel: 'Full',
@@ -117,10 +131,8 @@ exports.DefaultAdaptableOptions = {
     generalOptions: {
         hideEmptyGroupRows: false,
         showMissingPrimaryKeyAlert: false,
-        showMissingColumnsWarning: true,
+        dataSets: GeneralConstants_1.EMPTY_ARRAY,
         showGroupingTotalsAsHeader: false,
-        hideColumnWhenGrouped: false,
-        autoOrderGroupedColumns: true,
         alternativeModuleNames: undefined,
         currentCalendar: 'United Kingdom',
         cellSummaryOperations: undefined,
@@ -178,6 +190,7 @@ exports.DefaultAdaptableOptions = {
         enableFilterOnSpecialColumns: true,
         maxFilterValuesToDisplay: 2000,
         systemFilters: AdaptablePredicate_1.SystemFilterPredicateIds,
+        showQuickFilter: true,
     },
     searchOptions: {
         excludeColumnFromQuickSearch: undefined,
@@ -210,35 +223,31 @@ exports.DefaultAdaptableOptions = {
             showOutsideDays: true,
             datepickerButtons: ['close', 'today'],
         },
+        actionOptions: {
+            actionColumns: undefined,
+            actionRowButtons: undefined,
+            actionRowButtonsPosition: 'pinnedLeft',
+        },
         colorPalette: UIHelper_1.default.getDefaultColors(),
         editableCellStyle: undefined,
         readOnlyCellStyle: undefined,
         styleClassNames: GeneralConstants_1.EMPTY_ARRAY,
-        columnTypes: GeneralConstants_1.EMPTY_ARRAY,
         permittedValues: undefined,
         editLookUpItems: undefined,
-        actionColumns: undefined,
+        customDisplayFormatters: undefined,
         showDocumentationLinks: true,
         gridInfoSections: ['GridSummary', 'AdaptableOptions', 'ColumnInfo'],
         showAdapTableVersion: true,
     },
     toolPanelOptions: {
-        showAdaptableToolPanel: true,
-        adaptableToolPanelTitle: GeneralConstants.ADAPTABLE,
         showToolPanelsDropdown: true,
         customButtons: undefined,
         customToolPanels: undefined,
-        iconKey: 'menu',
-        width: UIHelper_1.default.getAdaptableToolPanelWidth(),
-        minWidth: UIHelper_1.default.getAdaptableToolPanelWidth(),
-        maxWidth: undefined,
-        toolPanelOrder: ['filters', 'columns', 'adaptable'],
     },
     dataChangeHistoryOptions: {
         activeByDefault: false,
         showDataChange: undefined,
     },
-    customPredicateDefs: [],
     settingsPanelOptions: {
         popupType: 'window',
         title: 'Settings Panel',

package/src/Utilities/Defaults/DefaultSettingsPanel.js

@@ -20,7 +20,7 @@ exports.DEFAULT_NAVIGATION_ITEMS = [
     'CalculatedColumn',
     'ConditionalStyle',
     'CustomSort',
-    'DataSource',
+    'DataSet',
     'Export',
     'Filter',
     'FlashingCell',

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js

@@ -226,10 +226,8 @@ exports.booleanExpressionFunctions = {
             var _a;
             const searchTerm = expressionFunctionUtils_1.getStringValue(context, String(args[0]));
             return (_a = context.api) === null || _a === void 0 ? void 0 : _a.columnApi.getColumns().some((column) => {
-                var _a, _b;
-                const value = column.dataType === 'Date'
-                    ? // for Date columns use the display value, as we do a textual comparison
-                     (_a = context.api) === null || _a === void 0 ? void 0 : _a.gridApi.getDisplayValueFromRowNode(context.node, column.columnId) : (_b = context.api) === null || _b === void 0 ? void 0 : _b.gridApi.getNormalisedValueFromRowNode(context.node, column.columnId);
+                var _a;
+                const value = (_a = context.api) === null || _a === void 0 ? void 0 : _a.gridApi.getDisplayValueFromRowNode(context.node, column.columnId);
                 const columnValue = expressionFunctionUtils_1.getStringValue(context, String(value));
                 return columnValue.indexOf(searchTerm) !== -1;
             });

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -12,6 +12,7 @@ function assignAdaptableOptions(adaptableOptions) {
     const returnedAdaptableOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions, adaptableOptions);
     returnedAdaptableOptions.adaptableStateKey = (_a = returnedAdaptableOptions.adaptableStateKey) !== null && _a !== void 0 ? _a : returnedAdaptableOptions.adaptableId;
     returnedAdaptableOptions.adaptableQLOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.adaptableQLOptions, adaptableOptions.adaptableQLOptions);
+    returnedAdaptableOptions.columnOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.columnOptions, adaptableOptions.columnOptions);
     returnedAdaptableOptions.adaptableQLOptions.expressionOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.adaptableQLOptions.expressionOptions, returnedAdaptableOptions.adaptableQLOptions.expressionOptions);
     returnedAdaptableOptions.layoutOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.layoutOptions, adaptableOptions.layoutOptions);
     returnedAdaptableOptions.notificationsOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.notificationsOptions, adaptableOptions.notificationsOptions);
@@ -20,11 +21,13 @@ function assignAdaptableOptions(adaptableOptions) {
     returnedAdaptableOptions.entitlementOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.entitlementOptions, adaptableOptions.entitlementOptions);
     returnedAdaptableOptions.dashboardOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.dashboardOptions, adaptableOptions.dashboardOptions);
     returnedAdaptableOptions.editOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.editOptions, adaptableOptions.editOptions);
+    returnedAdaptableOptions.editOptions.rowFormOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.editOptions.rowFormOptions, returnedAdaptableOptions.editOptions.rowFormOptions);
     returnedAdaptableOptions.containerOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.containerOptions, adaptableOptions.containerOptions);
     returnedAdaptableOptions.generalOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.generalOptions, adaptableOptions.generalOptions);
     returnedAdaptableOptions.searchOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.searchOptions, adaptableOptions.searchOptions);
     returnedAdaptableOptions.filterOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.filterOptions, adaptableOptions.filterOptions);
     returnedAdaptableOptions.userInterfaceOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.userInterfaceOptions, adaptableOptions.userInterfaceOptions);
+    returnedAdaptableOptions.userInterfaceOptions.actionOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.userInterfaceOptions.actionOptions, returnedAdaptableOptions.userInterfaceOptions.actionOptions);
     returnedAdaptableOptions.userInterfaceOptions.dateInputOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.userInterfaceOptions.dateInputOptions, returnedAdaptableOptions.userInterfaceOptions.dateInputOptions);
     returnedAdaptableOptions.menuOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.menuOptions, adaptableOptions.menuOptions);
     returnedAdaptableOptions.stateOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.stateOptions, adaptableOptions.stateOptions);
@@ -66,7 +69,7 @@ function checkValidPrimaryKey(adaptable) {
             adaptable.api.alertApi.showAlertError('No Primary Key', errorMessage);
         }
         else {
-            if (adaptable.adaptableOptions.generalOptions.showMissingColumnsWarning == true) {
+            if (adaptable.adaptableOptions.columnOptions.showMissingColumnsWarning == true) {
                 LoggingHelper_1.ConsoleLogError(errorMessage);
             }
         }

package/src/Utilities/ObjectFactory.d.ts

@@ -1,6 +1,5 @@
 import { ScheduleType } from '../PredefinedConfig/Common/Enums';
 import { CustomSort } from '../PredefinedConfig/CustomSortState';
-import { DataSource } from '../PredefinedConfig/DataSourceState';
 import { CalculatedColumn } from '../PredefinedConfig/CalculatedColumnState';
 import { PlusMinusNudge } from '../PredefinedConfig/PlusMinusState';
 import { AlertDefinition, AlertProperties } from '../PredefinedConfig/AlertState';
@@ -19,17 +18,15 @@ import { IPushPullReport } from '../PredefinedConfig/SystemState';
 import { IPushPullSchedule } from '../PredefinedConfig/IPushPullState';
 import { OpenFinSchedule, OpenFinReport } from '../PredefinedConfig/OpenFinState';
 import { NamedQuery } from '../PredefinedConfig/QueryState';
-import { ColumnFilter, SystemFilterPredicateId } from '../PredefinedConfig/FilterState';
 import { ReminderSchedule } from '../PredefinedConfig/ScheduleState';
 import { AdaptableCellChangedAlert, AdaptableGenericAlert, AdaptableRowChangedAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
 import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatusMessageInfo';
 import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
-import { FlashingCellDefinition, GridDataChangedInfo } from '../types';
+import { ColumnFilter, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
 import { ToastOptions } from 'react-toastify';
 export declare function CreateEmptyCustomSort(): CustomSort;
-export declare function CreateEmptyDataSource(): DataSource;
 export declare function CreateEmptyCalculatedColumn(isFilterable: boolean): CalculatedColumn;
 export declare function CreateEmptyNamedQuery(expression?: string): NamedQuery;
 export declare function CreateEmptyPlusMinusNudge(): PlusMinusNudge;
@@ -64,12 +61,12 @@ export declare function CreateEmptyStyle(): AdaptableStyle;
 export declare function CreateSystemStatusMessageInfo(message: string, type: AdaptableMessageType, furtherInfo?: string): SystemStatusMessageInfo;
 export declare function CreateEmptyCellSummmary(): CellSummmary;
 export declare function CreateColumnFilter(ColumnId: string, PredicateId: SystemFilterPredicateId, Inputs: any[]): ColumnFilter;
-export declare function CreateToastOptions(notificationsOptions: NotificationsOptions, { onClose }?: {
+export declare function CreateToastOptions(notificationsOptions: NotificationsOptions, { onClose, containerId }: {
     onClose?: VoidFunction;
+    containerId: string;
 }): ToastOptions;
 export declare const ObjectFactory: {
     CreateEmptyCustomSort: typeof CreateEmptyCustomSort;
-    CreateEmptyDataSource: typeof CreateEmptyDataSource;
     CreateEmptyCalculatedColumn: typeof CreateEmptyCalculatedColumn;
     CreateEmptyNamedQuery: typeof CreateEmptyNamedQuery;
     CreateEmptyPlusMinusNudge: typeof CreateEmptyPlusMinusNudge;

package/src/Utilities/ObjectFactory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectFactory = exports.CreateToastOptions = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyConditionalStyle = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyDataSource = exports.CreateEmptyCustomSort = void 0;
+exports.ObjectFactory = exports.CreateToastOptions = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyConditionalStyle = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCustomSort = void 0;
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
@@ -9,10 +9,6 @@ function CreateEmptyCustomSort() {
     return { Uuid: Uuid_1.createUuid(), ColumnId: GeneralConstants_1.EMPTY_STRING, SortedValues: [] };
 }
 exports.CreateEmptyCustomSort = CreateEmptyCustomSort;
-function CreateEmptyDataSource() {
-    return { Uuid: Uuid_1.createUuid(), Name: GeneralConstants_1.EMPTY_STRING, Description: GeneralConstants_1.EMPTY_STRING };
-}
-exports.CreateEmptyDataSource = CreateEmptyDataSource;
 function CreateEmptyCalculatedColumn(isFilterable) {
     return {
         Uuid: Uuid_1.createUuid(),
@@ -359,7 +355,7 @@ function CreateColumnFilter(ColumnId, PredicateId, Inputs) {
     };
 }
 exports.CreateColumnFilter = CreateColumnFilter;
-function CreateToastOptions(notificationsOptions, { onClose } = {}) {
+function CreateToastOptions(notificationsOptions, { onClose, containerId }) {
     const adaptableToastPosition = notificationsOptions.position;
     const position = getToastPosition(adaptableToastPosition);
     const duration = notificationsOptions.duration;
@@ -369,6 +365,7 @@ function CreateToastOptions(notificationsOptions, { onClose } = {}) {
     const isDraggable = notificationsOptions.isDraggable;
     const transition = getToastTransition(notificationsOptions.transition);
     const toastProps = {
+        containerId,
         position,
         autoClose: duration == 'always' ? false : duration,
         hideProgressBar: !showProgressBar,
@@ -412,7 +409,6 @@ function getToastTransition(transition) {
 }
 exports.ObjectFactory = {
     CreateEmptyCustomSort,
-    CreateEmptyDataSource,
     CreateEmptyCalculatedColumn,
     CreateEmptyNamedQuery,
     CreateEmptyPlusMinusNudge,