yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-08-18 14:06:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Fixing UI issue #2184 #2101 (#2302)

Browse Source
This commit is contained in:
Sachin Chaurasiya 2022-01-20 13:17:42 +05:30 committed by GitHub
parent d6522e2ab4
commit e6f1148920
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
openmetadata-ui/src/main/resources/ui/src/components/UserList/UserList.tsx
View File

@ -20,6 +20,7 @@ import { UserType } from '../../enums/user.enum';
import { Team } from '../../generated/entity/teams/team'; import { Team } from '../../generated/entity/teams/team';
import { User } from '../../generated/entity/teams/user'; import { User } from '../../generated/entity/teams/user';
import { getCountBadge } from '../../utils/CommonUtils'; import { getCountBadge } from '../../utils/CommonUtils';
import ErrorPlaceHolder from '../common/error-with-placeholder/ErrorPlaceHolder';
import Searchbar from '../common/searchbar/Searchbar'; import Searchbar from '../common/searchbar/Searchbar';
import UserDetailsModal from '../Modals/UserDetailsModal/UserDetailsModal'; import UserDetailsModal from '../Modals/UserDetailsModal/UserDetailsModal';
import UserDataCard from '../UserDataCard/UserDataCard'; import UserDataCard from '../UserDataCard/UserDataCard';
@ -311,25 +312,35 @@ const UserList: FunctionComponent<Props> = ({
}; };
return ( return (
<PageLayout leftPanel={getLeftPanel()}> <PageLayout leftPanel={allUsers.length > 0 && getLeftPanel()}>
{!isLoading ? ( <>
<> {!isLoading ? (
{getTabs()} <>
{currentTab === 1 && getUserCards(UserType.ISUSER)} {allUsers.length === 0 ? (
{currentTab === 2 && getUserCards(UserType.ISADMIN)} <ErrorPlaceHolder>
{currentTab === 3 && getUserCards(UserType.ISBOT)} <p className="w-text-lg tw-text-center">No Users Added.</p>
{!isUndefined(selectedUser) && ( </ErrorPlaceHolder>
<UserDetailsModal ) : (
header="User Details" <>
userData={selectedUser} {getTabs()}
onCancel={() => setSelectedUser(undefined)} {currentTab === 1 && getUserCards(UserType.ISUSER)}
onSave={handleSave} {currentTab === 2 && getUserCards(UserType.ISADMIN)}
/> {currentTab === 3 && getUserCards(UserType.ISBOT)}
)} {!isUndefined(selectedUser) && (
</> <UserDetailsModal
) : ( header="User Details"
<Loader /> userData={selectedUser}
)} onCancel={() => setSelectedUser(undefined)}
onSave={handleSave}
/>
)}
</>
)}
</>
) : (
<Loader />
)}
</>
</PageLayout> </PageLayout>
); );
}; };

8
openmetadata-ui/src/main/resources/ui/src/components/nav-bar/NavBar.tsx
View File

@ -55,7 +55,7 @@ const NavBar = ({
<div className="tw-h-16 tw-py-3 tw-border-b-2 tw-border-separator"> <div className="tw-h-16 tw-py-3 tw-border-b-2 tw-border-separator">
<div className="tw-flex tw-items-center tw-flex-row tw-justify-between tw-flex-nowrap tw-px-6 centered-layout"> <div className="tw-flex tw-items-center tw-flex-row tw-justify-between tw-flex-nowrap tw-px-6 centered-layout">
<div className="tw-flex tw-items-center tw-flex-row tw-justify-between tw-flex-nowrap"> <div className="tw-flex tw-items-center tw-flex-row tw-justify-between tw-flex-nowrap">
<NavLink id="openmetadata_logo" to="/"> <NavLink className="tw-flex-shrink-0" id="openmetadata_logo" to="/">
<SVGIcons alt="OpenMetadata Logo" icon={Icons.LOGO} width="90" /> <SVGIcons alt="OpenMetadata Logo" icon={Icons.LOGO} width="90" />
</NavLink> </NavLink>
<div className="tw-ml-5"> <div className="tw-ml-5">
@ -121,7 +121,7 @@ const NavBar = ({
</div> </div>
<div className="tw-flex tw-ml-auto tw-pl-36"> <div className="tw-flex tw-ml-auto tw-pl-36">
<button <button
className="tw-nav focus:tw-no-underline hover:tw-underline" className="tw-nav focus:tw-no-underline hover:tw-underline tw-flex-shrink-0"
data-testid="whatsnew-modal" data-testid="whatsnew-modal"
onClick={() => handleFeatureModal(true)}> onClick={() => handleFeatureModal(true)}>
<PopOver <PopOver
@ -137,7 +137,7 @@ const NavBar = ({
</PopOver> </PopOver>
</button> </button>
<button <button
className="tw-nav focus:tw-no-underline hover:tw-underline" className="tw-nav focus:tw-no-underline hover:tw-underline tw-flex-shrink-0"
data-testid="tour"> data-testid="tour">
<PopOver <PopOver
position="bottom" position="bottom"
@ -153,7 +153,7 @@ const NavBar = ({
</Link> </Link>
</PopOver> </PopOver>
</button> </button>
<div> <div className="tw-flex-shrink-0">
<DropDown <DropDown
dropDownList={supportDropdown} dropDownList={supportDropdown}
icon={ icon={