Austin/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2024-11-16 11:42:29 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix: workspace member's last_active should be last_active_time, but not last_login_time (#4906)

Browse Source
This commit is contained in:
DomKing 2024-06-14 20:49:19 +08:00 committed by GitHub
parent c6b791d070
commit 43c19007e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/fields/member_fields.py
View File

@ -28,6 +28,7 @@ account_with_role_fields = {
'avatar': fields.String, 'avatar': fields.String,
'email': fields.String, 'email': fields.String,
'last_login_at': TimestampField, 'last_login_at': TimestampField,
'last_active_at': TimestampField,
'created_at': TimestampField, 'created_at': TimestampField,
'role': fields.String, 'role': fields.String,
'status': fields.String, 'status': fields.String,

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

@ -105,7 +105,7 @@ const MembersPage = () => {
<div className='text-xs text-gray-500 leading-[18px]'>{account.email}</div> <div className='text-xs text-gray-500 leading-[18px]'>{account.email}</div>
</div> </div>
</div> </div>
<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> <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>
<div className='shrink-0 w-[96px] flex items-center'> <div className='shrink-0 w-[96px] flex items-center'>
{ {
(owner && account.role !== 'owner') (owner && account.role !== 'owner')

3
web/models/common.ts
View File

@ -27,6 +27,7 @@ export type UserProfileResponse = {
interface_theme?: string interface_theme?: string
timezone?: string timezone?: string
last_login_at?: string last_login_at?: string
last_active_at?: string
last_login_ip?: string last_login_ip?: string
created_at?: string created_at?: string
} }
@ -61,7 +62,7 @@ export type TenantInfoResponse = {
trial_end_reason: null | 'trial_exceeded' | 'using_custom' trial_end_reason: null | 'trial_exceeded' | 'using_custom'
} }
export type Member = Pick<UserProfileResponse, 'id' | 'name' | 'email' | 'last_login_at' | 'created_at'> & { export type Member = Pick<UserProfileResponse, 'id' | 'name' | 'email' | 'last_login_at' | 'last_login_at' | 'created_at'> & {
avatar: string avatar: string
status: 'pending' | 'active' | 'banned' | 'closed' status: 'pending' | 'active' | 'banned' | 'closed'
role: 'owner' | 'admin' | 'editor' | 'normal' role: 'owner' | 'admin' | 'editor' | 'normal'