From 09df12b6e910aac4754b2dda6b21840059628056 Mon Sep 17 00:00:00 2001
From: ichalagashvili <i.chalagashvili@entando.com>
Date: Thu, 17 Aug 2023 13:11:31 +0400
Subject: [PATCH 1/2] ENG-5100 remove logic for primary tenant menu rendering

---
 src/ui/internal-page/VerticalMenuContainer.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ui/internal-page/VerticalMenuContainer.js b/src/ui/internal-page/VerticalMenuContainer.js
index 20c45fd8f..311cb5cc1 100644
--- a/src/ui/internal-page/VerticalMenuContainer.js
+++ b/src/ui/internal-page/VerticalMenuContainer.js
@@ -44,7 +44,7 @@ import { dismissedWizardKey } from 'ui/app-tour/constant';
 import { getMfeTargetPrimaryMenu } from 'state/mfe/selectors';
 import MfeContainer from 'ui/app/MfeContainer';
 import { getAppTourlastStep } from 'state/app-tour/selectors';
-import { selectIsPrimaryTenant } from 'state/multi-tenancy/selectors';
+// import { selectIsPrimaryTenant } from 'state/multi-tenancy/selectors';
 import { selectCurrSystemConfigAdvancedSearch } from 'state/current-system-configuration/selectors';
 
 const {
@@ -469,12 +469,12 @@ MfeMenuContainer.propTypes = {
 const VerticalMenu = (props) => {
   const mfeMenu = useSelector(getMfeTargetPrimaryMenu);
   // const mfeHeaderMenu = useSelector(getMfeTargetPrimaryHeader);
-  const isPrimaryTenant = useSelector(selectIsPrimaryTenant);
+  // const isPrimaryTenant = useSelector(selectIsPrimaryTenant);
 
   // TODO: remove when we have the ECR API is implemented
   const isMFEMenuEnabled = process.env.USE_MFE || false;
 
-  return isMFEMenuEnabled && isPrimaryTenant
+  return isMFEMenuEnabled
     ?
       <MfeMenuContainer
         menuId={mfeMenu.id}

From 113a0099e94d9d89e842b5748e961e2d69a6dfef Mon Sep 17 00:00:00 2001
From: ichalagashvili <i.chalagashvili@entando.com>
Date: Mon, 21 Aug 2023 12:01:39 +0400
Subject: [PATCH 2/2] ENG-5100 download mfe config if secondary tenant too

---
 src/app-init/MfeDownloadManager.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/app-init/MfeDownloadManager.js b/src/app-init/MfeDownloadManager.js
index 11702e7f9..0d29882f0 100644
--- a/src/app-init/MfeDownloadManager.js
+++ b/src/app-init/MfeDownloadManager.js
@@ -6,7 +6,7 @@ import { getUsername } from '@entando/apimanager';
 import { fetchMfeConfigList } from 'state/mfe/actions';
 import StartupWaitScreen from 'ui/app/StartupWaitScreen';
 import RowSpinner from 'ui/pages/common/RowSpinner';
-import { selectCurrentTenant, selectIsPrimaryTenant } from 'state/multi-tenancy/selectors';
+import { selectCurrentTenant } from 'state/multi-tenancy/selectors';
 import { fetchCurrentTenant } from 'state/multi-tenancy/actions';
 
 const MFE_MANDATORY_SLOT = ['primary-menu'];
@@ -24,7 +24,7 @@ export default function MfeDownloadManager(props) {
   const [isPolling, setIsPolling] = useState(false);
   const currentUserName = useSelector(getUsername);
   const currentTenant = useSelector(selectCurrentTenant);
-  const isPrimaryTenant = useSelector(selectIsPrimaryTenant);
+  // const isPrimaryTenant = useSelector(selectIsPrimaryTenant);
 
   useEffect(() => {
     // wait until apiManager is not initialised and only after that fetch the mfe config list
@@ -51,11 +51,9 @@ export default function MfeDownloadManager(props) {
           configPolling = setTimeout(fetchConfig, 10000);
         });
       };
-      if (isPrimaryTenant) {
-        fetchConfig();
-      }
+      fetchConfig();
     }
-  }, [dispatch, currentUserName, isPrimaryTenant]);
+  }, [dispatch, currentUserName]);
 
   useEffect(() => {
     if (currentUserName) {