fix: handling correctly show all categories (#2335)

Co-authored-by: Dominik Toton <[email protected]>

Author: damian-molinski

catalyst_voices/apps/voices/lib/pages/category/change_category_button.dart

@@ -4,7 +4,6 @@ import 'package:catalyst_voices/widgets/dropdown/category_dropdown.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';
-import 'package:catalyst_voices_models/catalyst_voices_models.dart';
 import 'package:catalyst_voices_view_models/catalyst_voices_view_models.dart'
     hide PopupMenuItem;
 import 'package:flutter/material.dart';
@@ -24,13 +23,13 @@ class _ChangeCategoryButtonState extends State<ChangeCategoryButton> {
   @override
   Widget build(BuildContext context) {
     return BlocSelector<CategoryDetailCubit, CategoryDetailState,
-        List<DropdownMenuViewModel<SignedDocumentRef>>>(
+        List<DropdownMenuViewModel<ProposalsCategoryFilter>>>(
       selector: (state) {
         final selectedCategory = state.category?.id ?? '';
         return state.categories
             .map(
               (e) => DropdownMenuViewModel(
-                value: e.id,
+                value: ProposalsRefCategoryFilter(ref: e.id),
                 name: e.formattedName,
                 isSelected: e.id == selectedCategory,
               ),
@@ -69,11 +68,12 @@ class _ChangeCategoryButtonState extends State<ChangeCategoryButton> {
     );
   }
 
-  Future<void> _changeCategory(SignedDocumentRef? categoryId) async {
-    if (categoryId == null) {
+  Future<void> _changeCategory(ProposalsCategoryFilter value) async {
+    final ref = value.ref;
+    if (ref == null) {
       return;
     }
-    await context.read<CategoryDetailCubit>().getCategoryDetail(categoryId);
+    await context.read<CategoryDetailCubit>().getCategoryDetail(ref);
   }
 
   void _handleClose() {

catalyst_voices/apps/voices/lib/pages/proposals/widgets/category_selector.dart

@@ -3,7 +3,6 @@ import 'package:catalyst_voices/widgets/dropdown/category_dropdown.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';
-import 'package:catalyst_voices_models/catalyst_voices_models.dart';
 import 'package:catalyst_voices_view_models/catalyst_voices_view_models.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
@@ -46,15 +45,16 @@ class _CategorySelectorState extends State<_CategorySelector> {
   Widget build(BuildContext context) {
     return CategoryDropdown(
       items: [
-        DropdownMenuViewModel.all(
-          context.l10n,
+        DropdownMenuViewModel(
+          value: const ProposalsAnyCategoryFilter(),
+          name: context.l10n.showAll,
           isSelected: widget.items.none((e) => e.isSelected),
         ),
         ...widget.items.map((item) => item.toDropdownItem()),
       ],
       highlightColor: context.colors.onSurfacePrimary08,
       onSelected: (value) {
-        context.read<ProposalsCubit>().changeSelectedCategory(value);
+        context.read<ProposalsCubit>().changeSelectedCategory(value.ref);
       },
       popupMenuButtonKey: _popupMenuButtonKey,
       child: Container(
@@ -91,9 +91,9 @@ class _CategorySelectorState extends State<_CategorySelector> {
 }
 
 extension on ProposalsCategorySelectorItem {
-  DropdownMenuViewModel<SignedDocumentRef> toDropdownItem() {
+  DropdownMenuViewModel<ProposalsCategoryFilter> toDropdownItem() {
     return DropdownMenuViewModel(
-      value: ref,
+      value: ProposalsRefCategoryFilter(ref: ref),
       name: name.trim().isNotEmpty ? name : '-TBD-',
       isSelected: isSelected,
     );

catalyst_voices/apps/voices/lib/widgets/dropdown/category_dropdown.dart

@@ -1,14 +1,13 @@
-import 'package:catalyst_voices_models/catalyst_voices_models.dart';
 import 'package:catalyst_voices_view_models/catalyst_voices_view_models.dart'
     hide PopupMenuItem;
 import 'package:flutter/material.dart';
 
 class CategoryDropdown extends StatelessWidget {
-  final List<DropdownMenuViewModel<SignedDocumentRef>> items;
+  final List<DropdownMenuViewModel<ProposalsCategoryFilter>> items;
   final Color? highlightColor;
   final Clip clipBehavior;
   final GlobalKey<PopupMenuButtonState<dynamic>> popupMenuButtonKey;
-  final ValueChanged<SignedDocumentRef?>? onSelected;
+  final ValueChanged<ProposalsCategoryFilter>? onSelected;
   final VoidCallback? onCanceled;
   final VoidCallback? onOpened;
   final Offset offset;

catalyst_voices/apps/voices/test/widgets/dropdown/category_dropdown_test.dart

@@ -10,12 +10,12 @@ void main() {
   final items = [
     const DropdownMenuViewModel(
       name: 'Item 1',
-      value: SignedDocumentRef(id: 'value1'),
+      value: ProposalsRefCategoryFilter(ref: SignedDocumentRef(id: 'value1')),
       isSelected: false,
     ),
     const DropdownMenuViewModel(
       name: 'Item 2',
-      value: SignedDocumentRef(id: 'value2'),
+      value: ProposalsRefCategoryFilter(ref: SignedDocumentRef(id: 'value2')),
       isSelected: true,
     ),
   ];
@@ -34,7 +34,7 @@ void main() {
               popupMenuButtonKey: popupMenuButtonKey,
               highlightColor: Colors.blue,
               onSelected: (value) {
-                selectedValue = value;
+                selectedValue = value.ref;
               },
               child: const Text('Dropdown'),
             ),

catalyst_voices/packages/internal/catalyst_voices_view_models/lib/src/catalyst_voices_view_models.dart

@@ -32,6 +32,7 @@ export 'proposal/proposal_view_model.dart';
 export 'proposal_builder/exception/proposal_builder_exception.dart';
 export 'proposal_comments/proposal_comments_segment.dart';
 export 'proposal_comments/proposal_comments_sort.dart';
+export 'proposals/proposals_category_filter.dart';
 export 'proposals/proposals_category_selector_item.dart';
 export 'proposals/proposals_filter_type_ext.dart';
 export 'registration/exception/localized_registration_exception.dart';

catalyst_voices/packages/internal/catalyst_voices_view_models/lib/src/category/dropdown_menu_view_model.dart

@@ -1,4 +1,3 @@
-import 'package:catalyst_voices_localization/generated/catalyst_voices_localizations.dart';
 import 'package:equatable/equatable.dart';
 
 class DropdownMenuViewModel<T extends Object> extends Equatable {
@@ -12,17 +11,6 @@ class DropdownMenuViewModel<T extends Object> extends Equatable {
     required this.isSelected,
   });
 
-  factory DropdownMenuViewModel.all(
-    VoicesLocalizations l10n, {
-    required bool isSelected,
-  }) {
-    return DropdownMenuViewModel(
-      value: null,
-      name: l10n.showAll,
-      isSelected: isSelected,
-    );
-  }
-
   @override
   List<Object?> get props => [
         value,

catalyst_voices/packages/internal/catalyst_voices_view_models/lib/src/proposals/proposals_category_filter.dart

@@ -0,0 +1,23 @@
+import 'package:catalyst_voices_models/catalyst_voices_models.dart';
+import 'package:equatable/equatable.dart';
+
+final class ProposalsAnyCategoryFilter extends ProposalsCategoryFilter {
+  const ProposalsAnyCategoryFilter() : super(ref: null);
+}
+
+sealed class ProposalsCategoryFilter extends Equatable {
+  final SignedDocumentRef? ref;
+
+  const ProposalsCategoryFilter({
+    this.ref,
+  });
+
+  @override
+  List<Object?> get props => [ref];
+}
+
+final class ProposalsRefCategoryFilter extends ProposalsCategoryFilter {
+  const ProposalsRefCategoryFilter({
+    required SignedDocumentRef super.ref,
+  });
+}