authscape 1.0.280 → 1.0.282

package/index.js

@@ -422,7 +422,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.DocumentManager = void 0;
 var _material = require("@mui/material");
 var _react = _interopRequireWildcard(require("react"));
-var _AddRounded = _interopRequireDefault(require("@mui/icons-material/AddRounded"));
 var _DeleteRounded = _interopRequireDefault(require("@mui/icons-material/DeleteRounded"));
 var _Folder = _interopRequireDefault(require("@mui/icons-material/Folder"));
 var _InsertDriveFile = _interopRequireDefault(require("@mui/icons-material/InsertDriveFile"));
@@ -430,7 +429,6 @@ var _styles = require("@mui/material/styles");
 var _Menu = _interopRequireDefault(require("@mui/material/Menu"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
 var _Divider = _interopRequireDefault(require("@mui/material/Divider"));
-var _KeyboardArrowDown = _interopRequireDefault(require("@mui/icons-material/KeyboardArrowDown"));
 var _InsertDriveFileOutlined = _interopRequireDefault(require("@mui/icons-material/InsertDriveFileOutlined"));
 var _Breadcrumbs = _interopRequireDefault(require("@mui/material/Breadcrumbs"));
 var _Link = _interopRequireDefault(require("@mui/material/Link"));
@@ -458,7 +456,8 @@ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructur
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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; }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } // import AddRoundedIcon from '@mui/icons-material/AddRounded';
+// import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
 // remove before merging back
 // import { FileUploader, apiService, NextImage } from 'authscape';
 
@@ -754,18 +753,6 @@ var DocumentManager = function DocumentManager(_ref) {
     "aria-expanded": open ? 'true' : undefined,
     variant: "contained",
     disableElevation: true,
-    onClick: handleClick,
-    startIcon: /*#__PURE__*/_react["default"].createElement(_AddRounded["default"], null),
-    endIcon: /*#__PURE__*/_react["default"].createElement(_KeyboardArrowDown["default"], null)
-  }, "New"), /*#__PURE__*/_react["default"].createElement(StyledMenu, {
-    id: "demo-customized-menu",
-    MenuListProps: {
-      'aria-labelledby': 'demo-customized-button'
-    },
-    anchorEl: anchorEl,
-    open: open,
-    onClose: handleClose
-  }, /*#__PURE__*/_react["default"].createElement(_MenuItem["default"], {
     onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var newDocumentName, response;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
@@ -789,15 +776,13 @@ var DocumentManager = function DocumentManager(_ref) {
               setUpdate(!update);
             }
           case 6:
-            handleClose();
-          case 7:
           case "end":
             return _context3.stop();
         }
       }, _callee3);
     })),
-    disableRipple: true
-  }, /*#__PURE__*/_react["default"].createElement(_InsertDriveFile["default"], null), "New Folder"))), /*#__PURE__*/_react["default"].createElement(FileUploader, {
+    startIcon: /*#__PURE__*/_react["default"].createElement(_InsertDriveFile["default"], null)
+  }, "New Folder")), (files != null && files.documentSegments.length == 0 || folderParent != null) && /*#__PURE__*/_react["default"].createElement(FileUploader, {
     refOveride: fileUploaderRef,
     url: "/Document/UploadFile",
     params: {
@@ -857,10 +842,94 @@ var DocumentManager = function DocumentManager(_ref) {
       height: "85vh",
       width: '100%'
     }
-  }, /*#__PURE__*/_react["default"].createElement(_material.Grid, {
+  }, files != 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
+      }
+    }, /*#__PURE__*/_react["default"].createElement(_material.Typography, {
+      variant: "h6",
+      gutterBottom: true
+    }, segment.name), /*#__PURE__*/_react["default"].createElement(_material.Grid, {
+      container: true,
+      spacing: 2
+    }, files.documentAndFiles.filter(function (item) {
+      return item.segmentId == segment.id;
+    }).map(function (file, index) {
+      return /*#__PURE__*/_react["default"].createElement(_material.Grid, {
+        onContextMenu: function onContextMenu(event) {
+          handleContextMenu(event, file);
+        },
+        item: true,
+        key: index,
+        xs: xs,
+        sm: sm,
+        md: md,
+        lg: lg,
+        onClick: function onClick() {
+          return handleFileClick(file);
+        }
+      }, /*#__PURE__*/_react["default"].createElement(_material.Paper, {
+        sx: {
+          padding: 2,
+          flexDirection: 'column',
+          height: "100%",
+          display: "flex",
+          alignItems: "center",
+          cursor: 'pointer',
+          maxHeight: 300,
+          position: "relative",
+          '&:hover': {
+            backgroundColor: '#F5F5F5'
+          }
+        }
+      }, file.type === 'folder' && /*#__PURE__*/_react["default"].createElement(_material.Box, {
+        sx: {
+          position: "absolute",
+          top: 45,
+          color: "white"
+        }
+      }, file.count), file.isLocked && /*#__PURE__*/_react["default"].createElement(_material.Box, {
+        sx: {
+          position: "absolute",
+          top: 10,
+          right: 10,
+          color: "black"
+        }
+      }, /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
+        title: overrideLockMessage
+      }, /*#__PURE__*/_react["default"].createElement(_LockRounded["default"], null))), file.type === 'folder' ? /*#__PURE__*/_react["default"].createElement(_Folder["default"], {
+        sx: {
+          fontSize: 80,
+          color: "orange"
+        }
+      }) : file.documentFileExtentionType == 0 || disablePreview ? /*#__PURE__*/_react["default"].createElement(_InsertDriveFileOutlined["default"], {
+        sx: {
+          fontSize: 60
+        }
+      }) : /*#__PURE__*/_react["default"].createElement(NextImage, {
+        src: file.uri,
+        alt: "Image",
+        width: 80,
+        height: 80
+      }), /*#__PURE__*/_react["default"].createElement(_material.Typography, {
+        variant: "subtitle1",
+        sx: {
+          paddingTop: 1,
+          fontSize: 14
+        }
+      }, file.name), /*#__PURE__*/_react["default"].createElement(_material.Typography, {
+        variant: "subtitle2",
+        sx: {
+          paddingTop: 0,
+          fontSize: 11
+        }
+      }, file.lastUpdated)));
+    })));
+  }), (files.documentSegments.length == 0 || folderParent != null) && /*#__PURE__*/_react["default"].createElement(_material.Grid, {
     container: true,
     spacing: 2
-  }, files != null && files.map(function (file, index) {
+  }, files.documentAndFiles.map(function (file, index) {
     return /*#__PURE__*/_react["default"].createElement(_material.Grid, {
       onContextMenu: function onContextMenu(event) {
         handleContextMenu(event, file);
@@ -930,7 +999,7 @@ var DocumentManager = function DocumentManager(_ref) {
         fontSize: 11
       }
     }, file.lastUpdated)));
-  })), /*#__PURE__*/_react["default"].createElement(_Menu["default"], {
+  }))), /*#__PURE__*/_react["default"].createElement(_Menu["default"], {
     open: contextMenu !== null,
     onClose: handleClose,
     anchorReference: "anchorPosition",
@@ -961,19 +1030,33 @@ var DocumentManager = function DocumentManager(_ref) {
     }
   }, "Cancel"), /*#__PURE__*/_react["default"].createElement(_material.Button, {
     onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var response;
+      var response, _response2;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             dialogDeleteClosed();
-            _context4.next = 3;
+            if (!(contextFile.type == "folder")) {
+              _context4.next = 8;
+              break;
+            }
+            _context4.next = 4;
             return apiService()["delete"]("/Document/DeleteFolder?documentId=" + contextFile.id);
-          case 3:
+          case 4:
             response = _context4.sent;
             if (response != null && response.status == 200) {
               setUpdate(!update);
             }
-          case 5:
+            _context4.next = 12;
+            break;
+          case 8:
+            _context4.next = 10;
+            return apiService()["delete"]("/Document/DeleteFile?documentId=" + contextFile.id);
+          case 10:
+            _response2 = _context4.sent;
+            if (_response2 != null && _response2.status == 200) {
+              setUpdate(!update);
+            }
+          case 12:
           case "end":
             return _context4.stop();
         }

package/package.json

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

package/src/components/DocumentManager.js

@@ -1,6 +1,6 @@
 import { AppBar, Box, Button, Toolbar, Typography, Grid, Paper } from '@mui/material';
 import React, {useEffect, useState, useRef} from 'react';
-import AddRoundedIcon from '@mui/icons-material/AddRounded';
+// import AddRoundedIcon from '@mui/icons-material/AddRounded';
 import DeleteRoundedIcon from '@mui/icons-material/DeleteRounded';
 import FolderIcon from '@mui/icons-material/Folder';
 import InsertDriveFileIcon from '@mui/icons-material/InsertDriveFile';
@@ -8,7 +8,7 @@ import { styled, alpha } from '@mui/material/styles';
 import Menu from '@mui/material/Menu';
 import MenuItem from '@mui/material/MenuItem';
 import Divider from '@mui/material/Divider';
-import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
+// import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
 import InsertDriveFileOutlinedIcon from '@mui/icons-material/InsertDriveFileOutlined';
 import Breadcrumbs from '@mui/material/Breadcrumbs';
 import Link from '@mui/material/Link';
@@ -241,6 +241,38 @@ export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1,
         <AppBar position="static" color='inherit' elevation={0}>
           <Toolbar>
             <Box>
+              <Button
+                id="demo-customized-button"
+                aria-controls={open ? 'demo-customized-menu' : undefined}
+                aria-haspopup="true"
+                aria-expanded={open ? 'true' : undefined}
+                variant="contained"
+                disableElevation
+                onClick={async () => {
+
+                  let newDocumentName = prompt("New folder name");
+                  if (newDocumentName != null && newDocumentName != "")
+                  {
+                    let response = await apiService().post("/Document/CreateFolder", {
+                      folderName:  newDocumentName,
+                      parentFolderId: folderParent != null ? folderParent.id : null,
+                      viewDocumentType: viewDocumentType
+                    });
+
+                    if (response != null && response.status == 200)
+                    {
+                      // refresh
+                      setUpdate(!update);
+                    }
+
+                  }
+
+                }}
+                startIcon={<InsertDriveFileIcon />}>
+                New Folder
+              </Button>
+            </Box>
+            {/* <Box>
               <Button
                 id="demo-customized-button"
                 aria-controls={open ? 'demo-customized-menu' : undefined}
@@ -288,8 +320,9 @@ export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1,
                   New Folder
                 </MenuItem>
               </StyledMenu>
-            </Box>
+            </Box> */}
 
+            {(files != null && files.documentSegments.length == 0 || folderParent != null) &&
             <FileUploader refOveride={fileUploaderRef} url={"/Document/UploadFile"} params={{
                     
                     viewType : viewDocumentType,
@@ -312,7 +345,8 @@ export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1,
                     Upload File(s)
                   </Button>
 
-                </FileUploader>
+            </FileUploader>
+            }
           </Toolbar>
         </AppBar>
 
@@ -345,53 +379,123 @@ export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1,
       </Box>
 
       <Box sx={{height: "85vh", width: '100%' }}>
-        <Grid container spacing={2}>
-          {files != null && files.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>
-                  }
+        {files != null &&
+        <>
+
 
-                {file.type === 'folder' ? (
-                  <FolderIcon sx={{ fontSize: 80, color:"orange" }} />
-                ) : (
+          
+          {(files.documentSegments.length > 0 && folderParent == null) && files.documentSegments.map((segment, index) => (
+          
+            <Box sx={{paddingTop:3}}>
+              <Typography variant="h6" gutterBottom>
+                {segment.name}
+              </Typography>
 
-                    file.documentFileExtentionType == 0 || disablePreview ? <InsertDriveFileOutlinedIcon sx={{ fontSize: 60 }} /> : <NextImage src={file.uri} alt={"Image"} width={80} height={80} />
+
+              <Grid container spacing={2}>
+                {files.documentAndFiles.filter(item => item.segmentId == segment.id).map((file, index) => (
                   
-                )}
-                <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 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>
+
+            </Box>
 
           ))}
-        </Grid>
+        
+          
+          {(files.documentSegments.length == 0 || folderParent != null) &&
+          <Grid container spacing={2}>
+            {files.documentAndFiles.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>
+          }
 
+        </>
+        }
         <Menu
           open={contextMenu !== null}
           onClose={handleClose}
@@ -451,10 +555,21 @@ export const DocumentManager = ({loadedUser, setIsLoading, viewDocumentType = 1,
           <Button onClick={async () => {
             dialogDeleteClosed();
 
-            let response = await apiService().delete("/Document/DeleteFolder?documentId=" + contextFile.id);
-            if (response != null && response.status == 200)
+            if (contextFile.type == "folder")
             {
-              setUpdate(!update);
+              let response = await apiService().delete("/Document/DeleteFolder?documentId=" + contextFile.id);
+              if (response != null && response.status == 200)
+              {
+                setUpdate(!update);
+              }
+            }
+            else
+            {
+              let response = await apiService().delete("/Document/DeleteFile?documentId=" + contextFile.id);
+              if (response != null && response.status == 200)
+              {
+                setUpdate(!update);
+              }
             }
 
           }} autoFocus>