authscape 1.0.252 → 1.0.256

package/index.js

@@ -457,8 +457,8 @@ var DocumentManager = function DocumentManager(_ref) {
     setIsLoading = _ref.setIsLoading,
     _ref$viewDocumentType = _ref.viewDocumentType,
     viewDocumentType = _ref$viewDocumentType === void 0 ? 1 : _ref$viewDocumentType,
-    _ref$apiDownloadEnfor = _ref.apiDownloadEnforced,
-    apiDownloadEnforced = _ref$apiDownloadEnfor === void 0 ? false : _ref$apiDownloadEnfor,
+    _ref$disablePreview = _ref.disablePreview,
+    disablePreview = _ref$disablePreview === void 0 ? false : _ref$disablePreview,
     _ref$openToFolderId = _ref.openToFolderId,
     openToFolderId = _ref$openToFolderId === void 0 ? null : _ref$openToFolderId,
     _ref$overrideLockMess = _ref.overrideLockMessage,
@@ -476,22 +476,26 @@ var DocumentManager = function DocumentManager(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     folderParent = _useState6[0],
     setFolderParent = _useState6[1];
-  var _useState7 = (0, _react.useState)([]),
+  var _useState7 = (0, _react.useState)(null),
     _useState8 = _slicedToArray(_useState7, 2),
-    breadCrumb = _useState8[0],
-    setBreadCrumb = _useState8[1];
-  var _useState9 = (0, _react.useState)(null),
+    masterFolder = _useState8[0],
+    setMasterFolder = _useState8[1];
+  var _useState9 = (0, _react.useState)([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    contextMenu = _useState10[0],
-    setContextMenu = _useState10[1];
+    breadCrumb = _useState10[0],
+    setBreadCrumb = _useState10[1];
   var _useState11 = (0, _react.useState)(null),
     _useState12 = _slicedToArray(_useState11, 2),
-    contextFile = _useState12[0],
-    setContextFile = _useState12[1];
-  var _useState13 = (0, _react.useState)(false),
+    contextMenu = _useState12[0],
+    setContextMenu = _useState12[1];
+  var _useState13 = (0, _react.useState)(null),
     _useState14 = _slicedToArray(_useState13, 2),
-    dialogDelete = _useState14[0],
-    setDialogDelete = _useState14[1];
+    contextFile = _useState14[0],
+    setContextFile = _useState14[1];
+  var _useState15 = (0, _react.useState)(false),
+    _useState16 = _slicedToArray(_useState15, 2),
+    dialogDelete = _useState16[0],
+    setDialogDelete = _useState16[1];
   var handleContextMenu = function handleContextMenu(event, file) {
     event.preventDefault();
     setContextFile(file);
@@ -510,40 +514,53 @@ var DocumentManager = function DocumentManager(_ref) {
     if (loadedUser) {
       var fetchDocuments = /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-          var folderId, response, _response;
+          var folderId, folderResponse, response, _response;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 folderId = null;
-                if (folderParent == null && openToFolderId != null) {
-                  folderId = {
-                    id: openToFolderId
-                  };
-                } else if (folderParent != null) {
+                if (!(folderParent == null && openToFolderId != null)) {
+                  _context.next = 9;
+                  break;
+                }
+                folderId = openToFolderId;
+                // should get the current document...
+                _context.next = 5;
+                return apiService().get("/Document/GetDocumentByFolderId?folderId=" + folderId);
+              case 5:
+                folderResponse = _context.sent;
+                if (folderResponse != null && folderResponse.status == 200) {
+                  setMasterFolder(folderResponse.data);
+                }
+                _context.next = 10;
+                break;
+              case 9:
+                if (folderParent != null) {
                   folderId = folderParent.id;
                 }
+              case 10:
                 if (!(folderId != null)) {
-                  _context.next = 9;
+                  _context.next = 17;
                   break;
                 }
-                _context.next = 5;
+                _context.next = 13;
                 return apiService().get("/Document/GetDocumentsAndFiles?parentFolderId=" + folderId + "&ViewDocumentType=" + viewDocumentType);
-              case 5:
+              case 13:
                 response = _context.sent;
                 if (response != null && response.status == 200) {
                   setFiles(response.data);
                 }
-                _context.next = 13;
+                _context.next = 21;
                 break;
-              case 9:
-                _context.next = 11;
+              case 17:
+                _context.next = 19;
                 return apiService().get("/Document/GetDocumentsAndFiles?ViewDocumentType=" + viewDocumentType);
-              case 11:
+              case 19:
                 _response = _context.sent;
                 if (_response != null && _response.status == 200) {
                   setFiles(_response.data);
                 }
-              case 13:
+              case 21:
               case "end":
                 return _context.stop();
             }
@@ -556,10 +573,10 @@ var DocumentManager = function DocumentManager(_ref) {
       fetchDocuments();
     }
   }, [loadedUser, folderParent, update]);
-  var _useState15 = (0, _react.useState)(null),
-    _useState16 = _slicedToArray(_useState15, 2),
-    anchorEl = _useState16[0],
-    setAnchorEl = _useState16[1];
+  var _useState17 = (0, _react.useState)(null),
+    _useState18 = _slicedToArray(_useState17, 2),
+    anchorEl = _useState18[0],
+    setAnchorEl = _useState18[1];
   var open = Boolean(anchorEl);
   var handleClick = function handleClick(event) {
     setAnchorEl(event.currentTarget);
@@ -745,8 +762,8 @@ var DocumentManager = function DocumentManager(_ref) {
     refOveride: fileUploaderRef,
     url: "/Document/UploadFile",
     params: {
-      parentFolderId: folderParent != null ? folderParent.id : "",
-      viewDocumentType: viewDocumentType
+      viewType: viewDocumentType,
+      parentFolderId: folderParent != null ? folderParent.id : ""
     },
     multiple: true,
     variant: "custom",
@@ -784,7 +801,7 @@ var DocumentManager = function DocumentManager(_ref) {
       setFolderParent(null);
       setBreadCrumb([]);
     }
-  }, "My Files"), breadCrumb.map(function (bread, index) {
+  }, masterFolder == null && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, "My Files"), masterFolder != null && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, masterFolder.name)), breadCrumb.map(function (bread, index) {
     return /*#__PURE__*/_react["default"].createElement(_Link["default"], {
       key: index,
       underline: "hover",
@@ -852,7 +869,7 @@ var DocumentManager = function DocumentManager(_ref) {
         fontSize: 80,
         color: "orange"
       }
-    }) : file.documentFileExtentionType == 0 || apiDownloadEnforced ? /*#__PURE__*/_react["default"].createElement(_InsertDriveFileOutlined["default"], {
+    }) : file.documentFileExtentionType == 0 || disablePreview ? /*#__PURE__*/_react["default"].createElement(_InsertDriveFileOutlined["default"], {
       sx: {
         fontSize: 60
       }
@@ -1268,8 +1285,8 @@ var FileUploader = function FileUploader(_ref) {
       var array = [];
       for (var index = 0; index < propertyNames.length; index++) {
         array.push({
-          key: propertyNames[0],
-          value: propertyValues[0]
+          key: propertyNames[index],
+          value: propertyValues[index]
         });
       }
       setParameters(array);

package/package.json

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

package/src/components/DocumentManager.js

@@ -24,12 +24,13 @@ import Tooltip from '@mui/material/Tooltip';
 // remove before merging back
 // import { FileUploader, apiService, NextImage } from 'authscape';
 
-export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1, apiDownloadEnforced = false, openToFolderId = null, overrideLockMessage = "The directory cannot be removed."}) => {
+export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1, disablePreview = false, openToFolderId = null, overrideLockMessage = "The directory cannot be removed."}) => {
 
     const fileUploaderRef = useRef();
     const [files, setFiles] = useState(null);
     const [update, setUpdate] = useState(false);
     const [folderParent, setFolderParent] = useState(null);
+    const [masterFolder, setMasterFolder] = useState(null);
     const [breadCrumb, setBreadCrumb] = useState([]);
 
     const [contextMenu, setContextMenu] = useState(null);
@@ -68,7 +69,14 @@ export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1,
           let folderId = null;
           if (folderParent == null && openToFolderId != null)
           {
-            folderId = { id: openToFolderId };
+            folderId = openToFolderId;
+            // should get the current document...
+
+            let folderResponse = await apiService().get("/Document/GetDocumentByFolderId?folderId=" + folderId);
+            if (folderResponse != null && folderResponse.status == 200)
+            {
+              setMasterFolder(folderResponse.data);
+            }
           }
           else if (folderParent != null)
           {
@@ -259,10 +267,10 @@ export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1,
               </StyledMenu>
             </Box>
 
-
             <FileUploader refOveride={fileUploaderRef} url={"/Document/UploadFile"} params={{
+                    
+                    viewType : viewDocumentType,
                     parentFolderId: (folderParent != null ? folderParent.id : ""),
-                    viewDocumentType: viewDocumentType
                   
                   }} multiple={true} variant='custom' onUploadCompleted={() => {
                         setUpdate(!update);
@@ -294,7 +302,8 @@ export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1,
             setBreadCrumb([]);
 
           }}>
-            My Files
+            {masterFolder == null && <>My Files</>}
+            {masterFolder != null && <>{masterFolder.name}</>}
           </Link>
           {breadCrumb.map((bread, index) => {
             return (
@@ -349,7 +358,7 @@ export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1,
                   <FolderIcon sx={{ fontSize: 80, color:"orange" }} />
                 ) : (
 
-                    file.documentFileExtentionType == 0 || apiDownloadEnforced ? <InsertDriveFileOutlinedIcon sx={{ fontSize: 60 }} /> : <NextImage src={file.uri} alt={"Image"} width={80} height={80} />
+                    file.documentFileExtentionType == 0 || disablePreview ? <InsertDriveFileOutlinedIcon sx={{ fontSize: 60 }} /> : <NextImage src={file.uri} alt={"Image"} width={80} height={80} />
                   
                 )}
                 <Typography variant="subtitle1" sx={{paddingTop:1, fontSize:14}}>{file.name}</Typography>

package/src/components/FileUploader.js

@@ -132,8 +132,8 @@ export const FileUploader = ({
 
       for (let index = 0; index < propertyNames.length; index++) {
         array.push({
-          key: propertyNames[0],
-          value: propertyValues[0],
+          key: propertyNames[index],
+          value: propertyValues[index],
         });
       }