@abgov/jsonforms-components 2.4.5 → 2.4.6

package/index.esm.js

@@ -8489,7 +8489,6 @@ let _2 = t => t,
   _t3$2,
   _t4$2;
 const _excluded$3 = ["data", "path", "handleChange", "uischema"];
-const DELAY_UPLOAD_TIMEOUT_MS = 5;
 const DELAY_DELETE_TIMEOUT_MS = 5;
 const FileUploaderReview = props => {
   return FileUploader(Object.assign({}, props, {
@@ -8499,6 +8498,7 @@ const FileUploaderReview = props => {
 const FileUploader = _ref => {
   let {
       data,
+      path,
       handleChange,
       uischema
     } = _ref,
@@ -8526,15 +8526,17 @@ const FileUploader = _ref => {
   const variant = ((_d = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _d === void 0 ? void 0 : _d.variant) || 'button';
   const multiFileUploader = variant === 'dragdrop';
   const [deleteHide, setDeleteHide] = useState(false);
+  const fileListLength = fileList && ((_e = fileList[props.i18nKeyPrefix]) === null || _e === void 0 ? void 0 : _e.length) || 0;
   function uploadFile(file) {
     if (uploadTrigger) {
+      if (!multiFileUploader) {
+        const fileInList = getFile(fileListLength - 1);
+        if (fileInList) {
+          deleteTrigger(fileInList, propertyId);
+        }
+      }
       uploadTrigger(file, propertyId);
-      const handleFunction = () => {
-        const value = ['Loading', Array.isArray(data) ? data[1] : file === null || file === void 0 ? void 0 : file.name];
-        handleChange(propertyId, value);
-      };
       setDeleteHide(false);
-      setTimeout(handleFunction, DELAY_UPLOAD_TIMEOUT_MS);
     }
   }
   function downloadFile(file) {
@@ -8549,30 +8551,39 @@ const FileUploader = _ref => {
   }
   function getFileName(index) {
     var _a;
-    return fileList && fileList[props.i18nKeyPrefix] && ((_a = fileList[props.i18nKeyPrefix][index]) === null || _a === void 0 ? void 0 : _a.filename);
+    return (_a = getFile(index)) === null || _a === void 0 ? void 0 : _a.filename;
   }
   function getFile(index) {
-    return fileList && fileList[props.i18nKeyPrefix] && fileList[props.i18nKeyPrefix][index];
+    var _a;
+    return (_a = fileList === null || fileList === void 0 ? void 0 : fileList[props.i18nKeyPrefix]) === null || _a === void 0 ? void 0 : _a[index];
   }
   useEffect(() => {
     // UseEffect is required because not having it causes a react update error, but
     // it doesn't function correctly within jsonforms unless there is a minor delay here
     const delayedFunction = () => {
-      var _a;
+      const files = [];
+      for (let i = 0; i < fileListLength; i++) {
+        files.push(getFile(i));
+      }
       if (fileList) {
-        handleChange(propertyId, fileList && ((_a = fileList[propertyId]) === null || _a === void 0 ? void 0 : _a.urn));
+        const data = files.map(f => f.urn).join(';');
+        if (data === '') {
+          handleChange(path, undefined);
+        } else {
+          handleChange(path, data);
+        }
       }
     };
     const timeoutId = setTimeout(delayedFunction, 1);
     return () => clearTimeout(timeoutId);
   }, [handleChange, fileList, propertyId]);
-  const readOnly = ((_f = (_e = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _e === void 0 ? void 0 : _e.componentProps) === null || _f === void 0 ? void 0 : _f.readOnly) === true || (props === null || props === void 0 ? void 0 : props.isStepperReview) === true || user === null;
-  const maxFileSize = (_j = (_h = (_g = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _g === void 0 ? void 0 : _g.componentProps) === null || _h === void 0 ? void 0 : _h.maxFileSize) !== null && _j !== void 0 ? _j : '';
-  const accept = (_m = (_l = (_k = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _k === void 0 ? void 0 : _k.componentProps) === null || _l === void 0 ? void 0 : _l.accept) !== null && _m !== void 0 ? _m : '';
+  const readOnly = ((_g = (_f = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _f === void 0 ? void 0 : _f.componentProps) === null || _g === void 0 ? void 0 : _g.readOnly) === true || (props === null || props === void 0 ? void 0 : props.isStepperReview) === true || user === null;
+  const maxFileSize = (_k = (_j = (_h = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _h === void 0 ? void 0 : _h.componentProps) === null || _j === void 0 ? void 0 : _j.maxFileSize) !== null && _k !== void 0 ? _k : '';
+  const accept = (_o = (_m = (_l = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _l === void 0 ? void 0 : _l.componentProps) === null || _m === void 0 ? void 0 : _m.accept) !== null && _o !== void 0 ? _o : '';
   if (!enumerators) {
     return jsx(Fragment, {});
   }
-  const helpText = (_o = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _o === void 0 ? void 0 : _o.help;
+  const helpText = (_p = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _p === void 0 ? void 0 : _p.help;
   const sentenceCaseLabel = convertToSentenceCase(label);
   const DownloadFileWidget = ({
     index
@@ -8580,7 +8591,7 @@ const FileUploader = _ref => {
     var _a;
     const [showFileDeleteConfirmation, setShowFileDeleteConfirmation] = useState(false);
     return jsx("div", {
-      children: readOnly && index ? jsxs(AttachmentBorderDisabled, {
+      children: readOnly ? jsxs(AttachmentBorderDisabled, {
         children: [getFileName(index), jsx(GoAContextMenuIcon, {
           testId: "download-icon",
           title: "Download",
@@ -8614,7 +8625,7 @@ const FileUploader = _ref => {
             deleteFile(getFile(index));
             setDeleteHide(true);
             const handleFunction = () => {
-              handleChange(propertyId, '');
+              handleChange(path, undefined);
             };
             setTimeout(handleFunction, DELAY_DELETE_TIMEOUT_MS);
           }
@@ -8622,7 +8633,6 @@ const FileUploader = _ref => {
       })
     });
   };
-  const fileListLength = fileList && ((_p = fileList[props.i18nKeyPrefix]) === null || _p === void 0 ? void 0 : _p.length) || 0;
   return jsxs(FileUploaderStyle, {
     className: "FileUploader",
     children: [required ? jsx(GoAFormItem, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "2.4.5",
+  "version": "2.4.6",
   "license": "Apache-2.0",
   "description": "Government of Alberta - React renderers for JSON Forms based on the design system.",
   "repository": "https://github.com/GovAlta/adsp-monorepo",