From 24e3a3abf6b0f9fac5fcdbc87de1069792105c3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
Date: Thu, 2 Sep 2021 15:45:21 +0200
Subject: [PATCH] Enhance base channel help message

---
 .../activation-key/activation-key-channels.tsx   | 16 ++++++++++++----
 web/spacewalk-web.changes                        |  1 +
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/web/html/src/manager/systems/activation-key/activation-key-channels.tsx b/web/html/src/manager/systems/activation-key/activation-key-channels.tsx
index 2cfcd779f60d..9e1a38c0d97d 100644
--- a/web/html/src/manager/systems/activation-key/activation-key-channels.tsx
+++ b/web/html/src/manager/systems/activation-key/activation-key-channels.tsx
@@ -2,6 +2,8 @@ import ChildChannels from "./child-channels";
 import ActivationKeyChannelsApi from "./activation-key-channels-api";
 import * as React from "react";
 import { Loading } from "components/utils/Loading";
+import { Messages } from "components/messages";
+import { Utils as MessagesUtils } from 'components/messages';
 import MandatoryChannelsApi from "core/channels/api/mandatory-channels-api";
 import { availableChannelsType, ChannelDto } from "./activation-key-channels-api";
 
@@ -79,6 +81,7 @@ class ActivationKeyChannels extends React.Component<ActivationKeyChannelsProps,
   };
 
   render() {
+    const defaultChannelName = this.getDefaultBase().name;
     return (
       <ActivationKeyChannelsApi
         onNewBaseChannel={this.onNewBaseChannel}
@@ -117,12 +120,17 @@ class ActivationKeyChannels extends React.Component<ActivationKeyChannelsProps,
                   </select>
                   <span className="help-block">
                     {t(
-                      'Choose "SUSE Manager Default" to allow systems to register to the default SUSE Manager ' +
-                        "provided channel that corresponds to the installed SUSE Linux version. Instead of the default, " +
-                        "you may choose a particular SUSE provided channel or a custom base channel, but if a system using " +
-                        "this key is not compatible with the selected channel, it will fall back to its SUSE Manager Default channel."
+                      `Selecting the "${defaultChannelName}" base channel enables a system to register to the ` +
+                      'correct channel that corresponds to the installed operating system. You can also select ' +
+                      'SUSE provided channels, or use custom base channels but if a system using such a channel ' +
+                      `is not compatible then the fall back will be the "${defaultChannelName}" channel.`
                     )}
                   </span>
+                  <Messages items={
+                      MessagesUtils.warning(t(`When "${this.getDefaultBase().name}" is selected and the installed ` +
+                                              'product is not detected, no channel will be added even if children ' +
+                                              'channels are selected.'))
+                  }/>
                 </div>
               </div>
               <div className="form-group">
diff --git a/web/spacewalk-web.changes b/web/spacewalk-web.changes
index 3dc023e4eea3..099c0e48e6ad 100644
--- a/web/spacewalk-web.changes
+++ b/web/spacewalk-web.changes
@@ -1,3 +1,4 @@
+- Enhance the default base channel help message (bsc#1171520)
 - Don't capitalize acronyms
 - 'AppStreams with defaults' filter template in CLM
 - Add a link to OS image store dir in image list page