Skip to content

Commit

Permalink
Merge pull request #252 from aalves08/224-backport-2.x
Browse files Browse the repository at this point in the history
[backport 2.x] Add copy to Inventory of Machines Selector Template to warn users about machine count
  • Loading branch information
aalves08 authored Dec 11, 2024
2 parents fd69e7f + c90ea71 commit 5460f71
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions pkg/elemental/l10n/en-us.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ elemental:
machineReg: Registration Endpoint
machineInv: Inventory of Machines
clusterGroup:
helper: The Machine Count total, even if divided by multiple Machines Pools, must match the total amount of Inventory of Machines; otherwise, some Inventory of Machines might not report back if this condition isn't met.
selector:
label: Inventory of Machines Selector Template
matchesAll: Matches all {total, number} existing Inventory of Machines
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,16 @@ export default {
<template>
<div>
<h2 v-t="'elemental.clusterGroup.selector.label'" class="mt-20 mb-20" />
<h2 v-t="'elemental.clusterGroup.selector.label'" class="mt-20 mb-5" />
<p class="user-warn mb-20">{{ t('elemental.clusterGroup.helper', {}, true) }}</p>
<MatchExpressions
:mode="mode"
:type="elementalType"
:value="expressions"
:show-remove="false"
:keys-select-options="machineInventorySelectorKeyOptions"
@input="matchChanged($event)"
class="mb-40"
/>
<Banner v-if="matchingMachineInventories" :color="(matchingMachineInventories.isNone || matchingMachineInventories.isAll ? 'warning' : 'success')">
<span v-if="matchingMachineInventories.isAll" v-clean-html="t('elemental.clusterGroup.selector.matchesAll', matchingMachineInventories)" />
Expand All @@ -132,3 +134,10 @@ export default {
</Banner>
</div>
</template>
<style lang="scss" scoped>
.user-warn {
font-size: 13px;
color: var(--darker);
}
</style>

0 comments on commit 5460f71

Please sign in to comment.