authscape 1.0.273 → 1.0.275

package/index.js

@@ -505,16 +505,20 @@ var DocumentManager = function DocumentManager(_ref) {
     setBreadCrumb = _useState10[1];
   var _useState11 = (0, _react.useState)(null),
     _useState12 = _slicedToArray(_useState11, 2),
-    contextMenu = _useState12[0],
-    setContextMenu = _useState12[1];
+    uploadParentId = _useState12[0],
+    setUploadParentId = _useState12[1];
   var _useState13 = (0, _react.useState)(null),
     _useState14 = _slicedToArray(_useState13, 2),
-    contextFile = _useState14[0],
-    setContextFile = _useState14[1];
-  var _useState15 = (0, _react.useState)(false),
+    contextMenu = _useState14[0],
+    setContextMenu = _useState14[1];
+  var _useState15 = (0, _react.useState)(null),
     _useState16 = _slicedToArray(_useState15, 2),
-    dialogDelete = _useState16[0],
-    setDialogDelete = _useState16[1];
+    contextFile = _useState16[0],
+    setContextFile = _useState16[1];
+  var _useState17 = (0, _react.useState)(false),
+    _useState18 = _slicedToArray(_useState17, 2),
+    dialogDelete = _useState18[0],
+    setDialogDelete = _useState18[1];
   var handleContextMenu = function handleContextMenu(event, file) {
     event.preventDefault();
     setContextFile(file);
@@ -533,7 +537,7 @@ var DocumentManager = function DocumentManager(_ref) {
     if (loadedUser) {
       var fetchDocuments = /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-          var folderId, folderResponse, response, _response;
+          var folderId, folderResponse, params, response, _response;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
@@ -558,28 +562,39 @@ var DocumentManager = function DocumentManager(_ref) {
                   folderId = folderParent.id;
                 }
               case 10:
+                setUploadParentId(folderId);
+                params = "";
+                if (fieldId1 != null) {
+                  params = "&fieldId1=" + fieldId1;
+                }
+                if (fieldId2 != null) {
+                  params = "&fieldId2=" + fieldId2;
+                }
+                if (fieldId3 != null) {
+                  params = "&fieldId3=" + fieldId3;
+                }
                 if (!(folderId != null)) {
-                  _context.next = 17;
+                  _context.next = 22;
                   break;
                 }
-                _context.next = 13;
-                return apiService().get("/Document/GetDocumentsAndFiles?parentFolderId=" + folderId + "&ViewDocumentType=" + viewDocumentType + "&fieldId1=" + fieldId1 + "&fieldId2=" + fieldId2 + "&fieldId3=" + fieldId3);
-              case 13:
+                _context.next = 18;
+                return apiService().get("/Document/GetDocumentsAndFiles?parentFolderId=" + folderId + "&ViewDocumentType=" + viewDocumentType + params);
+              case 18:
                 response = _context.sent;
                 if (response != null && response.status == 200) {
                   setFiles(response.data);
                 }
-                _context.next = 21;
+                _context.next = 26;
                 break;
-              case 17:
-                _context.next = 19;
-                return apiService().get("/Document/GetDocumentsAndFiles?ViewDocumentType=" + viewDocumentType + "&fieldId1=" + fieldId1 + "&fieldId2=" + fieldId2 + "&fieldId3=" + fieldId3);
-              case 19:
+              case 22:
+                _context.next = 24;
+                return apiService().get("/Document/GetDocumentsAndFiles?ViewDocumentType=" + viewDocumentType + params);
+              case 24:
                 _response = _context.sent;
                 if (_response != null && _response.status == 200) {
                   setFiles(_response.data);
                 }
-              case 21:
+              case 26:
               case "end":
                 return _context.stop();
             }
@@ -592,10 +607,10 @@ var DocumentManager = function DocumentManager(_ref) {
       fetchDocuments();
     }
   }, [loadedUser, folderParent, update]);
-  var _useState17 = (0, _react.useState)(null),
-    _useState18 = _slicedToArray(_useState17, 2),
-    anchorEl = _useState18[0],
-    setAnchorEl = _useState18[1];
+  var _useState19 = (0, _react.useState)(null),
+    _useState20 = _slicedToArray(_useState19, 2),
+    anchorEl = _useState20[0],
+    setAnchorEl = _useState20[1];
   var open = Boolean(anchorEl);
   var handleClick = function handleClick(event) {
     setAnchorEl(event.currentTarget);
@@ -782,7 +797,7 @@ var DocumentManager = function DocumentManager(_ref) {
     url: "/Document/UploadFile",
     params: {
       viewType: viewDocumentType,
-      parentFolderId: folderParent != null ? folderParent.id : ""
+      parentFolderId: uploadParentId
     },
     multiple: true,
     variant: "custom",

package/package.json

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

package/src/components/DocumentManager.js

@@ -33,6 +33,8 @@ export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1,
     const [masterFolder, setMasterFolder] = useState(null);
     const [breadCrumb, setBreadCrumb] = useState([]);
 
+    const [uploadParentId, setUploadParentId] = useState(null);
+
     const [contextMenu, setContextMenu] = useState(null);
     const [contextFile, setContextFile] = useState(null);
 
@@ -82,10 +84,31 @@ export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1,
           {
             folderId = folderParent.id;
           }
+
+
+          setUploadParentId(folderId);
+
+
+          let params = "";
+          if (fieldId1 != null)
+          {
+            params = "&fieldId1=" + fieldId1;
+          }
+
+          if (fieldId2 != null)
+          {
+            params = "&fieldId2=" + fieldId2;
+          }
+
+          if (fieldId3 != null)
+          {
+            params = "&fieldId3=" + fieldId3;
+          }
+
         
           if (folderId != null)
           {
-            let response = await apiService().get("/Document/GetDocumentsAndFiles?parentFolderId=" + folderId + "&ViewDocumentType=" + viewDocumentType + "&fieldId1=" + fieldId1 + "&fieldId2=" + fieldId2 + "&fieldId3=" + fieldId3);
+            let response = await apiService().get("/Document/GetDocumentsAndFiles?parentFolderId=" + folderId + "&ViewDocumentType=" + viewDocumentType + params);
             if (response != null && response.status == 200)
             {
               setFiles(response.data);
@@ -93,7 +116,7 @@ export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1,
           }
           else
           {
-            let response = await apiService().get("/Document/GetDocumentsAndFiles?ViewDocumentType=" + viewDocumentType + "&fieldId1=" + fieldId1 + "&fieldId2=" + fieldId2 + "&fieldId3=" + fieldId3);
+            let response = await apiService().get("/Document/GetDocumentsAndFiles?ViewDocumentType=" + viewDocumentType + params);
             if (response != null && response.status == 200)
             {
               setFiles(response.data);  
@@ -270,7 +293,7 @@ export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1,
             <FileUploader refOveride={fileUploaderRef} url={"/Document/UploadFile"} params={{
                     
                     viewType : viewDocumentType,
-                    parentFolderId: (folderParent != null ? folderParent.id : ""),
+                    parentFolderId: uploadParentId,
                   
                   }} multiple={true} variant='custom' onUploadCompleted={() => {
                         setUpdate(!update);