@oneblink/apps-react 1.2.5 → 2.0.0-beta.1

package/dist/form-elements/FormElementCompliance.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormElementCompliance.js","sourceRoot":"","sources":["../../src/form-elements/FormElementCompliance.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,OAAO,kBAAkB,MAAM,2CAA2C,CAAA;AAC1E,OAAO,qBAAqB,MAAM,gCAAgC,CAAA;AAClE,OAAO,eAAe,MAAM,0BAA0B,CAAA;AACtD,OAAO,2BAA2B,MAAM,sCAAsC,CAAA;AAE9E,OAAO,YAAY,MAAM,gBAAgB,CAAA;AACzC,OAAO,yBAAyB,MAAM,kDAAkD,CAAA;AACxF,OAAO,gBAAgB,MAAM,oBAAoB,CAAA;AACjD,OAAO,gBAA+C,MAAM,oBAAoB,CAAA;AAChF,OAAO,mBAAmB,MAAM,uBAAuB,CAAA;AAoBvD,MAAM,WAAW,GAAG;IAClB,iBAAiB,EAAE,KAAK;IACxB,YAAY,EAAE,KAAK;IACnB,eAAe,EAAE,KAAK;IACtB,QAAQ,EAAE,KAAK;IACf,sCAAsC,EAAE,KAAK;CAC9C,CAAA;AAED,SAAS,qBAAqB,CAAC,EAC7B,EAAE,EACF,OAAO,EACP,KAAK,EACL,QAAQ,EACR,yBAAyB,EACzB,iBAAiB,EACjB,wBAAwB,EACxB,MAAM,GACA;IACN,MAAM,UAAU,GAAG,KAA0B,CAAA;IAE7C,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAChC,GAAG,EAAE,CAAC,CAAC;QACL,GAAG,WAAW;QACd,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,QAAQ;QACzB,KAAK,EAAE,OAAO;QACd,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,QAAQ;QAC7B,IAAI,EAAE,UAAU;KACjB,CAAC,EACF,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAC7C,CAAA;IACD,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAChC,GAAG,EAAE,CAAC,CAAC;QACL,GAAG,WAAW;QACd,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,QAAQ;QACzB,KAAK,EAAE,OAAO;QACd,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,QAAQ;QAC7B,IAAI,EAAE,OAAO;QACb,UAAU,EAAE,SAAS;QACrB,UAAU,EAAE,SAAS;QACrB,iBAAiB,EAAE,KAAK;QACxB,WAAW,EAAE,OAAO,CAAC,WAAW;KACjC,CAAC,EACF,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,CAClE,CAAA;IAED,MAAM,iBAAiB,GAAG,KAAK,CAAC,WAAW,CAGzC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE;QACR,QAAQ,CAAC,EAAE,EAAE,CAAC,aAAgC,EAAE,EAAE;YAChD,IAAI,QAAQ,GAAG,SAAS,CAAA;YACxB,IAAI,OAAO,CAAC,KAAK,UAAU,EAAE;gBAC3B,QAAQ,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;aAC9D;iBAAM;gBACL,QAAQ,GAAG,CAAC,CAAA;aACb;YACD,IAAI,CAAC,QAAQ,EAAE;gBACb,OAAM;aACP;YACD,OAAO;gBACL,GAAG,aAAa;gBAChB,KAAK,EAAE,QAAQ;aAChB,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,EACD,CAAC,QAAQ,CAAC,CACX,CAAA;IACD,MAAM,iBAAiB,GAAG,KAAK,CAAC,WAAW,CAGzC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE;QACR,QAAQ,CAAC,OAAO,EAAE,CAAC,aAAa,EAAE,EAAE;YAClC,IAAI,CAAC,aAAa,EAAE;gBAClB,OAAM;aACP;YACD,IAAI,QAAQ,GAAG,SAAS,CAAA;YACxB,IAAI,OAAO,CAAC,KAAK,UAAU,EAAE;gBAC3B,QAAQ,GAAG,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;aAClC;iBAAM;gBACL,QAAQ,GAAG,CAAC,CAAA;aACb;YACD,OAAO;gBACL,GAAG,aAAa;gBAChB,KAAK,EAAE,QAAQ;aAChB,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,EACD,CAAC,OAAO,EAAE,QAAQ,CAAC,CACpB,CAAA;IACD,MAAM,iBAAiB,GAAG,KAAK,CAAC,WAAW,CAGzC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE;QACR,QAAQ,CAAC,OAAO,EAAE,CAAC,aAAa,EAAE,EAAE;YAClC,IAAI,CAAC,aAAa,EAAE;gBAClB,OAAM;aACP;YACD,IAAI,QAAQ,GAAG,SAAS,CAAA;YACxB,IAAI,OAAO,CAAC,KAAK,UAAU,EAAE;gBAC3B,QAAQ,GAAG,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;aAClC;iBAAM;gBACL,QAAQ,GAAG,CAAC,CAAA;aACb;YACD,OAAO;gBACL,GAAG,aAAa;gBAChB,KAAK,EAAE,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;aAC1D,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,EACD,CAAC,OAAO,EAAE,QAAQ,CAAC,CACpB,CAAA;IAED,MAAM,CAAC,cAAc,EAAE,oBAAoB,CAAC,GAAG,2BAA2B,CACxE,OAAO,EACP,CAAC,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,CAAA,EACnB,iBAAiB,CAClB,CAAA;IACD,MAAM,CAAC,cAAc,EAAE,oBAAoB,CAAC,GAAG,2BAA2B,CACxE,OAAO,EACP,CAAC,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,CAAA,EACnB,iBAAiB,CAClB,CAAA;IAED,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA;IAEpD,MAAM,eAAe,GAAG,qBAAqB,CAAC;QAC5C,OAAO;QACP,KAAK,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK;QACxB,QAAQ,EAAE,iBAAiB;QAC3B,yBAAyB;KAC1B,CAAC,CAAA;IAEF,OAAO,CACL,6BAAK,SAAS,EAAC,4BAA4B;QACzC,oBAAC,yBAAyB,IACxB,SAAS,EAAE,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,EACtD,EAAE,EAAE,EAAE,EACN,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAE1B,6BAAK,SAAS,EAAC,0BAA0B;gBACvC,oBAAC,kBAAkB,IAAC,OAAO,EAAE,OAAO,CAAC,OAAO;oBAC1C,6BAAK,SAAS,EAAC,gEAAgE,IAC5E,eAAe,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;wBAC9B,MAAM,UAAU,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,MAAK,MAAM,CAAC,KAAK,CAAA;wBACrD,OAAO,CACL,6BAAK,SAAS,EAAC,2BAA2B,EAAC,GAAG,EAAE,MAAM,CAAC,KAAK;4BAC1D,oBAAC,YAAY,IACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,GAAG,EAAE;oCACZ,UAAU,EAAE,CAAA;oCACZ,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;gCAC1C,CAAC,EACD,SAAS,EAAE,IAAI,CACb,iFAAiF,EACjF;oCACE,YAAY,EAAE,UAAU;oCACxB,UAAU,EAAE,CAAC,UAAU;iCACxB,CACF,GACD,CACE,CACP,CAAA;oBACH,CAAC,CAAC,CACE,CACa;gBACpB,CAAC,OAAO,IAAI,wBAAwB,CAAC,IAAI,CAAC,CAAC,iBAAiB,IAAI,CAC/D,6BAAK,IAAI,EAAC,OAAO,EAAC,SAAS,EAAC,kBAAkB;oBAC5C,6BAAK,SAAS,EAAC,2DAA2D,IACvE,iBAAiB,CACd,CACF,CACP;gBACD,6BAAK,SAAS,EAAC,0EAA0E;oBACvF,oBAAC,gBAAgB,IACf,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAC,OAAO,EACZ,OAAO,EAAE,oBAAoB,EAC7B,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,CAAA,YAG/B;oBACnB,oBAAC,gBAAgB,IACf,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAC,YAAY,EACjB,OAAO,EAAE,oBAAoB,EAC7B,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,CAAA,YAG/B,CACf;gBACL,cAAc,IAAI,CACjB,6BAAK,SAAS,EAAC,6BAA6B;oBAC1C,oBAAC,mBAAmB,IAClB,EAAE,EAAE,GAAG,EAAE,QAAQ,EACjB,QAAQ,EAAE,iBAAiB,EAC3B,wBAAwB,EAAE,KAAK,EAC/B,iBAAiB,EAAE,SAAS,EAC5B,KAAK,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,EACxB,OAAO,EAAE,YAAY,GACrB,CACE,CACP;gBACA,cAAc,IAAI,CACjB,6BAAK,SAAS,EAAC,6BAA6B;oBAC1C,oBAAC,gBAAgB,IACf,EAAE,EAAE,GAAG,EAAE,QAAQ,EACjB,QAAQ,EAAE,iBAAiB,EAC3B,wBAAwB,EAAE,KAAK,EAC/B,iBAAiB,EAAE,SAAS,EAC5B,KAAK,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,EACxB,OAAO,EAAE,YAAY,GACrB,CACE,CACP,CACG,CACoB,CACxB,CACP,CAAA;AACH,CAAC;AACD,eAAe,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA","sourcesContent":["import * as React from 'react'\nimport clsx from 'clsx'\n\nimport FormElementOptions from '../components/renderer/FormElementOptions'\nimport useFormElementOptions from '../hooks/useFormElementOptions'\nimport useBooleanState from '../hooks/useBooleanState'\nimport useToggleComplianceChildren from '../hooks/useToggleComplianceChildren'\nimport { FormTypes } from '@oneblink/types'\nimport OptionButton from './OptionButton'\nimport FormElementLabelContainer from '../components/renderer/FormElementLabelContainer'\nimport ComplianceButton from './ComplianceButton'\nimport FormElementFiles, { PossibleFileConfiguration } from './FormElementFiles'\nimport FormElementTextarea from './FormElementTextarea'\nimport { FormElementValueChangeHandler } from '../types/form'\n\ninterface Props {\n  id: string\n  element: FormTypes.ComplianceElement\n  value: unknown\n  onChange: FormElementValueChangeHandler<Value>\n  displayValidationMessage: boolean\n  validationMessage: string | undefined\n  conditionallyShownOptions: FormTypes.ChoiceElementOption[] | undefined\n  isEven?: boolean\n}\n\nexport interface Value {\n  value?: string\n  notes?: string\n  files?: PossibleFileConfiguration[]\n}\n\nconst baseElement = {\n  conditionallyShow: false,\n  isDataLookup: false,\n  isElementLookup: false,\n  required: false,\n  requiresAllConditionallyShowPredicates: false,\n}\n\nfunction FormElementCompliance({\n  id,\n  element,\n  value,\n  onChange,\n  conditionallyShownOptions,\n  validationMessage,\n  displayValidationMessage,\n  isEven,\n}: Props) {\n  const typedValue = value as Value | undefined\n\n  const notesElement = React.useMemo<FormTypes.TextareaElement>(\n    () => ({\n      ...baseElement,\n      readOnly: element.readOnly,\n      id: `${element.id}-notes`,\n      label: 'Notes',\n      name: `${element.name}_notes`,\n      type: 'textarea',\n    }),\n    [element.id, element.name, element.readOnly],\n  )\n  const filesElement = React.useMemo<FormTypes.FilesElement>(\n    () => ({\n      ...baseElement,\n      readOnly: element.readOnly,\n      id: `${element.id}-files`,\n      label: 'Media',\n      name: `${element.name}_files`,\n      type: 'files',\n      maxEntries: undefined,\n      minEntries: undefined,\n      restrictFileTypes: false,\n      storageType: element.storageType,\n    }),\n    [element.id, element.name, element.readOnly, element.storageType],\n  )\n\n  const handleValueChange = React.useCallback<\n    FormElementValueChangeHandler<string>\n  >(\n    (fe, v) => {\n      onChange(fe, (existingValue: Value | undefined) => {\n        let newValue = undefined\n        if (typeof v === 'function') {\n          newValue = v(existingValue ? existingValue.value : undefined)\n        } else {\n          newValue = v\n        }\n        if (!newValue) {\n          return\n        }\n        return {\n          ...existingValue,\n          value: newValue,\n        }\n      })\n    },\n    [onChange],\n  )\n  const handleNotesChange = React.useCallback<\n    React.ComponentProps<typeof FormElementTextarea>['onChange']\n  >(\n    (fe, v) => {\n      onChange(element, (existingValue) => {\n        if (!existingValue) {\n          return\n        }\n        let newNotes = undefined\n        if (typeof v === 'function') {\n          newNotes = v(existingValue.notes)\n        } else {\n          newNotes = v\n        }\n        return {\n          ...existingValue,\n          notes: newNotes,\n        }\n      })\n    },\n    [element, onChange],\n  )\n  const handleFilesChange = React.useCallback<\n    React.ComponentProps<typeof FormElementFiles>['onChange']\n  >(\n    (fe, v) => {\n      onChange(element, (existingValue) => {\n        if (!existingValue) {\n          return\n        }\n        let newFiles = undefined\n        if (typeof v === 'function') {\n          newFiles = v(existingValue.files)\n        } else {\n          newFiles = v\n        }\n        return {\n          ...existingValue,\n          files: newFiles && newFiles.length ? newFiles : undefined,\n        }\n      })\n    },\n    [element, onChange],\n  )\n\n  const [isShowingNotes, toggleIsShowingNotes] = useToggleComplianceChildren(\n    element,\n    !!typedValue?.notes,\n    handleNotesChange,\n  )\n  const [isShowingFiles, toggleIsShowingFiles] = useToggleComplianceChildren(\n    element,\n    !!typedValue?.files,\n    handleFilesChange,\n  )\n\n  const [isDirty, setIsDirty] = useBooleanState(false)\n\n  const filteredOptions = useFormElementOptions({\n    element,\n    value: typedValue?.value,\n    onChange: handleValueChange,\n    conditionallyShownOptions,\n  })\n\n  return (\n    <div className=\"cypress-compliance-element\">\n      <FormElementLabelContainer\n        className={`ob-compliance ${!isEven ? 'even' : 'odd'}`}\n        id={id}\n        element={element}\n        required={element.required}\n      >\n        <div className=\"ob-compliance__container\">\n          <FormElementOptions options={element.options}>\n            <div className=\"buttons ob-buttons ob-buttons-radio cypress-radio-button-group\">\n              {filteredOptions.map((option) => {\n                const isSelected = typedValue?.value === option.value\n                return (\n                  <div className=\"ob-button-radio-container\" key={option.value}>\n                    <OptionButton\n                      element={element}\n                      option={option}\n                      isSelected={isSelected}\n                      onClick={() => {\n                        setIsDirty()\n                        handleValueChange(element, option.value)\n                      }}\n                      className={clsx(\n                        'button ob-button ob-button__input ob-radio__button cypress-radio-button-control',\n                        {\n                          'is-primary': isSelected,\n                          'is-light': !isSelected,\n                        },\n                      )}\n                    />\n                  </div>\n                )\n              })}\n            </div>\n          </FormElementOptions>\n          {(isDirty || displayValidationMessage) && !!validationMessage && (\n            <div role=\"alert\" className=\"has-margin-top-8\">\n              <div className=\"has-text-danger ob-error__text cypress-validation-message\">\n                {validationMessage}\n              </div>\n            </div>\n          )}\n          <div className=\"buttons ob-buttons ob-buttons-compliance cypress-compliance-button-group\">\n            <ComplianceButton\n              isActive={isShowingNotes}\n              icon=\"notes\"\n              onClick={toggleIsShowingNotes}\n              disabled={element.readOnly || !typedValue?.value}\n            >\n              Notes\n            </ComplianceButton>\n            <ComplianceButton\n              isActive={isShowingFiles}\n              icon=\"perm_media\"\n              onClick={toggleIsShowingFiles}\n              disabled={element.readOnly || !typedValue?.value}\n            >\n              Media\n            </ComplianceButton>\n          </div>\n          {isShowingNotes && (\n            <div className=\"ob-compliance-child-element\">\n              <FormElementTextarea\n                id={`${id}-notes`}\n                onChange={handleNotesChange}\n                displayValidationMessage={false}\n                validationMessage={undefined}\n                value={typedValue?.notes}\n                element={notesElement}\n              />\n            </div>\n          )}\n          {isShowingFiles && (\n            <div className=\"ob-compliance-child-element\">\n              <FormElementFiles\n                id={`${id}-files`}\n                onChange={handleFilesChange}\n                displayValidationMessage={false}\n                validationMessage={undefined}\n                value={typedValue?.files}\n                element={filesElement}\n              />\n            </div>\n          )}\n        </div>\n      </FormElementLabelContainer>\n    </div>\n  )\n}\nexport default React.memo(FormElementCompliance)\n"]}
+{"version":3,"file":"FormElementCompliance.js","sourceRoot":"","sources":["../../src/form-elements/FormElementCompliance.tsx"],"names":[],"mappings":"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","sourcesContent":["import * as React from 'react'\nimport clsx from 'clsx'\n\nimport FormElementOptions from '../components/renderer/FormElementOptions'\nimport useFormElementOptions from '../hooks/useFormElementOptions'\nimport useBooleanState from '../hooks/useBooleanState'\nimport useToggleComplianceChildren from '../hooks/useToggleComplianceChildren'\nimport { FormTypes } from '@oneblink/types'\nimport OptionButton from './OptionButton'\nimport FormElementLabelContainer from '../components/renderer/FormElementLabelContainer'\nimport ComplianceButton from './ComplianceButton'\nimport FormElementFiles from './FormElementFiles'\nimport FormElementTextarea from './FormElementTextarea'\nimport { FormElementValueChangeHandler } from '../types/form'\nimport { Attachment } from '../types/attachments'\n\ninterface Props {\n  id: string\n  element: FormTypes.ComplianceElement\n  value: unknown\n  onChange: FormElementValueChangeHandler<Value>\n  displayValidationMessage: boolean\n  validationMessage: string | undefined\n  conditionallyShownOptions: FormTypes.ChoiceElementOption[] | undefined\n  isEven?: boolean\n}\n\nexport interface Value {\n  value?: string\n  notes?: string\n  files?: Attachment[]\n}\n\nconst baseElement = {\n  conditionallyShow: false,\n  isDataLookup: false,\n  isElementLookup: false,\n  required: false,\n  requiresAllConditionallyShowPredicates: false,\n}\n\nfunction FormElementCompliance({\n  id,\n  element,\n  value,\n  onChange,\n  conditionallyShownOptions,\n  validationMessage,\n  displayValidationMessage,\n  isEven,\n}: Props) {\n  const typedValue = value as Value | undefined\n\n  const notesElement = React.useMemo<FormTypes.TextareaElement>(\n    () => ({\n      ...baseElement,\n      readOnly: element.readOnly,\n      id: `${element.id}-notes`,\n      label: 'Notes',\n      name: `${element.name}_notes`,\n      type: 'textarea',\n    }),\n    [element.id, element.name, element.readOnly],\n  )\n  const filesElement = React.useMemo<FormTypes.FilesElement>(\n    () => ({\n      ...baseElement,\n      readOnly: element.readOnly,\n      id: `${element.id}-files`,\n      label: 'Media',\n      name: `${element.name}_files`,\n      type: 'files',\n      maxEntries: undefined,\n      minEntries: undefined,\n      restrictFileTypes: false,\n      storageType: element.storageType,\n    }),\n    [element.id, element.name, element.readOnly, element.storageType],\n  )\n\n  const handleValueChange = React.useCallback<\n    FormElementValueChangeHandler<string>\n  >(\n    (fe, v) => {\n      onChange(fe, (existingValue: Value | undefined) => {\n        let newValue = undefined\n        if (typeof v === 'function') {\n          newValue = v(existingValue ? existingValue.value : undefined)\n        } else {\n          newValue = v\n        }\n        if (!newValue) {\n          return\n        }\n        return {\n          ...existingValue,\n          value: newValue,\n        }\n      })\n    },\n    [onChange],\n  )\n  const handleNotesChange = React.useCallback<\n    React.ComponentProps<typeof FormElementTextarea>['onChange']\n  >(\n    (fe, v) => {\n      onChange(element, (existingValue) => {\n        if (!existingValue) {\n          return\n        }\n        let newNotes = undefined\n        if (typeof v === 'function') {\n          newNotes = v(existingValue.notes)\n        } else {\n          newNotes = v\n        }\n        return {\n          ...existingValue,\n          notes: newNotes,\n        }\n      })\n    },\n    [element, onChange],\n  )\n  const handleFilesChange = React.useCallback<\n    React.ComponentProps<typeof FormElementFiles>['onChange']\n  >(\n    (fe, v) => {\n      onChange(element, (existingValue) => {\n        if (!existingValue) {\n          return\n        }\n        let newFiles = undefined\n        if (typeof v === 'function') {\n          newFiles = v(existingValue.files)\n        } else {\n          newFiles = v\n        }\n        return {\n          ...existingValue,\n          files: newFiles && newFiles.length ? newFiles : undefined,\n        }\n      })\n    },\n    [element, onChange],\n  )\n\n  const [isShowingNotes, toggleIsShowingNotes] = useToggleComplianceChildren(\n    element,\n    !!typedValue?.notes,\n    handleNotesChange,\n  )\n  const [isShowingFiles, toggleIsShowingFiles] = useToggleComplianceChildren(\n    element,\n    !!typedValue?.files,\n    handleFilesChange,\n  )\n\n  const [isDirty, setIsDirty] = useBooleanState(false)\n\n  const filteredOptions = useFormElementOptions({\n    element,\n    value: typedValue?.value,\n    onChange: handleValueChange,\n    conditionallyShownOptions,\n  })\n\n  return (\n    <div className=\"cypress-compliance-element\">\n      <FormElementLabelContainer\n        className={`ob-compliance ${!isEven ? 'even' : 'odd'}`}\n        id={id}\n        element={element}\n        required={element.required}\n      >\n        <div className=\"ob-compliance__container\">\n          <FormElementOptions options={element.options}>\n            <div className=\"buttons ob-buttons ob-buttons-radio cypress-radio-button-group\">\n              {filteredOptions.map((option) => {\n                const isSelected = typedValue?.value === option.value\n                return (\n                  <div className=\"ob-button-radio-container\" key={option.value}>\n                    <OptionButton\n                      element={element}\n                      option={option}\n                      isSelected={isSelected}\n                      onClick={() => {\n                        setIsDirty()\n                        handleValueChange(element, option.value)\n                      }}\n                      className={clsx(\n                        'button ob-button ob-button__input ob-radio__button cypress-radio-button-control',\n                        {\n                          'is-primary': isSelected,\n                          'is-light': !isSelected,\n                        },\n                      )}\n                    />\n                  </div>\n                )\n              })}\n            </div>\n          </FormElementOptions>\n          {(isDirty || displayValidationMessage) && !!validationMessage && (\n            <div role=\"alert\" className=\"has-margin-top-8\">\n              <div className=\"has-text-danger ob-error__text cypress-validation-message\">\n                {validationMessage}\n              </div>\n            </div>\n          )}\n          <div className=\"buttons ob-buttons ob-buttons-compliance cypress-compliance-button-group\">\n            <ComplianceButton\n              isActive={isShowingNotes}\n              icon=\"notes\"\n              onClick={toggleIsShowingNotes}\n              disabled={element.readOnly || !typedValue?.value}\n            >\n              Notes\n            </ComplianceButton>\n            <ComplianceButton\n              isActive={isShowingFiles}\n              icon=\"perm_media\"\n              onClick={toggleIsShowingFiles}\n              disabled={element.readOnly || !typedValue?.value}\n            >\n              Media\n            </ComplianceButton>\n          </div>\n          {isShowingNotes && (\n            <div className=\"ob-compliance-child-element\">\n              <FormElementTextarea\n                id={`${id}-notes`}\n                onChange={handleNotesChange}\n                displayValidationMessage={false}\n                validationMessage={undefined}\n                value={typedValue?.notes}\n                element={notesElement}\n              />\n            </div>\n          )}\n          {isShowingFiles && (\n            <div className=\"ob-compliance-child-element\">\n              <FormElementFiles\n                id={`${id}-files`}\n                onChange={handleFilesChange}\n                displayValidationMessage={false}\n                validationMessage={undefined}\n                value={typedValue?.files}\n                element={filesElement}\n              />\n            </div>\n          )}\n        </div>\n      </FormElementLabelContainer>\n    </div>\n  )\n}\nexport default React.memo(FormElementCompliance)\n"]}

package/dist/form-elements/{FormElementFiles/FormElementFile.d.ts → FormElementFile.d.ts}

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { FormTypes } from '@oneblink/types';
-import { OnChange } from '../../hooks/attachments/useAttachment';
-import { Attachment } from '../../types/attachments';
+import { OnChange } from '../hooks/attachments/useAttachment';
+import { Attachment } from '../types/attachments';
 declare type Props = {
     element: FormTypes.FilesElement;
     onRemove: (id: string) => void;

package/dist/form-elements/{FormElementFiles/FormElementFile.js → FormElementFile.js}

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import downloadAttachment from '../../services/download-file';
-import useAttachment from '../../hooks/attachments/useAttachment';
-import FileCard from '../../components/renderer/attachments/FileCard';
+import downloadAttachment from '../services/download-file';
+import useAttachment from '../hooks/attachments/useAttachment';
+import FileCard from '../components/renderer/attachments/FileCard';
 const FormElementFile = ({ element, onRemove, file, onChange, disableUpload, }) => {
     const attachmentResult = useAttachment(file, element, onChange, disableUpload);
     const handleRemove = React.useCallback(() => {

package/dist/form-elements/FormElementFile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FormElementFile.js","sourceRoot":"","sources":["../../src/form-elements/FormElementFile.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,kBAAkB,MAAM,2BAA2B,CAAA;AAE1D,OAAO,aAA2B,MAAM,oCAAoC,CAAA;AAC5E,OAAO,QAAQ,MAAM,6CAA6C,CAAA;AAWlE,MAAM,eAAe,GAAG,CAAC,EACvB,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,aAAa,GACP,EAAE,EAAE;IACV,MAAM,gBAAgB,GAAG,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAA;IAE9E,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACd,OAAO,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;SACzB;QACD,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC3B,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAA;IAEpB,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE;QAClD,MAAM,kBAAkB,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAA;IAEV,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACrC,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE;YACtC,OAAO,GAAG,EAAE;gBACV,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE;oBACjB,IAAI,EAAE,KAAK;oBACX,GAAG,EAAE,IAAI,CAAC,GAAG;oBACb,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,SAAS,EAAE,IAAI,CAAC,SAAS;iBAC1B,CAAC,CAAA;YACJ,CAAC,CAAA;SACF;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAA;IAEpB,OAAO,CACL,oBAAC,QAAQ,IACP,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,gBAAgB,CAAC,WAAW,EACzC,cAAc,EAAE,aAAa,EAC7B,kBAAkB,EAAE,gBAAgB,CAAC,kBAAkB,EACvD,iBAAiB,EAAE,gBAAgB,CAAC,iBAAiB,EACrD,iBAAiB,EAAE,gBAAgB,CAAC,iBAAiB,EACrD,QAAQ,EAAE,gBAAgB,CAAC,QAAQ,EACnC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,UAAU,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,EACrE,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,WAAW,GACpB,CACH,CAAA;AACH,CAAC,CAAA;AAED,eAAe,KAAK,CAAC,IAAI,CAAQ,eAAe,CAAC,CAAA","sourcesContent":["import * as React from 'react'\nimport downloadAttachment from '../services/download-file'\nimport { FormTypes } from '@oneblink/types'\nimport useAttachment, { OnChange } from '../hooks/attachments/useAttachment'\nimport FileCard from '../components/renderer/attachments/FileCard'\nimport { Attachment } from '../types/attachments'\n\ntype Props = {\n  element: FormTypes.FilesElement\n  onRemove: (id: string) => void\n  file: Attachment\n  disableUpload: boolean\n  onChange: OnChange\n}\n\nconst FormElementFile = ({\n  element,\n  onRemove,\n  file,\n  onChange,\n  disableUpload,\n}: Props) => {\n  const attachmentResult = useAttachment(file, element, onChange, disableUpload)\n\n  const handleRemove = React.useCallback(() => {\n    if (!file.type) {\n      return onRemove(file.id)\n    }\n    return onRemove(file._id)\n  }, [file, onRemove])\n\n  const handleDownload = React.useCallback(async () => {\n    await downloadAttachment(file)\n  }, [file])\n\n  const handleRetry = React.useMemo(() => {\n    if (file.type === 'ERROR' && file.data) {\n      return () => {\n        onChange(file._id, {\n          type: 'NEW',\n          _id: file._id,\n          data: file.data,\n          fileName: file.fileName,\n          isPrivate: file.isPrivate,\n        })\n      }\n    }\n  }, [file, onChange])\n\n  return (\n    <FileCard\n      element={element}\n      isUploading={attachmentResult.isUploading}\n      isUploadPaused={disableUpload}\n      uploadErrorMessage={attachmentResult.uploadErrorMessage}\n      loadImageUrlError={attachmentResult.loadImageUrlError}\n      isLoadingImageUrl={attachmentResult.isLoadingImageUrl}\n      imageUrl={attachmentResult.imageUrl}\n      fileName={file.fileName}\n      onDownload={attachmentResult.canDownload ? handleDownload : undefined}\n      onRemove={handleRemove}\n      onRetry={handleRetry}\n    />\n  )\n}\n\nexport default React.memo<Props>(FormElementFile)\n"]}

package/dist/form-elements/{FormElementFiles/FormElementFiles.d.ts → FormElementFiles.d.ts}

@@ -1,15 +1,15 @@
 import * as React from 'react';
 import { FormTypes } from '@oneblink/types';
-import { Attachment } from '../../types/attachments';
-import { FormElementValueChangeHandler } from '../../types/form';
-declare type Props = {
+import { Attachment } from '../types/attachments';
+import { FormElementValueChangeHandler } from '../types/form';
+export declare function stringifyAttachments(value: Attachment[] | undefined): string;
+declare function FormElementFiles({ id, element, value, onChange, validationMessage, displayValidationMessage, }: {
     id: string;
     element: FormTypes.FilesElement;
     value?: Attachment[];
     onChange: FormElementValueChangeHandler<Attachment[]>;
     displayValidationMessage: boolean;
     validationMessage: string | undefined;
-};
-declare function FormElementFiles({ id, element, value, onChange, validationMessage, displayValidationMessage, }: Props): JSX.Element;
+}): JSX.Element;
 declare const _default: React.MemoExoticComponent<typeof FormElementFiles>;
 export default _default;

package/dist/form-elements/{FormElementFiles/FormElementFiles.js → FormElementFiles.js}

@@ -1,8 +1,14 @@
 import * as React from 'react';
-import Files from '../../components/renderer/attachments/Files';
+import Files from '../components/renderer/attachments/Files';
 import FormElementFile from './FormElementFile';
-import useAttachments from '../../hooks/attachments/useAttachments';
-import { checkFileNameIsValid, checkFileNameExtensionIsValid, } from '../../services/form-validation';
+import useAttachments from '../hooks/attachments/useAttachments';
+import { checkFileNameIsValid, checkFileNameExtensionIsValid, } from '../services/form-validation';
+export function stringifyAttachments(value) {
+    if (value === null || value === void 0 ? void 0 : value.every((attachment) => !attachment.type)) {
+        return JSON.stringify(value);
+    }
+    return '';
+}
 function FormElementFiles({ id, element, value, onChange, validationMessage, displayValidationMessage, }) {
     const { isDirty, addAttachments, removeAttachment, changeAttachment } = useAttachments(element, onChange);
     const attachments = value || [];

package/dist/form-elements/FormElementFiles.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FormElementFiles.js","sourceRoot":"","sources":["../../src/form-elements/FormElementFiles.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,KAAK,MAAM,0CAA0C,CAAA;AAC5D,OAAO,eAAe,MAAM,mBAAmB,CAAA;AAC/C,OAAO,cAAc,MAAM,qCAAqC,CAAA;AAChE,OAAO,EACL,oBAAoB,EACpB,6BAA6B,GAC9B,MAAM,6BAA6B,CAAA;AAIpC,MAAM,UAAU,oBAAoB,CAAC,KAA+B;IAClE,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QAClD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;KAC7B;IACD,OAAO,EAAE,CAAA;AACX,CAAC;AAED,SAAS,gBAAgB,CAAC,EACxB,EAAE,EACF,OAAO,EACP,KAAK,EACL,QAAQ,EACR,iBAAiB,EACjB,wBAAwB,GAQzB;IACC,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,GACnE,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAEnC,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE,CAAA;IAE/B,MAAM,sBAAsB,GAAG,KAAK,CAAC,WAAW,CAC9C,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE;QACpB,OAAO,CACL,oBAAC,eAAe,IACd,GAAG,EAAE,KAAK,EACV,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,gBAAgB,EAC1B,aAAa,EACX,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI,WAAW,CAAC,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;gBACjE,CAAC,oBAAoB,CAAC,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC;gBACnD,CAAC,6BAA6B,CAAC,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC,GAE9D,CACH,CAAA;IACH,CAAC,EACD,CAAC,WAAW,CAAC,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAClE,CAAA;IAED,OAAO,CACL,oBAAC,KAAK,IACJ,EAAE,EAAE,EAAE,EACN,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,wBAAwB,EAAE,wBAAwB,EAClD,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,cAAc,EAC1B,kBAAkB,EAAE,sBAAsB,GAC1C,CACH,CAAA;AACH,CAAC;AAED,eAAe,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA","sourcesContent":["import * as React from 'react'\nimport { FormTypes } from '@oneblink/types'\nimport Files from '../components/renderer/attachments/Files'\nimport FormElementFile from './FormElementFile'\nimport useAttachments from '../hooks/attachments/useAttachments'\nimport {\n  checkFileNameIsValid,\n  checkFileNameExtensionIsValid,\n} from '../services/form-validation'\nimport { Attachment } from '../types/attachments'\nimport { FormElementValueChangeHandler } from '../types/form'\n\nexport function stringifyAttachments(value: Attachment[] | undefined): string {\n  if (value?.every((attachment) => !attachment.type)) {\n    return JSON.stringify(value)\n  }\n  return ''\n}\n\nfunction FormElementFiles({\n  id,\n  element,\n  value,\n  onChange,\n  validationMessage,\n  displayValidationMessage,\n}: {\n  id: string\n  element: FormTypes.FilesElement\n  value?: Attachment[]\n  onChange: FormElementValueChangeHandler<Attachment[]>\n  displayValidationMessage: boolean\n  validationMessage: string | undefined\n}) {\n  const { isDirty, addAttachments, removeAttachment, changeAttachment } =\n    useAttachments(element, onChange)\n\n  const attachments = value || []\n\n  const handleRenderAttachment = React.useCallback(\n    (attachment, index) => {\n      return (\n        <FormElementFile\n          key={index}\n          element={element}\n          onRemove={removeAttachment}\n          file={attachment}\n          onChange={changeAttachment}\n          disableUpload={\n            (!!element.maxEntries && attachments.length > element.maxEntries) ||\n            !checkFileNameIsValid(element, attachment.fileName) ||\n            !checkFileNameExtensionIsValid(element, attachment.fileName)\n          }\n        />\n      )\n    },\n    [attachments.length, changeAttachment, element, removeAttachment],\n  )\n\n  return (\n    <Files\n      id={id}\n      isDirty={isDirty}\n      element={element}\n      attachments={attachments}\n      displayValidationMessage={displayValidationMessage}\n      validationMessage={validationMessage}\n      onAddFiles={addAttachments}\n      onRenderAttachment={handleRenderAttachment}\n    />\n  )\n}\n\nexport default React.memo(FormElementFiles)\n"]}

package/dist/form-elements/FormElementSignature.js

@@ -4,7 +4,7 @@ import scrollingService from '../services/scrolling-service';
 import FormElementLabelContainer from '../components/renderer/FormElementLabelContainer';
 import OnLoading from '../components/renderer/OnLoading';
 import useAttachment from '../hooks/attachments/useAttachment';
-import { checkIsUsingLegacyStorage, prepareNewAttachment, } from '../services/attachments';
+import { prepareNewAttachment } from '../services/attachments';
 import AttachmentStatus from '../components/renderer/attachments/AttachmentStatus';
 import useBooleanState from '../hooks/useBooleanState';
 import { canvasToBlob } from '../services/blob-utils';
@@ -39,11 +39,6 @@ const SignatureDrawing = React.memo(function SignatureDrawing({ element, onChang
         if (!canvasRef.current)
             return;
         const trimmedCanvas = canvasRef.current.getTrimmedCanvas();
-        if (checkIsUsingLegacyStorage(element)) {
-            const value = trimmedCanvas.toDataURL();
-            onChange(element, value);
-            return;
-        }
         // Convert base64 data uri to blob and send it on its way
         const blob = await canvasToBlob(trimmedCanvas);
         onChange(element, prepareNewAttachment(blob, 'signature.png', element));
@@ -133,7 +128,7 @@ const DisplayImage = React.memo(function DisplayImage({ element, uploadErrorMess
     if (imageUrl) {
         return (React.createElement(React.Fragment, null,
             React.createElement("span", { className: "ob-figure__status" },
-                React.createElement(AttachmentStatus, { element: element, isLoadingImageUrl: isLoadingImageUrl, loadImageUrlError: loadImageUrlError, isUploading: isUploading, imageUrl: imageUrl })),
+                React.createElement(AttachmentStatus, { isLoadingImageUrl: isLoadingImageUrl, loadImageUrlError: loadImageUrlError, isUploading: isUploading, imageUrl: imageUrl })),
             React.createElement("img", { src: imageUrl, className: "cypress-signature-image ob-signature__img" })));
     }
     return React.createElement(ImagePreviewUnavailable, null);

package/dist/form-elements/FormElementSignature.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormElementSignature.js","sourceRoot":"","sources":["../../src/form-elements/FormElementSignature.tsx"],"names":[],"mappings":"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","sourcesContent":["import * as React from 'react'\nimport SignatureCanvas from 'react-signature-canvas'\nimport { FormTypes } from '@oneblink/types'\n\nimport scrollingService from '../services/scrolling-service'\nimport FormElementLabelContainer from '../components/renderer/FormElementLabelContainer'\nimport OnLoading from '../components/renderer/OnLoading'\nimport useAttachment from '../hooks/attachments/useAttachment'\nimport { FormElementBinaryStorageValue } from '../types/attachments'\nimport {\n  checkIsUsingLegacyStorage,\n  prepareNewAttachment,\n} from '../services/attachments'\nimport AttachmentStatus from '../components/renderer/attachments/AttachmentStatus'\nimport useBooleanState from '../hooks/useBooleanState'\nimport { canvasToBlob } from '../services/blob-utils'\nimport ImagePreviewUnavailable from '../components/renderer/attachments/ImagePreviewUnavailable'\nimport { FormElementValueChangeHandler } from '../types/form'\nimport useIsPageVisible from '../hooks/useIsPageVisible'\n\ntype Props = {\n  id: string\n  element: FormTypes.DrawElement\n  value: FormElementBinaryStorageValue\n  onChange: FormElementValueChangeHandler<FormElementBinaryStorageValue>\n  displayValidationMessage: boolean\n  validationMessage: string | undefined\n}\n\nfunction FormElementSignature({\n  id,\n  element,\n  value,\n  onChange,\n  validationMessage,\n  displayValidationMessage,\n}: Props) {\n  const [isDirty, setIsDirty] = useBooleanState(false)\n  const isPageVisible = useIsPageVisible()\n\n  const handleChange = React.useCallback(\n    (formElement, newValue) => {\n      setIsDirty()\n      onChange(formElement, newValue)\n    },\n    [onChange, setIsDirty],\n  )\n\n  return (\n    <div className=\"cypress-signature-element\">\n      <FormElementLabelContainer\n        className=\"ob-signature\"\n        id={id}\n        element={element}\n        required={element.required}\n      >\n        <div className=\"control\">\n          {value ? (\n            <SignatureDisplay\n              element={element}\n              value={value}\n              onChange={handleChange}\n            />\n          ) : isPageVisible ? (\n            <SignatureDrawing element={element} onChange={handleChange} />\n          ) : null}\n        </div>\n\n        {(isDirty || displayValidationMessage) && !!validationMessage && (\n          <div role=\"alert\" className=\"has-margin-top-8\">\n            <div className=\"has-text-danger ob-error__text cypress-validation-message\">\n              {validationMessage}\n            </div>\n          </div>\n        )}\n      </FormElementLabelContainer>\n    </div>\n  )\n}\n\nexport default React.memo(FormElementSignature)\n\nconst SignatureDrawing = React.memo(function SignatureDrawing({\n  element,\n  onChange,\n}: {\n  element: Props['element']\n  onChange: Props['onChange']\n}) {\n  const canvasRef = React.useRef<SignatureCanvas>(null)\n\n  const [isEmpty, setIsEmpty] = React.useState(true)\n  const [canvasDimensions, setCanvasDimensions] = React.useState({})\n\n  const handleClear = React.useCallback(() => {\n    if (canvasRef.current) {\n      console.log('Clearing signature...')\n      canvasRef.current.clear()\n    }\n    setIsEmpty(true)\n  }, [])\n\n  const handleDone = React.useCallback(async () => {\n    if (!canvasRef.current) return\n    const trimmedCanvas = canvasRef.current.getTrimmedCanvas()\n\n    if (checkIsUsingLegacyStorage(element)) {\n      const value = trimmedCanvas.toDataURL()\n      onChange(element, value)\n      return\n    }\n\n    // Convert base64 data uri to blob and send it on its way\n    const blob = await canvasToBlob(trimmedCanvas)\n    onChange(element, prepareNewAttachment(blob, 'signature.png', element))\n  }, [element, onChange])\n\n  // HANDLING CANVAS CHANGE\n  const handleEndDraw = React.useCallback(() => {\n    if (window.cordova) {\n      scrollingService.enableScrolling()\n    }\n    if (isEmpty) {\n      setIsEmpty(false)\n    }\n  }, [isEmpty])\n\n  // HANDLE RESIZE\n  React.useEffect(() => {\n    const signatureCanvas = canvasRef.current\n    if (!signatureCanvas) return\n    const resize = () => {\n      const parentDiv = signatureCanvas.getCanvas().parentNode\n      if (parentDiv) {\n        setCanvasDimensions({\n          // @ts-expect-error ???\n          width: parentDiv.clientWidth,\n          // @ts-expect-error ???\n          height: parentDiv.clientHeight,\n        })\n      }\n    }\n    window.addEventListener('resize', resize)\n    resize()\n\n    return () => {\n      window.removeEventListener('resize', resize)\n    }\n  }, [canvasRef])\n\n  // REACTIVE DISABLING OF CANVAS\n  React.useEffect(() => {\n    if (!canvasRef.current) return\n    if (element.readOnly) {\n      canvasRef.current.off()\n    } else {\n      canvasRef.current.on()\n    }\n  }, [canvasRef, element.readOnly])\n\n  return (\n    <>\n      <div>\n        <SignatureCanvas\n          ref={canvasRef}\n          canvasProps={{\n            ...canvasDimensions,\n            className:\n              'input ob-signature__control cypress-signature-control signature-pad',\n            // @ts-expect-error ???\n            disabled: element.readOnly,\n          }}\n          onEnd={handleEndDraw}\n          onBegin={\n            window.cordova ? scrollingService.disableScrolling : undefined\n          }\n        />\n      </div>\n\n      <div className=\"buttons ob-buttons\">\n        <button\n          type=\"button\"\n          className=\"button ob-button is-light ob-button__clear cypress-clear-signature\"\n          onClick={handleClear}\n          disabled={element.readOnly || isEmpty}\n        >\n          Clear\n        </button>\n        <button\n          type=\"button\"\n          className=\"button ob-button ob-button__done is-primary cypress-done-signature-button\"\n          onClick={handleDone}\n          disabled={element.readOnly || isEmpty}\n        >\n          Done\n        </button>\n      </div>\n    </>\n  )\n})\n\nconst SignatureDisplay = React.memo(function SignatureDisplay({\n  element,\n  value,\n  onChange,\n}: {\n  element: Props['element']\n  value: Props['value']\n  onChange: Props['onChange']\n}) {\n  const result = useAttachment(\n    value,\n    element,\n    React.useCallback(\n      (id, attachment) => {\n        onChange(element, attachment)\n      },\n      [element, onChange],\n    ),\n  )\n\n  return (\n    <>\n      <figure className=\"ob-figure\">\n        <div className=\"figure-content\">\n          <DisplayImage element={element} {...result} />\n        </div>\n      </figure>\n\n      <div className=\"buttons ob-buttons\">\n        <button\n          type=\"button\"\n          className=\"button ob-button is-light ob-button__clear cypress-clear-signature\"\n          onClick={() => onChange(element, undefined)}\n          disabled={element.readOnly}\n        >\n          Clear\n        </button>\n      </div>\n    </>\n  )\n})\n\nconst DisplayImage = React.memo(function DisplayImage({\n  element,\n  uploadErrorMessage,\n  isUploading,\n  isLoadingImageUrl,\n  imageUrl,\n  loadImageUrlError,\n}: ReturnType<typeof useAttachment> & {\n  element: FormTypes.DrawElement\n}) {\n  if (uploadErrorMessage) {\n    return (\n      <>\n        <h3 className=\"title is-3\">Upload Failed</h3>\n        <p>\n          Your signature failed to upload, please press the <b>Clear</b> button\n          and try again.\n        </p>\n      </>\n    )\n  }\n\n  if (loadImageUrlError) {\n    return (\n      <>\n        <h3 className=\"title is-3\">Preview Failed</h3>\n        <p>{loadImageUrlError.message}</p>\n      </>\n    )\n  }\n\n  if (isLoadingImageUrl) {\n    return <OnLoading small className=\"cypress-signature-loading-image\" />\n  }\n\n  if (imageUrl) {\n    return (\n      <>\n        <span className=\"ob-figure__status\">\n          <AttachmentStatus\n            element={element}\n            isLoadingImageUrl={isLoadingImageUrl}\n            loadImageUrlError={loadImageUrlError}\n            isUploading={isUploading}\n            imageUrl={imageUrl}\n          />\n        </span>\n        <img\n          src={imageUrl}\n          className=\"cypress-signature-image ob-signature__img\"\n        />\n      </>\n    )\n  }\n\n  return <ImagePreviewUnavailable />\n})\n"]}
+{"version":3,"file":"FormElementSignature.js","sourceRoot":"","sources":["../../src/form-elements/FormElementSignature.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,eAAe,MAAM,wBAAwB,CAAA;AAGpD,OAAO,gBAAgB,MAAM,+BAA+B,CAAA;AAC5D,OAAO,yBAAyB,MAAM,kDAAkD,CAAA;AACxF,OAAO,SAAS,MAAM,kCAAkC,CAAA;AACxD,OAAO,aAAa,MAAM,oCAAoC,CAAA;AAE9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC9D,OAAO,gBAAgB,MAAM,qDAAqD,CAAA;AAClF,OAAO,eAAe,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,uBAAuB,MAAM,4DAA4D,CAAA;AAEhG,OAAO,gBAAgB,MAAM,2BAA2B,CAAA;AAWxD,SAAS,oBAAoB,CAAC,EAC5B,EAAE,EACF,OAAO,EACP,KAAK,EACL,QAAQ,EACR,iBAAiB,EACjB,wBAAwB,GAClB;IACN,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA;IACpD,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IAExC,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,CACpC,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE;QACxB,UAAU,EAAE,CAAA;QACZ,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;IACjC,CAAC,EACD,CAAC,QAAQ,EAAE,UAAU,CAAC,CACvB,CAAA;IAED,OAAO,CACL,6BAAK,SAAS,EAAC,2BAA2B;QACxC,oBAAC,yBAAyB,IACxB,SAAS,EAAC,cAAc,EACxB,EAAE,EAAE,EAAE,EACN,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAE1B,6BAAK,SAAS,EAAC,SAAS,IACrB,KAAK,CAAC,CAAC,CAAC,CACP,oBAAC,gBAAgB,IACf,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,YAAY,GACtB,CACH,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAClB,oBAAC,gBAAgB,IAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,GAAI,CAC/D,CAAC,CAAC,CAAC,IAAI,CACJ;YAEL,CAAC,OAAO,IAAI,wBAAwB,CAAC,IAAI,CAAC,CAAC,iBAAiB,IAAI,CAC/D,6BAAK,IAAI,EAAC,OAAO,EAAC,SAAS,EAAC,kBAAkB;gBAC5C,6BAAK,SAAS,EAAC,2DAA2D,IACvE,iBAAiB,CACd,CACF,CACP,CACyB,CACxB,CACP,CAAA;AACH,CAAC;AAED,eAAe,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;AAE/C,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,gBAAgB,CAAC,EAC5D,OAAO,EACP,QAAQ,GAIT;IACC,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAkB,IAAI,CAAC,CAAA;IAErD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IAClD,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAElE,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QACzC,IAAI,SAAS,CAAC,OAAO,EAAE;YACrB,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;YACpC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;SAC1B;QACD,UAAU,CAAC,IAAI,CAAC,CAAA;IAClB,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE;QAC9C,IAAI,CAAC,SAAS,CAAC,OAAO;YAAE,OAAM;QAC9B,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAA;QAE1D,yDAAyD;QACzD,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,aAAa,CAAC,CAAA;QAC9C,QAAQ,CAAC,OAAO,EAAE,oBAAoB,CAAC,IAAI,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC,CAAA;IACzE,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;IAEvB,yBAAyB;IACzB,MAAM,aAAa,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QAC3C,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,gBAAgB,CAAC,eAAe,EAAE,CAAA;SACnC;QACD,IAAI,OAAO,EAAE;YACX,UAAU,CAAC,KAAK,CAAC,CAAA;SAClB;IACH,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA;IAEb,gBAAgB;IAChB,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,eAAe,GAAG,SAAS,CAAC,OAAO,CAAA;QACzC,IAAI,CAAC,eAAe;YAAE,OAAM;QAC5B,MAAM,MAAM,GAAG,GAAG,EAAE;YAClB,MAAM,SAAS,GAAG,eAAe,CAAC,SAAS,EAAE,CAAC,UAAU,CAAA;YACxD,IAAI,SAAS,EAAE;gBACb,mBAAmB,CAAC;oBAClB,uBAAuB;oBACvB,KAAK,EAAE,SAAS,CAAC,WAAW;oBAC5B,uBAAuB;oBACvB,MAAM,EAAE,SAAS,CAAC,YAAY;iBAC/B,CAAC,CAAA;aACH;QACH,CAAC,CAAA;QACD,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QACzC,MAAM,EAAE,CAAA;QAER,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAC9C,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;IAEf,+BAA+B;IAC/B,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,SAAS,CAAC,OAAO;YAAE,OAAM;QAC9B,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,CAAA;SACxB;aAAM;YACL,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,CAAA;SACvB;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEjC,OAAO,CACL;QACE;YACE,oBAAC,eAAe,IACd,GAAG,EAAE,SAAS,EACd,WAAW,EAAE;oBACX,GAAG,gBAAgB;oBACnB,SAAS,EACP,qEAAqE;oBACvE,uBAAuB;oBACvB,QAAQ,EAAE,OAAO,CAAC,QAAQ;iBAC3B,EACD,KAAK,EAAE,aAAa,EACpB,OAAO,EACL,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,GAEhE,CACE;QAEN,6BAAK,SAAS,EAAC,oBAAoB;YACjC,gCACE,IAAI,EAAC,QAAQ,EACb,SAAS,EAAC,oEAAoE,EAC9E,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,OAAO,YAG9B;YACT,gCACE,IAAI,EAAC,QAAQ,EACb,SAAS,EAAC,2EAA2E,EACrF,OAAO,EAAE,UAAU,EACnB,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,OAAO,WAG9B,CACL,CACL,CACJ,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,gBAAgB,CAAC,EAC5D,OAAO,EACP,KAAK,EACL,QAAQ,GAKT;IACC,MAAM,MAAM,GAAG,aAAa,CAC1B,KAAK,EACL,OAAO,EACP,KAAK,CAAC,WAAW,CACf,CAAC,EAAE,EAAE,UAAU,EAAE,EAAE;QACjB,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;IAC/B,CAAC,EACD,CAAC,OAAO,EAAE,QAAQ,CAAC,CACpB,CACF,CAAA;IAED,OAAO,CACL;QACE,gCAAQ,SAAS,EAAC,WAAW;YAC3B,6BAAK,SAAS,EAAC,gBAAgB;gBAC7B,oBAAC,YAAY,IAAC,OAAO,EAAE,OAAO,KAAM,MAAM,GAAI,CAC1C,CACC;QAET,6BAAK,SAAS,EAAC,oBAAoB;YACjC,gCACE,IAAI,EAAC,QAAQ,EACb,SAAS,EAAC,oEAAoE,EAC9E,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,EAC3C,QAAQ,EAAE,OAAO,CAAC,QAAQ,YAGnB,CACL,CACL,CACJ,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,YAAY,CAAC,EACpD,OAAO,EACP,kBAAkB,EAClB,WAAW,EACX,iBAAiB,EACjB,QAAQ,EACR,iBAAiB,GAGlB;IACC,IAAI,kBAAkB,EAAE;QACtB,OAAO,CACL;YACE,4BAAI,SAAS,EAAC,YAAY,oBAAmB;YAC7C;;gBACoD,uCAAY;yCAE5D,CACH,CACJ,CAAA;KACF;IAED,IAAI,iBAAiB,EAAE;QACrB,OAAO,CACL;YACE,4BAAI,SAAS,EAAC,YAAY,qBAAoB;YAC9C,+BAAI,iBAAiB,CAAC,OAAO,CAAK,CACjC,CACJ,CAAA;KACF;IAED,IAAI,iBAAiB,EAAE;QACrB,OAAO,oBAAC,SAAS,IAAC,KAAK,QAAC,SAAS,EAAC,iCAAiC,GAAG,CAAA;KACvE;IAED,IAAI,QAAQ,EAAE;QACZ,OAAO,CACL;YACE,8BAAM,SAAS,EAAC,mBAAmB;gBACjC,oBAAC,gBAAgB,IACf,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,iBAAiB,EACpC,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,GAClB,CACG;YACP,6BACE,GAAG,EAAE,QAAQ,EACb,SAAS,EAAC,2CAA2C,GACrD,CACD,CACJ,CAAA;KACF;IAED,OAAO,oBAAC,uBAAuB,OAAG,CAAA;AACpC,CAAC,CAAC,CAAA","sourcesContent":["import * as React from 'react'\nimport SignatureCanvas from 'react-signature-canvas'\nimport { FormTypes } from '@oneblink/types'\n\nimport scrollingService from '../services/scrolling-service'\nimport FormElementLabelContainer from '../components/renderer/FormElementLabelContainer'\nimport OnLoading from '../components/renderer/OnLoading'\nimport useAttachment from '../hooks/attachments/useAttachment'\nimport { FormElementBinaryStorageValue } from '../types/attachments'\nimport { prepareNewAttachment } from '../services/attachments'\nimport AttachmentStatus from '../components/renderer/attachments/AttachmentStatus'\nimport useBooleanState from '../hooks/useBooleanState'\nimport { canvasToBlob } from '../services/blob-utils'\nimport ImagePreviewUnavailable from '../components/renderer/attachments/ImagePreviewUnavailable'\nimport { FormElementValueChangeHandler } from '../types/form'\nimport useIsPageVisible from '../hooks/useIsPageVisible'\n\ntype Props = {\n  id: string\n  element: FormTypes.DrawElement\n  value: FormElementBinaryStorageValue\n  onChange: FormElementValueChangeHandler<FormElementBinaryStorageValue>\n  displayValidationMessage: boolean\n  validationMessage: string | undefined\n}\n\nfunction FormElementSignature({\n  id,\n  element,\n  value,\n  onChange,\n  validationMessage,\n  displayValidationMessage,\n}: Props) {\n  const [isDirty, setIsDirty] = useBooleanState(false)\n  const isPageVisible = useIsPageVisible()\n\n  const handleChange = React.useCallback(\n    (formElement, newValue) => {\n      setIsDirty()\n      onChange(formElement, newValue)\n    },\n    [onChange, setIsDirty],\n  )\n\n  return (\n    <div className=\"cypress-signature-element\">\n      <FormElementLabelContainer\n        className=\"ob-signature\"\n        id={id}\n        element={element}\n        required={element.required}\n      >\n        <div className=\"control\">\n          {value ? (\n            <SignatureDisplay\n              element={element}\n              value={value}\n              onChange={handleChange}\n            />\n          ) : isPageVisible ? (\n            <SignatureDrawing element={element} onChange={handleChange} />\n          ) : null}\n        </div>\n\n        {(isDirty || displayValidationMessage) && !!validationMessage && (\n          <div role=\"alert\" className=\"has-margin-top-8\">\n            <div className=\"has-text-danger ob-error__text cypress-validation-message\">\n              {validationMessage}\n            </div>\n          </div>\n        )}\n      </FormElementLabelContainer>\n    </div>\n  )\n}\n\nexport default React.memo(FormElementSignature)\n\nconst SignatureDrawing = React.memo(function SignatureDrawing({\n  element,\n  onChange,\n}: {\n  element: Props['element']\n  onChange: Props['onChange']\n}) {\n  const canvasRef = React.useRef<SignatureCanvas>(null)\n\n  const [isEmpty, setIsEmpty] = React.useState(true)\n  const [canvasDimensions, setCanvasDimensions] = React.useState({})\n\n  const handleClear = React.useCallback(() => {\n    if (canvasRef.current) {\n      console.log('Clearing signature...')\n      canvasRef.current.clear()\n    }\n    setIsEmpty(true)\n  }, [])\n\n  const handleDone = React.useCallback(async () => {\n    if (!canvasRef.current) return\n    const trimmedCanvas = canvasRef.current.getTrimmedCanvas()\n\n    // Convert base64 data uri to blob and send it on its way\n    const blob = await canvasToBlob(trimmedCanvas)\n    onChange(element, prepareNewAttachment(blob, 'signature.png', element))\n  }, [element, onChange])\n\n  // HANDLING CANVAS CHANGE\n  const handleEndDraw = React.useCallback(() => {\n    if (window.cordova) {\n      scrollingService.enableScrolling()\n    }\n    if (isEmpty) {\n      setIsEmpty(false)\n    }\n  }, [isEmpty])\n\n  // HANDLE RESIZE\n  React.useEffect(() => {\n    const signatureCanvas = canvasRef.current\n    if (!signatureCanvas) return\n    const resize = () => {\n      const parentDiv = signatureCanvas.getCanvas().parentNode\n      if (parentDiv) {\n        setCanvasDimensions({\n          // @ts-expect-error ???\n          width: parentDiv.clientWidth,\n          // @ts-expect-error ???\n          height: parentDiv.clientHeight,\n        })\n      }\n    }\n    window.addEventListener('resize', resize)\n    resize()\n\n    return () => {\n      window.removeEventListener('resize', resize)\n    }\n  }, [canvasRef])\n\n  // REACTIVE DISABLING OF CANVAS\n  React.useEffect(() => {\n    if (!canvasRef.current) return\n    if (element.readOnly) {\n      canvasRef.current.off()\n    } else {\n      canvasRef.current.on()\n    }\n  }, [canvasRef, element.readOnly])\n\n  return (\n    <>\n      <div>\n        <SignatureCanvas\n          ref={canvasRef}\n          canvasProps={{\n            ...canvasDimensions,\n            className:\n              'input ob-signature__control cypress-signature-control signature-pad',\n            // @ts-expect-error ???\n            disabled: element.readOnly,\n          }}\n          onEnd={handleEndDraw}\n          onBegin={\n            window.cordova ? scrollingService.disableScrolling : undefined\n          }\n        />\n      </div>\n\n      <div className=\"buttons ob-buttons\">\n        <button\n          type=\"button\"\n          className=\"button ob-button is-light ob-button__clear cypress-clear-signature\"\n          onClick={handleClear}\n          disabled={element.readOnly || isEmpty}\n        >\n          Clear\n        </button>\n        <button\n          type=\"button\"\n          className=\"button ob-button ob-button__done is-primary cypress-done-signature-button\"\n          onClick={handleDone}\n          disabled={element.readOnly || isEmpty}\n        >\n          Done\n        </button>\n      </div>\n    </>\n  )\n})\n\nconst SignatureDisplay = React.memo(function SignatureDisplay({\n  element,\n  value,\n  onChange,\n}: {\n  element: Props['element']\n  value: Props['value']\n  onChange: Props['onChange']\n}) {\n  const result = useAttachment(\n    value,\n    element,\n    React.useCallback(\n      (id, attachment) => {\n        onChange(element, attachment)\n      },\n      [element, onChange],\n    ),\n  )\n\n  return (\n    <>\n      <figure className=\"ob-figure\">\n        <div className=\"figure-content\">\n          <DisplayImage element={element} {...result} />\n        </div>\n      </figure>\n\n      <div className=\"buttons ob-buttons\">\n        <button\n          type=\"button\"\n          className=\"button ob-button is-light ob-button__clear cypress-clear-signature\"\n          onClick={() => onChange(element, undefined)}\n          disabled={element.readOnly}\n        >\n          Clear\n        </button>\n      </div>\n    </>\n  )\n})\n\nconst DisplayImage = React.memo(function DisplayImage({\n  element,\n  uploadErrorMessage,\n  isUploading,\n  isLoadingImageUrl,\n  imageUrl,\n  loadImageUrlError,\n}: ReturnType<typeof useAttachment> & {\n  element: FormTypes.DrawElement\n}) {\n  if (uploadErrorMessage) {\n    return (\n      <>\n        <h3 className=\"title is-3\">Upload Failed</h3>\n        <p>\n          Your signature failed to upload, please press the <b>Clear</b> button\n          and try again.\n        </p>\n      </>\n    )\n  }\n\n  if (loadImageUrlError) {\n    return (\n      <>\n        <h3 className=\"title is-3\">Preview Failed</h3>\n        <p>{loadImageUrlError.message}</p>\n      </>\n    )\n  }\n\n  if (isLoadingImageUrl) {\n    return <OnLoading small className=\"cypress-signature-loading-image\" />\n  }\n\n  if (imageUrl) {\n    return (\n      <>\n        <span className=\"ob-figure__status\">\n          <AttachmentStatus\n            isLoadingImageUrl={isLoadingImageUrl}\n            loadImageUrlError={loadImageUrlError}\n            isUploading={isUploading}\n            imageUrl={imageUrl}\n          />\n        </span>\n        <img\n          src={imageUrl}\n          className=\"cypress-signature-image ob-signature__img\"\n        />\n      </>\n    )\n  }\n\n  return <ImagePreviewUnavailable />\n})\n"]}

package/dist/hooks/attachments/useAttachment.js

@@ -7,7 +7,7 @@ import useAuth from '../../hooks/useAuth';
 import { urlToBlobAsync } from '../../services/blob-utils';
 import useAttachmentBlobs from '../../hooks/attachments/useAttachmentBlobs';
 export default function useAttachment(value, element, onChange, disableUpload) {
-    const isPrivate = element.storageType === 'private';
+    const isPrivate = element.storageType !== 'public';
     const form = useFormDefinition();
     const isOffline = useIsOffline();
     const { isLoggedIn, isUsingFormsKey } = useAuth();

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 { submissionService } from '@oneblink/apps'\nimport { FormTypes } from '@oneblink/types'\nimport useFormDefinition from '../useFormDefinition'\nimport useIsOffline from '../useIsOffline'\nimport {\n  Attachment,\n  AttachmentNew,\n  FormElementBinaryStorageValue,\n} 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 = (id: string, attachment: Attachment) => 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 === 'private'\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\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 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 submissionService.uploadAttachment(\n          {\n            formId,\n            fileName: newAttachment.fileName,\n            contentType: data.type,\n            data,\n            isPrivate,\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    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  }\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 { submissionService } from '@oneblink/apps'\nimport { FormTypes } from '@oneblink/types'\nimport useFormDefinition from '../useFormDefinition'\nimport useIsOffline from '../useIsOffline'\nimport {\n  Attachment,\n  AttachmentNew,\n  FormElementBinaryStorageValue,\n} 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 = (id: string, attachment: Attachment) => 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\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 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 submissionService.uploadAttachment(\n          {\n            formId,\n            fileName: newAttachment.fileName,\n            contentType: data.type,\n            data,\n            isPrivate,\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    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  }\n}\n"]}

package/dist/services/attachments.d.ts

@@ -2,7 +2,6 @@ import { FormTypes } from '@oneblink/types';
 import { AttachmentNew } from '../types/attachments';
 export declare function prepareNewAttachment(blob: Blob, fileName: string, element: FormTypes.FormElementBinaryStorage): AttachmentNew;
 export declare function checkIfContentTypeIsImage(contentType: string): boolean;
-export declare function checkIsUsingLegacyStorage(element: FormTypes.FormElementBinaryStorage): boolean;
 export declare function parseFilesAsAttachmentsLegacy(files: File[], onAnnotateCanvas?: (file: File, canvas: HTMLCanvasElement) => void): Promise<Array<{
     data: string;
     fileName: string;

package/dist/services/attachments.js

@@ -6,16 +6,13 @@ export function prepareNewAttachment(blob, fileName, element) {
         _id: uuid(),
         data: blob,
         fileName,
-        isPrivate: element.storageType === 'private',
+        isPrivate: element.storageType !== 'public',
         type: 'NEW',
     };
 }
 export function checkIfContentTypeIsImage(contentType) {
     return contentType.indexOf('image/') === 0;
 }
-export function checkIsUsingLegacyStorage(element) {
-    return !element.storageType || element.storageType === 'legacy';
-}
 export async function parseFilesAsAttachmentsLegacy(files, onAnnotateCanvas) {
     const attachments = [];
     for (const file of files) {

package/dist/services/attachments.js.map

@@ -1 +1 @@
-{"version":3,"file":"attachments.js","sourceRoot":"","sources":["../../src/services/attachments.ts"],"names":[],"mappings":"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","sourcesContent":["import { FormTypes } from '@oneblink/types'\nimport { Sentry } from '@oneblink/apps'\nimport { v4 as uuid } from 'uuid'\nimport { AttachmentNew } from '../types/attachments'\nimport { blobToCanvas, getBlobOrientation } from './blob-utils'\n\nexport function prepareNewAttachment(\n  blob: Blob,\n  fileName: string,\n  element: FormTypes.FormElementBinaryStorage,\n): AttachmentNew {\n  return {\n    _id: uuid(),\n    data: blob,\n    fileName,\n    isPrivate: element.storageType === 'private',\n    type: 'NEW',\n  }\n}\n\nexport function checkIfContentTypeIsImage(contentType: string) {\n  return contentType.indexOf('image/') === 0\n}\n\nexport function checkIsUsingLegacyStorage(\n  element: FormTypes.FormElementBinaryStorage,\n): boolean {\n  return !element.storageType || element.storageType === 'legacy'\n}\n\nexport async function parseFilesAsAttachmentsLegacy(\n  files: File[],\n  onAnnotateCanvas?: (file: File, canvas: HTMLCanvasElement) => void,\n): Promise<Array<{ data: string; fileName: string; contentType: string }>> {\n  const attachments: Array<{\n    data: string\n    fileName: string\n    contentType: string\n  }> = []\n\n  for (const file of files) {\n    const result = await correctFileOrientation(file, onAnnotateCanvas)\n\n    if (result instanceof Blob) {\n      console.log('Attempting to parse File as attachment', file)\n\n      const base64data = await new Promise<string>((resolve, reject) => {\n        const reader = new FileReader()\n        reader.onload = function () {\n          resolve(reader.result as string)\n        }\n        reader.onerror = function () {\n          reject(new Error('Could not read file from data url'))\n        }\n        reader.readAsDataURL(file)\n      })\n\n      attachments.push({\n        fileName: file.name,\n        contentType: file.type,\n        data: base64data,\n      })\n    } else {\n      attachments.push({\n        fileName: file.name,\n        contentType: file.type,\n        data: result.toDataURL(),\n      })\n    }\n  }\n\n  return attachments\n}\n\nexport async function correctFileOrientation(\n  file: File,\n  onAnnotateCanvas?: (file: File, canvas: HTMLCanvasElement) => void,\n): Promise<Blob | HTMLCanvasElement> {\n  try {\n    if (!checkIfContentTypeIsImage(file.type)) {\n      return file\n    }\n\n    console.log('Attempting to parse File as image attachment', file)\n\n    const orientation = await getBlobOrientation(file)\n    if (\n      (typeof orientation !== 'number' || orientation === 1) &&\n      !onAnnotateCanvas\n    ) {\n      console.log('Skipping orientation correction for image')\n      return file\n    }\n\n    console.log(\n      'Loading image onto canvas to correct orientation using image meta data',\n      { orientation },\n    )\n    const canvas = await blobToCanvas(file, orientation)\n    if (onAnnotateCanvas) {\n      onAnnotateCanvas(file, canvas)\n    }\n    return canvas\n  } catch (err) {\n    console.warn('Failed to rotate the orientation of a file:', err)\n    Sentry.captureException(err)\n    return file\n  }\n}\n"]}
+{"version":3,"file":"attachments.js","sourceRoot":"","sources":["../../src/services/attachments.ts"],"names":[],"mappings":"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","sourcesContent":["import { FormTypes } from '@oneblink/types'\nimport { Sentry } from '@oneblink/apps'\nimport { v4 as uuid } from 'uuid'\nimport { AttachmentNew } from '../types/attachments'\nimport { blobToCanvas, getBlobOrientation } from './blob-utils'\n\nexport function prepareNewAttachment(\n  blob: Blob,\n  fileName: string,\n  element: FormTypes.FormElementBinaryStorage,\n): AttachmentNew {\n  return {\n    _id: uuid(),\n    data: blob,\n    fileName,\n    isPrivate: element.storageType !== 'public',\n    type: 'NEW',\n  }\n}\n\nexport function checkIfContentTypeIsImage(contentType: string) {\n  return contentType.indexOf('image/') === 0\n}\n\nexport async function parseFilesAsAttachmentsLegacy(\n  files: File[],\n  onAnnotateCanvas?: (file: File, canvas: HTMLCanvasElement) => void,\n): Promise<Array<{ data: string; fileName: string; contentType: string }>> {\n  const attachments: Array<{\n    data: string\n    fileName: string\n    contentType: string\n  }> = []\n\n  for (const file of files) {\n    const result = await correctFileOrientation(file, onAnnotateCanvas)\n\n    if (result instanceof Blob) {\n      console.log('Attempting to parse File as attachment', file)\n\n      const base64data = await new Promise<string>((resolve, reject) => {\n        const reader = new FileReader()\n        reader.onload = function () {\n          resolve(reader.result as string)\n        }\n        reader.onerror = function () {\n          reject(new Error('Could not read file from data url'))\n        }\n        reader.readAsDataURL(file)\n      })\n\n      attachments.push({\n        fileName: file.name,\n        contentType: file.type,\n        data: base64data,\n      })\n    } else {\n      attachments.push({\n        fileName: file.name,\n        contentType: file.type,\n        data: result.toDataURL(),\n      })\n    }\n  }\n\n  return attachments\n}\n\nexport async function correctFileOrientation(\n  file: File,\n  onAnnotateCanvas?: (file: File, canvas: HTMLCanvasElement) => void,\n): Promise<Blob | HTMLCanvasElement> {\n  try {\n    if (!checkIfContentTypeIsImage(file.type)) {\n      return file\n    }\n\n    console.log('Attempting to parse File as image attachment', file)\n\n    const orientation = await getBlobOrientation(file)\n    if (\n      (typeof orientation !== 'number' || orientation === 1) &&\n      !onAnnotateCanvas\n    ) {\n      console.log('Skipping orientation correction for image')\n      return file\n    }\n\n    console.log(\n      'Loading image onto canvas to correct orientation using image meta data',\n      { orientation },\n    )\n    const canvas = await blobToCanvas(file, orientation)\n    if (onAnnotateCanvas) {\n      onAnnotateCanvas(file, canvas)\n    }\n    return canvas\n  } catch (err) {\n    console.warn('Failed to rotate the orientation of a file:', err)\n    Sentry.captureException(err)\n    return file\n  }\n}\n"]}

package/dist/services/checkIfAttachmentsAreUploading.js

@@ -1,4 +1,3 @@
-import { checkIsUsingLegacyStorage } from './attachments';
 function checkIfAttachmentsAreUploadingForFormElements(formElements, submission) {
     return formElements.some((formElement) => {
         var _a;
@@ -28,9 +27,6 @@ function checkIfAttachmentsAreUploadingForFormElements(formElements, submission)
             case 'draw':
             case 'compliance':
             case 'files': {
-                if (checkIsUsingLegacyStorage(formElement)) {
-                    break;
-                }
                 const value = submission[formElement.name];
                 if (!value) {
                     break;

package/dist/services/checkIfAttachmentsAreUploading.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkIfAttachmentsAreUploading.js","sourceRoot":"","sources":["../../src/services/checkIfAttachmentsAreUploading.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAA;AAGzD,SAAS,6CAA6C,CACpD,YAAqC,EACrC,UAA+B;IAE/B,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;;QACvC,QAAQ,WAAW,CAAC,IAAI,EAAE;YACxB,KAAK,SAAS,CAAC;YACf,KAAK,MAAM,CAAC,CAAC;gBACX,OAAO,6CAA6C,CAClD,WAAW,CAAC,QAAQ,EACpB,UAAU,CACX,CAAA;aACF;YACD,KAAK,MAAM,CAAC,CAAC;gBACX,MAAM,gBAAgB,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;gBACrD,IAAI,CAAC,gBAAgB,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;oBAC7D,MAAK;iBACN;gBACD,OAAO,6CAA6C,CAClD,WAAW,CAAC,QAAQ,IAAI,EAAE,EAC1B,gBAAuC,CACxC,CAAA;aACF;YACD,KAAK,eAAe,CAAC,CAAC;gBACpB,MAAM,OAAO,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;gBAC5C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;oBAC3B,MAAK;iBACN;gBACD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC5B,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;wBACzB,6CAA6C,CAC3C,WAAW,CAAC,QAAQ,EACpB,KAAK,CACN,CACF,CAAA;gBACH,CAAC,CAAC,CAAA;aACH;YACD,KAAK,QAAQ,CAAC;YACd,KAAK,MAAM,CAAC;YACZ,KAAK,YAAY,CAAC;YAClB,KAAK,OAAO,CAAC,CAAC;gBACZ,IAAI,yBAAyB,CAAC,WAAW,CAAC,EAAE;oBAC1C,MAAK;iBACN;gBAED,MAAM,KAAK,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;gBAC1C,IAAI,CAAC,KAAK,EAAE;oBACV,MAAK;iBACN;gBAED,8DAA8D;gBAC9D,QAAQ,WAAW,CAAC,IAAI,EAAE;oBACxB,KAAK,QAAQ,CAAC;oBACd,KAAK,MAAM,CAAC,CAAC;wBACX,OAAO,CAAC,CAAC,CAAC,KAAoB,aAApB,KAAK,uBAAL,KAAK,CAAiB,IAAI,CAAA,CAAA;qBACrC;oBACD,KAAK,YAAY,CAAC,CAAC;wBACjB,OAAO,MAAC,KAAoC,CAAC,KAAK,0CAAE,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;4BAChE,OAAO,CAAC,CAAC,CAAC,IAAmB,aAAnB,IAAI,uBAAJ,IAAI,CAAiB,IAAI,CAAA,CAAA;wBACrC,CAAC,CAAC,CAAA;qBACH;oBACD,KAAK,OAAO,CAAC,CAAC;wBACZ,OAAQ,KAAsB,aAAtB,KAAK,uBAAL,KAAK,CAAmB,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE;4BAClD,OAAO,CAAC,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,CAAA,CAAA;wBAC3B,CAAC,CAAC,CAAA;qBACH;iBACF;aACF;SACF;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,8BAA8B,CACpD,IAAoB,EACpB,UAA+B;IAE/B,OAAO,6CAA6C,CAClD,IAAI,CAAC,QAAQ,EACb,UAAU,CACX,CAAA;AACH,CAAC","sourcesContent":["import { FormTypes } from '@oneblink/types'\nimport { Attachment } from '../types/attachments'\nimport { Value as FormElementComplianceValue } from '../form-elements/FormElementCompliance'\nimport { checkIsUsingLegacyStorage } from './attachments'\nimport { FormSubmissionModel } from '../types/form'\n\nfunction checkIfAttachmentsAreUploadingForFormElements(\n  formElements: FormTypes.FormElement[],\n  submission: FormSubmissionModel,\n): boolean {\n  return formElements.some((formElement) => {\n    switch (formElement.type) {\n      case 'section':\n      case 'page': {\n        return checkIfAttachmentsAreUploadingForFormElements(\n          formElement.elements,\n          submission,\n        )\n      }\n      case 'form': {\n        const nestedSubmission = submission[formElement.name]\n        if (!nestedSubmission || typeof nestedSubmission !== 'object') {\n          break\n        }\n        return checkIfAttachmentsAreUploadingForFormElements(\n          formElement.elements || [],\n          nestedSubmission as FormSubmissionModel,\n        )\n      }\n      case 'repeatableSet': {\n        const entries = submission[formElement.name]\n        if (!Array.isArray(entries)) {\n          break\n        }\n        return entries.some((entry) => {\n          return (\n            typeof entry === 'object' &&\n            checkIfAttachmentsAreUploadingForFormElements(\n              formElement.elements,\n              entry,\n            )\n          )\n        })\n      }\n      case 'camera':\n      case 'draw':\n      case 'compliance':\n      case 'files': {\n        if (checkIsUsingLegacyStorage(formElement)) {\n          break\n        }\n\n        const value = submission[formElement.name]\n        if (!value) {\n          break\n        }\n\n        // If the attachment has a type, it has not finished uploading\n        switch (formElement.type) {\n          case 'camera':\n          case 'draw': {\n            return !!(value as Attachment)?.type\n          }\n          case 'compliance': {\n            return (value as FormElementComplianceValue).files?.some((file) => {\n              return !!(file as Attachment)?.type\n            })\n          }\n          case 'files': {\n            return (value as Attachment[])?.some((attachment) => {\n              return !!attachment?.type\n            })\n          }\n        }\n      }\n    }\n  })\n}\n\nexport default function checkIfAttachmentsAreUploading(\n  form: FormTypes.Form,\n  submission: FormSubmissionModel,\n): boolean {\n  return checkIfAttachmentsAreUploadingForFormElements(\n    form.elements,\n    submission,\n  )\n}\n"]}
+{"version":3,"file":"checkIfAttachmentsAreUploading.js","sourceRoot":"","sources":["../../src/services/checkIfAttachmentsAreUploading.ts"],"names":[],"mappings":"AAKA,SAAS,6CAA6C,CACpD,YAAqC,EACrC,UAA+B;IAE/B,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;;QACvC,QAAQ,WAAW,CAAC,IAAI,EAAE;YACxB,KAAK,SAAS,CAAC;YACf,KAAK,MAAM,CAAC,CAAC;gBACX,OAAO,6CAA6C,CAClD,WAAW,CAAC,QAAQ,EACpB,UAAU,CACX,CAAA;aACF;YACD,KAAK,MAAM,CAAC,CAAC;gBACX,MAAM,gBAAgB,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;gBACrD,IAAI,CAAC,gBAAgB,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;oBAC7D,MAAK;iBACN;gBACD,OAAO,6CAA6C,CAClD,WAAW,CAAC,QAAQ,IAAI,EAAE,EAC1B,gBAAuC,CACxC,CAAA;aACF;YACD,KAAK,eAAe,CAAC,CAAC;gBACpB,MAAM,OAAO,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;gBAC5C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;oBAC3B,MAAK;iBACN;gBACD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC5B,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;wBACzB,6CAA6C,CAC3C,WAAW,CAAC,QAAQ,EACpB,KAAK,CACN,CACF,CAAA;gBACH,CAAC,CAAC,CAAA;aACH;YACD,KAAK,QAAQ,CAAC;YACd,KAAK,MAAM,CAAC;YACZ,KAAK,YAAY,CAAC;YAClB,KAAK,OAAO,CAAC,CAAC;gBACZ,MAAM,KAAK,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;gBAC1C,IAAI,CAAC,KAAK,EAAE;oBACV,MAAK;iBACN;gBAED,8DAA8D;gBAC9D,QAAQ,WAAW,CAAC,IAAI,EAAE;oBACxB,KAAK,QAAQ,CAAC;oBACd,KAAK,MAAM,CAAC,CAAC;wBACX,OAAO,CAAC,CAAC,CAAC,KAAoB,aAApB,KAAK,uBAAL,KAAK,CAAiB,IAAI,CAAA,CAAA;qBACrC;oBACD,KAAK,YAAY,CAAC,CAAC;wBACjB,OAAO,MAAC,KAAoC,CAAC,KAAK,0CAAE,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;4BAChE,OAAO,CAAC,CAAC,CAAC,IAAmB,aAAnB,IAAI,uBAAJ,IAAI,CAAiB,IAAI,CAAA,CAAA;wBACrC,CAAC,CAAC,CAAA;qBACH;oBACD,KAAK,OAAO,CAAC,CAAC;wBACZ,OAAQ,KAAsB,aAAtB,KAAK,uBAAL,KAAK,CAAmB,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE;4BAClD,OAAO,CAAC,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,CAAA,CAAA;wBAC3B,CAAC,CAAC,CAAA;qBACH;iBACF;aACF;SACF;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,8BAA8B,CACpD,IAAoB,EACpB,UAA+B;IAE/B,OAAO,6CAA6C,CAClD,IAAI,CAAC,QAAQ,EACb,UAAU,CACX,CAAA;AACH,CAAC","sourcesContent":["import { FormTypes } from '@oneblink/types'\nimport { Attachment } from '../types/attachments'\nimport { Value as FormElementComplianceValue } from '../form-elements/FormElementCompliance'\nimport { FormSubmissionModel } from '../types/form'\n\nfunction checkIfAttachmentsAreUploadingForFormElements(\n  formElements: FormTypes.FormElement[],\n  submission: FormSubmissionModel,\n): boolean {\n  return formElements.some((formElement) => {\n    switch (formElement.type) {\n      case 'section':\n      case 'page': {\n        return checkIfAttachmentsAreUploadingForFormElements(\n          formElement.elements,\n          submission,\n        )\n      }\n      case 'form': {\n        const nestedSubmission = submission[formElement.name]\n        if (!nestedSubmission || typeof nestedSubmission !== 'object') {\n          break\n        }\n        return checkIfAttachmentsAreUploadingForFormElements(\n          formElement.elements || [],\n          nestedSubmission as FormSubmissionModel,\n        )\n      }\n      case 'repeatableSet': {\n        const entries = submission[formElement.name]\n        if (!Array.isArray(entries)) {\n          break\n        }\n        return entries.some((entry) => {\n          return (\n            typeof entry === 'object' &&\n            checkIfAttachmentsAreUploadingForFormElements(\n              formElement.elements,\n              entry,\n            )\n          )\n        })\n      }\n      case 'camera':\n      case 'draw':\n      case 'compliance':\n      case 'files': {\n        const value = submission[formElement.name]\n        if (!value) {\n          break\n        }\n\n        // If the attachment has a type, it has not finished uploading\n        switch (formElement.type) {\n          case 'camera':\n          case 'draw': {\n            return !!(value as Attachment)?.type\n          }\n          case 'compliance': {\n            return (value as FormElementComplianceValue).files?.some((file) => {\n              return !!(file as Attachment)?.type\n            })\n          }\n          case 'files': {\n            return (value as Attachment[])?.some((attachment) => {\n              return !!attachment?.type\n            })\n          }\n        }\n      }\n    }\n  })\n}\n\nexport default function checkIfAttachmentsAreUploading(\n  form: FormTypes.Form,\n  submission: FormSubmissionModel,\n): boolean {\n  return checkIfAttachmentsAreUploadingForFormElements(\n    form.elements,\n    submission,\n  )\n}\n"]}

package/dist/services/checkIfAttachmentsExist.js

@@ -1,5 +1,4 @@
 import { v4 as uuid } from 'uuid';
-import { checkIsUsingLegacyStorage } from './attachments';
 export function validateAttachmentExists(attachment, attachmentRetentionInDays) {
     if (attachment.type || !attachment.uploadedAt || !attachmentRetentionInDays) {
         return;
@@ -98,9 +97,6 @@ function checkIfAttachmentsExistForFormElements(formElements, submission, attach
             case 'draw':
             case 'compliance':
             case 'files': {
-                if (checkIsUsingLegacyStorage(formElement)) {
-                    break;
-                }
                 const value = submission[formElement.name];
                 if (!value) {
                     break;

package/dist/services/checkIfAttachmentsExist.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkIfAttachmentsExist.js","sourceRoot":"","sources":["../../src/services/checkIfAttachmentsExist.ts"],"names":[],"mappings":"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","sourcesContent":["import { FormTypes } from '@oneblink/types'\nimport { v4 as uuid } from 'uuid'\nimport { Attachment, AttachmentError } from '../types/attachments'\n\nimport { Value as FormElementComplianceValue } from '../form-elements/FormElementCompliance'\nimport { checkIsUsingLegacyStorage } from './attachments'\nimport { FormSubmissionModel } from '../types/form'\n\nexport function validateAttachmentExists(\n  attachment: Attachment,\n  attachmentRetentionInDays: number | undefined,\n): AttachmentError | void {\n  if (attachment.type || !attachment.uploadedAt || !attachmentRetentionInDays) {\n    return\n  }\n\n  const uploadedAt = new Date(attachment.uploadedAt)\n  const expiresAt = new Date(attachment.uploadedAt)\n  expiresAt.setDate(uploadedAt.getDate() + attachmentRetentionInDays)\n  const now = new Date()\n  console.log('Checking if attachment still exists', {\n    uploadedAt,\n    expiresAt,\n    attachment,\n  })\n  // check if attachment exists\n  if (expiresAt > now) {\n    return\n  }\n\n  const attachmentError: AttachmentError = {\n    type: 'ERROR',\n    errorMessage:\n      \"This attachment has been removed based on your administrator's data retention policy, please remove it and upload it again.\",\n    _id: uuid(),\n    fileName: attachment.fileName,\n    isPrivate: attachment.isPrivate,\n  }\n  return attachmentError\n}\n\nfunction validateAttachmentsExists(\n  attachments: unknown,\n  attachmentRetentionInDays: number | undefined,\n): Attachment[] | void {\n  if (!Array.isArray(attachments)) {\n    return\n  }\n  const newAttachments = [...attachments]\n  let hasChanges = false\n  for (let index = 0; index < newAttachments.length; index++) {\n    const attachmentError = validateAttachmentExists(\n      newAttachments[index] as Attachment,\n      attachmentRetentionInDays,\n    )\n    if (attachmentError) {\n      hasChanges = true\n      newAttachments[index] = attachmentError\n    }\n  }\n  if (hasChanges) {\n    return newAttachments\n  }\n}\n\nfunction checkIfAttachmentsExistForFormElements(\n  formElements: FormTypes.FormElement[],\n  submission: FormSubmissionModel,\n  attachmentRetentionInDays: number | undefined,\n): FormSubmissionModel | void {\n  const result: FormSubmissionModel = {\n    ...submission,\n  }\n  let hasChanges = false\n  for (const formElement of formElements) {\n    switch (formElement.type) {\n      case 'section':\n      case 'page': {\n        const newSubmission = checkIfAttachmentsExistForFormElements(\n          formElement.elements,\n          result,\n          attachmentRetentionInDays,\n        )\n        if (newSubmission) {\n          hasChanges = true\n          Object.assign(result, newSubmission)\n        }\n        break\n      }\n      case 'form': {\n        const nestedSubmission = submission[formElement.name]\n        if (!nestedSubmission || typeof nestedSubmission !== 'object') {\n          break\n        }\n        const newSubmission = checkIfAttachmentsExistForFormElements(\n          formElement.elements || [],\n          nestedSubmission as FormSubmissionModel,\n          attachmentRetentionInDays,\n        )\n        if (newSubmission) {\n          hasChanges = true\n          result[formElement.name] = newSubmission\n        }\n        break\n      }\n      case 'repeatableSet': {\n        const entries = submission[formElement.name]\n        if (!Array.isArray(entries)) {\n          break\n        }\n        const newEntries = [...entries]\n        let hasEntryChanges = false\n        for (let index = 0; index < entries.length; index++) {\n          const entry = entries[index]\n          if (typeof entry === 'object') {\n            const newEntry = checkIfAttachmentsExistForFormElements(\n              formElement.elements,\n              entry,\n              attachmentRetentionInDays,\n            )\n            if (newEntry) {\n              hasEntryChanges = true\n              newEntries[index] = newEntry\n            }\n          }\n        }\n        if (hasEntryChanges) {\n          hasChanges = true\n          result[formElement.name] = newEntries\n        }\n        break\n      }\n      case 'camera':\n      case 'draw':\n      case 'compliance':\n      case 'files': {\n        if (checkIsUsingLegacyStorage(formElement)) {\n          break\n        }\n\n        const value = submission[formElement.name]\n        if (!value) {\n          break\n        }\n\n        // If the attachment has a type, it has not finished uploading\n        switch (formElement.type) {\n          case 'camera':\n          case 'draw': {\n            const attachmentError = validateAttachmentExists(\n              value as Attachment,\n              attachmentRetentionInDays,\n            )\n            if (attachmentError) {\n              hasChanges = true\n              result[formElement.name] = attachmentError\n            }\n            break\n          }\n          case 'compliance': {\n            const newAttachments = validateAttachmentsExists(\n              (value as FormElementComplianceValue).files,\n              attachmentRetentionInDays,\n            )\n            if (newAttachments) {\n              hasChanges = true\n              result[formElement.name] = {\n                ...(value as FormElementComplianceValue),\n                files: newAttachments,\n              }\n            }\n            break\n          }\n          case 'files': {\n            const newAttachments = validateAttachmentsExists(\n              value,\n              attachmentRetentionInDays,\n            )\n            if (newAttachments) {\n              hasChanges = true\n              result[formElement.name] = newAttachments\n            }\n            break\n          }\n        }\n      }\n    }\n  }\n  if (hasChanges) {\n    return result\n  }\n}\n\nexport default function checkIfAttachmentsExist(\n  form: FormTypes.Form,\n  submission: FormSubmissionModel,\n  attachmentRetentionInDays: number | undefined,\n): FormSubmissionModel | void {\n  return checkIfAttachmentsExistForFormElements(\n    form.elements,\n    submission,\n    attachmentRetentionInDays,\n  )\n}\n"]}
+{"version":3,"file":"checkIfAttachmentsExist.js","sourceRoot":"","sources":["../../src/services/checkIfAttachmentsExist.ts"],"names":[],"mappings":"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","sourcesContent":["import { FormTypes } from '@oneblink/types'\nimport { v4 as uuid } from 'uuid'\nimport { Attachment, AttachmentError } from '../types/attachments'\n\nimport { Value as FormElementComplianceValue } from '../form-elements/FormElementCompliance'\nimport { FormSubmissionModel } from '../types/form'\n\nexport function validateAttachmentExists(\n  attachment: Attachment,\n  attachmentRetentionInDays: number | undefined,\n): AttachmentError | void {\n  if (attachment.type || !attachment.uploadedAt || !attachmentRetentionInDays) {\n    return\n  }\n\n  const uploadedAt = new Date(attachment.uploadedAt)\n  const expiresAt = new Date(attachment.uploadedAt)\n  expiresAt.setDate(uploadedAt.getDate() + attachmentRetentionInDays)\n  const now = new Date()\n  console.log('Checking if attachment still exists', {\n    uploadedAt,\n    expiresAt,\n    attachment,\n  })\n  // check if attachment exists\n  if (expiresAt > now) {\n    return\n  }\n\n  const attachmentError: AttachmentError = {\n    type: 'ERROR',\n    errorMessage:\n      \"This attachment has been removed based on your administrator's data retention policy, please remove it and upload it again.\",\n    _id: uuid(),\n    fileName: attachment.fileName,\n    isPrivate: attachment.isPrivate,\n  }\n  return attachmentError\n}\n\nfunction validateAttachmentsExists(\n  attachments: unknown,\n  attachmentRetentionInDays: number | undefined,\n): Attachment[] | void {\n  if (!Array.isArray(attachments)) {\n    return\n  }\n  const newAttachments = [...attachments]\n  let hasChanges = false\n  for (let index = 0; index < newAttachments.length; index++) {\n    const attachmentError = validateAttachmentExists(\n      newAttachments[index] as Attachment,\n      attachmentRetentionInDays,\n    )\n    if (attachmentError) {\n      hasChanges = true\n      newAttachments[index] = attachmentError\n    }\n  }\n  if (hasChanges) {\n    return newAttachments\n  }\n}\n\nfunction checkIfAttachmentsExistForFormElements(\n  formElements: FormTypes.FormElement[],\n  submission: FormSubmissionModel,\n  attachmentRetentionInDays: number | undefined,\n): FormSubmissionModel | void {\n  const result: FormSubmissionModel = {\n    ...submission,\n  }\n  let hasChanges = false\n  for (const formElement of formElements) {\n    switch (formElement.type) {\n      case 'section':\n      case 'page': {\n        const newSubmission = checkIfAttachmentsExistForFormElements(\n          formElement.elements,\n          result,\n          attachmentRetentionInDays,\n        )\n        if (newSubmission) {\n          hasChanges = true\n          Object.assign(result, newSubmission)\n        }\n        break\n      }\n      case 'form': {\n        const nestedSubmission = submission[formElement.name]\n        if (!nestedSubmission || typeof nestedSubmission !== 'object') {\n          break\n        }\n        const newSubmission = checkIfAttachmentsExistForFormElements(\n          formElement.elements || [],\n          nestedSubmission as FormSubmissionModel,\n          attachmentRetentionInDays,\n        )\n        if (newSubmission) {\n          hasChanges = true\n          result[formElement.name] = newSubmission\n        }\n        break\n      }\n      case 'repeatableSet': {\n        const entries = submission[formElement.name]\n        if (!Array.isArray(entries)) {\n          break\n        }\n        const newEntries = [...entries]\n        let hasEntryChanges = false\n        for (let index = 0; index < entries.length; index++) {\n          const entry = entries[index]\n          if (typeof entry === 'object') {\n            const newEntry = checkIfAttachmentsExistForFormElements(\n              formElement.elements,\n              entry,\n              attachmentRetentionInDays,\n            )\n            if (newEntry) {\n              hasEntryChanges = true\n              newEntries[index] = newEntry\n            }\n          }\n        }\n        if (hasEntryChanges) {\n          hasChanges = true\n          result[formElement.name] = newEntries\n        }\n        break\n      }\n      case 'camera':\n      case 'draw':\n      case 'compliance':\n      case 'files': {\n        const value = submission[formElement.name]\n        if (!value) {\n          break\n        }\n\n        // If the attachment has a type, it has not finished uploading\n        switch (formElement.type) {\n          case 'camera':\n          case 'draw': {\n            const attachmentError = validateAttachmentExists(\n              value as Attachment,\n              attachmentRetentionInDays,\n            )\n            if (attachmentError) {\n              hasChanges = true\n              result[formElement.name] = attachmentError\n            }\n            break\n          }\n          case 'compliance': {\n            const newAttachments = validateAttachmentsExists(\n              (value as FormElementComplianceValue).files,\n              attachmentRetentionInDays,\n            )\n            if (newAttachments) {\n              hasChanges = true\n              result[formElement.name] = {\n                ...(value as FormElementComplianceValue),\n                files: newAttachments,\n              }\n            }\n            break\n          }\n          case 'files': {\n            const newAttachments = validateAttachmentsExists(\n              value,\n              attachmentRetentionInDays,\n            )\n            if (newAttachments) {\n              hasChanges = true\n              result[formElement.name] = newAttachments\n            }\n            break\n          }\n        }\n      }\n    }\n  }\n  if (hasChanges) {\n    return result\n  }\n}\n\nexport default function checkIfAttachmentsExist(\n  form: FormTypes.Form,\n  submission: FormSubmissionModel,\n  attachmentRetentionInDays: number | undefined,\n): FormSubmissionModel | void {\n  return checkIfAttachmentsExistForFormElements(\n    form.elements,\n    submission,\n    attachmentRetentionInDays,\n  )\n}\n"]}

package/dist/services/cleanFormSubmissionModel.js

@@ -1,4 +1,3 @@
-import { checkIsUsingLegacyStorage } from './attachments';
 function cleanElementValue(submission, elements, formElementsConditionallyShown, stripBinaryData, captchaTokens) {
     // Clear data from submission on fields that are hidden on visible pages
     return elements.reduce((model, element) => {
@@ -26,9 +25,7 @@ function cleanElementValue(submission, elements, formElementsConditionallyShown,
             }
             case 'files': {
                 const value = submission[element.name];
-                const hasBinaryData = checkIsUsingLegacyStorage(element) ||
-                    (Array.isArray(value) &&
-                        value.some((attachment) => !!attachment.data));
+                const hasBinaryData = Array.isArray(value) && value.some((attachment) => !!attachment.data);
                 if ((!stripBinaryData || !hasBinaryData) &&
                     !((_b = formElementsConditionallyShown === null || formElementsConditionallyShown === void 0 ? void 0 : formElementsConditionallyShown[element.name]) === null || _b === void 0 ? void 0 : _b.isHidden)) {
                     model[element.name] = submission[element.name];
@@ -38,7 +35,7 @@ function cleanElementValue(submission, elements, formElementsConditionallyShown,
             case 'camera':
             case 'draw': {
                 const value = submission[element.name];
-                const hasBinaryData = checkIsUsingLegacyStorage(element) || !!(value === null || value === void 0 ? void 0 : value.data);
+                const hasBinaryData = !!(value === null || value === void 0 ? void 0 : value.data);
                 if ((!stripBinaryData || !hasBinaryData) &&
                     !((_c = formElementsConditionallyShown === null || formElementsConditionallyShown === void 0 ? void 0 : formElementsConditionallyShown[element.name]) === null || _c === void 0 ? void 0 : _c.isHidden)) {
                     model[element.name] = submission[element.name];