Skip to content

Commit

Permalink
fix:correcting vscode api in the keployHome.svelete (#72)
Browse files Browse the repository at this point in the history
Signed-off-by: Aditya-eddy <aditya282003@gmail.com>
  • Loading branch information
Aditya-eddy authored Oct 7, 2024
1 parent 525a3cd commit c90dc08
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 61 deletions.
17 changes: 17 additions & 0 deletions sidebar/sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ if (rerunTestSuiteButton) {

if(backConfigbutton){
backConfigbutton.addEventListener('click',async () =>{
console.log("back button clicked man." , selectedIconButton.textContent);
if(selectedIconButton.textContent == '1'){
console.log("selectedIconButton: " , selectedIconButton.textContent );
console.log("backconfig button clicked")
Expand Down Expand Up @@ -418,6 +419,22 @@ document.addEventListener('addUsersClick', function (e) {
}
});

// Listen for custom events from the Svelte component
document.addEventListener('getKeployConfig', () => {
vscode.postMessage({
type: 'getKeployConfig',
});
});

document.addEventListener('updateKeployConfig', (e) => {
const config = e.detail.config;
vscode.postMessage({
type: 'updateKeployConfig',
config: config,
});
});


// Handle messages sent from the extension
window.addEventListener('message', event => {
const message = event.data;
Expand Down
121 changes: 60 additions & 61 deletions webviews/components/KeployHome.svelte
Original file line number Diff line number Diff line change
@@ -1,37 +1,6 @@
<script>
import { fly } from "svelte/transition";
import { onMount } from 'svelte';
// import lottie from 'lottie-web';
// let navigateToConfig = false;
onMount(() => {
// Acquire the VS Code API on mount
if (!vscodeApi) {
vscodeApi = window.acquireVsCodeApi();
}
// Request the Keploy config from the extension
vscodeApi.postMessage({
type: 'getKeployConfig',
});
// Listen for the response from the extension
window.addEventListener('message', event => {
const message = event.data;
if (message.type === 'keployConfig') {
const config = message.config;
// Set the form fields with the values from the config
appName = config.appName || '';
command = config.command || '';
containerName = config.containerName || '';
networkName = config.networkName || 'default';
delay = config.test?.delay || 5;
apiTimeout = config.test?.apiTimeout || 5;
mongoPassword = config.test?.mongoPassword || '';
}
});
});
let startRecordingButton;
let startTestingButton;
let buttonsSection = document.getElementById("buttonsSection");
Expand All @@ -44,10 +13,7 @@
let settingsIcon = document.querySelector(".settings-icon");
let currentStep = 1;
let backConfigButton;
let vscodeApi = null; // Store the VS Code API reference
// let delay = 5;
// let delay = 5;
// let apiTimeout = 5;
let appName = '';
let command = '';
Expand All @@ -56,37 +22,69 @@
let delay = 5;
let apiTimeout = 5;
let mongoPassword = '';
// import lottie from 'lottie-web';
// let navigateToConfig = false;
// On mount, request config and set up listeners
onMount(() => {
// Dispatch a custom event to request the Keploy config
const getConfigEvent = new CustomEvent('getKeployConfig');
document.dispatchEvent(getConfigEvent);
// Listen for the response from sidebar.js
document.addEventListener('keployConfig', event => {
const config = event.detail.config;
// Set the form fields with the values from the config
appName = config.appName || '';
command = config.command || '';
containerName = config.containerName || '';
networkName = config.networkName || 'default';
delay = config.test?.delay || 5;
apiTimeout = config.test?.apiTimeout || 5;
mongoPassword = config.test?.mongoPassword || '';
});
// Initialize DOM elements
// Listen for custom events from sidebar.js
// ... listen for other custom events as needed
});
if (!vscodeApi) {
vscodeApi = window.acquireVsCodeApi();
}
function validateInput(event) {
let value = event.target.value;
let value = event.target.value;
// Check if the input contains anything other than digits
if (/\D/.test(value) || value < 0 || isNaN(value)) {
// Remove any non-digit characters and ensure the value is non-negative
event.target.value = value.replace(/\D/g, '') || 0;
// Check if the input contains anything other than digits
if (/\D/.test(value) || value < 0 || isNaN(value)) {
// Remove any non-digit characters and ensure the value is non-negative
event.target.value = value.replace(/\D/g, '') || 0;
}
}
}
function saveSettings() {
// Post the updated config values to the VS Code extension
vscodeApi.postMessage({
type: "updateKeployConfig",
config: {
appName,
command,
containerName,
networkName,
test: {
delay,
apiTimeout,
mongoPassword,
function saveSettings() {
// Dispatch a custom event with the updated config
const updateConfigEvent = new CustomEvent('updateKeployConfig', {
detail: {
config: {
appName,
command,
containerName,
networkName,
test: {
delay,
apiTimeout,
mongoPassword,
},
},
},
});
document.dispatchEvent(updateConfigEvent);
}
let progressBarHide;
function goToNextStep(step) {
currentStep = step;
Expand Down Expand Up @@ -122,10 +120,11 @@ function saveSettings() {
};
function navigateToConfig() {
if (selectedIconButton === 3) {
selectedIconButton = 1; // Set to the default view
return;
}
//below code's logic already written in sidebar.js
// if (selectedIconButton === 3) {
// selectedIconButton = 1; // Set to the default view
// return;
// }
if(isRecording || isTesting){
isRecording = false;
Expand Down

0 comments on commit c90dc08

Please sign in to comment.