From 85805bdf8265f4fe14a583b43b786257ffccc4dc Mon Sep 17 00:00:00 2001
From: Faton Ramadani <faton.ramadani14@gmail.com>
Date: Fri, 1 Dec 2023 10:20:53 +0100
Subject: [PATCH] fix(frontend): fix tutorials contols (#2745)

---
 .../lib/components/tutorials/Tutorial.svelte  | 119 ++++++++++--------
 .../tutorials/app/AppTutorial.svelte          |   2 +
 2 files changed, 71 insertions(+), 50 deletions(-)

diff --git a/frontend/src/lib/components/tutorials/Tutorial.svelte b/frontend/src/lib/components/tutorials/Tutorial.svelte
index 074d7a653b..cd2fe1a317 100644
--- a/frontend/src/lib/components/tutorials/Tutorial.svelte
+++ b/frontend/src/lib/components/tutorials/Tutorial.svelte
@@ -19,72 +19,91 @@
 	export let getSteps: (driver: Driver, options?: Options | undefined) => DriveStep[] = () => []
 
 	let totalSteps = 0
-
+	let tutorial: Driver | undefined = undefined
 	const dispatch = createEventDispatcher()
 
+	// Render controls needs to be exposed so steps that have a custom render can call it
+	export function renderControls({ config, state }) {
+		const popoverDescription = document.querySelector('#driver-popover-description')
+
+		if (!tutorial) {
+			return
+		}
+
+		if (state.activeIndex == 0) {
+			const div = document.createElement('div')
+
+			const skipTutorials = new SkipTutorials({
+				target: div
+			})
+
+			skipTutorials.$on('skipAll', () => {
+				dispatch('skipAll')
+				tutorial?.destroy()
+			})
+
+			skipTutorials.$on('skipThis', () => {
+				updateProgress(index)
+				tutorial?.destroy()
+			})
+
+			if (popoverDescription) {
+				popoverDescription.appendChild(div)
+			}
+		}
+
+		const controls = document.createElement('div')
+
+		const tutorialControls = new TutorialControls({
+			target: controls,
+			props: {
+				activeIndex: state.activeIndex,
+				totalSteps
+			}
+		})
+
+		tutorialControls.$on('next', () => {
+			const step = tutorial?.getActiveStep()
+
+			if (step) {
+				if (tutorial?.getActiveStep()?.popover?.onNextClick) {
+					const activeElement = tutorial?.getActiveElement()
+					tutorial?.getActiveStep()?.popover?.onNextClick?.(activeElement, step, {
+						config,
+						state
+					})
+				} else {
+					tutorial?.moveNext()
+				}
+			}
+		})
+
+		tutorialControls.$on('previous', () => {
+			tutorial?.movePrevious()
+		})
+
+		if (popoverDescription) {
+			popoverDescription.appendChild(controls)
+		}
+	}
+
 	export const runTutorial = (options?: Options | undefined) => {
 		if (tainted) {
 			dispatch('error', { detail: name })
 			return
 		}
 
-		const tutorial = driver({
+		tutorial = driver({
 			allowClose: true,
 			disableActiveInteraction: true,
 			showButtons: ['close'],
 			showProgress: false,
 			overlayColor: 'rgba(0, 0, 0, 0.8)',
 			onPopoverRender: (popover, { config, state }) => {
-				const popoverDescription = document.querySelector('#driver-popover-description')
-
-				if (state.activeIndex == 0) {
-					const div = document.createElement('div')
-
-					const skipTutorials = new SkipTutorials({
-						target: div
-					})
-
-					skipTutorials.$on('skipAll', () => {
-						dispatch('skipAll')
-						tutorial.destroy()
-					})
-
-					skipTutorials.$on('skipThis', () => {
-						updateProgress(index)
-						tutorial.destroy()
-					})
-
-					if (popoverDescription) {
-						popoverDescription.appendChild(div)
-					}
-				}
-
-				const controls = document.createElement('div')
-
-				console.log(state)
-
-				const tutorialControls = new TutorialControls({
-					target: controls,
-					props: {
-						activeIndex: state.activeIndex,
-						totalSteps
-					}
-				})
-
-				tutorialControls.$on('next', () => {
-					tutorial.moveNext()
-				})
-
-				tutorialControls.$on('previous', () => {
-					tutorial.movePrevious()
-				})
-
-				if (popoverDescription) {
-					popoverDescription.appendChild(controls)
-				}
+				renderControls({ config, state })
 			},
 			onDestroyed: () => {
-				if (!tutorial.hasNextStep()) {
+				if (!tutorial?.hasNextStep()) {
 					$ignoredTutorials = Array.from(new Set([...$ignoredTutorials, index]))
 				}
 			}
diff --git a/frontend/src/lib/components/tutorials/app/AppTutorial.svelte b/frontend/src/lib/components/tutorials/app/AppTutorial.svelte
index 4f7e5160b8..6ff9b3a0d0 100644
--- a/frontend/src/lib/components/tutorials/app/AppTutorial.svelte
+++ b/frontend/src/lib/components/tutorials/app/AppTutorial.svelte
@@ -252,6 +252,8 @@
 						wrapper.appendChild(objectViewer)
 
 						popover.description.appendChild(wrapper)
+
+						tutorial?.renderControls(opts)
 					}
 				}
 			},