form-craft-package 1.1.3 → 1.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-craft-package",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "main": "index.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/src/components/form/layout-renderer/3-element/1-dynamic-button.tsx

@@ -37,6 +37,7 @@ export const DynamicFormButtonRender = memo(
     const formValues = Form.useWatch([], { form: formRef, preserve: true })
     const formId = Form.useWatch(FormPreservedItemKeys.FormId, { form: formRef, preserve: true }) // for public use
     const formKey = Form.useWatch(FormPreservedItemKeys.FormKey, { form: formRef, preserve: true }) // for public use
+    const companyKey = Form.useWatch(FormPreservedItemKeys.CompanyKey, { form: formRef, preserve: true }) // for public use
     const convertScreenToPdf = Form.useWatch(FormPreservedItemKeys.ConvertScreenToPDF, {
       form: formRef,
       preserve: true,
@@ -161,7 +162,8 @@ export const DynamicFormButtonRender = memo(
       formRef?.validateFields().then((values) => {
         const queryParams = objectToQueryParams(values)
         console.log(queryParams)
-        const fullUrl = `${location.pathname}?${queryParams}`
+        const feDomainUrl = window.location.origin
+        const fullUrl = `${feDomainUrl}/${location.pathname}?${queryParams}`
         console.log(fullUrl)
         const blobName = 'abc'
         client
@@ -228,17 +230,17 @@ export const DynamicFormButtonRender = memo(
           if (formRef) {
             const signatureField = formRef.getFieldValue(FormPreservedItemKeys.HasSignature)
             if (!!signatureField) {
-              setDataLoadingType(FormLoadingModalTypeEnum.GeneratingPdf)
-
               const signatureBase64 = formRef.getFieldValue(signatureField)
-              const blobName = await saveFile(base64ToBlob(signatureBase64), 'signature')
+              const blobName = await saveFile(base64ToBlob(signatureBase64), 'signature', isPublic ? companyKey : '')
 
               if (!!blobName) formRef.setFieldValue(signatureField, blobName)
             }
 
             if (formDataId === NEW_FORM_DATA_IDENTIFIER) {
-              if (convertScreenToPdf) generatePdfProof()
-              else onCreateNewData()
+              if (convertScreenToPdf) {
+                setDataLoadingType(FormLoadingModalTypeEnum.GeneratingPdf)
+                generatePdfProof()
+              } else onCreateNewData()
             } else onSaveExistingData()
           } else error({ message: CUSTOM_ERROR_MESSAGES.FormInstanceNotFound })
 
@@ -266,7 +268,7 @@ export const DynamicFormButtonRender = memo(
           warning({ message: errorMessage })
           return
       }
-    }, [btnProps, baseDynamicUrl, formDataId, convertScreenToPdf])
+    }, [btnProps, baseDynamicUrl, formDataId, convertScreenToPdf, companyKey])
 
     return (
       <>

package/src/components/form/layout-renderer/3-element/6-signature.tsx

@@ -30,7 +30,6 @@ export default function LayoutRenderer_Signature({ formRef, fieldKey, elementPro
             const sigBase64 = sigCanvasRef.current?.toDataURL()
             if (sigBase64)
               formRef.setFieldsValue({ [fieldKey]: sigBase64, [FormPreservedItemKeys.HasSignature]: fieldKey })
-            // saveSignature(sigBase64)
           }}
         />
       )}

package/src/components/form/layout-renderer/3-element/7-file-upload.tsx

@@ -7,6 +7,7 @@ import { IFileUploadElementRules } from '../../../../types'
 import { useNotification } from '../../../common/custom-hooks'
 import { FaTrashAlt } from 'react-icons/fa'
 import { saveFile } from '../../../../functions/form'
+import { FormPreservedItemKeys } from '../../../../enums'
 
 export default function LayoutRenderer_FileUpload({
   formRef,
@@ -17,6 +18,7 @@ export default function LayoutRenderer_FileUpload({
   const { warningModal, confirmModal } = useNotification()
   const [loading, setLoading] = useState(false)
   const savedSignatureBlobName = Form.useWatch(fieldKey, formRef)
+  const companyKey = Form.useWatch(FormPreservedItemKeys.CompanyKey, { form: formRef, preserve: true }) // for public use
 
   const deleteSavedFile = useCallback((blobName: string) => {
     setLoading(true)
@@ -37,7 +39,7 @@ export default function LayoutRenderer_FileUpload({
     onChange: async (fileInfo: any) => {
       if (fileInfo.file.status === 'done') {
         setLoading(true)
-        const blobName = await saveFile(fileInfo.file.originFileObj, fileInfo.file.name)
+        const blobName = await saveFile(companyKey, fileInfo.file.originFileObj, fileInfo.file.name)
         if (blobName) formRef.setFieldValue(fieldKey, blobName)
         setLoading(false)
       }

package/src/functions/form.ts

@@ -1,10 +1,11 @@
 import client from './axios-handler'
 
-export const saveFile = async (file: any, fileName: string): Promise<string | null> => {
+export const saveFile = async (file: any, fileName: string, companyKey: string): Promise<string | null> => {
   try {
     const formData = new FormData()
     formData.append('file', file, fileName)
-    const response = await client.post('/api/attachment', formData)
+    const endpoint = companyKey ? `/api/attachment/create/${companyKey}` : '/api/attachment'
+    const response = await client.post(endpoint, formData)
     if (response.status < 300) return response.data
 
     return null