form-craft-package 1.7.9-dev.2 → 1.7.10-dev.0

package/src/functions/forms/index.ts

@@ -1,11 +1,14 @@
-import { DEFAULT_LAYOUT_CONFIG, NEW_FORM_DATA_IDENTIFIER } from '../../constants'
+import { BSON_DATA_IDENTIFIER_PREFIXES, DEFAULT_LAYOUT_CONFIG, NEW_FORM_DATA_IDENTIFIER } from '../../constants'
 import { ElementTypeEnum, FieldElementOptionSourceEnum } from '../../enums'
 export * from './create-form-rules'
 export * from './data-render-functions'
 export * from './extended-json-handlers'
 export * from './form-schema-validator'
 export * from './get-element-props'
+export * from './linked-form-joins'
+export * from './convert-number-into-words'
 import { CancelToken } from 'axios'
+import client from '../../api/client'
 import {
   IFilterNested,
   IDndLayoutElement,
@@ -13,7 +16,6 @@ import {
   IDynamicForm,
   IFormDataApiReqConfig,
 } from '../../types'
-import client from '../../api/client'
 
 export const extractFiltersFromLayout = (elements: { [key: string]: IDndLayoutElement }) => {
   const filters: IFilterNested = {}
@@ -29,7 +31,16 @@ export const extractFiltersFromLayout = (elements: { [key: string]: IDndLayoutEl
       })
     } else if (el.props && 'filter' in el.props && el.props.filter) {
       filters[el.key] = el.props.filter
-        ? { ...el.props.filter, isDateFilter: [ElementTypeEnum.DatePicker].includes(el.elementType) }
+        ? {
+            ...el.props.filter,
+            bsonDataType: el.elementType.includes(BSON_DATA_IDENTIFIER_PREFIXES.ObjectId)
+              ? BSON_DATA_IDENTIFIER_PREFIXES.ObjectId
+              : el.elementType.includes(BSON_DATA_IDENTIFIER_PREFIXES.Number)
+              ? BSON_DATA_IDENTIFIER_PREFIXES.Number
+              : el.elementType.includes(BSON_DATA_IDENTIFIER_PREFIXES.Date)
+              ? BSON_DATA_IDENTIFIER_PREFIXES.Date
+              : undefined,
+          }
         : undefined
     }
   })
@@ -39,7 +50,7 @@ export const extractFiltersFromLayout = (elements: { [key: string]: IDndLayoutEl
 
 /** ---------------------------------------------------------------------------------------------------------  */
 
-export const getFlexContainerStyle = (display?: IGridContainerConfig) => {
+export const getGridContainerStyle = (display?: IGridContainerConfig) => {
   if (!display) return DEFAULT_LAYOUT_CONFIG
 
   return display
@@ -173,6 +184,14 @@ export async function fetchFormDataAsLookup(
 /** ---------------------------------------------------------------------------------------------------------  */
 
 export const getProjectionKey = (key: string): string => key.replace(/\./g, '_')
+export const revertProjectionKey = (key?: string): string => {
+  if (!key || typeof key !== 'string') return ''
+
+  const segments = key.split('__')
+  const replaced = segments.map((segment) => segment.replace(/_/g, '.'))
+
+  return replaced.join('__')
+}
 
 /** ---------------------------------------------------------------------------------------------------------  */
 
@@ -185,6 +204,16 @@ export const getIdEqualsQuery = (alias: number | string = '', id: string = '') =
 
 /** ---------------------------------------------------------------------------------------------------------  */
 
+export const getEqualsFalseyQuery = (field: string) => ({ [field]: { $in: [false, null, '', 0] } })
+
+/** ---------------------------------------------------------------------------------------------------------  */
+
 export const isValidMongoDbId = (id?: string) => id && (id === NEW_FORM_DATA_IDENTIFIER || /^[0-9a-fA-F]{24}$/.test(id))
 
 /** ---------------------------------------------------------------------------------------------------------  */
+
+export const isNewFormDataPage = (formDataId?: string) => !formDataId || formDataId === NEW_FORM_DATA_IDENTIFIER
+
+/** ---------------------------------------------------------------------------------------------------------  */
+
+/** ---------------------------------------------------------------------------------------------------------  */

package/src/functions/forms/linked-form-joins.ts

@@ -0,0 +1,19 @@
+import { IFormJoin } from '../../types'
+
+export function mergeJoins(joinsList: IFormJoin[][]): IFormJoin[] {
+  const seen = new Set<string>()
+  const merged: IFormJoin[] = []
+
+  for (const joins of joinsList) {
+    if (!Array.isArray(joins)) continue
+    
+    for (const j of joins) {
+      if (!seen.has(j.alias)) {
+        seen.add(j.alias)
+        merged.push(j)
+      }
+    }
+  }
+
+  return merged
+}

package/src/functions/reports/create-blob-url.ts

@@ -0,0 +1,16 @@
+export function createBlobUrlOrDownload(data: any, fileName: string, autoDownload = false): string {
+  const blob = new Blob([data], { type: 'application/pdf' })
+  const url = URL.createObjectURL(blob)
+
+  if (autoDownload) {
+    const link = document.createElement('a')
+    link.href = url
+    link.setAttribute('download', fileName)
+
+    document.body.appendChild(link)
+    link.click()
+    document.body.removeChild(link)
+  }
+
+  return url
+}

package/src/functions/reports/index.tsx

@@ -1,3 +1,4 @@
+export * from './create-blob-url'
 import { getProjectionKey } from '..'
 import { ElementTypeEnum, ReportLayoutLineTypeEnum, ReportLayoutSectionTypeEnum } from '../../enums'
 import { IDndLayoutCol, IDndLayoutRow, IDndLayoutStructure, IReportTableLayoutStyle } from '../../types'

package/src/types/forms/data-list/filter-config.ts

@@ -1,27 +1,16 @@
+import { IFormJoin } from '..'
 import { FilterConfigTypeEnum } from '../../../enums'
 
-export type IFilterConfig = INoFilterConfig | IFilterByAuthUser | IFilterByLinkedForm | IFilterCustom
+export type IFilterConfig = INoFilterConfig | IFilterCustom
 export interface INoFilterConfig {
   type: FilterConfigTypeEnum.NoFilter
 }
-export interface IFilterByAuthUser {
-  type: FilterConfigTypeEnum.ByAuthUser
-  config?: { [key: string]: any }
-}
-export interface IFilterByLinkedForm {
-  type: FilterConfigTypeEnum.ByLinkedForm
-  relationshipPath: IFilterByLinkedFormRelPath[]
-}
-export interface IFilterByLinkedFormRelPath {
-  formId: number
-  foreignKey: string
-  // parentForeignKey?: string
-  field?: string
-}
 export interface IFilterCustom {
   type: FilterConfigTypeEnum.Custom
   config: { [key: string]: any }
-  isDateFilter?: boolean
+  bsonDataType?: string
+  joins?: IFormJoin[]
+  conditionFormBranches?: string[]
 }
 
 export interface IFilterSimple {

package/src/types/forms/data-list/index.ts

@@ -2,9 +2,11 @@ export * from './filter-config'
 import { ReactNode } from 'react'
 import { AlignTypeEnum, DeviceBreakpointEnum, MongoDbSortOrderEnum } from '../../../enums'
 import { IDataRenderConfig } from '../layout-elements'
+import { IFormJoin } from '..'
 
 export interface IFormDataListColumn {
   key: string
+  joins: IFormJoin[]
   label: string
   order: number
   optionFieldPath?: string

package/src/types/forms/index.ts

@@ -21,7 +21,6 @@ export interface IFormDataListConfig {
   listType: FormDataListViewTypeEnum
   columns: IFormDataListColumn[]
   header: IDndLayoutStructure_Responsive
-  formJoins: IFormJoin[]
   pagination?: IFormDataListPagination
   title?: string
   showCount?: boolean

package/src/types/forms/layout-elements/data-render-config.ts

@@ -4,27 +4,27 @@ import { CountryEnum, DataRenderTypeEnum } from '../../../enums'
 export type IDataRenderConfig =
   | IDataRender_Default
   | IDataRender_Number
-  | IDataRender_NumberInWords
   | IDataRender_Currency
   | IDataRender_Image
   // | IDataRender_PhoneNumber
   | IDataRender_Date
   | IDataRender_Buttons
   | IDataRender_Conditional
+  | IDataRender_Tags
 
 export interface IDataRender_Default {
   type: DataRenderTypeEnum.Default
 }
 
+export interface IDataRender_Tags {
+  type: DataRenderTypeEnum.Tags
+}
+
 export interface IDataRender_Number {
   type: DataRenderTypeEnum.Number
   decimalPoint?: number
 }
 
-export interface IDataRender_NumberInWords {
-  type: DataRenderTypeEnum.NumberInWords
-}
-
 export interface IDataRender_Currency {
   type: DataRenderTypeEnum.Currency
   country: CountryEnum

package/src/types/forms/layout-elements/field-option-source.ts

@@ -1,11 +1,12 @@
-import { IFilterConfig } from '..'
+import { IDataRenderConfig, IFilterConfig, IFormJoin } from '..'
 import { FieldElementOptionSourceEnum } from '../../../enums'
 
 export type IFieldElementOptionSource =
   | IOptionSourceConstant
-  | IOptionSourceForm
+  | IOptionSourceDynamicForm
   | IOptionSourceReadFromDetails
   | IOptionSourceLinkedForm
+  | IOptionSourceAny
 
 export interface IOptionSourceConstant {
   type: FieldElementOptionSourceEnum.Static
@@ -18,14 +19,10 @@ export interface IFormLayoutFieldOption {
   filter?: IFilterConfig
 }
 
-export interface IOptionSourceForm {
+export interface IOptionSourceDynamicForm extends IOptionSourceFormFields {
   type: FieldElementOptionSourceEnum.DynamicForm
-  form: IOptionSourceFormInfo
-}
-export interface IOptionSourceFormInfo {
-  id: number
-  formName: string
-  field: string
+  formId: number
+  formName?: string
 }
 
 export interface IOptionSourceReadFromDetails {
@@ -34,6 +31,24 @@ export interface IOptionSourceReadFromDetails {
   optionFieldPath: string
 }
 
-export interface IOptionSourceLinkedForm {
+export interface IOptionSourceLinkedForm extends IOptionSourceFormFields {
   type: FieldElementOptionSourceEnum.LinkedForm
+  baseFormId: number
+  joins: IFormJoin[]
+  formName?: string
+}
+
+export interface IOptionSourceAny {
+  type: FieldElementOptionSourceEnum.Any
+}
+
+export interface IOptionSourceFormFields {
+  field: string
+  field1_RC?: IDataRenderConfig
+  field2?: string
+  field2_RC?: IDataRenderConfig
+  field3?: string
+  field3_RC?: IDataRenderConfig
+  field4?: string
+  field4_RC?: IDataRenderConfig
 }

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

@@ -201,6 +201,12 @@ export interface IContainerElement extends BaseFormLayoutElement {
 
 /** -------------------------------------------------------------------------------------------- */
 
+export interface IPlaceholderElement extends BaseFormLayoutElement {
+  elementType: ElementTypeEnum.Placeholder
+}
+
+/** -------------------------------------------------------------------------------------------- */
+
 export interface IReportTableElement extends BaseFormLayoutElement {
   elementType: ElementTypeEnum.ReportTable
   style?: ICssStyle | ICssStylePerBreakpoint
@@ -289,7 +295,7 @@ export interface IFormDataLoadElement extends BaseFormLayoutElement {
 export interface IFormDataLoadElementProps {
   hasNoLabel?: boolean
   baseFormId: number
-  displayConfigFormId: number
+  m2mRelFormId?: number
   displayConfigId: string
   joins: IFormJoin[]
   filter?: IFilterConfig

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

@@ -9,10 +9,6 @@ export type IGridContainerConfig = {
   columnsGaps?: string[]
 }
 
-export type FlexItemConfig = {
-  gap?: string
-}
-
 export type ICssStyle = {
   [key: string]: any
 }

package/src/types/forms/relationship/index.ts

@@ -1,7 +1,7 @@
 import { IDataListSorter, IFilterConfig, IFormDataListConfig } from '..'
 import { FormRelationshipEnum, NewFormViewTypeEnum } from '../../../enums'
 
-export type IFormRelationshipConfig = IFormRelationshipConfig_ManyToMany | IFormRelationshipConfig_Others
+export type IFormRelationshipConfig = IFormRelationshipConfig_OneToMany | IFormRelationshipConfig_Others
 
 interface IFormRelationshipConfig_Base {
   formId: number
@@ -10,14 +10,14 @@ interface IFormRelationshipConfig_Base {
   viewType?: NewFormViewTypeEnum
   displayConfigs?: IRelationshipDisplayConfig[]
 }
-export interface IFormRelationshipConfig_ManyToMany extends IFormRelationshipConfig_Base {
-  type: FormRelationshipEnum.ManyToMany
-  foreignKey2: string
-  relationshipFormId: number
+export interface IFormRelationshipConfig_OneToMany extends IFormRelationshipConfig_Base {
+  type: FormRelationshipEnum.OneToMany
+  m2mTargetFormId?: number
+  m2mTargetFormFK?: string
 }
 
 export interface IFormRelationshipConfig_Others extends IFormRelationshipConfig_Base {
-  type: FormRelationshipEnum.ManyToOne | FormRelationshipEnum.OneToMany | FormRelationshipEnum.OneToOne
+  type: FormRelationshipEnum.ManyToOne | FormRelationshipEnum.OneToOne
 }
 
 export type IRelationshipDisplayConfig = {

package/src/types/index.ts

@@ -16,6 +16,7 @@ import {
   IListElement,
   INumberInputElement,
   IPickerElement,
+  IPlaceholderElement,
   IRadioElement,
   IReadFieldDataElement,
   IReCaptchaElement,
@@ -80,3 +81,4 @@ export type IDndLayoutElement =
   | IListElement
   | IImageElement
   | IBreadcrumbElement
+  | IPlaceholderElement

package/src/functions/forms/breadcrumb-handlers.ts

@@ -1,21 +0,0 @@
-import { IFormJoin } from '../../types'
-
-export const getForeignKeysFromBreadcrumb = (breadcrumb: {
-  [key: string]: any
-}): { foreignKey?: string; foreignKey2?: string } => {
-  if (!breadcrumb || !breadcrumb.manyToManyRelInfo) return {}
-
-  const form1Join = (breadcrumb.formJoins as IFormJoin[]).find(
-    (j) => j.formId === breadcrumb.manyToManyRelInfo.currentFormId,
-  )
-  const localFieldSplit = form1Join?.localField.split('.') ?? []
-  const foreignKey = localFieldSplit[localFieldSplit.length - 1]
-
-  const form2Join = (breadcrumb.formJoins as IFormJoin[]).find(
-    (j) => j.formId === breadcrumb.manyToManyRelInfo.otherFormId,
-  )
-  const localField2Split = form2Join?.localField.split('.') ?? []
-  const foreignKey2 = localField2Split[localField2Split.length - 1]
-
-  return { foreignKey, foreignKey2 }
-}