fix: correctly implement AlertService.confirm API

2020-07-08 16:30:53 +02:00
parent d7c8efee25
commit a9aba87033
1 changed files with 12 additions and 10 deletions
--- a/app/assets/javascripts/services/alertService.ts
+++ b/app/assets/javascripts/services/alertService.ts
@@ -72,22 +72,24 @@ export class AlertService extends SNAlertService {
    title: string,
    confirmButtonText = 'Confirm',
    cancelButtonText = 'Cancel',
-    onConfirm: () => void,
-    onCancel: () => void,
+    onConfirm?: () => void,
+    onCancel?: () => void,
    destructive = false
  ) {
-    const confirmed = await confirmDialog({
+    return confirmDialog({
      text,
      title,
      confirmButtonText,
      cancelButtonText,
      confirmButtonStyle: destructive ? 'danger' : 'info'
-    });
-    if (confirmed) {
-      onConfirm();
-    } else {
-      onCancel();
-    }
-    return confirmed;
+    }).then(confirmed => new Promise((resolve, reject) => {
+      if (confirmed) {
+        onConfirm?.();
+        resolve(true);
+      } else {
+        onCancel?.();
+        reject(false);
+      }
+    }))
  }
 }