Skip to content

Commit ecc3b2b

Browse files
jc21jc21
committed
Fixed frontend issues, switched back to nginxproxymanager dockerhub space
1 parent ae95045 commit ecc3b2b

26 files changed

+304
-1106
lines changed

‎docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file assumes that these scripts have been run first:
55
# - ./scripts/ci/build-frontend
66

7-
FROM jc21/testca as testca
7+
FROM nginxproxymanager/testca as testca
88
FROM letsencrypt/pebble as pebbleca
99
FROM jc21/gotools:latest AS gobuild
1010

@@ -32,7 +32,7 @@ RUN mkdir -p /dist \
3232
# Final image
3333
#===============
3434

35-
FROM jc21/nginx-full:acmesh AS final
35+
FROM nginxproxymanager/nginx-full:acmesh AS final
3636

3737
COPY --from=gobuild /dist/server /app/bin/server
3838
COPY --from=gobuild /dist/ipranges /app/bin/ipranges

‎docker/dev/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM jc21/testca as testca
1+
FROM nginxproxymanager/testca as testca
22
FROM letsencrypt/pebble as pebbleca
3-
FROM jc21/nginx-full:acmesh-golang
3+
FROM nginxproxymanager/nginx-full:acmesh-golang
44
LABEL maintainer="Jamie Curnow <[email protected]>"
55

66
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

‎frontend/src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function App() {
2222
<Router />
2323
</AuthProvider>
2424
</ChakraProvider>
25-
<ReactQueryDevtools position="bottom-right" panelPosition="right" />
25+
<ReactQueryDevtools buttonPosition="bottom-right" position="right" />
2626
</QueryClientProvider>
2727
</LocaleProvider>
2828
</RawIntlProvider>

‎frontend/src/components/SiteWrapper.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function SiteWrapper({ children }: Props) {
2727
const j: SSEMessage = JSON.parse(e.data);
2828
if (j) {
2929
if (j.affects) {
30-
queryClient.invalidateQueries([j.affects]);
30+
queryClient.invalidateQueries({ queryKey: [j.affects] });
3131
}
3232
if (j.type) {
3333
toast({

‎frontend/src/hooks/useAccessLists.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ const useAccessLists = (
3131
return useQuery<AccessListsResponse, Error>({
3232
queryKey: ["access-lists", { offset, limit, sortBy, filters }],
3333
queryFn: () => fetchAccessLists(offset, limit, sortBy, filters),
34-
keepPreviousData: true,
3534
staleTime: 15 * 1000, // 15 seconds
3635
...options,
3736
});

‎frontend/src/hooks/useCertificate.ts

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,34 +22,32 @@ const useCertificate = (id: number, options = {}) => {
2222

2323
const useSetCertificate = () => {
2424
const queryClient = useQueryClient();
25-
return useMutation(
26-
(values: Certificate) => {
25+
return useMutation({
26+
mutationFn: (values: Certificate) => {
2727
return values.id
2828
? setCertificate(values.id, values)
2929
: createCertificate(values);
3030
},
31-
{
32-
onMutate: (values) => {
33-
const previousObject = queryClient.getQueryData([
34-
"certificate",
35-
values.id,
36-
]);
31+
onMutate: (values: Certificate) => {
32+
const previousObject = queryClient.getQueryData([
33+
"certificate",
34+
values.id,
35+
]);
3736

38-
queryClient.setQueryData(["certificate", values.id], (old: any) => ({
39-
...old,
40-
...values,
41-
}));
37+
queryClient.setQueryData(["certificate", values.id], (old: any) => ({
38+
...old,
39+
...values,
40+
}));
4241

43-
return () =>
44-
queryClient.setQueryData(["certificate", values.id], previousObject);
45-
},
46-
onError: (_, __, rollback: any) => rollback(),
47-
onSuccess: async ({ id }: Certificate) => {
48-
queryClient.invalidateQueries(["certificate", id]);
49-
queryClient.invalidateQueries(["certificates"]);
50-
},
42+
return () =>
43+
queryClient.setQueryData(["certificate", values.id], previousObject);
5144
},
52-
);
45+
onError: (_, __, rollback: any) => rollback(),
46+
onSuccess: async ({ id }: Certificate) => {
47+
queryClient.invalidateQueries({ queryKey: ["certificate", id] });
48+
queryClient.invalidateQueries({ queryKey: ["certificates"] });
49+
},
50+
});
5351
};
5452

5553
export { useCertificate, useSetCertificate };

‎frontend/src/hooks/useCertificateAuthorities.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ const useCertificateAuthorities = (
3131
return useQuery<CertificateAuthoritiesResponse, Error>({
3232
queryKey: ["certificate-authorities", { offset, limit, sortBy, filters }],
3333
queryFn: () => fetchCertificateAuthorities(offset, limit, sortBy, filters),
34-
keepPreviousData: true,
3534
staleTime: 15 * 1000, // 15 seconds
3635
...options,
3736
});

‎frontend/src/hooks/useCertificateAuthority.ts

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,40 +22,42 @@ const useCertificateAuthority = (id: number, options = {}) => {
2222

2323
const useSetCertificateAuthority = () => {
2424
const queryClient = useQueryClient();
25-
return useMutation(
26-
(values: CertificateAuthority) => {
25+
return useMutation({
26+
mutationFn: (values: CertificateAuthority) => {
2727
return values.id
2828
? setCertificateAuthority(values.id, values)
2929
: createCertificateAuthority(values);
3030
},
31-
{
32-
onMutate: (values) => {
33-
const previousObject = queryClient.getQueryData([
34-
"certificate-authority",
35-
values.id,
36-
]);
31+
onMutate: (values: CertificateAuthority) => {
32+
const previousObject = queryClient.getQueryData([
33+
"certificate-authority",
34+
values.id,
35+
]);
3736

37+
queryClient.setQueryData(
38+
["certificate-authority", values.id],
39+
(old: any) => ({
40+
...old,
41+
...values,
42+
}),
43+
);
44+
45+
return () =>
3846
queryClient.setQueryData(
3947
["certificate-authority", values.id],
40-
(old: any) => ({
41-
...old,
42-
...values,
43-
}),
48+
previousObject,
4449
);
45-
46-
return () =>
47-
queryClient.setQueryData(
48-
["certificate-authority", values.id],
49-
previousObject,
50-
);
51-
},
52-
onError: (_, __, rollback: any) => rollback(),
53-
onSuccess: async ({ id }: CertificateAuthority) => {
54-
queryClient.invalidateQueries(["certificate-authority", id]);
55-
queryClient.invalidateQueries(["certificate-authorities"]);
56-
},
5750
},
58-
);
51+
onError: (_: any, __: any, rollback: any) => rollback(),
52+
onSuccess: async ({ id }: CertificateAuthority) => {
53+
queryClient.invalidateQueries({
54+
queryKey: ["certificate-authority", id],
55+
});
56+
queryClient.invalidateQueries({
57+
queryKey: ["certificate-authorities"],
58+
});
59+
},
60+
});
5961
};
6062

6163
export { useCertificateAuthority, useSetCertificateAuthority };

‎frontend/src/hooks/useCertificates.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ const useCertificates = (
3131
return useQuery<CertificatesResponse, Error>({
3232
queryKey: ["certificates", { offset, limit, sortBy, filters }],
3333
queryFn: () => fetchCertificates(offset, limit, sortBy, filters),
34-
keepPreviousData: true,
3534
staleTime: 15 * 1000, // 15 seconds
3635
...options,
3736
});

‎frontend/src/hooks/useDNSProvider.ts

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,34 +22,32 @@ const useDNSProvider = (id: number, options = {}) => {
2222

2323
const useSetDNSProvider = () => {
2424
const queryClient = useQueryClient();
25-
return useMutation(
26-
(values: DNSProvider) => {
25+
return useMutation({
26+
mutationFn: (values: DNSProvider) => {
2727
return values.id
2828
? setDNSProvider(values.id, values)
2929
: createDNSProvider(values);
3030
},
31-
{
32-
onMutate: (values) => {
33-
const previousObject = queryClient.getQueryData([
34-
"dns-provider",
35-
values.id,
36-
]);
31+
onMutate: (values: DNSProvider) => {
32+
const previousObject = queryClient.getQueryData([
33+
"dns-provider",
34+
values.id,
35+
]);
3736

38-
queryClient.setQueryData(["dns-provider", values.id], (old: any) => ({
39-
...old,
40-
...values,
41-
}));
37+
queryClient.setQueryData(["dns-provider", values.id], (old: any) => ({
38+
...old,
39+
...values,
40+
}));
4241

43-
return () =>
44-
queryClient.setQueryData(["dns-provider", values.id], previousObject);
45-
},
46-
onError: (_, __, rollback: any) => rollback(),
47-
onSuccess: async ({ id }: DNSProvider) => {
48-
queryClient.invalidateQueries(["dns-provider", id]);
49-
queryClient.invalidateQueries(["dns-providers"]);
50-
},
42+
return () =>
43+
queryClient.setQueryData(["dns-provider", values.id], previousObject);
5144
},
52-
);
45+
onError: (_, __, rollback: any) => rollback(),
46+
onSuccess: async ({ id }: DNSProvider) => {
47+
queryClient.invalidateQueries({ queryKey: ["dns-provider", id] });
48+
queryClient.invalidateQueries({ queryKey: ["dns-providers"] });
49+
},
50+
});
5351
};
5452

5553
export { useDNSProvider, useSetDNSProvider };

0 commit comments

Comments
 (0)