From 0d55361a9bb2e43f1842167bef04aa44acd51f20 Mon Sep 17 00:00:00 2001 From: NaiJi Date: Tue, 2 May 2023 17:05:55 -0300 Subject: [PATCH] fix: Improve installation failure dialogues --- .../server_installation_cubit.dart | 48 +++++++++---------- .../server_providers/digital_ocean.dart | 8 ++-- .../providers/server_providers/hetzner.dart | 16 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lib/logic/cubit/server_installation/server_installation_cubit.dart b/lib/logic/cubit/server_installation/server_installation_cubit.dart index 04bfa830..940f6ede 100644 --- a/lib/logic/cubit/server_installation/server_installation_cubit.dart +++ b/lib/logic/cubit/server_installation/server_installation_cubit.dart @@ -262,32 +262,32 @@ class ServerInstallationCubit extends Cubit { if (!result.success && result.data != null) { bool dialoguesResolved = false; CallbackDialogueBranching branching = result.data!; - while (!dialoguesResolved) { - showPopUpAlert( - alertTitle: branching.title, - description: branching.description, - actionButtonTitle: branching.choices[1].title, - actionButtonOnPressed: () async { - final branchingResult = await branching.choices[1].callback!(); - if (branchingResult.data == null) { - dialoguesResolved = true; - return; - } + //while (!dialoguesResolved) { + showPopUpAlert( + alertTitle: branching.title, + description: branching.description, + actionButtonTitle: branching.choices[1].title, + actionButtonOnPressed: () async { + final branchingResult = await branching.choices[1].callback!(); + if (branchingResult.data == null) { + dialoguesResolved = true; + return; + } - branching = branchingResult.data!; - }, - cancelButtonTitle: branching.choices[0].title, - cancelButtonOnPressed: () async { - final branchingResult = await branching.choices[0].callback!(); - if (branchingResult.data == null) { - dialoguesResolved = true; - return; - } + branching = branchingResult.data!; + }, + cancelButtonTitle: branching.choices[0].title, + cancelButtonOnPressed: () async { + final branchingResult = await branching.choices[0].callback!(); + if (branchingResult.data == null) { + dialoguesResolved = true; + return; + } - branching = branchingResult.data!; - }, - ); - } + branching = branchingResult.data!; + }, + ); + //} } } diff --git a/lib/logic/providers/server_providers/digital_ocean.dart b/lib/logic/providers/server_providers/digital_ocean.dart index 906a5525..97317144 100644 --- a/lib/logic/providers/server_providers/digital_ocean.dart +++ b/lib/logic/providers/server_providers/digital_ocean.dart @@ -159,10 +159,10 @@ class DigitalOceanServerProvider extends ServerProvider { choices: [ CallbackDialogueChoice( title: 'basis.cancel'.tr(), - callback: await installationData.errorCallback(), + callback: () async => await installationData.errorCallback(), ), CallbackDialogueChoice( - title: 'basis.try_again'.tr(), + title: 'modals.try_again'.tr(), callback: () async => launchInstallation(installationData), ), ], @@ -215,7 +215,7 @@ class DigitalOceanServerProvider extends ServerProvider { callback: null, ), CallbackDialogueChoice( - title: 'basis.try_again'.tr(), + title: 'modals.try_again'.tr(), callback: () async { await Future.delayed(const Duration(seconds: 5)); final deletion = await deleteServer(hostname); @@ -595,7 +595,7 @@ class DigitalOceanServerProvider extends ServerProvider { callback: null, ), CallbackDialogueChoice( - title: 'basis.try_again'.tr(), + title: 'modals.try_again'.tr(), callback: () async { await Future.delayed(const Duration(seconds: 5)); return deleteServer(hostname); diff --git a/lib/logic/providers/server_providers/hetzner.dart b/lib/logic/providers/server_providers/hetzner.dart index e58223b7..7d4221fa 100644 --- a/lib/logic/providers/server_providers/hetzner.dart +++ b/lib/logic/providers/server_providers/hetzner.dart @@ -418,10 +418,10 @@ class HetznerServerProvider extends ServerProvider { choices: [ CallbackDialogueChoice( title: 'basis.cancel'.tr(), - callback: await installationData.errorCallback(), + callback: () async => await installationData.errorCallback(), ), CallbackDialogueChoice( - title: 'basis.try_again'.tr(), + title: 'modals.try_again'.tr(), callback: () async => launchInstallation(installationData), ), ], @@ -467,10 +467,10 @@ class HetznerServerProvider extends ServerProvider { choices: [ CallbackDialogueChoice( title: 'basis.cancel'.tr(), - callback: installationData.errorCallback(), + callback: () async => installationData.errorCallback(), ), CallbackDialogueChoice( - title: 'basis.yes'.tr(), + title: 'modals.yes'.tr(), callback: () async { final deleting = await deleteServer(hostname); if (deleting.success) { @@ -481,7 +481,7 @@ class HetznerServerProvider extends ServerProvider { }, ), ], - description: volumeResult.message ?? 'modals.destroy_server'.tr(), + description: 'modals.destroy_server'.tr(), title: 'modals.already_exists'.tr(), ), success: false, @@ -504,7 +504,7 @@ class HetznerServerProvider extends ServerProvider { }, ), CallbackDialogueChoice( - title: 'basis.try_again'.tr(), + title: 'modals.try_again'.tr(), callback: () async => launchInstallation(installationData), ), ], @@ -556,7 +556,7 @@ class HetznerServerProvider extends ServerProvider { }, ), CallbackDialogueChoice( - title: 'basis.try_again'.tr(), + title: 'modals.try_again'.tr(), callback: () async { await _adapter.api().deleteVolume(volume['id']); await Future.delayed(const Duration(seconds: 5)); @@ -631,7 +631,7 @@ class HetznerServerProvider extends ServerProvider { callback: null, ), CallbackDialogueChoice( - title: 'basis.try_again'.tr(), + title: 'modals.try_again'.tr(), callback: () async { await Future.delayed(const Duration(seconds: 5)); return deleteServer(hostname);