Skip to content

Commit c30c07f

Browse files
refactor: Improve form validation logic in useEditForm and useNewForm
1 parent f4b4c9c commit c30c07f

File tree

3 files changed

+28
-13
lines changed

3 files changed

+28
-13
lines changed

.github/workflows/check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI
1+
name: check
22
on: push
33
jobs:
44
check:

src/Components/Event/useEditForm.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ export function useEditForm(event: Models.IEvent) {
4141
}
4242

4343
_setTitle(value);
44-
!err && setValTitle(undefined);
44+
if (!err) {
45+
setValTitle(undefined);
46+
}
4547

4648
return !err;
4749
}
@@ -89,7 +91,9 @@ export function useEditForm(event: Models.IEvent) {
8991
}
9092

9193
_setUpdate(value);
92-
!err && setValUpdate(undefined);
94+
if (!err) {
95+
setValUpdate(undefined);
96+
}
9397

9498
return !err;
9599
}
@@ -128,7 +132,9 @@ export function useEditForm(event: Models.IEvent) {
128132
err = true;
129133
}
130134

131-
!err && setValStart(undefined);
135+
if (!err) {
136+
setValStart(undefined);
137+
}
132138
_setStart(value);
133139

134140
return !err;
@@ -144,7 +150,9 @@ export function useEditForm(event: Models.IEvent) {
144150
err = true;
145151
}
146152

147-
!err && setValEnd(undefined);
153+
if (!err) {
154+
setValEnd(undefined);
155+
}
148156
_setEnd(value);
149157

150158
return !err;

src/Components/New/useNewForm.ts

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ export function useNewForm() {
3636
}
3737

3838
_setTitle(value);
39-
!err && setValTitle(undefined);
40-
39+
if (!err) {
40+
setValTitle(undefined);
41+
}
4142
return !err;
4243
}
4344

@@ -75,8 +76,9 @@ export function useNewForm() {
7576
}
7677

7778
_setDescription(value);
78-
!err && setValDescription(undefined);
79-
79+
if (!err) {
80+
setValDescription(undefined);
81+
}
8082
return !err;
8183
}
8284

@@ -95,7 +97,9 @@ export function useNewForm() {
9597
err = true;
9698
}
9799

98-
!err && setValStart(undefined);
100+
if (!err) {
101+
setValStart(undefined);
102+
}
99103
_setStart(value);
100104

101105
return !err;
@@ -111,7 +115,9 @@ export function useNewForm() {
111115
err = true;
112116
}
113117

114-
!err && setValEnd(undefined);
118+
if (!err) {
119+
setValEnd(undefined);
120+
}
115121
_setEnd(value);
116122

117123
return !err;
@@ -134,8 +140,9 @@ export function useNewForm() {
134140
}
135141

136142
_setServices(updated);
137-
!err && setValServices(undefined);
138-
143+
if (!err) {
144+
setValServices(undefined);
145+
}
139146
return !err;
140147
}
141148

0 commit comments

Comments
 (0)