Skip to content

Commit

Permalink
[WEB-2456] Chore: workspace member list additional info (#5604)
Browse files Browse the repository at this point in the history
* chore: added last login medium

* chore: added email and authentication columns in member settings

* fix: revoked lock file changes

---------

Co-authored-by: NarayanBavisetti <narayan3119@gmail.com>
  • Loading branch information
gakshita and NarayanBavisetti authored Sep 16, 2024
1 parent 3ce84f7 commit 7450755
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 9 deletions.
1 change: 1 addition & 0 deletions apiserver/plane/app/serializers/user.py
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
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
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
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==

0 comments on commit 7450755

Please sign in to comment.