fix: fixed profile dropdown warnning

raheeliftikhar5 · raheeliftikhar5 · commit 7a69d659b39a · 2023-09-22T11:55:28.000+05:00
diff --git a/client/packages/lowcoder/src/pages/common/profileDropdown.tsx b/client/packages/lowcoder/src/pages/common/profileDropdown.tsx
@@ -26,6 +26,7 @@ import { trans } from "i18n";
 import { showSwitchOrg } from "@lowcoder-ee/pages/common/customerService";
 import { checkIsMobile } from "util/commonUtils";
 import { selectSystemConfig } from "redux/selectors/configSelectors";
+import { ItemType } from "antd/es/menu/hooks/useItems";
 
 const ProfileWrapper = styled.div`
   display: flex;
@@ -159,13 +160,10 @@ export default function ProfileDropdown(props: DropDownProps) {
     }
   };
 
-  const menu = (
-    <DropdownMenu
-      style={{ width: "192px" }}
-      onClick={handleClick}
-      expandIcon={<StyledPackUpIcon />}
-    >
-      <Menu.Item key="profile">
+  let profileDropdownMenuItems:ItemType[] = [
+    {
+      key: 'profile',
+      label: (
         <ProfileWrapper>
           <ProfileImage source={avatarUrl} userName={username} side={48} />
           <StyledNameLabel>
@@ -187,36 +185,61 @@ export default function ProfileDropdown(props: DropDownProps) {
             <OrgRoleLabel>{OrgRoleInfo[currentOrgRoleId].name}</OrgRoleLabel>
           )}
         </ProfileWrapper>
-      </Menu.Item>
-      {orgs && orgs.length > 0 && showSwitchOrg(props.user, sysConfig) && (
-        <StyledDropdownSubMenu
-          key="switchOrg"
-          title={trans("profile.switchOrg")}
-          popupOffset={[4, -12]}
-        >
-          <CommonTextLabel style={{ margin: "8px", color: "#B8B9BF" }}>
-            {trans("profile.joinedOrg")}
-          </CommonTextLabel>
-          {orgs.map((org: Org) => {
-            const MenuItem = (currentOrgId === org.id ? SelectDropMenuItem : Menu.Item) as React.ElementType;
-            return (
-              <MenuItem key={org.id} icon={currentOrgId === org.id && <CheckoutIcon />}>
-                {org.name}
-              </MenuItem>
-            );
-          })}
-          {!checkIsMobile(window.innerWidth) && (
-            <>
-              <Menu.Divider />
-              <Menu.Item key="newOrganization" icon={<AddIcon />}>
-                {trans("profile.createOrg")}
-              </Menu.Item>
-            </>
-          )}
-        </StyledDropdownSubMenu>
-      )}
-      <Menu.Item key="logout">{trans("profile.logout")}</Menu.Item>
-    </DropdownMenu>
+      ),
+    },
+    {
+      key: 'logout',
+      label: trans("profile.logout"),
+    }
+  ]
+
+  if(orgs && orgs.length > 0 && showSwitchOrg(props.user, sysConfig)) {
+    const switchOrgSubMenu = orgs.map((org: Org) => ({
+      key: org.id,
+      icon: currentOrgId === org.id && <CheckoutIcon />,
+      label: org.name
+    }))
+
+    let addWorkSpace:ItemType[] = [];
+    if(!checkIsMobile(window.innerWidth)) {
+      addWorkSpace = [
+        { type: 'divider'},
+        {
+          key: 'newOrganization',
+          icon: <AddIcon />,
+          label: trans("profile.createOrg")
+        }
+      ]
+    }
+
+    const switchOrgMenu = {
+      key: 'switchOrg',
+      label: trans("profile.switchOrg"),
+      popupOffset: [4, -12],
+      children: [
+        {
+          key: 'joinedOrg',
+          label: (
+            <CommonTextLabel style={{ margin: "8px", color: "#B8B9BF" }}>
+              {trans("profile.joinedOrg")}
+            </CommonTextLabel>
+          ),
+          disabled: true,
+        },
+        ...switchOrgSubMenu,
+        ...addWorkSpace,
+      ]
+    }
+    profileDropdownMenuItems.splice(1, 0, switchOrgMenu);
+  }
+
+  const menu = (
+    <DropdownMenu
+      style={{ width: "192px" }}
+      onClick={handleClick}
+      expandIcon={<StyledPackUpIcon />}
+      items={profileDropdownMenuItems}
+    />
   );
   return (
     <>
diff --git a/client/packages/lowcoder/src/pages/userAuth/formLogin.tsx b/client/packages/lowcoder/src/pages/userAuth/formLogin.tsx
@@ -71,16 +71,13 @@ export default function FormLogin() {
         <ConfirmButton loading={loading} disabled={!account || !password} onClick={onSubmit}>
           {trans("userAuth.login")}
         </ConfirmButton>
-        {Boolean(invitationId) && (
-          <>
-            <Divider />
-            <ThirdPartyAuth
-              invitationId={invitationId}
-              invitedOrganizationId={invitedOrganizationId}
-              authGoal="login"
-            />
-          </>
-        )}
+
+        <Divider />
+        <ThirdPartyAuth
+          invitationId={invitationId}
+          invitedOrganizationId={invitedOrganizationId}
+          authGoal="login"
+        />
       </AccountLoginWrapper>
       <AuthBottomView>
         {systemConfig.form.enableRegister && (
