form-craft-package 1.11.9-dev.0 → 1.11.12

package/package.json

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

package/src/components/auth-layouts/index.tsx

@@ -370,7 +370,7 @@ export const TemplateLayout = ({
       return (
         <Layout className="fc-layout min-h-screen">
           <Header
-            className="fc-header sticky top-0 z-40 flex items-center shadow-sm justify-between px-1 overflow-visible"
+            className="fc-header sticky top-0 z-40 flex items-center shadow-sm justify-between px-1 overflow-hidden"
             style={{ height: headerHeight, lineHeight: 'normal' }}
           >
             <div className="flex">

package/src/components/form/1-list/table-header.tsx

@@ -254,7 +254,8 @@ const handleFilterValues = async (
     let stringifiedFilter = JSON.stringify((config as IFilterCustom).config)
 
     const placeholder = isNumber || isBoolean ? `"${VALUE_REPLACEMENT_PLACEHOLDER}"` : VALUE_REPLACEMENT_PLACEHOLDER
-    stringifiedFilter = stringifiedFilter.replaceAll(placeholder, value).replaceAll('@', '$')
+    const resolvedValue = !isNumber && !isBoolean ? value.replace(/\s+/g, '').split('').join('\\\\s*') : value
+    stringifiedFilter = stringifiedFilter.replaceAll(placeholder, resolvedValue).replaceAll('@', '$')
 
     if (value2) stringifiedFilter = stringifiedFilter.replaceAll(VALUE_REPLACEMENT_PLACEHOLDER2, value2)
 

package/src/components/form/layout-renderer/3-element/1-dynamic-button/use-send-notification.hook.ts

@@ -140,7 +140,11 @@ export const useSendNotificationAction = ({
   )
 
   const onSendNotification = useCallback(
-    async (notifActionProps: IButtonProps_SendNotification, newFormDataId?: string) => {
+    async (
+      notifActionProps: IButtonProps_SendNotification,
+      newFormDataId?: string,
+      extraAttachments: IEmail_Attachment[] = [],
+    ) => {
       const { notificationId } = notifActionProps
 
       const { joins = [], notifications } = formNotifications
@@ -165,6 +169,7 @@ export const useSendNotificationAction = ({
         setDataLoadingType?.(FormLoadingModalTypeEnum.GeneratingReport)
         formTemplateReportAttachments = await handleTemplateReport(formNotif.attachments!, targetFormDataId)
       }
+      const additionalEmailAttachments = [...formTemplateReportAttachments, ...extraAttachments]
 
       setDataLoadingType?.(FormLoadingModalTypeEnum.SendingNotification)
 
@@ -179,7 +184,7 @@ export const useSendNotificationAction = ({
             replacementData: formDataRes.data,
             formId,
             fileBaseUrl,
-            additionalEmailAttachments: formTemplateReportAttachments,
+            additionalEmailAttachments,
           })
 
           if (!notificationRequests.length) {

package/src/components/form/layout-renderer/3-element/18-gallery/index.tsx

@@ -228,6 +228,7 @@ function LayoutRenderer_Gallery({
         isOpen={isUploadModalOpen}
         formContext={formContext}
         formItem={formItem}
+        elementProps={elementProps}
         elementKey={elementKey}
         textConditions={textConditions}
         isDisabled={isDisabled}

package/src/components/form/layout-renderer/3-element/18-gallery/upload.modal.tsx

@@ -1,21 +1,29 @@
 import client from '../../../../../api/client'
 import { isNewFormDataPage, resolveConditionalText } from '../../../../../functions'
 import { saveFile } from '../../../../../functions/forms/form'
-import { TranslationTextSubTypeEnum, TranslationTextTypeEnum } from '../../../../../enums'
+import {
+  ButtonActionCategoryEnum,
+  EmailAttachmentTypeEnum,
+  TranslationTextSubTypeEnum,
+  TranslationTextTypeEnum,
+} from '../../../../../enums'
 import { RcFile, UploadFile, UploadProps } from 'antd/es/upload'
 import { Form, Modal, Spin, Upload } from 'antd'
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { FaUpload } from 'react-icons/fa6'
+import { useSendNotificationAction } from '../1-dynamic-button/use-send-notification.hook'
 import { Button_FillerPortal } from '../../../../common/button'
 import { useNotification, useTranslation } from '../../../../common/custom-hooks'
 import useGetCurrentBreakpoint from '../../../../common/custom-hooks/use-window-width.hook'
 import { IElementBaseProps } from '..'
 import { IFormContext } from '../../1-row'
+import { IEmail_Attachment, IGalleryElementProps } from '../../../../../types'
 
 export default function GalleryUploadModal({
   isOpen,
   formContext,
   formItem,
+  elementProps,
   elementKey,
   textConditions,
   onDiscardSuccess,
@@ -23,6 +31,7 @@ export default function GalleryUploadModal({
 }: {
   isOpen: boolean
   formContext: IFormContext
+  elementProps: IGalleryElementProps
   onDiscardSuccess: () => void
   onSaveSuccess: (blobNames: string[]) => void
 } & IElementBaseProps) {
@@ -35,6 +44,13 @@ export default function GalleryUploadModal({
   const [isUploadLoading, setIsUploadLoading] = useState(false)
   const [isSaving, setIsSaving] = useState(false)
   const [isDiscarding, setIsDiscarding] = useState(false)
+  const [isSendingNotification, setIsSendingNotification] = useState(false)
+  const onSendNotification = useSendNotificationAction({
+    ...formContext,
+    onSuccess: () => {},
+    onError: () => {},
+    onFinal: () => {},
+  })
 
   const allValues = Form.useWatch([], { form: formRef, preserve: true })
 
@@ -147,13 +163,58 @@ export default function GalleryUploadModal({
         data: JSON.stringify(parsedData),
       })
       if (res.status === 200) {
+        const shouldSendNotification = elementProps.sendNotification && !!elementProps.notificationId
+        const savedBlobNames = [...uploadedBlobNames]
+
+        if (shouldSendNotification) {
+          const extraAttachments: IEmail_Attachment[] = uploadedFiles
+            .map((file) => {
+              const blobName =
+                typeof file.response === 'object' && file.response
+                  ? (file.response as { blobName?: string }).blobName
+                  : undefined
+              if (!blobName) return null
+
+              return {
+                blobName,
+                fileName: file.name,
+                type: EmailAttachmentTypeEnum.Image,
+              }
+            })
+            .filter((attachment): attachment is IEmail_Attachment => !!attachment)
+
+          setIsSendingNotification(true)
+          try {
+            await onSendNotification(
+              {
+                category: ButtonActionCategoryEnum.SendNotification,
+                notificationId: elementProps.notificationId!,
+              },
+              formDataId,
+              extraAttachments,
+            )
+          } finally {
+            setIsSendingNotification(false)
+          }
+        }
+
         setUploadedFiles([])
-        onSaveSuccess(uploadedBlobNames)
+        onSaveSuccess(savedBlobNames)
       }
     } finally {
       setIsSaving(false)
     }
-  }, [formDataId, formId, formItem.path, onSaveSuccess, uploadedBlobNames])
+  }, [
+    elementProps.notificationId,
+    elementProps.sendNotification,
+    formDataId,
+    formId,
+    formItem.path,
+    onSaveSuccess,
+    onSendNotification,
+    uploadedFiles,
+    uploadedBlobNames,
+  ])
 
   return (
     <Modal
@@ -164,13 +225,18 @@ export default function GalleryUploadModal({
       title={title || 'Upload pictures'}
       footer={
         <div className="flex justify-between">
-          <Button_FillerPortal outline disabled={isUploadLoading} loading={isDiscarding} onClick={discardUploadedFiles}>
+          <Button_FillerPortal
+            outline
+            disabled={isUploadLoading || isSendingNotification}
+            loading={isDiscarding}
+            onClick={discardUploadedFiles}
+          >
             {discardText || 'Discard & Close'}
           </Button_FillerPortal>
           <Button_FillerPortal
             primary
-            disabled={isUploadLoading || isDiscarding}
-            loading={isSaving}
+            disabled={isUploadLoading || isDiscarding || isSendingNotification}
+            loading={isSaving || isSendingNotification}
             onClick={saveUploadedFiles}
           >
             {saveText || 'Save Pictures'}
@@ -178,7 +244,7 @@ export default function GalleryUploadModal({
         </div>
       }
     >
-      <Spin spinning={isUploadLoading}>
+      <Spin spinning={isUploadLoading || isSendingNotification}>
         <Upload.Dragger {...uploadProps} fileList={uploadedFiles}>
           <div className="flex flex-col items-center">
             <FaUpload size={24} className="text-primary" />

package/src/types/forms/layout-elements/index.ts

@@ -191,6 +191,8 @@ export interface IGalleryElementProps {
   grid?: Partial<Record<DeviceBreakpointEnum, IGalleryElementGridConfig | null>>
   uploadButtonConditions?: IFormLayoutElementConditions
   deleteButtonConditions?: IFormLayoutElementConditions
+  sendNotification?: boolean
+  notificationId?: number
 }
 export interface IGalleryElementGridConfig {
   count?: number | null