feat: support field addition during revert

frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/FieldListDrawer/MagicFormBuilderContainer.tsx

@@ -29,6 +29,7 @@ import { useAssistanceMutations } from '~features/admin-form/assistance/mutation
 
 import { useDeleteFormField } from '../../mutations/useDeleteFormField'
 import {
+  isAcceptDenyOpenSelector,
   recentlyCreatedFieldIdsSelector,
   useMagicFormBuilderStore,
 } from '../../useMagicFormBuilderStore'
@@ -70,10 +71,8 @@ const MagicFormBuilderButton = ({
 }
 
 const MagicFormBuilderCreateFormPrompt = ({
-  onSettled,
   onClose,
 }: {
-  onSettled: () => void
   onClose: () => void
 }) => {
   const {
@@ -85,9 +84,7 @@ const MagicFormBuilderCreateFormPrompt = ({
   const { useMakeTextPromptMutation } = useAssistanceMutations()
 
   const onSubmit = async ({ prompt }: TextPromptInputs) => {
-    useMakeTextPromptMutation.mutate(prompt, {
-      onSettled: onSettled,
-    })
+    useMakeTextPromptMutation.mutate(prompt)
   }
 
   return (
@@ -176,18 +173,18 @@ const MagicFormBuilderPopover = ({
   isOpen: boolean
   setIsOpen: (isOpen: boolean) => void
 }) => {
-  const [isAcceptDenyOpen, setIsAcceptDenyOpen] = useState(false)
   const clearRecentlyCreatedFieldIds = useMagicFormBuilderStore(
     (state) => state.clearRecentlyCreatedFieldIds,
   )
   const recentlyCreatedFieldIds = useMagicFormBuilderStore(
     recentlyCreatedFieldIdsSelector,
   )
 
+  const isAcceptDenyOpen = useMagicFormBuilderStore(isAcceptDenyOpenSelector)
+
   const onClickDefaults = () => {
     clearRecentlyCreatedFieldIds()
     setIsOpen(false)
-    setTimeout(() => setIsAcceptDenyOpen(false), 100) // delay to allow popover to close before updating state
   }
 
   const { deleteMultipleFormFieldsMutation } = useDeleteFormField()
@@ -203,7 +200,6 @@ const MagicFormBuilderPopover = ({
           {!isAcceptDenyOpen ? (
             <MagicFormBuilderCreateFormPrompt
               onClose={() => setIsOpen(false)}
-              onSettled={() => setIsAcceptDenyOpen(true)}
             />
           ) : (
             <MagicFormBuilderAcceptDeny

frontend/src/features/admin-form/create/builder-and-design/useMagicFormBuilderStore.tsx

@@ -1,13 +1,15 @@
 import create from 'zustand'
 
 export type MagicFormBuilderStore = {
+  isAcceptDenyOpen: boolean
   recentlyCreatedFieldIds: Set<string>
   setRecentlyCreatedFieldIds: (fieldIds: Set<string>) => void
   clearRecentlyCreatedFieldIds: () => void
 }
 
 export const useMagicFormBuilderStore = create<MagicFormBuilderStore>(
-  (set) => ({
+  (set, get) => ({
+    isAcceptDenyOpen: get().recentlyCreatedFieldIds.size > 0,
     recentlyCreatedFieldIds: new Set(),
     setRecentlyCreatedFieldIds: (fieldIds) =>
       set({ recentlyCreatedFieldIds: fieldIds }),
@@ -16,6 +18,10 @@ export const useMagicFormBuilderStore = create<MagicFormBuilderStore>(
   }),
 )
 
+export const isAcceptDenyOpenSelector = (
+  state: MagicFormBuilderStore,
+): MagicFormBuilderStore['isAcceptDenyOpen'] => state.isAcceptDenyOpen
+
 export const recentlyCreatedFieldIdsSelector = (
   state: MagicFormBuilderStore,
 ): MagicFormBuilderStore['recentlyCreatedFieldIds'] =>