feat(cat-voices): integrate proposals list - Part 2 (#2227)

* proposals tabs + category selector widget

* feat: update url when category changes

* feat: proposals type as query param

* fix: full category name

* refactor: split widgets into separate files

* wip: proposals pagination part 1

* wip: Proposals filters model

* feat: integrate fav

* chore: add filters param to get proposals page request

* chore: proposals types count

* chore: moving classes and models around

* wip: counting proposals

* feat: counting final proposals

* feat: favorites count

* feat: my proposals count

* chore: final proposals action helper

* chore: mapping ref ver

* chore: cleanup code

* feat: count author search

* feat: finish proposals count query

* fix: melos flutter_rust_bridge version

* fix: empty category name

* chore: spelling

* chore: remove dummy page request delay

* chore: spelling

* chore: make analyser happy

* feat: paging proposals

* chore: make ProposalsSignal extend Equatable

* refactor: little refactor of methods in ProposalDao

* feat: emitting errors when fav change fails

* refactor: separate build joined method

* feat: filtering proposals types

* chore: safe checking proposals + mapping

* chore: pagination wrap alignment

* chore: include categoryText

* chore: proposal card formatting

* chore: localized pagination status text

* fix: limit unnecessary pagination resets

* fix: _IdsFilter

* chore: cleanup

* fix: comparing category id only

* fix: displaying non 0 pages

* chore: marking documents as changed when fav is changing

* chore: removing fav proposals

* fix: my proposals filtering when not authenticated

* chore: docs

* fix: proposal dao tests

* chore: loc plural

* chore: explicit switch

* refactor: use records syntax

Author: damian-molinski

catalyst_voices/apps/voices/lib/pages/proposals/proposals_page.dart

@@ -123,6 +123,7 @@ class _ProposalsPageState extends State<ProposalsPage>
           currentPage: page.page,
           maxResults: page.total,
           itemList: page.items,
+          error: const Optional.empty(),
           isLoading: false,
         );
     }

catalyst_voices/apps/voices/lib/widgets/cards/pending_proposal_card.dart

@@ -120,7 +120,7 @@ class _FundsAndDuration extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
       decoration: BoxDecoration(
         color: Theme.of(context).colorScheme.primary.withValues(alpha: 0.12),
         borderRadius: BorderRadius.circular(8),

catalyst_voices/apps/voices/lib/widgets/cards/proposal_card.dart

@@ -7,6 +7,8 @@ import 'package:flutter/material.dart';
 /// A proposal card spanning proposals in different stages.
 ///
 /// Designed to work with as many cases as [ProposalViewModel] will support.
+// TODO(damian-molinski): Refactor this widget to accept minimum data necessary
+// not entire ProposalViewModel.
 class ProposalCard extends StatelessWidget {
   final AssetGenImage? image;
   final ProposalViewModel proposal;

catalyst_voices/apps/voices/lib/widgets/pagination/layouts/paginated_grid_view.dart.dart

@@ -40,7 +40,6 @@ class PaginatedGridView<ItemType> extends StatelessWidget {
       valueListenable: _pagingController,
       builder: (context, pagingState, _) {
         Widget child;
-        final itemList = _pagingController.itemList;
         switch (pagingState.status) {
           case PagingStatus.empty:
             child = builderDelegate.emptyIndicatorBuilder(context);
@@ -57,12 +56,12 @@ class PaginatedGridView<ItemType> extends StatelessWidget {
                 key: const Key('PaginatedGridView'),
                 spacing: 16,
                 runSpacing: 16,
-                children: [
-                  for (var i = pagingState.currentFrom;
-                      i <= pagingState.currentTo;
-                      i++)
-                    _itemBuilder(context, itemList[i]),
-                ],
+                alignment: WrapAlignment.spaceEvenly,
+                crossAxisAlignment: WrapCrossAlignment.start,
+                runAlignment: WrapAlignment.start,
+                children: pagingState.itemList
+                    .map((item) => _itemBuilder(context, item))
+                    .toList(),
               ),
             );
             break;
@@ -137,7 +136,11 @@ class _Controls extends StatelessWidget {
       children: [
         Text(
           key: const Key('PaginationText'),
-          '$fromNumber-$toNumber of $maxResults proposals',
+          context.l10n.paginationProposalsCounter(
+            fromNumber,
+            toNumber,
+            maxResults,
+          ),
         ),
         VoicesIconButton(
           key: const Key('PrevPageBtn'),

catalyst_voices/apps/voices/lib/widgets/pagination/paging_state.dart

@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:catalyst_voices/widgets/pagination/paging_status.dart';
 import 'package:catalyst_voices_models/catalyst_voices_models.dart';
 import 'package:catalyst_voices_view_models/catalyst_voices_view_models.dart';
@@ -54,13 +52,7 @@ class PagingState<ItemType> extends Equatable {
   int get currentLastPage => (_itemCount / itemsPerPage).ceil() - 1;
 
   int get currentTo {
-    if (itemList.isEmpty) {
-      return 0;
-    }
-    return min(
-      min(currentFrom + itemsPerPage - 1, itemList.length - 1),
-      maxResults - 1,
-    );
+    return currentPage * itemsPerPage + itemsPerPage;
   }
 
   int get fromValue => currentFrom + 1;

catalyst_voices/melos.yaml

@@ -122,7 +122,7 @@ command:
           url: https://github.com/input-output-hk/flutter-quill
           path: flutter_quill_extensions
           ref: 532172254c3cee957bbdbb08be922f2c870b7fff
-      flutter_rust_bridge: 2.9.0
+      flutter_rust_bridge: 2.5.1
       flutter_secure_storage: ^9.2.2
       formz: ^0.7.0
       intl: ^0.19.0

catalyst_voices/packages/internal/catalyst_voices_blocs/lib/src/discovery/discovery_cubit.dart

@@ -185,11 +185,11 @@ class DiscoveryCubit extends Cubit<DiscoveryState> with BlocErrorEmitterMixin {
   }
 
   void _setupProposalsSubscription() {
-    _logger.info('Setting up proposals subscription');
+    _logger.fine('Setting up proposals subscription');
     _proposalsSubscription =
         _proposalService.watchLatestProposals(limit: 7).listen(
       (proposals) async {
-        _logger.info('Got proposals: ${proposals.length}');
+        _logger.finest('Got proposals: ${proposals.length}');
         _emitMostRecentProposals(proposals);
         final currentFavorites =
             await _proposalService.watchFavoritesProposalsIds().first;

catalyst_voices/packages/internal/catalyst_voices_blocs/lib/src/proposals/proposals_cubit.dart

@@ -52,6 +52,7 @@ final class ProposalsCubit extends Cubit<ProposalsState>
     Optional<SignedDocumentRef>? category,
     ProposalsFilterType? type,
     Optional<String>? searchQuery,
+    bool sendResetSignal = true,
   }) {
     final filters = _cache.filters.copyWith(
       type: type,
@@ -61,13 +62,19 @@ final class ProposalsCubit extends Cubit<ProposalsState>
       searchQuery: searchQuery,
     );
 
+    if (_cache.filters == filters) {
+      return;
+    }
+
     _cache = _cache.copyWith(filters: filters);
 
     if (category != null) _rebuildCategories();
 
     _watchProposalsCount(filters: filters.toCountFilters());
 
-    emitSignal(const ResetProposalsPaginationSignal());
+    if (sendResetSignal) {
+      emitSignal(const ResetProposalsPaginationSignal());
+    }
   }
 
   void changeSelectedCategory(SignedDocumentRef? categoryId) {
@@ -90,37 +97,19 @@ final class ProposalsCubit extends Cubit<ProposalsState>
 
   Future<void> getProposals(PageRequest request) async {
     try {
-      final campaign = await _campaignService.getActiveCampaign();
-      if (campaign == null) {
-        return;
+      if (_cache.campaign == null) {
+        final campaign = await _campaignService.getActiveCampaign();
+        _cache = _cache.copyWith(campaign: Optional(campaign));
       }
 
-      final campaignStage = CampaignStage.fromCampaign(
-        campaign,
-        DateTimeExt.now(),
-      );
-
-      final filters = _cache.filters;
-
       final page = await _proposalService.getProposalsPage(
         request: request,
-        filters: filters,
+        filters: _cache.filters,
       );
 
       _cache = _cache.copyWith(page: Optional(page));
 
-      final mappedPage = page.map(
-        (proposal) {
-          return ProposalViewModel.fromProposalAtStage(
-            proposal: proposal,
-            campaignName: campaign.name,
-            campaignStage: campaignStage,
-          );
-        },
-      );
-
-      final signal = ProposalsPageReadySignal(page: mappedPage);
-      emitSignal(signal);
+      _emitCachedProposalsPage();
     } catch (error, stackTrace) {
       _logger.severe('Failed loading page $request', error, stackTrace);
     }
@@ -139,6 +128,7 @@ final class ProposalsCubit extends Cubit<ProposalsState>
       onlyMy: Optional(onlyMyProposals),
       category: Optional(category),
       type: type,
+      sendResetSignal: false,
     );
   }
 
@@ -157,6 +147,21 @@ final class ProposalsCubit extends Cubit<ProposalsState>
 
     emit(state.copyWith(favoritesIds: favoritesIds));
 
+    if (!isFavorite && _cache.filters.type == ProposalsFilterType.favorites) {
+      final page = _cache.page;
+      if (page != null) {
+        final proposals = List.of(page.items)
+            .where((element) => element.selfRef != ref)
+            .toList();
+
+        final updatedPage = page.copyWithItems(proposals);
+
+        _cache = _cache.copyWith(page: Optional(updatedPage));
+
+        _emitCachedProposalsPage();
+      }
+    }
+
     unawaited(_updateFavoriteProposal(ref, isFavorite: isFavorite));
   }
 
@@ -173,6 +178,34 @@ final class ProposalsCubit extends Cubit<ProposalsState>
     emit(state.copyWith(hasSearchQuery: !asOptional.isEmpty));
   }
 
+  void _emitCachedProposalsPage() {
+    final campaign = _cache.campaign;
+    final page = _cache.page;
+
+    if (campaign == null || page == null) {
+      return;
+    }
+
+    final campaignStage = CampaignStage.fromCampaign(
+      campaign,
+      DateTimeExt.now(),
+    );
+
+    final mappedPage = page.map(
+      (proposal) {
+        return ProposalViewModel.fromProposalAtStage(
+          proposal: proposal,
+          campaignName: campaign.name,
+          campaignStage: campaignStage,
+        );
+      },
+    );
+
+    final signal = ProposalsPageReadySignal(page: mappedPage);
+
+    emitSignal(signal);
+  }
+
   void _handleActiveAccountIdChange(CatalystId? id) {
     changeFilters(author: Optional(id));
   }

catalyst_voices/packages/internal/catalyst_voices_blocs/lib/src/proposals/proposals_cubit_cache.dart

@@ -2,12 +2,14 @@ import 'package:catalyst_voices_models/catalyst_voices_models.dart';
 import 'package:equatable/equatable.dart';
 
 final class ProposalsCubitCache extends Equatable {
+  final Campaign? campaign;
   final Page<Proposal>? page;
   final ProposalsFilters filters;
   final List<CampaignCategory>? categories;
   final ProposalsCount count;
 
   const ProposalsCubitCache({
+    this.campaign,
     this.page,
     this.filters = const ProposalsFilters(),
     this.categories,
@@ -16,19 +18,22 @@ final class ProposalsCubitCache extends Equatable {
 
   @override
   List<Object?> get props => [
+        campaign,
         page,
         filters,
         categories,
         count,
       ];
 
   ProposalsCubitCache copyWith({
+    Optional<Campaign>? campaign,
     Optional<Page<Proposal>>? page,
     ProposalsFilters? filters,
     Optional<List<CampaignCategory>>? categories,
     ProposalsCount? count,
   }) {
     return ProposalsCubitCache(
+      campaign: campaign.dataOr(this.campaign),
       page: page.dataOr(this.page),
       filters: filters ?? this.filters,
       categories: categories.dataOr(this.categories),

catalyst_voices/packages/internal/catalyst_voices_localization/lib/l10n/intl_en.arb

@@ -2504,5 +2504,20 @@
   "viewProposalCommentsDescription": "Open My proposals in the Discovery Space",
   "@viewProposalCommentsDescription": {
     "description": "Text for the view proposal comments description in the card"
+  },
+  "paginationProposalsCounter": "{from}-{to} of {max, plural, =0{proposals} =1{proposal} other{proposals}}",
+  "@paginationProposalsCounter": {
+    "description": "Below pagination list, next to page switch controls",
+    "placeholders": {
+      "from": {
+        "type": "int"
+      },
+      "to": {
+        "type": "int"
+      },
+      "max": {
+        "type": "int"
+      }
+    }
   }
 }