Update cloud user logic

Author: alexandrudanpop

packages/react-ui/src/app/common/hooks/flags-hooks.ts

@@ -59,9 +59,28 @@ export const flagsHooks = {
     };
   },
   useShouldFetchCloudTemplates: () => {
-    return (
-      !flagsHooks.useFlag<boolean>(FlagId.CLOUD_CONNECTION_PAGE_ENABLED).data ||
-      false
-    );
+    const cloudConnectionPageEnabled = flagsHooks.useFlag<boolean>(
+      FlagId.CLOUD_CONNECTION_PAGE_ENABLED,
+    ).data;
+    const federatedLoginEnabled = flagsHooks.useFlag<boolean>(
+      FlagId.FEDERATED_LOGIN_ENABLED,
+    ).data;
+
+    // Fetch cloud templates when cloud connection page is disabled
+    // OR when federated login is enabled
+    return !cloudConnectionPageEnabled || federatedLoginEnabled || false;
+  },
+
+  useShouldShowCloudUserInMenu: () => {
+    const cloudConnectionPageEnabled = flagsHooks.useFlag<boolean>(
+      FlagId.CLOUD_CONNECTION_PAGE_ENABLED,
+    ).data;
+    const federatedLoginEnabled = flagsHooks.useFlag<boolean>(
+      FlagId.FEDERATED_LOGIN_ENABLED,
+    ).data;
+
+    // Show cloud user in menu only when:
+    // - Cloud connection page is disabled AND federated login is also disabled
+    return !cloudConnectionPageEnabled && !federatedLoginEnabled;
   },
 };

packages/react-ui/src/app/features/navigation/side-menu/side-menu-footer.tsx

@@ -38,6 +38,7 @@ const SideMenuFooter = ({ isMinimized }: Props) => {
   }));
   const user = authenticationSession.getCurrentUser();
   const useCloudTemplates = flagsHooks.useShouldFetchCloudTemplates();
+  const shouldShowCloudUserInMenu = flagsHooks.useShouldShowCloudUserInMenu();
   const branding = flagsHooks.useWebsiteBranding();
   const { createPollingInterval } = useUserInfoPolling();
 
@@ -103,12 +104,13 @@ const SideMenuFooter = ({ isMinimized }: Props) => {
       onLogout={onLogout}
       isMinimized={isMinimized}
       cloudConfig={{
-        user: cloudUser
-          ? {
-              email: cloudUser.email,
-            }
-          : undefined,
-        isCloudLoginEnabled: useCloudTemplates,
+        user:
+          cloudUser && shouldShowCloudUserInMenu
+            ? {
+                email: cloudUser.email,
+              }
+            : undefined,
+        isCloudLoginEnabled: useCloudTemplates && shouldShowCloudUserInMenu,
         onCloudLogin,
         logoUrl: branding.logos.logoIconPositiveUrl,
       }}