@campxdev/shared 1.0.5 → 1.1.1

package/src/components/Form/Form.tsx

@@ -1,156 +1,156 @@
-import axios, { axiosErrorToast } from '../../config/axios'
-import { yupResolver } from '@hookform/resolvers/yup'
-import { Alert, Box, Button, ButtonProps, Typography } from '@mui/material'
-import RenderForm, { generateYupSchema, RenderFormProps } from './RenderForm'
-import { ReactNode, useState } from 'react'
-import { useForm } from 'react-hook-form'
-import { useMutation, useQueryClient } from 'react-query'
-import { toast } from 'react-toastify'
-
-const makePostRequest = async ({
-  endpoint,
-  postBody,
-}: {
-  endpoint: string
-  postBody: any
-}) => {
-  const method = postBody?.id ? 'PUT' : 'POST'
-  const url = postBody?.id ? `${endpoint}/${postBody?.id}` : endpoint
-  return await axios({
-    url,
-    method,
-    data: postBody,
-  })
-}
-
-interface FormProps extends Omit<RenderFormProps, 'control'> {
-  buttonProps?: ButtonProps
-  submitBtn?: { label?: ReactNode }
-  cancelBtn?: { label?: ReactNode }
-  onSubmit?: (formData) => any
-  onCancel?: () => void
-  endPoint?: string
-  defaultValues?: any
-  refetchKey?: string
-  onSuccess?: () => void
-  previousData?: any
-}
-
-export default function Form({
-  submitBtn = { label: 'Submit' },
-  cancelBtn = { label: 'Cancel' },
-  buttonProps,
-  onSubmit = () => {},
-  endPoint,
-  defaultValues,
-  cols,
-  fields,
-  dropdowns,
-  refetchKey,
-  onSuccess = () => {},
-  onCancel,
-  previousData,
-}: FormProps) {
-  const queryClient = useQueryClient()
-  const [error, setError] = useState<any>(null)
-  const { control, watch, handleSubmit } = useForm({
-    defaultValues,
-    resolver: yupResolver(generateYupSchema([fields])),
-  })
-
-  const {
-    data,
-    mutate,
-    isLoading: posting,
-  } = useMutation(makePostRequest, {
-    onSuccess(data) {
-      queryClient.invalidateQueries(refetchKey)
-      toast.success('Created/Updated Successfully')
-      onSuccess && onSuccess()
-    },
-    onError(error: any) {
-      setError(error?.response?.data?.message)
-      axiosErrorToast(error)
-    },
-  })
-
-  const onError = (error) => {
-    const errorArray = Object.values(error)?.map((item: any) => item?.message)
-    setError(errorArray)
-  }
-
-  return (
-    <form
-      onSubmit={handleSubmit((originalFormData) => {
-        const modifiedFormData = onSubmit(originalFormData) ?? originalFormData
-
-        mutate({
-          endpoint: endPoint,
-          postBody: modifiedFormData,
-        })
-      }, onError)}
-    >
-      <RenderForm
-        cols={cols}
-        fields={fields}
-        control={control}
-        dropdowns={dropdowns}
-      />
-
-      <FormErrorDisplay message={error} />
-      <Box
-        sx={{
-          display: 'flex',
-          gap: '20px',
-          marginTop: '1rem',
-        }}
-      >
-        <Button fullWidth type="submit" {...buttonProps}>
-          {submitBtn?.label}
-        </Button>
-        <Button
-          fullWidth
-          variant="outlined"
-          onClick={() => {
-            onCancel ? onCancel() : null
-          }}
-          {...buttonProps}
-        >
-          {cancelBtn?.label}
-        </Button>
-      </Box>
-    </form>
-  )
-}
-
-const FormErrorDisplay = ({ message }: { message: string | string[] }) => {
-  if (!message) return null
-
-  if (typeof message === 'string')
-    return (
-      <Alert severity="error" sx={{ marginTop: '1rem' }}>
-        {message}
-      </Alert>
-    )
-
-  return (
-    <Alert
-      severity="error"
-      sx={{
-        marginTop: '1rem',
-        '& .MuiAlert-icon': {
-          display: 'flex',
-          alignItems: 'center',
-        },
-      }}
-    >
-      <Box>
-        {message?.map((item, index) => (
-          <Typography color="error" variant="body1" key={index}>
-            {item}
-          </Typography>
-        ))}
-      </Box>
-    </Alert>
-  )
-}
+import axios, { axiosErrorToast } from '../../config/axios'
+import { yupResolver } from '@hookform/resolvers/yup'
+import { Alert, Box, Button, ButtonProps, Typography } from '@mui/material'
+import RenderForm, { generateYupSchema, RenderFormProps } from './RenderForm'
+import { ReactNode, useState } from 'react'
+import { useForm } from 'react-hook-form'
+import { useMutation, useQueryClient } from 'react-query'
+import { toast } from 'react-toastify'
+
+const makePostRequest = async ({
+  endpoint,
+  postBody,
+}: {
+  endpoint: string
+  postBody: any
+}) => {
+  const method = postBody?.id ? 'PUT' : 'POST'
+  const url = postBody?.id ? `${endpoint}/${postBody?.id}` : endpoint
+  return await axios({
+    url,
+    method,
+    data: postBody,
+  })
+}
+
+interface FormProps extends Omit<RenderFormProps, 'control'> {
+  buttonProps?: ButtonProps
+  submitBtn?: { label?: ReactNode }
+  cancelBtn?: { label?: ReactNode }
+  onSubmit?: (formData) => any
+  onCancel?: () => void
+  endPoint?: string
+  defaultValues?: any
+  refetchKey?: string
+  onSuccess?: () => void
+  previousData?: any
+}
+
+export default function Form({
+  submitBtn = { label: 'Submit' },
+  cancelBtn = { label: 'Cancel' },
+  buttonProps,
+  onSubmit = () => {},
+  endPoint,
+  defaultValues,
+  cols,
+  fields,
+  dropdowns,
+  refetchKey,
+  onSuccess = () => {},
+  onCancel,
+  previousData,
+}: FormProps) {
+  const queryClient = useQueryClient()
+  const [error, setError] = useState<any>(null)
+  const { control, watch, handleSubmit } = useForm({
+    defaultValues,
+    resolver: yupResolver(generateYupSchema([fields])),
+  })
+
+  const {
+    data,
+    mutate,
+    isLoading: posting,
+  } = useMutation(makePostRequest, {
+    onSuccess(data) {
+      queryClient.invalidateQueries(refetchKey)
+      toast.success('Created/Updated Successfully')
+      onSuccess && onSuccess()
+    },
+    onError(error: any) {
+      setError(error?.response?.data?.message)
+      axiosErrorToast(error)
+    },
+  })
+
+  const onError = (error) => {
+    const errorArray = Object.values(error)?.map((item: any) => item?.message)
+    setError(errorArray)
+  }
+
+  return (
+    <form
+      onSubmit={handleSubmit((originalFormData) => {
+        const modifiedFormData = onSubmit(originalFormData) ?? originalFormData
+
+        mutate({
+          endpoint: endPoint,
+          postBody: modifiedFormData,
+        })
+      }, onError)}
+    >
+      <RenderForm
+        cols={cols}
+        fields={fields}
+        control={control}
+        dropdowns={dropdowns}
+      />
+
+      <FormErrorDisplay message={error} />
+      <Box
+        sx={{
+          display: 'flex',
+          gap: '20px',
+          marginTop: '1rem',
+        }}
+      >
+        <Button fullWidth type="submit" {...buttonProps}>
+          {submitBtn?.label}
+        </Button>
+        <Button
+          fullWidth
+          variant="outlined"
+          onClick={() => {
+            onCancel ? onCancel() : null
+          }}
+          {...buttonProps}
+        >
+          {cancelBtn?.label}
+        </Button>
+      </Box>
+    </form>
+  )
+}
+
+const FormErrorDisplay = ({ message }: { message: string | string[] }) => {
+  if (!message) return null
+
+  if (typeof message === 'string')
+    return (
+      <Alert severity="error" sx={{ marginTop: '1rem' }}>
+        {message}
+      </Alert>
+    )
+
+  return (
+    <Alert
+      severity="error"
+      sx={{
+        marginTop: '1rem',
+        '& .MuiAlert-icon': {
+          display: 'flex',
+          alignItems: 'center',
+        },
+      }}
+    >
+      <Box>
+        {message?.map((item, index) => (
+          <Typography color="error" variant="body1" key={index}>
+            {item}
+          </Typography>
+        ))}
+      </Box>
+    </Alert>
+  )
+}

package/src/components/Form/RenderForm.tsx

@@ -1,188 +1,188 @@
-import { Box, Typography } from '@mui/material'
-import { ReactNode } from 'react'
-import * as yup from 'yup'
-import { Control } from 'react-hook-form'
-import {
-  FormDatePicker,
-  FormRadioGroup,
-  FormSingleSelect,
-  FormTextField,
-} from '../HookForm'
-
-export const generateYupSchema = (
-  normalFieldGroups: any[][],
-  fieldArrayGroups?: any[],
-) => {
-  const flatArray = normalFieldGroups.flat()
-
-  const validations = flatArray
-    ?.filter(
-      (item) => item?.required !== undefined || item?.validation !== undefined,
-    )
-    ?.reduce((acc, curr) => {
-      return {
-        [curr.name]:
-          curr?.validation ??
-          yup.string().required(`${curr?.label} is required`),
-        ...acc,
-      }
-    }, {})
-
-  return yup.object().shape(validations)
-}
-
-type FormTypes =
-  | 'FormTextField'
-  | 'Display'
-  | 'FormSingleSelect'
-  | 'FormRadioGroup'
-  | 'FormDatePicker'
-
-export interface Field {
-  render: FormTypes
-  name: string
-  label?: string
-  required?: boolean
-  elementProps?: any
-  disabled?: boolean
-  valiation?: any
-}
-
-export interface RenderFormProps {
-  fields: Field[]
-  dropdowns?: { [x: string]: { label: string | ReactNode; value: any }[] }
-  control: Control<any, any>
-  cols: number
-  data?: any
-  fieldArrayOptions?: { index: number; name: string }
-  gap?: string | number
-}
-
-const RenderForm = ({
-  fields,
-  dropdowns,
-  control,
-  cols,
-  data = null,
-  fieldArrayOptions,
-  gap = '1rem',
-}: RenderFormProps) => {
-  return (
-    <>
-      <Box
-        sx={{
-          display: 'grid',
-          gridTemplateColumns: `repeat(${cols}, 1fr)`,
-          gap,
-          width: '100%',
-        }}
-      >
-        {fields?.map((item) => {
-          return renderFormField({
-            field: item,
-            control,
-            dropdown: dropdowns ? dropdowns[item?.name] : null,
-            elementProps: item?.elementProps,
-            value: data ? data[item?.name] : null,
-            fieldArrayOptions,
-          })
-        })}
-      </Box>
-    </>
-  )
-}
-export default RenderForm
-
-const renderFormField = ({
-  field,
-  control,
-  dropdown,
-  elementProps,
-  value,
-  fieldArrayOptions,
-}) => {
-  const name = fieldArrayOptions?.name
-    ? `${fieldArrayOptions?.name}.${fieldArrayOptions?.index}.${field?.name}`
-    : field?.name
-
-  switch (field.render) {
-    case 'FormTextField':
-      return (
-        <FormTextField
-          control={control}
-          name={name}
-          label={field?.label}
-          required={field?.required}
-          disabled={field?.disabled}
-          {...elementProps}
-        />
-      )
-
-    case 'FormSingleSelect':
-      return (
-        <FormSingleSelect
-          options={dropdown}
-          control={control}
-          name={name}
-          label={field?.label}
-          required={field?.required}
-          disabled={field?.disabled}
-          {...elementProps}
-        />
-      )
-    case 'FormDatePicker':
-      return (
-        <FormDatePicker
-          size="medium"
-          control={control}
-          name={name}
-          label={field?.label}
-          required={field?.required}
-          disabled={field?.disabled}
-          {...elementProps}
-        />
-      )
-    case 'FormRadioGroup':
-      return (
-        <FormRadioGroup
-          row={true}
-          options={dropdown}
-          control={control}
-          name={name}
-          label={field?.label}
-          required={field?.required}
-          disabled={field?.disabled}
-          {...elementProps}
-        />
-      )
-    case 'Display':
-      return <FormDisplay label={field?.label} value={value} />
-
-    case 'NestedForm':
-      return <NestedForm label={field?.label} nestedFields={[]} />
-
-    default:
-      return <>{field?.label}</>
-  }
-}
-
-const FormDisplay = ({ label, value }) => {
-  return (
-    <Box>
-      <Typography variant="subtitle2">{label}</Typography>
-      <Typography variant="body1" marginTop={'5px'}>
-        {value ?? '-'}
-      </Typography>
-    </Box>
-  )
-}
-
-const NestedForm = ({
-  nestedFields,
-  label,
-}: {
-  label: ReactNode
-  nestedFields: Field[]
-}) => {
-  return <></>
-}
+import { Box, Typography } from '@mui/material'
+import { ReactNode } from 'react'
+import * as yup from 'yup'
+import { Control } from 'react-hook-form'
+import {
+  FormDatePicker,
+  FormRadioGroup,
+  FormSingleSelect,
+  FormTextField,
+} from '../HookForm'
+
+export const generateYupSchema = (
+  normalFieldGroups: any[][],
+  fieldArrayGroups?: any[],
+) => {
+  const flatArray = normalFieldGroups.flat()
+
+  const validations = flatArray
+    ?.filter(
+      (item) => item?.required !== undefined || item?.validation !== undefined,
+    )
+    ?.reduce((acc, curr) => {
+      return {
+        [curr.name]:
+          curr?.validation ??
+          yup.string().required(`${curr?.label} is required`),
+        ...acc,
+      }
+    }, {})
+
+  return yup.object().shape(validations)
+}
+
+type FormTypes =
+  | 'FormTextField'
+  | 'Display'
+  | 'FormSingleSelect'
+  | 'FormRadioGroup'
+  | 'FormDatePicker'
+
+export interface Field {
+  render: FormTypes
+  name: string
+  label?: string
+  required?: boolean
+  elementProps?: any
+  disabled?: boolean
+  valiation?: any
+}
+
+export interface RenderFormProps {
+  fields: Field[]
+  dropdowns?: { [x: string]: { label: string | ReactNode; value: any }[] }
+  control: Control<any, any>
+  cols: number
+  data?: any
+  fieldArrayOptions?: { index: number; name: string }
+  gap?: string | number
+}
+
+const RenderForm = ({
+  fields,
+  dropdowns,
+  control,
+  cols,
+  data = null,
+  fieldArrayOptions,
+  gap = '1rem',
+}: RenderFormProps) => {
+  return (
+    <>
+      <Box
+        sx={{
+          display: 'grid',
+          gridTemplateColumns: `repeat(${cols}, 1fr)`,
+          gap,
+          width: '100%',
+        }}
+      >
+        {fields?.map((item) => {
+          return renderFormField({
+            field: item,
+            control,
+            dropdown: dropdowns ? dropdowns[item?.name] : null,
+            elementProps: item?.elementProps,
+            value: data ? data[item?.name] : null,
+            fieldArrayOptions,
+          })
+        })}
+      </Box>
+    </>
+  )
+}
+export default RenderForm
+
+const renderFormField = ({
+  field,
+  control,
+  dropdown,
+  elementProps,
+  value,
+  fieldArrayOptions,
+}) => {
+  const name = fieldArrayOptions?.name
+    ? `${fieldArrayOptions?.name}.${fieldArrayOptions?.index}.${field?.name}`
+    : field?.name
+
+  switch (field.render) {
+    case 'FormTextField':
+      return (
+        <FormTextField
+          control={control}
+          name={name}
+          label={field?.label}
+          required={field?.required}
+          disabled={field?.disabled}
+          {...elementProps}
+        />
+      )
+
+    case 'FormSingleSelect':
+      return (
+        <FormSingleSelect
+          options={dropdown}
+          control={control}
+          name={name}
+          label={field?.label}
+          required={field?.required}
+          disabled={field?.disabled}
+          {...elementProps}
+        />
+      )
+    case 'FormDatePicker':
+      return (
+        <FormDatePicker
+          size="medium"
+          control={control}
+          name={name}
+          label={field?.label}
+          required={field?.required}
+          disabled={field?.disabled}
+          {...elementProps}
+        />
+      )
+    case 'FormRadioGroup':
+      return (
+        <FormRadioGroup
+          row={true}
+          options={dropdown}
+          control={control}
+          name={name}
+          label={field?.label}
+          required={field?.required}
+          disabled={field?.disabled}
+          {...elementProps}
+        />
+      )
+    case 'Display':
+      return <FormDisplay label={field?.label} value={value} />
+
+    case 'NestedForm':
+      return <NestedForm label={field?.label} nestedFields={[]} />
+
+    default:
+      return <>{field?.label}</>
+  }
+}
+
+const FormDisplay = ({ label, value }) => {
+  return (
+    <Box>
+      <Typography variant="subtitle2">{label}</Typography>
+      <Typography variant="body1" marginTop={'5px'}>
+        {value ?? '-'}
+      </Typography>
+    </Box>
+  )
+}
+
+const NestedForm = ({
+  nestedFields,
+  label,
+}: {
+  label: ReactNode
+  nestedFields: Field[]
+}) => {
+  return <></>
+}