feat(cat-voices): connect propsal action (#2144)

* feat: saving published document in local db

* feat: stream with proper user proposal

* feat: add query for fetching latest document version by ref and type in DocumentsDao

* feat: remove unused back navigation from proposal builder action and cleanup imports in the proposal builder status action file

* feat: integrate ProposalVersionInfoText for better display of proposal iteration details and streamline imports in the card widget

* refactor: replace SignedDocumentRef with DocumentRef across multiple repositories and services for consistency and clarity

* refactor: streamline proposal data handling by creating helper methods and improving data fetching logic in ProposalServiceImpl

* test: enhance proposal service tests with additional mocks for proposal publish and comments count handling

* refactor: improve document processing logic by consolidating async operations and adding a dedicated method for document handling

* refactor: enhance document querying logic and streamline proposal data handling with improved filtering and error handling mechanisms

* refactor: simplify proposal subscription setup and enhance document processing with better error handling and logging

* test: adding tests

---------

Co-authored-by: Damian Moliński <[email protected]>

Author: LynxLynxx

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

@@ -5,11 +5,13 @@ import 'package:catalyst_voices/widgets/cards/proposal_card_widgets.dart';
 import 'package:catalyst_voices/widgets/modals/proposals/share_proposal_dialog.dart';
 import 'package:catalyst_voices/widgets/text/day_month_time_text.dart';
 import 'package:catalyst_voices/widgets/widgets.dart';
+import 'package:catalyst_voices_blocs/catalyst_voices_blocs.dart';
 import 'package:catalyst_voices_brands/catalyst_voices_brands.dart';
 import 'package:catalyst_voices_localization/catalyst_voices_localization.dart';
 import 'package:catalyst_voices_models/catalyst_voices_models.dart';
 import 'package:catalyst_voices_view_models/catalyst_voices_view_models.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 /// Displays a proposal in pending state on a card.
 class PendingProposalCard extends StatefulWidget {
@@ -153,61 +155,63 @@ class _PendingProposalCardState extends State<PendingProposalCard> {
 
   @override
   Widget build(BuildContext context) {
-    return Material(
-      key: const Key('ProposalCard'),
-      color: Colors.transparent,
-      child: InkWell(
-        statesController: _statesController,
-        onTap: widget.onTap,
-        child: ValueListenableBuilder(
-          valueListenable: _statesController,
-          builder: (context, value, child) => Container(
-            constraints: const BoxConstraints(maxWidth: 326),
-            decoration: BoxDecoration(
-              color: context.colors.elevationsOnSurfaceNeutralLv1White,
-              borderRadius: BorderRadius.circular(12),
-              border: Border.all(
-                color: _border.resolve(_statesController.value),
+    return SizedBox(
+      height: 454,
+      child: Material(
+        key: const Key('ProposalCard'),
+        color: Colors.transparent,
+        child: InkWell(
+          statesController: _statesController,
+          onTap: widget.onTap,
+          child: ValueListenableBuilder(
+            valueListenable: _statesController,
+            builder: (context, value, child) => Container(
+              constraints: const BoxConstraints(maxWidth: 326),
+              decoration: BoxDecoration(
+                color: context.colors.elevationsOnSurfaceNeutralLv1White,
+                borderRadius: BorderRadius.circular(12),
+                border: Border.all(
+                  color: _border.resolve(_statesController.value),
+                ),
               ),
-            ),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.stretch,
-              children: [
-                Padding(
-                  padding: const EdgeInsets.all(16),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      _Topbar(
-                        proposalRef: widget.proposal.ref,
-                        showStatus: widget.showStatus,
-                        isFavorite: widget.isFavorite,
-                        onFavoriteChanged: widget.onFavoriteChanged,
-                      ),
-                      _Category(
-                        category: widget.proposal.category,
-                      ),
-                      const SizedBox(height: 4),
-                      _Title(text: widget.proposal.title),
-                      _Author(author: widget.proposal.author),
-                      _FundsAndDuration(
-                        funds: widget.proposal.fundsRequested,
-                        duration: widget.proposal.duration,
-                      ),
-                      const SizedBox(height: 12),
-                      _Description(text: widget.proposal.description),
-                      const SizedBox(height: 24),
-                      _ProposalInfo(
-                        proposalStage: widget.proposal.publishStage,
-                        version: widget.proposal.version,
-                        lastUpdate: widget.proposal.lastUpdateDate,
-                        commentsCount: widget.proposal.commentsCount,
-                        showLastUpdate: widget.showLastUpdate,
-                      ),
-                    ],
-                  ),
+              child: Padding(
+                padding: const EdgeInsets.all(16),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    _Topbar(
+                      proposalRef: widget.proposal.ref,
+                      showStatus: widget.showStatus,
+                      isFavorite: widget.isFavorite,
+                      onFavoriteChanged: widget.onFavoriteChanged,
+                    ),
+                    _Category(
+                      category: widget.proposal.category,
+                    ),
+                    const SizedBox(height: 4),
+                    Expanded(
+                      child: _Title(text: widget.proposal.title),
+                    ),
+                    _Author(author: widget.proposal.author),
+                    _FundsAndDuration(
+                      funds: widget.proposal.fundsRequested,
+                      duration: widget.proposal.duration,
+                    ),
+                    const SizedBox(height: 12),
+                    Expanded(
+                      child: _Description(text: widget.proposal.description),
+                    ),
+                    const SizedBox(height: 12),
+                    _ProposalInfo(
+                      proposalStage: widget.proposal.publishStage,
+                      version: widget.proposal.version,
+                      lastUpdate: widget.proposal.lastUpdateDate,
+                      commentsCount: widget.proposal.commentsCount,
+                      showLastUpdate: widget.showLastUpdate,
+                    ),
+                  ],
                 ),
-              ],
+              ),
             ),
           ),
         ),
@@ -359,8 +363,16 @@ class _ProposalInfo extends StatelessWidget {
     if (lastUpdate == null) {
       return '';
     }
+    final timezone = context.select<SessionCubit?, TimezonePreferences>(
+      (value) => value?.state.settings.timezone ?? TimezonePreferences.local,
+    );
+
+    final effectiveData = switch (timezone) {
+      TimezonePreferences.utc => lastUpdate!.toUtc(),
+      TimezonePreferences.local => lastUpdate!.toLocal(),
+    };
     final dt =
-        DateFormatter.formatDateTimeParts(lastUpdate!, includeYear: true);
+        DateFormatter.formatDateTimeParts(effectiveData, includeYear: true);
 
     return context.l10n.publishedOn(dt.date, dt.time);
   }

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

@@ -2,11 +2,11 @@ import 'dart:async';
 
 import 'package:catalyst_voices/common/ext/build_context_ext.dart';
 import 'package:catalyst_voices/common/ext/proposal_publish_ext.dart';
-import 'package:catalyst_voices/common/formatters/date_formatter.dart';
 import 'package:catalyst_voices/routes/routing/proposal_builder_route.dart';
 import 'package:catalyst_voices/widgets/buttons/voices_text_button.dart';
 import 'package:catalyst_voices/widgets/common/affix_decorator.dart';
 import 'package:catalyst_voices/widgets/modals/proposals/proposal_builder_delete_confirmation_dialog.dart';
+import 'package:catalyst_voices/widgets/text/proposal_version_info_text.dart';
 import 'package:catalyst_voices_assets/catalyst_voices_assets.dart';
 import 'package:catalyst_voices_blocs/catalyst_voices_blocs.dart';
 import 'package:catalyst_voices_localization/catalyst_voices_localization.dart';
@@ -135,7 +135,6 @@ class _IterationVersionList extends StatelessWidget {
                 crossAxisAlignment: CrossAxisAlignment.stretch,
                 spacing: 6,
                 children: versions
-                    .skip(1)
                     .map(
                       (e) => _IterationVersion(
                         version: e,
@@ -157,7 +156,8 @@ class _ProposalIterationHistoryState extends State<ProposalIterationHistory> {
 
   bool get _hasNewerLocalIteration {
     if (widget.proposal.versions.isEmpty) return false;
-    return widget.proposal.versions.first.isLatestVersion(
+    final latestVersion = widget.proposal.versions.first;
+    return latestVersion.isLatestVersion(
       widget.proposal.selfRef.version ?? '',
     );
   }
@@ -177,7 +177,7 @@ class _ProposalIterationHistoryState extends State<ProposalIterationHistory> {
             Padding(
               padding: const EdgeInsets.symmetric(
                 vertical: 6,
-                horizontal: 17,
+                horizontal: 16,
               ),
               child: Row(
                 children: [
@@ -197,17 +197,22 @@ class _ProposalIterationHistoryState extends State<ProposalIterationHistory> {
                       boldTitle: true,
                     )
                   else
-                    Text(
-                      context.l10n.publishingHistory,
-                      style: context.textTheme.labelMedium?.copyWith(
-                        color: context.colors.textOnPrimaryLevel1,
+                    Padding(
+                      padding: const EdgeInsets.symmetric(
+                        vertical: 14,
+                      ),
+                      child: Text(
+                        context.l10n.publishingHistory,
+                        style: context.textTheme.labelMedium?.copyWith(
+                          color: context.colors.textOnPrimaryLevel1,
+                        ),
                       ),
                     ),
                   const Spacer(),
                   Offstage(
                     offstage: !_hasNewerLocalIteration,
                     child: _Actions(
-                      ref: widget.proposal.selfRef,
+                      ref: widget.proposal.versions.first.selfRef,
                     ),
                   ),
                 ],
@@ -249,21 +254,15 @@ class _Title extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final datetime = DateFormatter.formatDayMonthTime(updateDate);
     final publishName = publish.localizedWorkspaceName(context.l10n);
     return AffixDecorator(
       prefix: VoicesAssets.icons.documentText.buildIcon(size: 18),
-      child: Text(
-        context.l10n.proposalIterationPublishUpdateAndTitle(
-          iteration,
-          publishName,
-          datetime,
-          title,
-        ),
-        style: context.textTheme.labelMedium?.copyWith(
-          color: context.colors.textOnPrimaryLevel1,
-          fontWeight: boldTitle ? FontWeight.bold : FontWeight.w100,
-        ),
+      child: ProposalVersionInfoText(
+        iteration: iteration,
+        publish: publishName,
+        updateDate: updateDate,
+        title: title,
+        boldTitle: boldTitle,
       ),
     );
   }

catalyst_voices/apps/voices/lib/widgets/text/last_edit_date.dart

@@ -20,11 +20,11 @@ class LastEditDate extends StatelessWidget {
   Widget build(BuildContext context) {
     return TimezoneDateTimeText(
       dateTime,
-      formatter: (context, dateTime) {
-        final date = DateFormatter.formatDayMonthTime(
-          dateTime,
+      formatter: (context, date) {
+        final dt = DateFormatter.formatDayMonthTime(
+          date,
         );
-        return context.l10n.lastEditDate(date);
+        return context.l10n.lastEditDate(dt);
       },
       style: textStyle ??
           context.textTheme.labelMedium?.copyWith(

catalyst_voices/apps/voices/lib/widgets/text/proposal_version_info_text.dart

@@ -0,0 +1,50 @@
+import 'package:catalyst_voices/common/ext/build_context_ext.dart';
+import 'package:catalyst_voices/common/formatters/date_formatter.dart';
+import 'package:catalyst_voices/widgets/text/timezone_date_time_text.dart';
+import 'package:catalyst_voices_brands/catalyst_voices_brands.dart';
+import 'package:catalyst_voices_localization/catalyst_voices_localization.dart';
+import 'package:flutter/material.dart';
+
+class ProposalVersionInfoText extends StatelessWidget {
+  final String title;
+  final String publish;
+  final int iteration;
+  final DateTime updateDate;
+  final bool boldTitle;
+  const ProposalVersionInfoText({
+    super.key,
+    required this.title,
+    required this.publish,
+    required this.iteration,
+    required this.updateDate,
+    required this.boldTitle,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return TimezoneDateTimeTextTheme(
+      data: TimezoneDateTimeTextThemeData(
+        timestampTextStyle: WidgetStatePropertyAll(
+          context.textTheme.labelMedium?.copyWith(
+            color: context.colors.textOnPrimaryLevel1,
+            fontWeight: boldTitle ? FontWeight.bold : FontWeight.w100,
+          ),
+        ),
+      ),
+      child: TimezoneDateTimeText(
+        updateDate,
+        showTimezone: false,
+        formatter: (context, dateTime) {
+          final datetime = DateFormatter.formatDayMonthTime(dateTime);
+
+          return context.l10n.proposalIterationPublishUpdateAndTitle(
+            iteration,
+            publish,
+            datetime,
+            title,
+          );
+        },
+      ),
+    );
+  }
+}

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

@@ -2,12 +2,15 @@ import 'dart:async';
 
 import 'package:catalyst_voices_models/catalyst_voices_models.dart';
 import 'package:catalyst_voices_services/catalyst_voices_services.dart';
+import 'package:catalyst_voices_shared/catalyst_voices_shared.dart';
 import 'package:catalyst_voices_view_models/catalyst_voices_view_models.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 part 'discovery_state.dart';
 
+final _logger = Logger('DiscoveryCubit');
+
 class DiscoveryCubit extends Cubit<DiscoveryState> {
   // ignore: unused_field
   final CampaignService _campaignService;
@@ -90,10 +93,12 @@ class DiscoveryCubit extends Cubit<DiscoveryState> {
   }
 
   void _setupProposalsSubscription() {
+    _logger.info('Setting up proposals subscription');
     _proposalsSubscription =
         _proposalService.watchLatestProposals(limit: 7).listen(
       (proposals) {
         if (isClosed) return;
+        _logger.info('Got proposals: ${proposals.length}');
         final proposalList = proposals
             .map(
               (e) => PendingProposal.fromProposal(

catalyst_voices/packages/internal/catalyst_voices_blocs/lib/src/proposal_builder/proposal_builder_bloc.dart

@@ -381,8 +381,6 @@ final class ProposalBuilderBloc
       final proposalData = await _proposalService.getProposal(
         ref: proposalRef,
       );
-      // TODO(LynxLynxx): check if new local proposal is created
-      // when SignedDocumentRef is used instead of DraftRef
 
       final proposal = Proposal.fromData(proposalData);
 
@@ -396,7 +394,6 @@ final class ProposalBuilderBloc
           isLatest: index == proposalData.versions.length - 1,
         );
       }).toList();
-
       final categoryId = proposalData.categoryId;
       final category = await _campaignService.getCategory(categoryId);
 

catalyst_voices/packages/internal/catalyst_voices_blocs/lib/src/workspace/workspace_bloc.dart

@@ -137,10 +137,14 @@ final class WorkspaceBloc extends Bloc<WorkspaceEvent, WorkspaceState>
     if (proposal == null || proposal.selfRef is! SignedDocumentRef) {
       return emitError(const LocalizedUnknownException());
     }
-    await _proposalService.unlockProposal(
-      proposalRef: proposal.selfRef as SignedDocumentRef,
-      categoryId: proposal.categoryId,
-    );
+    try {
+      await _proposalService.forgetProposal(
+        proposalRef: proposal.selfRef as SignedDocumentRef,
+        categoryId: proposal.categoryId,
+      );
+    } catch (e, stackTrace) {
+      _logger.severe('Error forgetting proposal', e, stackTrace);
+    }
   }
 
   Future<void> _getTimelineItems(
@@ -189,9 +193,9 @@ final class WorkspaceBloc extends Bloc<WorkspaceEvent, WorkspaceState>
 
         add(LoadProposalsEvent(proposals));
       },
-      onError: (Object error) {
+      onError: (Object error, StackTrace stackTrace) {
         if (isClosed) return;
-        _logger.info('Users proposals stream error', error);
+        _logger.info('Users proposals stream error', error, stackTrace);
         add(ErrorLoadProposalsEvent(LocalizedException.create(error)));
       },
     );
@@ -227,5 +231,6 @@ final class WorkspaceBloc extends Bloc<WorkspaceEvent, WorkspaceState>
     await _proposalsSubscription?.cancel();
     _proposalsSubscription = null;
     _setupProposalsSubscription();
+    emit(state.copyWith(isLoading: false));
   }
 }