@oneblink/apps-react 2.5.0-beta.2 → 2.5.0

package/dist/components/formStore/display/ElementDisplay.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { FormElementWithOptions } from '@oneblink/types/typescript/forms';
-export declare function FileChip({ file: { fileName, url, isPrivate, data }, }: {
+export declare function FileChip({ file: { fileName, url, data }, }: {
     file: {
         fileName: string;
         url?: string;

package/dist/components/formStore/display/ElementDisplay.js

@@ -17,7 +17,7 @@ async function fetchFile(url) {
     }
     return await response.blob();
 }
-export function FileChip({ file: { fileName, url, isPrivate, data }, }) {
+export function FileChip({ file: { fileName, url, data }, }) {
     const [{ isDownloading, error }, setState] = React.useState({
         isDownloading: false,
     });
@@ -32,13 +32,8 @@ export function FileChip({ file: { fileName, url, isPrivate, data }, }) {
                 isDownloading: true,
             });
             if (url) {
-                if (isPrivate) {
-                    const blob = await fetchFile(url);
-                    saveAs(blob, fileName);
-                }
-                else {
-                    saveAs(url, fileName);
-                }
+                const blob = await fetchFile(url);
+                saveAs(blob, fileName);
             }
             else if (data) {
                 saveAs(data, fileName);
@@ -53,7 +48,7 @@ export function FileChip({ file: { fileName, url, isPrivate, data }, }) {
                 error: error,
             });
         }
-    }, [data, fileName, isPrivate, url]);
+    }, [data, fileName, url]);
     return (React.createElement(React.Fragment, null,
         React.createElement(Chip, { label: fileName, deleteIcon: React.createElement(SaveAlt, null), onDelete: handleDownload, variant: "outlined", icon: isDownloading ? React.createElement(CircularProgress, { size: 16 }) : React.createElement(AttachFile, null) }),
         React.createElement(ErrorSnackbar, { open: !!error, onClose: clearError },

package/dist/components/formStore/display/ElementDisplay.js.map

@@ -1 +1 @@
-{"version":3,"file":"ElementDisplay.js","sourceRoot":"","sources":["../../../../src/components/formStore/display/ElementDisplay.tsx"],"names":[],"mappings":"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","sourcesContent":["import * as React from 'react'\nimport { saveAs } from 'file-saver'\nimport { Chip, CircularProgress, Grid } from '@mui/material'\nimport { SaveAlt, AttachFile } from '@mui/icons-material'\nimport ErrorSnackbar from '../../ErrorSnackbar'\nimport { UnorderedList, ListItem } from '../../Lists'\nimport { FormElementWithOptions } from '@oneblink/types/typescript/forms'\nimport { getCognitoIdToken } from '@oneblink/apps/dist/services/cognito'\n\nasync function fetchFile(url: string) {\n  const idToken = await getCognitoIdToken()\n  const response = await fetch(url, {\n    headers: {\n      Authorization: `Bearer ${idToken}`,\n    },\n  })\n\n  if (!response.ok) {\n    throw new Error(\n      `Unable to download file. HTTP Status Code: ${response.status}`,\n    )\n  }\n\n  return await response.blob()\n}\n\nexport function FileChip({\n  file: { fileName, url, isPrivate, data },\n}: {\n  file: {\n    fileName: string\n    url?: string\n    isPrivate?: boolean\n    data?: string\n  }\n}) {\n  const [{ isDownloading, error }, setState] = React.useState<{\n    error?: Error\n    isDownloading: boolean\n  }>({\n    isDownloading: false,\n  })\n  const clearError = React.useCallback(() => {\n    setState({\n      isDownloading: false,\n    })\n  }, [])\n  const handleDownload = React.useCallback(async () => {\n    try {\n      setState({\n        isDownloading: true,\n      })\n\n      if (url) {\n        if (isPrivate) {\n          const blob = await fetchFile(url)\n          saveAs(blob, fileName)\n        } else {\n          saveAs(url, fileName)\n        }\n      } else if (data) {\n        saveAs(data, fileName)\n      }\n\n      setState({\n        isDownloading: false,\n      })\n    } catch (error) {\n      setState({\n        isDownloading: false,\n        error: error as Error,\n      })\n    }\n  }, [data, fileName, isPrivate, url])\n  return (\n    <>\n      <Chip\n        label={fileName}\n        deleteIcon={<SaveAlt />}\n        onDelete={handleDownload}\n        variant=\"outlined\"\n        icon={isDownloading ? <CircularProgress size={16} /> : <AttachFile />}\n      />\n      <ErrorSnackbar open={!!error} onClose={clearError}>\n        <span data-cypress=\"download-legacy-file-error-message\">\n          {error && error.message}\n        </span>\n      </ErrorSnackbar>\n    </>\n  )\n}\n\nexport function FilesElementDataTableCellContent({\n  value,\n}: {\n  value: Array<{\n    fileName: string\n    url?: string | undefined\n    isPrivate?: boolean | undefined\n    data?: string | undefined\n  }>\n}) {\n  return (\n    <Grid container spacing={1}>\n      {value.map((file, index) => {\n        return (\n          <Grid item key={index} xs={12}>\n            <FileChip file={file} />\n          </Grid>\n        )\n      })}\n    </Grid>\n  )\n}\n\nexport function MultiSelectFormElementTableCellContent({\n  value,\n  formElement,\n}: {\n  value: string[]\n  formElement: FormElementWithOptions\n}) {\n  return (\n    <UnorderedList disablePadding>\n      {value.map((selection, index) => {\n        const label = getSelectedOptionLabel(formElement, selection)\n        return <ListItem key={index}>{label?.toString()}</ListItem>\n      })}\n    </UnorderedList>\n  )\n}\n\nexport function getSelectedOptionLabel(\n  formElement: FormElementWithOptions,\n  value: string,\n) {\n  const selectedOption = (formElement.options || []).find(\n    (opt) => opt.value === value,\n  )\n  return selectedOption ? selectedOption.label : value\n}\n"]}
+{"version":3,"file":"ElementDisplay.js","sourceRoot":"","sources":["../../../../src/components/formStore/display/ElementDisplay.tsx"],"names":[],"mappings":"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","sourcesContent":["import * as React from 'react'\nimport { saveAs } from 'file-saver'\nimport { Chip, CircularProgress, Grid } from '@mui/material'\nimport { SaveAlt, AttachFile } from '@mui/icons-material'\nimport ErrorSnackbar from '../../ErrorSnackbar'\nimport { UnorderedList, ListItem } from '../../Lists'\nimport { FormElementWithOptions } from '@oneblink/types/typescript/forms'\nimport { getCognitoIdToken } from '@oneblink/apps/dist/services/cognito'\n\nasync function fetchFile(url: string) {\n  const idToken = await getCognitoIdToken()\n  const response = await fetch(url, {\n    headers: {\n      Authorization: `Bearer ${idToken}`,\n    },\n  })\n\n  if (!response.ok) {\n    throw new Error(\n      `Unable to download file. HTTP Status Code: ${response.status}`,\n    )\n  }\n\n  return await response.blob()\n}\n\nexport function FileChip({\n  file: { fileName, url, data },\n}: {\n  file: {\n    fileName: string\n    url?: string\n    isPrivate?: boolean\n    data?: string\n  }\n}) {\n  const [{ isDownloading, error }, setState] = React.useState<{\n    error?: Error\n    isDownloading: boolean\n  }>({\n    isDownloading: false,\n  })\n  const clearError = React.useCallback(() => {\n    setState({\n      isDownloading: false,\n    })\n  }, [])\n  const handleDownload = React.useCallback(async () => {\n    try {\n      setState({\n        isDownloading: true,\n      })\n\n      if (url) {\n        const blob = await fetchFile(url)\n        saveAs(blob, fileName)\n      } else if (data) {\n        saveAs(data, fileName)\n      }\n\n      setState({\n        isDownloading: false,\n      })\n    } catch (error) {\n      setState({\n        isDownloading: false,\n        error: error as Error,\n      })\n    }\n  }, [data, fileName, url])\n  return (\n    <>\n      <Chip\n        label={fileName}\n        deleteIcon={<SaveAlt />}\n        onDelete={handleDownload}\n        variant=\"outlined\"\n        icon={isDownloading ? <CircularProgress size={16} /> : <AttachFile />}\n      />\n      <ErrorSnackbar open={!!error} onClose={clearError}>\n        <span data-cypress=\"download-legacy-file-error-message\">\n          {error && error.message}\n        </span>\n      </ErrorSnackbar>\n    </>\n  )\n}\n\nexport function FilesElementDataTableCellContent({\n  value,\n}: {\n  value: Array<{\n    fileName: string\n    url?: string | undefined\n    isPrivate?: boolean | undefined\n    data?: string | undefined\n  }>\n}) {\n  return (\n    <Grid container spacing={1}>\n      {value.map((file, index) => {\n        return (\n          <Grid item key={index} xs={12}>\n            <FileChip file={file} />\n          </Grid>\n        )\n      })}\n    </Grid>\n  )\n}\n\nexport function MultiSelectFormElementTableCellContent({\n  value,\n  formElement,\n}: {\n  value: string[]\n  formElement: FormElementWithOptions\n}) {\n  return (\n    <UnorderedList disablePadding>\n      {value.map((selection, index) => {\n        const label = getSelectedOptionLabel(formElement, selection)\n        return <ListItem key={index}>{label?.toString()}</ListItem>\n      })}\n    </UnorderedList>\n  )\n}\n\nexport function getSelectedOptionLabel(\n  formElement: FormElementWithOptions,\n  value: string,\n) {\n  const selectedOption = (formElement.options || []).find(\n    (opt) => opt.value === value,\n  )\n  return selectedOption ? selectedOption.label : value\n}\n"]}

package/dist/hooks/attachments/useAttachment.js

@@ -48,10 +48,7 @@ export default function useAttachment(value, element, onChange, disableUpload) {
                 if (ignore) {
                     return;
                 }
-                // Store Blob in Context if image is private
-                if (isPrivate) {
-                    storeAttachmentBlobLocally({ attachmentId: upload.id, blob: data });
-                }
+                storeAttachmentBlobLocally({ attachmentId: upload.id, blob: data });
                 console.log('Successfully Uploaded attachment!', upload);
                 // UPDATE ATTACHMENT
                 onChange(newAttachment._id, upload);
@@ -120,13 +117,6 @@ export default function useAttachment(value, element, onChange, disableUpload) {
             });
             return;
         }
-        // If the file is a public url we can finish here and just use that
-        if (!value.isPrivate) {
-            setImageUrlState({
-                imageUrl: value.url,
-            });
-            return;
-        }
         // Check for locally stored Blob. Blob should be stored locally for private uploaded images only
         const locallyStoredAttachment = getAttachmentBlobLocally(value.id);
         if (locallyStoredAttachment) {
@@ -150,7 +140,7 @@ export default function useAttachment(value, element, onChange, disableUpload) {
         const privateImageUrl = value.url;
         const effect = async () => {
             try {
-                const blob = await urlToBlobAsync(privateImageUrl, true, abortController.signal);
+                const blob = await urlToBlobAsync(privateImageUrl, abortController.signal);
                 if (ignore) {
                     return;
                 }
@@ -220,11 +210,6 @@ export default function useAttachment(value, element, onChange, disableUpload) {
             // can only be downloaded if we still have the data
             return !!value.data;
         }
-        // attachments that have been uploaded
-        // public attachments can always be downloaded
-        if (!value.isPrivate) {
-            return true;
-        }
         // private attachments can only be downloaded if user is authenticated
         if (isAuthenticated) {
             return true;

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'\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 { isLoggedIn, isUsingFormsKey } = useAuth()\n  const { storeAttachmentBlobLocally, getAttachmentBlobLocally } =\n    useAttachmentBlobs()\n\n  const isAuthenticated = isLoggedIn || isUsingFormsKey\n\n  const [imageUrlState, setImageUrlState] = React.useState<{\n    imageUrl?: string | null\n    loadImageUrlError?: Error\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 attachmentsService.uploadAttachment(\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        // Store Blob in Context if image is private\n        if (isPrivate) {\n          storeAttachmentBlobLocally({ attachmentId: upload.id, blob: data })\n        }\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    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      setImageUrlState({\n        imageUrl: value,\n      })\n      return\n    }\n\n    if (value.type) {\n      if (!value.data) {\n        return\n      }\n\n      if (!checkIfContentTypeIsImage(value.data.type)) {\n        // Not an image which we will represent as null\n        setImageUrlState({\n          imageUrl: null,\n        })\n        return\n      }\n\n      const imageUrl = URL.createObjectURL(value.data)\n      console.log('Created object url from blob for image', imageUrl)\n      setImageUrlState({\n        imageUrl,\n      })\n      return\n    }\n\n    if (!checkIfContentTypeIsImage(value.contentType)) {\n      // Not an image which we will represent as null\n      setImageUrlState({\n        imageUrl: null,\n      })\n      return\n    }\n\n    // If the file is a public url we can finish here and just use that\n    if (!value.isPrivate) {\n      setImageUrlState({\n        imageUrl: value.url,\n      })\n      return\n    }\n\n    // Check for locally stored Blob. Blob should be stored locally for private uploaded images only\n    const locallyStoredAttachment = getAttachmentBlobLocally(value.id)\n    if (locallyStoredAttachment) {\n      const imageUrl = URL.createObjectURL(locallyStoredAttachment.blob)\n      console.log(\n        'Created object url from locally stored Blob for private image attachment',\n        imageUrl,\n      )\n      setImageUrlState({\n        imageUrl,\n      })\n      return\n    }\n\n    // If user is not logged in or is offline, we can't download private images.\n    // If the blob was not stored locally (above) for some reason, the user is SOL\n    if (!isAuthenticated || isOffline) {\n      setImageUrlState({\n        imageUrl: null,\n      })\n      return\n    }\n\n    let ignore = false\n    const abortController = new AbortController()\n    const privateImageUrl = value.url\n\n    const effect = async () => {\n      try {\n        const blob = await urlToBlobAsync(\n          privateImageUrl,\n          true,\n          abortController.signal,\n        )\n        if (ignore) {\n          return\n        }\n        // Store private image attachment in Context\n        storeAttachmentBlobLocally({ attachmentId: value.id, blob })\n        const imageUrl = URL.createObjectURL(blob)\n        console.log(\n          'Created object url from private attachment for image',\n          imageUrl,\n        )\n        setImageUrlState({\n          imageUrl,\n        })\n      } catch (error) {\n        if (ignore) {\n          return\n        }\n        console.warn('Error loading file:', error)\n        setImageUrlState({\n          loadImageUrlError: 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 imageUrl = imageUrlState.imageUrl\n      if (imageUrl && imageUrl.startsWith('blob:')) {\n        console.log('revoking image url:', imageUrl)\n        URL.revokeObjectURL(imageUrl)\n      }\n    }\n  }, [imageUrlState.imageUrl])\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    // attachments that have been uploaded\n    // public attachments can always be downloaded\n    if (!value.isPrivate) {\n      return true\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    isLoadingImageUrl: imageUrlState.imageUrl === undefined,\n    ...imageUrlState,\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'\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 { isLoggedIn, isUsingFormsKey } = useAuth()\n  const { storeAttachmentBlobLocally, getAttachmentBlobLocally } =\n    useAttachmentBlobs()\n\n  const isAuthenticated = isLoggedIn || isUsingFormsKey\n\n  const [imageUrlState, setImageUrlState] = React.useState<{\n    imageUrl?: string | null\n    loadImageUrlError?: Error\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 attachmentsService.uploadAttachment(\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    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      setImageUrlState({\n        imageUrl: value,\n      })\n      return\n    }\n\n    if (value.type) {\n      if (!value.data) {\n        return\n      }\n\n      if (!checkIfContentTypeIsImage(value.data.type)) {\n        // Not an image which we will represent as null\n        setImageUrlState({\n          imageUrl: null,\n        })\n        return\n      }\n\n      const imageUrl = URL.createObjectURL(value.data)\n      console.log('Created object url from blob for image', imageUrl)\n      setImageUrlState({\n        imageUrl,\n      })\n      return\n    }\n\n    if (!checkIfContentTypeIsImage(value.contentType)) {\n      // Not an image which we will represent as null\n      setImageUrlState({\n        imageUrl: null,\n      })\n      return\n    }\n\n    // Check for locally stored Blob. Blob should be stored locally for private uploaded images only\n    const locallyStoredAttachment = getAttachmentBlobLocally(value.id)\n    if (locallyStoredAttachment) {\n      const imageUrl = URL.createObjectURL(locallyStoredAttachment.blob)\n      console.log(\n        'Created object url from locally stored Blob for private image attachment',\n        imageUrl,\n      )\n      setImageUrlState({\n        imageUrl,\n      })\n      return\n    }\n\n    // If user is not logged in or is offline, we can't download private images.\n    // If the blob was not stored locally (above) for some reason, the user is SOL\n    if (!isAuthenticated || isOffline) {\n      setImageUrlState({\n        imageUrl: null,\n      })\n      return\n    }\n\n    let ignore = false\n    const abortController = new AbortController()\n    const privateImageUrl = value.url\n\n    const effect = async () => {\n      try {\n        const blob = await urlToBlobAsync(\n          privateImageUrl,\n          abortController.signal,\n        )\n        if (ignore) {\n          return\n        }\n        // Store private image attachment in Context\n        storeAttachmentBlobLocally({ attachmentId: value.id, blob })\n        const imageUrl = URL.createObjectURL(blob)\n        console.log(\n          'Created object url from private attachment for image',\n          imageUrl,\n        )\n        setImageUrlState({\n          imageUrl,\n        })\n      } catch (error) {\n        if (ignore) {\n          return\n        }\n        console.warn('Error loading file:', error)\n        setImageUrlState({\n          loadImageUrlError: 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 imageUrl = imageUrlState.imageUrl\n      if (imageUrl && imageUrl.startsWith('blob:')) {\n        console.log('revoking image url:', imageUrl)\n        URL.revokeObjectURL(imageUrl)\n      }\n    }\n  }, [imageUrlState.imageUrl])\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    isLoadingImageUrl: imageUrlState.imageUrl === undefined,\n    ...imageUrlState,\n    canDownload,\n    progress: progressState,\n  }\n}\n"]}

package/dist/services/blob-utils.d.ts

@@ -1,5 +1,5 @@
 export declare function dataUriToBlobSync(dataUri: string): Blob;
-export declare function urlToBlobAsync(url: string, isPrivate?: boolean, abortSignal?: AbortSignal): Promise<Blob>;
+export declare function urlToBlobAsync(url: string, abortSignal?: AbortSignal): Promise<Blob>;
 export declare function blobToCanvas(blob: Blob, orientation?: number): Promise<HTMLCanvasElement>;
 export declare function canvasToBlob(canvas: HTMLCanvasElement): Promise<Blob>;
 export declare function getBlobOrientation(blob: Blob): Promise<number | undefined>;

package/dist/services/blob-utils.js

@@ -22,12 +22,7 @@ export function dataUriToBlobSync(dataUri) {
     const [, contentType] = matches || [];
     return b64toBlob(b64Data, contentType);
 }
-async function generateRequestInit(isPrivate, abortSignal) {
-    if (!isPrivate) {
-        return {
-            signal: abortSignal,
-        };
-    }
+async function generateRequestInit(abortSignal) {
     const idToken = await authService.getIdToken();
     if (idToken) {
         return {
@@ -38,8 +33,8 @@ async function generateRequestInit(isPrivate, abortSignal) {
         };
     }
 }
-export async function urlToBlobAsync(url, isPrivate, abortSignal) {
-    const requestInit = await generateRequestInit(isPrivate, abortSignal);
+export async function urlToBlobAsync(url, abortSignal) {
+    const requestInit = await generateRequestInit(abortSignal);
     const response = await fetch(url, requestInit);
     if (!response.ok) {
         throw new Error(`Unable to download file. HTTP Status Code: ${response.status}`);

package/dist/services/blob-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"blob-utils.js","sourceRoot":"","sources":["../../src/services/blob-utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { authService } from '@oneblink/apps'\nimport loadImage from 'blueimp-load-image'\n\n// Copied from https://stackoverflow.com/questions/16245767/creating-a-blob-from-a-base64-string-in-javascript\nconst b64toBlob = (b64Data: string, contentType = '', sliceSize = 512) => {\n  const byteCharacters = atob(b64Data)\n  const byteArrays = []\n\n  for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {\n    const slice = byteCharacters.slice(offset, offset + sliceSize)\n\n    const byteNumbers = new Array(slice.length)\n    for (let i = 0; i < slice.length; i++) {\n      byteNumbers[i] = slice.charCodeAt(i)\n    }\n\n    const byteArray = new Uint8Array(byteNumbers)\n    byteArrays.push(byteArray)\n  }\n\n  const blob = new Blob(byteArrays, { type: contentType })\n  return blob\n}\n\nexport function dataUriToBlobSync(dataUri: string) {\n  const [prefix, b64Data] = dataUri.split(',')\n  const matches = prefix.match(/data:(.*);base64/)\n  const [, contentType] = matches || []\n  return b64toBlob(b64Data, contentType)\n}\n\nasync function generateRequestInit(\n  isPrivate?: boolean,\n  abortSignal?: AbortSignal,\n): Promise<RequestInit | undefined> {\n  if (!isPrivate) {\n    return {\n      signal: abortSignal,\n    }\n  }\n\n  const idToken = await authService.getIdToken()\n  if (idToken) {\n    return {\n      signal: abortSignal,\n      headers: {\n        Authorization: `Bearer ${idToken}`,\n      },\n    }\n  }\n}\n\nexport async function urlToBlobAsync(\n  url: string,\n  isPrivate?: boolean,\n  abortSignal?: AbortSignal,\n) {\n  const requestInit = await generateRequestInit(isPrivate, abortSignal)\n  const response = await fetch(url, requestInit)\n  if (!response.ok) {\n    throw new Error(\n      `Unable to download file. HTTP Status Code: ${response.status}`,\n    )\n  }\n  return await response.blob()\n}\n\nexport async function blobToCanvas(\n  blob: Blob,\n  orientation?: number,\n): Promise<HTMLCanvasElement> {\n  const loadImageResult = await loadImage(blob, {\n    canvas: true,\n    orientation: orientation,\n  })\n  // @ts-expect-error this it always be a HTMLCanvasElement because we passed `canvas: true` above\n  const canvas: HTMLCanvasElement = loadImageResult.image\n  return canvas\n}\n\nexport async function canvasToBlob(canvas: HTMLCanvasElement) {\n  const blob: Blob = await new Promise((resolve, reject) => {\n    canvas.toBlob((blob) => {\n      if (blob) resolve(blob)\n      reject(new Error('Failed to convert canvas back to blob.'))\n    })\n  })\n  return blob\n}\n\nexport async function getBlobOrientation(\n  blob: Blob,\n): Promise<number | undefined> {\n  const imageMetaData: loadImage.MetaData = await loadImage.parseMetaData(blob)\n  const orientation = imageMetaData.exif?.get('Orientation')\n  return orientation as number | undefined\n}\n"]}
+{"version":3,"file":"blob-utils.js","sourceRoot":"","sources":["../../src/services/blob-utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { authService } from '@oneblink/apps'\nimport loadImage from 'blueimp-load-image'\n\n// Copied from https://stackoverflow.com/questions/16245767/creating-a-blob-from-a-base64-string-in-javascript\nconst b64toBlob = (b64Data: string, contentType = '', sliceSize = 512) => {\n  const byteCharacters = atob(b64Data)\n  const byteArrays = []\n\n  for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {\n    const slice = byteCharacters.slice(offset, offset + sliceSize)\n\n    const byteNumbers = new Array(slice.length)\n    for (let i = 0; i < slice.length; i++) {\n      byteNumbers[i] = slice.charCodeAt(i)\n    }\n\n    const byteArray = new Uint8Array(byteNumbers)\n    byteArrays.push(byteArray)\n  }\n\n  const blob = new Blob(byteArrays, { type: contentType })\n  return blob\n}\n\nexport function dataUriToBlobSync(dataUri: string) {\n  const [prefix, b64Data] = dataUri.split(',')\n  const matches = prefix.match(/data:(.*);base64/)\n  const [, contentType] = matches || []\n  return b64toBlob(b64Data, contentType)\n}\n\nasync function generateRequestInit(\n  abortSignal?: AbortSignal,\n): Promise<RequestInit | undefined> {\n  const idToken = await authService.getIdToken()\n  if (idToken) {\n    return {\n      signal: abortSignal,\n      headers: {\n        Authorization: `Bearer ${idToken}`,\n      },\n    }\n  }\n}\n\nexport async function urlToBlobAsync(url: string, abortSignal?: AbortSignal) {\n  const requestInit = await generateRequestInit(abortSignal)\n  const response = await fetch(url, requestInit)\n  if (!response.ok) {\n    throw new Error(\n      `Unable to download file. HTTP Status Code: ${response.status}`,\n    )\n  }\n  return await response.blob()\n}\n\nexport async function blobToCanvas(\n  blob: Blob,\n  orientation?: number,\n): Promise<HTMLCanvasElement> {\n  const loadImageResult = await loadImage(blob, {\n    canvas: true,\n    orientation: orientation,\n  })\n  // @ts-expect-error this it always be a HTMLCanvasElement because we passed `canvas: true` above\n  const canvas: HTMLCanvasElement = loadImageResult.image\n  return canvas\n}\n\nexport async function canvasToBlob(canvas: HTMLCanvasElement) {\n  const blob: Blob = await new Promise((resolve, reject) => {\n    canvas.toBlob((blob) => {\n      if (blob) resolve(blob)\n      reject(new Error('Failed to convert canvas back to blob.'))\n    })\n  })\n  return blob\n}\n\nexport async function getBlobOrientation(\n  blob: Blob,\n): Promise<number | undefined> {\n  const imageMetaData: loadImage.MetaData = await loadImage.parseMetaData(blob)\n  const orientation = imageMetaData.exif?.get('Orientation')\n  return orientation as number | undefined\n}\n"]}

package/dist/services/download-file.js

@@ -78,10 +78,7 @@ export default async function downloadAttachment(attachment) {
             }
             return;
         }
-        if (!attachment.isPrivate) {
-            return await downloadFile(attachment.url, attachment.fileName);
-        }
-        const blob = await urlToBlobAsync(attachment.url, attachment.isPrivate);
+        const blob = await urlToBlobAsync(attachment.url);
         return await downloadFile(blob, attachment.fileName);
     }
     catch (error) {

package/dist/services/download-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"download-file.js","sourceRoot":"","sources":["../../src/services/download-file.ts"],"names":[],"mappings":"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","sourcesContent":["import { Sentry, attachmentsService } from '@oneblink/apps'\nimport * as bulmaToast from 'bulma-toast'\nimport fileSaver from 'file-saver'\nimport { urlToBlobAsync } from './blob-utils'\n\nasync function downloadFile(data: Blob | string, fileName: string) {\n  if (window.cordova) {\n    const file = typeof data === 'string' ? await urlToBlobAsync(data) : data\n    await new Promise((resolve, reject) => {\n      window.requestFileSystem(\n        window.PERSISTENT,\n        0,\n        (fs) => {\n          fs.root.getFile(\n            fileName,\n            {\n              create: true,\n              exclusive: false,\n            },\n            (fileEntry) => {\n              // Create a FileWriter object for our FileEntry\n              fileEntry.createWriter(\n                (fileWriter) => {\n                  fileWriter.onwriteend = () => {\n                    // @ts-expect-error ???\n                    window.cordova.plugins.fileOpener2.open(\n                      // @ts-expect-error ???\n                      fileEntry.nativeURL,\n                      file.type,\n                      {\n                        error: (error: Error) => {\n                          console.log(\n                            'An error occurred opening the downloaded file',\n                          )\n                          reject(error)\n                        },\n                        success: () => resolve(undefined),\n                      },\n                    )\n                  }\n\n                  fileWriter.onerror = (error) => {\n                    console.log(\n                      'An error occurred writing the file to file system',\n                    )\n                    reject(error)\n                  }\n\n                  fileWriter.write(file)\n                },\n                (error) => {\n                  console.log(\n                    'An error attempting to create file writer for new file',\n                  )\n                  reject(error)\n                },\n              )\n            },\n            (error) => {\n              console.log(\n                'An error occurred getting new file data from file system',\n              )\n              reject(error)\n            },\n          )\n        },\n        (error) => {\n          console.log('An error occurred requesting access to the file system')\n          reject(error)\n        },\n      )\n    })\n    return\n  } else {\n    fileSaver.saveAs(data, fileName)\n  }\n}\n\nconst handleError = (error?: Error) => {\n  if (error) {\n    console.warn('An error occurred attempting to download file:', error)\n    Sentry.captureException(error)\n    bulmaToast.toast({\n      message:\n        'Sorry, there was an issue downloading your file, please try again.',\n      // @ts-expect-error bulma sets this string as a class, so we are hacking in our own classes\n      type: 'ob-toast is-danger cypress-download-file-toast',\n      dismissible: true,\n      closeOnClick: true,\n    })\n  }\n}\n\nexport async function downloadFileLegacy(dataURI: string, fileName: string) {\n  try {\n    return await downloadFile(dataURI, fileName)\n  } catch (error) {\n    handleError(error as Error)\n  }\n}\n\nexport default async function downloadAttachment(\n  attachment: attachmentsService.Attachment,\n) {\n  try {\n    if (attachment.type) {\n      if (attachment.data) {\n        await downloadFile(attachment.data, attachment.fileName)\n      }\n      return\n    }\n    if (!attachment.isPrivate) {\n      return await downloadFile(attachment.url, attachment.fileName)\n    }\n    const blob = await urlToBlobAsync(attachment.url, attachment.isPrivate)\n    return await downloadFile(blob, attachment.fileName)\n  } catch (error) {\n    handleError(error as Error)\n  }\n}\n"]}
+{"version":3,"file":"download-file.js","sourceRoot":"","sources":["../../src/services/download-file.ts"],"names":[],"mappings":"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","sourcesContent":["import { Sentry, attachmentsService } from '@oneblink/apps'\nimport * as bulmaToast from 'bulma-toast'\nimport fileSaver from 'file-saver'\nimport { urlToBlobAsync } from './blob-utils'\n\nasync function downloadFile(data: Blob | string, fileName: string) {\n  if (window.cordova) {\n    const file = typeof data === 'string' ? await urlToBlobAsync(data) : data\n    await new Promise((resolve, reject) => {\n      window.requestFileSystem(\n        window.PERSISTENT,\n        0,\n        (fs) => {\n          fs.root.getFile(\n            fileName,\n            {\n              create: true,\n              exclusive: false,\n            },\n            (fileEntry) => {\n              // Create a FileWriter object for our FileEntry\n              fileEntry.createWriter(\n                (fileWriter) => {\n                  fileWriter.onwriteend = () => {\n                    // @ts-expect-error ???\n                    window.cordova.plugins.fileOpener2.open(\n                      // @ts-expect-error ???\n                      fileEntry.nativeURL,\n                      file.type,\n                      {\n                        error: (error: Error) => {\n                          console.log(\n                            'An error occurred opening the downloaded file',\n                          )\n                          reject(error)\n                        },\n                        success: () => resolve(undefined),\n                      },\n                    )\n                  }\n\n                  fileWriter.onerror = (error) => {\n                    console.log(\n                      'An error occurred writing the file to file system',\n                    )\n                    reject(error)\n                  }\n\n                  fileWriter.write(file)\n                },\n                (error) => {\n                  console.log(\n                    'An error attempting to create file writer for new file',\n                  )\n                  reject(error)\n                },\n              )\n            },\n            (error) => {\n              console.log(\n                'An error occurred getting new file data from file system',\n              )\n              reject(error)\n            },\n          )\n        },\n        (error) => {\n          console.log('An error occurred requesting access to the file system')\n          reject(error)\n        },\n      )\n    })\n    return\n  } else {\n    fileSaver.saveAs(data, fileName)\n  }\n}\n\nconst handleError = (error?: Error) => {\n  if (error) {\n    console.warn('An error occurred attempting to download file:', error)\n    Sentry.captureException(error)\n    bulmaToast.toast({\n      message:\n        'Sorry, there was an issue downloading your file, please try again.',\n      // @ts-expect-error bulma sets this string as a class, so we are hacking in our own classes\n      type: 'ob-toast is-danger cypress-download-file-toast',\n      dismissible: true,\n      closeOnClick: true,\n    })\n  }\n}\n\nexport async function downloadFileLegacy(dataURI: string, fileName: string) {\n  try {\n    return await downloadFile(dataURI, fileName)\n  } catch (error) {\n    handleError(error as Error)\n  }\n}\n\nexport default async function downloadAttachment(\n  attachment: attachmentsService.Attachment,\n) {\n  try {\n    if (attachment.type) {\n      if (attachment.data) {\n        await downloadFile(attachment.data, attachment.fileName)\n      }\n      return\n    }\n    const blob = await urlToBlobAsync(attachment.url)\n    return await downloadFile(blob, attachment.fileName)\n  } catch (error) {\n    handleError(error as Error)\n  }\n}\n"]}

package/package.json

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