Skip to content

Commit 374447c

Browse files
committed
Locales cleanup
1 parent af9349d commit 374447c

26 files changed

+142
-374
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import * as api from "./base";
2+
import { Certificate } from "./models";
3+
4+
export async function createCertificate(
5+
data: Certificate,
6+
abortController?: AbortController,
7+
): Promise<Certificate> {
8+
const { result } = await api.post(
9+
{
10+
url: "/certificates",
11+
data,
12+
},
13+
abortController,
14+
);
15+
return result;
16+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import * as api from "./base";
2+
import { Certificate } from "./models";
3+
4+
export async function getCertificate(
5+
id: number,
6+
params = {},
7+
): Promise<Certificate> {
8+
const { result } = await api.get({
9+
url: `/certificates/${id}`,
10+
params,
11+
});
12+
return result;
13+
}

frontend/src/api/npm/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
export * from "./createCertificate";
12
export * from "./createCertificateAuthority";
23
export * from "./createDNSProvider";
34
export * from "./createUser";
45
export * from "./getAccessLists";
6+
export * from "./getCertificate";
57
export * from "./getCertificateAuthorities";
68
export * from "./getCertificateAuthority";
79
export * from "./getCertificates";
@@ -22,6 +24,7 @@ export * from "./models";
2224
export * from "./refreshToken";
2325
export * from "./responseTypes";
2426
export * from "./setAuth";
27+
export * from "./setCertificate";
2528
export * from "./setCertificateAuthority";
2629
export * from "./setDNSProvider";
2730
export * from "./setUser";
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import * as api from "./base";
2+
import { Certificate } from "./models";
3+
4+
export async function setCertificate(
5+
id: number,
6+
data: any,
7+
): Promise<Certificate> {
8+
if (data.id) {
9+
delete data.id;
10+
}
11+
12+
const { result } = await api.put({
13+
url: `/certificates/${id}`,
14+
data,
15+
});
16+
return result;
17+
}

frontend/src/hooks/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export * from "./useAccessLists";
2+
export * from "./useCertificate";
23
export * from "./useCertificateAuthorities";
34
export * from "./useCertificateAuthority";
45
export * from "./useCertificates";

frontend/src/hooks/useCertificate.ts

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
import {
2+
createCertificate,
3+
getCertificate,
4+
setCertificate,
5+
Certificate,
6+
} from "api/npm";
7+
import { useMutation, useQuery, useQueryClient } from "react-query";
8+
9+
const fetchCertificate = (id: any) => {
10+
return getCertificate(id);
11+
};
12+
13+
const useCertificate = (id: number, options = {}) => {
14+
return useQuery<Certificate, Error>(
15+
["certificate", id],
16+
() => fetchCertificate(id),
17+
{
18+
staleTime: 60 * 1000, // 1 minute
19+
...options,
20+
},
21+
);
22+
};
23+
24+
const useSetCertificate = () => {
25+
const queryClient = useQueryClient();
26+
return useMutation(
27+
(values: Certificate) => {
28+
return values.id
29+
? setCertificate(values.id, values)
30+
: createCertificate(values);
31+
},
32+
{
33+
onMutate: (values) => {
34+
const previousObject = queryClient.getQueryData([
35+
"certificate",
36+
values.id,
37+
]);
38+
39+
queryClient.setQueryData(["certificate", values.id], (old: any) => ({
40+
...old,
41+
...values,
42+
}));
43+
44+
return () =>
45+
queryClient.setQueryData(["certificate", values.id], previousObject);
46+
},
47+
onError: (error, values, rollback: any) => rollback(),
48+
onSuccess: async ({ id }: Certificate) => {
49+
queryClient.invalidateQueries(["certificate", id]);
50+
queryClient.invalidateQueries("certificate");
51+
},
52+
},
53+
);
54+
};
55+
56+
export { useCertificate, useSetCertificate };

frontend/src/locale/src/de.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@
5656
"certificate-authority.max-domains": {
5757
"defaultMessage": "Maximale Domains pro Zertifikat"
5858
},
59-
"certificate-authority.name": {
60-
"defaultMessage": "Name"
61-
},
6259
"certificate.create": {
6360
"defaultMessage": "Zertifikat erstellen"
6461
},
@@ -86,9 +83,6 @@
8683
"column.max-domains": {
8784
"defaultMessage": "Domänen pro Zertifikat"
8885
},
89-
"column.name": {
90-
"defaultMessage": "Name"
91-
},
9286
"column.servers": {
9387
"defaultMessage": "Servers"
9488
},
@@ -140,7 +134,7 @@
140134
"dns-provider.create": {
141135
"defaultMessage": "Erstellen Sie einen DNS-Anbieter"
142136
},
143-
"dns-provider.name": {
137+
"name": {
144138
"defaultMessage": "Name"
145139
},
146140
"dns-providers.title": {

frontend/src/locale/src/en.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -332,9 +332,6 @@
332332
"certificate-authority.max-domains": {
333333
"defaultMessage": "Maximum Domains per Certificate"
334334
},
335-
"certificate-authority.name": {
336-
"defaultMessage": "Name"
337-
},
338335
"certificate.create": {
339336
"defaultMessage": "Create Certificate"
340337
},
@@ -362,9 +359,6 @@
362359
"column.max-domains": {
363360
"defaultMessage": "Domains per Cert"
364361
},
365-
"column.name": {
366-
"defaultMessage": "Name"
367-
},
368362
"column.servers": {
369363
"defaultMessage": "Servers"
370364
},
@@ -416,7 +410,7 @@
416410
"dns-provider.create": {
417411
"defaultMessage": "Create DNS Provider"
418412
},
419-
"dns-provider.name": {
413+
"name": {
420414
"defaultMessage": "Name"
421415
},
422416
"dns-providers.title": {

frontend/src/locale/src/fa.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@
5656
"certificate-authority.max-domains": {
5757
"defaultMessage": "حداکثر دامنه در هر گواهی"
5858
},
59-
"certificate-authority.name": {
60-
"defaultMessage": "نام"
61-
},
6259
"certificate.create": {
6360
"defaultMessage": "ایجاد گواهی"
6461
},
@@ -86,9 +83,6 @@
8683
"column.max-domains": {
8784
"defaultMessage": "دامنه در هر گواهی"
8885
},
89-
"column.name": {
90-
"defaultMessage": "نام"
91-
},
9286
"column.servers": {
9387
"defaultMessage": "Servers"
9488
},
@@ -140,7 +134,7 @@
140134
"dns-provider.create": {
141135
"defaultMessage": "ارائه دهنده DNS ایجاد کنید"
142136
},
143-
"dns-provider.name": {
137+
"name": {
144138
"defaultMessage": "نام"
145139
},
146140
"dns-providers.title": {

frontend/src/modals/AccessListCreateModal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@ function AccessListCreateModal({
9797
isInvalid={form.errors.name && form.touched.name}>
9898
<FormLabel htmlFor="name">
9999
{intl.formatMessage({
100-
id: "certificate-authority.name",
100+
id: "name",
101101
})}
102102
</FormLabel>
103103
<Input
104104
{...field}
105105
id="name"
106106
placeholder={intl.formatMessage({
107-
id: "certificate-authority.name",
107+
id: "name",
108108
})}
109109
/>
110110
<FormErrorMessage>{form.errors.name}</FormErrorMessage>

0 commit comments

Comments
 (0)