Merge commit '639574c6b578af7721e7e3093b015b7de67a928f' into staging

client/src/pages/networks/components/graph/index.tsx

@@ -1,4 +1,3 @@
-import { useMemo } from "react"
 import { Spinner } from "@dataesr/dsfr-plus"
 import { VOSviewerOnline } from "vosviewer-online"
 import { useDSFRConfig } from "@dataesr/dsfr-plus"
@@ -16,21 +15,19 @@ export default function NetworkGraph() {
   const { search, currentQuery, filters } = useSearchData(currentTab, false)
   const { search: searchClusters } = useSearchData(currentTab, parameters.clusters)
   const { locale: lang } = useDSFRConfig()
+  const theme = document.documentElement.getAttribute("data-fr-theme")
 
-  const keyClusters = searchClusters.isFetching ? false : parameters.clusters
-  const vosviewer = keyClusters ? searchClusters?.data : search?.data
-  const key = useMemo(
-    () => JSON.stringify({ currentTab, currentQuery, filters, keyClusters, lang, focusItem, parameters }),
-    [currentTab, currentQuery, filters, keyClusters, lang, focusItem, parameters]
-  )
+  if (searchClusters.isFetching) parameters.clusters = false
+  const vosviewer = parameters.clusters ? searchClusters?.data : search?.data
 
   if (!currentQuery) return <Default />
 
   if (search.isFetching) return <Spinner />
 
   if (!vosviewer?.network) return <Error204 />
 
-  const theme = document.documentElement.getAttribute("data-fr-scheme")
+  const key = JSON.stringify({ currentTab, currentQuery, filters, ...parameters, lang, theme, focusItem })
+
   const vosparams = {
     largest_component: false,
     dark_ui: theme === "dark",

client/src/pages/networks/integration/index.tsx

@@ -2,19 +2,24 @@ import { Suspense } from "react"
 import { createIntl, RawIntlProvider } from "react-intl"
 import { messages } from "../config/messages"
 import useIntegration from "../hooks/useIntegration"
+import { NetworkContext } from "../context"
 import NetworksLayout from "../layout"
 
 export default function NetworksIntegration() {
-  const { integrationLang: locale } = useIntegration()
+  const { integrationId, integrationLang: locale } = useIntegration()
   const intl = createIntl({
     locale,
     messages: messages[locale],
   })
 
+  if (!integrationId) return "ERROR: Integration local ID not defined!"
+
   return (
     <RawIntlProvider value={intl}>
       <Suspense>
-        <NetworksLayout />
+        <NetworkContext>
+          <NetworksLayout />
+        </NetworkContext>
       </Suspense>
     </RawIntlProvider>
   )