authscape 1.0.126 → 1.0.127

package/index.js

@@ -249,7 +249,11 @@ var FileUploader = function FileUploader(_ref) {
     _ref$primaryColor = _ref.primaryColor,
     primaryColor = _ref$primaryColor === void 0 ? "#000" : _ref$primaryColor,
     _ref$onConfirmDelete = _ref.onConfirmDelete,
-    onConfirmDelete = _ref$onConfirmDelete === void 0 ? null : _ref$onConfirmDelete;
+    onConfirmDelete = _ref$onConfirmDelete === void 0 ? null : _ref$onConfirmDelete,
+    _ref$variant = _ref.variant,
+    variant = _ref$variant === void 0 ? "filemanager" : _ref$variant,
+    _ref$onUploadComplete = _ref.onUploadCompleted,
+    onUploadCompleted = _ref$onUploadComplete === void 0 ? null : _ref$onUploadComplete;
   // Declare a new state variable, which we'll call "count"
   var _useState = (0, _react.useState)(""),
     _useState2 = _slicedToArray(_useState, 2),
@@ -354,9 +358,12 @@ var FileUploader = function FileUploader(_ref) {
             _context.next = 12;
             break;
           case 30:
+            if (onUploadCompleted != null) {
+              onUploadCompleted();
+            }
             setUploading(false);
             setMessage("Uploaded successfully");
-          case 32:
+          case 33:
           case "end":
             return _context.stop();
         }
@@ -444,7 +451,11 @@ var FileUploader = function FileUploader(_ref) {
     style: {
       display: "none"
     }
-  }), /*#__PURE__*/_react["default"].createElement(_material.Grid, {
+  }), variant == "custom" && /*#__PURE__*/_react["default"].createElement(_system.Box, {
+    onClick: function onClick() {
+      handleUploadFileInput();
+    }
+  }, children), variant == "filemanager" && /*#__PURE__*/_react["default"].createElement(_material.Grid, {
     container: true,
     spacing: 2
   }, /*#__PURE__*/_react["default"].createElement(_material.Grid, {

package/package.json

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

package/src/components/FileUploader.js

@@ -19,7 +19,6 @@ import Tooltip from '@mui/material/Tooltip';
 import Backdrop from '@mui/material/Backdrop';
 import CircularProgress from '@mui/material/CircularProgress';
 
-
 export const FileUploader = ({
   url,
   params,
@@ -29,7 +28,9 @@ export const FileUploader = ({
   isHidden = false,
   refOveride = null,
   primaryColor = "#000",
-  onConfirmDelete = null
+  onConfirmDelete = null,
+  variant = "filemanager", // custom vs filemanager
+  onUploadCompleted = null
 }) => {
   // Declare a new state variable, which we'll call "count"
   const [message, setMessage] = useState("");
@@ -81,6 +82,7 @@ export const FileUploader = ({
         data.append(element.key, element.value);
       }
 
+
       try {
         await apiService().post(url, data, {
           onUploadProgress: (ProgressEvent) => {
@@ -107,6 +109,11 @@ export const FileUploader = ({
       fileIndex++;
     }
 
+    if (onUploadCompleted != null)
+    {
+      onUploadCompleted();
+    }
+
     setUploading(false);
     setMessage("Uploaded successfully");
   };
@@ -152,149 +159,159 @@ export const FileUploader = ({
   return (
     <Box sx={{ marginTop: 1, display: isHidden ? "none" : "block" }}>
       
-      <input
-        className="inputfile"
-        id="file"
-        type="file"
-        name="file"
-        multiple={multiple}
-        ref={fileUploader}
-        onChange={handleUpload}
-        style={{ display: "none" }}
-      />
-
-      <Grid container spacing={2}>
-        <Grid ref={refOveride} item xs={4} onClick={handleUploadFileInput}>
-          <Grid
-            container
-            sx={{
-              padding: 2,
-              backgroundColor: "#ECEDED",
-              fontSize: "14px",
-              cursor: "pointer",
-              borderRadius: "8px",
-              border: "1px dashed #C8D4D5",
-            }}
-          >
-            <Grid item xs={2}>
-              <Box>
-                <FileCopyRoundedIcon
-                  sx={{ fill: "#C8D4D5", width: 50, height: 50 }}
-                />
-              </Box>
-            </Grid>
-            <Grid item xs={10}>
-              <Box>Drag and drop files here or</Box>
-              <Box sx={{ marginTop: 1 }}>
-                <Stack direction="row" spacing={2}>
-                  <UploadRoundedIcon
-                    sx={{ fill: primaryColor, width: 30, height: 30 }}
-                  />
-                  <Typography
+        <input
+            className="inputfile"
+            id="file"
+            type="file"
+            name="file"
+            multiple={multiple}
+            ref={fileUploader}
+            onChange={handleUpload}
+            style={{ display: "none" }}
+        />
+
+        {variant == "custom" &&
+        <Box onClick={() => {
+            handleUploadFileInput();
+        }}>
+            {children}
+        </Box>
+        }
+
+        {variant == "filemanager" &&
+        <Grid container spacing={2}>
+            <Grid ref={refOveride} item xs={4} onClick={handleUploadFileInput}>
+            <Grid
+                container
+                sx={{
+                padding: 2,
+                backgroundColor: "#ECEDED",
+                fontSize: "14px",
+                cursor: "pointer",
+                borderRadius: "8px",
+                border: "1px dashed #C8D4D5",
+                }}
+            >
+                <Grid item xs={2}>
+                <Box>
+                    <FileCopyRoundedIcon
+                    sx={{ fill: "#C8D4D5", width: 50, height: 50 }}
+                    />
+                </Box>
+                </Grid>
+                <Grid item xs={10}>
+                <Box>Drag and drop files here or</Box>
+                <Box sx={{ marginTop: 1 }}>
+                    <Stack direction="row" spacing={2}>
+                    <UploadRoundedIcon
+                        sx={{ fill: primaryColor, width: 30, height: 30 }}
+                    />
+                    <Typography
+                        variant="h3"
+                        component={"span"}
+                        sx={{ color: primaryColor, paddingTop: 0.6 }}
+                    >
+                        Upload
+                    </Typography>
+                    </Stack>
+                </Box>
+                </Grid>
+                <Grid item xs={12}>
+                {loaded > 0 && (
+                    <LinearProgress
+                    variant="buffer"
+                    value={loaded}
+                    sx={{ marginTop: 2 }}
+                    />
+                )}
+
+                {loaded == 100 && (
+                    <Typography
                     variant="h3"
                     component={"span"}
-                    sx={{ color: primaryColor, paddingTop: 0.6 }}
-                  >
-                    Upload
-                  </Typography>
-                </Stack>
-              </Box>
+                    sx={{ color: primaryColor, paddingTop: 0.6 }}>
+                    Completed
+                    </Typography>
+                )}
+                </Grid>
             </Grid>
-            <Grid item xs={12}>
-              {loaded > 0 && (
-                <LinearProgress
-                  variant="buffer"
-                  value={loaded}
-                  sx={{ marginTop: 2 }}
-                />
-              )}
-
-              {loaded == 100 && (
-                <Typography
-                  variant="h3"
-                  component={"span"}
-                  sx={{ color: primaryColor, paddingTop: 0.6 }}>
-                  Completed
-                </Typography>
-              )}
             </Grid>
-          </Grid>
-        </Grid>
 
-        {children}
-
-        <Grid container sx={{ paddingTop: 1 }}>
-          {filesDownloadable != null &&
-            filesDownloadable.map((fileUpload, idx) => {
-              return (
-                <Grid
-                  key={"fileDownloadable-" + idx}
-                  item
-                  xs={8}
-                  sm={8}
-                  md={5}
-                  lg={3}
-                  sx={{
-                    marginLeft: 2,
-                    padding: 1,
-                    marginTop: 1,
-                    backgroundColor: "#ECEDED",
-                    position: "relative",
-                    fontSize: "14px",
-                    cursor: "pointer",
-                    borderRadius: "8px",
-                    border: "1px solid #54C7DD",
-                  }}
-                  onClick={async () => {
-                    window.open(fileUpload.uri);
-                  }}
-                >
-                  <Tooltip placement="left" arrow title={fileUpload.name}>
-                    <Stack    
-                      direction="row"
-                      spacing={1}
-                      display="flex"
-                      justifyContent={"space-between"}
+            {children}
+
+            <Grid container sx={{ paddingTop: 1 }}>
+            {filesDownloadable != null &&
+                filesDownloadable.map((fileUpload, idx) => {
+                return (
+                    <Grid
+                    key={"fileDownloadable-" + idx}
+                    item
+                    xs={8}
+                    sm={8}
+                    md={5}
+                    lg={3}
+                    sx={{
+                        marginLeft: 2,
+                        padding: 1,
+                        marginTop: 1,
+                        backgroundColor: "#ECEDED",
+                        position: "relative",
+                        fontSize: "14px",
+                        cursor: "pointer",
+                        borderRadius: "8px",
+                        border: "1px solid #54C7DD",
+                    }}
+                    onClick={async () => {
+                        window.open(fileUpload.uri);
+                    }}
                     >
-                      <Box display={"flex"} alignItems="center">
-                        <FileDownloadOutlinedIcon sx={{ fill: "#92D6E3" }} />
-                        <Box
-                          sx={{
-                            paddingTop: 0.6,
-                            marginLeft: "5px",
-                          }}
+                    <Tooltip placement="left" arrow title={fileUpload.name}>
+                        <Stack    
+                        direction="row"
+                        spacing={1}
+                        display="flex"
+                        justifyContent={"space-between"}
                         >
-                          <Typography
+                        <Box display={"flex"} alignItems="center">
+                            <FileDownloadOutlinedIcon sx={{ fill: "#92D6E3" }} />
+                            <Box
                             sx={{
-                              overflow: "hidden",
-                              whiteSpace: "nowrap",
-                              textOverflow: "ellipsis",
-                              width:"350px"
+                                paddingTop: 0.6,
+                                marginLeft: "5px",
                             }}
-                          >
-                            {fileUpload.name}
-                          </Typography>
+                            >
+                            <Typography
+                                sx={{
+                                overflow: "hidden",
+                                whiteSpace: "nowrap",
+                                textOverflow: "ellipsis",
+                                width:"350px"
+                                }}
+                            >
+                                {fileUpload.name}
+                            </Typography>
+                            </Box>
+
+                            <IconButton
+                            aria-label="delete"
+                            sx={{ position: "absolute", right: "0" }}
+                            onClick={(evt) => {
+                                evt.stopPropagation();
+                                setOrderFileId(fileUpload.id);
+                                setViewDeleteDialog(true);
+                            }}
+                            >
+                            <DeleteIcon />
+                            </IconButton>
                         </Box>
-
-                        <IconButton
-                          aria-label="delete"
-                          sx={{ position: "absolute", right: "0" }}
-                          onClick={(evt) => {
-                            evt.stopPropagation();
-                            setOrderFileId(fileUpload.id);
-                            setViewDeleteDialog(true);
-                          }}
-                        >
-                          <DeleteIcon />
-                        </IconButton>
-                      </Box>
-                    </Stack>
-                  </Tooltip>
-                </Grid>
-              );
-            })}
+                        </Stack>
+                    </Tooltip>
+                    </Grid>
+                );
+                })}
+            </Grid>
         </Grid>
-      </Grid>
+        }
 
       <Dialog
         open={viewDeleteDialog}