@adaptabletools/adaptable 16.1.1-canary.1 → 16.2.0-canary.0

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

@@ -43,15 +43,9 @@ const DataPreview = (props) => {
             " step and provide Data"));
     }
     const primaryKey = adaptable.api.optionsApi.getPrimaryKey();
-    const dataSample = props.data[0];
     const columns = React.useMemo(() => {
-        if (!dataSample) {
-            return {};
-        }
-        const adaptableColumnsInData = adaptable.api.columnApi.getColumns().filter((c) => {
-            var _a;
-            return dataSample && ((_a = c.field) !== null && _a !== void 0 ? _a : c.columnId) in dataSample;
-        });
+        var _a;
+        const mappedAdaptableColumns = (_a = props.columnsMap) === null || _a === void 0 ? void 0 : _a.filter((map) => map.include && map.abColumn);
         const mapDataType = (dataType) => {
             switch (dataType) {
                 case 'Boolean':
@@ -69,23 +63,25 @@ const DataPreview = (props) => {
             }
             return rowData[primaryKey];
         };
-        const infiniteColumns = adaptableColumnsInData.reduce((acc, column) => {
-            const isPrimaryKey = column.columnId === primaryKey;
+        const infiniteColumns = mappedAdaptableColumns.reduce((acc, colMap) => {
+            var _a;
+            const isPrimaryKey = ((_a = colMap === null || colMap === void 0 ? void 0 : colMap.abColumn) === null || _a === void 0 ? void 0 : _a.columnId) === primaryKey;
             let editable = !isPrimaryKey;
             if (props.editable !== undefined && !isPrimaryKey) {
                 editable = props.editable;
             }
-            acc[column.columnId] = {
-                field: column.field,
-                header: adaptable.api.columnApi.getFriendlyNameForColumnId(column.columnId),
-                dataType: mapDataType(column.dataType),
+            const abColumn = colMap.abColumn;
+            acc[colMap.field] = {
+                field: colMap.field,
+                header: adaptable.api.columnApi.getFriendlyNameForColumnId(colMap.abColumn.columnId),
+                dataType: mapDataType(abColumn.dataType),
                 defaultEditable: editable,
                 valueGetter: (params) => {
-                    if (column.dataType === 'Boolean') {
-                        return params.data[column.columnId] ? 'True' : 'False';
+                    if (abColumn.dataType === 'Boolean') {
+                        return params.data[colMap.field] ? 'True' : 'False';
                     }
                     else {
-                        return params.data[params.field];
+                        return params.data[colMap.field];
                     }
                 },
             };

package/src/View/DataImport/DataImportWizard/sections/ValidationSection.d.ts

@@ -1,11 +1,12 @@
 import * as React from 'react';
-import { ValidationErrorsMap } from '../DataImportWizard';
+import { ColumnsMap, ValidationErrorsMap } from '../DataImportWizard';
 interface ValidationSectionProps {
     data?: Record<string, unknown>[];
     onDataChange?: (data: Record<string, unknown>[]) => void;
     errors: ValidationErrorsMap | null;
     skipInvalidRows: boolean;
     onSkipInvalidRowsChange: (skipInvalidRows: boolean) => void;
+    columnsMap: ColumnsMap[] | null;
 }
 export declare const ValidationSection: React.FunctionComponent<ValidationSectionProps>;
 export {};

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

@@ -30,6 +30,6 @@ const ValidationSection = (props) => {
         React.createElement(Tabs_1.Tabs, { flex: 1 },
             React.createElement(Tabs_1.Tabs.Tab, null, "Preview"),
             React.createElement(Tabs_1.Tabs.Content, null,
-                React.createElement(DataPreview_1.DataPreview, { data: props.data, errors: props.errors, editable: true, onDataChange: props.onDataChange })))));
+                React.createElement(DataPreview_1.DataPreview, { columnsMap: props.columnsMap, data: props.data, errors: props.errors, editable: true, onDataChange: props.onDataChange })))));
 };
 exports.ValidationSection = ValidationSection;

package/src/View/QuickSearch/QuickSearchInput.js

@@ -17,6 +17,6 @@ const QuickSearchInput = (props) => {
         QuickSearchText,
         onRunQuickSearch,
     });
-    return (react_1.default.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { type: "text", autoFocus: props.autoFocus, placeholder: adaptable.api.optionsApi.getQuickSearchOptions().quickSearchPlaceholder, className: props.className, value: searchText, OnTextChange: search, style: { height: '100%' }, inputStyle: { width: '7rem' } }));
+    return (react_1.default.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { type: "text", autoFocus: props.autoFocus, placeholder: adaptable.api.optionsApi.getQuickSearchOptions().quickSearchPlaceholder, className: props.className, value: searchText, OnTextChange: search, style: { height: '100%' }, inputStyle: { width: '10rem' } }));
 };
 exports.QuickSearchInput = QuickSearchInput;

package/src/components/Dashboard/Dashboard.d.ts

@@ -9,6 +9,7 @@ export declare type DashboardProps = {
     children: ReactElement<DashboardTabProps>[];
     left: ReactNode;
     right: ReactNode;
+    footer: ReactNode;
     canFloat: boolean;
     onShowDashboardPopup?: () => void;
     activeTabIndex?: number;

package/src/components/Dashboard/Dashboard.js

@@ -78,6 +78,7 @@ function Dashboard(props) {
         // @ts-ignore
         ref: targetRef, className: (0, join_1.default)(`ab-Dashboard`, collapsed ? 'ab-Dashboard--collapsed' : '', floating ? 'ab-Dashboard--floating' : '', inline ? 'ab-Dashboard--inline' : ''), style: floating ? floatingStyle : undefined },
         expanded && inline ? renderHomeToolbar() : renderBar(),
-        expanded && children && children.length ? (React.createElement("div", { className: "ab-Dashboard__content" }, children[activeTabIndex] ? children[activeTabIndex].props.children : null)) : null));
+        expanded && children && children.length ? (React.createElement("div", { className: "ab-Dashboard__content" }, children[activeTabIndex] ? children[activeTabIndex].props.children : null)) : null,
+        props.footer));
 }
 exports.Dashboard = Dashboard;

package/src/components/DragAndDropContext/ModuleManager.js

@@ -21,7 +21,7 @@ const ModuleManager = (props) => {
     const unusedItems = React.useMemo(() => availableItems
         .map((t) => t.Id)
         .filter((item) => {
-        return !tabs.some((tab) => tab.Items.includes(item));
+        return !tabs.some((tab) => { var _a; return (_a = tab.Items) === null || _a === void 0 ? void 0 : _a.includes(item); });
     }), [tabs, availableItems]);
     const handleToolbarDragEnd = (result) => {
         const { source, destination, draggableId } = result;

package/src/components/DragAndDropContext/TabList.js

@@ -33,7 +33,7 @@ function TabItem({ tab, tabIndex, onRemove, onRemoveToolbar, onChangeTabName, di
 }
 exports.TabItem = TabItem;
 function ToolbarList({ toolbars, droppableId, onRemove, disabled, }) {
-    return (React.createElement(react_beautiful_dnd_1.Droppable, { droppableId: droppableId, type: "TOOLBAR" }, (provided, snapshot) => (React.createElement(rebass_1.Box, Object.assign({ className: "ab-ModuleSelector__ToolbarList", ref: provided.innerRef }, (disabled ? {} : provided.droppableProps), { "data-name": "dashboard-toolbar-drop-target", backgroundColor: snapshot.isDraggingOver ? 'var(--ab-dashboard-tab-drop-target__background)' : '' }),
+    return (React.createElement(react_beautiful_dnd_1.Droppable, { droppableId: droppableId, type: "TOOLBAR" }, (provided, snapshot) => (React.createElement(rebass_1.Box, Object.assign({ className: "ab-ModuleSelector__ToolbarList", ref: provided.innerRef }, (disabled ? {} : provided.droppableProps), { "data-name": "dashboard-toolbar-drop-target", backgroundColor: snapshot.isDraggingOver ? 'var(--ab-dashboard-tab-drop-target__background)' : '' }), toolbars === null || toolbars === void 0 ? void 0 :
         toolbars.map((toolbar, toolbarIndex) => (React.createElement(ToolbarItem, { disabled: disabled, key: toolbar, toolbar: toolbar, toolbarIndex: toolbarIndex, onRemove: () => onRemove(toolbarIndex) }))),
         provided.placeholder))));
 }

package/src/components/ExpressionEditor/editorButtonsObservable.js

@@ -12,6 +12,11 @@ exports.editorButtonsObservable = [
         data: 'GRID_CHANGE()',
         text: 'GridChange',
     },
+    {
+        functionName: 'ROW_ADDED',
+        data: 'ROW_ADDED()',
+        text: 'RowAdded',
+    },
     {
         functionName: 'COUNT',
         data: 'COUNT()',