From 74507559b8f0935e3df57fe445310bd3af769889 Mon Sep 17 00:00:00 2001
From: Akshita Goyal <36129505+gakshita@users.noreply.github.com>
Date: Mon, 16 Sep 2024 14:28:41 +0530
Subject: [PATCH] [WEB-2456] Chore: workspace member list additional info
 (#5604)

* 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>
---
 apiserver/plane/app/serializers/user.py       |  1 +
 packages/types/src/workspace.d.ts             |  1 +
 .../workspace/settings/useMemberColumns.tsx   | 31 ++++++++++++++-----
 yarn.lock                                     |  2 +-
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/apiserver/plane/app/serializers/user.py b/apiserver/plane/app/serializers/user.py
index ec26eb1a297..f99214874aa 100644
--- a/apiserver/plane/app/serializers/user.py
+++ b/apiserver/plane/app/serializers/user.py
@@ -176,6 +176,7 @@ class Meta:
             "is_bot",
             "display_name",
             "email",
+            "last_login_medium",
         ]
         read_only_fields = [
             "id",
diff --git a/packages/types/src/workspace.d.ts b/packages/types/src/workspace.d.ts
index 8ce3fc56a03..f72f52463e3 100644
--- a/packages/types/src/workspace.d.ts
+++ b/packages/types/src/workspace.d.ts
@@ -77,6 +77,7 @@ export interface IWorkspaceMember {
   last_name?: string;
   joining_date?: string;
   display_name?: string;
+  last_login_medium?: string;
 }
 
 export interface IWorkspaceMemberMe {
diff --git a/web/ce/components/workspace/settings/useMemberColumns.tsx b/web/ce/components/workspace/settings/useMemberColumns.tsx
index a24d0e23c3f..64c92cf52ab 100644
--- a/web/ce/components/workspace/settings/useMemberColumns.tsx
+++ b/web/ce/components/workspace/settings/useMemberColumns.tsx
@@ -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
@@ -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>,
     },
   ];
diff --git a/yarn.lock b/yarn.lock
index 3024890ce76..c3bec8f79e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -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==
\ No newline at end of file