Enhance base channel help message

calancha · Sep 3, 2021 · 24e3a3a · 24e3a3a
1 parent f754c07
commit 24e3a3a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 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
@@ -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
@@ -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