fix(organizations): filter takes externalIds

ahonestla · ahonestla · commit 705383163a54 · 2026-01-26T17:06:56.000+01:00
diff --git a/client/src/api/organizations/autocomplete/index.ts b/client/src/api/organizations/autocomplete/index.ts
@@ -2,7 +2,16 @@ import { organizationsIndex, postHeaders } from "../../../config/api";
 import { LightOrganization } from "../../../types/organization";
 import { SearchArgs, SearchResponse, ElasticResult } from "../../../types/commons";
 
-const SOURCE = ["id", "label", "address.main", "address.city", "publicationsCount", "projectsCount", "patentsCount"]
+const SOURCE = [
+  "id",
+  "label",
+  "address.main",
+  "address.city",
+  "externalIds",
+  "publicationsCount",
+  "projectsCount",
+  "patentsCount",
+]
 
 export async function autocompleteOrganizations({ query }: SearchArgs): Promise<Pick<SearchResponse<LightOrganization>, "data">> {
   const body: any = {
diff --git a/client/src/pages/organizations/[id]/components/network/index.tsx b/client/src/pages/organizations/[id]/components/network/index.tsx
@@ -6,7 +6,7 @@ import { useIntl } from "react-intl"
 
 type OrganizationNetworkProps = {
   data: Network
-  affiliationsIds: { value: string; label: string }[]
+  affiliationsIds: { value: any; label: string }[]
 }
 
 export default function OrganizationNetwork({ data: network, affiliationsIds }: OrganizationNetworkProps) {
diff --git a/client/src/pages/organizations/[id]/components/organization.tsx b/client/src/pages/organizations/[id]/components/organization.tsx
@@ -56,8 +56,6 @@ export default function OrganizationPresentation({
 		NETWORK_BADGES_CODES.includes(b.code.toLowerCase()),
 	);
 
-	console.log("data", data)
-
 	const propre = data?.institutionOf
 		?.filter((element) =>
 			["établissement tutelle", "primary"].includes(element.relationType),
@@ -319,10 +317,7 @@ export default function OrganizationPresentation({
 									<OrganizationNetwork
 										data={network}
 										affiliationsIds={[
-											{ value: data.id, label: getLangFieldValue(locale)(data.label) },
-											...data?.externalIds?.filter((extId) => extId.id !== data.id).map((extId) =>
-												({ value: extId.id, label: extId.id })
-											),
+											{ value: [...new Set([data.id, ...data.externalIds?.map((extId) => extId.id)])], label: getLangFieldValue(locale)(data.label) },
 										]}
 									/>
 									<OrganizationProjects
diff --git a/client/src/pages/search/components/publications/filters/organizations.tsx b/client/src/pages/search/components/publications/filters/organizations.tsx
@@ -16,9 +16,9 @@ import getLangFieldValue from "../../../../../utils/lang";
 
 export default function PublicationOrganizationsFilter() {
   const { locale } = useDSFRConfig();
-  const { currentFilters, handleFilterChange, setOperator } = useUrl();
+  const { currentFilters, handleArrayFilterChange, setOperator } = useUrl();
 
-  const authorsAutocompletedList = useAutocompleteList<LightOrganization>({
+  const organizationsAutocompletedList = useAutocompleteList<LightOrganization>({
     async load({ filterText }) {
       if (!filterText) {
         return { items: [] };
@@ -55,39 +55,42 @@ export default function PublicationOrganizationsFilter() {
       <TagGroup>
         {filter?.values?.map(({ value, label }) => (
           <DismissibleTag
-            key={value}
+            key={Array.isArray(value) ? value.join("|||") : value}
             className="fr-mr-1v"
             color="orange-terre-battue"
             onClick={(e) => {
               e.preventDefault()
-              handleFilterChange({ field: "affiliations.id", value })
+              handleArrayFilterChange({ field: "affiliations.id", value: Array.isArray(value) ? value : [value] })
             }}
           >
-            {label || value}
+            {label || (Array.isArray(value) ? value.join(", ") : value)}
           </DismissibleTag>
         ))}
       </TagGroup>
       <Autocomplete
         label="Rechercher des structures"
-        items={authorsAutocompletedList.items}
-        inputValue={authorsAutocompletedList.filterText}
-        onInputChange={authorsAutocompletedList.setFilterText}
-        loadingState={authorsAutocompletedList.loadingState}
+        items={organizationsAutocompletedList.items}
+        inputValue={organizationsAutocompletedList.filterText}
+        onInputChange={organizationsAutocompletedList.setFilterText}
+        loadingState={organizationsAutocompletedList.loadingState}
         // menuTrigger="focus"
         size="md"
         onSelectionChange={(item) => {
           if (!item) return
-          const [value, label] = item.toString().split("###")
-          handleFilterChange({ field: "affiliations.id", value, label })
-          authorsAutocompletedList.setFilterText('')
+          const [label, values] = item.toString().split("###")
+          const value = values.split("|||")
+          handleArrayFilterChange({ field: "affiliations.id", value, label })
+          organizationsAutocompletedList.setFilterText("")
         }}
       >
         {(item) => (
           <AutocompleteItem
             startContent={<span className="fr-mr-3v fr-icon--md fr-icon-user-line" />}
             endContent={<span className="fr-text--xs fr-text-mention--grey">{item.publicationsCount} publications</span>}
             description={item.address?.find((a) => a.main)?.city}
-            key={`${item.id}###${getLangFieldValue(locale)(item.label)}`}
+            key={`${getLangFieldValue(locale)(item.label)}###${[
+              ...new Set([item.id, ...(item.externalIds?.map((id) => id.id) || [])]),
+            ].join("|||")}`}
           >
             {getLangFieldValue(locale)(item.label)}
           </AutocompleteItem>
diff --git a/client/src/pages/search/hooks/useUrl.ts b/client/src/pages/search/hooks/useUrl.ts
@@ -5,7 +5,7 @@ import useIntegration from "../../networks/hooks/useIntegration";
 
 type FilterValues = {
   label?: string;
-  value: string | number;
+  value: string | number | (string | number)[];
 }[];
 export type Filter = {
   type: "terms" | "range" | "bool";
@@ -67,13 +67,13 @@ export function filtersToElasticQuery(
     if (!filter?.values?.length || !filter?.type) return [];
     if (filter.operator === "and") {
       return filter?.values?.map(({ value }) =>
-        fromFilterToElasticQuery(field, [value], filter.type)
+        fromFilterToElasticQuery(field, Array.isArray(value) ? value : [value], filter.type)
       );
     }
     return [
       fromFilterToElasticQuery(
         field,
-        filter.values.map(({ value }) => value),
+        filter.values.flatMap(({ value }) => (Array.isArray(value) ? value : [value])),
         filter.type
       ),
     ];
@@ -164,6 +164,42 @@ export default function useUrl() {
     [currentFilters, handleDeleteFilter, searchParams, setSearchParams]
   );
 
+  const handleArrayFilterChange = useCallback(
+    ({ field, value, filterType = "terms", label = null }: { field: string; value: (string | number)[]; filterType?: "terms" | "range" | "bool"; label?: string }) => {
+      if (!field || !value) return;
+      const prev = { ...currentFilters };
+      const filter = prev?.[field];
+      if (!filter) {
+        const nextFilters = {
+          ...prev,
+          [field]: {
+            values: [{ value, label }],
+            type: filterType,
+            operator: "or" as "or" | "and",
+          },
+        };
+        searchParams.set("filters", stringifySearchFiltersForURL(nextFilters));
+        setSearchParams(searchParams);
+        return;
+      }
+      const arrayExists = filter?.values?.some((el) => JSON.stringify(el.value) === JSON.stringify(value))
+      const nextFilterValues = arrayExists
+        ? filter?.values?.filter((el) => JSON.stringify(el.value) !== JSON.stringify(value))
+        : [...filter.values, { value, label }];
+      if (!nextFilterValues.length && filter?.operator !== "and") {
+        return handleDeleteFilter({ field });
+      }
+      const nextFilters = {
+        ...prev,
+        [field]: { ...filter, values: nextFilterValues },
+      };
+
+      searchParams.set("filters", stringifySearchFiltersForURL(nextFilters));
+      setSearchParams(searchParams);
+    },
+    [currentFilters, handleDeleteFilter, searchParams, setSearchParams]
+  );
+
   const handleFilterChange = useCallback(
     ({ field, value, filterType = "terms", label = null }) => {
       if (!field || !value) return;
@@ -239,6 +275,7 @@ export default function useUrl() {
       handleDeleteFilter,
       handleRangeFilterChange,
       handleBoolFilterChange,
+      handleArrayFilterChange,
     };
   }, [
     api,
@@ -252,6 +289,7 @@ export default function useUrl() {
     handleDeleteFilter,
     handleRangeFilterChange,
     handleBoolFilterChange,
+    handleArrayFilterChange,
   ]);
 
   return values;
diff --git a/client/src/types/organization.ts b/client/src/types/organization.ts
@@ -145,6 +145,7 @@ export type LightOrganization = {
 	level: string;
 	nature: string;
 	id: string;
+	externalIds?: Array<ExternalIdsData>;
 	creationYear: string;
 	isFrench: string;
 	active: string;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import { useIntl } from "react-intl"`
`6`	`6`
`7`	`7`	`type OrganizationNetworkProps = {`
`8`	`8`	`data: Network`
`9`		`- affiliationsIds: { value: string; label: string }[]`
	`9`	`+ affiliationsIds: { value: any; label: string }[]`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`export default function OrganizationNetwork({ data: network, affiliationsIds }: OrganizationNetworkProps) {`