Improve waiting dialog

1 files changed, 29 insertions, 11 deletions

diff --git a/src/client/os.ts b/src/client/os.ts
index 03bae65539..688bc136df 100644
--- a/src/client/os.ts
+++ b/src/client/os.ts
@@ -62,17 +62,34 @@ export function api(endpoint: string, data: Record<string, any> = {}, token?: st
 	return promise;
 }
 
-export function apiWithDialog(endpoint: string, data: Record<string, any> = {}, token?: string | null | undefined, onSuccess?: (res: any) => void, onFailure?: (e: Error) => void) {
+export function apiWithDialog(
+	endpoint: string,
+	data: Record<string, any> = {},
+	token?: string | null | undefined,
+	onSuccess?: (res: any) => void,
+	onFailure?: (e: Error) => void,
+) {
+	const promise = api(endpoint, data, token);
+	promiseDialog(promise, onSuccess, onFailure);
+
+	return promise;
+}
+
+export function promiseDialog<T extends Promise<any>>(
+	promise: T,
+	onSuccess?: (res: any) => void,
+	onFailure?: (e: Error) => void,
+	text?: string,
+): T {
 	const showing = ref(true);
-	const state = ref('waiting');
+	const success = ref(false);
 
-	const promise = api(endpoint, data, token);
 	promise.then(res => {
 		if (onSuccess) {
 			showing.value = false;
 			onSuccess(res);
 		} else {
-			state.value = 'success';
+			success.value = true;
 			setTimeout(() => {
 				showing.value = false;
 			}, 1000);
@@ -89,9 +106,10 @@ export function apiWithDialog(endpoint: string, data: Record<string, any> = {},
 		}
 	});
 
-	popup(defineAsyncComponent(() => import('@/components/icon-dialog.vue')), {
-		type: state,
-		showing: showing
+	popup(defineAsyncComponent(() => import('@/components/waiting-dialog.vue')), {
+		success: success,
+		showing: showing,
+		text: text,
 	}, {}, 'closed');
 
 	return promise;
@@ -161,8 +179,8 @@ export function success() {
 		setTimeout(() => {
 			showing.value = false;
 		}, 1000);
-		popup(defineAsyncComponent(() => import('@/components/icon-dialog.vue')), {
-			type: 'success',
+		popup(defineAsyncComponent(() => import('@/components/waiting-dialog.vue')), {
+			success: true,
 			showing: showing
 		}, {
 			done: () => resolve(),
@@ -173,8 +191,8 @@ export function success() {
 export function waiting() {
 	return new Promise((resolve, reject) => {
 		const showing = ref(true);
-		popup(defineAsyncComponent(() => import('@/components/icon-dialog.vue')), {
-			type: 'waiting',
+		popup(defineAsyncComponent(() => import('@/components/waiting-dialog.vue')), {
+			success: false,
 			showing: showing
 		}, {
 			done: () => resolve(),