Allow header prefix and name to be changed via env vars

Signed-off-by: Sean Sundberg <seansund@us.ibm.com>

Author: Sean Sundberg

config/config.js

@@ -27,6 +27,8 @@ const {
   // Secret
   APPID_CONFIG,
   OCP_OAUTH_CONFIG,
+  HEADER_PREFIX,
+  HEADER_NAME,
 } = process.env;
 
 console.log('NODE_ENV: ', NODE_ENV)
@@ -61,5 +63,7 @@ module.exports = {
   apiHost: API_HOST ?? 'http://localhost:3001',
   region: REGION ?? 'unknown',
   authProvider: OCP_OAUTH_CONFIG ? "openshift" : "appid",
-  authConfig: authConfig
+  authConfig: authConfig,
+  headerPrefix: HEADER_PREFIX,
+  headerName: HEADER_NAME,
 };

server/server.js

@@ -12,6 +12,7 @@ const config = require('../config/config');
   const LOGIN_URL = "/login";
   const LOGOUT_URL = "/logout";
   const CALLBACK_URL = "/login/callback";
+  const CONFIG_URL = "/config";
 
   const conf = {
     applicationUrl: config.externalUri,
@@ -115,6 +116,14 @@ const config = require('../config/config');
     if (req.session) console.log('test', req.session.redirectUrl);
     res.redirect(req.session?.redirectUrl ? req.session.redirectUrl : '/');
   }
+  app.get(CONFIG_URL, (req, res) => {
+    res.header("Content-Type", "application/json; charset=utf-8")
+    res.status(200);
+    res.json({
+      headerPrefix: config.headerPrefix,
+      headerName: config.headerName,
+    });
+  });
   app.get(CALLBACK_URL, passport.authenticate(config.authProvider), redirectAfterLogin);
   app.get(LOGIN_URL, passport.authenticate(config.authProvider), redirectAfterLogin);
   app.get(LOGOUT_URL, function (req, res, next) {

src/components/OverView.jsx

@@ -19,12 +19,12 @@ class OverView extends Component {
                 <Row className="compliance-page__row">
                     <Column lg={{span: 12}}>
                         <h2 style={{ margin: "30px 0" }} >
-                           TechZone Deployer
+                           Solution Deployer
                         </h2>
 
                         <p style={{ lineHeight: "20px" }}>
-                            The goal of this tool is to accelerate adoption of IBM Software on Hybrid-Cloud. TechZone Deployer drastically reduces the time and effort it takes
-                            to deploy solutions leveraging IBM Software on any Cloud, by providing a modular automation framework allowing users to build their
+                            The goal of this tool is to accelerate solution value in a hybrid-cloud landscape. Solution Deployer drastically reduces the time and effort it takes
+                            to deploy solutions on any cloud or on-premise infrastructure, by providing a modular automation framework allowing users to build their
                             custom solutions and automate their deployment using our solution builder features.
                             It simplifies the complexity of the data attributes that surround a reference architecture for enterprise workloads with regulatory compliance.
                             When we review the regulatory controls the number of cloud services and the possible reference

src/components/builder/solutions/CreateSolutionView.jsx

@@ -270,7 +270,7 @@ class CreateSolutionview extends Component {
                                                 </p>
                                                 <br />
                                                 <p>
-                                                    Then, you will have to pick the IBM Software cartridges you need as part of your solution, from individual components of IBM Cloud Paks,
+                                                    Then, you will have to pick the software cartridges you need as part of your solution, from individual components of IBM Cloud Paks,
                                                     Sustainability Software, or bringing your own custom Software tiles. Once you have completed all these steps you will be redirected to
                                                     your new solution and can download the automation to support the provisioning into your own environment.
                                                 </p>
@@ -417,7 +417,7 @@ class CreateSolutionview extends Component {
                                                         <form className="plans">
 
                                                             <div className="title">
-                                                                Now you have selected your reference architecture you will require some file storage for your IBM Software
+                                                                Now you have selected your reference architecture you will require some file storage for your software selections.
                                                             </div>
 
                                                             {
@@ -581,7 +581,7 @@ class CreateSolutionview extends Component {
 
                                             <div className="summary">
 
-                                                <p>You have chosen to create an IBM Technology solution called <strong>{this.state.fields?.name}</strong></p>
+                                                <p>You have chosen to create a solution called <strong>{this.state.fields?.name}</strong></p>
 
                                                 <div className='arch'>
                                                     <p>You want to <strong>{persona?.displayName}</strong> <img loading="lazy" src={persona?.iconUrl} alt={persona?.displayName ?? ""} /></p>
@@ -591,7 +591,7 @@ class CreateSolutionview extends Component {
                                                 </div>
 
                                                 <p>
-                                                    You have chosen the following IBM Software to help get your solution started:
+                                                    You have chosen the following software to help get your solution started:
                                                     <ul>
                                                         {software?.map(sw => (
                                                             <li key={sw.name}>{sw.displayName ?? sw.name}</li>

src/components/ui-shell/UIShell.jsx

@@ -45,7 +45,9 @@ class UIShell extends Component {
       patternName: "Overview",
       profileExpanded: false,
       content: defaultConfig,
-      notifications: []
+      notifications: [],
+      headerPrefix: '',
+      headerName: 'Solution Deployer'
     };
   }
 
@@ -121,6 +123,14 @@ class UIShell extends Component {
         }
       })
       .catch(console.error);
+
+    fetch('/config')
+      .then(res => res.json())
+      .then(config => {
+        if (config.headerPrefix !== undefined) this.setState({ headerPrefix: config.headerPrefix });
+        if (config.headerName !== undefined) this.setState({ headerName: config.headerName });
+      })
+      .catch(console.error);
   }
 
   fetchToken() {
@@ -145,7 +155,7 @@ class UIShell extends Component {
           render={({ isSideNavExpanded, onClickSideNavExpand }) => (
 
 
-            <Header aria-label="IBM">
+            <Header aria-label="CNTK">
 
               <SkipToContent />
 
@@ -155,8 +165,8 @@ class UIShell extends Component {
                 isActive={isSideNavExpanded}
               />
 
-              <HeaderName prefix={ApplicationMode.isFsControlsMode() ? 'IBM Cloud' : 'IBM Technology Zone'}>
-                {ApplicationMode.isFsControlsMode() ? 'Controls Catalog' : 'Deployer'}
+              <HeaderName prefix={this.state.headerPrefix}>
+                {this.state.headerName}
               </HeaderName>
 
               <HeaderNavigation aria-label="navigation">