From c2605de89afa75e5957c49cda15a460d5860d99c Mon Sep 17 00:00:00 2001
From: ronronscelestes <julie.plantey@gmail.com>
Date: Tue, 12 Apr 2022 15:23:56 +0200
Subject: [PATCH] update ConfigurationsProvider with new logo

---
 packages/core/admin/admin/src/pages/App/index.js          | 3 ++-
 .../SettingsPage/pages/ApplicationInfosPage/index.js      | 8 +++++++-
 .../SettingsPage/pages/ApplicationInfosPage/utils/api.js  | 4 +++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/core/admin/admin/src/pages/App/index.js b/packages/core/admin/admin/src/pages/App/index.js
index 1c9769cf4b..d7fa37051a 100644
--- a/packages/core/admin/admin/src/pages/App/index.js
+++ b/packages/core/admin/admin/src/pages/App/index.js
@@ -12,6 +12,7 @@ import {
   request,
   useNotification,
   TrackingContext,
+  prefixFileUrlWithBackendUrl,
 } from '@strapi/helper-plugin';
 import { SkipToContent } from '@strapi/design-system/Main';
 import { useIntl } from 'react-intl';
@@ -71,7 +72,7 @@ function App() {
           data: { hasAdmin, uuid, menuLogo },
         } = await request('/admin/init', { method: 'GET' });
 
-        setCustomLogo(menuLogo, 'menu');
+        setCustomLogo(prefixFileUrlWithBackendUrl(menuLogo), 'menu');
 
         if (uuid) {
           try {
diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js
index 9ad323b506..8ca61e46b2 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js
@@ -17,6 +17,7 @@ import { Link } from '@strapi/design-system/Link';
 import { Button } from '@strapi/design-system/Button';
 import ExternalLink from '@strapi/icons/ExternalLink';
 import Check from '@strapi/icons/Check';
+import { useConfigurations } from '../../../../hooks';
 import Form from './components/Form';
 import { fetchProjectSettings, updateProjectSettings } from './utils/api';
 import { getFormData } from './utils/getFormData';
@@ -30,6 +31,10 @@ const ApplicationInfosPage = () => {
   useFocusWhenNavigate();
   const appInfos = useAppInfos();
   const { shouldUpdateStrapi, latestStrapiReleaseTag, strapiVersion } = appInfos;
+  const {
+    setCustomLogo,
+    logos: { menu },
+  } = useConfigurations();
 
   const { data } = useQuery('project-settings', fetchProjectSettings);
 
@@ -38,8 +43,9 @@ const ApplicationInfosPage = () => {
     : 'app.components.UpgradePlanModal.text-ee';
 
   const submitMutation = useMutation(body => updateProjectSettings(body), {
-    onSuccess: async () => {
+    onSuccess: async ({ menuLogo }) => {
       await queryClient.invalidateQueries('project-settings', { refetchActive: true });
+      setCustomLogo(menuLogo?.url || menu.default, 'menu');
     },
   });
 
diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/api.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/api.js
index 7db367a56b..8a414831cf 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/api.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/api.js
@@ -8,7 +8,9 @@ const fetchProjectSettings = async () => {
 };
 
 const updateProjectSettings = async body => {
-  await axiosInstance.post('/admin/project-settings', body);
+  const { data } = await axiosInstance.post('/admin/project-settings', body);
+
+  return prefixAllUrls(data);
 };
 
 export { fetchProjectSettings, updateProjectSettings };