🐛 fix: Update server and web version update descriptions to remove version prefix for clarity
This commit is contained in:
parent
c5dbd97e19
commit
cbd6e29ded
@ -13,9 +13,9 @@
|
|||||||
"systemServices": "System Services",
|
"systemServices": "System Services",
|
||||||
"update": "Update",
|
"update": "Update",
|
||||||
"updateFailed": "Update failed",
|
"updateFailed": "Update failed",
|
||||||
"updateServerDescription": "Are you sure you want to update the server version from V{{current}} to V{{latest}}?",
|
"updateServerDescription": "Are you sure you want to update the server version from {{current}} to {{latest}}?",
|
||||||
"updateSuccess": "Update completed successfully",
|
"updateSuccess": "Update completed successfully",
|
||||||
"updateWebDescription": "Are you sure you want to update the web version from V{{current}} to V{{latest}}?",
|
"updateWebDescription": "Are you sure you want to update the web version from {{current}} to {{latest}}?",
|
||||||
"userUpdateSuccess": "User updated successfully",
|
"userUpdateSuccess": "User updated successfully",
|
||||||
"webVersion": "Web Version"
|
"webVersion": "Web Version"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -13,9 +13,9 @@
|
|||||||
"systemServices": "系统服务",
|
"systemServices": "系统服务",
|
||||||
"update": "更新",
|
"update": "更新",
|
||||||
"updateFailed": "更新失败",
|
"updateFailed": "更新失败",
|
||||||
"updateServerDescription": "确定要将服务器版本从 V{{current}} 更新到 V{{latest}} 吗?",
|
"updateServerDescription": "确定要将服务器版本从 {{current}} 更新到 {{latest}} 吗?",
|
||||||
"updateSuccess": "更新成功",
|
"updateSuccess": "更新成功",
|
||||||
"updateWebDescription": "确定要将前端版本从 V{{current}} 更新到 V{{latest}} 吗?",
|
"updateWebDescription": "确定要将前端版本从 {{current}} 更新到 {{latest}} 吗?",
|
||||||
"userUpdateSuccess": "用户端更新成功",
|
"userUpdateSuccess": "用户端更新成功",
|
||||||
"webVersion": "前端版本"
|
"webVersion": "前端版本"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -80,7 +80,6 @@ export default function SystemVersionCard() {
|
|||||||
staleTime: 0,
|
staleTime: 0,
|
||||||
retry: 1,
|
retry: 1,
|
||||||
});
|
});
|
||||||
console.log(webVersionInfo);
|
|
||||||
|
|
||||||
const updateServerMutation = useMutation({
|
const updateServerMutation = useMutation({
|
||||||
mutationFn: async (serviceName: string) => {
|
mutationFn: async (serviceName: string) => {
|
||||||
@ -199,7 +198,7 @@ export default function SystemVersionCard() {
|
|||||||
>
|
>
|
||||||
<Icon className="mr-1 h-3 w-3" icon="mdi:download" />
|
<Icon className="mr-1 h-3 w-3" icon="mdi:download" />
|
||||||
{hasWebNewVersion && webVersionInfo
|
{hasWebNewVersion && webVersionInfo
|
||||||
? `${t("update", "Update")} V${webVersionInfo.latest_version}`
|
? `${t("update", "Update")} ${webVersionInfo.latest_version}`
|
||||||
: t("update", "Update")}
|
: t("update", "Update")}
|
||||||
</Button>
|
</Button>
|
||||||
</AlertDialogTrigger>
|
</AlertDialogTrigger>
|
||||||
@ -212,9 +211,9 @@ export default function SystemVersionCard() {
|
|||||||
{webVersionInfo
|
{webVersionInfo
|
||||||
? t(
|
? t(
|
||||||
"updateWebDescription",
|
"updateWebDescription",
|
||||||
"Are you sure you want to update the web version from V{{current}} to V{{latest}}?",
|
"Are you sure you want to update the web version from {{current}} to {{latest}}?",
|
||||||
{
|
{
|
||||||
current: packageJson.version,
|
current: webVersionInfo.current_version,
|
||||||
latest: webVersionInfo.latest_version,
|
latest: webVersionInfo.latest_version,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@ -278,7 +277,7 @@ export default function SystemVersionCard() {
|
|||||||
{serverVersionInfo && moduleConfig
|
{serverVersionInfo && moduleConfig
|
||||||
? t(
|
? t(
|
||||||
"updateServerDescription",
|
"updateServerDescription",
|
||||||
"Are you sure you want to update the server version from V{{current}} to V{{latest}}?",
|
"Are you sure you want to update the server version from {{current}} to {{latest}}?",
|
||||||
{
|
{
|
||||||
current:
|
current:
|
||||||
moduleConfig.service_version ||
|
moduleConfig.service_version ||
|
||||||
|
|||||||
@ -193,7 +193,7 @@ request.interceptors.request.use(
|
|||||||
request.interceptors.response.use(
|
request.interceptors.response.use(
|
||||||
(response) => {
|
(response) => {
|
||||||
const { code } = response.data;
|
const { code } = response.data;
|
||||||
if (code !== 200) {
|
if (code !== 200 && code !== 0) {
|
||||||
handleError({
|
handleError({
|
||||||
data: response.data,
|
data: response.data,
|
||||||
config: {
|
config: {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user