From b135e8954390205ad6705f747ca256280a984967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anne=20L=27H=C3=B4te?= <anne.lhote@gmail.com>
Date: Wed, 5 Mar 2025 11:13:21 +0100
Subject: [PATCH] fix(tag-input): No need to clear tag input, should clear
 complete search instead

---
 client/src/components/tag-input/index.jsx      | 18 +-----------------
 client/src/pages/datasets/search.jsx           | 11 -----------
 .../src/pages/openalex-affiliations/search.jsx | 11 -----------
 client/src/pages/publications/search.jsx       | 11 -----------
 4 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/client/src/components/tag-input/index.jsx b/client/src/components/tag-input/index.jsx
index 28943096..309d92d8 100644
--- a/client/src/components/tag-input/index.jsx
+++ b/client/src/components/tag-input/index.jsx
@@ -31,7 +31,6 @@ export default function TagInput({
   onInputHandler,
   onTagsChange,
   placeholder,
-  removeAllAffiliations,
   seeMoreAction,
   seeMoreAfter,
   switchGetRorChildren,
@@ -102,21 +101,7 @@ export default function TagInput({
         <Col className="fr-pb-2w">
           <TextInput
             hint={hint}
-            label={(
-              <>
-                {label}
-                <Button
-                  aria-label="Remove all affiliations"
-                  className="fr-ml-1w"
-                  color="yellow-tournesol"
-                  icon="delete-line"
-                  onClick={() => removeAllAffiliations()}
-                  size="sm"
-                  title="Remove all affiliations"
-                  variant="text"
-                />
-              </>
-            )}
+            label={label}
             message={message}
             messageType={messageType}
             onChange={(e) => setInput(e.target.value)}
@@ -212,7 +197,6 @@ TagInput.propTypes = {
   onInputHandler: PropTypes.func,
   onTagsChange: PropTypes.func.isRequired,
   placeholder: PropTypes.string,
-  removeAllAffiliations: PropTypes.func.isRequired,
   seeMoreAction: PropTypes.func,
   seeMoreAfter: PropTypes.number,
   switchGetRorChildren: PropTypes.func,
diff --git a/client/src/pages/datasets/search.jsx b/client/src/pages/datasets/search.jsx
index 44eacdc4..23610266 100644
--- a/client/src/pages/datasets/search.jsx
+++ b/client/src/pages/datasets/search.jsx
@@ -193,15 +193,6 @@ export default function DatasetsSearch() {
     navigate(`/${pathname.split('/')[1]}/results${search}`);
   };
 
-  const removeAllAffiliations = () => {
-    setSearchParams({
-      ...currentSearchParams,
-      affiliations: [],
-      deletedAffiliations: [],
-    });
-    setSearchedAffiliations([]);
-  };
-
   const switchGetRorChildren = () => setSearchParams({ ...currentSearchParams, getRorChildren: currentSearchParams.getRorChildren === '1' ? '0' : '1' });
 
   const NB_TAGS_STICKY = 2;
@@ -269,7 +260,6 @@ export default function DatasetsSearch() {
                   messageType={messageType}
                   onInputHandler={setOnInputAffiliationsHandler}
                   onTagsChange={onTagsChange}
-                  removeAllAffiliations={removeAllAffiliations}
                   seeMoreAfter={0}
                   switchGetRorChildren={switchGetRorChildren}
                   tags={tags}
@@ -312,7 +302,6 @@ export default function DatasetsSearch() {
               messageType={messageType}
               onInputHandler={setOnInputAffiliationsHandler}
               onTagsChange={onTagsChange}
-              removeAllAffiliations={removeAllAffiliations}
               seeMoreAction={(e) => {
                 setIsOpen(true);
                 e.preventDefault();
diff --git a/client/src/pages/openalex-affiliations/search.jsx b/client/src/pages/openalex-affiliations/search.jsx
index 5adcb793..a02d3e5a 100644
--- a/client/src/pages/openalex-affiliations/search.jsx
+++ b/client/src/pages/openalex-affiliations/search.jsx
@@ -234,15 +234,6 @@ export default function Search() {
     });
   };
 
-  const removeAllAffiliations = () => {
-    setSearchParams({
-      ...currentSearchParams,
-      affiliations: [],
-      deletedAffiliations: [],
-    });
-    setSearchedAffiliations([]);
-  };
-
   const switchGetRorChildren = () => setSearchParams({ ...currentSearchParams, getRorChildren: currentSearchParams.getRorChildren === '1' ? '0' : '1' });
 
   const NB_TAGS_STICKY = 2;
@@ -310,7 +301,6 @@ export default function Search() {
                   messageType={messageType}
                   onInputHandler={setOnInputAffiliationsHandler}
                   onTagsChange={onTagsChange}
-                  removeAllAffiliations={removeAllAffiliations}
                   seeMoreAfter={0}
                   switchGetRorChildren={switchGetRorChildren}
                   tags={tags}
@@ -361,7 +351,6 @@ export default function Search() {
               messageType={messageType}
               onInputHandler={setOnInputAffiliationsHandler}
               onTagsChange={onTagsChange}
-              removeAllAffiliations={removeAllAffiliations}
               seeMoreAction={(e) => {
                 setIsOpen(true);
                 e.preventDefault();
diff --git a/client/src/pages/publications/search.jsx b/client/src/pages/publications/search.jsx
index 35b83d1f..95e7b297 100644
--- a/client/src/pages/publications/search.jsx
+++ b/client/src/pages/publications/search.jsx
@@ -193,15 +193,6 @@ export default function PublicationsSearch() {
     navigate(`/${pathname.split('/')[1]}/results${search}`);
   };
 
-  const removeAllAffiliations = () => {
-    setSearchParams({
-      ...currentSearchParams,
-      affiliations: [],
-      deletedAffiliations: [],
-    });
-    setSearchedAffiliations([]);
-  };
-
   const switchGetRorChildren = () => setSearchParams({ ...currentSearchParams, getRorChildren: currentSearchParams.getRorChildren === '1' ? '0' : '1' });
 
   const NB_TAGS_STICKY = 2;
@@ -269,7 +260,6 @@ export default function PublicationsSearch() {
                   messageType={messageType}
                   onInputHandler={setOnInputAffiliationsHandler}
                   onTagsChange={onTagsChange}
-                  removeAllAffiliations={removeAllAffiliations}
                   seeMoreAfter={0}
                   switchGetRorChildren={switchGetRorChildren}
                   tags={tags}
@@ -312,7 +302,6 @@ export default function PublicationsSearch() {
               messageType={messageType}
               onInputHandler={setOnInputAffiliationsHandler}
               onTagsChange={onTagsChange}
-              removeAllAffiliations={removeAllAffiliations}
               seeMoreAction={(e) => {
                 setIsOpen(true);
                 e.preventDefault();