From dd0813101c572f9e4b77f713e5c2663bc7e1d607 Mon Sep 17 00:00:00 2001
From: Mohit Suman <mohit.skn@gmail.com>
Date: Fri, 17 Jun 2022 01:42:33 +0530
Subject: [PATCH 1/3] add support for OpenShift local 2.4.1

Signed-off-by: Mohit Suman <mohit.skn@gmail.com>
---
 src/webview/cluster/app/cluster.tsx     |  8 +++----
 src/webview/cluster/app/clusterView.tsx | 31 ++++++++++++-------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/webview/cluster/app/cluster.tsx b/src/webview/cluster/app/cluster.tsx
index 72ad3fd93..0cef0257e 100644
--- a/src/webview/cluster/app/cluster.tsx
+++ b/src/webview/cluster/app/cluster.tsx
@@ -27,18 +27,18 @@ const useStyles = makeStyles(clusterStyle);
 const clusterTypes = [
   {
     heading: 'Deploy it locally on your laptop',
-    description: 'Install on Laptop: Red Hat CodeReady Containers.',
+    description: 'Install on Laptop: Red Hat OpenShift Local(formerly Red Hat CodeReady Containers)',
     smallInfo: 'Create a minimal OpenShift 4 cluster on your desktop/laptop for local development and testing.',
     imageUrl: ['https://www.openshift.com/hubfs/images/icons/Icon-Red_Hat-Hardware-Laptop-A-Black-RGB.svg'],
     urlAlt: 'crc',
     redirectLink: '',
     buttonText: 'Create/Refresh cluster',
-    tooltip: 'You can create/run local OpenShift 4 cluster using this wizard.'
+    tooltip: 'Create/Run local OpenShift 4 cluster using the guided workflow'
   },
   {
     heading: 'Launch Developer Sandbox',
     description: 'Free access to the Developer Sandbox for Red Hat OpenShift',
-    smallInfo: 'The sandbox provides you with a private OpenShift environment in a shared, multi-tenant OpenShift cluster that is pre-configured with a set of developer tools.',
+    smallInfo: 'If you are exploring how to run your code as containers in OpenShift, our free Developer Sandbox instantly gives you a way to try it out.',
     imageUrl: ['https://assets.openshift.com/hubfs/images/logos/osh/Logo-Red_Hat-OpenShift-A-Standard-RGB.svg'],
     urlAlt: 'dev sandbox',
     redirectLink: '',
@@ -151,7 +151,7 @@ export default function Header() {
                 <div className={classes.rowBody}>
                     <Card className={classes.cardContent}>
                         <Typography variant="body2" component="p" style={{ padding: 20 }}>
-                            Red Hat CodeReady Containers brings a minimal OpenShift 4 cluster to your local computer.<br></br>You can use this wizard to create OpenShift cluster locally. Cluster take approximately 15 minutes to provision.
+                            Red Hat OpenShift Local brings a minimal OpenShift 4 cluster to your local computer.<br></br>You can use this guided workflow to create OpenShift cluster locally. Cluster take approximately 15 minutes to provision.
                         </Typography>
                         <AddClusterView vscode={vscodeApi} />
                     </Card>
diff --git a/src/webview/cluster/app/clusterView.tsx b/src/webview/cluster/app/clusterView.tsx
index 34e3c8b34..f5aa58d12 100644
--- a/src/webview/cluster/app/clusterView.tsx
+++ b/src/webview/cluster/app/clusterView.tsx
@@ -53,14 +53,14 @@ const crcDefaults = {
 
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 function getSteps() {
-  return ['CodeReady Containers archive', 'File path of image pull secret', 'Select optional configurations', 'Setup CRC', 'Start the cluster'];
+  return ['Download OpenShift Local', 'File path of image pull secret', 'Select optional configurations', 'Setup OpenShift Local', 'Start the cluster'];
 }
 
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 export default function addClusterView(props) {
   const classes = useStyles();
-  const crcLatest = '1.40.0';
-  const crcOpenShift = '4.9.18';
+  const crcLatest = '2.4.1';
+  const crcOpenShift = '4.10.14';
   const [fileName, setBinaryPath] = React.useState('');
   const [pullSecretPath, setSecret] = React.useState('');
   const [cpuSize, setCpuSize] = React.useState(crcDefaults.DefaultCPUs);
@@ -218,7 +218,7 @@ export default function addClusterView(props) {
   };
 
   const handleDisabled = () => {
-    return (activeStep === 1 && fileName === '') 
+    return (activeStep === 1 && fileName === '')
         || (activeStep === 2 && pullSecretPath === '');
   };
 
@@ -226,7 +226,7 @@ export default function addClusterView(props) {
     setStopProgress(true);
     setCrcStopError(false);
     props.vscode.postMessage({
-        action: 'crcStop', 
+        action: 'crcStop',
         data: {
             tool: fileName
         }
@@ -339,7 +339,7 @@ export default function addClusterView(props) {
         <div className={classes.column}>
           <List dense>
             <ListItem>
-              <ListItemText primary={<span>CodeReady Containers Status: {status.crcStatus}</span>}/>
+              <ListItemText primary={<span>OpenShift Local Status: {status.crcStatus}</span>}/>
             </ListItem>
             <ListItem>
               <ListItemText primary={<span>OpenShift Status: {status.openshiftStatus}</span>}/>
@@ -396,7 +396,7 @@ export default function addClusterView(props) {
     )}
     {(statusSkeleton && !statusError) && (
       <div>
-        <Typography paragraph>Refreshing the crc status</Typography>
+        <Typography paragraph>Refreshing the OpenShift Local status</Typography>
         <LinearProgress />
       </div>
     )}
@@ -461,7 +461,7 @@ export default function addClusterView(props) {
         case 0:
           return (
             <div>
-              <Typography>Download and extract the CodeReady Containers archive for your operating system and place the executable in your $PATH</Typography>
+              <Typography>Download and open the OpenShift Local file. Opening the file will automatically start a step-by-step installation guide.</Typography>
               <List className={classes.uploadLabel}>
                 <ListItem>
                   <ListItemAvatar>
@@ -471,15 +471,14 @@ export default function addClusterView(props) {
                   </ListItemAvatar>
                   <ListItemText
                     primary="Download"
-                    secondary={<span>This will download the CodeReady Containers {crcLatest} archive</span>}/>
+                    secondary={<span>This will download OpenShift local {crcLatest}</span>}/>
                     <a href={fetchDownloadBinary()} style={{ textDecoration: 'none'}}>
                       <Button
                         color="default"
                         component="span"
                         className={classes.button}
-                        startIcon={<GetApp />}
                       >
-                        Download
+                        Download OpenShift Local
                       </Button>
                     </a>
                 </ListItem>
@@ -492,7 +491,7 @@ export default function addClusterView(props) {
                   </ListItemAvatar>
                   <ListItemText
                     primary={<span>Executable Location<sup style={{color: '#BE0000'}}>*</sup></span>}
-                    secondary={<span>Provide the CodeReady Containers {crcLatest} executable location</span>} />
+                    secondary={<span>Provide the OpenShift Local {crcLatest} executable location</span>} />
                   <div>
                     <input
                     style={{ display: 'none' }}
@@ -612,7 +611,7 @@ export default function addClusterView(props) {
             <List>
               <ListItem>
               <ListItemText
-                primary={<span>Set up your host operating system for the CodeReady Containers virtual machine</span>}
+                primary={<span>Set up your host operating system for the OpenShift Local virtual machine</span>}
                 secondary={<span>Once the setup process is successful, then proceed to start the cluster in Next step.</span>} />
                 <Button
                   onClick={handleCrcSetup}
@@ -624,7 +623,7 @@ export default function addClusterView(props) {
         case 4:
           return (
             <Typography>
-              Start the cluster. This will create a minimal OpenShift {crcOpenShift} cluster to your local computer.
+              Start the cluster. This will create a minimal OpenShift {crcOpenShift} cluster on your computer.
             </Typography>)
         default:
           return 'Unknown step';
@@ -635,7 +634,7 @@ export default function addClusterView(props) {
     <Paper elevation={3}>
       <blockquote className={classes.blockquoteText}>
         <Typography variant="body2" component="p" style={{textAlign: 'center'}}>
-          Install OpenShift {crcOpenShift} on your system using CodeReady Containers {crcLatest}.
+          Install OpenShift {crcOpenShift} on your system using OpenShift Local {crcLatest}.
         </Typography>
       </blockquote>
       <Stepper activeStep={activeStep} orientation="vertical">
@@ -697,7 +696,7 @@ export default function addClusterView(props) {
           <Paper square elevation={3} className={classes.resetContainer}>
             <blockquote className={classes.blockquoteText}>
               <Typography variant='body2'>
-                CRC configuration is detected in workspace settings. If you need to setup a new CRC instance, click on Reset and proceed with wizard workflow.
+                OpenShift Local configuration is detected in workspace settings. If you need to setup a new OpenShift Local instance, click on Reset and proceed with guided workflow.
               </Typography>
             </blockquote>
             <StartStopLoader />

From 06a842e7da50aaae1cedd29d37b00461ab6886f2 Mon Sep 17 00:00:00 2001
From: Denis Golovin <dgolovin@users.noreply.github.com>
Date: Thu, 16 Jun 2022 19:34:02 -0700
Subject: [PATCH 2/3] Fix description

---
 src/webview/cluster/app/cluster.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webview/cluster/app/cluster.tsx b/src/webview/cluster/app/cluster.tsx
index 0cef0257e..2534dde3c 100644
--- a/src/webview/cluster/app/cluster.tsx
+++ b/src/webview/cluster/app/cluster.tsx
@@ -27,7 +27,7 @@ const useStyles = makeStyles(clusterStyle);
 const clusterTypes = [
   {
     heading: 'Deploy it locally on your laptop',
-    description: 'Install on Laptop: Red Hat OpenShift Local(formerly Red Hat CodeReady Containers)',
+    description: 'Install on Laptop: Red Hat OpenShift Local (formerly Red Hat CodeReady Containers)',
     smallInfo: 'Create a minimal OpenShift 4 cluster on your desktop/laptop for local development and testing.',
     imageUrl: ['https://www.openshift.com/hubfs/images/icons/Icon-Red_Hat-Hardware-Laptop-A-Black-RGB.svg'],
     urlAlt: 'crc',

From 43d3a6b2083ea1ccf710514f369773892986e038 Mon Sep 17 00:00:00 2001
From: Denis Golovin <dgolovin@users.noreply.github.com>
Date: Thu, 16 Jun 2022 19:37:23 -0700
Subject: [PATCH 3/3] Fix OpenShift Local caps in product name

---
 src/webview/cluster/app/clusterView.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/webview/cluster/app/clusterView.tsx b/src/webview/cluster/app/clusterView.tsx
index f5aa58d12..e9111ca62 100644
--- a/src/webview/cluster/app/clusterView.tsx
+++ b/src/webview/cluster/app/clusterView.tsx
@@ -471,7 +471,7 @@ export default function addClusterView(props) {
                   </ListItemAvatar>
                   <ListItemText
                     primary="Download"
-                    secondary={<span>This will download OpenShift local {crcLatest}</span>}/>
+                    secondary={<span>This will download OpenShift Local {crcLatest}</span>}/>
                     <a href={fetchDownloadBinary()} style={{ textDecoration: 'none'}}>
                       <Button
                         color="default"
@@ -708,4 +708,4 @@ export default function addClusterView(props) {
       )}
     </div>
   );
-}
\ No newline at end of file
+}