Added missing localizations

2026-01-15 11:05:15 +03:00
17 changed files with 72 additions and 352 deletions
--- a/frontend/pshared/lib/data/dto/invitation/invitation.dart
+++ b/frontend/pshared/lib/data/dto/invitation/invitation.dart
@@ -9,15 +9,11 @@ part 'invitation.g.dart';
 class InvitationContentDTO {
  final String email;
  final String name;
-  @JsonKey(defaultValue: '')
-  //TODO remove when backend will accept lastName
-  final String lastName;
  final String comment;

  const InvitationContentDTO({
    required this.email,
    required this.name,
-    required this.lastName,
    required this.comment,
  });

--- a/frontend/pshared/lib/data/mapper/invitation/invitation.dart
+++ b/frontend/pshared/lib/data/mapper/invitation/invitation.dart
@@ -20,7 +20,6 @@ extension InvitationModelMapper on Invitation {
    content: InvitationContentDTO(
      email: content.email,
      name: content.name,
-      lastName: content.lastName,
      comment: content.comment,
    ),
    isArchived: isArchived,
@@ -41,7 +40,6 @@ extension InvitationDTOMapper on InvitationDTO {
    content: InvitationContent(
      email: content.email,
      name: content.name,
-      lastName: content.lastName,
      comment: content.comment,
    ),
    isArchived: isArchived,
--- a/frontend/pshared/lib/models/invitation/invitation.dart
+++ b/frontend/pshared/lib/models/invitation/invitation.dart
@@ -8,36 +8,23 @@ import 'package:pshared/models/invitation/status.dart';
 class InvitationContent {
  final String email;
  final String name;
-  final String lastName;
  final String comment;

  const InvitationContent({
    required this.email,
    required this.name,
-    required this.lastName,
    required this.comment,
  });

  InvitationContent copyWith({
    String? email,
    String? name,
-    String? lastName,
    String? comment,
  }) => InvitationContent(
    email: email ?? this.email,
    name: name ?? this.name,
-    lastName: lastName ?? this.lastName,
    comment: comment ?? this.comment,
  );
-
-  String get fullName {
-    final trimmedName = name.trim();
-    final trimmedLastName = lastName.trim();
-    if (trimmedName.isEmpty && trimmedLastName.isEmpty) return '';
-    if (trimmedName.isEmpty) return trimmedLastName;
-    if (trimmedLastName.isEmpty) return trimmedName;
-    return '$trimmedName $trimmedLastName';
-  }
 }

 class Invitation implements PermissionBoundStorable {
@@ -73,7 +60,7 @@ class Invitation implements PermissionBoundStorable {
  @override
  String get organizationRef => permissionBound.organizationRef;

-  String get inviteeDisplayName => content.fullName.isNotEmpty ? content.fullName : content.email;
+  String get inviteeDisplayName => content.name.isNotEmpty ? content.name : content.email;
  bool get isExpired => expiresAt.isBefore(DateTime.now().toUtc());
  bool get isPending => status == InvitationStatus.created || status == InvitationStatus.sent;

@@ -104,7 +91,6 @@ Invitation newInvitation({
  required String inviterRef,
  required String email,
  String name = '',
-  String lastName = '',
  String comment = '',
  InvitationStatus status = InvitationStatus.created,
  DateTime? expiresAt,
@@ -120,6 +106,6 @@ Invitation newInvitation({
  inviterRef: inviterRef,
  status: status,
  expiresAt: expiresAt ?? DateTime.now().toUtc().add(const Duration(days: 7)),
-  content: InvitationContent(email: email, name: name, lastName: lastName, comment: comment),
+  content: InvitationContent(email: email, name: name, comment: comment),
  isArchived: isArchived,
 );
--- a/frontend/pshared/lib/provider/invitations.dart
+++ b/frontend/pshared/lib/provider/invitations.dart
@@ -30,7 +30,6 @@ class InvitationsProvider extends GenericProvider<Invitation> {
    required String roleRef,
    required String inviterRef,
    String name = '',
-    String lastName = '',
    String comment = '',
    DateTime? expiresAt,
  }) async {
@@ -40,7 +39,6 @@ class InvitationsProvider extends GenericProvider<Invitation> {
      inviterRef: inviterRef,
      email: email,
      name: name,
-      lastName: lastName,
      comment: comment,
      expiresAt: expiresAt,
    );
--- a/frontend/pshared/lib/provider/permissions.dart
+++ b/frontend/pshared/lib/provider/permissions.dart
@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:collection/collection.dart';

 import 'package:pshared/api/requests/change_role.dart';
-import 'package:pshared/models/describable.dart';
 import 'package:pshared/models/permissions/access.dart';
 import 'package:pshared/models/permissions/action.dart' as perm;
 import 'package:pshared/models/permissions/data/permission.dart';
@@ -102,32 +101,6 @@ class PermissionsProvider extends ChangeNotifier {
    return _performServiceCall(() => PermissionsService.deleteRoleDescription(descRef));
  }

-  Future<RoleDescription?> createRoleDescription({
-    required String name,
-    String? description,
-  }) async {
-    if (!_organizations.isOrganizationSet) {
-      throw StateError('Organization is not set');
-    }
-    final normalizedName = name.trim();
-    final normalizedDescription = description?.trim();
-    final roleDescription = RoleDescription.build(
-      organizationRef: _organizations.current.id,
-      roleDescription: newDescribable(name: normalizedName, description: normalizedDescription),
-    );
-
-    await _performServiceCall(() => PermissionsService.createRoleDescription(roleDescription));
-    final matches = roleDescriptions.where(
-      (role) =>
-        role.organizationRef == _organizations.current.id &&
-        role.name == normalizedName &&
-        (role.description ?? '') == (normalizedDescription ?? ''),
-    ).toList()
-      ..sort((a, b) => b.createdAt.compareTo(a.createdAt));
-
-    return matches.isEmpty ? null : matches.first;
-  }
-
  Future<UserAccess?> createPermissions(List<Policy> policies) {
    return _performServiceCall(() => PermissionsService.createPolicies(policies));
  }
--- a/frontend/pshared/lib/service/permissions.dart
+++ b/frontend/pshared/lib/service/permissions.dart
@@ -4,9 +4,7 @@ import 'package:pshared/api/requests/change_role.dart';
 import 'package:pshared/api/requests/permissions/change_policies.dart';
 import 'package:pshared/api/responses/policies.dart';
 import 'package:pshared/data/mapper/permissions/data/permissions.dart';
-import 'package:pshared/data/mapper/permissions/descriptions/role.dart';
 import 'package:pshared/data/mapper/permissions/descriptions/description.dart';
-import 'package:pshared/models/permissions/descriptions/role.dart';
 import 'package:pshared/models/permissions/access.dart';
 import 'package:pshared/models/permissions/data/policy.dart';
 import 'package:pshared/service/authorization/service.dart';
@@ -37,15 +35,6 @@ class PermissionsService {
    await AuthorizationService.getDELETEResponse(_objectType, '/role/$roleDescriptionRef', {});
  }  

-  static Future<void> createRoleDescription(RoleDescription roleDescription) async {
-    _logger.fine('Creating role ${roleDescription.name}...');
-    await AuthorizationService.getPOSTResponse(
-      _objectType,
-      '/role',
-      roleDescription.toDTO().toJson(),
-    );
-  }
-
  static Future<void> createPolicies(List<Policy> policies) async {
    _logger.fine('Creating ${policies.length} policies...');
    await AuthorizationService.getPOSTResponse(
--- a/frontend/pweb/lib/l10n/en.arb
+++ b/frontend/pweb/lib/l10n/en.arb
@@ -193,11 +193,6 @@
  "invitationEmailLabel": "Work email",
  "invitationNameLabel": "Full name",
  "invitationRoleLabel": "Role",
-  "invitationAddRoleButton": "Add role",
-  "invitationAddRoleTitle": "New role",
-  "invitationRoleNameLabel": "Role name",
-  "invitationRoleNameRequired": "Role name is required",
-  "invitationRoleDescriptionLabel": "Role description (optional)",
  "invitationMessageLabel": "Message (optional)",
  "invitationExpiresIn": "Expires in {days} days",
  "@invitationExpiresIn": {
@@ -209,7 +204,6 @@
  },
  "invitationSendButton": "Send invitation",
  "invitationCreatedSuccess": "Invitation sent",
-  "invitationRoleCreated": "Role created",
  "invitationSearchHint": "Search invitations",
  "invitationFilterAll": "All",
  "invitationFilterPending": "Pending",
@@ -233,7 +227,6 @@
  "invitationRevoked": "Invitation revoked",
  "invitationArchiveFailed": "Could not archive the invitation",
  "invitationRevokeFailed": "Could not revoke the invitation",
-  "invitationRoleCreateFailed": "Could not create role",
  "invitationUnknownRole": "Unknown role",
  
  "operationfryTitle": "Operation history",
@@ -571,6 +564,10 @@
  "colComment": "Comment",
  "recipientNoPaymentDetails": "This recipient has no available payment details.",
  "paymentInfo": "Payment info",
+  "paymentStatusSuccessTitle": "Payment completed",
+  "paymentStatusFailureTitle": "Payment failed",
+  "paymentStatusSuccessMessage": "The payment was completed successfully.",
+  "paymentStatusFailureMessage": "The payment could not be completed.",
  "recipient": "Recipient",
  "chooseAnotherRecipient": "Choose another recipient",
  "noRecipientsYet": "No recipients yet.",
--- a/frontend/pweb/lib/l10n/ru.arb
+++ b/frontend/pweb/lib/l10n/ru.arb
@@ -193,11 +193,6 @@
  "invitationEmailLabel": "Рабочий email",
  "invitationNameLabel": "Полное имя",
  "invitationRoleLabel": "Роль",
-  "invitationAddRoleButton": "Добавить роль",
-  "invitationAddRoleTitle": "Новая роль",
-  "invitationRoleNameLabel": "Название роли",
-  "invitationRoleNameRequired": "Укажите название роли",
-  "invitationRoleDescriptionLabel": "Описание роли (необязательно)",
  "invitationMessageLabel": "Сообщение (необязательно)",
  "invitationExpiresIn": "Истекает через {days} дн.",
  "@invitationExpiresIn": {
@@ -209,7 +204,6 @@
  },
  "invitationSendButton": "Отправить приглашение",
  "invitationCreatedSuccess": "Приглашение отправлено",
-  "invitationRoleCreated": "Роль создана",
  "invitationSearchHint": "Поиск приглашений",
  "invitationFilterAll": "Все",
  "invitationFilterPending": "В ожидании",
@@ -233,7 +227,6 @@
  "invitationRevoked": "Приглашение отозвано",
  "invitationArchiveFailed": "Не удалось архивировать приглашение",
  "invitationRevokeFailed": "Не удалось отозвать приглашение",
-  "invitationRoleCreateFailed": "Не удалось создать роль",
  "invitationUnknownRole": "Неизвестная роль",
  
  "operationfryTitle": "История операций",
@@ -572,6 +565,10 @@
  "colComment": "Комментарий",
  "recipientNoPaymentDetails": "У этого получателя нет доступных платежных данных.",
  "paymentInfo": "Платежная информация",
+  "paymentStatusSuccessTitle": "Платеж выполнен",
+  "paymentStatusFailureTitle": "Платеж не выполнен",
+  "paymentStatusSuccessMessage": "Платеж прошел успешно.",
+  "paymentStatusFailureMessage": "Не удалось выполнить платеж.",
  "recipient": "Получатель",
  "chooseAnotherRecipient": "Выбрать другого получателя",
  "noRecipientsYet": "Получателей пока нет.",
--- a/frontend/pweb/lib/main.dart
+++ b/frontend/pweb/lib/main.dart
@@ -19,7 +19,6 @@ import 'package:pshared/provider/invitations.dart';
 import 'package:pshared/service/payment/wallets.dart';

 import 'package:pweb/app/app.dart';
-import 'package:pweb/pages/invitations/widgets/list/view_model.dart';
 import 'package:pweb/app/timeago.dart';
 import 'package:pweb/providers/carousel.dart';
 import 'package:pweb/providers/operatioins.dart';
@@ -86,13 +85,6 @@ void main() async {
          create: (_) => InvitationsProvider(),
          update: (context, organizations, provider) => provider!..updateProviders(organizations),
        ),
-        ChangeNotifierProxyProvider2<OrganizationsProvider, RecipientsProvider, PaymentMethodsProvider>(
-           create: (_) => PaymentMethodsProvider(),
-           update: (context, organizations, recipients, provider) => provider!..updateProviders(organizations, recipients),
-        ),
-        ChangeNotifierProvider(
-          create: (_) => InvitationListViewModel(),
-        ),
        ChangeNotifierProxyProvider<OrganizationsProvider, WalletsProvider>(
          create: (_) => WalletsProvider(ApiWalletsService()),
          update: (context, organizations, provider) => provider!..update(organizations),
--- a/frontend/pweb/lib/models/role_draft.dart
+++ b/frontend/pweb/lib/models/role_draft.dart
@@ -1,9 +0,0 @@
-class RoleDraft {
-  final String name;
-  final String description;
-
-  const RoleDraft({
-    required this.name,
-    required this.description,
-  });
-}
--- a/frontend/pweb/lib/pages/invitations/page.dart
+++ b/frontend/pweb/lib/pages/invitations/page.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';

 import 'package:collection/collection.dart';
-
 import 'package:provider/provider.dart';

 import 'package:pshared/models/resources.dart';
@@ -14,7 +13,6 @@ 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';

@@ -29,34 +27,12 @@ class InvitationsPage extends StatefulWidget {
 class _InvitationsPageState extends State<InvitationsPage> {
  final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
  final TextEditingController _emailController = TextEditingController();
-  final TextEditingController _firstNameController = TextEditingController();
-  final TextEditingController _lastNameController = TextEditingController();
+  final TextEditingController _nameController = 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();
@@ -65,20 +41,15 @@ class _InvitationsPageState extends State<InvitationsPage> {

  void _bootstrapRoleSelection() {
    final roles = context.read<PermissionsProvider>().roleDescriptions;
-    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);
+    if (_selectedRoleRef == null && roles.isNotEmpty) {
+      _selectedRoleRef = roles.first.storable.id;
+    }
  }

  @override
  void dispose() {
    _emailController.dispose();
-    _firstNameController.dispose();
-    _lastNameController.dispose();
+    _nameController.dispose();
    _messageController.dispose();
    super.dispose();
  }
@@ -100,8 +71,7 @@ class _InvitationsPageState extends State<InvitationsPage> {
      context: context,
      action: () => invitations.sendInvitation(
        email: _emailController.text.trim(),
-        name: _firstNameController.text.trim(),
-        lastName: _lastNameController.text.trim(),
+        name: _nameController.text.trim(),
        comment: _messageController.text.trim(),
        roleRef: roleRef,
        inviterRef: account.id,
@@ -112,8 +82,7 @@ class _InvitationsPageState extends State<InvitationsPage> {
    );

    _emailController.clear();
-    _firstNameController.clear();
-    _lastNameController.clear();
+    _nameController.clear();
    _messageController.clear();
  }

@@ -121,7 +90,6 @@ 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(
@@ -141,11 +109,8 @@ class _InvitationsPageState extends State<InvitationsPage> {
              InvitationsForm(
                formKey: _formKey,
                emailController: _emailController,
-                firstNameController: _firstNameController,
-                lastNameController: _lastNameController,
+                nameController: _nameController,
                messageController: _messageController,
-                canCreateRoles: canCreateRoles,
-                onCreateRole: _createRole,
                expiryDays: _expiryDays,
                onExpiryChanged: (value) => setState(() => _expiryDays = value),
                selectedRoleRef: _selectedRoleRef,
--- a/frontend/pweb/lib/pages/invitations/widgets/form/fields.dart
+++ b/frontend/pweb/lib/pages/invitations/widgets/form/fields.dart
@@ -8,11 +8,8 @@ import 'package:pweb/generated/i18n/app_localizations.dart';
 class InvitationFormFields extends StatelessWidget {
  final List<RoleDescription> roles;
  final TextEditingController emailController;
-  final TextEditingController firstNameController;
-  final TextEditingController lastNameController;
+  final TextEditingController nameController;
  final TextEditingController messageController;
-  final bool canCreateRoles;
-  final VoidCallback onCreateRole;
  final String? selectedRoleRef;
  final ValueChanged<String?> onRoleChanged;

@@ -20,11 +17,8 @@ class InvitationFormFields extends StatelessWidget {
    super.key,
    required this.roles,
    required this.emailController,
-    required this.firstNameController,
-    required this.lastNameController,
+    required this.nameController,
    required this.messageController,
-    required this.canCreateRoles,
-    required this.onCreateRole,
    required this.selectedRoleRef,
    required this.onRoleChanged,
  });
@@ -53,21 +47,11 @@ class InvitationFormFields extends StatelessWidget {
              ),
            ),
            SizedBox(
-              width: 200,
+              width: 280,
              child: TextFormField(
-                controller: firstNameController,
+                controller: nameController,
                decoration: InputDecoration(
-                  labelText: loc.firstName,
-                  prefixIcon: const Icon(Icons.person_outline),
-                ),
-              ),
-            ),
-            SizedBox(
-              width: 200,
-              child: TextFormField(
-                controller: lastNameController,
-                decoration: InputDecoration(
-                  labelText: loc.lastName,
+                  labelText: loc.invitationNameLabel,
                  prefixIcon: const Icon(Icons.person_outline),
                ),
              ),
@@ -75,7 +59,7 @@ class InvitationFormFields extends StatelessWidget {
            SizedBox(
              width: 260,
              child: DropdownButtonFormField<String>(
-                value: selectedRoleRef,
+                initialValue: selectedRoleRef ?? (roles.isNotEmpty ? roles.first.storable.id : null),
                items: roles.map((role) => DropdownMenuItem(
                  value: role.storable.id,
                  child: Text(role.describable.name),
@@ -84,11 +68,6 @@ 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,
-                  ),
                ),
              ),
            ),
--- a/frontend/pweb/lib/pages/invitations/widgets/form/form.dart
+++ b/frontend/pweb/lib/pages/invitations/widgets/form/form.dart
@@ -6,11 +6,8 @@ import 'package:pweb/pages/invitations/widgets/form/view.dart';
 class InvitationsForm extends StatelessWidget {
  final GlobalKey<FormState> formKey;
  final TextEditingController emailController;
-  final TextEditingController firstNameController;
-  final TextEditingController lastNameController;
+  final TextEditingController nameController;
  final TextEditingController messageController;
-  final bool canCreateRoles;
-  final VoidCallback onCreateRole;
  final int expiryDays;
  final ValueChanged<int> onExpiryChanged;
  final String? selectedRoleRef;
@@ -22,11 +19,8 @@ class InvitationsForm extends StatelessWidget {
    super.key,
    required this.formKey,
    required this.emailController,
-    required this.firstNameController,
-    required this.lastNameController,
+    required this.nameController,
    required this.messageController,
-    required this.canCreateRoles,
-    required this.onCreateRole,
    required this.expiryDays,
    required this.onExpiryChanged,
    required this.selectedRoleRef,
@@ -39,11 +33,8 @@ class InvitationsForm extends StatelessWidget {
  Widget build(BuildContext context) => InvitationFormView(
    formKey: formKey,
    emailController: emailController,
-    firstNameController: firstNameController,
-    lastNameController: lastNameController,
+    nameController: nameController,
    messageController: messageController,
-    canCreateRoles: canCreateRoles,
-    onCreateRole: onCreateRole,
    expiryDays: expiryDays,
    onExpiryChanged: onExpiryChanged,
    selectedRoleRef: selectedRoleRef,
--- a/frontend/pweb/lib/pages/invitations/widgets/form/view.dart
+++ b/frontend/pweb/lib/pages/invitations/widgets/form/view.dart
@@ -13,11 +13,8 @@ import 'package:pweb/generated/i18n/app_localizations.dart';
 class InvitationFormView extends StatelessWidget {
  final GlobalKey<FormState> formKey;
  final TextEditingController emailController;
-  final TextEditingController firstNameController;
-  final TextEditingController lastNameController;
+  final TextEditingController nameController;
  final TextEditingController messageController;
-  final bool canCreateRoles;
-  final VoidCallback onCreateRole;
  final int expiryDays;
  final ValueChanged<int> onExpiryChanged;
  final String? selectedRoleRef;
@@ -29,11 +26,8 @@ class InvitationFormView extends StatelessWidget {
    super.key,
    required this.formKey,
    required this.emailController,
-    required this.firstNameController,
-    required this.lastNameController,
+    required this.nameController,
    required this.messageController,
-    required this.canCreateRoles,
-    required this.onCreateRole,
    required this.expiryDays,
    required this.onExpiryChanged,
    required this.selectedRoleRef,
@@ -67,11 +61,8 @@ class InvitationFormView extends StatelessWidget {
              InvitationFormFields(
                roles: roles,
                emailController: emailController,
-                firstNameController: firstNameController,
-                lastNameController: lastNameController,
+                nameController: nameController,
                messageController: messageController,
-                canCreateRoles: canCreateRoles,
-                onCreateRole: onCreateRole,
                selectedRoleRef: selectedRoleRef,
                onRoleChanged: onRoleChanged,
              ),
--- a/frontend/pweb/lib/pages/invitations/widgets/list/view.dart
+++ b/frontend/pweb/lib/pages/invitations/widgets/list/view.dart
@@ -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,62 +25,70 @@ 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) => context.read<InvitationListViewModel>().setQuery(query);
-  void _setFilter(InvitationFilter filter) => context.read<InvitationListViewModel>().setFilter(filter);
+  void _setQuery(String query) {
+    setState(() => _query = query.trim().toLowerCase());
+  }

-  void _onProviderChanged() {
-    final provider = _provider;
-    if (provider == null) {
-      return;
-    }
-    final error = provider.error;
-    if (error == null) {
-      _lastError = null;
-      return;
-    }
+  void _setFilter(InvitationFilter filter) {
+    setState(() => _filter = filter);
+  }
+
+  void _notifyError(BuildContext context, Object error, AppLocalizations loc) {
    if (identical(error, _lastError)) {
      return;
    }
    _lastError = error;
-    final loc = AppLocalizations.of(context)!;
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (!mounted) return;
-      postNotifyUserOfErrorX(
-        context: context,
-        errorSituation: loc.errorLoadingInvitations,
-        exception: 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;
  }

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

-    final invitations = viewModel.filteredInvitations(provider.invitations);
+    if (provider.error != null) {
+      _notifyError(context, provider.error!, loc);
+    } else {
+      _lastError = null;
+    }
+
+    final invitations = _filteredInvitations(provider.invitations);

    return Column(
      crossAxisAlignment: CrossAxisAlignment.start,
@@ -92,7 +100,7 @@ class _InvitationListViewState extends State<InvitationListView> {
        ),
        const SizedBox(height: 12),
        InvitationFilterChips(
-          selectedFilter: viewModel.filter,
+          selectedFilter: _filter,
          onSelected: _setFilter,
        ),
        const SizedBox(height: 16),
--- a/frontend/pweb/lib/pages/invitations/widgets/list/view_model.dart
+++ b/frontend/pweb/lib/pages/invitations/widgets/list/view_model.dart
@@ -1,46 +0,0 @@
-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;
-  }
-}
--- a/frontend/pweb/lib/widgets/roles/create_role_dialog.dart
+++ b/frontend/pweb/lib/widgets/roles/create_role_dialog.dart
@@ -1,85 +0,0 @@
-import 'package:flutter/material.dart';
-
-import 'package:pweb/models/role_draft.dart';
-import 'package:pweb/generated/i18n/app_localizations.dart';
-
-
-Future<RoleDraft?> showCreateRoleDialog(BuildContext context) {
-  return showDialog<RoleDraft>(
-    context: context,
-    builder: (dialogContext) => const _CreateRoleDialog(),
-  );
-}
-
-class _CreateRoleDialog extends StatefulWidget {
-  const _CreateRoleDialog();
-
-  @override
-  State<_CreateRoleDialog> createState() => _CreateRoleDialogState();
-}
-
-class _CreateRoleDialogState extends State<_CreateRoleDialog> {
-  final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
-  final TextEditingController _nameController = TextEditingController();
-  final TextEditingController _descriptionController = TextEditingController();
-
-  @override
-  void dispose() {
-    _nameController.dispose();
-    _descriptionController.dispose();
-    super.dispose();
-  }
-
-  void _submit() {
-    final form = _formKey.currentState;
-    if (form == null || !form.validate()) return;
-    Navigator.of(context).pop(RoleDraft(
-      name: _nameController.text.trim(),
-      description: _descriptionController.text.trim(),
-    ));
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final loc = AppLocalizations.of(context)!;
-    return AlertDialog(
-      title: Text(loc.invitationAddRoleTitle),
-      content: Form(
-        key: _formKey,
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            TextFormField(
-              controller: _nameController,
-              decoration: InputDecoration(
-                labelText: loc.invitationRoleNameLabel,
-              ),
-              validator: (value) => (value == null || value.trim().isEmpty)
-                ? loc.invitationRoleNameRequired
-                : null,
-            ),
-            const SizedBox(height: 12),
-            TextFormField(
-              controller: _descriptionController,
-              minLines: 2,
-              maxLines: 3,
-              decoration: InputDecoration(
-                labelText: loc.invitationRoleDescriptionLabel,
-              ),
-            ),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          onPressed: () => Navigator.of(context).pop(),
-          child: Text(loc.cancel),
-        ),
-        ElevatedButton(
-          onPressed: _submit,
-          child: Text(loc.add),
-        ),
-      ],
-    );
-  }
-}