tech/sendico
2
0
Fork 0
Code Issues 24 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Added placeholder for lastName and role addition functionality

Browse Source 
Try to rebase
This commit is contained in:
Arseni
2026-01-14 17:06:33 +03:00
parent 6bc5130883
commit 9319108b26
17 changed files with 348 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
frontend/pweb/lib/pages/invitations/page.dart
View File

@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:collection/collection.dart';
import 'package:provider/provider.dart';
import 'package:pshared/models/resources.dart';
@@ -13,6 +14,7 @@ import 'package:pweb/pages/invitations/widgets/form/form.dart';
import 'package:pweb/pages/invitations/widgets/list/list.dart';
import 'package:pweb/pages/loader.dart';
import 'package:pweb/widgets/error/snackbar.dart';
import 'package:pweb/widgets/roles/create_role_dialog.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
@@ -27,12 +29,34 @@ class InvitationsPage extends StatefulWidget {
class _InvitationsPageState extends State<InvitationsPage> {
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
final TextEditingController _emailController = TextEditingController();
final TextEditingController _nameController = TextEditingController();
final TextEditingController _firstNameController = TextEditingController();
final TextEditingController _lastNameController = TextEditingController();
final TextEditingController _messageController = TextEditingController();
String? _selectedRoleRef;
int _expiryDays = 7;
Future<void> _createRole() async {
final loc = AppLocalizations.of(context)!;
final draft = await showCreateRoleDialog(context);
if (draft == null) return;
final permissions = context.read<PermissionsProvider>();
final createdRole = await executeActionWithNotification(
context: context,
action: () => permissions.createRoleDescription(
name: draft.name,
description: draft.description.isEmpty ? null : draft.description,
),
successMessage: loc.invitationRoleCreated,
errorMessage: loc.invitationRoleCreateFailed,
);
if (createdRole != null && mounted) {
setState(() => _selectedRoleRef = createdRole.id);
}
}
@override
void didChangeDependencies() {
super.didChangeDependencies();
@@ -41,15 +65,20 @@ class _InvitationsPageState extends State<InvitationsPage> {
void _bootstrapRoleSelection() {
final roles = context.read<PermissionsProvider>().roleDescriptions;
if (_selectedRoleRef == null && roles.isNotEmpty) {
_selectedRoleRef = roles.first.storable.id;
}
if (roles.isEmpty) return;
final firstRoleRef = roles.first.storable.id;
final isSelectedAvailable = _selectedRoleRef != null
&& roles.any((role) => role.storable.id == _selectedRoleRef);
if (isSelectedAvailable) return;
if (!mounted) return;
setState(() => _selectedRoleRef = firstRoleRef);
}
@override
void dispose() {
_emailController.dispose();
_nameController.dispose();
_firstNameController.dispose();
_lastNameController.dispose();
_messageController.dispose();
super.dispose();
}
@@ -71,7 +100,8 @@ class _InvitationsPageState extends State<InvitationsPage> {
context: context,
action: () => invitations.sendInvitation(
email: _emailController.text.trim(),
name: _nameController.text.trim(),
name: _firstNameController.text.trim(),
lastName: _lastNameController.text.trim(),
comment: _messageController.text.trim(),
roleRef: roleRef,
inviterRef: account.id,
@@ -82,7 +112,8 @@ class _InvitationsPageState extends State<InvitationsPage> {
);
_emailController.clear();
_nameController.clear();
_firstNameController.clear();
_lastNameController.clear();
_messageController.clear();
}
@@ -90,6 +121,7 @@ class _InvitationsPageState extends State<InvitationsPage> {
Widget build(BuildContext context) {
final loc = AppLocalizations.of(context)!;
final permissions = context.watch<PermissionsProvider>();
final canCreateRoles = permissions.canCreate(ResourceType.roles);
if (!permissions.canRead(ResourceType.invitations)) {
return PageViewLoader(
@@ -109,8 +141,11 @@ class _InvitationsPageState extends State<InvitationsPage> {
InvitationsForm(
formKey: _formKey,
emailController: _emailController,
nameController: _nameController,
firstNameController: _firstNameController,
lastNameController: _lastNameController,
messageController: _messageController,
canCreateRoles: canCreateRoles,
onCreateRole: _createRole,
expiryDays: _expiryDays,
onExpiryChanged: (value) => setState(() => _expiryDays = value),
selectedRoleRef: _selectedRoleRef,

33
frontend/pweb/lib/pages/invitations/widgets/form/fields.dart
View File

@@ -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,
),
),
),
),

15
frontend/pweb/lib/pages/invitations/widgets/form/form.dart
View File

@@ -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,

15
frontend/pweb/lib/pages/invitations/widgets/form/view.dart
View File

@@ -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,
),

76
frontend/pweb/lib/pages/invitations/widgets/list/view.dart
View File

@@ -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),

46
frontend/pweb/lib/pages/invitations/widgets/list/view_model.dart Normal file
View File

@@ -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;
}
}