Skip to content

Commit 1a9bc12

Browse files
committed
Activate changes: whichSites should be an array of sites affected
Change-Id: Ief9191c44f8e12904392bb0a323865afe08ea9f0
1 parent 59aed51 commit 1a9bc12

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

cmk/gui/watolib/activate_changes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@ class PendingChangesSummary(TypedDict):
10871087
changeText: str
10881088
user: str
10891089
time: float
1090-
whichSites: str
1090+
whichSites: list[str]
10911091

10921092

10931093
class ActivationChangesSummary(TypedDict):
@@ -1369,9 +1369,9 @@ def _get_site_version(site_id: SiteId) -> str:
13691369
changeText=unescape(change["text"]),
13701370
user=change["user_id"],
13711371
time=change["time"],
1372-
whichSites="All sites"
1372+
whichSites=["All sites"]
13731373
if affects_all_sites(list(activation_sites(sites)), change)
1374-
else ", ".join(sorted(change["affected_sites"])),
1374+
else change["affected_sites"],
13751375
)
13761376
for _, change in changes_that_require_activation
13771377
],

packages/cmk-frontend-vue/src/main-menu/ChangesApp.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,8 @@ onMounted(() => {
579579
<CmkZebra :num="idx">
580580
<CmkIndent
581581
v-if="
582-
change.whichSites === 'All sites' || selectedSites.includes(change.whichSites)
582+
change.whichSites.includes('All sites') ||
583+
change.whichSites.some((site) => selectedSites.includes(site))
583584
"
584585
class="cmk-indent-pending-change-container"
585586
:class="{ 'red-text': change.user !== user_name && change.user !== null }"
@@ -593,7 +594,7 @@ onMounted(() => {
593594
<div class="cmk-div-user-sites-timestamp">
594595
<span>{{ change.user }}</span>
595596
<span>|</span>
596-
<span>{{ change.whichSites }}</span>
597+
<span>{{ change.whichSites.join(', ') }}</span>
597598
</div>
598599
<span>{{ change.timestring }}</span>
599600
</div>

packages/cmk-frontend-vue/src/main-menu/ChangesInterfaces.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export interface PendingChanges {
6060
changeText: string
6161
user: string
6262
time: number
63-
whichSites: string
63+
whichSites: Array<string>
6464
timestring?: string
6565
}
6666

0 commit comments

Comments
 (0)