Merge branch 'develop' of github.com:meedan/check-web into refactoring/…

…CV2-6006-add-graph-ql-fragments-for-media-origin-media-origin-banner-and-parent-components

localization/react-intl/src/app/components/bot/MatchingSettings.json

@@ -0,0 +1,37 @@
+[
+  {
+    "id": "matchingSettings.lowRange",
+    "description": "Label for low end of similarity threshold",
+    "defaultMessage": "Lenient"
+  },
+  {
+    "id": "matchingSettings.highRange",
+    "description": "Label for the high end of the similarity threshold",
+    "defaultMessage": "Strict"
+  },
+  {
+    "id": "matchingSettings.maxWordsHelpMessage",
+    "description": "Message for additional context for the use of the maximum word value",
+    "defaultMessage": "Maximum number of words to perform a keyword search instead of a similarity search."
+  },
+  {
+    "id": "matchingSettings.maxWordsLabel",
+    "description": "Label for maximum matching words input",
+    "defaultMessage": "Maximum words"
+  },
+  {
+    "id": "matchingSettings.similarityThresholdLabel",
+    "description": "Label for the search threshold slider",
+    "defaultMessage": "Search Threshold"
+  },
+  {
+    "id": "matchingSettings.similarityThresholdValueLabel",
+    "description": "Label for value on slider.",
+    "defaultMessage": "Search Threshold: {val}"
+  },
+  {
+    "id": "matchingSettings.similarityThresholdHelpMessage",
+    "description": "Additional context for the use of the value for the search threshold slider",
+    "defaultMessage": "When searching for articles to return based on a user message, how strict should the bot be when comparing text."
+  }
+]

package.json

@@ -124,7 +124,7 @@
     "eslint-plugin-relay": "^1.8.3",
     "eslint-plugin-require-path-exists": "1.1.7",
     "eslint-plugin-sort-destructure-keys": "^2.0.0",
-    "express": "^4.21.0",
+    "express": "^4.21.2",
     "file-loader": "^6.2.0",
     "graphql": "^14.6.0",
     "gulp": "^4.0.2",

src/app/components/article/MediaArticlesCard.js

@@ -81,7 +81,6 @@ const MediaArticlesCard = ({ article, onAdd, team }) => {
           { article.nodeType === 'Explainer' && <FormattedMessage defaultMessage="Explainer" description="Type description of an explainer article card." id="mediaArticlesCard.explainer" tagName="small" /> }
         </div>
         <h6 className={styles.articlesSidebarCardTitle}>
-          { article.nodeType === 'Explainer' && article.title }
           { article.nodeType === 'FactCheck' && isFactCheckValueBlank(article.title) ? article.claim_description?.description : article.title }
         </h6>
         { article.nodeType === 'Explainer' && article.description && <div className={styles.articlesSidebarCardDescription}>{article.description}</div> }

src/app/components/article/MediaArticlesTeamArticles.js

@@ -135,7 +135,7 @@ const MediaArticlesTeamArticles = ({
           let articles = [];
           let hasRelevantArticles = false;
           // If there are relevant articles, we prioritize and display them
-          if (props.project_media.relevant_articles_count > 0) {
+          if (props.project_media.relevant_articles_count > 0 && !textSearch) {
             hasRelevantArticles = true;
             articles = props.project_media.relevant_articles.edges.map(edge => edge.node);
           } else {