Skip to content

Commit 45fecb9

Browse files
fix model evaluation guide
1 parent e0e245f commit 45fecb9

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

webapp/src/components/home/Home.vue

+2-3
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ import { driver, type DriveStep } from "driver.js";
184184
import "driver.js/dist/driver.css";
185185
import { watch } from "vue";
186186
import { useGuideStore } from "@/store/guide";
187-
import { ssrGetDirectiveProps } from "vue/server-renderer";
188187
189188
const router = useRouter();
190189
const guideStoreTraining = useGuideStore();
@@ -255,9 +254,9 @@ driverObj.drive();
255254
watch(
256255
() => guideStoreTraining.showGuide,
257256
(newValue) => {
257+
driverObj.destroy();
258+
console.log(router.currentRoute.value.path);
258259
if (router.currentRoute.value.path == "/") {
259-
console.log(newValue);
260-
driverObj.destroy();
261260
driverObj.setSteps(steps);
262261
driverObj.drive();
263262
}

webapp/src/components/testing/Testing.vue

+4-8
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
import createDebug from "debug";
146146
import { List } from "immutable";
147147
import { computed, ref, onActivated, watch } from "vue";
148-
import { RouterLink } from "vue-router";
148+
import { RouterLink, useRouter } from "vue-router";
149149
import { VueSpinner } from "vue3-spinners";
150150
151151
import type { DataType, Model, Task } from "@epfml/discojs";
@@ -177,6 +177,7 @@ const models = useModelsStore();
177177
const tasksStore = useTasksStore();
178178
const toaster = useToaster();
179179
const guideStoreTesting = useGuideStore();
180+
const router = useRouter();
180181
const driverTesting = driver({
181182
showProgress: false,
182183
});
@@ -425,29 +426,24 @@ const evaluationSteps: DriveStep[] = [
425426
watch(
426427
() => guideStoreTesting.showGuide,
427428
(newValue) => {
428-
if (newValue) {
429+
driverTesting.destroy();
430+
if (router.currentRoute.value.path == "/evaluate") {
429431
if (validationStore.step === 0) {
430-
driverTesting.destroy();
431432
if (models.infos.isEmpty()) {
432433
driverTesting.setSteps(modelEmptySteps);
433434
} else {
434435
driverTesting.setSteps(modelSteps);
435436
}
436437
driverTesting.drive();
437-
guideStoreTesting.toggleGuide();
438438
}
439439
if (validationStore.step !== 0) {
440440
if (validationStore.step === 1) {
441-
driverTesting.destroy();
442441
driverTesting.setSteps(dataSteps);
443442
driverTesting.drive();
444-
guideStoreTesting.toggleGuide();
445443
}
446444
if (validationStore.step === 2) {
447-
driverTesting.destroy();
448445
driverTesting.setSteps(evaluationSteps);
449446
driverTesting.drive();
450-
guideStoreTesting.toggleGuide();
451447
}
452448
}
453449
}

0 commit comments

Comments
 (0)