FIX: Checkpoint URL ending up in EC Config (#2046)

stereum-dev · Sep 10, 2024 · 9dfce27 · 9dfce27
1 parent 966b2ab
commit 9dfce27
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/launcher/src/backend/ServiceManager.js b/launcher/src/backend/ServiceManager.js
@@ -307,13 +307,14 @@ export class ServiceManager {
     if (checkpointSyncIndex > -1) {
       command.splice(checkpointSyncIndex, 1);
     }
+    // remove genesisSync if used
+    if (genesisSyncCommands[client.service]) command = command.filter((c) => !c.includes(genesisSyncCommands[client.service]));
     //add checkpointSync if Url was send
-    if (checkpointUrl) {
+    if (checkpointUrl && checkpointCommands[client.service]) {
       command.push(checkpointCommands[client.service] + checkpointUrl);
-      if (genesisSyncCommands[client.service]) command = command.filter((c) => !c.includes(genesisSyncCommands[client.service]));
-    } else {
+    } else if (genesisSyncCommands[client.service]) {
       //add genesisSync if no Url was send
-      if (genesisSyncCommands[client.service]) command.push(genesisSyncCommands[client.service]);
+      command.push(genesisSyncCommands[client.service]);
     }
 
     if (isString) {

diff --git a/launcher/src/components/UI/edit-page/components/edit/SyncCarousel.vue b/launcher/src/components/UI/edit-page/components/edit/SyncCarousel.vue
@@ -101,7 +101,7 @@
 import { useClickInstall } from "@/store/clickInstallation";
 import ControlService from "@/store/ControlService";
 import { useNodeManage } from "@/store/nodeManage";
-import { computed, onBeforeMount, ref, watch, watchEffect } from "vue";
+import { computed, onBeforeMount, ref, watch, watchEffect, onMounted } from "vue";
 import { useRouter } from "vue-router";
 import { Carousel, Navigation, Slide } from "vue3-carousel";
 import "vue3-carousel/dist/carousel.css";
@@ -171,6 +171,10 @@ watch(currentSlide, (val) => {
 });
 
 // Lifecycle hooks
+onMounted(() => {
+  installStore.checkPointSync = "";
+});
+
 onBeforeMount(() => {
   currentSlide.value = 2;
 });

diff --git a/launcher/src/components/UI/one-click/components/sync/components/TheCarousel.vue b/launcher/src/components/UI/one-click/components/sync/components/TheCarousel.vue
@@ -175,6 +175,7 @@ watch(currentSlide, (val) => {
 
 // Lifecycle hooks
 onMounted(() => {
+  installStore.checkPointSync = "";
   currentSlide.value = 3;
 });