authscape 1.0.126 → 1.0.128

package/index.js

@@ -197,6 +197,82 @@ _defineProperty(Datatable, "defaultProps", {
 });
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.EditableDatagrid = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _xDataGrid = require("@mui/x-data-grid");
+var _material = require("@mui/material");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+var EditableDatagrid = function EditableDatagrid(_ref) {
+  var columns = _ref.columns,
+    rows = _ref.rows,
+    _isCellEditable = _ref.isCellEditable,
+    onCellEdited = _ref.onCellEdited,
+    _ref$height = _ref.height,
+    height = _ref$height === void 0 ? "50vh" : _ref$height,
+    _ref$pageSize = _ref.pageSize,
+    pageSize = _ref$pageSize === void 0 ? 50 : _ref$pageSize,
+    _ref$rowsPerPage = _ref.rowsPerPage,
+    rowsPerPage = _ref$rowsPerPage === void 0 ? [25, 50, 100] : _ref$rowsPerPage,
+    _ref$rowHeight = _ref.rowHeight,
+    rowHeight = _ref$rowHeight === void 0 ? 70 : _ref$rowHeight;
+  var handleCellEditCommit = _react["default"].useCallback(function () {
+    return /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+        var id, field, value, editedRow;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              id = params.id, field = params.field, value = params.value;
+              editedRow = {
+                id: id,
+                field: field,
+                value: value
+              };
+              onCellEdited(editedRow);
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x) {
+        return _ref2.apply(this, arguments);
+      };
+    }();
+  }, []);
+  return /*#__PURE__*/_react["default"].createElement(_material.Box, {
+    sx: {
+      height: height
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_xDataGrid.DataGrid, {
+    rows: rows,
+    columns: columns,
+    getRowHeight: function getRowHeight() {
+      return rowHeight;
+    },
+    pageSize: pageSize,
+    rowsPerPageOptions: rowsPerPage,
+    disableSelectionOnClick: true,
+    onCellEditCommit: handleCellEditCommit(),
+    isCellEditable: function isCellEditable(params) {
+      if (_isCellEditable != null) {
+        _isCellEditable(params);
+      }
+      return true;
+    }
+  }));
+};
+exports.EditableDatagrid = EditableDatagrid;
+"use strict";
+
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -249,7 +325,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 +434,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 +527,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.128",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/components/EditableDatagrid.js

@@ -0,0 +1,40 @@
+import React, {useEffect, useState} from 'react';
+import { DataGrid, GridActionsCellItem } from "@mui/x-data-grid";
+import { Box } from '@mui/material';
+
+export const EditableDatagrid = ({columns, rows, isCellEditable, onCellEdited, height="50vh", pageSize = 50, rowsPerPage  = [25, 50, 100], rowHeight = 70}) => {
+
+    const handleCellEditCommit = React.useCallback(() => async (params) => {
+
+        const { id, field, value } = params;
+        const editedRow = { id, field, value };
+
+        onCellEdited(editedRow);
+    
+    }, []);
+
+    return (
+        <Box sx={{height}}>
+            <DataGrid
+                rows={rows}
+                columns={columns}
+                getRowHeight={() => {
+                    return rowHeight;
+                }}
+                pageSize={pageSize}
+                rowsPerPageOptions={rowsPerPage}
+                disableSelectionOnClick
+                onCellEditCommit={handleCellEditCommit()}
+                isCellEditable={(params) => {
+
+                    if (isCellEditable != null)
+                    {
+                        isCellEditable(params);
+                    }
+                    return true;
+                }}
+            />
+        </Box>
+    )
+
+};

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}