Skip to content

fix(frontend): defer form title save to cta click in design drawer #9772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rickysurya wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(frontend): defer form title save to cta click in design drawer #9772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...c/features/admin-form/create/builder-and-design/BuilderAndDesignContent/StartPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ export const StartPageView = () => {
{...formBannerLogoProps}
/>
<FormHeader
title={form?.title}
title={startPageData?.title ?? form?.title}
showHeader
loggedInId={
form && form.authType !== FormAuthType.NIL
Expand Down
35 changes: 29 additions & 6 deletions ...admin-form/create/builder-and-design/BuilderAndDesignDrawer/DesignDrawer/DesignDrawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
Flex,
FormControl,
FormLabel,
Input,
Text,
Textarea,
} from '@chakra-ui/react'
Expand All @@ -29,6 +30,7 @@ import {
} from 'formsg-shared/types'

import { useToast } from '~hooks/useToast'
import { useFormTitleValidationRules } from '~utils/formValidation'
import { uploadLogo } from '~services/FileHandlerService'
import FormErrorMessage from '~components/FormControl/FormErrorMessage'
import NumberInput from '~components/NumberInput'
Expand All @@ -37,6 +39,8 @@ import Radio from '~components/Radio'
import { useMutateFormPage } from '~features/admin-form/common/mutations'
import { useCreatePageSidebar } from '~features/admin-form/create/common/CreatePageSidebarContext'
import { FormDetailsSection } from '~features/admin-form/settings/components/FormDetailsSection'
import { useMutateFormSettings } from '~features/admin-form/settings/mutations'
import { useAdminFormSettings } from '~features/admin-form/settings/queries'
import { useEnv } from '~features/env/queries'
import { getTitleBg } from '~features/public-form/components/FormStartPage/useFormHeader'

Expand Down Expand Up @@ -76,6 +80,11 @@ export const DesignInput = (): JSX.Element | null => {
const { formId } = useParams()
if (!formId) throw new Error('No formId provided')

const { data: settings } = useAdminFormSettings()
const { mutateFormTitle } = useMutateFormSettings()
const { formName } = t('features.common', { returnObjects: true })
const formTitleValidationRules = useFormTitleValidationRules()

const { startPageMutation } = useMutateFormPage()
const { handleClose } = useCreatePageSidebar()

Expand Down Expand Up @@ -117,9 +126,9 @@ export const DesignInput = (): JSX.Element | null => {
clearErrors,
setError,
setFocus,
} = useForm<FormStartPageInput>({
} = useForm<FormStartPageInput & { title: string }>({
mode: 'onBlur',
defaultValues: startPageData,
defaultValues: { ...startPageData, title: settings?.title },
})

// Update dirty state of builder so confirmation modal can be shown
Expand Down Expand Up @@ -186,10 +195,15 @@ export const DesignInput = (): JSX.Element | null => {
const handleCloseDrawer = useCallback(() => handleClose(false), [handleClose])

const handleUpdateDesign = handleSubmit(
async (startPageData: FormStartPageInput) => {
const { logo, attachment, estTimeTaken, ...rest } = startPageData
async (startPageData: FormStartPageInput & { title: string }) => {
const { logo, attachment, estTimeTaken, title, ...rest } = startPageData
const estTimeTakenTransformed =
estTimeTaken === '' ? undefined : estTimeTaken

if (title !== settings?.title) {
mutateFormTitle.mutate(title)
}

if (logo.state !== FormLogoState.Custom) {
startPageMutation.mutate(
{
Expand Down Expand Up @@ -342,8 +356,17 @@ export const DesignInput = (): JSX.Element | null => {
<FormErrorMessage>{errors.colorTheme?.message}</FormErrorMessage>
</FormControl>

{showDesignDrawerFormTitle && <FormDetailsSection />}

{showDesignDrawerFormTitle && (
<FormControl
isReadOnly={startPageMutation.isLoading}
isInvalid={!!errors.title}
isRequired
>
<FormLabel>{formName}</FormLabel>
<Input {...register('title', formTitleValidationRules)} />
<FormErrorMessage>{errors.title?.message}</FormErrorMessage>
</FormControl>
)}
<FormControl
isReadOnly={startPageMutation.isLoading}
isInvalid={!!errors.estTimeTaken}
Expand Down
1 change: 1 addition & 0 deletions apps/frontend/src/features/admin-form/create/builder-and-design/useDesignStore.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export type FormStartPageInput = Omit<
estTimeTaken: number | ''
logo: FormLogoBase
attachment: UploadedImage // Custom logo image
title?: string
}

export type DesignStore = {
Expand Down