form-craft-package 1.7.9-dev.1 → 1.7.9-dev.2

package/src/components/form/layout-renderer/3-element/9-form-data-render.tsx

@@ -1,9 +1,9 @@
 import { IElementBaseProps } from '.'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
 import FormDataListTableComponent, { IDataListLayoutConfig } from '../../1-list/table'
 import FormDataListSkeleton_Table from '../../../common/loading-skeletons/table'
+import { getIdEqualsQuery, getProjectionKey } from '../../../../functions'
 import { NEW_FORM_DATA_IDENTIFIER } from '../../../../constants'
-import { FilterConfigTypeEnum } from '../../../../enums'
 import { cancelableClient } from '../../../../api/client'
 import { IFormContext } from '../1-row'
 import {
@@ -12,12 +12,11 @@ import {
   IFormJoin,
   IFormRelationshipConfig,
   IFormSchema,
-  IRelationshipForm,
 } from '../../../../types'
 
 export default function LayoutRenderer_LoadFormData({ formContext, elementProps }: ILayoutRenderer_LoadFormData) {
   const { formId, formRef, formDataId } = formContext
-  const { joins } = elementProps
+  const { joins, baseFormId, displayConfigFormId, displayConfigId } = elementProps
   const lastChildInfo = useRef<{ formName: string; parentFormJoins: IFormJoin[] }>({
     formName: '',
     parentFormJoins: [],
@@ -29,27 +28,22 @@ export default function LayoutRenderer_LoadFormData({ formContext, elementProps
   const dataProjectRef = useRef<{ [key: string]: string }>({})
   const reportDataApiCancelFuncRef = useRef<() => void | undefined>(undefined)
 
-  const [defaultJoins, baseForm, defaultFilter] = useMemo(
-    () => getDefaultReqDataParams(joins, formId, formDataId),
-    [joins, formId, formDataId],
-  )
-
   const fetchDataList = useCallback(
     (headerAppliedFilters?: string) => {
-      if (!baseForm) return
+      if (!baseFormId) return
       setLoadings((c) => ({ ...c, data: true }))
 
-      const matchFilters: { [key: string]: any }[] = [...defaultFilter]
+      const matchFilters: { [key: string]: any }[] = [getIdEqualsQuery(formId, formDataId)]
       if (headerAppliedFilters) matchFilters.push(JSON.parse(headerAppliedFilters))
 
-      const { request, cancel } = cancelableClient.post(`/api/report/data/${baseForm.formId}`, {
-        joins: defaultJoins,
+      const { request, cancel } = cancelableClient.post(`/api/report/data/${baseFormId}`, {
+        joins,
         match: matchFilters.length
           ? JSON.stringify(matchFilters.length === 1 ? matchFilters[0] : { $and: matchFilters })
           : '',
         project: JSON.stringify({
           ...dataProjectRef.current,
-          ...defaultJoins.reduce((curr, j) => ({ ...curr, [`${j.formId}_id`]: `$${j.formId}._id` }), {}),
+          ...joins.reduce((curr, j) => ({ ...curr, [`${j.formId}_id`]: `$${j.formId}._id` }), {}),
         }),
       })
       reportDataApiCancelFuncRef.current = cancel
@@ -62,40 +56,56 @@ export default function LayoutRenderer_LoadFormData({ formContext, elementProps
         })
         .finally(() => setLoadings({ initial: false, data: false }))
     },
-    [defaultJoins, baseForm, defaultFilter],
+    [joins, baseFormId],
   )
 
   useEffect(() => {
-    if (!baseForm || !formDataId || formDataId === NEW_FORM_DATA_IDENTIFIER) return
+    if (!displayConfigFormId || !formDataId || formDataId === NEW_FORM_DATA_IDENTIFIER) return
 
-    const { request, cancel } = cancelableClient.get(`/api/form/${baseForm.formId}`)
+    // fetching display config (base form can be different than display config form)
+    const { request, cancel } = cancelableClient.get(`/api/form/${displayConfigFormId}`)
     request.then((res) => {
       if (res.status === 200) {
         const parsedData: IFormSchema | null = JSON.parse(res.data.data)
         if (!parsedData) return
         const { relationships = [] } = parsedData
 
-        const relationship: IFormRelationshipConfig | undefined = relationships.find(
-          (r: IFormRelationshipConfig) => r.foreignKey === baseForm.foreignKey,
+        const relationship: IFormRelationshipConfig | undefined = relationships.find((r: IFormRelationshipConfig) =>
+          r.displayConfigs?.some((dc) => dc.id === displayConfigId),
         )
-
-        const displayConfig = relationship?.displayConfigs?.find((config) => config.id === baseForm.displayConfigId)
+        const displayConfig = relationship?.displayConfigs?.find((config) => config.id === displayConfigId)
         if (!displayConfig || displayConfig.isRenderChildForm) return
 
-        lastChildInfo.current = { formName: res.data.name, parentFormJoins: defaultJoins }
+        const isManyToManyRelationship = displayConfigFormId !== baseFormId
+        lastChildInfo.current = { formName: res.data.name, parentFormJoins: joins }
 
         if (displayConfig.config) {
           if (Array.isArray(displayConfig.config.columns))
-            dataProjectRef.current = displayConfig.config.columns.reduce(
-              (curr, c) => (c.key ? { ...curr, [c.key.replace(/\./g, '_')]: `$${c.key}` } : curr),
-              {},
-            )
+            dataProjectRef.current = displayConfig.config.columns.reduce((curr, c) => {
+              if (!c.key) return curr
+
+              if (isManyToManyRelationship) {
+                // if the key starts with id, it means it's reading a field from other form joins that are already configured
+                // example: form id 145 one-to-many 145 many-to-many 146, and 149 is the rel form.
+                // the base form is 149, joined 145 (displayConfigFormId below) and 146. In this case, to read fields from 145, it appends 145 at front to make it 145.Data{...}
+                // However, to display data from 144, we can't append 145, whose keys already come with 144.Data.{...}. That's why it's checking if it starts with number or not
+                return {
+                  ...curr,
+                  [getProjectionKey(c.key)]: c.key.match(/^\d/) ? `$${c.key}` : `$${displayConfigFormId}.${c.key}`,
+                  // [getProjectionKey(c.key)]: `$${c.key}`,
+                  relDataId: '$_id',
+                  _id: `$${displayConfigFormId}._id`,
+                }
+              }
+
+              return { ...curr, [getProjectionKey(c.key)]: `$${c.key}` }
+            }, {})
 
           setListLayoutConfig({
-            configForFormId: baseForm.formId,
+            configForFormId: baseFormId,
             dataListConfig: {
               ...displayConfig.config,
-              columns: displayConfig.config.columns.map((c) => (c.key ? { ...c, key: c.key.replace(/\./g, '_') } : c)),
+              columns: displayConfig.config.columns.map((c) => (c.key ? { ...c, key: getProjectionKey(c.key) } : c)),
             },
           })
 
@@ -108,13 +118,21 @@ export default function LayoutRenderer_LoadFormData({ formContext, elementProps
       cancel()
       reportDataApiCancelFuncRef.current?.()
     }
-  }, [baseForm, formDataId, fetchDataList])
+  }, [displayConfigFormId, baseFormId, displayConfigId, formDataId, fetchDataList])
 
   const dataListHeaderContext = {
-    formId: baseForm?.formId,
+    formId: baseFormId,
     formDataId,
     formRef,
     ...lastChildInfo.current,
+    manyToManyRelInfo:
+      displayConfigFormId !== baseFormId && formId
+        ? {
+            middleFormId: baseFormId,
+            currentFormId: formId,
+            otherFormId: displayConfigFormId,
+          }
+        : null,
     onCustomFunctionCall: () => {},
   }
 
@@ -139,52 +157,3 @@ type ILayoutRenderer_LoadFormData = {
   formContext: IFormContext
   elementProps: IFormDataLoadElementProps
 } & IElementBaseProps
-
-const getDefaultReqDataParams = (
-  joins: IRelationshipForm[],
-  formId?: number,
-  formDataId?: string,
-): [IFormJoin[], IRelationshipForm | undefined, { [key: string]: any }[]] => {
-  if (!joins || !Array.isArray(joins) || joins.length === 0 || !formId) return [[], undefined, []]
-
-  const baseForm = joins[joins.length - 1]
-  const reversedJoins = [...joins].reverse()
-
-  const childrenJoins: IFormJoin[] = []
-  const filters: { [key: string]: any }[] = [{ $expr: { $eq: [`$${formId}._id`, { $toObjectId: formDataId }] } }]
-
-  if (
-    baseForm.filterConfig &&
-    baseForm.filterConfig.type === FilterConfigTypeEnum.Custom &&
-    baseForm.filterConfig.config
-  )
-    filters.push(
-      JSON.parse(
-        JSON.stringify(baseForm.filterConfig.config).replaceAll(`${baseForm.formId}.`, '').replaceAll('@', '$'),
-      ),
-    )
-
-  let prevJoinAlias = ''
-  reversedJoins.forEach((j, jIdx) => {
-    const nextJoin = reversedJoins[jIdx + 1]
-    const localField = `${prevJoinAlias}Data.${j.foreignKey}`
-    prevJoinAlias = `${nextJoin ? nextJoin.formId : formId}.`
-
-    const joinObj = {
-      formId: nextJoin ? nextJoin.formId : formId,
-      localField,
-      foreignField: '_id',
-      alias: nextJoin ? nextJoin.formId.toString() : formId.toString(),
-    }
-    childrenJoins.push(joinObj)
-
-    if (j.filterConfig && j.filterConfig.type === FilterConfigTypeEnum.Custom && j.filterConfig.config) {
-      let stringifiedFilter = JSON.stringify(j.filterConfig.config)
-
-      const filterConfig = JSON.parse(stringifiedFilter.replaceAll('@', '$'))
-      filters.push(filterConfig)
-    }
-  })
-
-  return [childrenJoins, baseForm, filters]
-}

package/src/components/modals/report-filters.modal/helper-functions.ts

@@ -1,5 +1,5 @@
 import { REPORT_EMPTY_CELL_CONTENT } from '../../../constants'
-import { renderData } from '../../../functions'
+import { getProjectionKey, renderData } from '../../../functions'
 import {
   AlignTypeEnum,
   ElementTypeEnum,
@@ -67,7 +67,7 @@ function groupData(
   const currentGroupConfig = groups[0]
   const groupingType: ReportGroupingTypeEnum = currentGroupConfig.type || ReportGroupingTypeEnum.RowSpan
   // Convert dependencyField (e.g. "81.Data.name") to underscore format (e.g. "81_Data_name").
-  const effectiveField = currentGroupConfig.dependencyField.replace(/\./g, '_')
+  const effectiveField = getProjectionKey(currentGroupConfig.dependencyField)
 
   // Group data by the effective field.
   const groupsMap = new Map<string, any[]>()
@@ -338,10 +338,7 @@ function evaluateSummary(dataSubset: any[], evaluationConfig: any): number {
   const evaluation = evaluationConfig.evaluations[0]
   let sum = evaluation.defaultValue || 0
   if (evaluation.operator === EvaluationOperatorsEnum.Add) {
-    const fieldKey = (typeof evaluation.field === 'string' ? evaluation.field : evaluation.field.field).replace(
-      /\./g,
-      '_',
-    )
+    const fieldKey = getProjectionKey(typeof evaluation.field === 'string' ? evaluation.field : evaluation.field.field)
     dataSubset.forEach((item) => {
       const num = parseFloat(item[fieldKey])
       if (!isNaN(num)) {

package/src/constants.ts

@@ -153,7 +153,7 @@ export const DEFAULT_CONFIG = {
 export const REGEX_PATTERNS = {
   CamelCase: /^[a-z]+(?:[A-Z0-9][a-z0-9]*)*$/,
   HtmlTag: /<[^>]*>/,
-  FormName: /[^A-Za-zА-Яа-яЁё0-9ӨөҮү._-\s]/g,
+  FormName: /[^A-Za-zА-Яа-яЁё0-9ӨөҮү.-\s]/g,
   BaseUrl: /[^A-Za-z0-9\-\._:#\/]+/g,
   UrlConstantPath: /[^A-Za-z0-9\-\._~#]+/g,
   DollarCurly: /\$\{(.*?)\}/g,
@@ -161,4 +161,10 @@ export const REGEX_PATTERNS = {
   SquareBracket: /\[(.*?)\]/g,
   JustLetterNumber: /[^a-zA-Z0-9]/g,
   NonEmptyHtmlString: /^(?!(?:\s*|(?:<[^>]+>\s*)+)$)[\s\S]+$/,
+  RelationshipFormName: /^[\p{Script=Latin}\p{Script=Cyrillic}]+_[\p{Script=Latin}\p{Script=Cyrillic}]+$/u,
+}
+export const BSON_DATA_IDENTIFIER_PREFIXES = {
+  ObjectId: 'ObjectId__',
+  Date: 'Date__',
+  Number: 'Number__',
 }

package/src/enums/form.enum.ts

@@ -59,7 +59,7 @@ export enum ButtonElementTypeEnum {
   Danger = 'Danger',
   DangerOutlined = 'DangerOutline',
   Link = 'Link',
-  Custom = 'Custom'
+  Custom = 'Custom',
 }
 export enum ButtonElementSizeEnum {
   Default = 'default',
@@ -89,8 +89,8 @@ export enum ButtonActionCategoryEnum {
 export enum NavigateButtonTypesEnum {
   NewDataPage = 'NewDataPage',
   ViewDataDetails = 'ViewDataDetails',
-  ReturnToList = 'ReturnToList',
-  ReturnOneBack = 'ReturnOneBack',
+  GoToDataList = 'GoToDataList',
+  GoBack = 'GoBack',
   Custom = 'Custom',
 }
 export enum NavigateButtonCustomComponentType {
@@ -164,6 +164,7 @@ export enum EvaluationValueTypeEnum {
   Report = 'Report',
 }
 export enum FormRelationshipEnum {
+  ManyToMany = 'many-to-many',
   ManyToOne = 'many-to-one',
   OneToMany = 'one-to-many',
   OneToOne = 'one-to-one',
@@ -175,6 +176,7 @@ export enum NewFormViewTypeEnum {
 }
 export enum DataSanitizationTypeEnum {
   Default = 'Default',
+  Predefined = 'Predefined',
   Custom = 'Custom',
 }
 export enum PatternPlacholdersEnum {

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

@@ -0,0 +1,21 @@
+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 }
+}

package/src/functions/forms/data-render-functions.tsx

@@ -33,6 +33,7 @@ export const generateTableColumns = (
       title: el.label,
       dataIndex: el.key ? (el.key.includes('.') ? el.key.split('.') : el.key) : '',
       sorter: el.sortable,
+      render: (data) => (data ? data : '-'),
     }
 
     if (el.optionFieldPath) col.render = () => <Spin spinning size="small" />

package/src/functions/forms/extended-json-handlers.ts

@@ -0,0 +1,56 @@
+import dayjs from 'dayjs'
+import { BSON_DATA_IDENTIFIER_PREFIXES } from '../../constants'
+import { isValidMongoDbId } from '..'
+
+export function toMongoDbExtendedJSON(input: Record<string, any>): Record<string, any> {
+  const out: Record<string, any> = {}
+
+  for (const [key, val] of Object.entries(input)) {
+    if (key.startsWith(BSON_DATA_IDENTIFIER_PREFIXES.ObjectId)) {
+      if (typeof val === 'string' && isValidMongoDbId(val)) out[key] = { $oid: val }
+      else {
+        console.warn(`Invalid ObjectId for "${key}":`, val)
+        out[key] = val
+      }
+    } else if (key.startsWith(BSON_DATA_IDENTIFIER_PREFIXES.Date)) {
+      const s = String(val)
+      if (!isNaN(Date.parse(s))) out[key] = { $date: s }
+      else {
+        console.warn(`Invalid Date for "${key}":`, val)
+        out[key] = val
+      }
+    } else if (key.startsWith(BSON_DATA_IDENTIFIER_PREFIXES.Number)) {
+      const num = typeof val === 'number' ? val : Number(val)
+      if (!isNaN(num)) out[key] = { $numberDecimal: num }
+      else {
+        console.warn(`Invalid Number for "${key}":`, val)
+        out[key] = val
+      }
+    } else out[key] = val
+  }
+
+  return out
+}
+
+export function fromMongoDbExtendedJSON(input: Record<string, any>): Record<string, any> {
+  const out: Record<string, any> = {}
+
+  for (const [key, val] of Object.entries(input)) {
+    if (key.startsWith(BSON_DATA_IDENTIFIER_PREFIXES.ObjectId) && val && typeof val === 'object' && '$oid' in val) {
+      out[key] = (val as any).$oid
+    } else if (key.startsWith(BSON_DATA_IDENTIFIER_PREFIXES.Date) && val && typeof val === 'object' && '$date' in val) {
+      const date = (val as any).$date
+      out[key] = date ? dayjs(date) : date
+    } else if (
+      key.startsWith(BSON_DATA_IDENTIFIER_PREFIXES.Number) &&
+      val &&
+      typeof val === 'object' &&
+      '$numberDecimal' in val
+    ) {
+      const n = (val as any).$numberDecimal
+      out[key] = typeof n === 'number' ? n : Number(n)
+    } else out[key] = val
+  }
+
+  return out
+}

package/src/functions/forms/index.ts

@@ -1,8 +1,8 @@
-import { DEFAULT_LAYOUT_CONFIG } from '../../constants'
+import { 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 './json-handlers'
+export * from './extended-json-handlers'
 export * from './form-schema-validator'
 export * from './get-element-props'
 import { CancelToken } from 'axios'
@@ -37,15 +37,6 @@ export const extractFiltersFromLayout = (elements: { [key: string]: IDndLayoutEl
   return filters
 }
 
-export const extractDateFields = (elements: { [key: string]: IDndLayoutElement }): string[] => {
-  const dateFieldKeys: string[] = []
-  Object.values(elements).forEach((el) => {
-    if ([ElementTypeEnum.DatePicker, ElementTypeEnum.TimePicker].includes(el.elementType)) dateFieldKeys.push(el.key)
-  })
-
-  return dateFieldKeys
-}
-
 /** ---------------------------------------------------------------------------------------------------------  */
 
 export const getFlexContainerStyle = (display?: IGridContainerConfig) => {
@@ -181,4 +172,19 @@ export async function fetchFormDataAsLookup(
 
 /** ---------------------------------------------------------------------------------------------------------  */
 
+export const getProjectionKey = (key: string): string => key.replace(/\./g, '_')
+
+/** ---------------------------------------------------------------------------------------------------------  */
+
+export const getIdEqualsQuery = (alias: number | string = '', id: string = '') =>
+  id
+    ? {
+        $expr: { $eq: [`$${alias ? `${alias}.` : ''}_id`, { $toObjectId: id }] },
+      }
+    : {}
+
+/** ---------------------------------------------------------------------------------------------------------  */
+
+export const isValidMongoDbId = (id?: string) => id && (id === NEW_FORM_DATA_IDENTIFIER || /^[0-9a-fA-F]{24}$/.test(id))
+
 /** ---------------------------------------------------------------------------------------------------------  */

package/src/functions/reports/index.tsx

@@ -1,3 +1,4 @@
+import { getProjectionKey } from '..'
 import { ElementTypeEnum, ReportLayoutLineTypeEnum, ReportLayoutSectionTypeEnum } from '../../enums'
 import { IDndLayoutCol, IDndLayoutRow, IDndLayoutStructure, IReportTableLayoutStyle } from '../../types'
 
@@ -46,7 +47,7 @@ function convertElement(element: any): any {
       }
     }
     case ElementTypeEnum.ReadFieldData: {
-      const fieldKey = element.props.field ? element.props.field.replace(/\./g, '_') : ''
+      const fieldKey = element.props.field ? getProjectionKey(element.props.field) : ''
       return {
         elementType: element.elementType,
         renderConfig: element.props.renderConfig,

package/src/types/forms/index.ts

@@ -11,6 +11,7 @@ import { IButtonElementProps } from './layout-elements'
 import { IDndLayoutStructure_Responsive } from '..'
 
 export interface IFormSchema {
+  isRelationshipForm?: boolean
   detailsConfig: IDndLayoutStructure_Responsive
   dataListConfig: IFormDataListConfig
   generateConfig: IFormGenerateConfig

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

@@ -7,12 +7,14 @@ import {
 } from '../../../enums'
 
 interface IButtonPropsBase {
+  formId?: number
   hasNoLabel?: boolean
   label?: string
   buttonType?: ButtonElementTypeEnum
   className?: string
   size?: ButtonElementSizeEnum
   order?: number
+  secondaryAction?: IButtonProps_Navigate | IButtonProps_CustomFunctionCall
   confirmation?: {
     enabled: boolean
     message?: string
@@ -24,16 +26,19 @@ interface IButtonPropsBase {
     error?: string
   }
 }
-export interface IButtonProps_Navigate extends IButtonPropsBase {
+export interface IButtonProps_Navigate {
   category: ButtonActionCategoryEnum.Navigate
   navigateType: NavigateButtonTypesEnum
+  navigateBackCount?: number
   urlComponents?: IButtonProps_NavigateCustomComponents[]
+  customUrl?: string
+  formId?: number
 }
 export interface IButtonProps_NavigateCustomComponents {
   type: NavigateButtonCustomComponentType
   value: string
 }
-export interface IButtonProps_CustomFunctionCall extends IButtonPropsBase {
+export interface IButtonProps_CustomFunctionCall {
   category: ButtonActionCategoryEnum.CustomFunction
   functionName: string
 }
@@ -46,4 +51,7 @@ export interface IButtonProps_Other extends IButtonPropsBase {
     | ButtonActionCategoryEnum.SaveDataChanges
     | ButtonActionCategoryEnum.ViewDataVersions
 }
-export type IButtonElementProps = IButtonProps_Navigate | IButtonProps_CustomFunctionCall | IButtonProps_Other
+export type IButtonElementProps =
+  | (IButtonProps_Navigate & IButtonPropsBase)
+  | (IButtonProps_CustomFunctionCall & IButtonPropsBase)
+  | IButtonProps_Other

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

@@ -19,8 +19,8 @@ import {
   ICssStylePerBreakpoint,
   IEvaluationConfig,
   IFilterConfig,
+  IFormJoin,
   IReadFieldDataElementProps,
-  IRelationshipForm,
   IReportTableElementProps,
 } from '..'
 import {
@@ -288,7 +288,11 @@ export interface IFormDataLoadElement extends BaseFormLayoutElement {
 }
 export interface IFormDataLoadElementProps {
   hasNoLabel?: boolean
-  joins: IRelationshipForm[]
+  baseFormId: number
+  displayConfigFormId: number
+  displayConfigId: string
+  joins: IFormJoin[]
+  filter?: IFilterConfig
   name: string
   pageBreak?: ReportPageBreakEnum // used for report
 }

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

@@ -1,11 +1,16 @@
 import { DataSanitizationTypeEnum } from '../../../enums'
 
-export type IDataSanitization = IDataSanitization_Default | IDataSanitization_Custom
+export type IDataSanitization = IDataSanitization_Default | IDataSanitization_Predefined | IDataSanitization_Custom
 
 interface IDataSanitization_Default {
   type: DataSanitizationTypeEnum.Default
 }
 
+export interface IDataSanitization_Predefined {
+  type: DataSanitizationTypeEnum.Predefined
+  pattern?: string
+}
+
 export interface IDataSanitization_Custom {
   type: DataSanitizationTypeEnum.Custom
   pattern: string

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

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

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

@@ -1,19 +0,0 @@
-// TODO: add json validator
-// TODO: pass the T and validate with it?
-
-export const parseJSON = <T extends any>(jsonString: string): T | null => {
-  try {
-    return JSON.parse(jsonString) as T
-  } catch (error) {
-    console.error('Invalid JSON string:', error)
-    return null
-  }
-}
-export const stringifyJSON = (jsonObject: any): string => {
-  try {
-    return JSON.stringify(jsonObject)
-  } catch (error) {
-    console.error('Unable to stringify JSON:', error)
-    return ''
-  }
-}