Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use nested tabbar in pulsar namespace page #39

Merged
merged 1 commit into from
Jan 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/generated/intl/messages_en.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class MessageLookup extends MessageLookupByLibrary {
final messages = _notInlinedMessages(_notInlinedMessages);
static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
"aboutAuthor": MessageLookupByLibrary.simpleMessage("About author"),
"anErrorOccurred": MessageLookupByLibrary.simpleMessage("An Error Occurred"),
"appName": MessageLookupByLibrary.simpleMessage("Paas Dashboard"),
"basic": MessageLookupByLibrary.simpleMessage("Basic"),
"brokersName": MessageLookupByLibrary.simpleMessage("Broker Instance"),
Expand Down
1 change: 1 addition & 0 deletions lib/generated/intl/messages_zh.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class MessageLookup extends MessageLookupByLibrary {
final messages = _notInlinedMessages(_notInlinedMessages);
static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
"aboutAuthor": MessageLookupByLibrary.simpleMessage("关于作者"),
"anErrorOccurred": MessageLookupByLibrary.simpleMessage("一个异常发生了"),
"appName": MessageLookupByLibrary.simpleMessage("Paas 仪表盘"),
"basic": MessageLookupByLibrary.simpleMessage("基础信息"),
"brokersName": MessageLookupByLibrary.simpleMessage("Pulsar 实例"),
Expand Down
10 changes: 10 additions & 0 deletions lib/generated/l10n.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib/l10n/intl_en.arb
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"@@locale": "en",
"aboutAuthor": "About author",
"anErrorOccurred": "An Error Occurred",
"appName": "Paas Dashboard",
"basic": "Basic",
"brokersName": "Broker Instance",
Expand Down
1 change: 1 addition & 0 deletions lib/l10n/intl_zh.arb
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"@@locale": "zh",
"aboutAuthor": "关于作者",
"anErrorOccurred": "一个异常发生了",
"appName": "Paas 仪表盘",
"basic": "基础信息",
"brokersName": "Pulsar 实例",
Expand Down
112 changes: 78 additions & 34 deletions lib/ui/pulsar/screen/pulsar_namespace.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'package:paas_dashboard_flutter/ui/pulsar/widget/pulsar_partitioned_topic
import 'package:paas_dashboard_flutter/ui/pulsar/widget/pulsar_sink_list.dart';
import 'package:paas_dashboard_flutter/ui/pulsar/widget/pulsar_source_list.dart';
import 'package:paas_dashboard_flutter/ui/pulsar/widget/pulsar_topic_list.dart';
import 'package:paas_dashboard_flutter/ui/util/colored_tab_bar.dart';
import 'package:paas_dashboard_flutter/vm/pulsar/pulsar_namespace_backlog_quota_view_model.dart';
import 'package:paas_dashboard_flutter/vm/pulsar/pulsar_namespace_policies_view_model.dart';
import 'package:paas_dashboard_flutter/vm/pulsar/pulsar_namespace_view_model.dart';
Expand Down Expand Up @@ -39,50 +40,93 @@ class PulsarNamespaceScreenState extends State<PulsarNamespaceScreen> {
Widget build(BuildContext context) {
final vm = Provider.of<PulsarNamespaceViewModel>(context);
return DefaultTabController(
length: 6,
length: 3,
child: Scaffold(
appBar: AppBar(
title: Text('Pulsar ${S.of(context).tenant} ${vm.tenant} -> ${S.of(context).namespace} ${vm.namespace}'),
bottom: TabBar(
tabs: [
Tab(text: "BacklogQuota"),
Tab(text: "PartitionedTopics"),
Tab(text: "Topics"),
Tab(text: "Source"),
Tab(text: "Sink"),
Tab(text: "Policies"),
Tab(text: "Policy"),
Tab(text: "Topic"),
Tab(text: "Function"),
],
),
),
body: TabBarView(
children: [
ChangeNotifierProvider(
create: (context) =>
PulsarNamespaceBacklogQuotaViewModel(vm.pulsarInstancePo, vm.tenantResp, vm.namespaceResp),
child: PulsarNamespaceBacklogQuotaWidget(),
).build(context),
ChangeNotifierProvider(
create: (context) =>
PulsarPartitionedTopicListViewModel(vm.pulsarInstancePo, vm.tenantResp, vm.namespaceResp),
child: PulsarPartitionedTopicListWidget(),
).build(context),
ChangeNotifierProvider(
create: (context) => PulsarTopicListViewModel(vm.pulsarInstancePo, vm.tenantResp, vm.namespaceResp),
child: PulsarTopicListWidget(),
).build(context),
ChangeNotifierProvider(
create: (context) => PulsarSourceListViewModel(vm.pulsarInstancePo, vm.tenantResp, vm.namespaceResp),
child: PulsarSourceListWidget(),
).build(context),
ChangeNotifierProvider(
create: (context) => PulsarSinkListViewModel(vm.pulsarInstancePo, vm.tenantResp, vm.namespaceResp),
child: PulsarSinkListWidget(),
).build(context),
ChangeNotifierProvider(
create: (context) =>
PulsarNamespacePoliciesViewModel(vm.pulsarInstancePo, vm.tenantResp, vm.namespaceResp),
child: PulsarNamespacePoliciesWidget(),
).build(context),
DefaultTabController(
length: 2,
child: Scaffold(
appBar: ColoredTabBar(
Colors.black,
TabBar(
tabs: [
Tab(text: "BacklogQuota"),
Tab(text: "Policies"),
],
)),
body: TabBarView(children: [
ChangeNotifierProvider(
create: (context) =>
PulsarNamespaceBacklogQuotaViewModel(vm.pulsarInstancePo, vm.tenantResp, vm.namespaceResp),
child: PulsarNamespaceBacklogQuotaWidget(),
).build(context),
ChangeNotifierProvider(
create: (context) =>
PulsarNamespacePoliciesViewModel(vm.pulsarInstancePo, vm.tenantResp, vm.namespaceResp),
child: PulsarNamespacePoliciesWidget(),
).build(context),
]),
),
),
DefaultTabController(
length: 2,
child: Scaffold(
appBar: ColoredTabBar(
Colors.black,
TabBar(
tabs: [
Tab(text: "PartitionedTopic"),
Tab(text: "Topic"),
],
)),
body: TabBarView(children: [
ChangeNotifierProvider(
create: (context) =>
PulsarPartitionedTopicListViewModel(vm.pulsarInstancePo, vm.tenantResp, vm.namespaceResp),
child: PulsarPartitionedTopicListWidget(),
).build(context),
ChangeNotifierProvider(
create: (context) => PulsarTopicListViewModel(vm.pulsarInstancePo, vm.tenantResp, vm.namespaceResp),
child: PulsarTopicListWidget(),
).build(context),
]),
),
),
DefaultTabController(
length: 2,
child: Scaffold(
appBar: ColoredTabBar(
Colors.black,
TabBar(
tabs: [
Tab(text: "Source"),
Tab(text: "Sink"),
],
)),
body: TabBarView(children: [
ChangeNotifierProvider(
create: (context) =>
PulsarSourceListViewModel(vm.pulsarInstancePo, vm.tenantResp, vm.namespaceResp),
child: PulsarSourceListWidget(),
).build(context),
ChangeNotifierProvider(
create: (context) => PulsarSinkListViewModel(vm.pulsarInstancePo, vm.tenantResp, vm.namespaceResp),
child: PulsarSinkListWidget(),
).build(context),
]),
),
)
],
),
),
Expand Down
1 change: 1 addition & 0 deletions lib/ui/pulsar/widget/pulsar_source_list.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class PulsarSourceListWidgetState extends State<PulsarSourceListWidget> {
void initState() {
super.initState();
final vm = Provider.of<PulsarSourceListViewModel>(context, listen: false);
vm.fetchSources();
searchTextController.addListener(() {
vm.filter(searchTextController.text);
});
Expand Down
3 changes: 2 additions & 1 deletion lib/ui/util/alert_util.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:paas_dashboard_flutter/generated/l10n.dart';

class AlertUtil {
static void exceptionDialog(Exception exception, BuildContext context) {
Expand All @@ -12,7 +13,7 @@ class AlertUtil {
static AlertDialog create(Object? error, BuildContext context) {
return AlertDialog(
title: Text(
'An Error Occured!',
S.of(context).anErrorOccurred,
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.redAccent,
Expand Down
17 changes: 17 additions & 0 deletions lib/ui/util/colored_tab_bar.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import 'package:flutter/material.dart';

class ColoredTabBar extends Container implements PreferredSizeWidget {
ColoredTabBar(this.color, this.tabBar);

final Color color;
final TabBar tabBar;

@override
Size get preferredSize => tabBar.preferredSize;

@override
Widget build(BuildContext context) => Container(
color: color,
child: tabBar,
);
}