mirror of
https://github.com/Elysola/WebHooker.git
synced 2026-11-20 17:13:49 +00:00
fix(console): reject edits of stale routes
A conflict reload can leave an older route editor open. Compare its original value before saving so it cannot overwrite the newly loaded route.
This commit is contained in:
1 parent
6eb9cbab4e
commit
4fae01453c
2 files changed
+10
No files matched your search
@@ -968,6 +968,13 @@ async function onSave(route: Route): Promise<void> {
|
||||
try {
|
||||
let next: Route[];
|
||||
if (editing.value) {
|
||||
// The route must still be the one the editor opened: a version changed
|
||||
// by someone else meanwhile would otherwise be overwritten silently.
|
||||
const latest = groupRoutes.value.find((r) => r.id === editing.value!.id);
|
||||
if (!latest || JSON.stringify(latest) !== JSON.stringify(editing.value)) {
|
||||
push(t("toast.routeChanged"), "bad");
|
||||
return;
|
||||
}
|
||||
next = groupRoutes.value.map((r) => (r.id === editing.value!.id ? route : r));
|
||||
} else {
|
||||
if (groupRoutes.value.some((r) => r.id === route.id)) {
|
||||
|
||||
@@ -428,6 +428,8 @@ const en: Dict = {
|
||||
"toast.groupSaved": "Groups saved",
|
||||
"toast.groupDeleted": "Group deleted",
|
||||
"toast.routeIdExists": "Route ID already exists",
|
||||
"toast.routeChanged":
|
||||
"This route was changed by someone else since you opened it. Close the editor and open it again.",
|
||||
"toast.groupIdExists": "Group ID already exists",
|
||||
"toast.saveFailed": "Save failed: {msg}",
|
||||
"toast.deleteFailed": "Delete failed: {msg}",
|
||||
@@ -870,6 +872,7 @@ const zh: Dict = {
|
||||
"toast.groupSaved": "分组已保存",
|
||||
"toast.groupDeleted": "分组已删除",
|
||||
"toast.routeIdExists": "路由 ID 已存在",
|
||||
"toast.routeChanged": "该路由在你打开后已被他人修改。请关闭编辑器后重新打开。",
|
||||
"toast.groupIdExists": "分组 ID 已存在",
|
||||
"toast.saveFailed": "保存失败:{msg}",
|
||||
"toast.deleteFailed": "删除失败:{msg}",
|
||||
|
||||
Reference in new issue
Block a user