From 4e0c1d7bd97e3f8455e3092e545607715e8aa8cb Mon Sep 17 00:00:00 2001 From: Aditya-eddy Date: Wed, 18 Sep 2024 18:43:32 +0530 Subject: [PATCH] chore:user should sign in for the e2e test Signed-off-by: Aditya-eddy --- sidebar/sidebar.js | 35 ++++++++++++------- src/SidebarProvider.ts | 4 +-- webviews/components/Config.svelte | 49 +++++++++++++++++++++++++-- webviews/components/KeployHome.svelte | 10 ++++-- 4 files changed, 76 insertions(+), 22 deletions(-) diff --git a/sidebar/sidebar.js b/sidebar/sidebar.js index 27d4127..26ef5db 100644 --- a/sidebar/sidebar.js +++ b/sidebar/sidebar.js @@ -35,6 +35,7 @@ const viewTestLogsButton = document.getElementById('viewTestLogsButton'); const viewRecordLogsButton = document.getElementById('viewRecordLogsButton'); const apiResponseElement = document.getElementById('apiResponseDisplay'); const backConfigbutton = document.getElementById('backConfig'); +let actionStarted = false; // const apiResponseDisplayLog = document.getElementById('apiResponseDisplay'); // const selectRecordFolderButton = document.getElementById('selectRecordFolderButton'); // const selectTestFolderButton = document.getElementById('selectTestFolderButton'); @@ -134,22 +135,28 @@ if(backConfigbutton){ console.log("selectedIconButton: " , selectedIconButton.textContent ); console.log("backconfig button clicked") - vscode.postMessage({ - type: "stopRecordingCommand", - value: `Stop Recording` - }); - - - vscode.postMessage({ - type: "stopTestingCommand", - value: `Stop Testing` - }); + if(actionStarted == true){ + vscode.postMessage({ + type: "stopRecordingCommand", + value: `Stop Recording` + }); + + vscode.postMessage({ + type: "stopTestingCommand", + value: `Stop Testing` + }); vscode.postMessage({ type:"navigate", - value:"Config" + value:"IntegrationTest" }) + }else{ + vscode.postMessage({ + type:"navigate", + value:"Config" + }) + } }else{ @@ -228,6 +235,7 @@ if (viewRecordLogsButton) { if (startRecordingButton) { startRecordingButton.addEventListener('click', async () => { console.log("startRecordingButton clicked"); + actionStarted = true; resetUI(); // let commandValue = appCommand.value; @@ -250,6 +258,7 @@ if (startRecordingButton) { if (stopRecordingButton) { stopRecordingButton.addEventListener('click', async () => { console.log("stopRecordingButton clicked"); + actionStarted = false; vscode.postMessage({ type: "stopRecordingCommand", value: `Stop Recording` @@ -259,6 +268,7 @@ if (stopRecordingButton) { if (startTestButton) { startTestButton.addEventListener('click', async () => { console.log("startTestButton clicked"); + actionStarted = true; resetUI(); // const commandValue = appCommand.value; @@ -280,7 +290,7 @@ if (startTestButton) { if (stopTestButton) { stopTestButton.addEventListener('click', async () => { console.log("stopTestButton clicked"); - + actionStarted = false; vscode.postMessage({ type: "stopTestingCommand", value: `Stop Testing` @@ -374,7 +384,6 @@ if (setupConfigButton) { }); } - document.addEventListener('ciCdStepClick', function (e) { // Logic to handle CI/CD setup click event if (e.detail.step === 'ci-cd-setup') { diff --git a/src/SidebarProvider.ts b/src/SidebarProvider.ts index 9602f13..e5d13c2 100644 --- a/src/SidebarProvider.ts +++ b/src/SidebarProvider.ts @@ -306,9 +306,7 @@ export class SidebarProvider implements vscode.WebviewViewProvider { } case "openLink":{ - if (!data.url) { - return; - } + try { console.log("Opening external link: " + data.url); vscode.env.openExternal(vscode.Uri.parse(data.url)); diff --git a/webviews/components/Config.svelte b/webviews/components/Config.svelte index b79adbb..72198f1 100644 --- a/webviews/components/Config.svelte +++ b/webviews/components/Config.svelte @@ -1,13 +1,56 @@ diff --git a/webviews/components/KeployHome.svelte b/webviews/components/KeployHome.svelte index f6a5c65..e8fd1a1 100644 --- a/webviews/components/KeployHome.svelte +++ b/webviews/components/KeployHome.svelte @@ -48,8 +48,12 @@ } }; function navigateToConfig() { - selectedIconButton = 1; - console.log("In the main screen"); + if(isRecording || isTesting){ + isRecording = false; + isTesting = false; + showSteps = false; + + } } const clearLastTestResults = () => { @@ -176,7 +180,7 @@

Running integration tests

{selectedIconButton}

-