authscape 1.0.532 → 1.0.536

package/index.js

@@ -3668,6 +3668,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } // import
 function AssignMapping(_ref) {
   var currentUser = _ref.currentUser,
     documentComponentId = _ref.documentComponentId,
+    _ref$setIsLoading = _ref.setIsLoading,
+    setIsLoading = _ref$setIsLoading === void 0 ? null : _ref$setIsLoading,
     _ref$onCancel = _ref.onCancel,
     onCancel = _ref$onCancel === void 0 ? null : _ref$onCancel,
     _ref$onPublished = _ref.onPublished,
@@ -3762,9 +3764,35 @@ function AssignMapping(_ref) {
   }();
   (0, _react.useEffect)(function () {
     if (documentComponentId != null) {
+      if (setIsLoading != null) {
+        setIsLoading(true);
+      }
       setSpreadSheetAddress("/DocumentMappingPreview/PreviewMappedData?companyId=" + currentUser.companyId + "&documentComponentId=" + documentComponentId);
-      fetchMappingFrom();
-      fetchMappingTo();
+      var fetchData = /*#__PURE__*/function () {
+        var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.next = 2;
+                return fetchMappingFrom();
+              case 2:
+                _context3.next = 4;
+                return fetchMappingTo();
+              case 4:
+                if (setIsLoading != null) {
+                  setIsLoading(false);
+                }
+              case 5:
+              case "end":
+                return _context3.stop();
+            }
+          }, _callee3);
+        }));
+        return function fetchData() {
+          return _ref4.apply(this, arguments);
+        };
+      }();
+      fetchData();
     }
   }, [documentComponentId]);
   return /*#__PURE__*/_react["default"].createElement(_system.Box, null, /*#__PURE__*/_react["default"].createElement(_Container["default"], {
@@ -3800,18 +3828,18 @@ function AssignMapping(_ref) {
     sx: {
       marginRight: 2
     },
-    onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+    onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             if (onCancel != null) {
               onCancel();
             }
           case 1:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3);
+      }, _callee4);
     }))
   }, "Cancel"), /*#__PURE__*/_react["default"].createElement(_material.Button, {
     variant: "contained",
@@ -3899,22 +3927,23 @@ function AssignMapping(_ref) {
     }
   }, "Cancel"), /*#__PURE__*/_react["default"].createElement(_material.Button, {
     variant: "contained",
-    onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var publishedRows, response;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            publishedRows = spreadSheetRef.current.getRows(); // publishedRows.forEach(element => {
-            //     alert(JSON.stringify(element));
-            // });
-            _context4.next = 3;
+            if (setIsLoading != null) {
+              setIsLoading(true);
+            }
+            publishedRows = spreadSheetRef.current.getRows();
+            _context5.next = 4;
             return apiService().post("/DocumentMapping/Publish", {
               companyId: currentUser.companyId,
               documentId: documentId,
               publishedRows: publishedRows
             });
-          case 3:
-            response = _context4.sent;
+          case 4:
+            response = _context5.sent;
             if (response != null && response.status == 200) {
               setShowPreviewDialog(false);
               if (onPublished != null) {
@@ -3923,11 +3952,14 @@ function AssignMapping(_ref) {
             } else {
               alert(JSON.stringify(response.data));
             }
-          case 5:
+            if (setIsLoading != null) {
+              setIsLoading(false);
+            }
+          case 7:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4);
+      }, _callee5);
     }))
   }, "Publish"))));
 }
@@ -4405,6 +4437,8 @@ function FileMapping(_ref) {
     fileUploadName = _ref$fileUploadName === void 0 ? "Upload Document" : _ref$fileUploadName,
     _ref$hideDocumentMana = _ref.hideDocumentManager,
     hideDocumentManager = _ref$hideDocumentMana === void 0 ? false : _ref$hideDocumentMana,
+    _ref$setIsLoading = _ref.setIsLoading,
+    setIsLoading = _ref$setIsLoading === void 0 ? null : _ref$setIsLoading,
     _ref$documentTypeId = _ref.documentTypeId,
     documentTypeId = _ref$documentTypeId === void 0 ? null : _ref$documentTypeId,
     _ref$onOpened = _ref.onOpened,
@@ -4442,6 +4476,7 @@ function FileMapping(_ref) {
     }
   }), documentComponentId != null && /*#__PURE__*/_react["default"].createElement(AssignMapping, {
     currentUser: currentUser,
+    setIsLoading: setIsLoading,
     documentComponentId: documentComponentId,
     onCancel: function onCancel() {
       setDocumentComponentId(null);
@@ -5168,7 +5203,7 @@ function MappedColumn(_ref) {
   }, "Matched"))), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
     variant: "body2",
     color: "text.secondary"
-  }, !isMapped && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, "This column is matched"), isMapped && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, "This column is not matched. If not matched it will not import"))), /*#__PURE__*/_react["default"].createElement(_CardActions["default"], {
+  }, !isMapped && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, "This column is matched with ", toName), isMapped && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, "This column is not matched. If not matched it will not import"))), /*#__PURE__*/_react["default"].createElement(_CardActions["default"], {
     sx: {
       backgroundColor: isMapped ? notMatchedColor : matchedColor
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.532",
+  "version": "1.0.536",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/components/mapping/assignMapping.js

@@ -15,7 +15,7 @@ import CloseIcon from '@mui/icons-material/Close';
 import IconButton from '@mui/material/IconButton';
 import ArrowRightAltRoundedIcon from '@mui/icons-material/ArrowRightAltRounded';
 
-export function AssignMapping({currentUser, documentComponentId, onCancel = null, onPublished = null}) {
+export function AssignMapping({currentUser, documentComponentId, setIsLoading = null, onCancel = null, onPublished = null}) {
 
     const [documentId, setDocumentId] = useState(documentComponentId);
 
@@ -58,10 +58,26 @@ export function AssignMapping({currentUser, documentComponentId, onCancel = null
 
         if (documentComponentId != null)
         {
+            if (setIsLoading != null)
+            {
+                setIsLoading(true);
+            }
+
             setSpreadSheetAddress("/DocumentMappingPreview/PreviewMappedData?companyId=" + currentUser.companyId + "&documentComponentId=" + documentComponentId);
 
-            fetchMappingFrom();
-            fetchMappingTo();
+            const fetchData = async () => {
+                await fetchMappingFrom();
+                await fetchMappingTo();
+
+
+                if (setIsLoading != null)
+                {
+                    setIsLoading(false);
+                }
+            }
+
+            fetchData();
+
         }
 
     }, [documentComponentId])
@@ -177,11 +193,12 @@ export function AssignMapping({currentUser, documentComponentId, onCancel = null
                 }}>Cancel</Button>
                 <Button variant="contained" onClick={async () => {
 
-                    let publishedRows = spreadSheetRef.current.getRows();
-                    // publishedRows.forEach(element => {
-                    //     alert(JSON.stringify(element));
-                    // });
+                    if (setIsLoading != null)
+                    {
+                        setIsLoading(true);
+                    }
 
+                    let publishedRows = spreadSheetRef.current.getRows();
 
                     let response = await apiService().post("/DocumentMapping/Publish", {
                         companyId: currentUser.companyId,
@@ -202,6 +219,12 @@ export function AssignMapping({currentUser, documentComponentId, onCancel = null
                     {
                         alert(JSON.stringify(response.data));
                     }
+
+                    if (setIsLoading != null)
+                    {
+                        setIsLoading(false);
+                    }
+
                 }}>
                     Publish
                 </Button>

package/src/components/mapping/fileMapping.js

@@ -3,7 +3,7 @@ import { Box } from '@mui/system';
 // import ManageMappingDocuments from './manageMappingDocuments';
 // import AssignMapping from './AssignMapping';
 
-export function FileMapping({currentUser, fileUploadName = "Upload Document", hideDocumentManager = false, documentTypeId = null, onOpened = null, onPublished = null, onCanceled = null, onArchived = null}) {
+export function FileMapping({currentUser, fileUploadName = "Upload Document", hideDocumentManager = false, setIsLoading = null, documentTypeId = null, onOpened = null, onPublished = null, onCanceled = null, onArchived = null}) {
 
     const [documentComponentId, setDocumentComponentId] = useState(null);
 
@@ -45,7 +45,7 @@ export function FileMapping({currentUser, fileUploadName = "Upload Document", hi
             }
 
             {documentComponentId != null &&
-              <AssignMapping currentUser={currentUser} documentComponentId={documentComponentId}
+              <AssignMapping currentUser={currentUser} setIsLoading={setIsLoading} documentComponentId={documentComponentId}
                 onCancel={() => {
 
                   setDocumentComponentId(null);

package/src/components/mapping/mappedColumn.js

@@ -36,7 +36,7 @@ export function MappedColumn({companyId, documentId, documentType, documentMappi
           }
         </Box>
         <Typography variant="body2" color="text.secondary">
-          {!isMapped && <>This column is matched</>}
+          {!isMapped && <>This column is matched with {toName}</>}
           {isMapped && <>This column is not matched. If not matched it will not import</>}
           
         </Typography>