@adaptabletools/adaptable-cjs 18.0.0-canary.25 → 18.0.0-canary.26

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -334,7 +334,7 @@ exports.aggregatedScalarExpressionFunctions = {
         handler(args, context) {
             const modeColumnParameter = (0, expressionFunctionUtils_1.extractColumnParameter)('mode', args);
             const modeColumnName = modeColumnParameter.value;
-            (0, expressionFunctionUtils_1.validateColumnType)(modeColumnName, ['Number', 'String'], 'mode', context.adaptableApi);
+            (0, expressionFunctionUtils_1.validateColumnType)(modeColumnName, ['Number', 'String', 'Date'], 'mode', context.adaptableApi);
             const groupByParameter = (0, expressionFunctionUtils_1.extractParameter)('MODE', 'operand', ['GROUP_BY'], args, {
                 isOptional: true,
             });
@@ -394,7 +394,7 @@ exports.aggregatedScalarExpressionFunctions = {
         ],
         examples: ['MODE([colA])', 'MODE([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
-        inputs: [['number'], ['text']],
+        inputs: [['number'], ['text'], ['date']],
     },
     DISTINCT: {
         handler(args, context) {
@@ -442,7 +442,7 @@ exports.aggregatedScalarExpressionFunctions = {
         ],
         examples: ['DISTINCT([colA])', 'DISTINCT([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
-        inputs: [['number'], ['text']],
+        inputs: [['number'], ['text'], ['date']],
     },
     ONLY: {
         handler(args, context) {
@@ -492,7 +492,7 @@ exports.aggregatedScalarExpressionFunctions = {
         ],
         examples: ['ONLY([colA])', 'ONLY([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
-        inputs: [['number'], ['text']],
+        inputs: [['number'], ['text'], ['date']],
     },
     STD_DEVIATION: {
         handler(args, context) {
@@ -853,7 +853,7 @@ exports.aggregatedScalarExpressionFunctions = {
         ],
         examples: ['COUNT([colA])', 'COUNT([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
-        inputs: [['number'], ['text']],
+        inputs: [['number'], ['text'], ['date']],
     },
     OVER: {
         handler(args, context) {
@@ -963,7 +963,7 @@ exports.aggregatedScalarExpressionFunctions = {
             };
             return result;
         },
-        description: 'Aggregates a column over multiple rows by computing the minimum of the column values\nOptionally the aggregation may be computed within provided individual groups',
+        description: 'Aggregates a Date column over multiple rows by computing the oldest of the column values\nOptionally the aggregation may be computed within provided individual groups',
         signatures: [
             'OLDEST( [colName] )',
             'OLDEST( COL(name: string))',
@@ -974,19 +974,19 @@ exports.aggregatedScalarExpressionFunctions = {
         category: 'aggregation',
         inputs: ['date'],
     },
-    YOUNGEST: {
+    NEWEST: {
         handler(args, context) {
-            const minColumnParameter = (0, expressionFunctionUtils_1.extractColumnParameter)('YOUNGEST', args);
+            const minColumnParameter = (0, expressionFunctionUtils_1.extractColumnParameter)('NEWEST', args);
             const minColumnName = minColumnParameter.value;
-            (0, expressionFunctionUtils_1.validateColumnType)(minColumnName, ['Date'], 'YOUNGEST', context.adaptableApi);
-            const groupByParameter = (0, expressionFunctionUtils_1.extractParameter)('YOUNGEST', 'operand', ['GROUP_BY'], args, {
+            (0, expressionFunctionUtils_1.validateColumnType)(minColumnName, ['Date'], 'NEWEST', context.adaptableApi);
+            const groupByParameter = (0, expressionFunctionUtils_1.extractParameter)('NEWEST', 'operand', ['GROUP_BY'], args, {
                 isOptional: true,
             });
             const aggregationExpressionEvaluation = {
                 aggregationParams: {
                     reducers: {
-                        YOUNGEST: {
-                            name: 'YOUNGEST',
+                        NEWEST: {
+                            name: 'NEWEST',
                             field: minColumnName,
                             initialValue: null,
                             reducer: (minValue, rowValue) => {
@@ -1016,20 +1016,20 @@ exports.aggregatedScalarExpressionFunctions = {
             };
             addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
             const result = {
-                name: 'YOUNGEST',
+                name: 'NEWEST',
                 type: 'aggregationScalar',
                 value: aggregationExpressionEvaluation,
             };
             return result;
         },
-        description: 'Aggregates a column over multiple rows by computing the minimum of the column values\nOptionally the aggregation may be computed within provided individual groups',
+        description: 'Aggregates a Date column over multiple rows by computing the most recent of the column values\nOptionally the aggregation may be computed within provided individual groups',
         signatures: [
-            'YOUNGEST( [colName] )',
-            'YOUNGEST( COL(name: string))',
-            'YOUNGEST( [colNameA], GROUP_BY( [colNameB] ))',
-            'YOUNGEST( COL(nameA: string), GROUP_BY( COL(nameB: string)))',
+            'NEWEST( [colName] )',
+            'NEWEST( COL(name: string))',
+            'NEWEST( [colNameA], GROUP_BY( [colNameB] ))',
+            'NEWEST( COL(nameA: string), GROUP_BY( COL(nameB: string)))',
         ],
-        examples: ['YOUNGEST([colA])', 'YOUNGEST([colA], GROUP_BY([colB]))'],
+        examples: ['NEWEST([colA])', 'NEWEST([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
         inputs: ['date'],
     },

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -97,6 +97,7 @@ function addUuidAndSource(adaptableObject) {
 }
 exports.addUuidAndSource = addUuidAndSource;
 function removeUuidAndSource(adaptableObject) {
+    const clonedObject = structuredClone(adaptableObject);
     const sanitiseObject = (object) => {
         for (const key in object) {
             if (key === 'Source' || key === 'Uuid') {
@@ -110,8 +111,8 @@ function removeUuidAndSource(adaptableObject) {
             }
         }
     };
-    sanitiseObject(adaptableObject);
-    return adaptableObject;
+    sanitiseObject(clonedObject);
+    return clonedObject;
 }
 exports.removeUuidAndSource = removeUuidAndSource;
 exports.AdaptableHelper = {

package/src/Utilities/ObjectFactory.js

@@ -313,6 +313,8 @@ function CreateEmptyCellSummmary() {
         Max: undefined,
         Min: undefined,
         Count: undefined,
+        Newest: undefined,
+        Oldest: undefined,
         Std_Deviation: undefined,
         Only: undefined,
     };

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

@@ -150,6 +150,7 @@ const LayoutWizard = (props) => {
                 title: 'Row Summaries',
                 details: 'Configure Row Summaries',
                 renderSummary: () => React.createElement(RowGroupingSection_1.RowGroupingSectionSummary, null),
+                isVisible: () => layoutSupportedFeatures.RowSummaries,
                 render: () => (React.createElement(rebass_1.Box, { p: 2, style: { height: '100%' } },
                     React.createElement(RowSummarySection_1.RowSummarySection, { onChange: setLayout }))),
             },

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

@@ -16,7 +16,23 @@ const RowGroupingSectionSummary = () => {
     var _a;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    return (React.createElement(rebass_1.Box, null, ((_a = layout.RowGroupedColumns) === null || _a === void 0 ? void 0 : _a.length) ? (layout.RowGroupedColumns.map((columnId) => (React.createElement(Tag_1.Tag, { mr: 1, key: columnId }, adaptable.api.columnApi.getFriendlyNameForColumnId(columnId))))) : (React.createElement(Tag_1.Tag, null, "No Row Grouping"))));
+    return (React.createElement(rebass_1.Box, null, ((_a = layout.RowSummaries) === null || _a === void 0 ? void 0 : _a.length) ? (layout === null || layout === void 0 ? void 0 : layout.RowSummaries.map((rowSummary, index) => {
+        var _a;
+        const columns = Object.entries((_a = rowSummary.ColumnsMap) !== null && _a !== void 0 ? _a : {})
+            .map(([columnId, expression]) => {
+            if (columnId === 'Source' || columnId === 'Uuid') {
+                return '';
+            }
+            return `${expression}(${adaptable.api.columnApi.getFriendlyNameForColumnId(columnId)})`;
+        })
+            .filter(Boolean)
+            .join(', ');
+        return (React.createElement(rebass_1.Box, { mb: 2 },
+            React.createElement(Tag_1.Tag, { key: index },
+                rowSummary.Position,
+                " ",
+                columns)));
+    })) : (React.createElement(Tag_1.Tag, null, "No Row Summaries"))));
 };
 exports.RowGroupingSectionSummary = RowGroupingSectionSummary;
 const RowGroupingSection = (props) => {

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

@@ -37,13 +37,13 @@ const areSummaryRowsValid = (layout) => {
 exports.areSummaryRowsValid = areSummaryRowsValid;
 const getAvailableExpressionsForColumnType = (columnType, availableScalarExpressions) => {
     const inputType = (0, adaptableQlUtils_1.mapColumnDataTypeToExpressionFunctionType)(columnType);
-    return Object.entries(availableScalarExpressions !== null && availableScalarExpressions !== void 0 ? availableScalarExpressions : {})
-        .map(([expression, expressionDef]) => {
+    // Object.entries(availableScalarExpressions ?? {})
+    return RowSummary_1.summarySupportedExpressions
+        .filter((expression) => availableScalarExpressions[expression])
+        .map((expression) => {
         var _a, _b;
+        const expressionDef = availableScalarExpressions[expression];
         let firstArg = null;
-        if (!RowSummary_1.summarySupportedExpressions.includes(expression)) {
-            return null;
-        }
         if (Array.isArray((_a = expressionDef === null || expressionDef === void 0 ? void 0 : expressionDef.inputs) === null || _a === void 0 ? void 0 : _a[0])) {
             // @ts-ignore
             firstArg = (_b = expressionDef.inputs.find((input) => input.includes(inputType))) === null || _b === void 0 ? void 0 : _b[0];

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -287,7 +287,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private getAgGridLightThemeName;
     applyAdaptableTheme(theme: AdaptableTheme | string): void;
     setRowGroupColumns(columnIds: string[]): void;
-    getAgGridAllGridColumns(): Column<any>[];
+    getAllGridColumns(): Column<any>[];
     clearRowGroupColumns(): void;
     expandAllRowGroups(): void;
     closeAllRowGroups(): void;

package/src/agGrid/AdaptableAgGrid.js

@@ -2760,7 +2760,7 @@ class AdaptableAgGrid {
     setRowGroupColumns(columnIds) {
         this.agGridAdapter.getAgGridApi().setRowGroupColumns(columnIds);
     }
-    getAgGridAllGridColumns() {
+    getAllGridColumns() {
         return this.agGridAdapter.getAgGridApi().getAllGridColumns();
     }
     clearRowGroupColumns() {

package/src/agGrid/AgGridAdapter.d.ts

@@ -1,9 +1,8 @@
-import { ColDef, Column, GridApi, GridOptions, IRowNode, ManagedGridOptionKey, ManagedGridOptions, Module, ModuleNames } from '@ag-grid-community/core';
+import { ColDef, ColGroupDef, Column, GridApi, GridOptions, IRowNode, ManagedGridOptionKey, ManagedGridOptions, Module, ModuleNames } from '@ag-grid-community/core';
 import { AdaptableAgGrid } from './AdaptableAgGrid';
 import { AdaptableColumn, AdaptableColumnGroup } from '../PredefinedConfig/Common/AdaptableColumn';
 import { SelectedCellInfo } from '../PredefinedConfig/Selection/SelectedCellInfo';
 import { SelectedRowInfo } from '../PredefinedConfig/Selection/SelectedRowInfo';
-import { ColGroupDef } from '@ag-grid-community/core/dist/esm/es6/entities/colDef';
 export declare class AgGridAdapter {
     private adaptableInstance;
     private DANGER_USE_GETTER_gridApi;

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.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: 1712327561436 || Date.now(),
-    VERSION: "18.0.0-canary.25" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1712574295706 || Date.now(),
+    VERSION: "18.0.0-canary.26" || '--current-version--',
 };

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

@@ -1590,11 +1590,17 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
-        props: {
+        props: ({
             name: string;
             kind: string;
             desc: string;
-        }[];
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            ref: string;
+        })[];
     };
     CellSummaryOptions: {
         name: string;