@adaptabletools/adaptable 18.0.0-canary.13 → 18.0.0-canary.15

package/package.json

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

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -27,11 +27,11 @@ import { IMetamodelService } from '../Utilities/Services/Interface/IMetamodelSer
 import { RenderReactRootFn } from '../renderReactRoot';
 import { AdaptableLogger } from '../agGrid/AdaptableLogger';
 import { Fdc3Service } from '../Utilities/Services/Fdc3Service';
-import { SummaryService } from '../Utilities/Services/SummaryService';
 import { AgGridAdapter } from '../agGrid/AgGridAdapter';
 import { AgGridColumnAdapter } from '../agGrid/AgGridColumnAdapter';
 import { AgGridMenuAdapter } from '../agGrid/AgGridMenuAdapter';
 import { RowEditService } from '../Utilities/Services/RowEditService';
+import { ISummaryService } from '../Utilities/Services/Interface/ISummaryService';
 /**
  * Contains AG Grid Options and Modules - used when instantiating AdapTable vanilla
  */
@@ -91,7 +91,7 @@ export interface IAdaptable {
     RowEditService: RowEditService;
     Fdc3Service: Fdc3Service;
     CellPopupService: CellPopupService;
-    SummaryService: SummaryService;
+    SummaryService: ISummaryService;
     /**
      * INTERNAL ADAPTABLE EVENTS
      * These are not called externally - for that we use eventapi

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

@@ -27,6 +27,7 @@ import { AdaptableObjectTag, AdaptableObjectWithScope } from '../../PredefinedCo
 import { Fdc3Service } from '../../Utilities/Services/Fdc3Service';
 import { CellPopupService } from '../../Utilities/Services/CellPopupService';
 import { RowEditService } from '../../Utilities/Services/RowEditService';
+import { ISummaryService } from '../../Utilities/Services/Interface/ISummaryService';
 export declare class AdaptableInternalApi extends ApiBase {
     getSystemState(): SystemState;
     showPopupConfirmation(confirmation: UIConfirmation): void;
@@ -60,6 +61,7 @@ export declare class AdaptableInternalApi extends ApiBase {
     getReportService(): IReportService;
     getCalculatedColumnExpressionService(): ICalculatedColumnExpressionService;
     getEntitlementService(): IEntitlementService;
+    getSummaryService(): ISummaryService;
     getQueryLanguageService(): IQueryLanguageService;
     getAlertService(): IAlertService;
     getTeamSharingService(): ITeamSharingService;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -102,6 +102,9 @@ export class AdaptableInternalApi extends ApiBase {
     getEntitlementService() {
         return this.adaptable.EntitlementService;
     }
+    getSummaryService() {
+        return this.adaptable.SummaryService;
+    }
     getQueryLanguageService() {
         return this.adaptable.QueryLanguageService;
     }

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

@@ -1,4 +1,4 @@
-import { SummarySupportedExpression } from '../../Utilities/Services/SummaryService';
+import { SummarySupportedExpression } from "../../Utilities/Services/Interface/ISummaryService";
 export declare const ROW_SUMMARY_ROW_ID = "__ROW_SUMMARY_ROW_ID";
 /**
  * Position of Row Summary - 'Top' or 'Bottom'
@@ -8,6 +8,12 @@ export type RowSummaryPosition = 'Top' | 'Bottom';
  * Defines a Row Summary used in a Layout
  */
 export interface RowSummary {
+    /**
+     * Where Row Summary appears - 'Top' or 'Bottom'
+     */
     Position?: RowSummaryPosition;
+    /**
+     * Map of Columns with Summary Expressions
+     */
     ColumnsMap: Record<string, SummarySupportedExpression>;
 }

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

@@ -1,6 +1,25 @@
+/**
+ * Config used when transposing a Grid
+ */
 export interface TransposeConfig {
+    /**
+     * Column to use to do transposition
+     * @defaultValue Primary Key Column
+     */
     transposedColumnId?: string;
+    /**
+     * Hide the Transposed Column
+     * @defaultValue true
+     */
     hideTransposedColumn?: boolean;
+    /**
+     * Only show curerntly visible Columns
+     * @defaultValue false
+     */
     visibleColumns?: boolean;
+    /**
+      * Only show curerntly visible Rows
+      * @defaultValue false
+      */
     visibleRows?: boolean;
 }

package/src/PredefinedConfig/LayoutState.d.ts

@@ -84,7 +84,7 @@ export interface Layout extends AdaptableObject {
      */
     SuppressAggFuncInHeader?: boolean;
     /**
-     * Row summaries
+     * Row Summaries - Pinned Rows that display Aggregation Info for a whole column
      */
     RowSummaries?: RowSummary[];
 }

package/src/Strategy/CellSummaryModule.js

@@ -91,7 +91,8 @@ export class CellSummaryModule extends AdaptableModuleBase {
             const handleExpression = (functionName) => {
                 const columnId = selectedCellInfo.columns[0].columnId;
                 const rowNodes = selectedCellInfo.gridCells.map((gc) => gc.rowNode);
-                return this.api.internalApi.getAdaptableInstance().SummaryService.evaluateExpressionValue({
+                return this.api.internalApi
+                    .getSummaryService().evaluateExpressionValue({
                     expression: {
                         function: functionName,
                     },

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -328,7 +328,7 @@ export const aggregatedScalarExpressionFunctions = {
         handler(args, context) {
             const modeColumnParameter = extractColumnParameter('mode', args);
             const modeColumnName = modeColumnParameter.value;
-            validateColumnType(modeColumnName, ['Number'], 'mode', context.adaptableApi);
+            validateColumnType(modeColumnName, ['Number', 'String'], 'mode', context.adaptableApi);
             const groupByParameter = extractParameter('MODE', 'operand', ['GROUP_BY'], args, {
                 isOptional: true,
             });
@@ -342,7 +342,10 @@ export const aggregatedScalarExpressionFunctions = {
                             reducer: (aggregatedValue, rowValue, rowNode) => {
                                 var _a;
                                 if (typeof rowValue !== 'number' && typeof rowValue !== 'string') {
-                                    return;
+                                    return aggregatedValue;
+                                }
+                                if (!aggregatedValue) {
+                                    return new Map();
                                 }
                                 aggregatedValue.set(rowValue, ((_a = aggregatedValue.get(rowValue)) !== null && _a !== void 0 ? _a : 0) + 1);
                                 return aggregatedValue;

package/src/Utilities/Services/Interface/ISummaryService.d.ts

@@ -0,0 +1,17 @@
+import { IAdaptableService } from './IAdaptableService';
+import { AdaptableModule } from '../../../PredefinedConfig/Common/Types';
+import { IRowNode } from '@ag-grid-community/core/dist/esm/es6/interfaces/iRowNode';
+import { AggregatedScalarLiveValue } from '../AggregatedScalarLiveValue';
+export declare const summarySupportedExpressions: readonly ["SUM", "AVG", "MIN", "MAX", "COUNT", "MEDIAN", "MODE", "DISTINCT", "ONLY", "STD_DEVIATION"];
+export type SummaryConfig = {
+    expression: {
+        function: SummarySupportedExpression;
+    };
+    columnId: string;
+    getRowNodes?: () => IRowNode[];
+};
+export type SummarySupportedExpression = (typeof summarySupportedExpressions)[number];
+export interface ISummaryService extends IAdaptableService {
+    evaluateExpressionValue(config: SummaryConfig, moduleId: AdaptableModule): any;
+    evaluateScalarLiveValue(config: SummaryConfig, moduleId: AdaptableModule): AggregatedScalarLiveValue;
+}

package/src/Utilities/Services/Interface/ISummaryService.js

@@ -0,0 +1,12 @@
+export const summarySupportedExpressions = [
+    'SUM',
+    'AVG',
+    'MIN',
+    'MAX',
+    'COUNT',
+    'MEDIAN',
+    'MODE',
+    'DISTINCT',
+    'ONLY',
+    'STD_DEVIATION',
+];

package/src/Utilities/Services/SummaryService.d.ts

@@ -1,19 +1,10 @@
-import { IRowNode } from '@ag-grid-community/core';
 import { AdaptableApi, AdaptableModule } from '../../types';
 import { AggregatedScalarLiveValue } from './AggregatedScalarLiveValue';
-export declare const summarySupportedExpressions: readonly ["SUM", "AVG", "MIN", "MAX", "COUNT", "MEDIAN", "MODE", "DISTINCT", "ONLY", "STD_DEVIATION"];
-export type SummarySupportedExpression = (typeof summarySupportedExpressions)[number];
-export type SumaryConfig = {
-    expression: {
-        function: SummarySupportedExpression;
-    };
-    columnId: string;
-    getRowNodes?: () => IRowNode[];
-};
-export declare class SummaryService {
+import { ISummaryService, SummaryConfig } from './Interface/ISummaryService';
+export declare class SummaryService implements ISummaryService {
     private adaptableApi;
     constructor(adaptableApi: AdaptableApi);
-    evaluateExpressionValue(config: SumaryConfig, moduleId: AdaptableModule): any;
-    evaluateScalarLiveValue(config: SumaryConfig, moduleId: AdaptableModule): AggregatedScalarLiveValue;
+    evaluateExpressionValue(config: SummaryConfig, moduleId: AdaptableModule): any;
+    evaluateScalarLiveValue(config: SummaryConfig, moduleId: AdaptableModule): AggregatedScalarLiveValue;
     destroy(): void;
 }

package/src/Utilities/Services/SummaryService.js

@@ -1,16 +1,4 @@
 import { AggregatedScalarLiveValue } from './AggregatedScalarLiveValue';
-export const summarySupportedExpressions = [
-    'SUM',
-    'AVG',
-    'MIN',
-    'MAX',
-    'COUNT',
-    'MEDIAN',
-    'MODE',
-    'DISTINCT',
-    'ONLY',
-    'STD_DEVIATION',
-];
 export class SummaryService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;

package/src/View/Layout/Wizard/LayoutWizard.js

@@ -108,13 +108,6 @@ export const LayoutWizard = (props) => {
                 render: () => (React.createElement(Box, { p: 2, style: { height: '100%' } },
                     React.createElement(RowGroupingSection, { onChange: setLayout }))),
             },
-            {
-                title: 'Row Summaries',
-                details: 'Configure Row Summaries',
-                renderSummary: () => React.createElement(RowGroupingSectionSummary, null),
-                render: () => (React.createElement(Box, { p: 2, style: { height: '100%' } },
-                    React.createElement(RowSummarySection, { onChange: setLayout }))),
-            },
             {
                 title: 'Aggregations',
                 isVisible: () => layoutSupportedFeatures.AggregationColumns,
@@ -124,6 +117,13 @@ export const LayoutWizard = (props) => {
                 render: () => (React.createElement(Box, { p: 2, style: { height: '100%' } },
                     React.createElement(AggregationsSection, { onChange: setLayout }))),
             },
+            {
+                title: 'Row Summaries',
+                details: 'Configure Row Summaries',
+                renderSummary: () => React.createElement(RowGroupingSectionSummary, null),
+                render: () => (React.createElement(Box, { p: 2, style: { height: '100%' } },
+                    React.createElement(RowSummarySection, { onChange: setLayout }))),
+            },
             {
                 title: 'Sort',
                 isVisible: () => layoutSupportedFeatures.ColumnSorts,

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

@@ -8,7 +8,7 @@ import { Tabs } from '../../../../components/Tabs';
 import { Tag } from '../../../../components/Tag';
 import { mapColumnDataTypeToExpressionFunctionType } from '../../../../Utilities/adaptableQlUtils';
 import { LayoutModuleId } from '../../../../Utilities/Constants/ModuleConstants';
-import { summarySupportedExpressions } from '../../../../Utilities/Services/SummaryService';
+import { summarySupportedExpressions } from '../../../../Utilities/Services/Interface/ISummaryService';
 import { sortWithOrderArray } from '../../../../Utilities/sortWithOrder';
 import { useAdaptable } from '../../../AdaptableContext';
 import { ValueSelector } from '../../../Components/ValueSelector';
@@ -112,6 +112,7 @@ const RowSummaryEditor = ({ rowSummary, onChange, availableScalarExpressions, on
                     } })))));
 };
 export const RowSummarySection = (props) => {
+    var _a;
     const adaptable = useAdaptable();
     const { data: layout } = useOnePageAdaptableWizardContext();
     const availableScalarExpressions = React.useMemo(() => {
@@ -125,8 +126,17 @@ export const RowSummarySection = (props) => {
             React.createElement("div", null,
                 React.createElement(Flex, { mb: 1 },
                     React.createElement(Flex, { flex: 1 }),
-                    React.createElement(SimpleButton, { icon: "plus" }, "Add Row Summary")),
-                layout.RowSummaries.map((rowSummary, index) => {
+                    React.createElement(SimpleButton, { onClick: () => {
+                            var _a;
+                            props.onChange(Object.assign(Object.assign({}, layout), { RowSummaries: [
+                                    ...((_a = layout.RowSummaries) !== null && _a !== void 0 ? _a : []),
+                                    {
+                                        Position: 'Top',
+                                        ColumnsMap: {},
+                                    },
+                                ] }));
+                        }, icon: "plus" }, "Add Row Summary")),
+                ((_a = layout.RowSummaries) !== null && _a !== void 0 ? _a : []).map((rowSummary, index) => {
                     return (React.createElement(RowSummaryEditor, { key: index, onDelete: () => {
                             const newSummaries = [...layout.RowSummaries];
                             newSummaries.splice(index, 1);

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -26,7 +26,7 @@ import { RenderReactRootFn } from '../renderReactRoot';
 import { AgGridOptionsService } from './AgGridOptionsService';
 import { AgGridColumnAdapter } from './AgGridColumnAdapter';
 import { RowEditService } from '../Utilities/Services/RowEditService';
-import { SummaryService } from '../Utilities/Services/SummaryService';
+import { ISummaryService } from '../Utilities/Services/Interface/ISummaryService';
 export type AdaptableVariant = 'vanilla' | 'react' | 'angular';
 export type AdaptableLifecycleState = 'initial' | 'preprocessOptions' | 'initAdaptableState' | 'setupAgGrid' | 'initAgGrid' | 'available' | 'ready' | 'preDestroyed';
 type RenderAgGridFrameworkComponentResult = false | GridApi;
@@ -82,7 +82,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     RowEditService: RowEditService;
     Fdc3Service: Fdc3Service;
     CellPopupService: CellPopupService;
-    SummaryService: SummaryService;
+    SummaryService: ISummaryService;
     private LicenseService;
     private ChartingService;
     private ThemeService;

package/src/agGrid/AdaptableAgGrid.js

@@ -1139,7 +1139,9 @@ export class AdaptableAgGrid {
         const allAgGridColDefIds = allAgGridFlattenedColDefs.map((colDef) => colDef.colId);
         const getColDef = (colId) => allAgGridFlattenedColDefs.find((colDef) => colDef.colId === colId);
         agGridState.columnVisibility = {
-            hiddenColIds: allAgGridColDefIds.filter((colDefId) => { var _a; return !((_a = currentLayout.Columns) === null || _a === void 0 ? void 0 : _a.includes(colDefId)); }),
+            hiddenColIds: allAgGridFlattenedColDefs
+                .filter((colDef) => { var _a; return !((_a = currentLayout.Columns) === null || _a === void 0 ? void 0 : _a.includes(colDef.colId)) || colDef.hide || colDef.initialHide; })
+                .map((colDef) => colDef.colId),
         };
         agGridState.columnOrder = {
             orderedColIds: sortWithOrderArray(allAgGridColDefIds, currentLayout.Columns || [], {

package/src/agGrid/AgGridMenuAdapter.js

@@ -213,18 +213,22 @@ export class AgGridMenuAdapter {
                 };
             }
             else {
-                return adaptableMenuItems.find((menuItem) => menuItem.module === moduleOrGroup);
+                return adaptableMenuItems.filter((menuItem) => menuItem.module === moduleOrGroup);
             }
         })
-            .filter((menuItem) => {
-            if (!menuItem) {
+            .filter((menuItems) => {
+            if (!menuItems.length) {
                 return false;
             }
-            if (menuItem.subItems && menuItem.subItems.length === 0) {
-                return false;
+            if (menuItems.length === 1) {
+                const singleMenuItem = menuItems[0];
+                if (singleMenuItem.subItems && singleMenuItem.subItems.length === 0) {
+                    return false;
+                }
             }
             return true;
-        });
+        })
+            .flat();
     }
     mapAdaptableMenuItemToSystemMenuItems(adaptableMenuItems) {
         return (adaptableMenuItems !== null && adaptableMenuItems !== void 0 ? adaptableMenuItems : []).map((menuItem) => {

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: 1711118620968 || Date.now(),
-    VERSION: "18.0.0-canary.13" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1711463137655 || Date.now(),
+    VERSION: "18.0.0-canary.15" || '--current-version--',
 };

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

@@ -4771,6 +4771,19 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
+        props: ({
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt?: undefined;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref: string;
+        })[];
     };
     RowSummaryPosition: {
         name: string;
@@ -5358,6 +5371,18 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    TransposeConfig: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            defVal: string;
+        }[];
+    };
     UIControlConfig: {
         name: string;
         kind: string;