@adaptabletools/adaptable 18.0.0-canary.2 → 18.0.0-canary.21

package/src/Api/EventApi.d.ts

@@ -1,6 +1,4 @@
-import { ActionRowSubmittedInfo, AdaptableReadyInfo, AdaptableStateChangedInfo, AdaptableStateReloadedInfo, AlertFiredInfo, CellChangedInfo, CellSelectionChangedInfo, ChartChangedInfo, ColumnFilterAppliedInfo, CustomToolbarConfiguredInfo, DashboardChangedInfo, DataImportedInfo, DataSetSelectedInfo, Fdc3MessageInfo, FlashingCellDisplayedInfo, GridDataChangedInfo, GridFilterAppliedInfo, GridSortedInfo, LayoutChangedInfo, LiveDataChangedInfo, RowSelectionChangedInfo, ScheduleTriggeredInfo, SystemStatusMessageDisplayedInfo, TeamSharingEntityChangedInfo, ThemeChangedInfo, ThemeEditedInfo } from '../types';
-import { CalculatedColumnChangedInfo } from './Events/CalculatedColumnChanged';
-import { CommentsChangedInfo } from './Events/CommentsChangedInfo';
+import { ActionRowSubmittedInfo, AdaptableReadyInfo, AdaptableStateChangedInfo, AdaptableStateReloadedInfo, AlertFiredInfo, CalculatedColumnChangedInfo, CellChangedInfo, CellSelectionChangedInfo, ChartChangedInfo, ColumnFilterAppliedInfo, CommentChangedInfo, CustomToolbarConfiguredInfo, DashboardChangedInfo, DataImportedInfo, DataSetSelectedInfo, Fdc3MessageInfo, FlashingCellDisplayedInfo, GridDataChangedInfo, GridFilterAppliedInfo, GridSortedInfo, LayoutChangedInfo, LiveDataChangedInfo, RowSelectionChangedInfo, ScheduleTriggeredInfo, SystemStatusMessageDisplayedInfo, TeamSharingEntityChangedInfo, ThemeChangedInfo, ThemeEditedInfo } from '../types';
 /**
  * Responsible for publishing the many Events that AdapTable fires
  */
@@ -297,17 +295,17 @@ export interface EventApi {
      */
     off(eventName: 'ChartChanged', callback: (chartChangedInfo: ChartChangedInfo) => void): void;
     /**
-     * Event fired when Comments are Changed
-     * @param eventName CommentsChanged
+     * Event fired when a Comment is Changed
+     * @param eventName CommentChanged
      * @param callback
      */
-    on(eventName: 'CommentsChanged', callback: (commentsChangedInfo: CommentsChangedInfo) => void): () => void;
+    on(eventName: 'CommentChanged', callback: (commentChangedInfo: CommentChangedInfo) => void): () => void;
     /**
-     * Unsubscribe from CommentsChanged
+     * Unsubscribe from CommentChanged
      * @param eventName
      * @param callback
      */
-    off(eventName: 'CommentsChanged', callback: (commentsChangedInfo: CommentsChangedInfo) => void): void;
+    off(eventName: 'CommentChanged', callback: (commentChangedInfo: CommentChangedInfo) => void): void;
     /**
      * Fired when Adaptable is up and running - has no arguments.
      * @param eventName - AdaptableReady
@@ -352,6 +350,6 @@ export interface EventApi {
     emitSync(eventName: 'DashboardChanged', data?: any): any[];
     emitSync(eventName: 'FlashingCellDisplayed', data?: any): any[];
     emitSync(eventName: 'AdaptableDestroy'): any[];
-    emit(eventName: 'ActionRowSubmitted' | 'AdaptableReady' | 'AlertFired' | 'AdaptableStateChanged' | 'AdaptableStateReloaded' | 'CellChanged' | 'ChartChanged' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'DashboardChanged' | 'DataImported' | 'DataSetSelected' | 'ColumnFilterApplied' | 'Fdc3Message' | 'GridDataChanged' | 'GridSorted' | 'LayoutChanged' | 'CalculatedColumnChanged' | 'LiveDataChanged' | 'ScheduleTriggered' | 'SearchChanged' | 'CellSelectionChanged' | 'RowSelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'ThemeEdited' | 'GridFilterApplied' | 'CommentsChanged', data?: any): Promise<any>;
+    emit(eventName: 'ActionRowSubmitted' | 'AdaptableReady' | 'AlertFired' | 'AdaptableStateChanged' | 'AdaptableStateReloaded' | 'CellChanged' | 'ChartChanged' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'DashboardChanged' | 'DataImported' | 'DataSetSelected' | 'ColumnFilterApplied' | 'Fdc3Message' | 'GridDataChanged' | 'GridSorted' | 'LayoutChanged' | 'CalculatedColumnChanged' | 'LiveDataChanged' | 'ScheduleTriggered' | 'SearchChanged' | 'CellSelectionChanged' | 'RowSelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'ThemeEdited' | 'GridFilterApplied' | 'CommentChanged', data?: any): Promise<any>;
     destroy(): void;
 }

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

@@ -1,11 +1,11 @@
-import { GridOptions } from '@ag-grid-community/core';
+import { GridApi } from '@ag-grid-community/core';
 import { BaseEventInfo } from './BaseEventInfo';
 /**
  * Object returned by `AdaptableReady` event - fired when AdapTable has loaded
  */
 export interface AdaptableReadyInfo<TData = any> extends BaseEventInfo {
     /**
-     * Underlying AG Grid GridOptions object
+     * Underlying AG Grid API
      */
-    gridOptions: GridOptions<TData>;
+    agGridApi: GridApi<TData>;
 }

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

@@ -0,0 +1,11 @@
+import { CommentThread } from '../../types';
+import { BaseEventInfo } from './BaseEventInfo';
+/**
+ * Event fired when a Comment has changed
+ */
+export interface CommentChangedInfo extends BaseEventInfo {
+    /**
+     * All current Comment Threads
+     */
+    commentThreads: CommentThread[];
+}

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

@@ -1,9 +1,9 @@
 import { IRowNode } from '@ag-grid-community/core';
 import { BaseEventInfo } from './BaseEventInfo';
+export type GridDataChangeTrigger = 'Add' | 'Edit' | 'Delete' | 'Load';
 /**
  * EventInfo returned by GridDataChanged event
- */
-export interface GridDataChangedInfo<TData = any> extends BaseEventInfo {
+ */ export interface GridDataChangedInfo<TData = any> extends BaseEventInfo {
     /**
      * Timestamp of change occurrence (in milliseconds)
      */
@@ -13,9 +13,9 @@ export interface GridDataChangedInfo<TData = any> extends BaseEventInfo {
      */
     dataRows: TData[];
     /**
-     * Trigger for row change: 'Add', 'Edit' or 'Delete'
+     * Trigger for row change: Load, Add, Edit, or Delete
      */
-    rowTrigger: 'Add' | 'Edit' | 'Delete';
+    rowTrigger: GridDataChangeTrigger;
     /**
      * Row Nodes that were affected by this change
      */

package/src/Api/GridApi.d.ts

@@ -7,9 +7,10 @@ import { DataUpdateConfig } from '../PredefinedConfig/Common/DataUpdateConfig';
 import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 import { CellHighlightInfo } from '../PredefinedConfig/Common/CellHighlightInfo';
 import { RowHighlightInfo } from '../PredefinedConfig/Common/RowHighlightInfo';
-import { GridOptions, IRowNode, RowModelType } from '@ag-grid-community/core';
+import { IRowNode, RowModelType } from '@ag-grid-community/core';
 import { GridCellRange } from '../PredefinedConfig/Selection/GridCellRange';
 import { RowsHighlightInfo } from '../PredefinedConfig/Common/RowsHighlightInfo';
+import { TransposeConfig } from '../PredefinedConfig/Common/TransposeConfig';
 /**
  * Provides access to important properites of AdapTable e.g. sorting, selected cells etc.
  */
@@ -27,15 +28,22 @@ export interface GridApi {
      */
     getFilteredData(): any[];
     /**
-     * Repopulates Grid with given data; fires `GridDataChanged` Event
-     * @param data any data suitable as AG Grid data source
+     * Retrieves visible data from the grid (filtered and sorted)
+     */
+    getVisibleData(): any[];
+    /**
+     * @deprecated use `loadGridData()` instead
      */
     resetGridData(data: any[]): void;
     /**
-     * Sets grid with given data for FIRST use; doesn't fire 'GridDataChanged' Event
-     * @param dataany data suitable as AG Grid data source
+     * @deprecated use `loadGridData()` instead
      */
     setInitialGridData(data: any): void;
+    /**
+     * Loads data into grid and fire a `GridDataChanged.trigger='Load'` event
+     * @param data data to load
+     */
+    loadGridData(data: any): void;
     /**
      * Updates AdapTable (and AG Grid) with rows that have changed
      * @param dataRows rows which have been updated - send whole row and AdapTable take cares of the rest
@@ -86,10 +94,6 @@ export interface GridApi {
      * Returns all current Selected Rows in AdapTable
      */
     getSelectedRowInfo(): SelectedRowInfo;
-    /**
-     * Returns Ag Grid instance (passed into Adaptable Options at start-up)
-     */
-    getAgGridInstance(): GridOptions;
     /**
      * Returns Column Sort information in AdapTable
      */
@@ -469,10 +473,6 @@ export interface GridApi {
      * Returns number of rows in Data Source
      */
     getRowCount(): number;
-    /**
-     * Returns number of visible rows in Data Source
-     */
-    getVisibleRowCount(): number;
     /**
      * Returns number of columns in Data Source
      */
@@ -515,4 +515,14 @@ export interface GridApi {
      * Returns AG Grid Row Model Type
      */
     getAgGridRowModelType(): RowModelType;
+    /**
+     * Returns number of visible rows in Data Source
+     *
+     * @deprecated use `getRowCount()` instead
+     */
+    getVisibleRowCount(): number;
+    /**
+     * Opens a window with a transposed view of Grid
+     */
+    showTransposedView(transposeConfig?: TransposeConfig): void;
 }

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

@@ -1,7 +1,9 @@
 import { ActionColumn, ActionColumnApi } from '../../../types';
 import { ApiBase } from './ApiBase';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { ColDef } from '@ag-grid-community/core';
 export declare class ActionColumnApiImpl extends ApiBase implements ActionColumnApi {
     constructor(adaptable: IAdaptable);
     getActionColumns(): ActionColumn[];
+    getColDefsForActionColumns(): ColDef[];
 }

package/src/Api/Implementation/ActionColumnApiImpl.js

@@ -1,4 +1,6 @@
 import { ApiBase } from './ApiBase';
+import { ActionColumnRenderer, ReactActionColumnRenderer } from '../../agGrid/ActionColumnRenderer';
+import { AB_SPECIAL_COLUMN } from '../../Utilities/Constants/GeneralConstants';
 export class ActionColumnApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -7,4 +9,32 @@ export class ActionColumnApiImpl extends ApiBase {
         var _a;
         return (_a = this.getActionColumnOptions().actionColumns) !== null && _a !== void 0 ? _a : [];
     }
+    getColDefsForActionColumns() {
+        const defaultSpecialColumnSettings = this.getGridApi().internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef();
+        const defaultActionColumnSettings = Object.assign(Object.assign({}, defaultSpecialColumnSettings), { resizable: true, suppressMenu: false, suppressMovable: false });
+        return this.getActionColumnApi()
+            .getActionColumns()
+            .map((actionColumn) => {
+            const actionColumnSettings = Object.assign(Object.assign({}, defaultActionColumnSettings), actionColumn.actionColumnSettings);
+            const newColDef = {
+                headerName: actionColumn.friendlyName ? actionColumn.friendlyName : actionColumn.columnId,
+                colId: actionColumn.columnId,
+                hide: false,
+                editable: false,
+                width: actionColumnSettings.width,
+                resizable: actionColumnSettings.resizable,
+                suppressHeaderMenuButton: actionColumnSettings.suppressMenu,
+                suppressMovable: actionColumnSettings.suppressMovable,
+                filter: false,
+                sortable: false,
+                enableRowGroup: false,
+                cellRenderer: this.getAdaptableApi().internalApi.getAdaptableInstance().variant === 'react'
+                    ? ReactActionColumnRenderer
+                    : ActionColumnRenderer,
+                type: [AB_SPECIAL_COLUMN, 'abColDefObject'],
+            };
+            this.getAdaptableApi().logInfo('Setting up Action Column: ' + actionColumn.columnId);
+            return newColDef;
+        });
+    }
 }

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

@@ -40,7 +40,7 @@ import { StatusBarApi } from '../StatusBarApi';
 import { StyledColumnApi } from '../StyledColumnApi';
 import { ActionColumnApi } from '../ActionColumnApi';
 import { ActionRowApi } from '../ActionRowApi';
-import { NotesApi } from '../NotesApi';
+import { NoteApi } from '../NoteApi';
 import { Fdc3Api } from '../Fdc3Api';
 import { GridFilterApi } from '../GridFilterApi';
 import { ColumnFilterApi } from '../ColumnFilterApi';
@@ -90,7 +90,7 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     dataChangeHistoryApi: DataChangeHistoryApi;
     chartingApi: ChartingApi;
     statusBarApi: StatusBarApi;
-    notesApi: NotesApi;
+    noteApi: NoteApi;
     fdc3Api: Fdc3Api;
     dataImportApi: DataImportApi;
     gridFilterApi: GridFilterApi;
@@ -98,6 +98,7 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     commentApi: CommentApi;
     private destroyed;
     constructor(adaptable: IAdaptable);
+    get agGridApi(): import("@ag-grid-community/core/dist/esm/es6/gridApi").GridApi<any>;
     /**
      * This is only meant to be called by the Adaptable instance.
      */

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -40,7 +40,7 @@ import { StyledColumnApiImpl } from './StyledColumnApiImpl';
 import { CalendarApiImpl } from './CalendarApiImpl';
 import { EntitlementApiImpl } from './EntitlementApiImpl';
 import { OptionsApiImpl } from './OptionsApiImpl';
-import { NotesApiImpl } from './NotesApiImpl';
+import { NoteApiImpl } from './NoteApiImpl';
 import { Fdc3ApiImpl } from './Fdc3ApiImpl';
 import { DataImportApiImpl } from './DataImportApiImpl';
 import { GridFilterApiImpl } from './GridFilterApiImpl';
@@ -94,7 +94,7 @@ export class AdaptableApiImpl {
         this.dataChangeHistoryApi = new DataChangeHistoryApiImpl(adaptable);
         this.chartingApi = new ChartingApiImpl(adaptable);
         this.statusBarApi = new StatusBarApiImpl(adaptable);
-        this.notesApi = new NotesApiImpl(adaptable);
+        this.noteApi = new NoteApiImpl(adaptable);
         this.fdc3Api = new Fdc3ApiImpl(adaptable);
         this.dataImportApi = new DataImportApiImpl(adaptable);
         this.gridFilterApi = new GridFilterApiImpl(adaptable);
@@ -103,6 +103,9 @@ export class AdaptableApiImpl {
         // adaptable internal api
         this.internalApi = new AdaptableInternalApi(adaptable);
     }
+    get agGridApi() {
+        return this.adaptable.agGridAdapter.getAgGridApi();
+    }
     /**
      * This is only meant to be called by the Adaptable instance.
      */

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

@@ -1,5 +1,5 @@
 import { Action } from 'redux';
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { AdaptableVariant, IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableState } from '../../PredefinedConfig/AdaptableState';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
@@ -7,7 +7,7 @@ import { ModuleInfo } from '../../Strategy/Interface/IModule';
 import { AdaptableOptions } from '../../AdaptableOptions/AdaptableOptions';
 import { AdaptableApi } from '../AdaptableApi';
 import { ExportOptions } from '../../AdaptableOptions/ExportOptions';
-import { ActionColumnApi, ActionColumnOptions, ActionRowApi, ActionRowOptions, AlertApi, AlertOptions, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CalendarOptions, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, ColumnFilterApi, ColumnFilterOptions, ColumnOptions, ConfigApi, ContainerOptions, CustomSortApi, CustomSortOptions, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, ExpressionApi, ExpressionOptions, Fdc3Api, Fdc3Options, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, GridFilterApi, GroupingOptions, LayoutApi, LayoutAssociatedObject, LayoutOptions, MenuOptions, NamedQueryApi, NotesOptions, NotificationsOptions, PluginsApi, PlusMinusApi, PredicateApi, PredicateOptions, QuickSearchApi, QuickSearchOptions, ScheduleApi, ScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, ToolPanelOptions, UserInterfaceApi, UserInterfaceOptions } from '../../types';
+import { ActionColumnApi, ActionColumnOptions, ActionRowApi, ActionRowOptions, AlertApi, AlertOptions, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CalendarOptions, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, ColumnFilterApi, ColumnFilterOptions, ColumnOptions, CommentOptions, ConfigApi, ContainerOptions, CustomSortApi, CustomSortOptions, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, ExpressionApi, ExpressionOptions, Fdc3Api, Fdc3Options, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, GridFilterApi, GroupingOptions, LayoutApi, LayoutAssociatedObject, LayoutOptions, MenuOptions, NamedQueryApi, NoteOptions, NotificationsOptions, PluginsApi, PlusMinusApi, PredicateApi, PredicateOptions, QuickSearchApi, QuickSearchOptions, ScheduleApi, ScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, ToolPanelOptions, UserInterfaceApi, UserInterfaceOptions } from '../../types';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 export declare abstract class ApiBase {
     protected adaptable: IAdaptable;
@@ -20,6 +20,7 @@ export declare abstract class ApiBase {
     protected logSuccess(message: string, ...optionalParams: any[]): void;
     protected logWarn(message: string, ...optionalParams: any[]): void;
     protected logError(message: string, ...optionalParams: any[]): void;
+    protected getAdaptableVariant(): AdaptableVariant;
     /**
      * Base api helper method which ensure that Adaptable Object being used in the function is not null or undefined
      *
@@ -52,7 +53,8 @@ export declare abstract class ApiBase {
     protected getActionColumnOptions(): ActionColumnOptions;
     protected getActionRowOptions(): ActionRowOptions;
     protected getColumnOptions(): ColumnOptions;
-    protected getNotesOptions(): NotesOptions;
+    protected getCommentOptions(): CommentOptions;
+    protected getNoteOptions(): NoteOptions;
     protected getCustomSortOptions(): CustomSortOptions;
     protected getDataSetOptions(): DataSetOptions;
     protected getCalendarOptions(): CalendarOptions;

package/src/Api/Implementation/ApiBase.js

@@ -21,6 +21,9 @@ export class ApiBase {
     logError(message, ...optionalParams) {
         this.adaptable.logger.error(message, ...optionalParams);
     }
+    getAdaptableVariant() {
+        return this.adaptable.variant;
+    }
     /**
      * Base api helper method which ensure that Adaptable Object being used in the function is not null or undefined
      *
@@ -98,8 +101,11 @@ export class ApiBase {
     getColumnOptions() {
         return this.getOptions().columnOptions;
     }
-    getNotesOptions() {
-        return this.getOptions().notesOptions;
+    getCommentOptions() {
+        return this.getOptions().commentOptions;
+    }
+    getNoteOptions() {
+        return this.getOptions().noteOptions;
     }
     getCustomSortOptions() {
         return this.getOptions().customSortOptions;

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

@@ -6,5 +6,4 @@ export declare class BulkUpdateApiImpl extends ApiBase implements BulkUpdateApi
     openBulkUpdateSettingsPanel(): void;
     showBulkUpdatePopup(): void;
     applyBulkUpdate(cellUpdateRequests: CellUpdateRequest[]): void;
-    setBulkUpdateValue(bulkUpdateValue: string): void;
 }

package/src/Api/Implementation/BulkUpdateApiImpl.js

@@ -1,7 +1,6 @@
 import { ApiBase } from './ApiBase';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import * as BulkUpdateRedux from '../../Redux/ActionsReducers/BulkUpdateRedux';
-import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
 export class BulkUpdateApiImpl extends ApiBase {
     getBulkUpdateValue() {
         return this.getAdaptableState().System.BulkUpdateValue;
@@ -15,7 +14,4 @@ export class BulkUpdateApiImpl extends ApiBase {
     applyBulkUpdate(cellUpdateRequests) {
         this.dispatchAction(BulkUpdateRedux.BulkUpdateApply(cellUpdateRequests));
     }
-    setBulkUpdateValue(bulkUpdateValue) {
-        this.dispatchAction(SystemRedux.BulkUpdateChangeValue(bulkUpdateValue));
-    }
 }

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

@@ -9,9 +9,4 @@ export declare class CellSummaryApiImpl extends ApiBase implements CellSummaryAp
     setCurrentCellSummaryOperation(operation: SummaryOperation | string): void;
     getCellSummaryOperationValue(operation: SummaryOperation | string): any;
     getCurrentCellSummaryOperationValue(): any;
-    /**
-     * Weighted average is availabe only if the current layout has at leat a Weighted Average aggregation defined.
-     */
-    private isWeightedAverageCellSummaryAvailable;
-    private getWeightedAverageCellSummaryOperation;
 }

package/src/Api/Implementation/CellSummaryApiImpl.js

@@ -2,7 +2,6 @@ import { ApiBase } from './ApiBase';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
 import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
-import { cellSummaryWeightedAverage } from '../../agGrid/weightedAverage';
 export class CellSummaryApiImpl extends ApiBase {
     openCellSummaryPopupSettingsPanel() {
         this.showModulePopup(ModuleConstants.CellSummaryModuleId);
@@ -13,12 +12,6 @@ export class CellSummaryApiImpl extends ApiBase {
     getCellSummaryOperationDefinitions() {
         var _a;
         let cellSummaryOperations = (_a = this.getCellSummaryOptions().cellSummaryOperations) !== null && _a !== void 0 ? _a : [];
-        if (this.isWeightedAverageCellSummaryAvailable()) {
-            cellSummaryOperations = [
-                ...cellSummaryOperations,
-                this.getWeightedAverageCellSummaryOperation(),
-            ];
-        }
         return cellSummaryOperations;
     }
     setCurrentCellSummaryOperation(operation) {
@@ -50,6 +43,8 @@ export class CellSummaryApiImpl extends ApiBase {
                 return cellSummary.Std_Deviation;
             case SummaryOperation.Only:
                 return cellSummary.Only;
+            case SummaryOperation.Weighted_Average:
+                return cellSummary.Weighted_Average;
             default:
                 return cellSummary[operation];
         }
@@ -61,20 +56,4 @@ export class CellSummaryApiImpl extends ApiBase {
             : cellSummaryOperation.operationName;
         return this.getCellSummaryOperationValue(summaryOperation);
     }
-    /**
-     * Weighted average is availabe only if the current layout has at leat a Weighted Average aggregation defined.
-     */
-    isWeightedAverageCellSummaryAvailable() {
-        const currentLayout = this.getAdaptableApi().layoutApi.getCurrentLayout();
-        if (currentLayout.AggregationColumns == undefined) {
-            return false;
-        }
-        return Object.values(currentLayout.AggregationColumns).some((aggCol) => typeof aggCol === 'object' && aggCol.type === 'weightedAverage');
-    }
-    getWeightedAverageCellSummaryOperation() {
-        return {
-            operationName: 'Weighted Avg',
-            operationFunction: cellSummaryWeightedAverage,
-        };
-    }
 }

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

@@ -63,4 +63,5 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getDefaultAggFunc(columnId: string): string;
     isSpecialColumn(columnId: string): boolean;
     openColumnInfoSettingsPanel(): void;
+    getColumnTypes(): string[];
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -3,6 +3,7 @@ import * as GeneralConstants from '../../Utilities/Constants/GeneralConstants';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { ColumnInternalApi } from '../Internal/ColumnInternalApi';
+import { createBaseContext } from '../../Utilities/ObjectFactory';
 export class ColumnApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -333,4 +334,13 @@ export class ColumnApiImpl extends ApiBase {
     openColumnInfoSettingsPanel() {
         this.showModulePopup(ModuleConstants.ColumnInfoModuleId);
     }
+    getColumnTypes() {
+        const columnTypes = this.getOptions().columnOptions.columnTypes;
+        if (typeof columnTypes === 'function') {
+            return columnTypes(createBaseContext(this.getAdaptableApi()));
+        }
+        else {
+            return columnTypes;
+        }
+    }
 }

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

@@ -1,8 +1,11 @@
 import { ApiBase } from './ApiBase';
-import { CellAddress } from '../../PredefinedConfig/CellAddress';
-import { CommentThread, AdaptableComment } from '../../types';
+import { CommentThread, AdaptableComment, CellAddress } from '../../types';
 import { CommentApi } from '../CommentApi';
+import { CommentsInternalApi } from '../Internal/CommentsInternalApi';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 export declare class CommentsApiImpl extends ApiBase implements CommentApi {
+    internalApi: CommentsInternalApi;
+    constructor(adaptable: IAdaptable);
     getComments(address: CellAddress): AdaptableComment[];
     getCommentThread(address: CellAddress): CommentThread | undefined;
     getCommentThreads(): CommentThread[];

package/src/Api/Implementation/CommentsApiImpl.js

@@ -2,7 +2,12 @@ import * as CommentRedux from '../../Redux/ActionsReducers/CommentsRedux';
 import { ApiBase } from './ApiBase';
 import ObjectFactory from '../../Utilities/ObjectFactory';
 import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
+import { CommentsInternalApi } from '../Internal/CommentsInternalApi';
 export class CommentsApiImpl extends ApiBase {
+    constructor(adaptable) {
+        super(adaptable);
+        this.internalApi = new CommentsInternalApi(adaptable);
+    }
     getComments(address) {
         return CommentRedux.GetCommentsSelector(this.getAdaptableState().Comment, address);
     }
@@ -10,7 +15,8 @@ export class CommentsApiImpl extends ApiBase {
         return CommentRedux.GetCellCommentSelector(this.getAdaptableState().Comment, address);
     }
     getCommentThreads() {
-        return this.getAdaptableState().Comment.CommentThreads;
+        var _a;
+        return (_a = this.getAdaptableState().Comment.CommentThreads) !== null && _a !== void 0 ? _a : [];
     }
     editComment(comment, address) {
         this.dispatchAction(CommentRedux.CommentsEdit({ comment, cellAddress: address }));

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

@@ -20,7 +20,7 @@ import { AdaptableModule, AdaptableStateKey } from '../../PredefinedConfig/Commo
 import { AdaptableOptions, AdaptableSearchState, AdaptableSortState, NamedQueryState, ScheduleState } from '../../types';
 import { PredefinedConfig } from '../../PredefinedConfig/PredefinedConfig';
 import { ChartingState } from '../../PredefinedConfig/ChartingState';
-import { NotesState } from '../../PredefinedConfig/NotesState';
+import { NoteState } from '../../PredefinedConfig/NoteState';
 export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     configInit(): void;
     copyAllStateToClipboard(): void;
@@ -48,7 +48,7 @@ export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     getApplicationState(returnJson?: boolean): ApplicationState;
     getCalculatedColumnState(returnJson?: boolean): CalculatedColumnState;
     getChartingState(returnJson?: boolean): ChartingState;
-    getNotesState(returnJson?: boolean): NotesState;
+    getNoteState(returnJson?: boolean): NoteState;
     getCustomSortState(returnJson?: boolean): CustomSortState;
     getDashboardState(returnJson?: boolean): DashboardState;
     getExportState(returnJson?: boolean): ExportState;

package/src/Api/Implementation/ConfigApiImpl.js

@@ -8,7 +8,7 @@ import * as AlertRedux from '../../Redux/ActionsReducers/AlertRedux';
 import * as BulkUpdateRedux from '../../Redux/ActionsReducers/BulkUpdateRedux';
 import * as CalculatedColumnRedux from '../../Redux/ActionsReducers/CalculatedColumnRedux';
 import * as ChartingRedux from '../../Redux/ActionsReducers/ChartingRedux';
-import * as NotesRedux from '../../Redux/ActionsReducers/NotesRedux';
+import * as NoteRedux from '../../Redux/ActionsReducers/NoteRedux';
 import * as CustomSortRedux from '../../Redux/ActionsReducers/CustomSortRedux';
 import * as ExportRedux from '../../Redux/ActionsReducers/ExportRedux';
 import * as FormatColumnRedux from '../../Redux/ActionsReducers/FormatColumnRedux';
@@ -117,7 +117,6 @@ export class ConfigApiImpl extends ApiBase {
     setAdaptableStateKey(adaptableStateKey, config) {
         return new Promise((resolve, reject) => {
             this.adaptable.api.internalApi.executeWithProgressIndicator(`Initialising...`, () => {
-                this.adaptable.adaptableOptions.adaptableStateKey = adaptableStateKey;
                 const flushCurrentState = !config || config.flushCurrentState !== false;
                 // make sure we persist any "pending" changes to state - since stateOptions.debounceStateDelay can cause
                 // the state to be persisted with a delay, which we dont want in this case
@@ -125,22 +124,34 @@ export class ConfigApiImpl extends ApiBase {
                     ? this.adaptable.adaptableStore.saveStateNow(this.adaptable)
                     : Promise.resolve(true);
                 flushStatePromise.then(() => {
+                    this.adaptable.adaptableOptions.adaptableStateKey = adaptableStateKey;
                     let predefinedConfig = config === null || config === void 0 ? void 0 : config.predefinedConfig;
                     if (predefinedConfig) {
                         predefinedConfig = initPredefinedConfigWithUuids(predefinedConfig);
                     }
-                    const promise = this.adaptable.adaptableStore.loadStore(this.adaptable, adaptableStateKey, predefinedConfig);
+                    const promise = this.adaptable.adaptableStore.loadStore({
+                        adaptable: this.adaptable,
+                        adaptableStateKey,
+                        predefinedConfig,
+                        postLoadHook: (state) => {
+                            return this.adaptable.normalizeAdaptableState(state, this.adaptable.agGridAdapter.getLiveGridOptions());
+                        },
+                    });
                     promise
                         .then(() => {
-                        this.adaptable.prepareGrid();
+                        this.adaptable.updateColumnModelAndRefreshGrid({ skipColDefsRefresh: true });
+                        this.adaptable.setLayout();
                         this.adaptable.api.userInterfaceApi.hideLoadingScreen();
                     })
                         .then(() => {
                         // resolve main(result) promise
                         resolve();
-                    }, () => {
+                    }, (error) => {
                         // reject main(result) promise
-                        reject();
+                        reject(error);
+                    })
+                        .catch((e) => {
+                        this.logError('Error setting Adaptable State Key', e);
                     });
                 });
             });
@@ -170,10 +181,10 @@ export class ConfigApiImpl extends ApiBase {
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Charting)
                     : this.getAdaptableState().Charting;
-            case 'Notes':
+            case 'Note':
                 return returnJson
-                    ? JSON.stringify(this.getAdaptableState().Notes)
-                    : this.getAdaptableState().Notes;
+                    ? JSON.stringify(this.getAdaptableState().Note)
+                    : this.getAdaptableState().Note;
             case 'CustomSort':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().CustomSort)
@@ -250,8 +261,8 @@ export class ConfigApiImpl extends ApiBase {
     getChartingState(returnJson = false) {
         return this.getUserStateByStateKey('Charting', returnJson);
     }
-    getNotesState(returnJson = false) {
-        return this.getUserStateByStateKey('Notes', returnJson);
+    getNoteState(returnJson = false) {
+        return this.getUserStateByStateKey('Note', returnJson);
     }
     getCustomSortState(returnJson = false) {
         return this.getUserStateByStateKey('CustomSort', returnJson);
@@ -306,8 +317,8 @@ export class ConfigApiImpl extends ApiBase {
             case 'Charting':
                 this.dispatchAction(ChartingRedux.ChartingReady(this.getChartingState()));
                 break;
-            case 'Notes':
-                this.dispatchAction(NotesRedux.NotesReady(this.getNotesState()));
+            case 'Note':
+                this.dispatchAction(NoteRedux.NoteReady(this.getNoteState()));
                 break;
             case 'CustomSort':
                 this.dispatchAction(CustomSortRedux.CustomSortReady(this.getCustomSortState()));