(skywalking-horizon-ui) branch main updated: admin(conflict): reframe the login prompt as a two-way version difference

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wu-sheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-horizon-ui.git


The following commit(s) were added to refs/heads/main by this push:
     new dbfa4d0  admin(conflict): reframe the login prompt as a two-way version difference
dbfa4d0 is described below

commit dbfa4d0d872e4df8e1e440e6d1955dbd52d169dd
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu May 21 21:46:55 2026 +0800

    admin(conflict): reframe the login prompt as a two-way version difference
    
    "Local template changes not published" implied the local side was always
    the edit. Divergence is symmetric (no timestamp comparison), so the title
    is now "Template versions differ from OAP" and the body notes OAP may have
    newer changes OR you have unpublished local edits — leading with the
    remote/live version. Drop the unverifiable "(newer)" claim on the confirm.
---
 apps/ui/src/shell/TemplateConflictPrompt.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/ui/src/shell/TemplateConflictPrompt.vue b/apps/ui/src/shell/TemplateConflictPrompt.vue
index 8a25d14..b766498 100644
--- a/apps/ui/src/shell/TemplateConflictPrompt.vue
+++ b/apps/ui/src/shell/TemplateConflictPrompt.vue
@@ -82,13 +82,13 @@ async function useLive(): Promise<void> {
   <Modal
     :open="open"
     :dismissable="false"
-    :title="confirmingRemote ? 'Use the live version?' : 'Local template changes not published'"
+    :title="confirmingRemote ? 'Use the live version?' : 'Template versions differ from OAP'"
   >
     <div v-if="!confirmingRemote" class="tcp">
       <p class="tcp__lede">
-        <b>{{ divergedCount }}</b> dashboard{{ divergedCount === 1 ? '' : 's' }} differ between your
-        <b>local</b> edits and what the OAP cluster currently serves (<b>remote</b>). Which version
-        should this session render?
+        <b>{{ divergedCount }}</b> dashboard{{ divergedCount === 1 ? '' : 's' }} differ between the
+        version OAP currently serves (<b>remote / live</b>) and your <b>local</b> copy — OAP may have
+        newer changes, or you have unpublished local edits. Which should this session render?
       </p>
       <ul class="tcp__list">
         <li v-for="(name, i) in divergedItems" :key="i">{{ name }}</li>
@@ -100,7 +100,7 @@ async function useLive(): Promise<void> {
     </div>
     <div v-else class="tcp">
       <p class="tcp__lede tcp__warn">
-        OAP holds a different (newer) version. Using live will <b>overwrite your
+        OAP holds a different version. Using live will <b>overwrite your
         {{ divergedCount }} local change{{ divergedCount === 1 ? '' : 's' }}</b> with the remote
         version — your local edits are <b>discarded and cannot be recovered</b>. Publish them with
         “Sync all to OAP” instead if you want to keep them. Override local with live?