Skip to content

Commit aee7a75

Browse files
committed
refactor: removing useless edits
1 parent cd970cb commit aee7a75

File tree

5 files changed

+9
-70
lines changed

5 files changed

+9
-70
lines changed

packages/app-builder/src/routes/ressources+/data+/create-annotation.tsx

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,6 @@ const createAnnotationSchema = z.union([
8888
createCommentAnnotationSchema,
8989
]);
9090

91-
// Add these helper objects at the top for clarity
92-
const commentPayloadShape = z.object({ text: z.string().nonempty() }).shape;
93-
const filePayloadShape = z.object({ files: z.array(z.instanceof(File)).min(1) }).shape;
94-
const tagPayloadShape = z.object({ tags: z.array(z.string()) }).shape;
95-
9691
export async function action({ request }: ActionFunctionArgs) {
9792
const {
9893
authService,
@@ -288,8 +283,8 @@ export function ClientCommentForm({
288283
<form.Field
289284
name="payload.text"
290285
validators={{
291-
onChange: commentPayloadShape.text,
292-
onBlur: commentPayloadShape.text,
286+
onChange: createCommentAnnotationSchema._def.right.shape.payload.shape.text,
287+
onBlur: createCommentAnnotationSchema._def.right.shape.payload.shape.text,
293288
}}
294289
>
295290
{(field) => (
@@ -389,8 +384,8 @@ export function ClientDocumentsPopover({
389384
<form.Field
390385
name="payload.files"
391386
validators={{
392-
onChange: filePayloadShape.files,
393-
onBlur: filePayloadShape.files,
387+
onChange: createFileAnnotationSchema._def.right.shape.payload.shape.files,
388+
onBlur: createFileAnnotationSchema._def.right.shape.payload.shape.files,
394389
}}
395390
>
396391
{(field) => (
@@ -581,8 +576,8 @@ export function ClientTagsEditSelect({
581576
<form.Field
582577
name="payload.tags"
583578
validators={{
584-
onChange: tagPayloadShape.tags,
585-
onBlur: tagPayloadShape.tags,
579+
onChange: tagAnnotationFormSchema._def.right.shape.payload.shape.tags,
580+
onBlur: tagAnnotationFormSchema._def.right.shape.payload.shape.tags,
586581
}}
587582
>
588583
{(field) => (

packages/app-builder/src/routes/ressources+/data+/create-pivot/SelectTargetEntity.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { useForm, useStore } from '@tanstack/react-form';
88
import { useMemo, useState } from 'react';
99
import { Trans, useTranslation } from 'react-i18next';
1010
import { Button, Code, MenuCommand, Modal } from 'ui-design-system';
11-
import { z } from 'zod';
1211

1312
export function SelectTargetEntity({
1413
pivotOptions,
@@ -74,8 +73,6 @@ export function SelectTargetEntity({
7473
const selectedOption = useStore(form.store, (state) => state.values.pivot);
7574
const [open, onOpenChange] = useState(false);
7675

77-
const pivotFieldShape = z.object({ pivot: z.any() }).shape;
78-
7976
return (
8077
<form onSubmit={handleSubmit(form)}>
8178
<div className="bg-grey-100 flex flex-col gap-6 p-6">
@@ -91,10 +88,7 @@ export function SelectTargetEntity({
9188
/>
9289
</Modal.Description>
9390

94-
<form.Field
95-
name="pivot"
96-
validators={{ onChange: pivotFieldShape.pivot, onBlur: pivotFieldShape.pivot }}
97-
>
91+
<form.Field name="pivot">
9892
{(field) => (
9993
<div className="flex flex-col gap-2">
10094
<MenuCommand.Menu {...{ open, onOpenChange }}>

packages/app-builder/src/routes/ressources+/data+/create-pivot/selectField.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { useForm, useStore } from '@tanstack/react-form';
66
import { useState } from 'react';
77
import { Trans, useTranslation } from 'react-i18next';
88
import { Button, Code, MenuCommand, Modal } from 'ui-design-system';
9-
import { z } from 'zod';
109

1110
export function SelectField({
1211
pivotOptions,
@@ -35,8 +34,6 @@ export function SelectField({
3534
const selectedOption = useStore(form.store, (state) => state.values.pivot);
3635
const [open, onOpenChange] = useState(false);
3736

38-
const pivotFieldShape = z.object({ pivot: z.any() }).shape;
39-
4037
return (
4138
<form onSubmit={handleSubmit(form)}>
4239
<div className="bg-grey-100 flex flex-col gap-6 p-6">
@@ -62,10 +59,7 @@ export function SelectField({
6259
/>
6360
</Callout>
6461

65-
<form.Field
66-
name="pivot"
67-
validators={{ onChange: pivotFieldShape.pivot, onBlur: pivotFieldShape.pivot }}
68-
>
62+
<form.Field name="pivot">
6963
{(field) => (
7064
<div className="flex flex-col gap-2">
7165
<MenuCommand.Menu {...{ open, onOpenChange }}>

packages/app-builder/src/routes/ressources+/settings+/users+/create.tsx

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -267,32 +267,10 @@ function CreateUserContent({
267267
</div>
268268
)}
269269
</form.Field>
270-
<form.Field
271-
name="organizationId"
272-
validators={{
273-
onBlur: schema.shape.organizationId,
274-
onChange: schema.shape.organizationId,
275-
}}
276-
>
277-
{(field) => (
278-
<div className="group flex flex-col gap-2">
279-
<FormLabel name={field.name}>Organization ID</FormLabel>
280-
<FormInput
281-
type="text"
282-
name={field.name}
283-
onBlur={field.handleBlur}
284-
onChange={(e) => field.handleChange(e.currentTarget.value)}
285-
defaultValue={field.state.value}
286-
valid={field.state.meta.errors.length === 0}
287-
/>
288-
<FormErrorOrDescription errors={getFieldErrors(field.state.meta.errors)} />
289-
</div>
290-
)}
291-
</form.Field>
292270
</div>
293271
<div className="flex flex-1 flex-row gap-2">
294272
<Modal.Close asChild>
295-
<Button className="flex-1" variant="secondary" name="cancel">
273+
<Button type="button" className="flex-1" variant="secondary" name="cancel">
296274
{t('common:cancel')}
297275
</Button>
298276
</Modal.Close>

packages/app-builder/src/routes/ressources+/settings+/users+/update.tsx

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -261,28 +261,6 @@ function UpdateUserContent({
261261
</div>
262262
)}
263263
</form.Field>
264-
<form.Field
265-
name="organizationId"
266-
validators={{
267-
onBlur: schema.shape.organizationId,
268-
onChange: schema.shape.organizationId,
269-
}}
270-
>
271-
{(field) => (
272-
<div className="group flex flex-col gap-2">
273-
<FormLabel name={field.name}>Organization ID</FormLabel>
274-
<FormInput
275-
type="text"
276-
name={field.name}
277-
onBlur={field.handleBlur}
278-
onChange={(e) => field.handleChange(e.currentTarget.value)}
279-
defaultValue={field.state.value}
280-
valid={field.state.meta.errors.length === 0}
281-
/>
282-
<FormErrorOrDescription errors={getFieldErrors(field.state.meta.errors)} />
283-
</div>
284-
)}
285-
</form.Field>
286264
</div>
287265
<div className="flex flex-1 flex-row gap-2">
288266
<Modal.Close asChild>

0 commit comments

Comments
 (0)