@adaptabletools/adaptable 18.0.0-canary.23 → 18.0.0-canary.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "18.0.0-canary.23",
+  "version": "18.0.0-canary.24",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableOptions/AdaptablePlugin.d.ts

@@ -29,7 +29,9 @@ export declare abstract class AdaptablePlugin {
     afterInitOptions(adaptable: IAdaptable, adaptableOptions: AdaptableOptions): void;
     afterInitApi(adaptable: IAdaptable, api: AdaptableApi): void;
     afterInitServices(adaptable: IAdaptable): void;
+    afterInitialStateLoaded(adaptable: IAdaptable): void;
     afterInitModules(adaptable: IAdaptable, strategies: Map<AdaptableModule, IModule>): void;
+    afterInitStore(adaptable: IAdaptable): void;
     afterInit(ab: IAdaptable): void;
     afterSetLayout(adaptable: IAdaptable, layout: Layout): void;
     onStoreEvent(eventName: string, data: {

package/src/AdaptableOptions/AdaptablePlugin.js

@@ -29,7 +29,9 @@ export class AdaptablePlugin {
     afterInitOptions(adaptable, adaptableOptions) { }
     afterInitApi(adaptable, api) { }
     afterInitServices(adaptable) { }
+    afterInitialStateLoaded(adaptable) { }
     afterInitModules(adaptable, strategies) { }
+    afterInitStore(adaptable) { }
     afterInit(ab) { }
     // hook executed after each layout update (Adaptable.setLayout())
     afterSetLayout(adaptable, layout) { }

package/src/AdaptableOptions/StateOptions.d.ts

@@ -34,7 +34,7 @@ export interface StateOptions {
      */
     debounceStateDelay?: number;
     /**
-     * Automatically migrate the state from the previous version of Adaptable to the current version.
+     * Automatically migrate State from previous AdapTable version to current one
      *
      * @defaultValue true
      */

package/src/Api/ColumnApi.d.ts

@@ -271,4 +271,8 @@ export interface ColumnApi {
      * @param columnType the columnType to filter by
      */
     getColumnsByColumnType(columnType: string): AdaptableColumn[];
+    /**
+     * Returns all columns currently Row Grouped
+     */
+    getRowGroupedColumns(): AdaptableColumn[];
 }

package/src/Api/GridApi.d.ts

@@ -366,6 +366,10 @@ export interface GridApi {
      * Whether Grid is currently showing Row Groups
      */
     isGridRowGrouped(): boolean;
+    /**
+     * Whether Grid is currently in Pivot Mode
+     */
+    isGridInPivotMode(): boolean;
     /**
      * Whether given Row Node is a Row Group
      * @param rowNode Node to check

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

@@ -67,4 +67,5 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     openColumnInfoSettingsPanel(): void;
     getColumnTypes(): string[];
     getColumnsByColumnType(columnType: string): AdaptableColumn[];
+    getRowGroupedColumns(): AdaptableColumn[];
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -356,4 +356,11 @@ export class ColumnApiImpl extends ApiBase {
             return ((_a = c.columnTypes) !== null && _a !== void 0 ? _a : []).includes(columnType);
         });
     }
+    getRowGroupedColumns() {
+        var _a;
+        return (_a = this.getLayoutApi()
+            .getCurrentRowGroupsColumnIds()) === null || _a === void 0 ? void 0 : _a.map((n) => {
+            return this.getColumnWithColumnId(n);
+        });
+    }
 }

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

@@ -95,6 +95,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     isGridGroupable(): boolean;
     isGridSelectable(): boolean;
     isGridRowGrouped(): boolean;
+    isGridInPivotMode(): boolean;
     isGroupRowNode(rowNode: IRowNode): boolean;
     isQuickFilterAvailable(): boolean;
     redrawGrid(): void;

package/src/Api/Implementation/GridApiImpl.js

@@ -356,6 +356,9 @@ export class GridApiImpl extends ApiBase {
     isGridRowGrouped() {
         return this.adaptable.isGridGroupingActive();
     }
+    isGridInPivotMode() {
+        return this.getLayoutApi().isCurrentLayoutPivot();
+    }
     isGroupRowNode(rowNode) {
         return this.adaptable.isGroupRowNode(rowNode);
     }

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

@@ -16,6 +16,7 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
         [key: string]: boolean;
     };
     getCurrentVisibleColumnIds(): string[];
+    getCurrentRowGroupsColumnIds(): string[];
     setLayout(layoutName: string): void;
     getCurrentLayout(): Layout;
     getCurrentLayoutColumnSort(columnId: string): ColumnSort['SortOrder'] | null;

package/src/Api/Implementation/LayoutApiImpl.js

@@ -34,6 +34,9 @@ export class LayoutApiImpl extends ApiBase {
     getCurrentVisibleColumnIds() {
         return this.getCurrentLayout().Columns;
     }
+    getCurrentRowGroupsColumnIds() {
+        return this.getCurrentLayout().RowGroupedColumns;
+    }
     setLayout(layoutName) {
         if (StringExtensions.IsNotNullOrEmpty(layoutName) &&
             layoutName !== this.getCurrentLayoutName()) {

package/src/Api/LayoutApi.d.ts

@@ -42,6 +42,10 @@ export interface LayoutApi {
      * Retrieves array of visible ColumnIds in current Layout
      */
     getCurrentVisibleColumnIds(): string[];
+    /**
+     * Retrieves array of visible ColumnIds in current Layout
+     */
+    getCurrentRowGroupsColumnIds(): string[];
     /**
      * Retrieves name of current Layout
      */

package/src/PredefinedConfig/Common/Menu.d.ts

@@ -10,11 +10,11 @@ export type AdaptableContextMenuItemName = (typeof ADAPTABLE_CONTEXT_MENU_ITEMS)
 /**
  * List of Shipped Adaptable Column Menu Items
  */
-export declare const ADAPTABLE_COLUMN_MENU_ITEMS: readonly ["calculated-column-edit", "cell-summary-show", "column-filter-bar-hide", "column-filter-bar-show", "column-filter-clear", "column-filter-on-cell-value", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "custom-sort-add", "custom-sort-edit", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "flashing-cell-add", "flashing-cell-delete", "format-column-add", "format-column-edit", "free-text-column-edit", "grid-info-show", "layout-column-caption-change", "layout-column-hide", "layout-column-select", "layout-column-select-preserve", "layout-column-select-reset", "layout-edit", "layout-grid-parent", "layout-select-parent", "layout-select-all", "plus-minus-add", "settings-panel-open", "styled-column-badge-add", "styled-column-badge-edit", "styled-column-gradient-add", "styled-column-gradient-edit", "styled-column-percent-bar-add", "styled-column-percent-bar-edit", "styled-column-sparkline-add", "styled-column-sparkline-edit", "system-status-show", "internal", "parent"];
+export declare const ADAPTABLE_COLUMN_MENU_ITEMS: readonly ["calculated-column-edit", "cell-summary-show", "column-filter-parent", "column-filter-bar-hide", "column-filter-bar-show", "column-filter-clear", "column-filter-on-cell-value", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "custom-sort-add", "custom-sort-edit", "dashboard-parent", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "flashing-cell-add", "flashing-cell-delete", "format-column-parent", "format-column-add", "format-column-edit", "free-text-column-edit", "grid-info-show", "layout-column-caption-change", "layout-column-hide", "layout-column-select", "layout-column-select-preserve", "layout-column-select-reset", "layout-edit", "layout-grid-parent", "layout-select-parent", "layout-select-all", "plus-minus-add", "settings-panel-open", "styled-column-parent", "styled-column-badge-add", "styled-column-badge-edit", "styled-column-gradient-add", "styled-column-gradient-edit", "styled-column-percent-bar-add", "styled-column-percent-bar-edit", "styled-column-sparkline-add", "styled-column-sparkline-edit", "system-status-show", "internal"];
 /**
  * List of Shipped Adaptable Context Menu Items
  */
-export declare const ADAPTABLE_CONTEXT_MENU_ITEMS: readonly ["alert-clear", "bulk-update-apply", "calculated-column-edit", "cell-summary-show", "column-filter-on-cell-value", "column-filter-clear", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "comment-add", "comment-remove", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "export-clipboard", "export-csv", "export-excel", "export-json", "export-table", "export-custom-destination", "fdc3-broadcast", "fdc3-raise-intent", "flashing-cell-clear", "flashing-row-clear", "grid-info-show", "layout-aggregated-view", "layout-auto-size", "layout-clear-selection", "layout-edit", "layout-select-all", "note-add", "note-remove", "settings-panel-open", "smart-edit-apply", "system-status-show"];
+export declare const ADAPTABLE_CONTEXT_MENU_ITEMS: readonly ["alert-clear", "bulk-update-apply", "calculated-column-edit", "cell-summary-show", "column-filter-parent", "column-filter-on-cell-value", "column-filter-clear", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "comment-add", "comment-remove", "dashboard-parent", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "export-parent", "export-clipboard", "export-csv", "export-excel", "export-json", "export-table", "export-custom-destination", "fdc3-parent", "fdc3-broadcast", "fdc3-raise-intent", "flashing-cell-clear", "flashing-row-clear", "grid-info-show", "layout-aggregated-view", "layout-auto-size", "layout-clear-selection", "layout-edit", "layout-select-all", "note-add", "note-remove", "settings-panel-open", "smart-edit-apply", "system-status-show"];
 /**
  * Menu item used by Adaptable in both Column and Context Menus
  */

package/src/PredefinedConfig/Common/Menu.js

@@ -4,6 +4,7 @@
 export const ADAPTABLE_COLUMN_MENU_ITEMS = [
     'calculated-column-edit',
     'cell-summary-show',
+    'column-filter-parent',
     'column-filter-bar-hide',
     'column-filter-bar-show',
     'column-filter-clear',
@@ -13,6 +14,7 @@ export const ADAPTABLE_COLUMN_MENU_ITEMS = [
     'column-info-show',
     'custom-sort-add',
     'custom-sort-edit',
+    'dashboard-parent',
     'dashboard-collapse',
     'dashboard-configure',
     'dashboard-dock',
@@ -23,6 +25,7 @@ export const ADAPTABLE_COLUMN_MENU_ITEMS = [
     'data-import',
     'flashing-cell-add',
     'flashing-cell-delete',
+    'format-column-parent',
     'format-column-add',
     'format-column-edit',
     'free-text-column-edit',
@@ -38,6 +41,7 @@ export const ADAPTABLE_COLUMN_MENU_ITEMS = [
     'layout-select-all',
     'plus-minus-add',
     'settings-panel-open',
+    'styled-column-parent',
     'styled-column-badge-add',
     'styled-column-badge-edit',
     'styled-column-gradient-add',
@@ -47,8 +51,7 @@ export const ADAPTABLE_COLUMN_MENU_ITEMS = [
     'styled-column-sparkline-add',
     'styled-column-sparkline-edit',
     'system-status-show',
-    'internal',
-    'parent',
+    'internal', // used by AdapTable in Settings Panel
 ];
 /**
  * List of Shipped Adaptable Context Menu Items
@@ -58,6 +61,7 @@ export const ADAPTABLE_CONTEXT_MENU_ITEMS = [
     'bulk-update-apply',
     'calculated-column-edit',
     'cell-summary-show',
+    'column-filter-parent',
     'column-filter-on-cell-value',
     'column-filter-clear',
     'column-filter-suspend',
@@ -65,6 +69,7 @@ export const ADAPTABLE_CONTEXT_MENU_ITEMS = [
     'column-info-show',
     'comment-add',
     'comment-remove',
+    'dashboard-parent',
     'dashboard-collapse',
     'dashboard-configure',
     'dashboard-dock',
@@ -73,12 +78,14 @@ export const ADAPTABLE_CONTEXT_MENU_ITEMS = [
     'dashboard-hide',
     'dashboard-show',
     'data-import',
+    'export-parent',
     'export-clipboard',
     'export-csv',
     'export-excel',
     'export-json',
     'export-table',
     'export-custom-destination',
+    'fdc3-parent',
     'fdc3-broadcast',
     'fdc3-raise-intent',
     'flashing-cell-clear',

package/src/Strategy/ColumnFilterModule.js

@@ -63,7 +63,7 @@ export class ColumnFilterModule extends AdaptableModuleBase {
             if (ArrayExtensions.IsNotNullOrEmpty(filterSubMenuItems)) {
                 return [
                     {
-                        name: 'parent',
+                        name: 'column-filter-parent',
                         label: this.moduleInfo.FriendlyName,
                         isVisible: true,
                         module: this.moduleInfo.ModuleName,
@@ -111,7 +111,7 @@ export class ColumnFilterModule extends AdaptableModuleBase {
                         }));
                     return [
                         {
-                            name: 'parent',
+                            name: 'column-filter-parent',
                             label: this.moduleInfo.FriendlyName,
                             isVisible: true,
                             module: this.moduleInfo.ModuleName,

package/src/Strategy/DashboardModule.js

@@ -49,7 +49,7 @@ export class DashboardModule extends AdaptableModuleBase {
             }
             return [
                 {
-                    name: 'parent',
+                    name: 'dashboard-parent',
                     label: this.moduleInfo.FriendlyName,
                     isVisible: true,
                     module: this.moduleInfo.ModuleName,

package/src/Strategy/ExportModule.js

@@ -95,7 +95,7 @@ export class ExportModule extends AdaptableModuleBase {
     }
     buildExportMenuItem(label, subItems) {
         return {
-            name: 'parent',
+            name: 'export-parent',
             label: label,
             module: this.moduleInfo.ModuleName,
             isVisible: true,

package/src/Strategy/Fdc3Module.js

@@ -27,7 +27,7 @@ export class Fdc3Module extends AdaptableModuleBase {
             contextMenuItems.sort((a, b) => a.label.localeCompare(b.label));
             if (contextMenuItems.length > 1) {
                 const groupMenuItem = {
-                    name: 'parent',
+                    name: 'fdc3-parent',
                     module: this.moduleInfo.ModuleName,
                     label: 'FDC3',
                     icon: {

package/src/Strategy/FormatColumnModule.js

@@ -62,7 +62,7 @@ export class FormatColumnModule extends AdaptableModuleBase {
                 };
                 const editFormatColumnMenuItem = this.createMenuItemShowPopup('format-column-edit', 'Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
                 returnColumnMenuItems.push({
-                    name: 'parent',
+                    name: 'format-column-parent',
                     label: 'Format Column',
                     module: this.moduleInfo.ModuleName,
                     isVisible: true,
@@ -79,7 +79,7 @@ export class FormatColumnModule extends AdaptableModuleBase {
                     .getModuleInfoByModule('FormatColumn');
                 const editFormatColumnMenuItem = this.createMenuItemReduxAction('format-column-edit', 'Show Current', this.moduleInfo.Glyph, PopupRedux.PopupShowScreen('FormatColumn', moduleInfo.Popup));
                 returnColumnMenuItems.push({
-                    name: 'parent',
+                    name: 'format-column-parent',
                     label: 'Format Column',
                     module: this.moduleInfo.ModuleName,
                     isVisible: true,

package/src/Strategy/StyledColumnModule.js

@@ -117,7 +117,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
                                     defaultCurrentSectionName: 'Style',
                                 } }));
                             returnColumnMenuItems.push({
-                                name: 'parent',
+                                name: 'styled-column-parent',
                                 label: 'Create Styled Column',
                                 module: this.moduleInfo.ModuleName,
                                 isVisible: true,

package/src/View/Layout/Wizard/sections/FilterSection.js

@@ -52,7 +52,7 @@ export const FilterSection = (props) => {
         React.createElement(Tabs.Content, null,
             React.createElement(FormLayout, { mb: 2 },
                 React.createElement(FormRow, { label: "Add Column Filter" },
-                    React.createElement(ColumnSelector, { filterColumn: (column) => column.filterable && !layoutFilters.some((f) => f.ColumnId === column.columnId), placeholder: "Select column to create filter", onChange: (option) => {
+                    React.createElement(ColumnSelector, { filterColumn: (column) => column.filterable && !layoutFilters.some((f) => f.ColumnId === column.columnId), placeholder: "Select Column to create Filter", onChange: (option) => {
                             props.onChange(Object.assign(Object.assign({}, layout), { ColumnFilters: [
                                     ...layoutFilters,
                                     {

package/src/View/Note/NotePopup.js

@@ -15,10 +15,10 @@ const tableDOMProps = {
     },
 };
 export const NotePopup = (props) => {
-    var _a;
+    var _a, _b, _c, _d;
     const adaptable = useAdaptable();
     const primaryKeyHeader = adaptable.api.columnApi.getFriendlyNameForColumnId(adaptable.api.columnApi.getPrimaryKeyColumn().columnId);
-    const dateFormat = (_a = adaptable.api.optionsApi.getNoteOptions().dateFormat) !== null && _a !== void 0 ? _a : DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME;
+    const dateFormat = (_d = (_c = (_b = (_a = adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNoteOptions) === null || _b === void 0 ? void 0 : _b.call(_a)) === null || _c === void 0 ? void 0 : _c.dateFormat) !== null && _d !== void 0 ? _d : DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME;
     const allNotes = useSelector((state) => GetAllNotesSelector(state.Note));
     const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Note') === 'ReadOnly';
     const columnsMap = React.useMemo(() => {

package/src/agGrid/AdaptableAgGrid.js

@@ -297,6 +297,7 @@ export class AdaptableAgGrid {
         this.forPlugins((plugin) => plugin.afterInitModules(this, this.adaptableModules));
         const perfLoadStore = this.logger.beginPerf(`loadStore()`);
         this.adaptableStore = this.initAdaptableStore();
+        this.forPlugins((plugin) => plugin.afterInitStore(this));
         await this.adaptableStore.loadStore({
             adaptable: this,
             adaptableStateKey: this.adaptableOptions.adaptableStateKey,
@@ -323,8 +324,7 @@ export class AdaptableAgGrid {
             return Promise.reject('Adaptable was destroyed while loading the store.');
             // FIXME AFL MIG: is this enough?! talk with the team
         }
-        this.forPlugins((plugin) => plugin.afterInitServices(this));
-        this.forPlugins((plugin) => plugin.afterInitModules(this, this.adaptableModules));
+        this.forPlugins((plugin) => plugin.afterInitialStateLoaded(this));
         // do this now so it sets module entitlements
         this.EntitlementService.setModulesEntitlements();
         /**

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1712304058670 || Date.now(),
-    VERSION: "18.0.0-canary.23" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1712325818168 || Date.now(),
+    VERSION: "18.0.0-canary.24" || '--current-version--',
 };