Ignore existing Robotoff questions (#6130)

openfoodfacts · Jan 6, 2025 · 1f8f66c · 1f8f66c
1 parent eb0a8bf
commit 1f8f66c
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 11 deletions.
diff --git a/packages/smooth_app/lib/helpers/robotoff_question_helper.dart b/packages/smooth_app/lib/helpers/robotoff_question_helper.dart
@@ -0,0 +1,25 @@
+import 'package:collection/collection.dart';
+import 'package:openfoodfacts/openfoodfacts.dart';
+
+extension RobotoffQuestionHelper on List<RobotoffQuestion> {
+  bool areSameAs(List<RobotoffQuestion> questions) {
+    return equals(questions, RobotoffQuestionsEquality());
+  }
+}
+
+class RobotoffQuestionsEquality implements Equality<RobotoffQuestion> {
+  @override
+  bool equals(RobotoffQuestion e1, RobotoffQuestion e2) =>
+      e1.insightId == e2.insightId;
+
+  @override
+  int hash(RobotoffQuestion e) => e.insightId.hashCode;
+
+  @override
+  bool isValidKey(Object? o) {
+    if (o is RobotoffQuestion) {
+      return true;
+    }
+    throw UnimplementedError();
+  }
+}
diff --git a/packages/smooth_app/lib/pages/product/product_page/new_product_page.dart b/packages/smooth_app/lib/pages/product/product_page/new_product_page.dart
@@ -142,7 +142,10 @@ class ProductPageState extends State<ProductPage>
                 },
                 child: hasPendingOperations
                     ? const ProductPageLoadingIndicator()
-                    : ProductQuestionsWidget(upToDateProduct),
+                    : KeepQuestionWidgetAlive(
+                        keepWidgetAlive: _keepRobotoffQuestionsAlive,
+                        child: ProductQuestionsWidget(upToDateProduct),
+                      ),
               ),
             ),
           ],
@@ -194,14 +197,11 @@ class ProductPageState extends State<ProductPage>
               child: HeroMode(
                 enabled: widget.withHeroAnimation &&
                     widget.heroTag?.isNotEmpty == true,
-                child: KeepQuestionWidgetAlive(
-                  keepWidgetAlive: _keepRobotoffQuestionsAlive,
-                  child: SummaryCard(
-                    upToDateProduct,
-                    _productPreferences,
-                    heroTag: widget.heroTag,
-                    isFullVersion: true,
-                  ),
+                child: SummaryCard(
+                  upToDateProduct,
+                  _productPreferences,
+                  heroTag: widget.heroTag,
+                  isFullVersion: true,
                 ),
               ),
             ),

diff --git a/packages/smooth_app/lib/pages/product/product_questions_widget.dart b/packages/smooth_app/lib/pages/product/product_questions_widget.dart
@@ -9,6 +9,7 @@ import 'package:smooth_app/generic_lib/design_constants.dart';
 import 'package:smooth_app/generic_lib/duration_constants.dart';
 import 'package:smooth_app/helpers/analytics_helper.dart';
 import 'package:smooth_app/helpers/robotoff_insight_helper.dart';
+import 'package:smooth_app/helpers/robotoff_question_helper.dart';
 import 'package:smooth_app/pages/hunger_games/question_page.dart';
 import 'package:smooth_app/query/product_questions_query.dart';
 import 'package:smooth_app/themes/theme_provider.dart';
@@ -87,13 +88,20 @@ class _ProductQuestionsWidgetState extends State<ProductQuestionsWidget>
     if (context.mounted && answeredQuestions != null && answeredQuestions > 0) {
       return _reloadQuestions(
         updateInsightAnnotations: true,
+        ignoreExistingQuestions: true,
       );
     }
   }
 
   Future<void> _reloadQuestions({
     bool updateInsightAnnotations = false,
+    bool ignoreExistingQuestions = false,
   }) async {
+    final List<RobotoffQuestion>? currentQuestions =
+        _state is _ProductQuestionsWithQuestions
+            ? (_state as _ProductQuestionsWithQuestions).questions
+            : null;
+
     setState(() => _state = const _ProductQuestionsLoading());
 
     final List<RobotoffQuestion> questions =
@@ -118,8 +126,14 @@ class _ProductQuestionsWidgetState extends State<ProductQuestionsWidget>
     }
 
     if (questions.isNotEmpty == true && !_annotationVoted) {
-      setState(() => _state = _ProductQuestionsWithQuestions(questions));
-      _trackEvent(AnalyticsEvent.questionVisible);
+      if (ignoreExistingQuestions &&
+          currentQuestions != null &&
+          questions.areSameAs(currentQuestions)) {
+        setState(() => _state = const _ProductQuestionsWithoutQuestions());
+      } else {
+        setState(() => _state = _ProductQuestionsWithQuestions(questions));
+        _trackEvent(AnalyticsEvent.questionVisible);
+      }
     } else {
       setState(() => _state = const _ProductQuestionsWithoutQuestions());
     }