chore!: drop Dialog.hide method

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Author: susnux

lib/components/GenericDialog.vue

@@ -4,10 +4,10 @@
 -->
 <template>
 	<NcDialog dialog-classes="nc-generic-dialog"
-		:buttons
+		:buttons="dialogButtons"
 		:name
 		:message="text"
-		@update:open="$emit('close')">
+		@update:open="$emit('close', false)">
 		<NcNoteCard v-if="severity" :type="severity">
 			<p v-text="text" />
 		</NcNoteCard>
@@ -19,7 +19,7 @@
 <script setup lang="ts">
 import type { IDialogButton, IDialogSeverity } from './types.ts'
 
-import { onMounted, onUnmounted } from 'vue'
+import { computed, onMounted, onUnmounted } from 'vue'
 import NcDialog from '@nextcloud/vue/components/NcDialog'
 import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
 
@@ -51,10 +51,18 @@ const props = defineProps<{
 	severity?: IDialogSeverity
 }>()
 
-defineEmits<{
-	close: []
+const emit = defineEmits<{
+	close: [buttonClick: boolean]
 }>()
 
+const dialogButtons = computed(() => props.buttons?.map((button) => ({
+	...button,
+	callback() {
+		button.callback()
+		emit('close', true)
+	},
+})))
+
 /**
  * Handler used to ensure the message is also shown when the page is unloaded
  * This is for backwards compatibility with OC.dialogs

lib/dialogs.ts

@@ -3,15 +3,12 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import type { IDialogButton } from './components/types'
-import type Vue from 'vue'
-
+import type { IDialogButton, IDialogSeverity } from './components/types.ts'
 import { spawnDialog } from '@nextcloud/vue/functions/dialog'
 
-import { DialogSeverity } from './components/types'
 import GenericDialog from './components/GenericDialog.vue'
 
-export { DialogSeverity } from './components/types'
+export type * from './components/types.ts'
 
 /**
  * This class provides generic Nextcloud themed dialogs
@@ -21,8 +18,7 @@ export class Dialog {
 	#name: string
 	#text: string
 	#buttons: IDialogButton[]
-	#severity?: DialogSeverity
-	#dialog?: Vue
+	#severity?: IDialogSeverity
 
 	/** @deprecated */
 	#html?: string
@@ -31,13 +27,12 @@ export class Dialog {
 		name: string,
 		text: string,
 		buttons: IDialogButton[] = [],
-		severity?: DialogSeverity,
+		severity?: IDialogSeverity,
 	) {
 		this.#name = name
 		this.#text = text
 		this.#buttons = buttons
 		this.#severity = severity
-		this.#dialog = undefined
 		this.#html = undefined
 	}
 
@@ -52,34 +47,22 @@ export class Dialog {
 
 	/**
 	 * Spawn and show the dialog - if already open the previous instance will be destroyed
+	 *
 	 * @return Promise that resolves when the dialog is answered successfully and rejects on close
 	 */
 	async show() {
-		if (this.#dialog) {
-			this.#dialog.$destroy()
+		const result = await spawnDialog(GenericDialog,
+			{
+				buttons: this.#buttons,
+				name: this.#name,
+				text: this.#text,
+				severity: this.#severity,
+				html: this.#html,
+			},
+		)
+		if (!result) {
+			throw new Error('Dialog closed')
 		}
-
-		return new Promise((resolve) => {
-			this.#dialog = spawnDialog(GenericDialog,
-				{
-					buttons: this.#buttons,
-					name: this.#name,
-					text: this.#text,
-					severity: this.#severity,
-					html: this.#html,
-				},
-				resolve,
-			)
-		})
-	}
-
-	/**
-	 * Hide and destroy the current dialog instance
-	 *
-	 * @deprecated use the promise of the `show` methods for the user interaction.
-	 */
-	hide() {
-		this.#dialog?.$destroy()
 	}
 
 }
@@ -103,7 +86,7 @@ export class Dialog {
  */
 export class DialogBuilder {
 
-	#severity?: DialogSeverity
+	#severity?: IDialogSeverity
 	#text: string
 	#name: string
 	#buttons: IDialogButton[]
@@ -137,7 +120,7 @@ export class DialogBuilder {
 	 * Set the severity of the dialog
 	 * @param severity Severity of the dialog
 	 */
-	setSeverity(severity: DialogSeverity) {
+	setSeverity(severity: IDialogSeverity) {
 		this.#severity = severity
 		return this
 	}