Added placeholder for lastName and role addition functionality
Try to rebase
This commit is contained in:
@@ -8,8 +8,11 @@ import 'package:pweb/generated/i18n/app_localizations.dart';
|
||||
class InvitationFormFields extends StatelessWidget {
|
||||
final List<RoleDescription> roles;
|
||||
final TextEditingController emailController;
|
||||
final TextEditingController nameController;
|
||||
final TextEditingController firstNameController;
|
||||
final TextEditingController lastNameController;
|
||||
final TextEditingController messageController;
|
||||
final bool canCreateRoles;
|
||||
final VoidCallback onCreateRole;
|
||||
final String? selectedRoleRef;
|
||||
final ValueChanged<String?> onRoleChanged;
|
||||
|
||||
@@ -17,8 +20,11 @@ class InvitationFormFields extends StatelessWidget {
|
||||
super.key,
|
||||
required this.roles,
|
||||
required this.emailController,
|
||||
required this.nameController,
|
||||
required this.firstNameController,
|
||||
required this.lastNameController,
|
||||
required this.messageController,
|
||||
required this.canCreateRoles,
|
||||
required this.onCreateRole,
|
||||
required this.selectedRoleRef,
|
||||
required this.onRoleChanged,
|
||||
});
|
||||
@@ -47,11 +53,21 @@ class InvitationFormFields extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
width: 280,
|
||||
width: 200,
|
||||
child: TextFormField(
|
||||
controller: nameController,
|
||||
controller: firstNameController,
|
||||
decoration: InputDecoration(
|
||||
labelText: loc.invitationNameLabel,
|
||||
labelText: loc.firstName,
|
||||
prefixIcon: const Icon(Icons.person_outline),
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
width: 200,
|
||||
child: TextFormField(
|
||||
controller: lastNameController,
|
||||
decoration: InputDecoration(
|
||||
labelText: loc.lastName,
|
||||
prefixIcon: const Icon(Icons.person_outline),
|
||||
),
|
||||
),
|
||||
@@ -59,7 +75,7 @@ class InvitationFormFields extends StatelessWidget {
|
||||
SizedBox(
|
||||
width: 260,
|
||||
child: DropdownButtonFormField<String>(
|
||||
initialValue: selectedRoleRef ?? (roles.isNotEmpty ? roles.first.storable.id : null),
|
||||
value: selectedRoleRef,
|
||||
items: roles.map((role) => DropdownMenuItem(
|
||||
value: role.storable.id,
|
||||
child: Text(role.describable.name),
|
||||
@@ -68,6 +84,11 @@ class InvitationFormFields extends StatelessWidget {
|
||||
decoration: InputDecoration(
|
||||
labelText: loc.invitationRoleLabel,
|
||||
prefixIcon: const Icon(Icons.security_outlined),
|
||||
suffixIcon: IconButton(
|
||||
onPressed: canCreateRoles ? onCreateRole : null,
|
||||
icon: const Icon(Icons.add_circle_outline),
|
||||
tooltip: loc.invitationAddRoleButton,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -6,8 +6,11 @@ import 'package:pweb/pages/invitations/widgets/form/view.dart';
|
||||
class InvitationsForm extends StatelessWidget {
|
||||
final GlobalKey<FormState> formKey;
|
||||
final TextEditingController emailController;
|
||||
final TextEditingController nameController;
|
||||
final TextEditingController firstNameController;
|
||||
final TextEditingController lastNameController;
|
||||
final TextEditingController messageController;
|
||||
final bool canCreateRoles;
|
||||
final VoidCallback onCreateRole;
|
||||
final int expiryDays;
|
||||
final ValueChanged<int> onExpiryChanged;
|
||||
final String? selectedRoleRef;
|
||||
@@ -19,8 +22,11 @@ class InvitationsForm extends StatelessWidget {
|
||||
super.key,
|
||||
required this.formKey,
|
||||
required this.emailController,
|
||||
required this.nameController,
|
||||
required this.firstNameController,
|
||||
required this.lastNameController,
|
||||
required this.messageController,
|
||||
required this.canCreateRoles,
|
||||
required this.onCreateRole,
|
||||
required this.expiryDays,
|
||||
required this.onExpiryChanged,
|
||||
required this.selectedRoleRef,
|
||||
@@ -33,8 +39,11 @@ class InvitationsForm extends StatelessWidget {
|
||||
Widget build(BuildContext context) => InvitationFormView(
|
||||
formKey: formKey,
|
||||
emailController: emailController,
|
||||
nameController: nameController,
|
||||
firstNameController: firstNameController,
|
||||
lastNameController: lastNameController,
|
||||
messageController: messageController,
|
||||
canCreateRoles: canCreateRoles,
|
||||
onCreateRole: onCreateRole,
|
||||
expiryDays: expiryDays,
|
||||
onExpiryChanged: onExpiryChanged,
|
||||
selectedRoleRef: selectedRoleRef,
|
||||
|
||||
@@ -13,8 +13,11 @@ import 'package:pweb/generated/i18n/app_localizations.dart';
|
||||
class InvitationFormView extends StatelessWidget {
|
||||
final GlobalKey<FormState> formKey;
|
||||
final TextEditingController emailController;
|
||||
final TextEditingController nameController;
|
||||
final TextEditingController firstNameController;
|
||||
final TextEditingController lastNameController;
|
||||
final TextEditingController messageController;
|
||||
final bool canCreateRoles;
|
||||
final VoidCallback onCreateRole;
|
||||
final int expiryDays;
|
||||
final ValueChanged<int> onExpiryChanged;
|
||||
final String? selectedRoleRef;
|
||||
@@ -26,8 +29,11 @@ class InvitationFormView extends StatelessWidget {
|
||||
super.key,
|
||||
required this.formKey,
|
||||
required this.emailController,
|
||||
required this.nameController,
|
||||
required this.firstNameController,
|
||||
required this.lastNameController,
|
||||
required this.messageController,
|
||||
required this.canCreateRoles,
|
||||
required this.onCreateRole,
|
||||
required this.expiryDays,
|
||||
required this.onExpiryChanged,
|
||||
required this.selectedRoleRef,
|
||||
@@ -61,8 +67,11 @@ class InvitationFormView extends StatelessWidget {
|
||||
InvitationFormFields(
|
||||
roles: roles,
|
||||
emailController: emailController,
|
||||
nameController: nameController,
|
||||
firstNameController: firstNameController,
|
||||
lastNameController: lastNameController,
|
||||
messageController: messageController,
|
||||
canCreateRoles: canCreateRoles,
|
||||
onCreateRole: onCreateRole,
|
||||
selectedRoleRef: selectedRoleRef,
|
||||
onRoleChanged: onRoleChanged,
|
||||
),
|
||||
|
||||
@@ -6,9 +6,9 @@ import 'package:pshared/models/invitation/invitation.dart';
|
||||
import 'package:pshared/provider/invitations.dart';
|
||||
|
||||
import 'package:pweb/models/invitation_filter.dart';
|
||||
import 'package:pweb/pages/invitations/widgets/filter/invitation_filter.dart';
|
||||
import 'package:pweb/pages/invitations/widgets/filter/chips.dart';
|
||||
import 'package:pweb/pages/invitations/widgets/list/body.dart';
|
||||
import 'package:pweb/pages/invitations/widgets/list/view_model.dart';
|
||||
import 'package:pweb/pages/invitations/widgets/search_field.dart';
|
||||
import 'package:pweb/widgets/error/snackbar.dart';
|
||||
|
||||
@@ -25,70 +25,62 @@ class InvitationListView extends StatefulWidget {
|
||||
class _InvitationListViewState extends State<InvitationListView> {
|
||||
final TextEditingController _searchController = TextEditingController();
|
||||
|
||||
InvitationFilter _filter = InvitationFilter.all;
|
||||
String _query = '';
|
||||
Object? _lastError;
|
||||
InvitationsProvider? _provider;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_provider = context.read<InvitationsProvider>();
|
||||
_provider?.addListener(_onProviderChanged);
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_provider?.removeListener(_onProviderChanged);
|
||||
_searchController.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _setQuery(String query) {
|
||||
setState(() => _query = query.trim().toLowerCase());
|
||||
}
|
||||
void _setQuery(String query) => context.read<InvitationListViewModel>().setQuery(query);
|
||||
void _setFilter(InvitationFilter filter) => context.read<InvitationListViewModel>().setFilter(filter);
|
||||
|
||||
void _setFilter(InvitationFilter filter) {
|
||||
setState(() => _filter = filter);
|
||||
}
|
||||
|
||||
void _notifyError(BuildContext context, Object error, AppLocalizations loc) {
|
||||
void _onProviderChanged() {
|
||||
final provider = _provider;
|
||||
if (provider == null) {
|
||||
return;
|
||||
}
|
||||
final error = provider.error;
|
||||
if (error == null) {
|
||||
_lastError = null;
|
||||
return;
|
||||
}
|
||||
if (identical(error, _lastError)) {
|
||||
return;
|
||||
}
|
||||
_lastError = error;
|
||||
postNotifyUserOfErrorX(
|
||||
context: context,
|
||||
errorSituation: loc.errorLoadingInvitations,
|
||||
exception: error,
|
||||
);
|
||||
}
|
||||
|
||||
List<Invitation> _filteredInvitations(List<Invitation> invitations) {
|
||||
final showArchived = _filter == InvitationFilter.archived;
|
||||
Iterable<Invitation> filtered = invitations
|
||||
.where((inv) => showArchived ? inv.isArchived : !inv.isArchived)
|
||||
.where((inv) => invitationFilterMatches(_filter, inv));
|
||||
|
||||
if (_query.isNotEmpty) {
|
||||
filtered = filtered.where((inv) {
|
||||
return inv.inviteeDisplayName.toLowerCase().contains(_query)
|
||||
|| inv.content.email.toLowerCase().contains(_query);
|
||||
});
|
||||
}
|
||||
|
||||
final sorted = filtered.toList()
|
||||
..sort((a, b) => b.createdAt.compareTo(a.createdAt));
|
||||
return sorted;
|
||||
final loc = AppLocalizations.of(context)!;
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (!mounted) return;
|
||||
postNotifyUserOfErrorX(
|
||||
context: context,
|
||||
errorSituation: loc.errorLoadingInvitations,
|
||||
exception: error,
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final loc = AppLocalizations.of(context)!;
|
||||
final provider = context.watch<InvitationsProvider>();
|
||||
final viewModel = context.watch<InvitationListViewModel>();
|
||||
|
||||
if (provider.isLoading) {
|
||||
return const Center(child: CircularProgressIndicator());
|
||||
}
|
||||
|
||||
if (provider.error != null) {
|
||||
_notifyError(context, provider.error!, loc);
|
||||
} else {
|
||||
_lastError = null;
|
||||
}
|
||||
|
||||
final invitations = _filteredInvitations(provider.invitations);
|
||||
final invitations = viewModel.filteredInvitations(provider.invitations);
|
||||
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
@@ -100,7 +92,7 @@ class _InvitationListViewState extends State<InvitationListView> {
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
InvitationFilterChips(
|
||||
selectedFilter: _filter,
|
||||
selectedFilter: viewModel.filter,
|
||||
onSelected: _setFilter,
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:pshared/models/invitation/invitation.dart';
|
||||
|
||||
import 'package:pweb/models/invitation_filter.dart';
|
||||
import 'package:pweb/pages/invitations/widgets/filter/invitation_filter.dart';
|
||||
|
||||
|
||||
class InvitationListViewModel extends ChangeNotifier {
|
||||
InvitationFilter _filter = InvitationFilter.all;
|
||||
String _query = '';
|
||||
|
||||
InvitationFilter get filter => _filter;
|
||||
String get query => _query;
|
||||
|
||||
void setFilter(InvitationFilter filter) {
|
||||
if (_filter == filter) return;
|
||||
_filter = filter;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void setQuery(String query) {
|
||||
final normalized = query.trim().toLowerCase();
|
||||
if (_query == normalized) return;
|
||||
_query = normalized;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
List<Invitation> filteredInvitations(List<Invitation> invitations) {
|
||||
final showArchived = _filter == InvitationFilter.archived;
|
||||
Iterable<Invitation> filtered = invitations
|
||||
.where((inv) => showArchived ? inv.isArchived : !inv.isArchived)
|
||||
.where((inv) => invitationFilterMatches(_filter, inv));
|
||||
|
||||
if (_query.isNotEmpty) {
|
||||
filtered = filtered.where((inv) {
|
||||
return inv.inviteeDisplayName.toLowerCase().contains(_query)
|
||||
|| inv.content.email.toLowerCase().contains(_query);
|
||||
});
|
||||
}
|
||||
|
||||
final sorted = filtered.toList()
|
||||
..sort((a, b) => b.createdAt.compareTo(a.createdAt));
|
||||
return sorted;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user