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

package/src/View/DataImport/DataImportPopup.js

@@ -17,7 +17,7 @@ const DataImportPopup = (props) => {
         }
     }, []);
     return (React.createElement(React.Fragment, null,
-        React.createElement(PopupPanel_1.PopupPanel, { headerText: 'Data Import', glyphicon: 'import' },
+        React.createElement(PopupPanel_1.PopupPanel, { headerText: 'Data Import', glyphicon: 'import', infoLink: props.moduleInfo.HelpPage },
             React.createElement(rebass_1.Box, null,
                 React.createElement(HelpBlock_1.default, { mb: 2, fontSize: 3 }, "Click the 'Import Data' button to insert or update data into AdapTable"),
                 React.createElement(SimpleButton_1.default, { icon: "import", variant: "raised", onClick: () => setIsWizardOpen(true) }, "Import Data"))),

package/src/View/DataImport/DataImportWizard/DataImportWizard.js

@@ -25,8 +25,9 @@ const DataImportWizard = (props) => {
     // - new data is loaded
     const [importType, setImportType] = React.useState('file');
     const primaryKey = adaptable.api.optionsApi.getPrimaryKey();
+    const hasDynamicallyAddedPrimaryKey = typeof dataImportOptions.getPrimaryKeyValue === 'function';
     const getPrimaryKeyValue = (rowData) => {
-        if (typeof dataImportOptions.getPrimaryKeyValue === 'function') {
+        if (hasDynamicallyAddedPrimaryKey) {
             return dataImportOptions.getPrimaryKeyValue(Object.assign(Object.assign({}, (0, ObjectFactory_1.createBaseContext)(adaptable.api)), { rowData }));
         }
         return rowData[primaryKey];
@@ -215,7 +216,8 @@ const DataImportWizard = (props) => {
                     if (columnsErrors && Object.keys(columnsErrors).length > 0) {
                         return 'Some fields do not have a corresponding column.';
                     }
-                    if (!(columnsMap === null || columnsMap === void 0 ? void 0 : columnsMap.some((map) => { var _a; return ((_a = map === null || map === void 0 ? void 0 : map.abColumn) === null || _a === void 0 ? void 0 : _a.field) === primaryKey; }))) {
+                    if (!hasDynamicallyAddedPrimaryKey &&
+                        !(columnsMap === null || columnsMap === void 0 ? void 0 : columnsMap.some((map) => { var _a; return ((_a = map === null || map === void 0 ? void 0 : map.abColumn) === null || _a === void 0 ? void 0 : _a.field) === primaryKey; }))) {
                         return 'You need to select a column for the primary key.';
                     }
                     return true;

package/src/View/DataImport/DataImportWizard/sections/ColumnsSection.js

@@ -62,7 +62,7 @@ const ColumnsSection = (props) => {
                 header: 'Data Field',
             },
             abColumn: {
-                header: 'Adaptable Column',
+                header: 'AdapTable Column',
                 render: (params) => {
                     var _a, _b, _c, _d, _e, _f;
                     // filter out used columns

package/src/agGrid/Adaptable.js

@@ -1742,6 +1742,13 @@ class Adaptable {
             this.api.gridApi.getFirstDisplayedRowNode()) {
             layout.ExpandedRowGroupValues = this.getExpandRowGroupsKeys();
         }
+        const previousVisibleColumns = currentLayout.Columns;
+        const newVisibleColumns = layout.Columns;
+        // check if all new columns were previously visible
+        const someColumnsAreNew = newVisibleColumns.some((colId) => !previousVisibleColumns.includes(colId));
+        if (someColumnsAreNew) {
+            this.setupColumns();
+        }
         this.persistLayout(layout);
     }
     // This method returns selected cells ONLY (if selection mode is cells or multiple cells).

package/src/components/ExpressionEditor/editorButtonsObservable.js

@@ -17,6 +17,11 @@ exports.editorButtonsObservable = [
         data: 'ROW_ADDED()',
         text: 'RowAdded',
     },
+    {
+        functionName: 'ROW_REMOVED',
+        data: 'ROW_REMOVED()',
+        text: 'RowRemoved',
+    },
     {
         functionName: 'COUNT',
         data: 'COUNT()',

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

@@ -2308,6 +2308,16 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
         }[];
     };
+    DataImportValidationError: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+        }[];
+    };
     DataSet: {
         name: string;
         kind: string;
@@ -4078,6 +4088,16 @@ export declare const ADAPTABLE_METAMODEL: {
             defVal?: undefined;
         })[];
     };
+    PreprocessDataContext: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+        }[];
+    };
     PreProcessExportContext: {
         name: string;
         kind: string;