Allow Cluster editor open on crc or sandbox page

dgolovin · JessicaJHee · commit 41792050f4a8 · 2023-06-08T16:28:39.000-04:00
Signed-off-by: Denis Golovin dgolovin@redhat.com
diff --git a/src/cloud-provider/redhat-cloud-provider.ts b/src/cloud-provider/redhat-cloud-provider.ts
@@ -100,8 +100,7 @@ class RedHatTreeDataProvier implements vscode.TreeDataProvider<RedHatCloudItem>
 
     @vsCommand('openshift.local.open.setup')
     static async openCrCWizard(): Promise<void> {
-        const webViewPanel: vscode.WebviewPanel = await ClusterViewLoader.loadView('Add OpenShift Cluster');
-        await webViewPanel.webview.postMessage({data: {param:'crc'}});
+        await ClusterViewLoader.loadView('Add OpenShift Cluster', 'crc');
     }
 
     @vsCommand('cloud.redhat.login', false)
@@ -124,7 +123,6 @@ class RedHatTreeDataProvier implements vscode.TreeDataProvider<RedHatCloudItem>
         {
             return vscode.commands.executeCommand('vscode.open', sandboxStatus.consoleURL);
         }
-
     }
 
     private static async getSandboxSignupStatus() : Promise<SBSignupResponse | undefined> {
diff --git a/src/webview/@types/windows/index.d.ts b/src/webview/@types/windows/index.d.ts
@@ -13,6 +13,7 @@ interface VscodeAPI {
 
 interface Window {
     cmdText?: string;
+    startingPage?: string;
     vscodeApi: VscodeAPI;
     acquireVsCodeApi: () => VscodeAPI;
 }
diff --git a/src/webview/cluster/app/cluster.tsx b/src/webview/cluster/app/cluster.tsx
@@ -55,6 +55,7 @@ export default function Header() {
     const [showWizard, setShowWizard] = React.useState('');
     const [crcLatest, setCrcLatest] = React.useState('');
     const [crcOpenShift, setCrcOpenShift] = React.useState('');
+    const [showWizard, setShowWizard] = React.useState(window.startingPage);
 
     window.onmessage = (event: any) => {
         if (['crc', 'sandbox'].includes(event.data.param)) {
diff --git a/src/webview/cluster/app/index.html b/src/webview/cluster/app/index.html
@@ -2,6 +2,9 @@
 <html lang="en">
     <head>
         <base href="%BASE_URL%" />
+        <script>
+            window.startingPage = '%STARTING_PAGE%';
+        </script>
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <title>Config View</title>
diff --git a/src/webview/cluster/clusterViewLoader.ts b/src/webview/cluster/clusterViewLoader.ts
@@ -322,7 +322,7 @@ export default class ClusterViewLoader {
     }
 
     // eslint-disable-next-line @typescript-eslint/require-await
-    static async loadView(title: string): Promise<vscode.WebviewPanel> {
+    static async loadView(title: string, initialPage: 'crc' | 'sandbox' | '' = ''): Promise<vscode.WebviewPanel> {
         const localResourceRoot = vscode.Uri.file(path.join(ClusterViewLoader.extensionPath, 'out', 'clusterViewer'));
         if (panel) {
             // If we already have a panel, show it in the target column
@@ -372,5 +372,4 @@ export default class ClusterViewLoader {
             }
         }
     }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,7 @@ class RedHatTreeDataProvier implements vscode.TreeDataProvider<RedHatCloudItem>`
`100`	`100`
`101`	`101`	`@vsCommand('openshift.local.open.setup')`
`102`	`102`	`static async openCrCWizard(): Promise<void> {`
`103`		`- const webViewPanel: vscode.WebviewPanel = await ClusterViewLoader.loadView('Add OpenShift Cluster');`
`104`		`- await webViewPanel.webview.postMessage({data: {param:'crc'}});`
	`103`	`+ await ClusterViewLoader.loadView('Add OpenShift Cluster', 'crc');`
`105`	`104`	`}`
`106`	`105`
`107`	`106`	`@vsCommand('cloud.redhat.login', false)`
`@@ -124,7 +123,6 @@ class RedHatTreeDataProvier implements vscode.TreeDataProvider<RedHatCloudItem>`
`124`	`123`	`{`
`125`	`124`	`return vscode.commands.executeCommand('vscode.open', sandboxStatus.consoleURL);`
`126`	`125`	`}`
`127`		`-`
`128`	`126`	`}`
`129`	`127`
`130`	`128`	`private static async getSandboxSignupStatus() : Promise<SBSignupResponse \| undefined> {`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ interface VscodeAPI {`
`13`	`13`
`14`	`14`	`interface Window {`
`15`	`15`	`cmdText?: string;`
	`16`	`+ startingPage?: string;`
`16`	`17`	`vscodeApi: VscodeAPI;`
`17`	`18`	`acquireVsCodeApi: () => VscodeAPI;`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ export default class ClusterViewLoader {`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`// eslint-disable-next-line @typescript-eslint/require-await`
`325`		`- static async loadView(title: string): Promise<vscode.WebviewPanel> {`
	`325`	`+ static async loadView(title: string, initialPage: 'crc' \| 'sandbox' \| '' = ''): Promise<vscode.WebviewPanel> {`
`326`	`326`	`const localResourceRoot = vscode.Uri.file(path.join(ClusterViewLoader.extensionPath, 'out', 'clusterViewer'));`
`327`	`327`	`if (panel) {`
`328`	`328`	`// If we already have a panel, show it in the target column`
`@@ -372,5 +372,4 @@ export default class ClusterViewLoader {`
`372`	`372`	`}`
`373`	`373`	`}`
`374`	`374`	`}`
`375`		`-`
`376`	`375`	`}`