@adaptabletools/adaptable-cjs 18.0.0-canary.16 → 18.0.0-canary.17

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.aggregatedScalarExpressionFunctionNames = exports.aggregatedScalarExpressionFunctions = exports.quantileAggregatedExpressionFunctions = exports.cumulativeAggregatedExpressionFunctions = exports.aggregatedExpressionFunctions = void 0;
-const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
+const tslib_1 = require("tslib");
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
-const TypeExtensions_1 = require("../Extensions/TypeExtensions");
 const ArrayExtensions_1 = require("../Extensions/ArrayExtensions");
+const TypeExtensions_1 = require("../Extensions/TypeExtensions");
+const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
+const isAfter_1 = tslib_1.__importDefault(require("date-fns/isAfter"));
+const DateHelper_1 = require("../Helpers/DateHelper");
 exports.aggregatedExpressionFunctions = [
     'SUM',
     'PERCENTAGE',
@@ -354,6 +357,7 @@ exports.aggregatedScalarExpressionFunctions = {
                                 return aggregatedValue;
                             },
                             done: (aggregatedValue) => {
+                                var _a;
                                 const sorted = [...aggregatedValue.entries()].sort(([aVal, aFreq], [bVal, bFreq]) => {
                                     if (aFreq < bFreq) {
                                         return 1;
@@ -365,7 +369,7 @@ exports.aggregatedScalarExpressionFunctions = {
                                         return aVal === bVal ? 0 : 1;
                                     }
                                 });
-                                return sorted[0][0];
+                                return (_a = sorted === null || sorted === void 0 ? void 0 : sorted[0]) === null || _a === void 0 ? void 0 : _a[0];
                             },
                         },
                     },
@@ -911,6 +915,124 @@ exports.aggregatedScalarExpressionFunctions = {
         examples: ['[col1]', 'COL("col1")'],
         category: 'special',
     },
+    OLDEST: {
+        handler(args, context) {
+            const minColumnParameter = (0, expressionFunctionUtils_1.extractColumnParameter)('OLDEST', args);
+            const minColumnName = minColumnParameter.value;
+            (0, expressionFunctionUtils_1.validateColumnType)(minColumnName, ['Date'], 'OLDEST', context.adaptableApi);
+            const groupByParameter = (0, expressionFunctionUtils_1.extractParameter)('OLDEST', 'operand', ['GROUP_BY'], args, {
+                isOptional: true,
+            });
+            const aggregationExpressionEvaluation = {
+                aggregationParams: {
+                    reducers: {
+                        OLDEST: {
+                            name: 'OLDEST',
+                            field: minColumnName,
+                            initialValue: null,
+                            reducer: (minValue, rowValue) => {
+                                if (!minValue) {
+                                    return rowValue;
+                                }
+                                if (!rowValue) {
+                                    return minValue;
+                                }
+                                if ((0, isAfter_1.default)((0, DateHelper_1.parseDateValue)(minValue), (0, DateHelper_1.parseDateValue)(rowValue))) {
+                                    return rowValue;
+                                }
+                                else {
+                                    return minValue;
+                                }
+                            },
+                            done: (minValue, arr) => {
+                                if (minValue !== null) {
+                                    return minValue;
+                                }
+                            },
+                        },
+                    },
+                },
+                rowFilterFn: context.filterFn,
+                getRowNodes: context.getRowNodes,
+            };
+            addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
+            const result = {
+                name: 'OLDEST',
+                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',
+        signatures: [
+            'OLDEST( [colName] )',
+            'OLDEST( COL(name: string))',
+            'OLDEST( [colNameA], GROUP_BY( [colNameB] ))',
+            'OLDEST( COL(nameA: string), GROUP_BY( COL(nameB: string)))',
+        ],
+        examples: ['OLDEST([colA])', 'OLDEST([colA], GROUP_BY([colB]))'],
+        category: 'aggregation',
+        inputs: ['date'],
+    },
+    YOUNGEST: {
+        handler(args, context) {
+            const minColumnParameter = (0, expressionFunctionUtils_1.extractColumnParameter)('YOUNGEST', 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, {
+                isOptional: true,
+            });
+            const aggregationExpressionEvaluation = {
+                aggregationParams: {
+                    reducers: {
+                        YOUNGEST: {
+                            name: 'YOUNGEST',
+                            field: minColumnName,
+                            initialValue: null,
+                            reducer: (minValue, rowValue) => {
+                                if (!minValue) {
+                                    return rowValue;
+                                }
+                                if (!rowValue) {
+                                    return minValue;
+                                }
+                                if ((0, isAfter_1.default)((0, DateHelper_1.parseDateValue)(minValue), (0, DateHelper_1.parseDateValue)(rowValue))) {
+                                    return minValue;
+                                }
+                                else {
+                                    return rowValue;
+                                }
+                            },
+                            done: (minValue, arr) => {
+                                if (minValue !== null) {
+                                    return minValue;
+                                }
+                            },
+                        },
+                    },
+                },
+                rowFilterFn: context.filterFn,
+                getRowNodes: context.getRowNodes,
+            };
+            addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
+            const result = {
+                name: 'YOUNGEST',
+                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',
+        signatures: [
+            'YOUNGEST( [colName] )',
+            'YOUNGEST( COL(name: string))',
+            'YOUNGEST( [colNameA], GROUP_BY( [colNameB] ))',
+            'YOUNGEST( COL(nameA: string), GROUP_BY( COL(nameB: string)))',
+        ],
+        examples: ['YOUNGEST([colA])', 'YOUNGEST([colA], GROUP_BY([colB]))'],
+        category: 'aggregation',
+        inputs: ['date'],
+    },
 };
 const mapAggregationToCumulation = (aggregationParameter, overColumnParameter, context) => {
     const aggregationEvaluation = aggregationParameter.value;

package/src/Utilities/MenuItem.d.ts

@@ -1,10 +1,11 @@
 import * as Redux from 'redux';
 import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, AdaptableMenuItemName } from '../PredefinedConfig/Common/Menu';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { AdaptableIcon, AdaptableSystemIconName } from '../PredefinedConfig/Common/AdaptableIcon';
 export declare class MenuItemDoReduxAction implements AdaptableMenuItem {
-    constructor(label: string, module: AdaptableModule, reduxAction: Redux.Action, icon: AdaptableSystemIconName, isVisible: boolean);
+    constructor(name: AdaptableMenuItemName, label: string, module: AdaptableModule, reduxAction: Redux.Action, icon: AdaptableSystemIconName, isVisible: boolean);
+    name: AdaptableMenuItemName;
     reduxAction: Redux.Action;
     label: string;
     module: AdaptableModule;
@@ -12,7 +13,8 @@ export declare class MenuItemDoReduxAction implements AdaptableMenuItem {
     icon: AdaptableIcon;
 }
 export declare class MenuItemDoClickFunction implements AdaptableMenuItem {
-    constructor(label: string, module: AdaptableModule, clickFunction: () => void, icon: AdaptableSystemIconName, isVisible: boolean);
+    constructor(name: AdaptableMenuItemName, label: string, module: AdaptableModule, clickFunction: () => void, icon: AdaptableSystemIconName, isVisible: boolean);
+    name: AdaptableMenuItemName;
     onClick: () => void;
     label: string;
     module: AdaptableModule;
@@ -20,7 +22,8 @@ export declare class MenuItemDoClickFunction implements AdaptableMenuItem {
     icon: AdaptableIcon;
 }
 export declare class MenuItemShowPopup implements AdaptableMenuItem {
-    constructor(label: string, module: AdaptableModule, componentName: string, icon: AdaptableSystemIconName, isVisible: boolean, popupParams?: ModuleParams);
+    constructor(name: AdaptableMenuItemName, label: string, module: AdaptableModule, componentName: string, icon: AdaptableSystemIconName, isVisible: boolean, popupParams?: ModuleParams);
+    name: AdaptableMenuItemName;
     reduxAction: Redux.Action;
     label: string;
     module: AdaptableModule;

package/src/Utilities/MenuItem.js

@@ -5,7 +5,8 @@ const tslib_1 = require("tslib");
 const PopupRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/PopupRedux"));
 // A menu item which performs a Redux Action when it is clicke
 class MenuItemDoReduxAction {
-    constructor(label, module, reduxAction, icon, isVisible) {
+    constructor(name, label, module, reduxAction, icon, isVisible) {
+        this.name = name;
         this.label = label;
         this.module = module;
         this.isVisible = isVisible;
@@ -17,7 +18,8 @@ class MenuItemDoReduxAction {
 }
 exports.MenuItemDoReduxAction = MenuItemDoReduxAction;
 class MenuItemDoClickFunction {
-    constructor(label, module, clickFunction, icon, isVisible) {
+    constructor(name, label, module, clickFunction, icon, isVisible) {
+        this.name = name;
         this.label = label;
         this.module = module;
         this.isVisible = isVisible;
@@ -30,7 +32,8 @@ class MenuItemDoClickFunction {
 exports.MenuItemDoClickFunction = MenuItemDoClickFunction;
 // A menu item which shows a popup screen when it is clieked
 class MenuItemShowPopup {
-    constructor(label, module, componentName, icon, isVisible, popupParams) {
+    constructor(name, label, module, componentName, icon, isVisible, popupParams) {
+        this.name = name;
         this.label = label;
         this.module = module;
         this.isVisible = isVisible;

package/src/Utilities/Services/LicenseService/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../../Redux/ActionsReducers/SystemRedux"),t=require("../../../Redux/ActionsReducers/PopupRedux"),s=e.__importDefault(require("../../ObjectFactory")),o=e.__importDefault(require("lodash/clamp")),i=require("../../Constants/DocumentationLinkConstants"),n=require("../../license/decode"),r=require("./shouldLogThankYouMessage"),l="sales@adaptabletools.com",c=10,d=864e5;var p;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(p=exports.LicenseValidityType||(exports.LicenseValidityType={}));const h=/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g,E=/(https):\/\/\S+(\.csb\.app)/g,I=/(https):\/\/\S+(\.adaptabletools\.com)/g,_=()=>"undefined"!=typeof window?window.location.origin:"",O=()=>{const e=_();console.log("isInsideSandpack",e);const[a,t,s]=Array.from(h.exec(e)||[]);return"https"===t&&"sandpack.codesandbox.io"===s},u=()=>{const e=_();console.log("isInsideSandbox",e);const[a,t,s]=Array.from(E.exec(e)||[]);return"https"===t&&".csb.app"===s},A=()=>{const e=_();console.log("isDemoApp",e);const[a,t,s]=Array.from(I.exec(e)||[]);return"https"===t&&".adaptabletools.com"===s};class N{constructor(e,a,t){this.adaptable=e,this.licenseKey=a,this.packageDetails=t,this.adaptable=e,this.adaptable.api.eventApi.on("AdaptableReady",(()=>{requestAnimationFrame((()=>{this.init()}))}))}init(){let e=null;if(this.licenseKey)try{e=(0,n.decode)(this.licenseKey)}catch(a){e=a}O()||u()||A()||this.handleLicenseValidation(e,this.getValidityType(e,this.packageDetails))}getValidityType(e,a){if(!e)return p.NO_LICENSE;if(e instanceof Error)return p.INVALID_LICENSE;const t=new Date(a.publishedAt),s=new Date(e.end),o=s<new Date,i=e.trial;let n=null;return n=o?s>t?i?p.NON_PRODUCTION_EXPIRED_IN_SCOPE:p.COMMERCIAL_EXPIRED_IN_SCOPE:i?p.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:p.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:i?p.NON_PRODUCTION_VALID:p.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){var t;const s=new Date;s.setHours(0,0,0,0);let p=0;e instanceof Error||!(null==e?void 0:e.end)||(p=Math.floor(((null===(t=null==e?void 0:e.end)||void 0===t?void 0:t.getTime())-s.getTime())/d),p=(0,o.default)(p,0,1/0));let h="",E="";!e||e instanceof Error||!e.appName||e.appName==n.GENERIC_APP_NAME||(h=e.appName,E=" for application [APP_NAME]");const I=(e,a=i.LicenseDocsLink,t=l,s=p,o=h)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",o).replace("[DAYS]",`${s}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(I("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":this.adaptable.logger.consoleLogByMessageType(I("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":this.adaptable.logger.consoleLogByMessageType(I("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(I("This AdapTable trial license has now expired. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Warning"),this.showWatermark("AdapTable License has expired");break;case"COMMERCIAL_VALID":if(p<=c)this.adaptable.logger.consoleLogByMessageType(I(`This AdapTable license${E} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{(0,r.shouldLogThankYouMessage)()&&this.adaptable.logger.consoleLogByMessageType(I(`Thank you for using a valid AdapTable license${E}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(I(`This AdapTable license${E} has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)`),"Warning");break;case"COMMERCIAL_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(I(`This AdapTable license${E} has expired. Adaptable version was published after the license expired. Please contact [EMAIL] if you wish to renew your license.`),"Error"),this.showNotification("Adaptable License has expired"),this.showWatermark("Adaptable License has expired")}}showNotification(e){this.adaptable.api.internalApi.dispatchReduxAction((0,t.PopupShowAlert)({alertType:"generic",header:"License Error",message:e,alertDefinition:s.default.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction((0,a.SystemLicenseShowWatermark)(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction((0,a.SystemLicenseDisablePersistence)())}destroy(){}}exports.LicenseService=N;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../../Redux/ActionsReducers/SystemRedux"),t=require("../../../Redux/ActionsReducers/PopupRedux"),s=e.__importDefault(require("../../ObjectFactory")),i=e.__importDefault(require("lodash/clamp")),o=require("../../Constants/DocumentationLinkConstants"),n=require("../../license/decode"),r=require("./shouldLogThankYouMessage"),l="sales@adaptabletools.com",c=10,d=864e5;var p;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(p=exports.LicenseValidityType||(exports.LicenseValidityType={}));const h=()=>"undefined"!=typeof window?window.location.origin:"",E=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g.exec(e)||[]);return"https"===t&&"sandpack.codesandbox.io"===s},_=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\S+(\.csb\.app)/g.exec(e)||[]);return"https"===t&&".csb.app"===s},I=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\S+(\.adaptabletools\.com)/g.exec(e)||[]);return"https"===t&&".adaptabletools.com"===s};class O{constructor(e,a,t){this.adaptable=e,this.licenseKey=a,this.packageDetails=t,this.adaptable=e,this.adaptable.api.eventApi.on("AdaptableReady",(()=>{requestAnimationFrame((()=>{this.init()}))}))}init(){let e=null;if(this.licenseKey)try{e=(0,n.decode)(this.licenseKey)}catch(a){e=a}E()||_()||I()||this.handleLicenseValidation(e,this.getValidityType(e,this.packageDetails))}getValidityType(e,a){if(!e)return p.NO_LICENSE;if(e instanceof Error)return p.INVALID_LICENSE;const t=new Date(a.publishedAt),s=new Date(e.end),i=s<new Date,o=e.trial;let n=null;return n=i?s>t?o?p.NON_PRODUCTION_EXPIRED_IN_SCOPE:p.COMMERCIAL_EXPIRED_IN_SCOPE:o?p.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:p.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:o?p.NON_PRODUCTION_VALID:p.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){var t;const s=new Date;s.setHours(0,0,0,0);let p=0;e instanceof Error||!(null==e?void 0:e.end)||(p=Math.floor(((null===(t=null==e?void 0:e.end)||void 0===t?void 0:t.getTime())-s.getTime())/d),p=(0,i.default)(p,0,1/0));let h="",E="";!e||e instanceof Error||!e.appName||e.appName==n.GENERIC_APP_NAME||(h=e.appName,E=" for application [APP_NAME]");const _=(e,a=o.LicenseDocsLink,t=l,s=p,i=h)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",i).replace("[DAYS]",`${s}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(_("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":this.adaptable.logger.consoleLogByMessageType(_("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":this.adaptable.logger.consoleLogByMessageType(_("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(_("This AdapTable trial license has now expired. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Warning"),this.showWatermark("AdapTable License has expired");break;case"COMMERCIAL_VALID":if(p<=c)this.adaptable.logger.consoleLogByMessageType(_(`This AdapTable license${E} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{(0,r.shouldLogThankYouMessage)()&&this.adaptable.logger.consoleLogByMessageType(_(`Thank you for using a valid AdapTable license${E}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(_(`This AdapTable license${E} has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)`),"Warning");break;case"COMMERCIAL_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(_(`This AdapTable license${E} has expired. Adaptable version was published after the license expired. Please contact [EMAIL] if you wish to renew your license.`),"Error"),this.showNotification("Adaptable License has expired"),this.showWatermark("Adaptable License has expired")}}showNotification(e){this.adaptable.api.internalApi.dispatchReduxAction((0,t.PopupShowAlert)({alertType:"generic",header:"License Error",message:e,alertDefinition:s.default.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction((0,a.SystemLicenseShowWatermark)(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction((0,a.SystemLicenseDisablePersistence)())}destroy(){}}exports.LicenseService=O;

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.js

@@ -43,7 +43,7 @@ const AdaptableObjectListItemView = (props) => {
             var _a;
             let labelEl = tag.label;
             if (typeof tag.label === 'function') {
-                labelEl = React.createElement(tag.label, { data: props.abObject });
+                labelEl = React.createElement(tag.label, { key: index, data: props.abObject });
             }
             labelEl = labelEl !== null && labelEl !== void 0 ? labelEl : tag.name;
             return (React.createElement(rebass_1.Flex, { "data-name": tag.name, key: `${index}-${tag.name}`, mb: 2, className: `${baseClassName}__row` },
@@ -135,6 +135,9 @@ const AdaptableObjectListItem = (props) => {
 exports.AdaptableObjectListItem = AdaptableObjectListItem;
 const AdaptableObjectList = (props) => {
     var _a;
-    return (React.createElement("ul", { className: LIST_BASE_CLASS_NAME }, (_a = props === null || props === void 0 ? void 0 : props.items) === null || _a === void 0 ? void 0 : _a.map((item) => (React.createElement(exports.AdaptableObjectListItem, Object.assign({ key: item.abObject.Uuid, data: item, module: props.module }, props.itemProps))))));
+    return (React.createElement("ul", { className: LIST_BASE_CLASS_NAME }, (_a = props === null || props === void 0 ? void 0 : props.items) === null || _a === void 0 ? void 0 : _a.map((item, index) => {
+        var _a;
+        return (React.createElement(exports.AdaptableObjectListItem, Object.assign({ key: (_a = item.abObject.Uuid) !== null && _a !== void 0 ? _a : index, data: item, module: props.module }, props.itemProps)));
+    })));
 };
 exports.AdaptableObjectList = AdaptableObjectList;

package/src/View/Components/FilterForm/QuickFilterForm.js

@@ -152,7 +152,7 @@ class QuickFilterFormComponent extends React.Component {
                 }
             };
             if (predicateInput.type === 'date' && !showDatePicker) {
-                return (React.createElement(AdaptableDateInlineInput_1.AdaptableDateInlineInput, { value: value, onKeyDownCapture: onKeyDownCapture, onChange: (value) => this.changeColumnPredicateInput(value, index) }));
+                return (React.createElement(AdaptableDateInlineInput_1.AdaptableDateInlineInput, { value: value, key: index, onKeyDownCapture: onKeyDownCapture, onChange: (value) => this.changeColumnPredicateInput(value, index) }));
             }
             return (React.createElement(AdaptableInput_1.default, { disabled: this.isFilterDisabled(), key: index, type: predicateInput.type === 'number' ? 'text' : predicateInput.type, 
                 // autoFocus has to be FALSE because if the input receives focus in the init phase,

package/src/View/Components/ValueSelector/index.js

@@ -66,7 +66,7 @@ function ValueSelector(props) {
         const label = !allowReorder ? preparedToLabel(option) : null;
         const reorderable = typeof allowReorder === 'function' ? allowReorder(option) : allowReorder;
         const renderNode = (props, dragHandleProps) => {
-            return (React.createElement(rebass_1.Flex, Object.assign({ className: `${baseClassName}__option`, alignItems: "center", mt: index ? 1 : 0, key: identifier, backgroundColor: 'primary', padding: 2, "data-index": index, "data-id": identifier, "data-name": "option" }, props),
+            return (React.createElement(rebass_1.Flex, Object.assign({ className: `${baseClassName}__option`, alignItems: "center", mt: index ? 1 : 0, key: identifier !== null && identifier !== void 0 ? identifier : index, backgroundColor: 'primary', padding: 2, "data-index": index, "data-id": identifier, "data-name": "option" }, props),
                 React.createElement(rebass_1.Flex, { flex: 1, flexDirection: "row", alignItems: "center" },
                     reorderable ? (React.createElement(rebass_1.Box, Object.assign({ mr: 3 }, dragHandleProps),
                         React.createElement(icons_1.Icon, { name: "drag", style: { cursor: 'grab' } }))) : null,

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

@@ -19,6 +19,7 @@ const SortSection_1 = require("./sections/SortSection");
 const FilterSection_1 = require("./sections/FilterSection");
 const GridFilterSection_1 = require("./sections/GridFilterSection");
 const RowSummarySection_1 = require("./sections/RowSummarySection");
+const RowSummary_1 = require("../../../PredefinedConfig/Common/RowSummary");
 const LayoutWizard = (props) => {
     var _a, _b;
     const dispatch = (0, react_redux_1.useDispatch)();
@@ -107,6 +108,7 @@ const LayoutWizard = (props) => {
             {
                 title: 'Row Groups',
                 isVisible: () => layoutSupportedFeatures.RowGroupedColumns,
+                isValid: RowSummarySection_1.areSummaryRowsValid,
                 details: 'Configure Row Grouping',
                 renderSummary: () => React.createElement(RowGroupingSection_1.RowGroupingSectionSummary, null),
                 render: () => (React.createElement(rebass_1.Box, { p: 2, style: { height: '100%' } },
@@ -119,7 +121,29 @@ const LayoutWizard = (props) => {
                 renderSummary: () => React.createElement(AggregationsSection_1.AggregationsSectionSummary, null),
                 isValid: (data) => (0, AggregationsSection_1.isAggregationsSectionValid)(data),
                 render: () => (React.createElement(rebass_1.Box, { p: 2, style: { height: '100%' } },
-                    React.createElement(AggregationsSection_1.AggregationsSection, { onChange: setLayout }))),
+                    React.createElement(AggregationsSection_1.AggregationsSection, { onChange: (layout) => {
+                            let newLayout = (0, Helper_1.cloneObject)(layout);
+                            // if we do not have an weighted avg col, we need to clear the row summary if one exists
+                            if (newLayout.RowSummaries) {
+                                newLayout.RowSummaries = newLayout.RowSummaries.map((rowSummary) => {
+                                    return Object.assign(Object.assign({}, rowSummary), { ColumnsMap: Object.entries(rowSummary.ColumnsMap).reduce((acc, [columnId, aggFunc]) => {
+                                            if (
+                                            // see if it is weighted avg
+                                            aggFunc === RowSummary_1.WEIGHTED_AVERAGE_AGGREATED_FUNCTION &&
+                                                // see if we have a weight in the agg columns
+                                                newLayout.AggregationColumns[columnId] &&
+                                                (typeof newLayout.AggregationColumns[columnId] !== 'object' ||
+                                                    newLayout.AggregationColumns[columnId].weightColumnId)) {
+                                                // need to remove the row summary
+                                                return acc;
+                                            }
+                                            acc[columnId] = aggFunc;
+                                            return acc;
+                                        }, {}) });
+                                });
+                            }
+                            setLayout(newLayout);
+                        } }))),
             },
             {
                 title: 'Row Summaries',

package/src/View/Layout/Wizard/sections/RowSummarySection.d.ts

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { Layout } from '../../../../../types';
+export declare const areSummaryRowsValid: (layout: Layout) => true | string;
 export declare const RowGroupingSectionSummary: React.FunctionComponent;
 interface RowSummarySectionProps {
     onChange: (data: Layout) => void;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RowSummarySection = exports.RowGroupingSectionSummary = void 0;
+exports.RowSummarySection = exports.RowGroupingSectionSummary = exports.areSummaryRowsValid = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
@@ -10,21 +10,38 @@ const Select_1 = require("../../../../components/Select");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../../components/SimpleButton"));
 const Tabs_1 = require("../../../../components/Tabs");
 const Tag_1 = require("../../../../components/Tag");
+const RowSummary_1 = require("../../../../PredefinedConfig/Common/RowSummary");
 const adaptableQlUtils_1 = require("../../../../Utilities/adaptableQlUtils");
 const ModuleConstants_1 = require("../../../../Utilities/Constants/ModuleConstants");
-const ISummaryService_1 = require("../../../../Utilities/Services/Interface/ISummaryService");
 const sortWithOrder_1 = require("../../../../Utilities/sortWithOrder");
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const ValueSelector_1 = require("../../../Components/ValueSelector");
 const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
 const Utilities_1 = require("./Utilities");
+const areSummaryRowsValid = (layout) => {
+    var _a;
+    if (!layout.RowSummaries)
+        return true;
+    let valid = true;
+    (_a = layout.RowSummaries) === null || _a === void 0 ? void 0 : _a.find((rowSummary) => {
+        var _a;
+        for (const [_, fn] of Object.entries((_a = rowSummary.ColumnsMap) !== null && _a !== void 0 ? _a : {})) {
+            if (!fn) {
+                valid = 'All row summary columns must have an aggregation function.';
+                return true;
+            }
+        }
+    });
+    return valid;
+};
+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]) => {
         var _a, _b;
         let firstArg = null;
-        if (!ISummaryService_1.summarySupportedExpressions.includes(expression)) {
+        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])) {
@@ -58,7 +75,7 @@ const RowSummaryEditor = ({ rowSummary, onChange, availableScalarExpressions, on
             .getColumns()
             .filter((column) => {
             var _a, _b;
-            if (!['Number', 'String'].includes(column.dataType))
+            if (!['Number', 'String', 'Date'].includes(column.dataType))
                 return false;
             return (_b = (_a = layout.Columns) === null || _a === void 0 ? void 0 : _a.includes) === null || _b === void 0 ? void 0 : _b.call(_a, column.columnId);
         })
@@ -101,6 +118,14 @@ const RowSummaryEditor = ({ rowSummary, onChange, availableScalarExpressions, on
                             label: expression,
                             value: expression,
                         }));
+                        // check out if this layout has a aggregation with wighted column
+                        const aggregation = layout.AggregationColumns[column.columnId];
+                        if (aggregation && typeof aggregation === 'object' && aggregation.weightedColumnId) {
+                            expressionOptions.push({
+                                label: 'WEIGHTERD_AVG',
+                                value: RowSummary_1.WEIGHTED_AVERAGE_AGGREATED_FUNCTION,
+                            });
+                        }
                         const expression = rowSummary.ColumnsMap[column.columnId];
                         return (React.createElement(rebass_1.Flex, null,
                             React.createElement(rebass_1.Flex, { mr: 2, alignItems: 'center' }, label),

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -26,7 +26,6 @@ import { RenderReactRootFn } from '../renderReactRoot';
 import { AgGridOptionsService } from './AgGridOptionsService';
 import { AgGridColumnAdapter } from './AgGridColumnAdapter';
 import { RowEditService } from '../Utilities/Services/RowEditService';
-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 +81,6 @@ export declare class AdaptableAgGrid implements IAdaptable {
     RowEditService: RowEditService;
     Fdc3Service: Fdc3Service;
     CellPopupService: CellPopupService;
-    SummaryService: ISummaryService;
     private LicenseService;
     private ChartingService;
     private ThemeService;

package/src/agGrid/AdaptableAgGrid.js

@@ -99,7 +99,6 @@ const AdaptableUpgradeHelper_1 = require("../migration/AdaptableUpgradeHelper");
 const Modal_1 = require("../components/Modal");
 const AdaptableLoadingScreen_1 = require("../View/Components/Popups/AdaptableLoadingScreen");
 const react_1 = require("react");
-const SummaryService_1 = require("../Utilities/Services/SummaryService");
 const AdaptableHelper_1 = require("../Utilities/Helpers/AdaptableHelper");
 const RowNodeProto = core_1.RowNode.prototype;
 const RowNode_dispatchLocalEvent = RowNodeProto.dispatchLocalEvent;
@@ -902,7 +901,7 @@ class AdaptableAgGrid {
          */
         // this will have to go/be heavily extended with https://github.com/AdaptableTools/adaptable/issues/2230
         this.agGridOptionsService.setGridOptionsProperty(gridOptions, 'columnTypes', (original_columnTypes) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             const providedColumnTypes = original_columnTypes || {};
             const gridOptionsColumnTypes = gridOptions.columnTypes || {};
             const patchedColumnTypes = Object.assign(providedColumnTypes, {
@@ -919,6 +918,12 @@ class AdaptableAgGrid {
                 abColDefTupleNumberArray: (_j = gridOptionsColumnTypes.abColDefTupleNumberArray) !== null && _j !== void 0 ? _j : {},
                 abColDefObjectNumberArray: (_k = gridOptionsColumnTypes.abColDefObjectNumberArray) !== null && _k !== void 0 ? _k : {},
             });
+            const customColumnTypes = (_l = this.api.columnApi.getColumnTypes()) !== null && _l !== void 0 ? _l : [];
+            for (const customColumnType of customColumnTypes) {
+                if (!patchedColumnTypes[customColumnType]) {
+                    patchedColumnTypes[customColumnType] = {};
+                }
+            }
             if (patchedColumnTypes.abColDefNumber.cellEditor == undefined) {
                 patchedColumnTypes.abColDefNumber.cellEditor =
                     this.variant === 'react' ? AdaptableNumberEditor_1.ReactAdaptableNumberEditor : AdaptableNumberEditor_1.AdaptableNumberEditor;
@@ -1573,7 +1578,6 @@ class AdaptableAgGrid {
         this.AlertService = new AlertService_1.AlertService(this.api);
         this.TeamSharingService = new TeamSharingService_1.TeamSharingService(this.api);
         this.Fdc3Service = new Fdc3Service_1.Fdc3Service(this.api);
-        this.SummaryService = new SummaryService_1.SummaryService(this.api);
         this.CellPopupService = new CellPopupService_1.CellPopupService(this.api);
         this.RowEditService = new RowEditService_1.RowEditService(this.api);
         this.MetamodelService = new MetamodelService_1.MetamodelService(() => this.api.optionsApi.getAdaptableOptions(), true);

package/src/agGrid/editors/AdaptableNumberEditor/index.d.ts

@@ -6,12 +6,12 @@ import { ICellEditorComp, ICellEditorParams } from '@ag-grid-community/core';
 interface AdaptableNumberCellEditorParams extends ICellEditorParams {
     /**
      * Whether to show the clear button. If `true`, it works together with `cellEditorParams.emptyValue`
-     * @default true
+     * @defaultValue true
      */
     showClearButton: boolean;
     /**
      * Value to set for the cell, when the clear button is pressed
-     * @default '' (empty string)
+     * @defaultValue '' (empty string)
      */
     emptyValue: string;
 }

package/src/agGrid/weightedAverage.d.ts

@@ -1,9 +1,7 @@
 import { IAggFuncParams } from '@ag-grid-community/core';
-import { CellSummaryOperationContext } from '../types';
 export declare const getNumericValue: (input: unknown) => number | null;
 export declare const weightedAverage: (params: IAggFuncParams, columnId: string, weightColumnId: string) => {
     [x: string]: number | (() => number | "");
     toString: () => number | "";
     valueOf: () => number;
 };
-export declare const cellSummaryWeightedAverage: ({ numericColumns, selectedCellInfo, adaptableApi, }: CellSummaryOperationContext) => any;

package/src/agGrid/weightedAverage.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cellSummaryWeightedAverage = exports.weightedAverage = exports.getNumericValue = void 0;
+exports.weightedAverage = exports.getNumericValue = void 0;
 const tslib_1 = require("tslib");
-const FormatHelper_1 = tslib_1.__importDefault(require("../Utilities/Helpers/FormatHelper"));
 const toNumber_1 = tslib_1.__importDefault(require("lodash/toNumber"));
 const getNumericValue = (input) => {
     if (typeof input === 'number') {
@@ -52,57 +51,3 @@ const weightedAverage = (params, columnId, weightColumnId) => {
     };
 };
 exports.weightedAverage = weightedAverage;
-const cellSummaryWeightedAverage = ({ numericColumns, selectedCellInfo, adaptableApi, }) => {
-    if ((numericColumns === null || numericColumns === void 0 ? void 0 : numericColumns.length) != 1) {
-        return '';
-    }
-    const columnId = numericColumns[0];
-    const currentLayout = adaptableApi.layoutApi.getCurrentLayout();
-    const selectedColumnAgg = currentLayout.AggregationColumns[columnId];
-    if (!selectedColumnAgg ||
-        typeof selectedColumnAgg !== 'object' ||
-        selectedColumnAgg.type !== 'weightedAverage') {
-        return '';
-    }
-    const weightedColumnId = selectedColumnAgg.weightedColumnId;
-    if (weightedColumnId) {
-        let sumWeightedValue = 0;
-        let sumPrimaryValues = 0;
-        let isValid = true;
-        selectedCellInfo.gridCells.forEach((gridCell) => {
-            if (adaptableApi.gridApi.isGroupRowNode(gridCell.rowNode)) {
-                isValid = false;
-            }
-            if (isValid) {
-                const weightedGridCell = adaptableApi.gridApi.getGridCellFromRowNode(gridCell.rowNode, weightedColumnId);
-                sumWeightedValue += weightedGridCell.rawValue;
-                sumPrimaryValues += weightedGridCell.rawValue * gridCell.normalisedValue;
-            }
-        });
-        if (!isValid) {
-            return '';
-        }
-        const abColumn = adaptableApi.columnApi.getColumnWithColumnId(columnId);
-        if (!abColumn) {
-            return '';
-        }
-        const activeFormatColumnsWithDisplayFormat = adaptableApi.formatColumnApi.internalApi.getFormatColumnsWithDisplayFormatForColumn(abColumn);
-        if (activeFormatColumnsWithDisplayFormat.length === 1 &&
-            activeFormatColumnsWithDisplayFormat[0].DisplayFormat.Formatter === 'NumberFormatter') {
-            // there only one FormatColumn on this column, so we will use it to format the aggregated value
-            const [singleActiveFormatColumnsWithDisplayFormat] = activeFormatColumnsWithDisplayFormat;
-            const options = singleActiveFormatColumnsWithDisplayFormat
-                .DisplayFormat.Options;
-            if (options) {
-                return FormatHelper_1.default.NumberFormatter(sumPrimaryValues / sumWeightedValue, options);
-            }
-        }
-        else {
-            // there are multiple (possibly conflicting) FormatColumns for this column, we cannot know which to use
-            return FormatHelper_1.default.NumberFormatter(sumPrimaryValues / sumWeightedValue, {
-                FractionDigits: 2,
-            });
-        }
-    }
-};
-exports.cellSummaryWeightedAverage = cellSummaryWeightedAverage;

package/src/components/Datepicker/index.js

@@ -103,7 +103,9 @@ exports.Datepicker = React.forwardRef((props, ref) => {
                         setVisible(true);
                     }
                 } }),
-                React.createElement(AdaptableDateInlineInput_1.AdaptableDateInlineInput, { ref: ref, value: inputValue, placeholder: placeholder !== null && placeholder !== void 0 ? placeholder : dateProps.format, onChange: (value) => {
+                React.createElement(AdaptableDateInlineInput_1.AdaptableDateInlineInput, { ref: ref, value: inputValue, 
+                    // We do not want to show the format when the date-picker is visible
+                    placeholder: placeholder !== null && placeholder !== void 0 ? placeholder : '', onChange: (value) => {
                         const date = new Date(value);
                         if ((0, date_fns_1.isValid)(date)) {
                             updateValue(date);

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: 1711464557352 || Date.now(),
-    VERSION: "18.0.0-canary.16" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1711543434054 || Date.now(),
+    VERSION: "18.0.0-canary.17" || '--current-version--',
 };

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

@@ -563,6 +563,12 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
             isOpt?: undefined;
             ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            ref: string;
+            isOpt?: undefined;
         } | {
             name: string;
             kind: string;