fix(dashboards): keep the user's edit when a dashboard save conflicts (#15272)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2026-11-04 00:08:55 +00:00 · 2026-10-15 12:14:06 +00:00
parent 7366654175
commit 00be51d925
48 changed files with 5665 additions and 247 deletions
@@ -8715,6 +8715,103 @@
    "rowsPerPage": "7051b8bbc62daa11",
    "rowsPerPageTooltip": "d42813bc4029d08c",
    "save": "1509f561f2416598",
+    "saveConflict": {
+      "added": "6b02e0d363a4af1c",
+      "back": "76900f1bfd16c8d4",
+      "baseUnknown": "480eac3e6d29656a",
+      "cannotUndo": "60dddbb0d7da619b",
+      "change": {
+        "addedPanel": "7098801c586ed504",
+        "addedTab": "cb7fad087532ea61",
+        "addedVariable": "350dca9cf38274ae",
+        "changedSettings": "26127bbdf241622a",
+        "deletedPanel": "a50304674b885cc6",
+        "deletedTab": "c78719d42bac493b",
+        "deletedVariable": "fad1535ad646f772",
+        "duplicatedPanel": "fb655f96a306503c",
+        "editedJson": "632803d315a57f07",
+        "editedPanel": "4f766fd42b7f8cd5",
+        "editedVariable": "8ec9fb3a37c2447a",
+        "movedPanel": "24bd9df76a579cd7",
+        "movedPanels": "0df6c34650203df2",
+        "renamedTab": "bc28269c39f535b6",
+        "reorderedTabs": "95117e97b0254bfc",
+        "reorderedVariables": "d5ddaaeea52bdfbd"
+      },
+      "changed": "2a6141e43be0c212",
+      "checking": "b185ea5c5812bae4",
+      "chipAdded": "114b07dc4f0098c6",
+      "chipChanged": "872f328c67d0e691",
+      "chipRemoved": "ddb33a0af03980a3",
+      "compareDifferent": "e9cdbd4dd56c72ee",
+      "compareField": "513b6492ecabdf1b",
+      "compareOther": "6e1332d2beadc5e5",
+      "compareRemoved": "14d8c0464d8ace89",
+      "compareSame": "81696990fe98a4e6",
+      "compareTheirs": "5a8edce3d938a735",
+      "compareTitle": "7e8cd2056da73a7f",
+      "compareYours": "f06cf159ad184289",
+      "discard": "eb1a70e39274bb76",
+      "impactDeletesEdited": "7540f8a22fa5a591",
+      "impactNothing": "475b333880f1ccf5",
+      "impactRemoves": "83fd0fd4a70b16e9",
+      "impactRestores": "d553afe4e038e667",
+      "impactReverts": "ff270b04233ccc13",
+      "impactSettings": "8b34014903265465",
+      "impactUnknown": "31f9bb1938e08712",
+      "kindPanel": "d0d91173008b6f83",
+      "kindSettings": "74a883a037bc227f",
+      "kindTab": "90ddf1963abb36c9",
+      "kindVariable": "e57e998726030b84",
+      "loadFailed": "9e9a4f3fef3ffcaa",
+      "merge": "8851aaa7d08ca1ae",
+      "mergeHint": "41ab12a53d84f6a9",
+      "mergeUnavailable": "f1291f97f5626bcb",
+      "notSaved": "790b38476d4b0216",
+      "notSavedChange": "062694f1d1e3b14f",
+      "nothingChanged": "31ef1ec561f045f7",
+      "overwrite": "b24963ea2cbc74b9",
+      "overwriteHint": "5aedc235b36f4cf3",
+      "overwriteRemoves": "03a71af16a95d5a3",
+      "overwriteReplaces": "a9e53ada6f12492d",
+      "panelCount": "31bbca679806b213",
+      "panelTouched": "a55dccd5fe284ca9",
+      "panelUntouched": "5cd59d9f7b6b8782",
+      "reload": "bdc090ec61e3fcfc",
+      "reloadHint": "f6c7666119f2d326",
+      "removeAndOverwrite": "5bc78f15a6f5e7cb",
+      "removed": "4118fb4fed0ecec9",
+      "renamedFrom": "4e0dcf51229a8632",
+      "resolve": "c8f193b315c86f3a",
+      "retry": "942087cc2d41e013",
+      "reviewHeading": "a13adc0e28fa4e42",
+      "reviewIntro": "3c26880bc574d061",
+      "saveFailed": "6b6f39aaececd86c",
+      "saveMerged": "b0176cce401c4ef4",
+      "savedAgain": "46ea08fa62731e0b",
+      "savedBy": "819451b3c7070d7b",
+      "savedByUnknown": "2c7c2326901bfe39",
+      "settingDescription": "c9046f7a37ad0ea7",
+      "settingDynamicFilters": "245d0fe3e84c969f",
+      "settingOther": "252d9e8941fc5d7a",
+      "settingTimeRange": "c7eab79536307e8c",
+      "settingTitle": "82a3537ff0dbce7e",
+      "stillUnresolved": "2c973039944aba05",
+      "tabCount": "61293d125134f7ec",
+      "tagTheirsEdited": "3350a34d59d03201",
+      "tagTheirsNew": "dd342050994d94f6",
+      "tagYours": "54b26f7d3d0ddc66",
+      "title": "8a8e2856aad142a8",
+      "toastMergeDiscarded": "9a2291b3fbe47831",
+      "toastMerged": "1bb862312db686fe",
+      "toastOverwritten": "c10a190bbb1f494a",
+      "toastOverwrittenNoTime": "330e479ef39af32d",
+      "toastReloaded": "33c3dc8525b71ef3",
+      "toastReloadedChange": "1bb408f1b60f0134",
+      "variableCount": "ebdcd13cca777a5f",
+      "whatChanged": "b76bcc96e0656c0d",
+      "yourChange": "95a544905acdb687"
+    },
    "scatter": "4720c0c3df2ea08e",
    "scatterLabel": "4720c0c3df2ea08e",
    "scheduledDashboards": "ce101109fb9453cb",