fuse-importer 0.26.3 → 0.26.5

package/lib/esm/Importer/common/Spreadsheet/index.js

@@ -9,15 +9,117 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import { jsx as _jsx } from "react/jsx-runtime";
-import React from "react";
+import { get } from "lodash";
+import { DateTime } from "luxon";
+import React, { useEffect, useState } from "react";
 import { areEqual } from "react-window";
+import { useImporterContext } from "../../contexts/ImporterContextProvider";
+import { SpreadsheetContextProvider } from "./SpreadsheetContextProvider";
 import SpreadsheetData from "./components/SpreadsheetData";
-import { SpreadsheetContextProvider, } from "./SpreadsheetContextProvider";
-var Spreadsheet = function (_a) {
-    var isReadOnly = _a.isReadOnly, initialDataSet = _a.initialDataSet, fields = _a.fields, _b = _a.options, options = _b === void 0 ? {} : _b, _c = _a.highlightFirstRow, highlightFirstRow = _c === void 0 ? false : _c, _d = _a.onValidateRecord, onValidateRecord = _d === void 0 ? null : _d, onDataSetChanged = _a.onDataSetChanged, onValidationStateChanged = _a.onValidationStateChanged, selectedRows = _a.selectedRows, setSelectedRows = _a.setSelectedRows;
-    return (_jsx(SpreadsheetContextProvider, __assign({ isReadOnly: isReadOnly, fields: fields, initialDataSet: initialDataSet, highlightFirstRow: highlightFirstRow, options: options, onDataSetChanged: onDataSetChanged, onValidateRecord: onValidateRecord, onValidationStateChanged: onValidationStateChanged, selectedRows: selectedRows, setSelectedRows: setSelectedRows }, { children: _jsx(SpreadsheetData, {}) })));
+var useFieldSorting = function () {
+    var templateHeaders = useImporterContext().templateHeaders;
+    var getDefaultSortCompareFn = function (sortBy) {
+        return function (a, b) {
+            var aField = get(a, sortBy.field);
+            var bField = get(b, sortBy.field);
+            var fieldTypes = templateHeaders.reduce(function (acc, header) {
+                var type = header.column_type;
+                var pattern = header.pattern || null;
+                acc[header.internal_key] = { type: type, pattern: pattern };
+                return acc;
+            }, {});
+            var fieldType = fieldTypes[sortBy.field];
+            var isAEmpty = aField === undefined || aField === null || aField === "";
+            var isBEmpty = bField === undefined || bField === null || bField === "";
+            // sort empty values to the end
+            if (isAEmpty && isBEmpty) {
+                if (a._meta.rowIndex === b._meta.rowIndex)
+                    return 0;
+                return a._meta.rowIndex < b._meta.rowIndex ? -1 : 1;
+            }
+            if (isAEmpty)
+                return 1;
+            if (isBEmpty)
+                return -1;
+            if (fieldType && fieldType.type === "boolean") {
+                var aString = aField ? "true" : "false";
+                var bString = bField ? "true" : "false";
+                if (aString === bString) {
+                    if (a._meta.rowIndex === b._meta.rowIndex)
+                        return 0;
+                    return a._meta.rowIndex < b._meta.rowIndex ? -1 : 1;
+                }
+                if (aString === "true")
+                    return sortBy.direction === "asc" ? -1 : 1;
+                if (bString === "true")
+                    return sortBy.direction === "asc" ? 1 : -1;
+            }
+            else if (fieldType &&
+                (fieldType.type === "date" ||
+                    fieldType.type === "datetime" ||
+                    fieldType.type === "time")) {
+                var aDateTime = aField
+                    ? DateTime.fromFormat(aField, fieldType.pattern)
+                    : null;
+                var bDateTime = bField
+                    ? DateTime.fromFormat(bField, fieldType.pattern)
+                    : null;
+                // sort invalid date values to the end before empty values
+                if (aDateTime && !aDateTime.isValid)
+                    return 1;
+                if (bDateTime && !bDateTime.isValid)
+                    return -1;
+                if (aDateTime && bDateTime && aDateTime.equals(bDateTime)) {
+                    if (a._meta.rowIndex === b._meta.rowIndex)
+                        return 0;
+                    return a._meta.rowIndex < b._meta.rowIndex ? -1 : 1;
+                }
+                if (sortBy.direction === "asc") {
+                    return (aDateTime === null || aDateTime === void 0 ? void 0 : aDateTime.valueOf()) - (bDateTime === null || bDateTime === void 0 ? void 0 : bDateTime.valueOf());
+                }
+                return (bDateTime === null || bDateTime === void 0 ? void 0 : bDateTime.valueOf()) - (aDateTime === null || aDateTime === void 0 ? void 0 : aDateTime.valueOf());
+            }
+            else {
+                if (aField === bField) {
+                    if (a._meta.rowIndex === b._meta.rowIndex)
+                        return 0;
+                    return a._meta.rowIndex < b._meta.rowIndex ? -1 : 1;
+                }
+                if (sortBy.direction === "asc") {
+                    return aField > bField ? 1 : -1;
+                }
+                return aField < bField ? 1 : -1;
+            }
+        };
+    };
+    return { getDefaultSortCompareFn: getDefaultSortCompareFn };
 };
-export default React.memo(Spreadsheet, areEqual);
-export * from "./hooks";
+var SpreadsheetWrapper = function (_a) {
+    var initialDataSet = _a.initialDataSet, props = __rest(_a, ["initialDataSet"]);
+    var _b = useState(0), key = _b[0], setKey = _b[1];
+    useEffect(function () {
+        /* increment the key to force a re-mount of the Spreadsheet component
+         when the initialDataSet changes */
+        setKey(key + 1);
+    }, [initialDataSet]);
+    return _jsx(Spreadsheet, __assign({ initialDataSet: initialDataSet }, props), key);
+};
+var Spreadsheet = function (props) {
+    var getDefaultSortCompareFn = useFieldSorting().getDefaultSortCompareFn;
+    return (_jsx(SpreadsheetContextProvider, __assign({}, props, { getSortCompareFn: getDefaultSortCompareFn }, { children: _jsx(SpreadsheetData, {}) })));
+};
+export default React.memo(SpreadsheetWrapper, areEqual);
 export * from "./SpreadsheetContextProvider";
+export * from "./hooks";

package/lib/esm/common/Table/TableActions/hooks.d.ts

@@ -4,17 +4,17 @@ interface UseTableActionsProps {
     setErrors: React.Dispatch<React.SetStateAction<BatchValidationErrors>>;
     setWarnings: React.Dispatch<React.SetStateAction<BatchValidationErrors>>;
 }
-export type DeleteRecords = (setDataSet: React.Dispatch<React.SetStateAction<RecordDataSet>>, selectedRecords: string[], errors: BatchValidationErrors, warnings: BatchValidationErrors, isDeletingAllRows: boolean) => void;
+export type DeleteRecords = (selectedRecords: string[], errors: BatchValidationErrors, warnings: BatchValidationErrors) => void;
 export type FilterRecordsBySearchValue = (obj: RecordDataSet, value: string, fields: Field[]) => RecordDataSet;
 export type FilterRecordsByError = (obj: RecordDataSet, keyToFilter: string, errors: BatchValidationErrors, fields: Field[]) => RecordDataSet;
 interface UseTableActionsProps {
     setErrors: React.Dispatch<React.SetStateAction<BatchValidationErrors>>;
     setWarnings: React.Dispatch<React.SetStateAction<BatchValidationErrors>>;
-    fields: Field[];
+    setDataSet: React.Dispatch<React.SetStateAction<RecordDataSet>>;
 }
-export declare const useTableActions: ({ setErrors, setWarnings, fields, }: UseTableActionsProps) => {
-    deleteRecords: DeleteRecords;
-    filterRecordsBySearchValue: (obj: RecordDataSet, value: string) => RecordDataSet;
+export declare const useTableActions: ({ setDataSet, setErrors, setWarnings, }: UseTableActionsProps) => {
+    deleteRecords: (selectedRecords: string[], errors: BatchValidationErrors, warnings: BatchValidationErrors) => void;
+    filterRecordsBySearchValue: (obj: RecordDataSet, value: string) => {};
     filterRecordsByError: (obj: RecordDataSet, keyToFilter: string, errors: BatchValidationErrors, fields: Field[]) => {};
 };
 export {};

package/lib/esm/common/Table/TableActions/hooks.js

@@ -1,14 +1,3 @@
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-import { useRef } from "react";
-import { addEmptyRows, recordListToDataSet } from "../../../Importer/data";
 var removeErrorsOrWarningsFromObject = function (obj, keysToRemove) {
     var keysSet = new Set(keysToRemove);
     var newObj = {};
@@ -19,6 +8,20 @@ var removeErrorsOrWarningsFromObject = function (obj, keysToRemove) {
     }
     return newObj;
 };
+var removeItemsFromObject = function (obj, idsToRemove) {
+    var _a;
+    var idSet = new Set(idsToRemove);
+    var newObj = {};
+    for (var key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+            var meta = (_a = obj[key]) === null || _a === void 0 ? void 0 : _a._meta;
+            if (meta && (meta === null || meta === void 0 ? void 0 : meta.id) && !(idSet === null || idSet === void 0 ? void 0 : idSet.has(meta === null || meta === void 0 ? void 0 : meta.id))) {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    return newObj;
+};
 var isObject = function (value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 };
@@ -31,31 +34,17 @@ var includesSearchValue = function (value, searchValue) {
     return false;
 };
 export var useTableActions = function (_a) {
-    var setErrors = _a.setErrors, setWarnings = _a.setWarnings, fields = _a.fields;
-    var allRowsDeleted = useRef([]);
+    var setDataSet = _a.setDataSet, setErrors = _a.setErrors, setWarnings = _a.setWarnings;
     // Delete records from dataSet and from validations
-    var deleteRecords = function (setDataSet, selectedRecords, errors, warnings, isDeletingAllRows) {
-        var rowsToBeAddedIntoDeletedOnes = Array.from(new Set(__spreadArray(__spreadArray([], selectedRecords, true), allRowsDeleted.current, true)));
-        allRowsDeleted.current = rowsToBeAddedIntoDeletedOnes;
-        var newErrors = removeErrorsOrWarningsFromObject(errors, rowsToBeAddedIntoDeletedOnes);
-        var newWarnings = removeErrorsOrWarningsFromObject(warnings, rowsToBeAddedIntoDeletedOnes);
-        setDataSet(function (oldValues) {
-            if (!rowsToBeAddedIntoDeletedOnes)
-                return oldValues;
-            if (isDeletingAllRows) {
-                allRowsDeleted.current = [];
-                return recordListToDataSet(addEmptyRows([], fields), fields);
-            }
-            var dataSetWithoutDeletedRecords = {};
-            for (var objKey in oldValues) {
-                if (!selectedRecords.includes(objKey)) {
-                    dataSetWithoutDeletedRecords[objKey] = oldValues[objKey];
-                }
-            }
-            return dataSetWithoutDeletedRecords;
-        });
+    var deleteRecords = function (selectedRecords, errors, warnings) {
+        var newErrors = removeErrorsOrWarningsFromObject(errors, selectedRecords);
+        var newWarnings = removeErrorsOrWarningsFromObject(warnings, selectedRecords);
         setErrors(newErrors);
         setWarnings(newWarnings);
+        setDataSet(function (prev) {
+            var newDataSet = removeItemsFromObject(prev, selectedRecords);
+            return newDataSet;
+        });
     };
     // Filter records by search value
     var filterRecordsBySearchValue = function (obj, value) {
@@ -72,11 +61,6 @@ export var useTableActions = function (_a) {
                 filteredObj[key] = currentObj;
             }
         }
-        // To ensure that rows are always displayed, even when the search query is empty,
-        // we return an empty record list when the search yields no results.
-        if (Object.keys(filteredObj).length === 0) {
-            return recordListToDataSet(addEmptyRows([], fields), fields);
-        }
         return filteredObj;
     };
     // Filter records by selected column error

package/lib/esm/common/Table/TableView/index.js

@@ -38,15 +38,17 @@ import { defaultTableHeaderHeightPx, defaultTableRowHeightPx } from "./common";
 export * from "./TableHeaders";
 export * from "./TableRows/TableRow";
 export * from "./common";
-export var TableViewWrapper = styled(Div)(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n  ", "\n  box-shadow: 0 0 0 1px ", ";\n  overflow: hidden;\n\n  ", "\n\n  // prevents clipped dropdowns\n  .ReactVirtualized__Grid__innerScrollContainer {\n    overflow: visible !important;\n  }\n  .ReactVirtualized__Table__row {\n    overflow: visible !important;\n  }\n\n"], ["\n  ", "\n  box-shadow: 0 0 0 1px ", ";\n  overflow: hidden;\n\n  ", "\n\n  // prevents clipped dropdowns\n  .ReactVirtualized__Grid__innerScrollContainer {\n    overflow: visible !important;\n  }\n  .ReactVirtualized__Table__row {\n    overflow: visible !important;\n  }\n\n"])), function (p) {
+export var TableViewWrapper = styled(Div)(templateObject_4 || (templateObject_4 = __makeTemplateObject(["\n  ", "\n  ", "\n  overflow: hidden;\n\n  ", "\n\n  // prevents clipped dropdowns\n  .ReactVirtualized__Grid__innerScrollContainer {\n    overflow: visible !important;\n  }\n  .ReactVirtualized__Table__row {\n    overflow: visible !important;\n  }\n"], ["\n  ", "\n  ", "\n  overflow: hidden;\n\n  ", "\n\n  // prevents clipped dropdowns\n  .ReactVirtualized__Grid__innerScrollContainer {\n    overflow: visible !important;\n  }\n  .ReactVirtualized__Table__row {\n    overflow: visible !important;\n  }\n"])), function (p) {
     return p.isLoading && css(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n      opacity: 0.5;\n    "], ["\n      opacity: 0.5;\n    "])));
-}, function (p) { return p.theme.colors.gray300; }, function (_a) {
+}, function (p) {
+    return !p.isLoading && css(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n      box-shadow: 0 0 0 1px ", ";\n    "], ["\n      box-shadow: 0 0 0 1px ", ";\n    "])), function (p) { return p.theme.colors.gray300; });
+}, function (_a) {
     var checkboxColumnWidth = _a.checkboxColumnWidth;
-    return checkboxColumnWidth && css(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n      max-width: calc(100vw - ", "px);\n    "], ["\n      max-width: calc(100vw - ", "px);\n    "])), checkboxColumnWidth);
+    return checkboxColumnWidth && css(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n      max-width: calc(100vw - ", "px);\n    "], ["\n      max-width: calc(100vw - ", "px);\n    "])), checkboxColumnWidth);
 });
-var SpinnerWrapper = styled(Div)(templateObject_4 || (templateObject_4 = __makeTemplateObject(["\n  pointer-events: none;\n  z-index: 100;\n"], ["\n  pointer-events: none;\n  z-index: 100;\n"])));
+var SpinnerWrapper = styled(Div)(templateObject_5 || (templateObject_5 = __makeTemplateObject(["\n  pointer-events: none;\n  z-index: 100;\n"], ["\n  pointer-events: none;\n  z-index: 100;\n"])));
 var tableHeaderId = "tableHeaderId";
-var VirtualizedGrid = styled(Grid)(templateObject_5 || (templateObject_5 = __makeTemplateObject(["\n  ", ";\n"], ["\n  ", ";\n"])), function (p) { return p.theme.css.scrollbarDark; });
+var VirtualizedGrid = styled(Grid)(templateObject_6 || (templateObject_6 = __makeTemplateObject(["\n  ", ";\n"], ["\n  ", ";\n"])), function (p) { return p.theme.css.scrollbarDark; });
 var loadingUI = (_jsx(SpinnerWrapper, __assign({ pRelative: true }, { children: _jsx(Div, __assign({ w100: true, h100: true, centered: true, h: 400, pAbsolute: true }, { children: _jsx(Spinner, {}) })) })));
 var buildGridStyles = function (rowWidthScalingFactor) {
     /* using style={{ willChange: "unset" }} is important for having items
@@ -70,7 +72,8 @@ export var TableView = React.memo(function (_a) {
         var scrollTop = _a.scrollTop, scrollLeft = _a.scrollLeft;
         if (headerContainerRef.current && headerContainerRef.current.scrollTo) {
             requestAnimationFrame(function () {
-                headerContainerRef.current.scrollTo({
+                var _a;
+                (_a = headerContainerRef === null || headerContainerRef === void 0 ? void 0 : headerContainerRef.current) === null || _a === void 0 ? void 0 : _a.scrollTo({
                     left: scrollLeft,
                 });
             });
@@ -127,4 +130,4 @@ export var TableView = React.memo(function (_a) {
                     return (_jsxs(_Fragment, { children: [canRenderTableHeaders && (_jsx(TableHeaders, { rowWidth: rowWidth, containerWidth: autosizerWidth, id: tableHeaderId, containerRef: headerContainerRef, height: tableHeadersHeight, rowHeight: rowHeight, scrollLeft: 0, columns: columns, sortBy: sortBy, setSortBy: setSortBy })), _jsx(GridContainer, __assign({}, gridContainerProps, { children: _jsx(VirtualizedGrid, __assign({}, gridProps, { children: Row })) }))] }));
                 } })] })));
 }, areEqual);
-var templateObject_1, templateObject_2, templateObject_3, templateObject_4, templateObject_5;
+var templateObject_1, templateObject_2, templateObject_3, templateObject_4, templateObject_5, templateObject_6;

package/lib/esm/common/Table/index.js

@@ -126,7 +126,7 @@ var Table = function (_a) {
     };
     var Container = data.length > 0 ? TableContainer : Div;
     var Wrapper = data.length > 0 ? TableWrapper : Div;
-    return (_jsx(Container, { children: _jsx(Wrapper, { children: _jsxs(Div, __assign({}, props, { children: [data.length ? (_jsx(DndContext, __assign({ sensors: dndContextValues.sensors, collisionDetection: dndContextValues.collisionDetection, onDragEnd: dndContextValues.onDragEnd, modifiers: dndContextValues.modifiers }, { children: _jsx(TableView, __assign({ pageSize: data.length, withPagination: withPagination, isDraggable: isDraggable }, {
+    return (_jsx(Container, { children: _jsx(Wrapper, { children: _jsxs(Div, __assign({}, props, { children: [data.length || isLoading ? (_jsx(DndContext, __assign({ sensors: dndContextValues.sensors, collisionDetection: dndContextValues.collisionDetection, onDragEnd: dndContextValues.onDragEnd, modifiers: dndContextValues.modifiers }, { children: _jsx(TableView, __assign({ pageSize: data.length, withPagination: withPagination, isDraggable: isDraggable }, {
                             isLoading: isLoading,
                             data: data,
                             columns: columns,

package/lib/esm/types.d.ts

@@ -64,6 +64,7 @@ export type BatchValidationErrors = {
     [rowId: string]: ValidationErrors;
 };
 export type AppResponse = {
+    recordsToDisplay?: Record[];
     errors?: SpreadsheetValidationErrors;
     message?: string;
 };