authscape 1.0.284 → 1.0.286

package/index.js

@@ -460,7 +460,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 // remove before merging back
-// import { FileUploader, apiService, NextImage } from 'authscape';
+//import { FileUploader, apiService, NextImage } from 'authscape';
 
 var DocumentManager = function DocumentManager(_ref) {
   var loadedUser = _ref.loadedUser,
@@ -560,7 +560,9 @@ var DocumentManager = function DocumentManager(_ref) {
               case 5:
                 folderResponse = _context.sent;
                 if (folderResponse != null && folderResponse.status == 200) {
+                  setFolderParent(folderResponse.data);
                   setMasterFolder(folderResponse.data);
+                  folderId = folderResponse.id;
                 }
                 _context.next = 10;
                 break;
@@ -589,7 +591,11 @@ var DocumentManager = function DocumentManager(_ref) {
               case 18:
                 response = _context.sent;
                 if (response != null && response.status == 200) {
-                  setFiles(response.data);
+                  setIsLoading(true);
+                  setTimeout(function () {
+                    // setIsLoading(false);
+                    setFiles(response.data);
+                  }, 500);
                 }
                 _context.next = 26;
                 break;
@@ -845,7 +851,7 @@ var DocumentManager = function DocumentManager(_ref) {
       height: "85vh",
       width: '100%'
     }
-  }, files != null && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, files.documentSegments.length > 0 && folderParent == null && files.documentSegments.map(function (segment, index) {
+  }, files != null && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, masterFolder == null && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, files.documentSegments.length > 0 && folderParent == null && files.documentSegments.map(function (segment, index) {
     return /*#__PURE__*/_react["default"].createElement(_material.Box, {
       sx: {
         paddingTop: 3
@@ -929,7 +935,7 @@ var DocumentManager = function DocumentManager(_ref) {
         }
       }, file.lastUpdated)));
     })), files != null && files.documentAndFiles != null && zeroStateView != null && /*#__PURE__*/_react["default"].createElement(_material.Box, null, zeroStateView(segment)));
-  }), (files.documentSegments.length == 0 || folderParent != null) && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_material.Grid, {
+  })), (files.documentSegments.length == 0 || folderParent != null) && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_material.Grid, {
     container: true,
     spacing: 2
   }, files.documentAndFiles.map(function (file, index) {

package/package.json

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

package/src/components/DocumentManager.js

@@ -22,7 +22,7 @@ import LockRoundedIcon from '@mui/icons-material/LockRounded';
 import Tooltip from '@mui/material/Tooltip';
 
 // remove before merging back
-// import { FileUploader, apiService, NextImage } from 'authscape';
+//import { FileUploader, apiService, NextImage } from 'authscape';
 
 export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1, disablePreview = false, openToFolderId = null, xs=12, sm=6, md=4, lg=2, overrideLockMessage = "The directory cannot be removed.", zeroStateView = null, fieldId1 = null, fieldId2 = null, fieldId3 = null}) => {
 
@@ -77,7 +77,9 @@ export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1,
             let folderResponse = await apiService().get("/Document/GetDocumentByFolderId?folderId=" + folderId);
             if (folderResponse != null && folderResponse.status == 200)
             {
-              setMasterFolder(folderResponse.data);
+                setFolderParent(folderResponse.data);
+                setMasterFolder(folderResponse.data);
+                folderId = folderResponse.id;
             }
           }
           else if (folderParent != null)
@@ -111,7 +113,11 @@ export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1,
             let response = await apiService().get("/Document/GetDocumentsAndFiles?parentFolderId=" + folderId + "&ViewDocumentType=" + viewDocumentType + params);
             if (response != null && response.status == 200)
             {
-              setFiles(response.data);
+              setIsLoading(true);
+              setTimeout(() => {
+                // setIsLoading(false);
+                setFiles(response.data);
+              }, 500);
             }
           }
           else
@@ -308,7 +314,7 @@ export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1,
       }
 
         <Divider />
-        
+
         <Breadcrumbs aria-label="breadcrumb" separator={">"} sx={{marginLeft:1, marginBottom:2, marginTop:2}}>
           <Link underline="hover" color="inherit" sx={{cursor:"pointer", fontWeight:"bold"}} onClick={() => {
 
@@ -340,75 +346,76 @@ export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1,
         {files != null &&
         <>
 
+        {masterFolder == null &&
+        <>
+            {(files.documentSegments.length > 0 && folderParent == null) && files.documentSegments.map((segment, index) => (
+            
+                <Box sx={{paddingTop:3}}>
+                <Typography variant="h6" gutterBottom>
+                    {segment.name}
+                </Typography>
 
-          
-          {(files.documentSegments.length > 0 && folderParent == null) && files.documentSegments.map((segment, index) => (
-          
-            <Box sx={{paddingTop:3}}>
-              <Typography variant="h6" gutterBottom>
-                {segment.name}
-              </Typography>
-
-
-              <Grid container spacing={2}>
-                {files.documentAndFiles.filter(item => item.segmentId == segment.id).map((file, index) => (
-                  
-                  <Grid onContextMenu={(event) => {
-                    handleContextMenu(event, file);
-                  }} item key={index} xs={xs} sm={sm} md={md} lg={lg} onClick={() => handleFileClick(file)}>
-                    <Paper
-                      sx={{
-                        padding: 2,
-                        flexDirection: 'column',
-                        height: "100%", display: "flex", alignItems: "center",
-                        cursor: 'pointer',
-                        maxHeight:300,
-                        position:"relative",
-                        '&:hover': {
-                          backgroundColor: '#F5F5F5'
-                        }
-                      }}>
-
-                        {file.type === 'folder'  && 
-                        <Box sx={{position:"absolute", top:45, color:"white"}}>
-                          {file.count}
-                        </Box>}
-
-                        {file.isLocked &&
-                          <Box sx={{position:"absolute", top:10, right: 10, color:"black"}}>
-                            <Tooltip title={overrideLockMessage}>
-                              <LockRoundedIcon />
-                            </Tooltip>
-                          </Box>
-                        }
-
-                      {file.type === 'folder' ? (
-                        <FolderIcon sx={{ fontSize: 80, color:"orange" }} />
-                      ) : (
 
-                          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>
-                      <Typography variant="subtitle2" sx={{paddingTop:0, fontSize:11}}>{file.lastUpdated}</Typography>
-                    </Paper>
-                  </Grid>
+                <Grid container spacing={2}>
+                    {files.documentAndFiles.filter(item => item.segmentId == segment.id).map((file, index) => (
+                    
+                    <Grid onContextMenu={(event) => {
+                        handleContextMenu(event, file);
+                    }} item key={index} xs={xs} sm={sm} md={md} lg={lg} onClick={() => handleFileClick(file)}>
+                        <Paper
+                        sx={{
+                            padding: 2,
+                            flexDirection: 'column',
+                            height: "100%", display: "flex", alignItems: "center",
+                            cursor: 'pointer',
+                            maxHeight:300,
+                            position:"relative",
+                            '&:hover': {
+                            backgroundColor: '#F5F5F5'
+                            }
+                        }}>
+
+                            {file.type === 'folder'  && 
+                            <Box sx={{position:"absolute", top:45, color:"white"}}>
+                            {file.count}
+                            </Box>}
+
+                            {file.isLocked &&
+                            <Box sx={{position:"absolute", top:10, right: 10, color:"black"}}>
+                                <Tooltip title={overrideLockMessage}>
+                                <LockRoundedIcon />
+                                </Tooltip>
+                            </Box>
+                            }
+
+                        {file.type === 'folder' ? (
+                            <FolderIcon sx={{ fontSize: 80, color:"orange" }} />
+                        ) : (
+
+                            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>
+                        <Typography variant="subtitle2" sx={{paddingTop:0, fontSize:11}}>{file.lastUpdated}</Typography>
+                        </Paper>
+                    </Grid>
+
+                    ))}
+                </Grid>
 
-                ))}
-              </Grid>
 
+                {(files != null && files.documentAndFiles != null && zeroStateView != null) &&
+                    
+                    <Box>
+                    {zeroStateView(segment)}
+                    </Box>
+                }
 
-              {(files != null && files.documentAndFiles != null && zeroStateView != null) &&
-                
-                <Box>
-                  {zeroStateView(segment)}
                 </Box>
-              }
 
-            </Box>
-
-          ))}
-        
+            ))}
+        </>
+        }
           
           {(files.documentSegments.length == 0 || folderParent != null) &&
           <>