@adaptabletools/adaptable 16.0.0-canary.3 → 16.0.0-canary.4

package/src/agGrid/Adaptable.js

@@ -68,6 +68,7 @@ const ThemeService_1 = require("../Utilities/Services/ThemeService");
 const AdaptableLogger_1 = require("./AdaptableLogger");
 const attachAddaptableColumnTypes_1 = require("./attachAddaptableColumnTypes");
 const FormatHelper_1 = require("../Utilities/Helpers/FormatHelper");
+const Fdc3Service_1 = require("../Utilities/Services/Fdc3Service");
 const tinycolor = require('tinycolor2');
 const GROUP_PATH_SEPARATOR = '/';
 // IMPORTANT - we need colId to be set in order for safeSetColDefs to work correctly
@@ -417,7 +418,7 @@ class Adaptable {
         this.agGridMenuHelper = new agGridMenuHelper_1.agGridMenuHelper(this, this.gridOptions);
         // Build the default group sort comparator - will get custom sort values (but not functions) in real time
         // TODO: if  a custom 'aggFunc' property is defined (see setupColumnAggFunc()), it won't be evaluated
-        if (this.adaptableOptions.columnOptions.autoOrderGroupedColumns) {
+        if (this.adaptableOptions.groupingOptions.autoOrderGroupedColumns) {
             this.setGridOptionsProperty('initialGroupOrderComparator', (userPropertyValue) => {
                 if (userPropertyValue) {
                     return userPropertyValue;
@@ -441,6 +442,7 @@ class Adaptable {
         this.QueryLanguageService = new QueryLanguageService_1.QueryLanguageService(this.api);
         this.AlertService = new AlertService_1.AlertService(this.api);
         this.TeamSharingService = new TeamSharingService_1.TeamSharingService(this.api);
+        this.Fdc3Service = new Fdc3Service_1.Fdc3Service(this.api);
         // @ts-ignore
         this.RowEditService = new RowEditService_1.RowEditService(this.api);
         this.MetamodelService = new MetamodelService_1.MetamodelService(() => this.api.optionsApi.getAdaptableOptions());
@@ -2687,7 +2689,7 @@ class Adaptable {
         return this.gridOptions.api.getDisplayedRowAtIndex(firstDisplayedRowIndex);
     }
     destroy(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
         if (this.gridOptions && this.gridOptions.api) {
             this.gridOptions.api.removeEventListener(core_1.Events.EVENT_FIRST_DATA_RENDERED, this.listenerFirstDataRendered);
             this.gridOptions.api.removeEventListener(core_1.Events.EVENT_COLUMN_PIVOT_MODE_CHANGED, this.listenerPivotModeChanged);
@@ -2777,23 +2779,25 @@ class Adaptable {
         this.DataService = null;
         (_h = (_g = this.EntitlementService) === null || _g === void 0 ? void 0 : _g.destroy) === null || _h === void 0 ? void 0 : _h.call(_g);
         this.EntitlementService = null;
-        (_k = (_j = this.ReportService) === null || _j === void 0 ? void 0 : _j.destroy) === null || _k === void 0 ? void 0 : _k.call(_j);
+        (_k = (_j = this.Fdc3Service) === null || _j === void 0 ? void 0 : _j.destroy) === null || _k === void 0 ? void 0 : _k.call(_j);
+        this.Fdc3Service = null;
+        (_m = (_l = this.ReportService) === null || _l === void 0 ? void 0 : _l.destroy) === null || _m === void 0 ? void 0 : _m.call(_l);
         this.ReportService = null;
-        (_m = (_l = this.ModuleService) === null || _l === void 0 ? void 0 : _l.destroy) === null || _m === void 0 ? void 0 : _m.call(_l);
+        (_p = (_o = this.ModuleService) === null || _o === void 0 ? void 0 : _o.destroy) === null || _p === void 0 ? void 0 : _p.call(_o);
         this.ModuleService = null;
-        (_p = (_o = this.ValidationService) === null || _o === void 0 ? void 0 : _o.destroy) === null || _p === void 0 ? void 0 : _p.call(_o);
+        (_r = (_q = this.ValidationService) === null || _q === void 0 ? void 0 : _q.destroy) === null || _r === void 0 ? void 0 : _r.call(_q);
         this.ValidationService = null;
-        (_r = (_q = this.QueryLanguageService) === null || _q === void 0 ? void 0 : _q.destroy) === null || _r === void 0 ? void 0 : _r.call(_q);
+        (_t = (_s = this.QueryLanguageService) === null || _s === void 0 ? void 0 : _s.destroy) === null || _t === void 0 ? void 0 : _t.call(_s);
         this.QueryLanguageService = null;
-        (_t = (_s = this.AlertService) === null || _s === void 0 ? void 0 : _s.destroy) === null || _t === void 0 ? void 0 : _t.call(_s);
+        (_v = (_u = this.AlertService) === null || _u === void 0 ? void 0 : _u.destroy) === null || _v === void 0 ? void 0 : _v.call(_u);
         this.AlertService = null;
-        (_v = (_u = this.TeamSharingService) === null || _u === void 0 ? void 0 : _u.destroy) === null || _v === void 0 ? void 0 : _v.call(_u);
+        (_x = (_w = this.TeamSharingService) === null || _w === void 0 ? void 0 : _w.destroy) === null || _x === void 0 ? void 0 : _x.call(_w);
         this.TeamSharingService = null;
-        (_x = (_w = this.RowEditService) === null || _w === void 0 ? void 0 : _w.destroy) === null || _x === void 0 ? void 0 : _x.call(_w);
+        (_z = (_y = this.RowEditService) === null || _y === void 0 ? void 0 : _y.destroy) === null || _z === void 0 ? void 0 : _z.call(_y);
         this.RowEditService = null;
-        (_z = (_y = this.MetamodelService) === null || _y === void 0 ? void 0 : _y.destroy) === null || _z === void 0 ? void 0 : _z.call(_y);
+        (_1 = (_0 = this.MetamodelService) === null || _0 === void 0 ? void 0 : _0.destroy) === null || _1 === void 0 ? void 0 : _1.call(_0);
         this.MetamodelService = null;
-        (_1 = (_0 = this.LicenseService) === null || _0 === void 0 ? void 0 : _0.destroy) === null || _1 === void 0 ? void 0 : _1.call(_0);
+        (_3 = (_2 = this.LicenseService) === null || _2 === void 0 ? void 0 : _2.destroy) === null || _3 === void 0 ? void 0 : _3.call(_2);
         this.LicenseService = null;
         this.isDestroyed = true;
     }
@@ -4641,6 +4645,7 @@ class Adaptable {
         return this.isAgGridModulePresent(core_1.ModuleNames.ExcelExportModule);
     }
     exportToExcel(reportData, fileName) {
+        var _a;
         const columnDefs = reportData.columns.map((column) => ({
             field: column.columnId,
             headerName: column.friendlyName,
@@ -4677,7 +4682,11 @@ class Adaptable {
             columnDefs,
             rowData: reportData.rows,
         };
-        const grid = new core_1.Grid(document.createElement('div'), gridOptions);
+        let gridParams;
+        if ((_a = this.runtimeConfig.agGridModules) === null || _a === void 0 ? void 0 : _a.length) {
+            gridParams = { modules: this.runtimeConfig.agGridModules };
+        }
+        const grid = new core_1.Grid(document.createElement('div'), gridOptions, gridParams);
         gridOptions.api.exportDataAsExcel({
             sheetName: 'Sheet 1',
             fileName: fileName,

package/src/agGrid/agGridHelper.js

@@ -43,6 +43,7 @@ const GeneralConstants = tslib_1.__importStar(require("../Utilities/Constants/Ge
 const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
 const UIHelper_1 = tslib_1.__importDefault(require("../View/UIHelper"));
 const StyledColumnModule_1 = require("../Strategy/StyledColumnModule");
+const Fdc3Module_1 = require("../Strategy/Fdc3Module");
 const tinycolor = require('tinycolor2');
 /**
  * Adaptable AG Grid implementation is getting really big and unwieldy
@@ -104,6 +105,7 @@ class agGridHelper {
         modules.set(ModuleConstants.StatusBarModuleId, new StatusBarModule_1.StatusBarModule(api));
         modules.set(ModuleConstants.ChartingModuleId, new ChartingModule_1.ChartingModule(api));
         modules.set(ModuleConstants.StyledColumnModuleId, new StyledColumnModule_1.StyledColumnModule(api));
+        modules.set(ModuleConstants.Fdc3ModuleId, new Fdc3Module_1.Fdc3Module(api));
         return modules;
     }
     TrySetUpNodeIds(hasAutogeneratedPrimaryKey) {

package/src/components/Drawer/index.d.ts

@@ -0,0 +1,6 @@
+import * as React from 'react';
+export interface DrawerProps {
+    open: boolean;
+    onOpenChange?: (open: boolean) => void;
+}
+export declare const Drawer: React.FunctionComponent<React.PropsWithChildren<DrawerProps>>;

package/src/components/Drawer/index.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Drawer = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const Drawer = (props) => {
+    const [isOpen, setIsOpen] = React.useState(() => {
+        return props.open;
+    });
+    const [show, setShow] = React.useState(props.open);
+    React.useEffect(() => {
+        // CLOSED -> OPEN
+        // SHOW Element, with closed class
+        // CHANGE class to opened
+        if (!isOpen && props.open) {
+            setShow(true);
+            requestAnimationFrame(() => {
+                setIsOpen(true);
+            });
+        }
+        // OPEN -> CLOSED
+        // CHANGE class to closed
+        // HIDE Element, when animation is finsihed
+        if (isOpen && !props.open) {
+            setIsOpen(false);
+        }
+    }, [props.open]);
+    const handleOnKeyDown = React.useCallback((event) => {
+        var _a;
+        // escape
+        if (event.key === 'Escape') {
+            (_a = props.onOpenChange) === null || _a === void 0 ? void 0 : _a.call(props, false);
+        }
+    }, []);
+    const handletransitionEnd = () => {
+        if (!isOpen) {
+            setShow(false);
+        }
+    };
+    if (!show) {
+        return null;
+    }
+    const style = {
+        position: 'fixed',
+        top: 0,
+        right: 0,
+        zIndex: 1000,
+        transition: 'transform 0.3s ease-in-out, opacity 0.3s ease-in-out',
+    };
+    if (isOpen) {
+        style.transform = 'translateY(0)';
+        style.opacity = 1;
+    }
+    else {
+        style.transform = 'translateY(-120%)';
+        style.opacity = 0;
+    }
+    return (React.createElement("div", { onKeyDown: handleOnKeyDown, style: style, onTransitionEnd: handletransitionEnd }, props.children));
+};
+exports.Drawer = Drawer;

package/src/components/ExpressionEditor/index.js

@@ -51,10 +51,12 @@ function ExpressionEditor(props) {
         ? props.columns
         : props.columns.filter((c) => !props.api.columnApi.isCalculatedColumn(c.columnId));
     const getColValue = (column) => {
-        return props.api.internalApi.getValueUsingField(data, column);
+        var _a;
+        return props.api.internalApi.getValueUsingField(data, (_a = column.field) !== null && _a !== void 0 ? _a : column.columnId);
     };
     const updateColValue = (rowData, column, newValue) => {
-        const updatedRowData = props.api.internalApi.setValueUsingField(rowData, column, newValue);
+        var _a;
+        const updatedRowData = props.api.internalApi.setValueUsingField(rowData, (_a = column.field) !== null && _a !== void 0 ? _a : column.columnId, newValue);
         return Object.assign({}, updatedRowData);
     };
     const getColDateValue = (column) => {

package/src/components/icons/fdc3.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: (props: any) => JSX.Element;
+export default _default;

package/src/components/icons/fdc3.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const DefaultIcon_1 = tslib_1.__importDefault(require("./DefaultIcon"));
+exports.default = (props) => (React.createElement(DefaultIcon_1.default, Object.assign({}, props, { viewBox: "0 0 612 792" }),
+    React.createElement("path", { d: "M545.58,533.27V271.23L334.25,393.24c0.13,1.11,0.65,2.07,0.65,3.22c0,13.13-8.85,23.8-20.8,27.43v243.03   L545.58,533.27L545.58,533.27z" }),
+    React.createElement("path", { d: "M328.46,378.97l208.38-120.31v-0.65L305.79,126L74.74,258.01v0.65l208.38,120.31   c5.32-6.89,13.29-11.62,22.67-11.62C315.17,367.34,323.14,372.08,328.46,378.97L328.46,378.97z" }),
+    React.createElement("path", { d: "M277.33,393.24L66,271.23v262.04l231.48,133.64V423.88c-11.94-3.63-20.8-14.3-20.8-27.43   C276.68,395.31,277.2,394.35,277.33,393.24L277.33,393.24z" })));

package/src/components/icons/index.js

@@ -27,6 +27,7 @@ const call_1 = tslib_1.__importDefault(require("./call"));
 const justify_1 = tslib_1.__importDefault(require("./justify"));
 const error_1 = tslib_1.__importDefault(require("./error"));
 const export_1 = tslib_1.__importDefault(require("./export"));
+const fdc3_1 = tslib_1.__importDefault(require("./fdc3"));
 const campaign_1 = tslib_1.__importDefault(require("./campaign"));
 const build_1 = tslib_1.__importDefault(require("./build"));
 const warning_1 = tslib_1.__importDefault(require("./warning"));
@@ -287,7 +288,8 @@ const allIcons = {
     'case-lower': case_lower_1.default,
     'case-upper': case_upper_1.default,
     'case-sentence': case_sentence_1.default,
-    flag: cell_validation_1.default, // original icon is flag,
+    flag: cell_validation_1.default,
+    fdc3: fdc3_1.default,
 };
 Object.keys(allIcons).forEach((name) => {
     const ReactCmp = allIcons[name];

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

@@ -317,6 +317,17 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    AdaptableConfig: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+            ref: string;
+        }[];
+    };
     AdaptableCoordinate: {
         name: string;
         kind: string;
@@ -1648,17 +1659,17 @@ export declare const ADAPTABLE_METAMODEL: {
             kind: string;
             desc: string;
             isOpt: boolean;
-            gridInfo: string;
-            noCode: string;
             defVal: string;
+            gridInfo?: undefined;
+            noCode?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
+            gridInfo: string;
+            noCode: string;
             defVal: string;
-            gridInfo?: undefined;
-            noCode?: undefined;
         })[];
     };
     ColumnSort: {
@@ -1687,6 +1698,11 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
+    CompatibleContext: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     ConfigState: {
         name: string;
         kind: string;
@@ -1716,7 +1732,7 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
-    ContactContext: {
+    ContactContextDepr: {
         name: string;
         kind: string;
         desc: string;
@@ -1742,7 +1758,7 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
-    ContactListContext: {
+    ContactListContextDepr: {
         name: string;
         kind: string;
         desc: string;
@@ -1771,7 +1787,7 @@ export declare const ADAPTABLE_METAMODEL: {
             defVal: string;
         }[];
     };
-    ContextData: {
+    ContextDataDepr: {
         name: string;
         kind: string;
         desc: string;
@@ -1810,7 +1826,7 @@ export declare const ADAPTABLE_METAMODEL: {
             ref?: undefined;
         })[];
     };
-    CountryContext: {
+    CountryContextDepr: {
         name: string;
         kind: string;
         desc: string;
@@ -2702,7 +2718,7 @@ export declare const ADAPTABLE_METAMODEL: {
             isOpt?: undefined;
         })[];
     };
-    FDC3Context: {
+    FDC3Context_DEPR: {
         name: string;
         kind: string;
         desc: string;
@@ -2726,7 +2742,7 @@ export declare const ADAPTABLE_METAMODEL: {
             isOpt?: undefined;
         })[];
     };
-    FDC3ContextType: {
+    FDC3ContextTypeDepr: {
         name: string;
         kind: string;
         desc: string;
@@ -2746,6 +2762,11 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    Fdc3IntentType: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     FilterActionOnDataChange: {
         name: string;
         kind: string;
@@ -3263,6 +3284,14 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
         props: ({
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            gridInfo: string;
+            noCode: string;
+            defVal: string;
+        } | {
             name: string;
             kind: string;
             desc: string;
@@ -3283,9 +3312,9 @@ export declare const ADAPTABLE_METAMODEL: {
             kind: string;
             desc: string;
             isOpt: boolean;
+            gridInfo?: undefined;
             noCode?: undefined;
             defVal?: undefined;
-            gridInfo?: undefined;
         })[];
     };
     IAdaptableNoCodeWizard: {
@@ -3311,7 +3340,7 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
-    InstrumentContext: {
+    InstrumentContextDepr: {
         name: string;
         kind: string;
         desc: string;
@@ -3337,7 +3366,7 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
-    InstrumentListContext: {
+    InstrumentListContextDepr: {
         name: string;
         kind: string;
         desc: string;
@@ -3751,7 +3780,7 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
-    OrganizationContext: {
+    OrganizationContextDepr: {
         name: string;
         kind: string;
         desc: string;
@@ -3869,7 +3898,7 @@ export declare const ADAPTABLE_METAMODEL: {
             isOpt: boolean;
         }[];
     };
-    PortfolioContext: {
+    PortfolioContextDepr: {
         name: string;
         kind: string;
         desc: string;
@@ -3903,7 +3932,7 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
-    PositionContext: {
+    PositionContextDepr: {
         name: string;
         kind: string;
         desc: string;