Skip to content

Commit ff11783

Browse files
uubulbuubulb
authored
chore: update translations (#101)
* chore: update translations * fix: form values type conversion * feat: terminal fullscreen mode * fix
1 parent 53a937a commit ff11783

16 files changed

+186
-166
lines changed

‎src/components/alert-rule.tsx

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ const alertRuleFormSchema = z.object({
8282
),
8383
rules: z.array(ruleSchema),
8484
fail_trigger_tasks: z.array(z.number()),
85+
fail_trigger_tasks_raw: z.string(),
8586
recover_trigger_tasks: z.array(z.number()),
87+
recover_trigger_tasks_raw: z.string(),
8688
notification_group_id: z.coerce.number().int(),
8789
trigger_mode: z.coerce.number().int().min(0),
8890
enable: asOptionalField(z.boolean()),
@@ -96,13 +98,17 @@ export const AlertRuleCard: React.FC<AlertRuleCardProps> = ({ data, mutate }) =>
9698
? {
9799
...data,
98100
rules_raw: JSON.stringify(data.rules),
101+
fail_trigger_tasks_raw: conv.arrToStr(data.fail_trigger_tasks),
102+
recover_trigger_tasks_raw: conv.arrToStr(data.recover_trigger_tasks),
99103
}
100104
: {
101105
name: "",
102106
rules_raw: "",
103107
rules: [],
104108
fail_trigger_tasks: [],
109+
fail_trigger_tasks_raw: "",
105110
recover_trigger_tasks: [],
111+
recover_trigger_tasks_raw: "",
106112
notification_group_id: 0,
107113
trigger_mode: 0,
108114
},
@@ -115,6 +121,8 @@ export const AlertRuleCard: React.FC<AlertRuleCardProps> = ({ data, mutate }) =>
115121

116122
const onSubmit = async (values: z.infer<typeof alertRuleFormSchema>) => {
117123
values.rules = JSON.parse(values.rules_raw)
124+
values.fail_trigger_tasks = conv.strToArr(values.fail_trigger_tasks_raw).map(Number)
125+
values.recover_trigger_tasks = conv.strToArr(values.recover_trigger_tasks_raw).map(Number)
118126
const { rules_raw, ...requiredFields } = values
119127
try {
120128
data?.id
@@ -227,51 +235,31 @@ export const AlertRuleCard: React.FC<AlertRuleCardProps> = ({ data, mutate }) =>
227235
/>
228236
<FormField
229237
control={form.control}
230-
name="fail_trigger_tasks"
238+
name="fail_trigger_tasks_raw"
231239
render={({ field }) => (
232240
<FormItem>
233241
<FormLabel>
234242
{t("TasksToTriggerOnAlert") +
235243
t("SeparateWithComma")}
236244
</FormLabel>
237245
<FormControl>
238-
<Input
239-
placeholder="1,2,3"
240-
{...field}
241-
value={conv.arrToStr(field.value ?? [])}
242-
onChange={(e) => {
243-
const arr = conv
244-
.strToArr(e.target.value)
245-
.map(Number)
246-
field.onChange(arr)
247-
}}
248-
/>
246+
<Input placeholder="1,2,3" {...field} />
249247
</FormControl>
250248
<FormMessage />
251249
</FormItem>
252250
)}
253251
/>
254252
<FormField
255253
control={form.control}
256-
name="recover_trigger_tasks"
254+
name="recover_trigger_tasks_raw"
257255
render={({ field }) => (
258256
<FormItem>
259257
<FormLabel>
260258
{t("TasksToTriggerAfterRecovery") +
261259
t("SeparateWithComma")}
262260
</FormLabel>
263261
<FormControl>
264-
<Input
265-
placeholder="1,2,3"
266-
{...field}
267-
value={conv.arrToStr(field.value ?? [])}
268-
onChange={(e) => {
269-
const arr = conv
270-
.strToArr(e.target.value)
271-
.map(Number)
272-
field.onChange(arr)
273-
}}
274-
/>
262+
<Input placeholder="1,2,3" {...field} />
275263
</FormControl>
276264
<FormMessage />
277265
</FormItem>

‎src/components/ddns.tsx

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ const ddnsFormSchema = z.object({
5757
name: z.string().min(1),
5858
provider: z.string(),
5959
domains: z.array(z.string()),
60+
domains_raw: z.string(),
6061
access_id: asOptionalField(z.string()),
6162
access_secret: asOptionalField(z.string()),
6263
webhook_url: asOptionalField(z.string().url()),
@@ -71,12 +72,16 @@ export const DDNSCard: React.FC<DDNSCardProps> = ({ data, providers, mutate }) =
7172
const form = useForm<z.infer<typeof ddnsFormSchema>>({
7273
resolver: zodResolver(ddnsFormSchema),
7374
defaultValues: data
74-
? data
75+
? {
76+
...data,
77+
domains_raw: conv.arrToStr(data.domains),
78+
}
7579
: {
7680
max_retries: 3,
7781
name: "",
7882
provider: "dummy",
7983
domains: [],
84+
domains_raw: "",
8085
},
8186
resetOptions: {
8287
keepDefaultValues: false,
@@ -87,6 +92,7 @@ export const DDNSCard: React.FC<DDNSCardProps> = ({ data, providers, mutate }) =
8792

8893
const onSubmit = async (values: z.infer<typeof ddnsFormSchema>) => {
8994
try {
95+
values.domains = conv.strToArr(values.domains_raw)
9096
data?.id ? await updateDDNSProfile(data.id, values) : await createDDNSProfile(values)
9197
} catch (e) {
9298
console.error(e)
@@ -156,22 +162,14 @@ export const DDNSCard: React.FC<DDNSCardProps> = ({ data, providers, mutate }) =
156162
/>
157163
<FormField
158164
control={form.control}
159-
name="domains"
165+
name="domains_raw"
160166
render={({ field }) => (
161167
<FormItem>
162168
<FormLabel>
163169
{t("Domains") + t("SeparateWithComma")}
164170
</FormLabel>
165171
<FormControl>
166-
<Input
167-
placeholder="www.example.com"
168-
{...field}
169-
value={conv.arrToStr(field.value ?? [])}
170-
onChange={(e) => {
171-
const arr = conv.strToArr(e.target.value)
172-
field.onChange(arr)
173-
}}
174-
/>
172+
<Input placeholder="www.example.com" {...field} />
175173
</FormControl>
176174
<FormMessage />
177175
</FormItem>

‎src/components/server.tsx

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,17 @@ const serverFormSchema = z.object({
4848
hide_for_guest: asOptionalField(z.boolean()),
4949
enable_ddns: asOptionalField(z.boolean()),
5050
ddns_profiles: asOptionalField(z.array(z.number())),
51+
ddns_profiles_raw: asOptionalField(z.string()),
5152
})
5253

5354
export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
5455
const { t } = useTranslation()
5556
const form = useForm<z.infer<typeof serverFormSchema>>({
5657
resolver: zodResolver(serverFormSchema),
57-
defaultValues: data,
58+
defaultValues: {
59+
...data,
60+
ddns_profiles_raw: data.ddns_profiles ? conv.arrToStr(data.ddns_profiles) : undefined,
61+
},
5862
resetOptions: {
5963
keepDefaultValues: false,
6064
},
@@ -64,6 +68,9 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
6468

6569
const onSubmit = async (values: z.infer<typeof serverFormSchema>) => {
6670
try {
71+
values.ddns_profiles = values.ddns_profiles_raw
72+
? conv.strToArr(values.ddns_profiles_raw).map(Number)
73+
: undefined
6774
await updateServer(data!.id!, values)
6875
} catch (e) {
6976
console.error(e)
@@ -119,24 +126,14 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
119126
/>
120127
<FormField
121128
control={form.control}
122-
name="ddns_profiles"
129+
name="ddns_profiles_raw"
123130
render={({ field }) => (
124131
<FormItem>
125132
<FormLabel>
126133
{t("DDNSProfiles") + t("SeparateWithComma")}
127134
</FormLabel>
128135
<FormControl>
129-
<Input
130-
placeholder="1,2,3"
131-
{...field}
132-
value={conv.arrToStr(field.value || [])}
133-
onChange={(e) => {
134-
const arr = conv
135-
.strToArr(e.target.value)
136-
.map(Number)
137-
field.onChange(arr)
138-
}}
139-
/>
136+
<Input placeholder="1,2,3" {...field} />
140137
</FormControl>
141138
<FormMessage />
142139
</FormItem>

‎src/components/service.tsx

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,15 @@ const serviceFormSchema = z.object({
5858
enable_show_in_service: asOptionalField(z.boolean()),
5959
enable_trigger_task: asOptionalField(z.boolean()),
6060
fail_trigger_tasks: z.array(z.number()),
61+
fail_trigger_tasks_raw: z.string(),
6162
latency_notify: asOptionalField(z.boolean()),
6263
max_latency: z.coerce.number().int().min(0),
6364
min_latency: z.coerce.number().int().min(0),
6465
name: z.string().min(1),
6566
notification_group_id: z.coerce.number().int(),
6667
notify: asOptionalField(z.boolean()),
6768
recover_trigger_tasks: z.array(z.number()),
69+
recover_trigger_tasks_raw: z.string(),
6870
skip_servers: z.record(z.boolean()),
6971
skip_servers_raw: z.array(z.string()),
7072
target: z.string(),
@@ -78,6 +80,8 @@ export const ServiceCard: React.FC<ServiceCardProps> = ({ data, mutate }) => {
7880
defaultValues: data
7981
? {
8082
...data,
83+
fail_trigger_tasks_raw: conv.arrToStr(data.fail_trigger_tasks),
84+
recover_trigger_tasks_raw: conv.arrToStr(data.recover_trigger_tasks),
8185
skip_servers_raw: conv.recordToStrArr(data.skip_servers ? data.skip_servers : {}),
8286
}
8387
: {
@@ -90,7 +94,9 @@ export const ServiceCard: React.FC<ServiceCardProps> = ({ data, mutate }) => {
9094
duration: 30,
9195
notification_group_id: 0,
9296
fail_trigger_tasks: [],
97+
fail_trigger_tasks_raw: "",
9398
recover_trigger_tasks: [],
99+
recover_trigger_tasks_raw: "",
94100
skip_servers: {},
95101
skip_servers_raw: [],
96102
},
@@ -103,6 +109,8 @@ export const ServiceCard: React.FC<ServiceCardProps> = ({ data, mutate }) => {
103109

104110
const onSubmit = async (values: z.infer<typeof serviceFormSchema>) => {
105111
values.skip_servers = conv.arrToRecord(values.skip_servers_raw)
112+
values.fail_trigger_tasks = conv.strToArr(values.fail_trigger_tasks_raw).map(Number)
113+
values.recover_trigger_tasks = conv.strToArr(values.recover_trigger_tasks_raw).map(Number)
106114
const { skip_servers_raw, ...requiredFields } = values
107115
try {
108116
data?.id
@@ -400,51 +408,31 @@ export const ServiceCard: React.FC<ServiceCardProps> = ({ data, mutate }) => {
400408
/>
401409
<FormField
402410
control={form.control}
403-
name="fail_trigger_tasks"
411+
name="fail_trigger_tasks_raw"
404412
render={({ field }) => (
405413
<FormItem>
406414
<FormLabel>
407415
{t("TasksToTriggerOnAlert") +
408416
t("SeparateWithComma")}
409417
</FormLabel>
410418
<FormControl>
411-
<Input
412-
placeholder="1,2,3"
413-
{...field}
414-
value={conv.arrToStr(field.value ?? [])}
415-
onChange={(e) => {
416-
const arr = conv
417-
.strToArr(e.target.value)
418-
.map(Number)
419-
field.onChange(arr)
420-
}}
421-
/>
419+
<Input placeholder="1,2,3" {...field} />
422420
</FormControl>
423421
<FormMessage />
424422
</FormItem>
425423
)}
426424
/>
427425
<FormField
428426
control={form.control}
429-
name="recover_trigger_tasks"
427+
name="recover_trigger_tasks_raw"
430428
render={({ field }) => (
431429
<FormItem>
432430
<FormLabel>
433431
{t("TasksToTriggerAfterRecovery") +
434432
t("SeparateWithComma")}
435433
</FormLabel>
436434
<FormControl>
437-
<Input
438-
placeholder="1,2,3"
439-
{...field}
440-
value={conv.arrToStr(field.value ?? [])}
441-
onChange={(e) => {
442-
const arr = conv
443-
.strToArr(e.target.value)
444-
.map(Number)
445-
field.onChange(arr)
446-
}}
447-
/>
435+
<Input placeholder="1,2,3" {...field} />
448436
</FormControl>
449437
<FormMessage />
450438
</FormItem>

0 commit comments

Comments
 (0)