@awell-health/ui-library 0.1.97 → 0.1.98

package/dist/index.js

@@ -41218,6 +41218,40 @@ Check the top-level render call using <` + t + ">.");
       return { options: options, loading: loading, error: error, onIcdClassificationSearchChange: onIcdClassificationSearchChange };
     };
 
+    var custom_json_parser = function (blob, defaultValue) {
+      if (defaultValue === void 0) {defaultValue = 'invalid JSON';}
+      try {
+        if (typeof blob !== 'string') {
+          throw new Error();
+        }
+        var parsed = JSON.parse(blob);
+        if (typeof parsed === 'string') {
+          return JSON.parse(parsed);
+        }
+        return parsed;
+      }
+      catch (error) {
+        return defaultValue;
+      }
+    };
+
+    var areAttachmentsValid = function (_a) {
+      var attachmentsValue = _a.attachmentsValue,required = _a.required,acceptedFileTypes = _a.acceptedFileTypes;
+      var parseAttachments = function (val) {
+        try {
+          return JSON.parse(val);
+        }
+        catch (error) {
+          return [];
+        }
+      };
+      var attachments = parseAttachments(attachmentsValue);
+      if (required) {
+        return !lodash.exports.isNil(attachments) && attachments.length > 0;
+      }
+      return attachments.every(function (attachment) {var _a;return acceptedFileTypes.includes((_a = attachment.contentType) !== null && _a !== void 0 ? _a : '');});
+    };
+
     var Tr={exports:{}},En={};
     /**
      * @license React
@@ -48061,187 +48095,138 @@ var     Kr=[{
 
     var classes$9 = {"file_input_field_container":"awell__FileInputField_file_input_field_container","error_message":"awell__FileInputField_error_message","file_upload_wrapper":"awell__FileInputField_file_upload_wrapper","file_list_wrapper":"awell__FileInputField_file_list_wrapper","btn-square":"awell__FileInputField_btn-square"};
 
-    var FileInputField = function (_a) {
-      var id = _a.id,label = _a.label,accept = _a.accept,_b = _a.multiple,multiple = _b === void 0 ? true : _b,error = _a.error,onChange = _a.onChange,onError = _a.onError,_c = _a.className,className = _c === void 0 ? '' : _c,dataCy = _a.dataCy,onFileUpload = _a.onFileUpload,configSlug = _a.configSlug,value = _a.value,mandatory = _a.mandatory;
-      var _d = React.useState(Array.isArray(value) ?
-      value === null || value === void 0 ? void 0 : value.map(function (attachment) {
-        var _a, _b, _c, _d;
-        return {
-          name: (_a = attachment.filename) !== null && _a !== void 0 ? _a : '',
-          size: (_b = attachment.size) !== null && _b !== void 0 ? _b : 0,
-          type: (_c = attachment.contentType) !== null && _c !== void 0 ? _c : '',
-          url: (_d = attachment.url) !== null && _d !== void 0 ? _d : '',
-          progress: 100,
-          error: undefined };
-
-      }) :
-      []),selectedFiles = _d[0],setSelectedFiles = _d[1];
-      React.useEffect(function () {
-        var attachments = selectedFiles.
-        filter(function (file) {return file.url;}).
-        map(function (file) {return {
-            url: file.url,
-            filename: file.name,
-            contentType: file.type,
-            size: file.size };
-        });
-        onChange(attachments);
-      }, [selectedFiles]);
+    var SingleFileInputField = function (_a) {
+      var _b, _c, _d, _e, _f;
+      var id = _a.id,label = _a.label,accept = _a.accept,error = _a.error,onChange = _a.onChange,onError = _a.onError,_g = _a.className,className = _g === void 0 ? '' : _g,dataCy = _a.dataCy,onFileUpload = _a.onFileUpload,configSlug = _a.configSlug,value = _a.value,mandatory = _a.mandatory,disabled = _a.disabled;
+      var _h = React.useState(!lodash.exports.isNil(value) && !lodash.exports.isEmpty(value) ?
+      {
+        id: (_b = value.filename) !== null && _b !== void 0 ? _b : 'untitled',
+        name: (_c = value.filename) !== null && _c !== void 0 ? _c : 'untitled',
+        size: (_d = value.size) !== null && _d !== void 0 ? _d : 0,
+        type: (_e = value.contentType) !== null && _e !== void 0 ? _e : '',
+        url: (_f = value.url) !== null && _f !== void 0 ? _f : '',
+        progress: 100,
+        error: undefined } :
+
+      undefined),selectedFile = _h[0],setSelectedFile = _h[1];
       var convertErrorMessage = function (error) {
         if (error === 'Failed to fetch') {
           return 'File upload failed. Please remove this file and try again.';
         }
         return error;
       };
-      var uploadFilesToStorage = function (files) {return __awaiter(void 0, void 0, void 0, function () {
-          var fileListWithUrls, _loop_1, _i, _a, file;
-          return __generator(this, function (_b) {
-            switch (_b.label) {
+      var uploadFileToStorage = function (file) {return __awaiter(void 0, void 0, void 0, function () {
+          var uploadingFile, fileUrl, completedFile, finalFile, attachment, error_1, failedFile;
+          return __generator(this, function (_a) {
+            switch (_a.label) {
               case 0:
-                fileListWithUrls = [];
-                _loop_1 = function (file) {
-                  var uploadingFile_1, fileUrl, completedFile_1, error_1, failedFile_1;
-                  return __generator(this, function (_c) {
-                    switch (_c.label) {
-                      case 0:
-                        _c.trys.push([0, 3,, 4]);
-                        uploadingFile_1 = {
-                          id: file.name,
-                          name: file.name,
-                          size: file.size,
-                          type: file.type,
-                          progress: 10,
-                          error: undefined };
-
-                        setSelectedFiles(function (prev) {return __spreadArray(__spreadArray([], prev.filter(function (f) {return f.id !== file.name;}), true), [
-                          uploadingFile_1],
-                          false);});
-                        return [4, onFileUpload === null || onFileUpload === void 0 ? void 0 : onFileUpload(file, configSlug)];
-                      case 1:
-                        fileUrl = _c.sent();
-                        completedFile_1 = {
-                          id: file.name,
-                          name: file.name,
-                          size: file.size,
-                          type: file.type,
-                          progress: 99,
-                          error: undefined,
-                          url: fileUrl };
-
-                        setSelectedFiles(function (prev) {return __spreadArray(__spreadArray([], prev.filter(function (f) {return f.id !== file.name;}), true), [
-                          completedFile_1],
-                          false);});
-                        return [4, new Promise(function (resolve) {return setTimeout(resolve, 100);})];
-                      case 2:
-                        _c.sent();
-                        setSelectedFiles(function (prev) {return __spreadArray(__spreadArray([], prev.filter(function (f) {return f.id !== file.name;}), true), [
-                          __assign(__assign({}, completedFile_1), { progress: 100 })],
-                          false);});
-                        fileListWithUrls.push(completedFile_1);
-                        return [3, 4];
-                      case 3:
-                        error_1 = _c.sent();
-                        failedFile_1 = {
-                          id: file.name,
-                          name: file.name,
-                          size: file.size,
-                          type: file.type,
-                          progress: 0,
-                          error: error_1 instanceof Error ?
-                          convertErrorMessage(error_1.message) :
-                          'File upload failed',
-                          url: undefined };
-
-                        setSelectedFiles(function (prev) {return __spreadArray(__spreadArray([], prev.filter(function (f) {return f.id !== file.name;}), true), [
-                          failedFile_1],
-                          false);});
-                        fileListWithUrls.push(failedFile_1);
-                        return [3, 4];
-                      case 4:return [2];}
-
-                  });
-                };
-                _i = 0, _a = Array.from(files);
-                _b.label = 1;
+                _a.trys.push([0, 3,, 4]);
+                uploadingFile = {
+                  id: file.name,
+                  name: file.name,
+                  size: file.size,
+                  type: file.type,
+                  progress: 10,
+                  error: undefined };
+
+                setSelectedFile(uploadingFile);
+                return [4, onFileUpload === null || onFileUpload === void 0 ? void 0 : onFileUpload(file, configSlug)];
               case 1:
-                if (!(_i < _a.length)) return [3, 4];
-                file = _a[_i];
-                return [5, _loop_1(file)];
+                fileUrl = _a.sent();
+                completedFile = __assign(__assign({}, uploadingFile), { progress: 99, error: undefined, url: fileUrl });
+                setSelectedFile(completedFile);
+                return [4, new Promise(function (resolve) {return setTimeout(resolve, 100);})];
               case 2:
-                _b.sent();
-                _b.label = 3;
+                _a.sent();
+                finalFile = __assign(__assign({}, completedFile), { progress: 100 });
+                setSelectedFile(finalFile);
+                if (finalFile.url) {
+                  attachment = {
+                    url: finalFile.url,
+                    filename: finalFile.name,
+                    contentType: finalFile.type,
+                    size: finalFile.size };
+
+                  onChange(attachment);
+                }
+                return [2, finalFile];
               case 3:
-                _i++;
-                return [3, 1];
-              case 4:return [2, fileListWithUrls];}
+                error_1 = _a.sent();
+                failedFile = {
+                  id: file.name,
+                  name: file.name,
+                  size: file.size,
+                  type: file.type,
+                  progress: 0,
+                  error: error_1 instanceof Error ?
+                  convertErrorMessage(error_1.message) :
+                  'File upload failed',
+                  url: undefined };
+
+                setSelectedFile(failedFile);
+                return [2, failedFile];
+              case 4:return [2];}
 
           });
         });};
       var handleFilesChange = function (files) {return __awaiter(void 0, void 0, void 0, function () {
-          var fileList;
+          var file, pendingFile;
           return __generator(this, function (_a) {
             switch (_a.label) {
               case 0:
-                fileList = Array.from(files).map(function (file) {return {
-                    id: file.name,
-                    name: file.name,
-                    size: file.size,
-                    type: file.type,
-                    progress: 1,
-                    error: undefined };
-                });
-                setSelectedFiles(function (prev) {return __spreadArray(__spreadArray([], prev, true), fileList, true);});
-                return [4, uploadFilesToStorage(files)];
+                file = files[0];
+                if (!file) {
+                  onChange(undefined);
+                  setSelectedFile(undefined);
+                  return [2];
+                }
+                pendingFile = {
+                  id: file.name,
+                  name: file.name,
+                  size: file.size,
+                  type: file.type,
+                  progress: 1,
+                  error: undefined };
+
+                setSelectedFile(pendingFile);
+                return [4, uploadFileToStorage(file)];
               case 1:
                 _a.sent();
                 return [2];}
 
           });
         });};
-      var handleRemoveFile = function (file) {
-        setSelectedFiles(selectedFiles.filter(function (f) {return f.name !== file.name;}));
+      var handleRemoveFile = function () {
+        setSelectedFile(undefined);
+        onChange(undefined);
       };
-      var generalProgress = selectedFiles.reduce(function (acc, file) {
-        var _a;
-        return acc + ((_a = file.progress) !== null && _a !== void 0 ? _a : 0);
-      }, 0) / selectedFiles.length;
-      var hideGeneralProgress = selectedFiles.length === 0 ||
-      selectedFiles.every(function (file) {return file.progress === 100;}) ||
-      generalProgress === 0;
-      return jsxRuntime.exports.jsxs("div", __assign({ className: "".concat(classes$9.file_input_field_container, " ").concat(className), "data-cy": dataCy }, { children: [label && jsxRuntime.exports.jsx(QuestionLabel, { htmlFor: id, label: label, mandatory: mandatory }), error && jsxRuntime.exports.jsx("div", __assign({ className: classes$9.error_message }, { children: error })), jsxRuntime.exports.jsx("div", __assign({ className: classes$9.file_upload_wrapper }, { children: jsxRuntime.exports.jsx(dg, { onChange: handleFilesChange, onError: onError, isMultiple: multiple, accept: accept, error: error }) })), selectedFiles.length > 0 && jsxRuntime.exports.jsx("div", __assign({ className: "".concat(classes$9.file_list_wrapper, " ").concat(classes$9.custom_file_list_container) }, { children: jsxRuntime.exports.jsx(ug, { files: selectedFiles, onDelete: handleRemoveFile, generalProgress: hideGeneralProgress ? undefined : generalProgress }) }))] }), id);
-    };
-
-    var custom_json_parser = function (blob) {
-      try {
-        if (typeof blob !== 'string') {
-          throw new Error();
-        }
-        var parsed = JSON.parse(blob);
-        if (typeof parsed === 'string') {
-          return JSON.parse(parsed);
-        }
-        return parsed;
-      }
-      catch (error) {
-        return 'invalid JSON';
+      if (value && disabled === true) {
+        return jsxRuntime.exports.jsxs("div", __assign({ className: "".concat(classes$9.file_input_field_container, " ").concat(className), "data-cy": dataCy }, { children: [label && jsxRuntime.exports.jsx(QuestionLabel, { htmlFor: id, label: label, mandatory: mandatory }), !value.url ? jsxRuntime.exports.jsx("div", { children: "No file uploaded" }) : jsxRuntime.exports.jsxs("div", __assign({ className: classes$9.read_only_file }, { children: [value.filename, " (", value.contentType, ")"] }))] }), id);
       }
+      return jsxRuntime.exports.jsxs("div", __assign({ className: "".concat(classes$9.file_input_field_container, " ").concat(className), "data-cy": dataCy }, { children: [label && jsxRuntime.exports.jsx(QuestionLabel, { htmlFor: id, label: label, mandatory: mandatory }), error && jsxRuntime.exports.jsx("div", __assign({ className: classes$9.error_message }, { children: error })), jsxRuntime.exports.jsx("div", __assign({ className: classes$9.file_upload_wrapper }, { children: jsxRuntime.exports.jsx(dg, { onChange: handleFilesChange, onError: onError, isMultiple: false, accept: accept, error: error }) })), selectedFile && jsxRuntime.exports.jsx("div", __assign({ className: "".concat(classes$9.file_list_wrapper, " ").concat(classes$9.custom_file_list_container) }, { children: jsxRuntime.exports.jsx(ug, { files: [selectedFile], onDelete: function () {return handleRemoveFile();}, generalProgress: selectedFile.progress !== undefined && selectedFile.progress < 100 ?
+            selectedFile.progress :
+            undefined }) }))] }), id);
     };
 
-    var areAttachmentsValid = function (_a) {
+    var isAttachmentValid = function (_a) {
       var attachmentsValue = _a.attachmentsValue,required = _a.required,acceptedFileTypes = _a.acceptedFileTypes;
-      var parseAttachments = function (val) {
+      var parseAttachment = function (val) {
         try {
-          return JSON.parse(val);
+          var parsed = JSON.parse(val);
+          return parsed;
         }
         catch (error) {
-          return [];
+          return null;
         }
       };
-      var attachments = parseAttachments(attachmentsValue);
+      var attachment = parseAttachment(attachmentsValue);
       if (required) {
-        return !lodash.exports.isNil(attachments) && attachments.length > 0;
+        return !lodash.exports.isNil(attachment) && !lodash.exports.isNil(attachment.url);
       }
-      return attachments.every(function (attachment) {var _a;return acceptedFileTypes.includes((_a = attachment.contentType) !== null && _a !== void 0 ? _a : '');});
+      if (lodash.exports.isNil(attachment) || lodash.exports.isNil(attachment.contentType)) {
+        return !required;
+      }
+      return acceptedFileTypes.includes(attachment.contentType);
     };
 
     var AUTO_PROGRESS_DELAY = 850;
@@ -48425,7 +48410,7 @@ var     Kr=[{
               required: config === null || config === void 0 ? void 0 : config.mandatory,
               validate: function (value) {
                 var _a, _b, _c;
-                return areAttachmentsValid({
+                return isAttachmentValid({
                   attachmentsValue: value,
                   acceptedFileTypes: (_b = (_a = config === null || config === void 0 ? void 0 : config.file_storage) === null || _a === void 0 ? void 0 : _a.accepted_file_types) !== null && _b !== void 0 ? _b : [],
                   required: (_c = config === null || config === void 0 ? void 0 : config.mandatory) !== null && _c !== void 0 ? _c : false });
@@ -48434,8 +48419,8 @@ var     Kr=[{
             render: function (_a) {
               var _b, _c, _d;
               var _e = _a.field,onControllerChange = _e.onChange,onBlur = _e.onBlur,value = _e.value;
-              return jsxRuntime.exports.jsx(FileInputField, { id: question.id, value: custom_json_parser(value), onChange: function (attachments) {
-                  onControllerChange(JSON.stringify(attachments));
+              return jsxRuntime.exports.jsx(SingleFileInputField, { id: question.id, value: custom_json_parser(value, ''), onChange: function (attachment) {
+                  onControllerChange(JSON.stringify(attachment));
                   onAnswerChange();
                 }, onBlur: onBlur, accept: (_c = (_b = config === null || config === void 0 ? void 0 : config.file_storage) === null || _b === void 0 ? void 0 : _b.accepted_file_types) !== null && _c !== void 0 ? _c : [
                 'application/pdf'],
@@ -48455,8 +48440,8 @@ var     Kr=[{
             render: function (_a) {
               var _b, _c, _d;
               var _e = _a.field,onControllerChange = _e.onChange,onBlur = _e.onBlur,value = _e.value;
-              return jsxRuntime.exports.jsx(FileInputField, { id: question.id, value: custom_json_parser(value), onChange: function (attachments) {
-                  onControllerChange(JSON.stringify(attachments));
+              return jsxRuntime.exports.jsx(SingleFileInputField, { id: question.id, value: custom_json_parser(value, ''), onChange: function (attachment) {
+                  onControllerChange(JSON.stringify(attachment));
                   onAnswerChange();
                 }, onBlur: onBlur, accept: (_c = (_b = config === null || config === void 0 ? void 0 : config.file_storage) === null || _b === void 0 ? void 0 : _b.accepted_file_types) !== null && _c !== void 0 ? _c : ['image/*'], configSlug: (_d = config === null || config === void 0 ? void 0 : config.file_storage) === null || _d === void 0 ? void 0 : _d.file_storage_config_slug, onFileUpload: onFileUpload, label: question.title, mandatory: config === null || config === void 0 ? void 0 : config.mandatory });
             } });

package/dist/types/atoms/fileInputField/SingleFileInputField.d.ts

@@ -0,0 +1,21 @@
+import React from 'react';
+import { Attachment } from '../../molecules/question/types';
+import '@awell-health/design-system/style.css';
+interface Props {
+    id?: string;
+    label?: string;
+    accept?: Array<string>;
+    error?: string;
+    onChange: (attachment: Attachment | undefined) => void;
+    onError?: (error: string) => void;
+    className?: string;
+    onBlur?: () => void;
+    dataCy?: string;
+    onFileUpload?: (file: File, configSlug?: string) => Promise<string | undefined>;
+    configSlug?: string;
+    value?: Attachment | null;
+    mandatory?: boolean;
+    disabled?: boolean;
+}
+export declare const SingleFileInputField: React.FC<Props>;
+export {};

package/dist/types/molecules/question/helpers/isAttachmentValid.d.ts

@@ -0,0 +1,5 @@
+export declare const isAttachmentValid: ({ attachmentsValue, required, acceptedFileTypes, }: {
+    attachmentsValue: string;
+    acceptedFileTypes: string[];
+    required: boolean;
+}) => boolean;

package/dist/types/utils/custom_json_parser.d.ts

@@ -1 +1 @@
-export declare const custom_json_parser: (blob: string) => any;
+export declare const custom_json_parser: (blob: string, defaultValue?: any) => any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awell-health/ui-library",
-  "version": "0.1.97",
+  "version": "0.1.98",
   "description": "UI components to integrate with Awell Health",
   "repository": {
     "type": "git",