@adaptabletools/adaptable 18.0.0-canary.8 → 18.0.0-canary.9

package/src/Api/ConfigApi.d.ts

@@ -27,7 +27,7 @@ export interface ConfigApi {
      */
     setAdaptableStateKey(adaptableStateKey: string, config?: {
         predefinedConfig: PredefinedConfig;
-    }): PromiseLike<void>;
+    }): Promise<void>;
     /**
      * Returns current Predefined Config
      */

package/src/Api/GridApi.d.ts

@@ -516,4 +516,8 @@ export interface GridApi {
      * @deprecated use `getRowCount()` instead
      */
     getVisibleRowCount(): number;
+    /**
+     * Opens a window with a transposed view of Grid
+     */
+    showTransposedView(transposedColumnId: string, hideTransposedColumn?: boolean): void;
 }

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

@@ -2,7 +2,11 @@ import { ApiBase } from './ApiBase';
 import { CellAddress } from '../../PredefinedConfig/CellAddress';
 import { CommentThread, AdaptableComment } 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);
     }

package/src/Api/Implementation/ConfigApiImpl.js

@@ -136,16 +136,19 @@ export class ConfigApiImpl extends ApiBase {
                     });
                     promise
                         .then(() => {
-                        this.adaptable.updateColumnModelAndRefreshGrid();
+                        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);
                     });
                 });
             });

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

@@ -130,4 +130,5 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     openGridInfoSettingsPanel(): void;
     getAgGridRowModelType(): RowModelType;
     getVisibleRowCount(): number;
+    showTransposedView(transposedColumnId: string, hideTransposedColumn?: boolean): void;
 }

package/src/Api/Implementation/GridApiImpl.js

@@ -5,6 +5,7 @@ import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import { GridInternalApi } from '../Internal/GridInternalApi';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { logDeprecation } from '../../Utilities/logDeprecation';
+import { WINDOW_SHOW_TRANSPOSED_VIEW } from '../../View/Components/Popups/WindowPopups/windowFactory';
 export class GridApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -515,4 +516,16 @@ export class GridApiImpl extends ApiBase {
         logDeprecation(this.adaptable.logger, 'GridApi', 'getVisibleRowCount', 'getRowCount');
         return this.getRowCount();
     }
+    showTransposedView(transposedColumnId, hideTransposedColumn) {
+        this.adaptable.api.internalApi.showPopupWindow({
+            id: WINDOW_SHOW_TRANSPOSED_VIEW,
+            factoryId: WINDOW_SHOW_TRANSPOSED_VIEW,
+            title: 'Transposed View',
+            icon: 'grid',
+            popupProps: {
+                transposedColumnId,
+                hideTransposedColumn,
+            },
+        });
+    }
 }

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

@@ -41,6 +41,8 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     removeColumnFromCurrentLayout(columnId: string): void;
     removeColumnFromAllLayouts(columnId: string): void;
     removeColumnFromLayout(columnId: string, layoutName: string): void;
+    addColumnToLayout(columnId: string, layoutName: string): void;
+    addColumnToCurrentLayout(columnId: string): void;
     getLayoutSupportedFeatures(): {
         RowGroupedColumns: boolean;
         AggregationColumns: boolean;
@@ -48,8 +50,4 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
         ColumnFilters: boolean;
         ColumnSorts: boolean;
     };
-    showTransposePopup(config: {
-        transposedColumnId: string;
-        hideTransposedColumn?: boolean;
-    }): void;
 }

package/src/Api/Implementation/LayoutApiImpl.js

@@ -9,7 +9,6 @@ import { createUuid } from '../../PredefinedConfig/Uuid';
 import { DEFAULT_LAYOUT } from '../../Utilities/Constants/GeneralConstants';
 import { PopupShowPrompt } from '../../Redux/ActionsReducers/PopupRedux';
 import { LayoutInternalApi } from '../Internal/LayoutInternalApi';
-import { WINDOW_SHOW_TRANSPOSED_VIEW } from '../../View/Components/Popups/WindowPopups/windowFactory';
 export class LayoutApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -222,6 +221,21 @@ export class LayoutApiImpl extends ApiBase {
             }
         }
     }
+    addColumnToLayout(columnId, layoutName) {
+        const column = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
+        if (column) {
+            const layout = this.getLayoutByName(layoutName);
+            if (layout) {
+                if (!layout.Columns.includes(columnId)) {
+                    this.dispatchAction(LayoutRedux.LayoutAddColumn(layoutName, columnId));
+                    this.getAdaptableApi().columnApi.showColumn(columnId);
+                }
+            }
+        }
+    }
+    addColumnToCurrentLayout(columnId) {
+        this.addColumnToLayout(columnId, this.getCurrentLayoutName());
+    }
     getLayoutSupportedFeatures() {
         const layoutSupportedFeatures = {
             RowGroupedColumns: true,
@@ -237,17 +251,4 @@ export class LayoutApiImpl extends ApiBase {
         }
         return layoutSupportedFeatures;
     }
-    showTransposePopup(config) {
-        const { transposedColumnId, hideTransposedColumn } = config;
-        this.adaptable.api.internalApi.showPopupWindow({
-            id: WINDOW_SHOW_TRANSPOSED_VIEW,
-            factoryId: WINDOW_SHOW_TRANSPOSED_VIEW,
-            title: 'Transpose View',
-            icon: 'grid',
-            popupProps: {
-                transposedColumnId,
-                hideTransposedColumn,
-            },
-        });
-    }
 }

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

@@ -2,7 +2,11 @@ import { ApiBase } from './ApiBase';
 import { NotesApi } from '../NotesApi';
 import { AdaptableNote, AdaptableNotes, NotesState } from '../../PredefinedConfig/NotesState';
 import { CellAddress } from '../../PredefinedConfig/CellAddress';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { NotesInternalApi } from '../Internal/NotesInternalApi';
 export declare class NotesApiImpl extends ApiBase implements NotesApi {
+    internalApi: NotesInternalApi;
+    constructor(adaptable: IAdaptable);
     addNote(noteStr: string, primaryKeyValue: any, columnId: string): void;
     editNote(note: AdaptableNote): void;
     updateNoteText(noteStr: string, note: AdaptableNote): void;

package/src/Api/Implementation/NotesApiImpl.js

@@ -1,6 +1,11 @@
 import { ApiBase } from './ApiBase';
 import * as NotesRedux from '../../Redux/ActionsReducers/NotesRedux';
+import { NotesInternalApi } from '../Internal/NotesInternalApi';
 export class NotesApiImpl extends ApiBase {
+    constructor(adaptable) {
+        super(adaptable);
+        this.internalApi = new NotesInternalApi(adaptable);
+    }
     addNote(noteStr, primaryKeyValue, columnId) {
         const note = {
             Text: noteStr,

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

@@ -10,6 +10,7 @@ export declare class ScopeApiImpl extends ApiBase implements ScopeApi {
     scopeIsEmpty(scope: AdaptableScope): boolean;
     scopeIsAll(scope: AdaptableScope): boolean;
     scopeHasDataType(scope: AdaptableScope): boolean;
+    scopeHasColumnType(scope: AdaptableScope): boolean;
     scopeHasOnlyBooleanDataType(scope: AdaptableScope): boolean;
     scopeHasColumns(scope: AdaptableScope): boolean;
     isSingleColumnScope(scope: AdaptableScope): boolean;
@@ -21,6 +22,7 @@ export declare class ScopeApiImpl extends ApiBase implements ScopeApi {
     isPrimaryKeyColumnInScopeColumns(scope: AdaptableScope): boolean;
     getScopeToString(scope: AdaptableScope): string;
     getColumnIdsInScope(scope: AdaptableScope): string[] | undefined;
+    getColumnTypesInScope(scope: AdaptableScope): string[] | undefined;
     getDataTypesInScope(scope: AdaptableScope): ScopeDataType[] | undefined;
     isColumnInNumericScope(column: AdaptableColumn, scope: AdaptableScope): boolean;
     isColumnInStringsScope(column: AdaptableColumn, scope: AdaptableScope): boolean;

package/src/Api/Implementation/ScopeApiImpl.js

@@ -13,6 +13,10 @@ export class ScopeApiImpl extends ApiBase {
         if ('DataTypes' in scope && scope.DataTypes.includes(column.dataType)) {
             return true;
         }
+        if ('ColumnTypes' in scope &&
+            scope.ColumnTypes.some((columnType) => { var _a; return (_a = column.columnTypes) === null || _a === void 0 ? void 0 : _a.includes(columnType); })) {
+            return true;
+        }
         if ('ColumnIds' in scope && scope.ColumnIds.includes(column.columnId)) {
             return true;
         }
@@ -27,13 +31,7 @@ export class ScopeApiImpl extends ApiBase {
             return columns;
         }
         return columns.filter((c) => {
-            if ('DataTypes' in scope && scope.DataTypes.includes(c.dataType)) {
-                return true;
-            }
-            if ('ColumnIds' in scope && scope.ColumnIds.includes(c.columnId)) {
-                return true;
-            }
-            return false;
+            return this.isColumnInScope(c, scope);
         });
     }
     getScopeDescription(scope) {
@@ -44,6 +42,9 @@ export class ScopeApiImpl extends ApiBase {
             // do we need a true check here?
             return 'Columns: All';
         }
+        if ('ColumnTypes' in scope) {
+            return ((scope.ColumnTypes.length > 0 ? 'ColumnTypes' : 'ColumnType') + ': ' + scope.ColumnTypes.join(', '));
+        }
         if ('DataTypes' in scope) {
             return ((scope.DataTypes.length > 0 ? 'DataTypes' : 'DataType') + ': ' + scope.DataTypes.join(', '));
         }
@@ -67,6 +68,9 @@ export class ScopeApiImpl extends ApiBase {
     scopeHasDataType(scope) {
         return scope !== undefined && 'DataTypes' in scope;
     }
+    scopeHasColumnType(scope) {
+        return scope !== undefined && 'ColumnTypes' in scope;
+    }
     scopeHasOnlyBooleanDataType(scope) {
         var _a;
         return 'DataTypes' in scope && ((_a = scope.DataTypes) === null || _a === void 0 ? void 0 : _a.length) == 1 && scope.DataTypes[0] == 'Boolean';
@@ -120,6 +124,9 @@ export class ScopeApiImpl extends ApiBase {
         if ('All' in scope) {
             return 'Columns: All';
         }
+        if ('ColumnTypes' in scope) {
+            return 'ColumnTypes: ' + scope.ColumnTypes.join(',');
+        }
         if ('DataTypes' in scope) {
             return 'DataTypes: ' + scope.DataTypes.join(',');
         }
@@ -140,6 +147,12 @@ export class ScopeApiImpl extends ApiBase {
         }
         return undefined;
     }
+    getColumnTypesInScope(scope) {
+        if (scope !== undefined && 'ColumnTypes' in scope) {
+            return scope.ColumnTypes;
+        }
+        return undefined;
+    }
     getDataTypesInScope(scope) {
         if (scope !== undefined && 'DataTypes' in scope) {
             return scope.DataTypes;

package/src/Api/Internal/CalculatedColumnInternalApi.js

@@ -129,7 +129,7 @@ export class CalculatedColumnInternalApi extends ApiBase {
                     ? calculatedColumn.FriendlyName
                     : calculatedColumn.ColumnId,
                 colId: calculatedColumn.ColumnId,
-                hide: true,
+                hide: false,
                 editable: false,
                 width: calculatedColumnSettings.Width,
                 enableValue: calculatedColumnSettings.Aggregatable,

package/src/Api/Internal/CommentsInternalApi.d.ts

@@ -0,0 +1,4 @@
+import { ApiBase } from '../Implementation/ApiBase';
+export declare class CommentsInternalApi extends ApiBase {
+    areCommentsAvailable(): boolean;
+}

package/src/Api/Internal/CommentsInternalApi.js

@@ -0,0 +1,13 @@
+import { ApiBase } from '../Implementation/ApiBase';
+export class CommentsInternalApi extends ApiBase {
+    areCommentsAvailable() {
+        const currentLayout = this.getLayoutApi().getCurrentLayout();
+        if (currentLayout.EnablePivot) {
+            return false;
+        }
+        if (currentLayout.RowGroupedColumns) {
+            return false;
+        }
+        return true;
+    }
+}

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -69,8 +69,9 @@ export class FormatColumnInternalApi extends ApiBase {
                 // this.getFormatColumnsWithColumnScope(formatColumns)
                 (this.adaptable.api.scopeApi.scopeHasColumns(fc.Scope) ||
                     // this.getFormatColumnsWithDataTypeScope(formatColumns)
-                    this.adaptable.api.scopeApi.scopeHasDataType(fc.Scope) || // this.getFormatColumnsWithAllScope(formatColumns)
-                this.adaptable.api.scopeApi.scopeIsAll(fc.Scope))
+                    this.adaptable.api.scopeApi.scopeHasDataType(fc.Scope) ||
+                    // this.getFormatColumnsWithAllScope(formatColumns)
+                    this.adaptable.api.scopeApi.scopeIsAll(fc.Scope) || this.adaptable.api.scopeApi.scopeHasColumnType(fc.Scope))
             );
         });
     }

package/src/Api/Internal/FreeTextColumnInternalApi.js

@@ -65,7 +65,7 @@ export class FreeTextColumnInternalApi extends ApiBase {
                 headerName: freeTextColumn.FriendlyName || freeTextColumn.ColumnId,
                 colId: freeTextColumn.ColumnId,
                 editable: true,
-                hide: true,
+                hide: false,
                 width: freeTextColumnSettings.Width,
                 enableValue: freeTextColumnSettings.Aggregatable,
                 filter: freeTextColumnSettings.Filterable,

package/src/Api/Internal/NotesInternalApi.d.ts

@@ -0,0 +1,4 @@
+import { ApiBase } from '../Implementation/ApiBase';
+export declare class NotesInternalApi extends ApiBase {
+    areNotesAvailable(): boolean;
+}

package/src/Api/Internal/NotesInternalApi.js

@@ -0,0 +1,13 @@
+import { ApiBase } from '../Implementation/ApiBase';
+export class NotesInternalApi extends ApiBase {
+    areNotesAvailable() {
+        const currentLayout = this.getLayoutApi().getCurrentLayout();
+        if (currentLayout.EnablePivot) {
+            return false;
+        }
+        if (currentLayout.RowGroupedColumns) {
+            return false;
+        }
+        return true;
+    }
+}

package/src/Api/LayoutApi.d.ts

@@ -163,6 +163,17 @@ export interface LayoutApi {
      * @param layoutName layout from which to remove Column
      */
     removeColumnFromLayout(columnId: string, layoutName: string): void;
+    /**
+     * Adds a Column to a given Layout
+     * @param columnId Column to add
+     * @param layoutName layout to which to add Column
+     */
+    addColumnToLayout(columnId: string, layoutName: string): void;
+    /**
+     * Adds a Column to Current Layout
+     * @param columnId Column to add
+      */
+    addColumnToCurrentLayout(columnId: string): void;
     /**
      * Returns what the layout supports.
      * This takes into account the data-source.
@@ -174,12 +185,4 @@ export interface LayoutApi {
         ColumnFilters: boolean;
         ColumnSorts: boolean;
     };
-    /**
-     * Opens a window with a transposed view of the grid
-     * it only works for client side data
-     */
-    showTransposePopup(config: {
-        transposedColumnId: string;
-        hideTransposedColumn?: boolean;
-    }): void;
 }

package/src/Api/ScopeApi.d.ts

@@ -31,6 +31,11 @@ export interface ScopeApi {
      * @param scope Scope to check
      */
     scopeHasDataType(scope: AdaptableScope): boolean;
+    /**
+     * True if Scope contains ColumnTypes
+     * @param scope Scope to check
+     */
+    scopeHasColumnType(scope: AdaptableScope): boolean;
     /**
      * True if the Scope is DataTypes and contains only Boolean
      * @param scope Scope to check
@@ -87,6 +92,11 @@ export interface ScopeApi {
      * @param scope Scope to check
      */
     getColumnIdsInScope(scope: AdaptableScope): string[] | undefined;
+    /**
+     * Returns all the ColumnTypes in the Scope
+     * @param scope Scope to check
+     */
+    getColumnTypesInScope(scope: AdaptableScope): string[] | undefined;
     /**
      * Returns all the DataTypes in the Scope
      * @param scope Scope to check

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

@@ -19,6 +19,10 @@ export interface AdaptableColumnBase extends AdaptableObject {
      * DataType of the Column
      */
     dataType: AdaptableColumnDataType;
+    /**
+     * Column Types of the Column
+     */
+    columnTypes?: string[];
 }
 export declare const isValidOrderForColumnGroups: ({ oldColumns, newColumns, }: {
     oldColumns: AdaptableColumn[];

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

@@ -54,4 +54,4 @@ export interface AdaptableBaseIcon {
 /**
  * All AdapTable System Icon names
  */
-export type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'chart-and-grid' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'comment' | 'comments' | 'contains' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'resume' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note' | 'import' | 'grid-filter';
+export type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'chart-and-grid' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'comment' | 'comments' | 'contains' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'resume' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note' | 'import' | 'grid-filter' | 'rows';

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

@@ -8,7 +8,10 @@ export type ScopeDataTypes<Type = ScopeDataType> = {
 export type ScopeColumnIds = {
     ColumnIds: string[];
 };
+export type ScopeColumnTypes = {
+    ColumnTypes: string[];
+};
 /**
  * Defines where a given Object / Module is active
  */
-export type AdaptableScope<Type = ScopeDataType> = ScopeAll | ScopeDataTypes<Type> | ScopeColumnIds;
+export type AdaptableScope<Type = ScopeDataType> = ScopeAll | ScopeDataTypes<Type> | ScopeColumnIds | ScopeColumnTypes;

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

@@ -0,0 +1,7 @@
+import { SummarySupportedExpression } from '../../Utilities/Services/SummaryService';
+export declare const ROW_SUMMARY_ROW_ID = "__ROW_SUMMARY_ROW_ID";
+export type RowSummaryPosition = 'Top' | 'Bottom';
+export interface RowSummary {
+    Position?: RowSummaryPosition;
+    ColumnsMap: Record<string, SummarySupportedExpression>;
+}

package/src/PredefinedConfig/Common/RowSummary.js

@@ -0,0 +1 @@
+export const ROW_SUMMARY_ROW_ID = '__ROW_SUMMARY_ROW_ID';

package/src/PredefinedConfig/LayoutState.d.ts

@@ -3,6 +3,7 @@ import { AdaptableObject } from './Common/AdaptableObject';
 import { ColumnSort } from './Common/ColumnSort';
 import { ColumnFilter, GridFilter } from '../types';
 import { AggregationColumns } from './Common/AggregationColumns';
+import { RowSummary } from './Common/RowSummary';
 /**
  * Predefined Configuration for the Layout Module
  */
@@ -82,4 +83,8 @@ export interface Layout extends AdaptableObject {
      * Whether to include the aggFunc name in the column header: e.g. 'sum(Bank Balance)' will just be 'Bank Balance'
      */
     SuppressAggFuncInHeader?: boolean;
+    /**
+     * Row summaries
+     */
+    RowSummaries?: RowSummary[];
 }

package/src/PredefinedConfig/SystemState.d.ts

@@ -20,6 +20,10 @@ export type { OpenFinReport };
 type ROW_PRIMARY_KEY = string;
 type COLUMN_ID_OR_WHOLE_ROW_LABEL = string;
 export type DataChangeHistoryMode = 'ACTIVE' | 'INACTIVE' | 'SUSPENDED';
+export type SystemRowSummary = {
+    Position: 'Top' | 'Bottom';
+    RowData: Record<string, any>;
+};
 /**
  * Internal state, used by Adaptable during a session; none of it is provided through Predefined Config, nor is it persisted
  */
@@ -103,6 +107,9 @@ export interface SystemState extends InternalState, IPushPullState, OpenFinState
         focusedEntity?: 'Note' | 'Comment';
         popupPosition?: CellAddress | null;
     };
+    RowSummary?: {
+        rowSummaries?: SystemRowSummary[];
+    };
 }
 export interface ProgressIndicator {
     active: boolean;

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

@@ -30,6 +30,10 @@ export declare const LAYOUT_SELECT = "LAYOUT_SELECT";
  * @ReduxAction A Layout has been (auto)saved
  */
 export declare const LAYOUT_SAVE = "LAYOUT_SAVE";
+/**
+ * @ReduxAction A Column has been added
+ */
+export declare const LAYOUT_ADD_COLUMN = "LAYOUT_ADD_COLUMN";
 /**
  * @ReduxAction A Column has been removed
  */
@@ -145,6 +149,10 @@ export interface LayoutSetColumnCaptionAction extends Redux.Action {
     columnId: string;
     caption: string;
 }
+export interface LayoutAddColumnAction extends Redux.Action {
+    layoutName: string;
+    columnId: string;
+}
 export interface LayoutRemoveColumnAction extends Redux.Action {
     layoutName: string;
     columnId: string;
@@ -163,6 +171,7 @@ export declare const LayoutAdd: (layout: Layout) => LayoutAddAction;
 export declare const LayoutDelete: (layout: Layout) => LayoutDeleteAction;
 export declare const LayoutSave: (layout: Layout) => LayoutSaveAction;
 export declare const LayoutSetColumnCaption: (layoutName: string, columnId: string, caption: string) => LayoutSetColumnCaptionAction;
+export declare const LayoutAddColumn: (layoutName: string, columnId: string) => LayoutAddColumnAction;
 export declare const LayoutRemoveColumn: (layoutName: string, columnId: string) => LayoutRemoveColumnAction;
 export declare const LayoutSelect: (layoutName: string) => LayoutSelectAction;
 export declare const LayoutReady: (layoutState: LayoutState) => LayoutReadyAction;

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -28,6 +28,10 @@ export const LAYOUT_SELECT = 'LAYOUT_SELECT';
  * @ReduxAction A Layout has been (auto)saved
  */
 export const LAYOUT_SAVE = 'LAYOUT_SAVE';
+/**
+ * @ReduxAction A Column has been added
+ */
+export const LAYOUT_ADD_COLUMN = 'LAYOUT_ADD_COLUMN';
 /**
  * @ReduxAction A Column has been removed
  */
@@ -149,6 +153,11 @@ export const LayoutSetColumnCaption = (layoutName, columnId, caption) => ({
     columnId,
     caption,
 });
+export const LayoutAddColumn = (layoutName, columnId) => ({
+    type: LAYOUT_ADD_COLUMN,
+    layoutName,
+    columnId,
+});
 export const LayoutRemoveColumn = (layoutName, columnId) => ({
     type: LAYOUT_REMOVE_COLUMN,
     layoutName,
@@ -218,6 +227,17 @@ export const LayoutReducer = (state = initialState, action) => {
             }
             return state;
         }
+        case LAYOUT_ADD_COLUMN: {
+            const addColumnAction = action;
+            const layoutname = addColumnAction.layoutName;
+            const colToAdd = addColumnAction.columnId;
+            let layoutToUpdate = state.Layouts.find((l) => l.Name === layoutname);
+            if (layoutToUpdate) {
+                layoutToUpdate.Columns.push(colToAdd);
+                return Object.assign(Object.assign({}, state), { Layouts: state.Layouts.map((abObject) => abObject.Uuid === layoutToUpdate.Uuid ? layoutToUpdate : abObject) });
+            }
+            return state;
+        }
         case LAYOUT_REMOVE_COLUMN: {
             const removeColumnAction = action;
             const layoutname = removeColumnAction.layoutName;

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

@@ -77,6 +77,7 @@ export declare const SYSTEM_VISUAL_EXPORT_END = "SYSTEM_VISUAL_EXPORT_END";
 export declare const SYSTEM_CELL_POPUP_SHOW = "SYSTEM_CELL_POPUP_SHOW";
 export declare const SYSTEM_CELL_POPUP_HIDE = "SYSTEM_CELL_POPUP_HIDE";
 export declare const SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY = "SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY";
+export declare const SYSTEM_SUMMARY_ROW_SET = "SYSTEM_SUMMARY_ROW_SET";
 export declare const DATA_IMPORT_COMPLETED = "DATA_IMPORT_COMPLETED";
 export interface DataImportCompletedAction extends Redux.Action {
     dataImportedInfo: DataImportedInfo;
@@ -328,6 +329,10 @@ export declare const SystemVisualExportEnd: () => SystemVisualExportEndAction;
 export declare const SystemQuickSearchFloatingVisibility: (visible: boolean) => SystemQuickSearchFloatingVisibilityAction;
 export declare const SystemCellPopupShow: (cellPosition: CellAddress, editMode?: boolean) => SystemCellPopupShowAction;
 export declare const SystemCellPopupEditFocusedEntity: (focusedEntity: 'Note' | 'Comment') => SystemCellPopupEditFocusedEntityAction;
+export declare const SystemRowSummartSet: (systemRowSummaries: SystemState['RowSummary']['rowSummaries']) => {
+    readonly type: "SYSTEM_SUMMARY_ROW_SET";
+    readonly rowSummaries: import("../../PredefinedConfig/SystemState").SystemRowSummary[];
+};
 export declare const SystemCellPopupHide: () => SystemCellPopupHideAction;
 export declare const SystemDisableDeleteConfirmationSelector: (state: SystemState) => boolean;
 export declare const SystemPreviousGroupedColumnsSelector: (state: SystemState) => Record<string, Record<string, number>>;

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -87,10 +87,12 @@ export const SYSTEM_SET_QUICK_SEARCH_FLOATING_VISIBILITY = 'SYSTEM_SET_QUICK_SEA
 // Data Export (Report)
 export const SYSTEM_VISUAL_EXPORT_BEGIN = 'SYSTEM_VISUAL_EXPORT_BEGIN';
 export const SYSTEM_VISUAL_EXPORT_END = 'SYSTEM_VISUAL_EXPORT_END';
-// Notes
+// Notes and Comments
 export const SYSTEM_CELL_POPUP_SHOW = 'SYSTEM_CELL_POPUP_SHOW';
 export const SYSTEM_CELL_POPUP_HIDE = 'SYSTEM_CELL_POPUP_HIDE';
 export const SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY = 'SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY';
+// Row Summaries
+export const SYSTEM_SUMMARY_ROW_SET = 'SYSTEM_SUMMARY_ROW_SET';
 // Data Import
 export const DATA_IMPORT_COMPLETED = 'DATA_IMPORT_COMPLETED';
 export const SystemHighlightCellAdd = (cellHighlightInfo) => ({
@@ -316,6 +318,10 @@ export const SystemCellPopupEditFocusedEntity = (focusedEntity) => ({
     type: SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY,
     focusedEntity,
 });
+export const SystemRowSummartSet = (systemRowSummaries) => ({
+    type: SYSTEM_SUMMARY_ROW_SET,
+    rowSummaries: systemRowSummaries,
+});
 export const SystemCellPopupHide = () => ({
     type: SYSTEM_CELL_POPUP_HIDE,
 });
@@ -758,6 +764,12 @@ export const SystemReducer = (state = initialState, action) => {
                     popupPosition: null,
                 } });
         }
+        case SYSTEM_SUMMARY_ROW_SET: {
+            const typedAction = action;
+            return Object.assign(Object.assign({}, state), { RowSummary: {
+                    rowSummaries: typedAction.rowSummaries,
+                } });
+        }
         default:
             return state;
     }