Skip to content

[WEB-2456] Chore: workspace member list additional info #5604

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

Merged
pushya22 merged 3 commits into from
Sep 16, 2024
Merged

[WEB-2456] Chore: workspace member list additional info #5604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
354d63d
chore: added last login medium
NarayanBavisetti Sep 13, 2024
6f7bdc5
chore: added email and authentication columns in member settings
gakshita Sep 13, 2024
bb57585
fix: revoked lock file changes
gakshita Sep 16, 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
1 change: 1 addition & 0 deletions apiserver/plane/app/serializers/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ class Meta:
"is_bot",
"display_name",
"email",
"last_login_medium",
]
read_only_fields = [
"id",
Expand Down
1 change: 1 addition & 0 deletions packages/types/src/workspace.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ export interface IWorkspaceMember {
last_name?: string;
joining_date?: string;
display_name?: string;
last_login_medium?: string;
}

export interface IWorkspaceMemberMe {
Expand Down
31 changes: 23 additions & 8 deletions web/ce/components/workspace/settings/useMemberColumns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ export const useMemberColumns = () => {

const columns = [
{
key: "Full Name",
content: "Full Name",
key: "Full name",
content: "Full name",
thClassName: "text-left",
tdRender: (rowData: RowData) => (
<NameColumn
Expand All @@ -38,21 +38,36 @@ export const useMemberColumns = () => {
/>
),
},

{
key: "Display Name",
content: "Display Name",
key: "Display name",
content: "Display name",
tdRender: (rowData: RowData) => <div className="w-32">{rowData.member.display_name}</div>,
},

{
key: "Account Type",
content: "Account Type",
key: "Email address",
content: "Email address",
tdRender: (rowData: RowData) => <div className="w-48 truncate">{rowData.member.email}</div>,
},

{
key: "Account type",
content: "Account type",
tdRender: (rowData: RowData) => <AccountTypeColumn rowData={rowData} workspaceSlug={workspaceSlug as string} />,
},

{
key: "Joining Date",
content: "Joining Date",
key: "Authentication",
content: "Authentication",
tdRender: (rowData: RowData) => (
<div className="capitalize">{rowData.member.last_login_medium?.replace("-", " ")}</div>
),
},

{
key: "Joining date",
content: "Joining date",
tdRender: (rowData: RowData) => <div>{getFormattedDate(rowData?.member?.joining_date || "")}</div>,
},
];
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13167,4 +13167,4 @@ zeed-dom@^0.10.9:
zxcvbn@^4.4.2:
version "4.4.2"
resolved "https://registry.yarnpkg.com/zxcvbn/-/zxcvbn-4.4.2.tgz#28ec17cf09743edcab056ddd8b1b06262cc73c30"
integrity sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ==
integrity sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ==