fix: style error fix

Co-authored-by: Minseok Choi <[email protected]>
minsgy · Jun 12, 2024 · 4bec014 · 4bec014
1 parent e19c0d8
commit 4bec014
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/example/src/mocks/handlers.ts b/example/src/mocks/handlers.ts
@@ -14,8 +14,8 @@ export const handlers = [
         status: 200,
         description: "Success",
         response: {
-          firstName: "John",
-          lastName: "Maverick",
+          firstName: "리",
+          lastName: "앜코",
         },
       },
       {

diff --git a/src/features/DevtoolsHandlerList.tsx b/src/features/DevtoolsHandlerList.tsx
@@ -14,7 +14,6 @@ import { HandlerSelect } from "./HandlerSelect"
 import { Button } from "@/shared/ui/button"
 import { Switch } from "@/shared/ui/switch"
 import {
-  TableCaption,
   TableHeader,
   TableRow,
   TableHead,
@@ -31,7 +30,6 @@ export const DevtoolsHandlerList = () => {
 
   return (
     <Table>
-      <TableCaption>A list of your recent invoices.</TableCaption>
       <TableHeader>
         <TableRow>
           <TableHead className="w-[100px]">Methods</TableHead>
@@ -53,11 +51,12 @@ export const DevtoolsHandlerList = () => {
             <TableCell>
               <div className="flex items-center">
                 <HandlerSelect
+                  value={route.selectedHandlerId}
                   onValueChange={(handlerId) =>
                     onSelectHandler(route.id, handlerId)
                   }
                   options={route.handlers}
-                  defaultValue={route.handlers?.[0]?.id ?? undefined}
+                  defaultValue={route.selectedHandlerId ?? route.handlers[0].id}
                 />
                 {route.origin === "custom" && (
                   <InlineCode>{route.origin}</InlineCode>

diff --git a/src/features/RouteEditPanel/EditHandlerForm.tsx b/src/features/RouteEditPanel/EditHandlerForm.tsx
@@ -1,5 +1,6 @@
 import {
   FormControl,
+  FormDescription,
   FormField,
   FormItem,
   FormLabel,
@@ -13,6 +14,7 @@ import { Input } from "@/shared/ui/input"
 import { Separator } from "@/shared/ui/separator"
 import { Button } from "@/shared/ui/button"
 import { formattedJson } from "./utils/formattedJson"
+import { InlineCode } from "@/shared/ui/typography"
 
 export const EditHandlerForm = () => {
   const handlerForm = useFormContext<CreateHandlerFormValues>()
@@ -72,6 +74,7 @@ export const EditHandlerForm = () => {
                   try {
                     const formattedResponse = await formattedJson(field.value)
                     field.onChange(formattedResponse)
+                    handlerForm.clearErrors(`response`)
                   } catch (error) {
                     const formattedError =
                       error instanceof Error ? error.message : "Unknown Error"
@@ -82,6 +85,10 @@ export const EditHandlerForm = () => {
                 }}
               />
             </FormControl>
+            <FormDescription>
+              You can use the <InlineCode>Ctrl + S</InlineCode> shortcut to save
+              the JSON formatting.
+            </FormDescription>
           </FormItem>
         )}
       />

diff --git a/src/features/RouteEditPanel/ResponseJsonEditor.tsx b/src/features/RouteEditPanel/ResponseJsonEditor.tsx
@@ -58,6 +58,7 @@ export const ResponseJsonEditor = ({
         history: true,
         bracketMatching: true,
       }}
+      onBlur={() => onSave?.()}
       {...rest}
     />
   )

diff --git a/src/features/RouteEditPanel/hooks/useCreateEditFormState.ts b/src/features/RouteEditPanel/hooks/useCreateEditFormState.ts
@@ -9,7 +9,6 @@ import {
   useEditorRouteState,
   useRoute,
 } from "@/providers/useMswDevtoolsContext"
-import { useEditorPanelState } from "@/hooks/useEditorPanelState"
 import { formattedJson } from "../utils/formattedJson"
 
 export type CreateRouteFormValues = z.infer<typeof createRouteFormSchema>
@@ -39,13 +38,13 @@ const createRouteFormSchema = z.object({
 
 export const useCreateEditFormState = () => {
   const defaultHandler = getDefaultResponse(0)
-  const { selectedRoute } = useEditorRouteState()
+  const { selectedRoute, onCloseEditPanel } = useEditorRouteState()
   const { onAddHandler, onUpdateHandler } = useRoute()
-  const { setIsOpenEditorPanel } = useEditorPanelState()
   const routeForm = useForm<CreateRouteFormValues>({
     resolver: zodResolver(createRouteFormSchema),
     mode: "onSubmit",
     reValidateMode: "onSubmit",
+    shouldUnregister: false,
     defaultValues: {
       delay: 0,
       url: "",
@@ -75,9 +74,10 @@ export const useCreateEditFormState = () => {
     if (selectedRoute === null) {
       onAddHandler(values)
     } else {
+      console.log("selectedRoute.id", selectedRoute.id, values)
       onUpdateHandler(selectedRoute.id, values)
     }
-    setIsOpenEditorPanel(false)
+    onCloseEditPanel()
   }
 
   const handleHandlerFormSubmit = (values: CreateHandlerFormValues) => {

diff --git a/src/features/RouteEditPanel/utils/formattedJson.ts b/src/features/RouteEditPanel/utils/formattedJson.ts
@@ -7,6 +7,7 @@ export const formattedJson = async (field: string) => {
     tabWidth: 4,
     printWidth: 10,
     parser: "json5",
+    trailingComma: "none",
     plugins: [babel, prettierPluginEstree],
   })
   // LINK: https://github.com/prettier/prettier/issues/6360