From 49bebe20cc87b5ce078d04f7fad9003d2e26bbf6 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 3 Nov 2022 19:10:55 +0100
Subject: [PATCH] fix(frontend): fix remaining openModal bugs

---
 frontend/src/lib/components/Modal.svelte               | 10 +++++-----
 frontend/src/lib/components/ScriptPicker.svelte        |  2 +-
 .../lib/components/flows/pickers/PickHubScript.svelte  |  2 +-
 .../src/lib/components/flows/pickers/PickScript.svelte |  2 +-
 .../src/lib/components/scripts/CreateActions.svelte    |  2 +-
 frontend/src/routes/flows.svelte                       |  2 +-
 frontend/src/routes/flows/get/[...path].svelte         |  2 +-
 frontend/src/routes/schedules.svelte                   |  2 +-
 frontend/src/routes/scripts.svelte                     |  2 +-
 frontend/src/routes/scripts/get/[...hash].svelte       |  2 +-
 frontend/src/routes/variables.svelte                   |  2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/frontend/src/lib/components/Modal.svelte b/frontend/src/lib/components/Modal.svelte
index 049ac0ff68..504ae4449f 100644
--- a/frontend/src/lib/components/Modal.svelte
+++ b/frontend/src/lib/components/Modal.svelte
@@ -6,14 +6,14 @@
 
 	const dispatch = createEventDispatcher()
 
-	export function closeModal(): void {
+	export function closeDrawer(): void {
 		document.body.style.overflow = 'auto'
 
 		open = false
 		dispatch('close')
 	}
 
-	export function openModal(): void {
+	export function openDrawer(): void {
 		document.body.style.overflow = 'hidden'
 		open = true
 		dispatch('open')
@@ -24,7 +24,7 @@
 		if (key === 'Escape' || key === 'Esc') {
 			if (open) {
 				event.preventDefault()
-				closeModal()
+				closeDrawer()
 			}
 		}
 	}
@@ -44,7 +44,7 @@
 					<button
 						on:click={() => {
 							open = false
-							closeModal()
+							closeDrawer()
 						}}
 					>
 						<svg
@@ -72,7 +72,7 @@
 					<div class="flex flex-row justify-between p-2 ">
 						<button
 							on:click={() => {
-								closeModal()
+								closeDrawer()
 							}}
 						>
 							<svg
diff --git a/frontend/src/lib/components/ScriptPicker.svelte b/frontend/src/lib/components/ScriptPicker.svelte
index ff9344625a..4681b4935f 100644
--- a/frontend/src/lib/components/ScriptPicker.svelte
+++ b/frontend/src/lib/components/ScriptPicker.svelte
@@ -85,7 +85,7 @@
 				const { language, content } = await getScriptByPath(scriptPath ?? '')
 				code = content
 				lang = language
-				drawerViewer.openModal()
+				drawerViewer.openDrawer()
 			}}
 		>
 			Show code
diff --git a/frontend/src/lib/components/flows/pickers/PickHubScript.svelte b/frontend/src/lib/components/flows/pickers/PickHubScript.svelte
index 2805996604..c846caec2a 100644
--- a/frontend/src/lib/components/flows/pickers/PickHubScript.svelte
+++ b/frontend/src/lib/components/flows/pickers/PickHubScript.svelte
@@ -35,5 +35,5 @@
 	label={customText ?? `${kind == Script.kind.SCRIPT ? 'Script' : `${kind} script`} from the Hub`}
 	icon={faUserGroup}
 	iconColor="text-blue-500"
-	on:click={() => itemPicker.openModal()}
+	on:click={() => itemPicker.openDrawer()}
 />
diff --git a/frontend/src/lib/components/flows/pickers/PickScript.svelte b/frontend/src/lib/components/flows/pickers/PickScript.svelte
index 94f24840b5..06a8389824 100644
--- a/frontend/src/lib/components/flows/pickers/PickScript.svelte
+++ b/frontend/src/lib/components/flows/pickers/PickScript.svelte
@@ -33,5 +33,5 @@
 	label={customText ?? `${kind == Script.kind.SCRIPT ? 'Script' : `${kind} script`} from workspace`}
 	icon={faUserGroup}
 	iconColor="text-blue-500"
-	on:click={() => itemPicker.openModal()}
+	on:click={() => itemPicker.openDrawer()}
 />
diff --git a/frontend/src/lib/components/scripts/CreateActions.svelte b/frontend/src/lib/components/scripts/CreateActions.svelte
index 0a4c71d091..66bf9405d3 100644
--- a/frontend/src/lib/components/scripts/CreateActions.svelte
+++ b/frontend/src/lib/components/scripts/CreateActions.svelte
@@ -62,7 +62,7 @@
 <div class="flex flex-row gap-2">
 	<ButtonPopup size="sm" startIcon={{ icon: faPlus }} href="/scripts/add">
 		<svelte:fragment slot="main">New script</svelte:fragment>
-		<ButtonPopupItem on:click={() => drawers.hub?.openModal()}>
+		<ButtonPopupItem on:click={() => drawers.hub?.openDrawer()}>
 			Import script from WindmillHub
 		</ButtonPopupItem>
 		<ButtonPopupItem on:click={() => drawers.template?.toggleDrawer()}>
diff --git a/frontend/src/routes/flows.svelte b/frontend/src/routes/flows.svelte
index 39f4621ad9..f3f71a8046 100644
--- a/frontend/src/routes/flows.svelte
+++ b/frontend/src/routes/flows.svelte
@@ -330,7 +330,7 @@
 															displayName: 'Share',
 															icon: faShare,
 															action: () => {
-																shareModal.openModal(path)
+																shareModal.openDrawer(path)
 															},
 															disabled: !canWrite
 														},
diff --git a/frontend/src/routes/flows/get/[...path].svelte b/frontend/src/routes/flows/get/[...path].svelte
index f096cffdea..ba5d11aafe 100644
--- a/frontend/src/routes/flows/get/[...path].svelte
+++ b/frontend/src/routes/flows/get/[...path].svelte
@@ -157,7 +157,7 @@
 						displayName: 'Share',
 						icon: faShare,
 						action: () => {
-							shareModal.openModal()
+							shareModal.openDrawer()
 						},
 						disabled: !can_write
 					},
diff --git a/frontend/src/routes/schedules.svelte b/frontend/src/routes/schedules.svelte
index c995405a54..319f31a6ec 100644
--- a/frontend/src/routes/schedules.svelte
+++ b/frontend/src/routes/schedules.svelte
@@ -153,7 +153,7 @@
 											icon: faShare,
 											disabled: !canWrite,
 											action: () => {
-												shareModal.openModal(path)
+												shareModal.openDrawer(path)
 											}
 										}
 									]}
diff --git a/frontend/src/routes/scripts.svelte b/frontend/src/routes/scripts.svelte
index c69db1e717..f6bee663c6 100644
--- a/frontend/src/routes/scripts.svelte
+++ b/frontend/src/routes/scripts.svelte
@@ -362,7 +362,7 @@
 														displayName: 'Share',
 														icon: faShare,
 														action: () => {
-															shareModal.openModal(path)
+															shareModal.openDrawer(path)
 														},
 														disabled: !canWrite
 													},
diff --git a/frontend/src/routes/scripts/get/[...hash].svelte b/frontend/src/routes/scripts/get/[...hash].svelte
index 21fa121bf9..226e549da7 100644
--- a/frontend/src/routes/scripts/get/[...hash].svelte
+++ b/frontend/src/routes/scripts/get/[...hash].svelte
@@ -200,7 +200,7 @@
 						displayName: 'Share',
 						icon: faShare,
 						action: () => {
-							shareModal.openModal()
+							shareModal.openDrawer()
 						},
 						disabled: !can_write
 					},
diff --git a/frontend/src/routes/variables.svelte b/frontend/src/routes/variables.svelte
index 91f8f17afa..4bcd98c0a6 100644
--- a/frontend/src/routes/variables.svelte
+++ b/frontend/src/routes/variables.svelte
@@ -168,7 +168,7 @@
 										{
 											displayName: 'Share',
 											action: () => {
-												shareModal.openModal(path)
+												shareModal.openDrawer(path)
 											},
 											disabled: !canWrite
 										},