Add delete confirm to delete button.

shoothzj · Aug 2, 2021 · 7b9170b · 7b9170b
1 parent 6b0d03b
commit 7b9170b
Show file tree

Hide file tree

Showing 10 changed files with 202 additions and 27 deletions.
diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
@@ -22,8 +22,19 @@ class MessageLookup extends MessageLookupByLibrary {
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
         "appName": MessageLookupByLibrary.simpleMessage("Paas Dashboard"),
+        "cancel": MessageLookupByLibrary.simpleMessage("Cancel"),
         "clearBacklog": MessageLookupByLibrary.simpleMessage("Clear Backlog"),
+        "confirm": MessageLookupByLibrary.simpleMessage("Confirm"),
+        "confirmDeleteQuestion":
+            MessageLookupByLibrary.simpleMessage("ConfirmDelete?"),
         "delete": MessageLookupByLibrary.simpleMessage("Delete"),
-        "refresh": MessageLookupByLibrary.simpleMessage("Refresh")
+        "deleteNamespace":
+            MessageLookupByLibrary.simpleMessage("Delete Namespace"),
+        "deleteTenant": MessageLookupByLibrary.simpleMessage("Delete Tenant"),
+        "deleteTopic": MessageLookupByLibrary.simpleMessage("Delete Topic"),
+        "namespaceName": MessageLookupByLibrary.simpleMessage("Namespace Name"),
+        "refresh": MessageLookupByLibrary.simpleMessage("Refresh"),
+        "tenantName": MessageLookupByLibrary.simpleMessage("Tenant Name"),
+        "topicName": MessageLookupByLibrary.simpleMessage("Topic Name")
       };
 }
diff --git a/lib/generated/intl/messages_zh.dart b/lib/generated/intl/messages_zh.dart
@@ -22,8 +22,17 @@ class MessageLookup extends MessageLookupByLibrary {
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
         "appName": MessageLookupByLibrary.simpleMessage("Paas 仪表盘"),
+        "cancel": MessageLookupByLibrary.simpleMessage("取消"),
         "clearBacklog": MessageLookupByLibrary.simpleMessage("清理积压"),
+        "confirm": MessageLookupByLibrary.simpleMessage("确认"),
+        "confirmDeleteQuestion": MessageLookupByLibrary.simpleMessage("确认删除吗？"),
         "delete": MessageLookupByLibrary.simpleMessage("删除"),
-        "refresh": MessageLookupByLibrary.simpleMessage("刷新")
+        "deleteNamespace": MessageLookupByLibrary.simpleMessage("删除命名空间"),
+        "deleteTenant": MessageLookupByLibrary.simpleMessage("删除租户"),
+        "deleteTopic": MessageLookupByLibrary.simpleMessage("删除 Topic"),
+        "namespaceName": MessageLookupByLibrary.simpleMessage("命名空间名称"),
+        "refresh": MessageLookupByLibrary.simpleMessage("刷新"),
+        "tenantName": MessageLookupByLibrary.simpleMessage("租户名称"),
+        "topicName": MessageLookupByLibrary.simpleMessage("Topic 名称")
       };
 }
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
@@ -2,5 +2,14 @@
   "appName": "Paas Dashboard",
   "refresh": "Refresh",
   "delete": "Delete",
+  "cancel": "Cancel",
+  "confirm": "Confirm",
+  "confirmDeleteQuestion": "ConfirmDelete?",
+  "tenantName": "Tenant Name",
+  "deleteTenant": "Delete Tenant",
+  "namespaceName": "Namespace Name",
+  "deleteNamespace": "Delete Namespace",
+  "topicName": "Topic Name",
+  "deleteTopic": "Delete Topic",
   "clearBacklog": "Clear Backlog"
 }
diff --git a/lib/l10n/intl_zh.arb b/lib/l10n/intl_zh.arb
@@ -2,5 +2,14 @@
   "appName": "Paas 仪表盘",
   "refresh": "刷新",
   "delete": "删除",
+  "cancel": "取消",
+  "confirm": "确认",
+  "confirmDeleteQuestion": "确认删除吗？",
+  "tenantName": "租户名称",
+  "deleteTenant": "删除租户",
+  "namespaceName": "命名空间名称",
+  "deleteNamespace": "删除命名空间",
+  "topicName": "Topic 名称",
+  "deleteTopic": "删除 Topic",
   "clearBacklog": "清理积压"
 }
diff --git a/lib/ui/component/delete_button.dart b/lib/ui/component/delete_button.dart
@@ -0,0 +1,45 @@
+import 'package:flutter/material.dart';
+import 'package:paas_dashboard_flutter/generated/l10n.dart';
+
+class DeleteButton extends StatelessWidget {
+  final VoidCallback voidCallback;
+
+  DeleteButton(this.voidCallback);
+
+  @override
+  Widget build(BuildContext context) {
+    return IconButton(
+        onPressed: () {
+          showDialog(
+              context: context,
+              builder: (context) {
+                return AlertDialog(
+                  title: Text(
+                    S.of(context).confirmDeleteQuestion,
+                    textAlign: TextAlign.center,
+                  ),
+                  actions: <Widget>[
+                    TextButton(
+                      child: Text(
+                        S.of(context).cancel,
+                      ),
+                      onPressed: () {
+                        Navigator.of(context).pop();
+                      },
+                    ),
+                    TextButton(
+                      child: Text(
+                        S.of(context).confirm,
+                      ),
+                      onPressed: () {
+                        voidCallback.call();
+                        Navigator.of(context).pop();
+                      },
+                    ),
+                  ],
+                );
+              });
+        },
+        icon: Icon(Icons.delete));
+  }
+}
diff --git a/lib/ui/pulsar/screen/pulsar_namespace.dart b/lib/ui/pulsar/screen/pulsar_namespace.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:paas_dashboard_flutter/generated/l10n.dart';
 import 'package:paas_dashboard_flutter/route/page_route_const.dart';
 import 'package:paas_dashboard_flutter/ui/util/alert_util.dart';
+import 'package:paas_dashboard_flutter/ui/util/data_cell_util.dart';
 import 'package:paas_dashboard_flutter/ui/util/form_util.dart';
 import 'package:paas_dashboard_flutter/ui/util/spinner_util.dart';
 import 'package:paas_dashboard_flutter/vm/pulsar/pulsar_namespace_view_model.dart';
@@ -64,19 +65,16 @@ class PulsarNamespaceScreenState extends State<PulsarNamespaceScreen> {
               DataCell(
                 Text(item.topic),
               ),
-              DataCell(TextButton(
-                child: Text('Delete'),
-                onPressed: () {
-                  vm.deleteTopic(item.topic);
-                },
-              )),
+              DataCellUtil.newDellDataCell(() {
+                vm.deleteTopic(item.topic);
+              }),
             ]));
     var topicsTable = SingleChildScrollView(
       child: PaginatedDataTable(
           showCheckboxColumn: false,
           columns: [
-            DataColumn(label: Text('Topic Name')),
-            DataColumn(label: Text('Delete Topic')),
+            DataColumn(label: Text(S.of(context).topicName)),
+            DataColumn(label: Text(S.of(context).deleteTopic)),
           ],
           source: vm),
     );

diff --git a/lib/ui/pulsar/screen/pulsar_tenant.dart b/lib/ui/pulsar/screen/pulsar_tenant.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:paas_dashboard_flutter/generated/l10n.dart';
 import 'package:paas_dashboard_flutter/route/page_route_const.dart';
 import 'package:paas_dashboard_flutter/ui/util/alert_util.dart';
+import 'package:paas_dashboard_flutter/ui/util/data_cell_util.dart';
 import 'package:paas_dashboard_flutter/ui/util/form_util.dart';
 import 'package:paas_dashboard_flutter/ui/util/spinner_util.dart';
 import 'package:paas_dashboard_flutter/vm/pulsar/pulsar_tenant_view_model.dart';
@@ -64,12 +65,9 @@ class PulsarTenantScreenState extends State<PulsarTenantScreen> {
               DataCell(
                 Text(item.namespace),
               ),
-              DataCell(TextButton(
-                child: Text(S.of(context).delete),
-                onPressed: () {
-                  vm.deleteNamespace(item.namespace);
-                },
-              )),
+              DataCellUtil.newDellDataCell(() {
+                vm.deleteNamespace(item.namespace);
+              }),
             ]));
     var formButton = createNamespace(context);
     var refreshButton = TextButton(
@@ -101,8 +99,8 @@ class PulsarTenantScreenState extends State<PulsarTenantScreen> {
           child: PaginatedDataTable(
               showCheckboxColumn: false,
               columns: [
-                DataColumn(label: Text('Namespace Name')),
-                DataColumn(label: Text('Delete namespace')),
+                DataColumn(label: Text(S.of(context).namespaceName)),
+                DataColumn(label: Text(S.of(context).deleteNamespace)),
               ],
               source: vm),
         ),

diff --git a/lib/ui/pulsar/tab/pulsar_details.dart b/lib/ui/pulsar/tab/pulsar_details.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:paas_dashboard_flutter/generated/l10n.dart';
 import 'package:paas_dashboard_flutter/route/page_route_const.dart';
 import 'package:paas_dashboard_flutter/ui/util/alert_util.dart';
+import 'package:paas_dashboard_flutter/ui/util/data_cell_util.dart';
 import 'package:paas_dashboard_flutter/ui/util/form_util.dart';
 import 'package:paas_dashboard_flutter/ui/util/spinner_util.dart';
 import 'package:paas_dashboard_flutter/vm/pulsar/pulsar_instance_view_model.dart';
@@ -64,12 +65,9 @@ class PulsarTenantsState extends State<PulsarTenantsWidget> {
               DataCell(
                 Text(item.tenant),
               ),
-              DataCell(TextButton(
-                child: Text(S.of(context).delete),
-                onPressed: () {
-                  vm.deleteTenants(item.tenant);
-                },
-              )),
+              DataCellUtil.newDellDataCell(() {
+                vm.deleteTenants(item.tenant);
+              })
             ]));
     var formButton = createTenant(context, vm.host, vm.port);
     var refreshButton = TextButton(
@@ -101,8 +99,8 @@ class PulsarTenantsState extends State<PulsarTenantsWidget> {
           child: PaginatedDataTable(
               showCheckboxColumn: false,
               columns: [
-                DataColumn(label: Text('TenantName')),
-                DataColumn(label: Text('Delete tenant')),
+                DataColumn(label: Text(S.of(context).tenantName)),
+                DataColumn(label: Text(S.of(context).deleteTenant)),
               ],
               source: vm),
         )
@@ -113,7 +111,7 @@ class PulsarTenantsState extends State<PulsarTenantsWidget> {
 
   ButtonStyleButton createTenant(BuildContext context, String host, int port) {
     final vm = Provider.of<PulsarInstanceViewModel>(context, listen: false);
-    var list = [FormFieldDef('Tenant Name')];
+    var list = [FormFieldDef(S.of(context).tenantName)];
     return FormUtil.createButton1("Pulsar Tenant", list, context,
         (tenant) async {
       vm.createTenant(tenant);

diff --git a/lib/ui/util/data_cell_util.dart b/lib/ui/util/data_cell_util.dart
@@ -0,0 +1,8 @@
+import 'package:flutter/material.dart';
+import 'package:paas_dashboard_flutter/ui/component/delete_button.dart';
+
+class DataCellUtil {
+  static DataCell newDellDataCell(VoidCallback voidCallback) {
+    return DataCell(DeleteButton(voidCallback));
+  }
+}