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

package/src/View/FreeTextColumn/Wizard/FreeTextColumnSettingsWizardSection.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FreeTextColumnSettingsWizardSection = exports.isValidFreeTextColumn = exports.renderFreeTextColumnSummary = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
+const react_1 = require("react");
 const rebass_1 = require("rebass");
 const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const ErrorBox_1 = tslib_1.__importDefault(require("../../../components/ErrorBox"));
 const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
 const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
 const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
-const react_1 = require("react");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const AdaptableInput_1 = tslib_1.__importDefault(require("../../Components/AdaptableInput"));
 const CheckBox_1 = require("../../../components/CheckBox");
@@ -78,10 +78,11 @@ const FreeTextColumnSettingsWizardSection = (props) => {
         props.onChange(Object.assign(Object.assign({}, data), { FriendlyName: ColumnName }));
     };
     const handleDataTypeChange = (DataType) => {
-        const newData = Object.assign(Object.assign({}, data), { DataType });
+        var _a;
+        const newData = Object.assign(Object.assign({}, data), { FreeTextColumnSettings: Object.assign(Object.assign({}, data.FreeTextColumnSettings), { DataType }) });
         delete newData.DefaultValue;
         if (!DataType) {
-            delete newData.DataType;
+            (_a = newData.FreeTextColumnSettings) === null || _a === void 0 ? true : delete _a.DataType;
         }
         props.onChange(newData);
     };

package/src/View/StyledColumn/Wizard/StyledColumnWizard.js

@@ -29,11 +29,11 @@ const StyledColumnWizard = (props) => {
     });
     const dispatch = (0, react_redux_1.useDispatch)();
     const handleFinish = () => {
-        if (data) {
-            dispatch(StyledColumnRedux.StyledColumnEdit(styledColumn));
+        if (props.popupParams.action === 'New' || !data) {
+            dispatch(StyledColumnRedux.StyledColumnAdd(styledColumn));
         }
         else {
-            dispatch(StyledColumnRedux.StyledColumnAdd(styledColumn));
+            dispatch(StyledColumnRedux.StyledColumnEdit(styledColumn));
         }
         props.onFinishWizard(styledColumn);
     };

package/src/View/TeamSharing/SharedEntityObjectView.js

@@ -54,14 +54,15 @@ const getSharedEntityActiveStatusObjectView = (isDependency) => (props) => {
             if (isStaleAndActive) {
                 statusInfo = (React.createElement(rebass_1.Box, { ml: 1, style: { color: 'var(--ab-color-warn)' } }, ` (Rev. ${newRevision} available)`));
             }
-            activeInfo = (React.createElement(React.Fragment, null,
-                `Imported Rev. ${activeRevision} ${isStaleAndActive ? 'is stale' : ''} `,
-                " ",
+            activeInfo = activeRevision && (React.createElement(React.Fragment, null,
+                activeRevision &&
+                    `Imported Rev. ${activeRevision} ${isStaleAndActive ? 'is stale' : ''} `,
+                ' ',
                 statusInfo));
         }
         else {
             // snapshot
-            activeInfo = React.createElement(React.Fragment, null, `Imported Rev. ${activeRevision}`);
+            activeInfo = activeRevision && React.createElement(React.Fragment, null, `Imported Rev. ${activeRevision}`);
         }
     }
     const sharedValue = `by ${sharedEntity.UserName} at ${new Date(sharedEntity.Timestamp).toLocaleString()}`;

package/src/agGrid/Adaptable.js

@@ -351,7 +351,7 @@ class Adaptable {
     // the 'old' constructor which takes an Adaptable adaptable object
     // this is still used internally but should not be used externally as a preference
     async init(adaptableOptions, runtimeConfig, _staticInit) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         if (runtimeConfig) {
             this.supressReact18RenderWarning = !!runtimeConfig.supressReact18RenderWarning;
             if (runtimeConfig.renderReactRoot) {
@@ -459,6 +459,8 @@ class Adaptable {
             abColDefObject: (_e = this.gridOptions.columnTypes.abColDefObject) !== null && _e !== void 0 ? _e : {},
             abColDefCustom: (_f = this.gridOptions.columnTypes.abColDefCustom) !== null && _f !== void 0 ? _f : {},
             abColDefNumberArray: (_g = this.gridOptions.columnTypes.abColDefNumberArray) !== null && _g !== void 0 ? _g : {},
+            abColDefTupleNumberArray: (_h = this.gridOptions.columnTypes.abColDefTupleNumberArray) !== null && _h !== void 0 ? _h : {},
+            abColDefObjectNumberArray: (_j = this.gridOptions.columnTypes.abColDefObjectNumberArray) !== null && _j !== void 0 ? _j : {},
         });
         if (this.gridOptions.columnTypes.abColDefNumber.cellEditor === undefined) {
             this.gridOptions.columnTypes.abColDefNumber.cellEditor =
@@ -1442,9 +1444,12 @@ class Adaptable {
             shouldUpdateHeaders = this.setupColumnHeader(colSetupInfo) || shouldUpdateHeaders;
         });
         isChanged = isChanged || shouldUpdateHeaders;
-        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(layout.ColumnFilters)) {
-            this.gridOptions.api.onFilterChanged();
-        }
+        // this is NOT really needed?!
+        // without it everything seem to still work as expected
+        // and the setLayout() execution time is shorter, so a double win
+        // if (ArrayExtensions.IsNotNullOrEmpty(layout.ColumnFilters)) {
+        //   this.gridOptions.api!.onFilterChanged();
+        // }
         if (isChanged) {
             // it's important we set pivot mode
             // before we set column state

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

@@ -470,6 +470,11 @@ export declare const ADAPTABLE_METAMODEL: {
             reference?: undefined;
         })[];
     };
+    AdaptableFrameworkComponent: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     AdaptableIcon: {
         name: string;
         kind: string;
@@ -1530,12 +1535,19 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
-        properties: {
+        properties: ({
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
-        }[];
+            isOptional?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+        })[];
     };
     ChartDefinition: {
         name: string;
@@ -2072,6 +2084,19 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference?: undefined;
+        })[];
     };
     CustomSettingsPanel: {
         name: string;