Skip to content

Commit 43c1900

Browse files
authored
fix: workspace member's last_active should be last_active_time, but not last_login_time (langgenius#4906)
1 parent c6b791d commit 43c1900

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

api/fields/member_fields.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
'avatar': fields.String,
2929
'email': fields.String,
3030
'last_login_at': TimestampField,
31+
'last_active_at': TimestampField,
3132
'created_at': TimestampField,
3233
'role': fields.String,
3334
'status': fields.String,

web/app/components/header/account-setting/members-page/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ const MembersPage = () => {
105105
<div className='text-xs text-gray-500 leading-[18px]'>{account.email}</div>
106106
</div>
107107
</div>
108-
<div className='shrink-0 flex items-center w-[104px] py-2 text-[13px] text-gray-700'>{dayjs(Number((account.last_login_at || account.created_at)) * 1000).locale(locale === 'zh-Hans' ? 'zh-cn' : 'en').fromNow()}</div>
108+
<div className='shrink-0 flex items-center w-[104px] py-2 text-[13px] text-gray-700'>{dayjs(Number((account.last_active_at || account.created_at)) * 1000).locale(locale === 'zh-Hans' ? 'zh-cn' : 'en').fromNow()}</div>
109109
<div className='shrink-0 w-[96px] flex items-center'>
110110
{
111111
(owner && account.role !== 'owner')

web/models/common.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export type UserProfileResponse = {
2727
interface_theme?: string
2828
timezone?: string
2929
last_login_at?: string
30+
last_active_at?: string
3031
last_login_ip?: string
3132
created_at?: string
3233
}
@@ -61,7 +62,7 @@ export type TenantInfoResponse = {
6162
trial_end_reason: null | 'trial_exceeded' | 'using_custom'
6263
}
6364

64-
export type Member = Pick<UserProfileResponse, 'id' | 'name' | 'email' | 'last_login_at' | 'created_at'> & {
65+
export type Member = Pick<UserProfileResponse, 'id' | 'name' | 'email' | 'last_login_at' | 'last_login_at' | 'created_at'> & {
6566
avatar: string
6667
status: 'pending' | 'active' | 'banned' | 'closed'
6768
role: 'owner' | 'admin' | 'editor' | 'normal'

0 commit comments

Comments
 (0)