feat(#668): pass consumer to drug list filter

hpi-dhc · Nov 22, 2023 · abcff68 · abcff68
1 parent c61a234
commit abcff68
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 68 deletions.
diff --git a/app/lib/common/models/userdata/userdata.dart b/app/lib/common/models/userdata/userdata.dart
@@ -203,6 +203,10 @@ class ActiveDrugs extends ChangeNotifier {
       await _remove(drugName);
     }
   }
+
+  bool contains(String drugName) {
+    return names.contains(drugName);
+  }
 }
 
 /// Initializes the user's data by registering all necessary adapters and

diff --git a/app/lib/common/widgets/drug_list/builder.dart b/app/lib/common/widgets/drug_list/builder.dart
@@ -4,6 +4,7 @@ import 'drug_items/drug_cards.dart';
 List<Widget> buildDrugList(
   BuildContext context,
   DrugListState state,
+  ActiveDrugs activeDrugs,
   {
     String? noDrugsMessage,
     List<Widget> Function(
@@ -18,8 +19,11 @@ List<Widget> buildDrugList(
     Map? drugItemsBuildParams,
   }
 ) {
-  List<Widget> buildDrugList(List<Drug> drugs, FilterState filter) {
-    final filteredDrugs = filter.filter(drugs);
+  List<Widget> buildDrugList(
+    List<Drug> drugs,
+    FilterState filter,
+  ) {
+    final filteredDrugs = filter.filter(drugs, activeDrugs);
     if (filteredDrugs.isEmpty && noDrugsMessage != null) {
       return [errorIndicator(noDrugsMessage)];
     }

diff --git a/app/lib/common/widgets/drug_list/cubit.dart b/app/lib/common/widgets/drug_list/cubit.dart
@@ -122,7 +122,7 @@ class FilterState {
   final Map<WarningLevel, bool> showWarningLevel;
   final String gene;
 
-  bool isAccepted(Drug drug) {
+  bool isAccepted(Drug drug, ActiveDrugs activeDrugs) {
     final userGuideline = drug.userGuideline();
     final guidelineGenes = drug.guidelines.isNotEmpty ?
       drug.guidelines.first.lookupkey.keys.toList() :
@@ -137,13 +137,14 @@ class FilterState {
         showWarningLevel[WarningLevel.green]!;
     }
     final isDrugAccepted = drug.matches(query: query) &&
-        (drug.isActive() || showInactive) &&
+        (activeDrugs.contains(drug.name) || showInactive) &&
         warningLevelMatches &&
         (gene.isBlank || (guidelineGenes.contains(gene)));
     return isDrugAccepted;
   }
 
-  List<Drug> filter(List<Drug> drugs) => drugs.filter(isAccepted).toList();
+  List<Drug> filter(List<Drug> drugs, ActiveDrugs activeDrugs) =>
+    drugs.filter((drug) => isAccepted(drug, activeDrugs)).toList();
 }
 
 @freezed

diff --git a/app/lib/common/widgets/drug_search.dart b/app/lib/common/widgets/drug_search.dart
@@ -1,5 +1,6 @@
 
 import 'package:flutter/cupertino.dart';
+import 'package:provider/provider.dart';
 
 import '../../../common/module.dart';
 import '../../common/pages/drug/widgets/tooltip_icon.dart';
@@ -35,7 +36,8 @@ class DrugSearch extends HookWidget {
       ? context.l10n.search_no_drugs_with_filter_amendment
       : '';
     final noDrugsMessage = context.l10n.search_no_drugs(amendment);
-    return BlocProvider(
+    return Consumer<ActiveDrugs>(
+      builder: (context, activeDrugs, child) => BlocProvider(
         create: (context) => cubit,
         child: BlocBuilder<DrugListCubit, DrugListState>(
           builder: (context, state) {
@@ -61,6 +63,7 @@ class DrugSearch extends HookWidget {
                   buildDrugList(
                     context,
                     state,
+                    activeDrugs,
                     buildDrugItems: buildDrugItems,
                     noDrugsMessage: noDrugsMessage,
                     drugItemsBuildParams: drugItemsBuildParams,
@@ -71,7 +74,8 @@ class DrugSearch extends HookWidget {
                 ..._maybeShowDrugInteractionExplanation(context),
               ],
             );
-        }
+          }
+        )
       )
     );
   }

diff --git a/app/lib/report/pages/gene.dart b/app/lib/report/pages/gene.dart
@@ -1,3 +1,5 @@
+import 'package:provider/provider.dart';
+
 import '../../common/module.dart';
 import '../../common/pages/drug/widgets/sub_header.dart';
 import '../../common/pages/drug/widgets/tooltip_icon.dart';
@@ -13,70 +15,72 @@ class GenePage extends HookWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) => cubit,
-      child: BlocBuilder<DrugListCubit, DrugListState>(
-        builder: (context, state) => pageScaffold(
-          title: context.l10n.gene_page_headline(phenotype.geneSymbol),
-          body: [
-            Padding(
-              padding: EdgeInsets.symmetric(
-                horizontal: PharMeTheme.smallToMediumSpace,
-                vertical: PharMeTheme.mediumSpace
-              ),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  SubHeader(
-                    context.l10n.gene_page_your_variant(phenotype.geneSymbol),
-                    tooltip: context.l10n
-                        .gene_page_name_tooltip(phenotype.geneSymbol),
-                  ),
-                  SizedBox(height: PharMeTheme.smallToMediumSpace),
-                  RoundedCard(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Table(
-                          columnWidths: Map.from({
-                            0: IntrinsicColumnWidth(),
-                            1: IntrinsicColumnWidth(flex: 1),
-                          }),
-                          children: [
-                            _buildRow(
-                                context.l10n.gene_page_genotype,
-                                phenotype.genotype,
-                                tooltip: context.l10n.gene_page_genotype_tooltip
-                            ),
-                            _buildRow(context.l10n.gene_page_phenotype,
-                                UserData.phenotypeFor(
-                                  phenotype.geneSymbol,
-                                  context,
-                                ).phenotype,
-                                tooltip:
-                                  context.l10n.gene_page_phenotype_tooltip
-                            ),
-                          ],
-                        ),
-                        if (inhibitableGenes.contains(phenotype.geneSymbol))
-                          ...buildDrugInteractionInfo(
-                            context,
-                            phenotype.geneSymbol,
+    return Consumer<ActiveDrugs>(
+      builder: (context, activeDrugs, child) => BlocProvider(
+        create: (context) => cubit,
+        child: BlocBuilder<DrugListCubit, DrugListState>(
+          builder: (context, state) => pageScaffold(
+            title: context.l10n.gene_page_headline(phenotype.geneSymbol),
+            body: [
+              Padding(
+                padding: EdgeInsets.symmetric(
+                  horizontal: PharMeTheme.smallToMediumSpace,
+                  vertical: PharMeTheme.mediumSpace
+                ),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    SubHeader(
+                      context.l10n.gene_page_your_variant(phenotype.geneSymbol),
+                      tooltip: context.l10n
+                          .gene_page_name_tooltip(phenotype.geneSymbol),
+                    ),
+                    SizedBox(height: PharMeTheme.smallToMediumSpace),
+                    RoundedCard(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Table(
+                            columnWidths: Map.from({
+                              0: IntrinsicColumnWidth(),
+                              1: IntrinsicColumnWidth(flex: 1),
+                            }),
+                            children: [
+                              _buildRow(
+                                  context.l10n.gene_page_genotype,
+                                  phenotype.genotype,
+                                  tooltip: context.l10n.gene_page_genotype_tooltip
+                              ),
+                              _buildRow(context.l10n.gene_page_phenotype,
+                                  UserData.phenotypeFor(
+                                    phenotype.geneSymbol,
+                                    context,
+                                  ).phenotype,
+                                  tooltip:
+                                    context.l10n.gene_page_phenotype_tooltip
+                              ),
+                            ],
                           ),
-                    ],
-                  )),
-                  SizedBox(height: PharMeTheme.smallToMediumSpace),
-                  SubHeader(context.l10n.gene_page_affected_drugs,
-                      tooltip: context.l10n.gene_page_affected_drugs_tooltip),
-                  SizedBox(height: PharMeTheme.smallSpace),
-                  ...buildDrugList(context, state,
-                      noDrugsMessage: context.l10n.gene_page_no_affected_drugs)
-                ],
+                          if (inhibitableGenes.contains(phenotype.geneSymbol))
+                            ...buildDrugInteractionInfo(
+                              context,
+                              phenotype.geneSymbol,
+                            ),
+                      ],
+                    )),
+                    SizedBox(height: PharMeTheme.smallToMediumSpace),
+                    SubHeader(context.l10n.gene_page_affected_drugs,
+                        tooltip: context.l10n.gene_page_affected_drugs_tooltip),
+                    SizedBox(height: PharMeTheme.smallSpace),
+                    ...buildDrugList(context, state, activeDrugs,
+                        noDrugsMessage: context.l10n.gene_page_no_affected_drugs)
+                  ],
+                ),
               ),
-            ),
-          ],
+            ],
+          ),
         ),
-      ),
+      )
     );
   }