Skip to content

Commit 2ee057a

Browse files
0xJacky0xJacky
committed
enhance(site): notification of sync
1 parent 497d5cd commit 2ee057a

File tree

21 files changed

+1336
-184
lines changed

21 files changed

+1336
-184
lines changed

‎app/src/components/Notification/config.ts‎

Lines changed: 67 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export function syncConfigError(text: string) {
88
const data = JSON.parse(text)
99

1010
if (data.status_code === 404) {
11-
return $gettext('Sync config %{config_name} to %{env_name} failed, please upgrade the remote Nginx UI to the latest version', { config_name: data.config_name, env_name: data.env_name }, true)
11+
return $gettext('Please upgrade the remote Nginx UI to the latest version')
1212
}
1313

1414
return $gettext('Sync config %{config_name} to %{env_name} failed, response: %{resp}', { config_name: data.cert_name, env_name: data.env_name, resp: data.resp_body }, true)
@@ -24,8 +24,73 @@ export function syncRenameConfigError(text: string) {
2424
const data = JSON.parse(text)
2525

2626
if (data.status_code === 404) {
27-
return $gettext('Rename %{orig_path} to %{new_path} on %{env_name} failed, please upgrade the remote Nginx UI to the latest version', { orig_path: data.orig_path, new_path: data.orig_path, env_name: data.env_name }, true)
27+
return $gettext('Please upgrade the remote Nginx UI to the latest version')
2828
}
2929

3030
return $gettext('Rename %{orig_path} to %{new_path} on %{env_name} failed, response: %{resp}', { orig_path: data.orig_path, new_path: data.orig_path, resp: data.resp_body, env_name: data.env_name }, true)
3131
}
32+
33+
export function saveSiteSuccess(text: string) {
34+
const data = JSON.parse(text)
35+
return $gettext('Save Site %{site} to %{node} successfully', { site: data.site, node: data.node })
36+
}
37+
38+
export function saveSiteError(text: string) {
39+
const data = JSON.parse(text)
40+
if (data.status_code === 404) {
41+
return $gettext('Please upgrade the remote Nginx UI to the latest version')
42+
}
43+
return $gettext('Save site %{site} to %{node} error, response: %{resp}', { site: data.name, node: data.node, resp: JSON.stringify(data.response) }, true)
44+
}
45+
46+
export function deleteSiteSuccess(text: string) {
47+
const data = JSON.parse(text)
48+
return $gettext('Remove Site %{site} from %{node} successfully', { site: data.name, node: data.node })
49+
}
50+
51+
export function deleteSiteError(text: string) {
52+
const data = JSON.parse(text)
53+
if (data.status_code === 404) {
54+
return $gettext('Please upgrade the remote Nginx UI to the latest version')
55+
}
56+
return $gettext('Remove site %{site} from %{node} error, response: %{resp}', { site: data.name, node: data.node, resp: JSON.stringify(data.response) }, true)
57+
}
58+
59+
export function enableSiteSuccess(text: string) {
60+
const data = JSON.parse(text)
61+
return $gettext('Enable Site %{site} on %{node} successfully', { site: data.name, node: data.node })
62+
}
63+
64+
export function enableSiteError(text: string) {
65+
const data = JSON.parse(text)
66+
if (data.status_code === 404) {
67+
return $gettext('Please upgrade the remote Nginx UI to the latest version')
68+
}
69+
return $gettext('Enable site %{site} on %{node} error, response: %{resp}', { site: data.name, node: data.node, resp: JSON.stringify(data.response) }, true)
70+
}
71+
72+
export function disableSiteSuccess(text: string) {
73+
const data = JSON.parse(text)
74+
return $gettext('Disable Site %{site} on %{node} successfully', { site: data.name, node: data.node })
75+
}
76+
77+
export function disableSiteError(text: string) {
78+
const data = JSON.parse(text)
79+
if (data.status_code === 404) {
80+
return $gettext('Please upgrade the remote Nginx UI to the latest version')
81+
}
82+
return $gettext('Disable site %{site} on %{node} error, response: %{resp}', { site: data.name, node: data.node, resp: JSON.stringify(data.response) }, true)
83+
}
84+
85+
export function renameSiteSuccess(text: string) {
86+
const data = JSON.parse(text)
87+
return $gettext('Rename Site %{site} to %{new_site} on %{node} successfully', { site: data.name, new_site: data.new_name, node: data.node })
88+
}
89+
90+
export function renameSiteError(text: string) {
91+
const data = JSON.parse(text)
92+
if (data.status_code === 404) {
93+
return $gettext('Please upgrade the remote Nginx UI to the latest version')
94+
}
95+
return $gettext('Rename Site %{site} to %{new_site} on %{node} error, response: %{resp}', { site: data.name, new_site: data.new_name, node: data.node, resp: JSON.stringify(data.response) }, true)
96+
}

‎app/src/components/Notification/detailRender.ts‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
import type { CustomRenderProps } from '@/components/StdDesign/StdDataDisplay/StdTableTransformer'
22
import { syncCertificateError, syncCertificateSuccess } from '@/components/Notification/cert'
33
import {
4+
deleteSiteError,
5+
deleteSiteSuccess,
6+
disableSiteError,
7+
disableSiteSuccess,
8+
enableSiteError,
9+
enableSiteSuccess,
10+
renameSiteError,
11+
renameSiteSuccess,
12+
saveSiteError,
13+
saveSiteSuccess,
414
syncConfigError,
515
syncConfigSuccess,
616
syncRenameConfigError,
@@ -17,6 +27,28 @@ export function detailRender(args: CustomRenderProps) {
1727
return syncRenameConfigSuccess(args.text)
1828
case 'Rename Remote Config Error':
1929
return syncRenameConfigError(args.text)
30+
31+
case 'Save Remote Site Success':
32+
return saveSiteSuccess(args.text)
33+
case 'Save Remote Site Error':
34+
return saveSiteError(args.text)
35+
case 'Delete Remote Site Success':
36+
return deleteSiteSuccess(args.text)
37+
case 'Delete Remote Site Error':
38+
return deleteSiteError(args.text)
39+
case 'Enable Remote Site Success':
40+
return enableSiteSuccess(args.text)
41+
case 'Enable Remote Site Error':
42+
return enableSiteError(args.text)
43+
case 'Disable Remote Site Success':
44+
return disableSiteSuccess(args.text)
45+
case 'Disable Remote Site Error':
46+
return disableSiteError(args.text)
47+
case 'Rename Remote Site Success':
48+
return renameSiteSuccess(args.text)
49+
case 'Rename Remote Site Error':
50+
return renameSiteError(args.text)
51+
2052
case 'Sync Config Success':
2153
return syncConfigSuccess(args.text)
2254
case 'Sync Config Error':

‎app/src/language/constants.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,15 @@ export const msg = [
4242

4343
$gettext('Sync Config Success'),
4444
$gettext('Sync Config Error'),
45+
46+
$gettext('Save Remote Site Success'),
47+
$gettext('Save Remote Site Error'),
48+
$gettext('Delete Remote Site Success'),
49+
$gettext('Delete Remote Site Error'),
50+
$gettext('Disable Remote Site Success'),
51+
$gettext('Disable Remote Site Error'),
52+
$gettext('Enable Remote Site Success'),
53+
$gettext('Enable Remote Site Error'),
54+
$gettext('Rename Remote Site Success'),
55+
$gettext('Rename Remote Site Error'),
4556
]

‎app/src/language/en/app.po‎

Lines changed: 117 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,16 @@ msgstr ""
549549
msgid "Delete Permanently"
550550
msgstr ""
551551

552+
#: src/language/constants.ts:49
553+
#, fuzzy
554+
msgid "Delete Remote Site Error"
555+
msgstr "Certificate is valid"
556+
557+
#: src/language/constants.ts:48
558+
#, fuzzy
559+
msgid "Delete Remote Site Success"
560+
msgstr "Certificate is valid"
561+
552562
#: src/views/site/site_list/SiteList.vue:68
553563
msgid "Delete site: %{site_name}"
554564
msgstr ""
@@ -617,6 +627,26 @@ msgstr "Disabled"
617627
msgid "Disable auto-renewal failed for %{name}"
618628
msgstr "Disable auto-renewal failed for %{name}"
619629

630+
#: src/language/constants.ts:51
631+
#, fuzzy
632+
msgid "Disable Remote Site Error"
633+
msgstr "Certificate is valid"
634+
635+
#: src/language/constants.ts:50
636+
#, fuzzy
637+
msgid "Disable Remote Site Success"
638+
msgstr "Certificate is valid"
639+
640+
#: src/components/Notification/config.ts:82
641+
#, fuzzy
642+
msgid "Disable site %{site} on %{node} error, response: %{resp}"
643+
msgstr "Saved successfully"
644+
645+
#: src/components/Notification/config.ts:74
646+
#, fuzzy
647+
msgid "Disable Site %{site} on %{node} successfully"
648+
msgstr "Saved successfully"
649+
620650
#: src/views/environment/envColumns.tsx:109
621651
#: src/views/environment/envColumns.tsx:92
622652
#: src/views/site/site_edit/SiteEdit.vue:177
@@ -813,6 +843,26 @@ msgstr "Enable auto-renewal failed for %{name}"
813843
msgid "Enable failed"
814844
msgstr "Enable failed"
815845

846+
#: src/language/constants.ts:53
847+
#, fuzzy
848+
msgid "Enable Remote Site Error"
849+
msgstr "Certificate is valid"
850+
851+
#: src/language/constants.ts:52
852+
#, fuzzy
853+
msgid "Enable Remote Site Success"
854+
msgstr "Certificate is valid"
855+
856+
#: src/components/Notification/config.ts:69
857+
#, fuzzy
858+
msgid "Enable site %{site} on %{node} error, response: %{resp}"
859+
msgstr "Saved successfully"
860+
861+
#: src/components/Notification/config.ts:61
862+
#, fuzzy
863+
msgid "Enable Site %{site} on %{node} successfully"
864+
msgstr "Saved successfully"
865+
816866
#: src/views/stream/components/Deploy.vue:41
817867
#, fuzzy
818868
msgid "Enable successfully"
@@ -1711,6 +1761,17 @@ msgstr ""
17111761
msgid "Please select at least one node!"
17121762
msgstr ""
17131763

1764+
#: src/components/Notification/config.ts:11
1765+
#: src/components/Notification/config.ts:27
1766+
#: src/components/Notification/config.ts:41
1767+
#: src/components/Notification/config.ts:54
1768+
#: src/components/Notification/config.ts:67
1769+
#: src/components/Notification/config.ts:80
1770+
#: src/components/Notification/config.ts:93
1771+
#, fuzzy
1772+
msgid "Please upgrade the remote Nginx UI to the latest version"
1773+
msgstr "Saved successfully"
1774+
17141775
#: src/views/environment/BatchUpgrader.vue:169
17151776
#: src/views/environment/BatchUpgrader.vue:222 src/views/system/Upgrade.vue:195
17161777
#: src/views/system/Upgrade.vue:246
@@ -1849,6 +1910,16 @@ msgstr ""
18491910
msgid "Remove"
18501911
msgstr ""
18511912

1913+
#: src/components/Notification/config.ts:56
1914+
#, fuzzy
1915+
msgid "Remove site %{site} from %{node} error, response: %{resp}"
1916+
msgstr "Saved successfully"
1917+
1918+
#: src/components/Notification/config.ts:48
1919+
#, fuzzy
1920+
msgid "Remove Site %{site} from %{node} successfully"
1921+
msgstr "Saved successfully"
1922+
18521923
#: src/views/preference/AuthSettings.vue:47
18531924
#: src/views/preference/components/Passkey.vue:50
18541925
#, fuzzy
@@ -1868,13 +1939,6 @@ msgstr "Saved successfully"
18681939
msgid "Rename"
18691940
msgstr "Username"
18701941

1871-
#: src/components/Notification/config.ts:27
1872-
#, fuzzy
1873-
msgid ""
1874-
"Rename %{orig_path} to %{new_path} on %{env_name} failed, please upgrade the "
1875-
"remote Nginx UI to the latest version"
1876-
msgstr "Saved successfully"
1877-
18781942
#: src/components/Notification/config.ts:30
18791943
#, fuzzy
18801944
msgid ""
@@ -1896,6 +1960,26 @@ msgstr "Certificate is valid"
18961960
msgid "Rename Remote Config Success"
18971961
msgstr "Certificate is valid"
18981962

1963+
#: src/language/constants.ts:55
1964+
#, fuzzy
1965+
msgid "Rename Remote Site Error"
1966+
msgstr "Certificate is valid"
1967+
1968+
#: src/language/constants.ts:54
1969+
#, fuzzy
1970+
msgid "Rename Remote Site Success"
1971+
msgstr "Certificate is valid"
1972+
1973+
#: src/components/Notification/config.ts:95
1974+
#, fuzzy
1975+
msgid "Rename Site %{site} to %{new_site} on %{node} error, response: %{resp}"
1976+
msgstr "Saved successfully"
1977+
1978+
#: src/components/Notification/config.ts:87
1979+
#, fuzzy
1980+
msgid "Rename Site %{site} to %{new_site} on %{node} successfully"
1981+
msgstr "Saved successfully"
1982+
18991983
#: src/views/config/components/Rename.vue:41
19001984
#, fuzzy
19011985
msgid "Rename successfully"
@@ -1992,6 +2076,26 @@ msgstr "Save Directive"
19922076
msgid "Save error %{msg}"
19932077
msgstr "Save error %{msg}"
19942078

2079+
#: src/language/constants.ts:47
2080+
#, fuzzy
2081+
msgid "Save Remote Site Error"
2082+
msgstr "Certificate is valid"
2083+
2084+
#: src/language/constants.ts:46
2085+
#, fuzzy
2086+
msgid "Save Remote Site Success"
2087+
msgstr "Certificate is valid"
2088+
2089+
#: src/components/Notification/config.ts:43
2090+
#, fuzzy
2091+
msgid "Save site %{site} to %{node} error, response: %{resp}"
2092+
msgstr "Saved successfully"
2093+
2094+
#: src/components/Notification/config.ts:35
2095+
#, fuzzy
2096+
msgid "Save Site %{site} to %{node} successfully"
2097+
msgstr "Saved successfully"
2098+
19952099
#: src/components/StdDesign/StdDataDisplay/StdBatchEdit.vue:47
19962100
#: src/components/StdDesign/StdDataDisplay/StdCurd.vue:117
19972101
#: src/views/certificate/CertificateEditor.vue:46
@@ -2209,13 +2313,6 @@ msgstr "Certificate is valid"
22092313
msgid "Sync Certificate Success"
22102314
msgstr "Certificate is valid"
22112315

2212-
#: src/components/Notification/config.ts:11
2213-
#, fuzzy
2214-
msgid ""
2215-
"Sync config %{config_name} to %{env_name} failed, please upgrade the remote "
2216-
"Nginx UI to the latest version"
2217-
msgstr "Saved successfully"
2218-
22192316
#: src/components/Notification/config.ts:14
22202317
#, fuzzy
22212318
msgid "Sync config %{config_name} to %{env_name} failed, response: %{resp}"
@@ -2648,6 +2745,12 @@ msgstr ""
26482745
msgid "Your passkeys"
26492746
msgstr ""
26502747

2748+
#, fuzzy
2749+
#~ msgid ""
2750+
#~ "Rename %{orig_path} to %{new_path} on %{env_name} failed, please upgrade "
2751+
#~ "the remote Nginx UI to the latest version"
2752+
#~ msgstr "Saved successfully"
2753+
26512754
#, fuzzy
26522755
#~ msgid "File not found"
26532756
#~ msgstr "File Not Found"

0 commit comments

Comments
 (0)