Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: overflow of fields in the user management cards #7261

Merged
merged 6 commits into from
Feb 28, 2024
Merged

fix: overflow of fields in the user management cards #7261

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
387c65a
fix: overflow of fields in the user management cards
alanansari Feb 23, 2024
aceddfd
refactored code
alanansari Feb 23, 2024
0c6ff65
Merge branch 'coronasafe:develop' into develop
alanansari Feb 24, 2024
3a28a43
UPDATE: inline styles to tailwind
alanansari Feb 24, 2024
9514689
Merge branch 'develop' into develop
nihal467 Feb 27, 2024
cb212e2
Merge branch 'develop' into develop
nihal467 Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/Components/Common/UserDetailsComponet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import UserDetails from "./UserDetails";

const UserDetailComponent = ({
id,
title,
value,
}: {
id: string;
title: string;
value: string;
}) => (
<div className="col-span-1">
<UserDetails id={id} title={title}>
<div
className="overflow-hidden font-semibold"
style={{ textOverflow: "ellipsis" }}
rithviknishad marked this conversation as resolved.
Show resolved Hide resolved
title={value}
>
{value}
</div>
</UserDetails>
</div>
);

export default UserDetailComponent;
31 changes: 16 additions & 15 deletions src/Components/Users/ManageUsers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { USER_TYPES } from "../../Common/constants";
import UnlinkFacilityDialog from "./UnlinkFacilityDialog";
import UserDeleteDialog from "./UserDeleteDialog";
import UserDetails from "../Common/UserDetails";
import UserDetailComponent from "../Common/UserDetailsComponet.js";
import UserFilter from "./UserFilter";
import {
classNames,
Expand Down Expand Up @@ -253,22 +254,18 @@ export default function ManageUsers() {
} gap-2 md:grid md:grid-cols-2`}
>
{user.user_type && (
<div className="col-span-1">
<UserDetails id="role" title="Role">
<div className="break-all font-semibold">
{user.user_type}
</div>
</UserDetails>
</div>
<UserDetailComponent
id="role"
title="Role"
value={user.user_type}
/>
)}
{user.district_object && (
<div className="col-span-1">
<UserDetails id="district" title="District">
<div className="font-semibold">
{user.district_object.name}
</div>
</UserDetails>
</div>
<UserDetailComponent
id="district"
title="District"
value={user.district_object.name}
/>
)}
{user.user_type === "Doctor" && (
<>
Expand Down Expand Up @@ -336,7 +333,11 @@ export default function ManageUsers() {
{user.created_by && (
<div className="col-span-1">
<UserDetails id="created_by" title="Created by">
<div className="break-all font-semibold">
<div
className="overflow-hidden font-semibold"
style={{ textOverflow: "ellipsis" }}
rithviknishad marked this conversation as resolved.
Show resolved Hide resolved
title={user.created_by}
>
{user.created_by}
</div>
</UserDetails>
Expand Down