@oneblink/apps-react 8.4.0-beta.3 → 8.4.0-beta.4

package/dist/hooks/attachments/useAttachment.js

@@ -27,20 +27,26 @@ export default function useAttachment(value, element, onChange, disableUpload) {
             !formId ||
             !value ||
             typeof value !== 'object' ||
-            value.type !== 'NEW' ||
-            !value.data) {
+            value.type !== 'NEW') {
             return;
         }
-        const newAttachment = value;
         const data = value.data;
+        if (!data) {
+            onChange(value._id, {
+                ...value,
+                type: 'ERROR',
+                errorMessage: 'We were unable to read this file from your file system. Please try again. If the problem persists, please contact your application administrators.',
+            });
+            return;
+        }
         let ignore = false;
         const abortController = new AbortController();
         const effect = async () => {
             try {
-                console.log('Attempting to upload attachment...', newAttachment.fileName);
+                console.log('Attempting to upload attachment...', value.fileName);
                 const upload = await onUploadAttachment({
                     formId,
-                    fileName: newAttachment.fileName,
+                    fileName: value.fileName,
                     contentType: data.type,
                     data,
                     isPrivate,
@@ -52,15 +58,15 @@ export default function useAttachment(value, element, onChange, disableUpload) {
                 storeAttachmentBlobLocally({ attachmentId: upload.id, blob: data });
                 console.log('Successfully Uploaded attachment!', upload);
                 // UPDATE ATTACHMENT
-                onChange(newAttachment._id, upload);
+                onChange(value._id, upload);
             }
             catch (error) {
                 if (ignore) {
                     return;
                 }
-                console.warn('Failed to upload attachment...', newAttachment.fileName, error);
-                onChange(newAttachment._id, {
-                    ...newAttachment,
+                console.warn('Failed to upload attachment...', value.fileName, error);
+                onChange(value._id, {
+                    ...value,
                     type: 'ERROR',
                     errorMessage: error.message,
                 });

package/dist/hooks/attachments/useAttachment.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAttachment.js","sourceRoot":"","sources":["../../../src/hooks/attachments/useAttachment.ts"],"names":[],"mappings":"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","sourcesContent":["import * as React from 'react'\nimport { attachmentsService } from '@oneblink/apps'\nimport { FormTypes } from '@oneblink/types'\nimport useFormDefinition from '../useFormDefinition'\nimport useIsOffline from '../useIsOffline'\nimport { FormElementBinaryStorageValue } from '../../types/attachments'\nimport { checkIfContentTypeIsImage } from '../../services/attachments'\nimport useAuth from '../../hooks/useAuth'\nimport { urlToBlobAsync } from '../../services/blob-utils'\nimport useAttachmentBlobs from '../../hooks/attachments/useAttachmentBlobs'\nimport useOnUploadAttachmentContext from '../useOnUploadAttachment'\n\nexport type OnChange = (\n  id: string,\n  attachment: attachmentsService.Attachment,\n) => void\n\nexport default function useAttachment(\n  value: FormElementBinaryStorageValue,\n  element: FormTypes.FormElementBinaryStorage,\n  onChange: OnChange,\n  disableUpload?: boolean,\n) {\n  const isPrivate = element.storageType !== 'public'\n  const form = useFormDefinition()\n  const isOffline = useIsOffline()\n  const onUploadAttachment = useOnUploadAttachmentContext()\n  const { isLoggedIn, isUsingFormsKey } = useAuth()\n  const { storeAttachmentBlobLocally, getAttachmentBlobLocally } =\n    useAttachmentBlobs()\n\n  const isAuthenticated = isLoggedIn || isUsingFormsKey\n\n  const [attachmentUrlState, setAttachmentUrlState] = React.useState<{\n    attachmentUrl?: string | null\n    loadAttachmentUrlError?: Error\n    isContentTypeImage?: boolean\n  }>({})\n  const [progressState, setProgressState] = React.useState<number | undefined>()\n\n  const onProgress = React.useCallback(({ progress }: { progress: number }) => {\n    setProgressState(progress)\n  }, [])\n\n  // TRIGGER UPLOAD\n  React.useEffect(() => {\n    const formId = form?.id\n\n    if (\n      isOffline ||\n      disableUpload ||\n      !formId ||\n      !value ||\n      typeof value !== 'object' ||\n      value.type !== 'NEW' ||\n      !value.data\n    ) {\n      return\n    }\n\n    const newAttachment = value as attachmentsService.AttachmentNew\n    const data = value.data\n\n    let ignore = false\n    const abortController = new AbortController()\n\n    const effect = async () => {\n      try {\n        console.log(\n          'Attempting to upload attachment...',\n          newAttachment.fileName,\n        )\n        const upload = await onUploadAttachment(\n          {\n            formId,\n            fileName: newAttachment.fileName,\n            contentType: data.type,\n            data,\n            isPrivate,\n            onProgress,\n          },\n          abortController.signal,\n        )\n        if (ignore) {\n          return\n        }\n\n        storeAttachmentBlobLocally({ attachmentId: upload.id, blob: data })\n\n        console.log('Successfully Uploaded attachment!', upload)\n\n        // UPDATE ATTACHMENT\n        onChange(newAttachment._id, upload)\n      } catch (error) {\n        if (ignore) {\n          return\n        }\n\n        console.warn(\n          'Failed to upload attachment...',\n          newAttachment.fileName,\n          error,\n        )\n        onChange(newAttachment._id, {\n          ...newAttachment,\n          type: 'ERROR',\n          errorMessage: (error as Error).message,\n        })\n      }\n    }\n\n    effect()\n\n    return () => {\n      ignore = true\n      abortController.abort()\n    }\n  }, [\n    disableUpload,\n    form?.id,\n    isOffline,\n    isPrivate,\n    onChange,\n    onProgress,\n    onUploadAttachment,\n    storeAttachmentBlobLocally,\n    value,\n  ])\n\n  // TRIGGER DOWNLOAD\n  React.useEffect(() => {\n    if (!value) {\n      return\n    }\n\n    // If the value is string we will assume a base64 data uri\n    if (typeof value === 'string') {\n      setAttachmentUrlState({\n        attachmentUrl: value,\n      })\n      return\n    }\n\n    if (value.type) {\n      if (!value.data) {\n        return\n      }\n\n      const attachmentUrl = URL.createObjectURL(value.data)\n      setAttachmentUrlState({\n        attachmentUrl,\n        isContentTypeImage: checkIfContentTypeIsImage(value.data.type),\n      })\n      return\n    }\n\n    // Check for locally stored Blob\n    const locallyStoredAttachment = getAttachmentBlobLocally(value.id)\n    if (locallyStoredAttachment) {\n      const attachmentUrl = URL.createObjectURL(locallyStoredAttachment.blob)\n      console.log('Created object url from locally stored Blob', attachmentUrl)\n      setAttachmentUrlState({\n        attachmentUrl,\n        isContentTypeImage: checkIfContentTypeIsImage(value.contentType),\n      })\n      return\n    }\n\n    // If user is not logged in or is offline, we can't download private attachments.\n    // If the blob was not stored locally (above) for some reason, the user is SOL\n    if (!isAuthenticated || isOffline) {\n      setAttachmentUrlState({\n        attachmentUrl: null,\n      })\n      return\n    }\n\n    let ignore = false\n    const abortController = new AbortController()\n    const privateAttachmentUrl = value.url\n\n    const effect = async () => {\n      try {\n        const blob = await urlToBlobAsync(\n          privateAttachmentUrl,\n          abortController.signal,\n        )\n        if (ignore) {\n          return\n        }\n        // Store private attachment in Context\n        storeAttachmentBlobLocally({ attachmentId: value.id, blob })\n        const attachmentUrl = URL.createObjectURL(blob)\n        console.log(\n          'Created object url from private attachment for image',\n          attachmentUrl,\n        )\n        setAttachmentUrlState({\n          attachmentUrl: attachmentUrl,\n        })\n      } catch (error) {\n        if (ignore) {\n          return\n        }\n        console.warn('Error loading file:', error)\n        setAttachmentUrlState({\n          loadAttachmentUrlError: error as Error,\n        })\n      }\n    }\n    effect()\n\n    return () => {\n      ignore = true\n      abortController.abort()\n    }\n  }, [\n    getAttachmentBlobLocally,\n    isAuthenticated,\n    isOffline,\n    storeAttachmentBlobLocally,\n    value,\n  ])\n\n  React.useEffect(() => {\n    return () => {\n      const attachmentUrl = attachmentUrlState.attachmentUrl\n      if (attachmentUrl && attachmentUrl.startsWith('blob:')) {\n        console.log('revoking attachment url:', attachmentUrl)\n        URL.revokeObjectURL(attachmentUrl)\n      }\n    }\n  }, [attachmentUrlState.attachmentUrl])\n\n  const isUploading = React.useMemo(() => {\n    return !!(\n      value &&\n      typeof value !== 'string' &&\n      value.type &&\n      value.type === 'NEW'\n    )\n  }, [value])\n\n  const uploadErrorMessage = React.useMemo(() => {\n    if (\n      value &&\n      typeof value !== 'string' &&\n      value.type &&\n      value.type === 'ERROR'\n    ) {\n      return value.errorMessage\n    }\n  }, [value])\n\n  const canDownload = React.useMemo(() => {\n    if (!value) {\n      return false\n    }\n\n    // legacy attachment as base64 data\n    if (typeof value === 'string') {\n      return true\n    }\n\n    // attachments still uploading or failed to upload\n    if (value.type) {\n      // can only be downloaded if we still have the data\n      return !!value.data\n    }\n\n    // private attachments can only be downloaded if user is authenticated\n    if (isAuthenticated) {\n      return true\n    }\n\n    return false\n  }, [isAuthenticated, value])\n\n  return {\n    isUploading,\n    uploadErrorMessage,\n    isLoadingAttachmentUrl: attachmentUrlState.attachmentUrl === undefined,\n    ...attachmentUrlState,\n    canDownload,\n    progress: progressState,\n  }\n}\n"]}
+{"version":3,"file":"useAttachment.js","sourceRoot":"","sources":["../../../src/hooks/attachments/useAttachment.ts"],"names":[],"mappings":"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","sourcesContent":["import * as React from 'react'\nimport { attachmentsService } from '@oneblink/apps'\nimport { FormTypes } from '@oneblink/types'\nimport useFormDefinition from '../useFormDefinition'\nimport useIsOffline from '../useIsOffline'\nimport { FormElementBinaryStorageValue } from '../../types/attachments'\nimport { checkIfContentTypeIsImage } from '../../services/attachments'\nimport useAuth from '../../hooks/useAuth'\nimport { urlToBlobAsync } from '../../services/blob-utils'\nimport useAttachmentBlobs from '../../hooks/attachments/useAttachmentBlobs'\nimport useOnUploadAttachmentContext from '../useOnUploadAttachment'\n\nexport type OnChange = (\n  id: string,\n  attachment: attachmentsService.Attachment,\n) => void\n\nexport default function useAttachment(\n  value: FormElementBinaryStorageValue,\n  element: FormTypes.FormElementBinaryStorage,\n  onChange: OnChange,\n  disableUpload?: boolean,\n) {\n  const isPrivate = element.storageType !== 'public'\n  const form = useFormDefinition()\n  const isOffline = useIsOffline()\n  const onUploadAttachment = useOnUploadAttachmentContext()\n  const { isLoggedIn, isUsingFormsKey } = useAuth()\n  const { storeAttachmentBlobLocally, getAttachmentBlobLocally } =\n    useAttachmentBlobs()\n\n  const isAuthenticated = isLoggedIn || isUsingFormsKey\n\n  const [attachmentUrlState, setAttachmentUrlState] = React.useState<{\n    attachmentUrl?: string | null\n    loadAttachmentUrlError?: Error\n    isContentTypeImage?: boolean\n  }>({})\n  const [progressState, setProgressState] = React.useState<number | undefined>()\n\n  const onProgress = React.useCallback(({ progress }: { progress: number }) => {\n    setProgressState(progress)\n  }, [])\n\n  // TRIGGER UPLOAD\n  React.useEffect(() => {\n    const formId = form?.id\n\n    if (\n      isOffline ||\n      disableUpload ||\n      !formId ||\n      !value ||\n      typeof value !== 'object' ||\n      value.type !== 'NEW'\n    ) {\n      return\n    }\n\n    const data = value.data\n    if (!data) {\n      onChange(value._id, {\n        ...value,\n        type: 'ERROR',\n        errorMessage:\n          'We were unable to read this file from your file system. Please try again. If the problem persists, please contact your application administrators.',\n      })\n      return\n    }\n\n    let ignore = false\n    const abortController = new AbortController()\n\n    const effect = async () => {\n      try {\n        console.log('Attempting to upload attachment...', value.fileName)\n        const upload = await onUploadAttachment(\n          {\n            formId,\n            fileName: value.fileName,\n            contentType: data.type,\n            data,\n            isPrivate,\n            onProgress,\n          },\n          abortController.signal,\n        )\n        if (ignore) {\n          return\n        }\n\n        storeAttachmentBlobLocally({ attachmentId: upload.id, blob: data })\n\n        console.log('Successfully Uploaded attachment!', upload)\n\n        // UPDATE ATTACHMENT\n        onChange(value._id, upload)\n      } catch (error) {\n        if (ignore) {\n          return\n        }\n\n        console.warn('Failed to upload attachment...', value.fileName, error)\n        onChange(value._id, {\n          ...value,\n          type: 'ERROR',\n          errorMessage: (error as Error).message,\n        })\n      }\n    }\n\n    effect()\n\n    return () => {\n      ignore = true\n      abortController.abort()\n    }\n  }, [\n    disableUpload,\n    form?.id,\n    isOffline,\n    isPrivate,\n    onChange,\n    onProgress,\n    onUploadAttachment,\n    storeAttachmentBlobLocally,\n    value,\n  ])\n\n  // TRIGGER DOWNLOAD\n  React.useEffect(() => {\n    if (!value) {\n      return\n    }\n\n    // If the value is string we will assume a base64 data uri\n    if (typeof value === 'string') {\n      setAttachmentUrlState({\n        attachmentUrl: value,\n      })\n      return\n    }\n\n    if (value.type) {\n      if (!value.data) {\n        return\n      }\n\n      const attachmentUrl = URL.createObjectURL(value.data)\n      setAttachmentUrlState({\n        attachmentUrl,\n        isContentTypeImage: checkIfContentTypeIsImage(value.data.type),\n      })\n      return\n    }\n\n    // Check for locally stored Blob\n    const locallyStoredAttachment = getAttachmentBlobLocally(value.id)\n    if (locallyStoredAttachment) {\n      const attachmentUrl = URL.createObjectURL(locallyStoredAttachment.blob)\n      console.log('Created object url from locally stored Blob', attachmentUrl)\n      setAttachmentUrlState({\n        attachmentUrl,\n        isContentTypeImage: checkIfContentTypeIsImage(value.contentType),\n      })\n      return\n    }\n\n    // If user is not logged in or is offline, we can't download private attachments.\n    // If the blob was not stored locally (above) for some reason, the user is SOL\n    if (!isAuthenticated || isOffline) {\n      setAttachmentUrlState({\n        attachmentUrl: null,\n      })\n      return\n    }\n\n    let ignore = false\n    const abortController = new AbortController()\n    const privateAttachmentUrl = value.url\n\n    const effect = async () => {\n      try {\n        const blob = await urlToBlobAsync(\n          privateAttachmentUrl,\n          abortController.signal,\n        )\n        if (ignore) {\n          return\n        }\n        // Store private attachment in Context\n        storeAttachmentBlobLocally({ attachmentId: value.id, blob })\n        const attachmentUrl = URL.createObjectURL(blob)\n        console.log(\n          'Created object url from private attachment for image',\n          attachmentUrl,\n        )\n        setAttachmentUrlState({\n          attachmentUrl: attachmentUrl,\n        })\n      } catch (error) {\n        if (ignore) {\n          return\n        }\n        console.warn('Error loading file:', error)\n        setAttachmentUrlState({\n          loadAttachmentUrlError: error as Error,\n        })\n      }\n    }\n    effect()\n\n    return () => {\n      ignore = true\n      abortController.abort()\n    }\n  }, [\n    getAttachmentBlobLocally,\n    isAuthenticated,\n    isOffline,\n    storeAttachmentBlobLocally,\n    value,\n  ])\n\n  React.useEffect(() => {\n    return () => {\n      const attachmentUrl = attachmentUrlState.attachmentUrl\n      if (attachmentUrl && attachmentUrl.startsWith('blob:')) {\n        console.log('revoking attachment url:', attachmentUrl)\n        URL.revokeObjectURL(attachmentUrl)\n      }\n    }\n  }, [attachmentUrlState.attachmentUrl])\n\n  const isUploading = React.useMemo(() => {\n    return !!(\n      value &&\n      typeof value !== 'string' &&\n      value.type &&\n      value.type === 'NEW'\n    )\n  }, [value])\n\n  const uploadErrorMessage = React.useMemo(() => {\n    if (\n      value &&\n      typeof value !== 'string' &&\n      value.type &&\n      value.type === 'ERROR'\n    ) {\n      return value.errorMessage\n    }\n  }, [value])\n\n  const canDownload = React.useMemo(() => {\n    if (!value) {\n      return false\n    }\n\n    // legacy attachment as base64 data\n    if (typeof value === 'string') {\n      return true\n    }\n\n    // attachments still uploading or failed to upload\n    if (value.type) {\n      // can only be downloaded if we still have the data\n      return !!value.data\n    }\n\n    // private attachments can only be downloaded if user is authenticated\n    if (isAuthenticated) {\n      return true\n    }\n\n    return false\n  }, [isAuthenticated, value])\n\n  return {\n    isUploading,\n    uploadErrorMessage,\n    isLoadingAttachmentUrl: attachmentUrlState.attachmentUrl === undefined,\n    ...attachmentUrlState,\n    canDownload,\n    progress: progressState,\n  }\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oneblink/apps-react",
   "description": "Helper functions for OneBlink apps in ReactJS.",
-  "version": "8.4.0-beta.3",
+  "version": "8.4.0-beta.4",
   "author": "OneBlink <developers@oneblink.io> (https://oneblink.io)",
   "bugs": {
     "url": "https://github.com/oneblink/apps-react/issues"