@adaptabletools/adaptable 15.0.0-canary.0 → 15.0.0-canary.2

package/src/agGrid/Adaptable.js

@@ -65,6 +65,7 @@ const weightedAverage_1 = require("./weightedAverage");
 const AggregationColumns_1 = require("../PredefinedConfig/Common/AggregationColumns");
 const renderReactRoot_1 = require("../renderReactRoot");
 const ChartingService_1 = require("../Utilities/Services/ChartingService");
+const ThemeService_1 = require("../Utilities/Services/ThemeService");
 const tinycolor = require('tinycolor2');
 const GROUP_PATH_SEPARATOR = '/';
 // IMPORTANT - we need colId to be set in order for safeSetColDefs to work correctly
@@ -429,6 +430,7 @@ class Adaptable {
         // create the services
         this.LicenseService = this.initLicenseService();
         this.ChartingService = new ChartingService_1.ChartingService(this.api);
+        this.ThemeService = new ThemeService_1.ThemeService(this.api);
         this.ValidationService = new ValidationService_1.ValidationService(this.api);
         this.ReportService = new ReportService_1.ReportService(this.api);
         this.ModuleService = new ModuleService_1.ModuleService(this.api);
@@ -647,7 +649,7 @@ class Adaptable {
                 this.initAgGridContainerFromInitializedAgGrid();
                 return Promise.resolve(true);
             }, () => {
-                (0, LoggingHelper_1.ConsoleLogError)(`Could not find any agGrid instance rendered. Could not find reference to ag-grid api. Make sure you pass the same  gridOptions object reference both to Adaptable and AgGrid`);
+                (0, LoggingHelper_1.ConsoleLogError)(`Could not find any AG Grid instance rendered. Could not find reference to AG Grid api. Make sure you pass the same gridOptions object reference both to Adaptable and AG Grid`);
                 return Promise.reject(false);
             });
         }
@@ -1583,7 +1585,7 @@ class Adaptable {
         layout.ColumnSorts = columnSorts;
         layout.RowGroupedColumns = groupedColumns;
         if (Object.keys(aggregatedColumns).length) {
-            // ag-grid aggregations are not 1-1 with adaptable column-aggregations
+            // AG Grid aggregations are not 1-1 with adaptable column-aggregations
             layout.AggregationColumns = this.mapAggregationColumnsFromGrid(aggregatedColumns, currentLayout);
         }
         else {
@@ -2149,7 +2151,7 @@ class Adaptable {
             this.gridOptions.api.redrawRows(redrawRowsParams);
         }
         catch (ex) {
-            (0, LoggingHelper_1.ConsoleLogError)('ag-grid redrawRows was unable to find some row nodes. Tried to redraw row nodes: ', rowNodes, ex);
+            (0, LoggingHelper_1.ConsoleLogError)('AG Grid redrawRows was unable to find some row nodes. Tried to redraw row nodes: ', rowNodes, ex);
         }
     }
     refreshCells(rowNodes, columns, forceUpdate, suppressFlash = false) {
@@ -2516,18 +2518,7 @@ class Adaptable {
         return justGroupColDefs;
     }
     getFirstRowNode() {
-        // Probably a better way but its only used by Calccolumn on creation so not urgent
-        let rowNode;
-        let foundNode = false;
-        this.gridOptions.api.forEachNode((node) => {
-            if (!foundNode) {
-                if (!node.group) {
-                    rowNode = node;
-                    foundNode = true;
-                }
-            }
-        });
-        return rowNode;
+        return this.gridOptions.api.getDisplayedRowAtIndex(0);
     }
     getFirstDisplayedRowNode() {
         const firstDisplayedRowIndex = this.gridOptions.api.getFirstDisplayedRow();
@@ -3048,7 +3039,7 @@ class Adaptable {
         const agFilterModel = this.gridOptions.api.getFilterModel();
         (this.gridOptions.columnApi.getColumns() || []).forEach((col) => {
             /**
-             * When ag-grid filters are used active state should not be removed for all columns.
+             * When AG Grid filters are used active state should not be removed for all columns.
              * Need to check if the column has a filter model.
              */
             const isColumnInFilterModel = agFilterModel && agFilterModel[col.getColId()];
@@ -3197,14 +3188,6 @@ class Adaptable {
     }
     setupColumnCellStyle({ col, colId, abColumn }) {
         this.setColDefProperty(col, 'cellStyle', (userCellStyle) => {
-            const defaultCellStyle = {
-                backgroundColor: null,
-                color: null,
-                fontWeight: null,
-                fontStyle: null,
-                fontSize: null,
-                borderColor: null,
-            };
             const activeFormatColumnsWithStyle = this.api.formatColumnApi.internalApi.getFormatColumnsWithStyleForColumn(abColumn);
             let styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(colId);
             if (styledColumn === null || styledColumn === void 0 ? void 0 : styledColumn.IsSuspended) {
@@ -3214,9 +3197,15 @@ class Adaptable {
             const hasQuickSearchStyle = quickSearchStyle != undefined;
             const cellStyle = (params) => {
                 const isQuickSearchActive = hasQuickSearchStyle && this.isQuickSearchActive(abColumn, params);
-                const result = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, defaultCellStyle), this.getReadOnlyCellStyle(abColumn, params)), this.getEditableCellStyle(abColumn, params)), (typeof userCellStyle === 'function' ? userCellStyle(params) : userCellStyle)), (!styledColumn
+                const result = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, this.getReadOnlyCellStyle(abColumn, params)), this.getEditableCellStyle(abColumn, params)), (typeof userCellStyle === 'function' ? userCellStyle(params) : userCellStyle)), (!styledColumn
                     ? this.getFormatColumnCellStyle(abColumn, activeFormatColumnsWithStyle, params)
                     : {})), (styledColumn ? this.getStyledColumnStyle(styledColumn, abColumn, params) : {})), (isQuickSearchActive ? quickSearchStyle : {})), this.getAlertCellStyle(abColumn, params)), this.getFlashingCellStyle(abColumn, params)), this.getCellHighlightStyle(abColumn, params));
+                // remove null values, AG Grid 29 fails, it asumes they are strings
+                Object.keys(result).forEach((key) => {
+                    if (result[key] === null || result[key] === undefined) {
+                        delete result[key];
+                    }
+                });
                 return result;
             };
             return cellStyle;
@@ -3259,7 +3248,6 @@ class Adaptable {
                     .flat()
                     .filter((x) => !!x);
                 const result = returnValue.length ? returnValue : undefined;
-                // console.log(result);
                 return result;
             };
             return cellClass;
@@ -4663,6 +4651,7 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
                 // recreating the standard AG Grid styling for row groups: 'Parent -> Child'
                 // additionally the values are formatted
                 let rowGroupNode = params.node;
+                const isFooterRow = rowGroupNode.footer;
                 const rowGroupSummary = [(_a = this.processRowGroupForExcelExport(rowGroupNode)) !== null && _a !== void 0 ? _a : ''];
                 while (rowGroupNode.parent) {
                     rowGroupNode = rowGroupNode.parent;
@@ -4671,7 +4660,11 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
                         rowGroupSummary.push(formattedParentNode);
                     }
                 }
-                return rowGroupSummary.reverse().join(' -> ');
+                let summary = rowGroupSummary.reverse().join(' -> ');
+                if (isFooterRow) {
+                    summary = `Total: ${summary}`;
+                }
+                return summary;
             },
         });
         // keep only the user defined props

package/src/agGrid/createAgStatusPanelComponent.js

@@ -14,7 +14,7 @@ const createAgStatusPanelComponent = (component, adaptable, context) => {
             }), adaptable);
             return (React.createElement("div", { className: "ab-StatusBar", ref: (node) => {
                     if (node) {
-                        // in React rendering, ag-grid renders an additional extra div
+                        // in React rendering, AG Grid renders an additional extra div
                         // around the status panel container, with className of 'ag-react-container'
                         // which needs to be stretched in order to fill the status panel
                         node.parentElement.style.display = 'flex';

package/src/metamodel/adaptable-metamodel-model.d.ts

@@ -1,19 +1,19 @@
 export declare type AdaptableMetamodel = Record<string, MetamodelItem>;
 export interface MetamodelItem {
     name: string;
-    kind: 'TypeAlias' | 'Interface' | 'Class';
-    description: string;
-    properties?: MetamodelItemProperty[];
+    kind: 'A' | 'I' | 'C';
+    desc: string;
+    props?: MetamodelItemProperty[];
 }
 export interface MetamodelItemProperty {
     name: string;
     kind: MetamodelItemPropertyKind;
-    description: string;
-    uiLabel: string;
-    reference?: string;
-    isOptional?: boolean;
-    defaultValue?: unknown;
+    desc: string;
+    uiLabel?: string;
+    ref?: string;
+    isOpt?: boolean;
+    defVal?: unknown;
     gridInfo?: 'item' | 'container';
     noCode?: 'item' | 'container';
 }
-export declare type MetamodelItemPropertyKind = 'REFERENCE' | 'number' | 'string' | 'boolean' | 'date' | 'function' | 'array' | 'indexType' | 'unknown';
+export declare type MetamodelItemPropertyKind = 'R' | 'n' | 's' | 'b' | 'd' | 'f' | 'a' | 'i' | 'u';