form-craft-package 1.1.8 → 1.1.10

package/package.json

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

package/src/components/form/2-details/index.tsx

@@ -67,7 +67,7 @@ export default function FormDataDetailsComponent({
           if (res.status === 200) {
             const parsedData: IFormSchema | null = parseJSON(res.data.data)
             if (parsedData) {
-              console.log({parsedData})
+              console.log({ parsedData })
               const { layout, migrationRules, convertScreenToPdf = false } = parsedData.detailsConfig
 
               if (isPublic) {

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

@@ -161,20 +161,19 @@ export const DynamicFormButtonRender = memo(
     const generatePdfProof = useCallback(() => {
       formRef?.validateFields().then((values) => {
         const queryParams = objectToQueryParams(values)
-        console.log(queryParams)
         const feDomainUrl = window.location.origin
-        const fullUrl = `${feDomainUrl}${location.pathname}?${queryParams}`
-        console.log(fullUrl)
+        const fullUrl = encodeURIComponent(`${feDomainUrl}${location.pathname}?${queryParams}`)
+
         const blobName = 'abc.pdf'
         client
-          .post(`/api/attachment/pdf/${companyKey}/${fullUrl}/${blobName}`)
+          .post(`/api/attachment/pdf/${companyKey}/${blobName}?url=${fullUrl}`)
           .then((res) => {
-            if (res.status < 300) {
-              console.log(res.data)
-              onCreateNewData(res.data)
-            }
+            if (res.status < 300) onCreateNewData(res.data)
+          })
+          .catch(() => {
+            closeModal()
+            error({ message: 'Error occured while generating PDF!' })
           })
-          .catch(() => error({ message: 'Error occured while generating PDF!' }))
       })
     }, [formRef, location.pathname, companyKey])
 
@@ -229,19 +228,17 @@ export const DynamicFormButtonRender = memo(
         case ButtonActionCategoryEnum.SaveDataChanges:
           if (formRef) {
             const signatureField = formRef.getFieldValue(FormPreservedItemKeys.HasSignature)
+            // to save the signature upon submission
             if (!!signatureField) {
               const signatureBase64 = formRef.getFieldValue(signatureField)
-              const blobName = await saveFile(
-                base64ToBlob(signatureBase64),
-                'signature.png',
-                isPublic ? companyKey : '',
-              )
+              const blobName = await saveFile(base64ToBlob(signatureBase64), 'signature', isPublic ? companyKey : '')
 
               if (!!blobName) formRef.setFieldValue(signatureField, blobName)
             }
 
             if (formDataId === NEW_FORM_DATA_IDENTIFIER) {
-              if (convertScreenToPdf) {
+              if (isPublic && convertScreenToPdf) {
+                // pdf generate does not work when auth-ed
                 setDataLoadingType(FormLoadingModalTypeEnum.GeneratingPdf)
                 generatePdfProof()
               } else onCreateNewData()

package/src/components/form/layout-renderer/3-element/5-re-captcha.tsx

@@ -16,7 +16,6 @@ export default function LayoutRenderer_ReCaptcha({ formRef, fieldKey, elementPro
       }
       client.get(`/api/site/${formKey}/verifycaptcha/${token}`).then((res) => {
         if (res.status < 300) {
-          console.log('re', res.data)
           if (!res.data) formRef.setFieldValue(fieldKey, true)
           else setTokenVerificationFailed(true)
         }

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

@@ -39,7 +39,7 @@ export default function LayoutRenderer_FileUpload({
     onChange: async (fileInfo: any) => {
       if (fileInfo.file.status === 'done') {
         setLoading(true)
-        const blobName = await saveFile(companyKey, fileInfo.file.originFileObj, fileInfo.file.name)
+        const blobName = await saveFile(fileInfo.file.originFileObj, fileInfo.file.name, companyKey)
         if (blobName) formRef.setFieldValue(fieldKey, blobName)
         setLoading(false)
       }

package/src/components/modals/form-data-loading.modal.tsx

@@ -32,6 +32,8 @@ export default function FormDataLoadingIndicatorModal({
         <Spin spinning size="large" />
         {(() => {
           switch (currentType) {
+            case FormLoadingModalTypeEnum.GeneratingPdf:
+              return <span className="text-primary">Generating PDF...</span>
             case FormLoadingModalTypeEnum.SavingChanges:
               return <span className="text-primary">Saving data...</span>
             case FormLoadingModalTypeEnum.ErrorOccured:

package/src/functions/form.ts

@@ -1,6 +1,6 @@
 import client from './axios-handler'
 
-export const saveFile = async (file: any, fileName: string, companyKey: 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)

package/src/functions/index.ts

@@ -98,7 +98,8 @@ export const base64ToBlob = (base64: string) => {
 
 export const objectToQueryParams = (obj: Record<string, any>): string =>
   Object.entries(obj)
-    .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
+    .map(([key, value]) => `${key}=${value}`)
+    // .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
     .join('&')
 
 /** ---------------------------------------------------------------------------------------------------------  */