fix: 🐛 Corrige la redirection vers les articles depuis les tnd

SocialGouv · Jan 15, 2024 · 2e1a2d7 · 2e1a2d7
1 parent 772e4ca
commit 2e1a2d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 61 deletions.
diff --git a/front/src/navigation/BottomTabNavigator.tsx b/front/src/navigation/BottomTabNavigator.tsx
@@ -162,6 +162,8 @@ const TabSurveysNavigator: FC = () => (
       options={{}}
     />
     <TabSurveysStack.Screen name="parentheque" component={Parentheque} />
+    <TabCalendarStack.Screen name="article" component={ArticleDetail} />
+    <TabCalendarStack.Screen name="articleSwipe" component={ArticleSwipe} />
   </TabSurveysStack.Navigator>
 );
 

diff --git a/front/src/screens/tndSurvey/tndSurveyResult.component.tsx b/front/src/screens/tndSurvey/tndSurveyResult.component.tsx
@@ -8,13 +8,8 @@ import HTML from "react-native-render-html";
 import WebView from "react-native-webview";
 
 import ImgBtnReview from "../../assets/images/btn-review-sp-plus.svg";
-import { ArticleList } from "../../components";
-import {
-  CommonText,
-  SecondaryTextItalic,
-  TitleH1,
-  View,
-} from "../../components/baseComponents";
+import { ArticleCard } from "../../components";
+import { CommonText, TitleH1, View } from "../../components/baseComponents";
 import {
   FetchPoliciesConstants,
   HomeDbQueries,
@@ -27,58 +22,8 @@ import { GraphQLMutation, GraphQLQuery } from "../../services";
 import { Colors, FontWeight, Margins, Paddings, Sizes } from "../../styles";
 import type { SurveyQuestionAndAnswers } from "../../type";
 import type { TndAnswers, TndQuestionnaire } from "../../type/tndSurvey.types";
-import type { Article, Step } from "../../types";
+import type { Article } from "../../types";
 import { LinkingUtils, TndSurveyUtils } from "../../utils";
-import ArticleDetail from "../articles/articleDetail.component";
-
-export const ArticlesRoute = (
-  updatedText: string,
-  articles: Article[]
-): React.ReactElement => {
-  const [showArticle, setShowArticle] = useState(false);
-  const [currentArticleId, setCurrentArticleId] = useState(0);
-  const [currentArticleStep, setCurrentArticleStep] = useState<
-    Step | undefined
-  >();
-
-  const onBackButtonPressed = useCallback(() => {
-    setShowArticle(false);
-  }, []);
-
-  const onUpdateStepAndArticleId = useCallback(
-    (articleId: number, step: Step | undefined) => {
-      setShowArticle(true);
-      setCurrentArticleId(articleId);
-      setCurrentArticleStep(step);
-    },
-    []
-  );
-
-  if (articles.length <= 0) {
-    return (
-      <View style={styles.center}>
-        <SecondaryTextItalic>{updatedText}</SecondaryTextItalic>
-      </View>
-    );
-  }
-
-  return showArticle ? (
-    <ArticleDetail
-      _articleId={currentArticleId}
-      _articleStep={currentArticleStep}
-      goBack={onBackButtonPressed}
-    />
-  ) : (
-    <View style={styles.listContainer}>
-      <ArticleList
-        articles={articles}
-        animationDuration={500}
-        isFromSearchScreen
-        setStepAndArticleId={onUpdateStepAndArticleId}
-      />
-    </View>
-  );
-};
 
 interface Props {
   result: number;
@@ -173,16 +118,15 @@ const TndSurveyResult: FC<Props> = ({ survey, tndQuestionnaire }) => {
             <CommonText style={styles.listArticlesTitle}>
               {Labels.tndSurvey.surveyResult.articlesToRead}
             </CommonText>
-            {/* {handicapArticles.map((article, index) => (
+            {handicapArticles.map((article, index) => (
               <View key={index}>
                 <ArticleCard
                   selectedArticleId={article.id}
                   articles={handicapArticles}
                   isFromTndScreen={true}
                 />
               </View>
-            ))} */}
-            {ArticlesRoute("", handicapArticles)}
+            ))}
           </View>
         )}
       </ScrollView>