Skip to content

feat: Add first login timestamp of each user to oc_preferences and user:info output #49377

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
Pytal merged 11 commits into from
Jan 7, 2025
Merged

feat: Add first login timestamp of each user to oc_preferences and user:info output #49377

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
baf7293
feat: Add first login timestamp of each user to oc_preferences and us…
come-nc Nov 19, 2024
e700713
chore: Update openapi specs
come-nc Nov 19, 2024
df8397e
fix(tests): Adapt tests to firstLogin new feature
come-nc Nov 19, 2024
b995912
feat(users): Use -1 for unknown firstLogin instead of setting it to c…
come-nc Nov 21, 2024
c4b5a78
feat: Show first login date in user list
Pytal Dec 5, 2024
1d0962a
feat(occ): Show first_seen in output of user:list --info
come-nc Dec 9, 2024
a8a2ca4
fix: Return timestamps in unix format rather than milliseconds
come-nc Dec 10, 2024
9ada0bb
fix(users): Adapt UI code to new timestamp fields names
come-nc Dec 10, 2024
0be1867
chore: Update openapi.json files
come-nc Dec 10, 2024
de8c450
fix(tests): Fix getLastLogin expectation in UsersControllerTest
come-nc Dec 10, 2024
c45b9ec
chore(assets): Recompile assets
nextcloud-command Jan 7, 2025
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
Prev Previous commit
Next Next commit
fix(users): Adapt UI code to new timestamp fields names 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Jan 7, 2025
commit 9ada0bb12abffb37c7ae9ab1d10ce382eeee6ae9
14 changes: 7 additions & 7 deletions apps/settings/src/mixins/UserRowMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default {
},
},
setup(props) {
const { formattedFullTime } = useFormatDateTime(props.user.firstLogin, { relativeTime: false })
const { formattedFullTime } = useFormatDateTime(props.user.firstLoginTimestamp * 1000, { relativeTime: false })
return {
formattedFullTime,
}
Expand Down Expand Up @@ -128,25 +128,25 @@ export default {
},

userFirstLogin() {
if (this.user.firstLogin > 0) {
if (this.user.firstLoginTimestamp > 0) {
return this.formattedFullTime
}
if (this.user.firstLogin < 0) {
if (this.user.firstLoginTimestamp < 0) {
return t('settings', 'Unknown')
}
return t('settings', 'Never')
},

/* LAST LOGIN */
userLastLoginTooltip() {
if (this.user.lastLogin > 0) {
return OC.Util.formatDate(this.user.lastLogin)
if (this.user.lastLoginTimestamp > 0) {
return OC.Util.formatDate(this.user.lastLoginTimestamp * 1000)
}
return ''
},
userLastLogin() {
if (this.user.lastLogin > 0) {
return OC.Util.relativeModifiedDate(this.user.lastLogin)
if (this.user.lastLoginTimestamp > 0) {
return OC.Util.relativeModifiedDate(this.user.lastLoginTimestamp * 1000)
}
return t('settings', 'Never')
},
Expand Down