-
Notifications
You must be signed in to change notification settings - Fork 92
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.
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
NcDatetime: New component for displaying timestamps as time relative from now #4219
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,258 @@ | ||
<!-- | ||
- @copyright Copyright (c) 2023 Ferdinand Thiessen <opensource@fthiessen.de> | ||
- | ||
- @author Ferdinand Thiessen <opensource@fthiessen.de> | ||
- | ||
- @license AGPL-3.0-or-later | ||
- | ||
- This program is free software: you can redistribute it and/or modify | ||
- it under the terms of the GNU Affero General Public License as | ||
- published by the Free Software Foundation, either version 3 of the | ||
- License, or (at your option) any later version. | ||
- | ||
- This program is distributed in the hope that it will be useful, | ||
- but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
- GNU Affero General Public License for more details. | ||
- | ||
- You should have received a copy of the GNU Affero General Public License | ||
- along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
- | ||
--> | ||
|
||
<docs> | ||
|
||
### General description | ||
|
||
This components purpose is to display a timestamp in the users local time format. | ||
It also supports relative time, for examples *6 seconds ago*. | ||
|
||
#### Standard usage | ||
|
||
Without any optional parameters the timestamp is displayed as a relative datetime and a title with the full date is added. | ||
|
||
```vue | ||
<template> | ||
<NcDatetime :timestamp="timestamp" /> | ||
</template> | ||
<script> | ||
export default { | ||
data() { | ||
return { | ||
timestamp: Date.now(), | ||
} | ||
}, | ||
} | ||
</script> | ||
``` | ||
|
||
#### Ignore seconds | ||
|
||
If you do not want the seconds to be counted up until minutes are reached you can simply use the `ignore-seconds` property. | ||
|
||
```vue | ||
<template> | ||
<NcDatetime :timestamp="timestamp" :ignore-seconds="true" /> | ||
</template> | ||
<script> | ||
export default { | ||
data() { | ||
return { | ||
timestamp: Date.now(), | ||
} | ||
}, | ||
} | ||
</script> | ||
``` | ||
|
||
#### Custom date or time format | ||
|
||
The component allows to format the full date for the title by settings the `format` property. | ||
It is also possible to disable relative time by setting the `relativeTime` property to `false`. | ||
|
||
```vue | ||
<template> | ||
<div> | ||
<h4>Short relative time</h4> | ||
<NcDatetime :timestamp="timestamp" relative-time="short" /> | ||
|
||
<h4>Custom title format</h4> | ||
<NcDatetime :timestamp="timestamp" :format="timeFormat" /> | ||
|
||
<h4>Without relative time</h4> | ||
<NcDatetime :timestamp="timestamp" :format="timeFormat" :relative-time="false" /> | ||
</div> | ||
</template> | ||
<script> | ||
export default { | ||
data() { | ||
return { | ||
timestamp: Date.now(), | ||
/** For allowed formats see the Intl.DateTimeFormat options */ | ||
timeFormat: { | ||
dateStyle: 'short', | ||
timeStyle: 'full' | ||
}, | ||
} | ||
}, | ||
} | ||
</script> | ||
<style> | ||
h4 { | ||
font-weight: bold; | ||
margin-top: 12px; | ||
} | ||
</style> | ||
``` | ||
</docs> | ||
|
||
<template> | ||
<span class="nc-datetime" | ||
:data-timestamp="timestamp" | ||
:title="formattedFullTime">{{ formattedTime }}</span> | ||
</template> | ||
|
||
<script> | ||
import { getCanonicalLocale } from '@nextcloud/l10n' | ||
import { t } from '../../l10n.js' | ||
|
||
const FEW_SECONDS_AGO = { | ||
long: t('a few seconds ago'), | ||
short: t('seconds ago'), // FOR TRANSLATORS: Shorter version of 'a few seconds ago' | ||
narrow: t('sec. ago'), // FOR TRANSLATORS: If possible in your language an even shorter version of 'a few seconds ago' | ||
} | ||
|
||
export default { | ||
name: 'NcDatetime', | ||
|
||
props: { | ||
/** | ||
* The timestamp to display, either an unix timestamp (in milliseconds) or a Date object | ||
*/ | ||
timestamp: { | ||
type: [Date, Number], | ||
required: true, | ||
}, | ||
/** | ||
* The format used for displaying, or if relative time is used the format used for the title (optional) | ||
* | ||
* @type {Intl.DateTimeFormatOptions} | ||
*/ | ||
format: { | ||
type: Object, | ||
default: () => ({ timeStyle: 'medium', dateStyle: 'short' }), | ||
}, | ||
/** | ||
* Wether to display the timestamp as time from now (optional) | ||
* | ||
* - `false`: Disable relative time | ||
* - `'long'`: Long text, like *2 seconds ago* (default) | ||
* - `'short'`: Short text, like *2 sec. ago* | ||
* - `'narrow'`: Even shorter text (same as `'short'` on some languages) | ||
*/ | ||
relativeTime: { | ||
type: [Boolean, String], | ||
default: 'long', | ||
validator: (v) => v === false || ['long', 'short', 'narrow'].includes(v), | ||
}, | ||
/** | ||
* Ignore seconds when displaying the relative time and just show `a few seconds ago` | ||
*/ | ||
ignoreSeconds: { | ||
type: Boolean, | ||
default: false, | ||
}, | ||
}, | ||
|
||
data() { | ||
return { | ||
/** Current time in ms */ | ||
currentTime: Date.now(), | ||
/** ID of the current time interval */ | ||
intervalId: undefined, | ||
} | ||
}, | ||
|
||
computed: { | ||
/** ECMA Date object of the timestamp */ | ||
dateObject() { | ||
return new Date(this.timestamp) | ||
}, | ||
/** Time string formatted for main text */ | ||
formattedTime() { | ||
if (this.relativeTime !== false) { | ||
const formatter = new Intl.RelativeTimeFormat(getCanonicalLocale(), { numeric: 'auto', style: this.relativeTime }) | ||
|
||
const diff = this.dateObject - new Date(this.currentTime) | ||
const seconds = diff / 1000 | ||
if (Math.abs(seconds) <= 90) { | ||
if (this.ignoreSeconds) { | ||
return FEW_SECONDS_AGO[this.relativeTime] | ||
} else { | ||
return formatter.format(Math.round(seconds), 'second') | ||
} | ||
} | ||
const minutes = seconds / 60 | ||
if (Math.abs(minutes) <= 90) { | ||
return formatter.format(Math.round(minutes), 'minute') | ||
} | ||
const hours = minutes / 60 | ||
if (Math.abs(hours) <= 72) { | ||
return formatter.format(Math.round(hours), 'hour') | ||
} | ||
const days = hours / 24 | ||
if (Math.abs(days) <= 6) { | ||
return formatter.format(Math.round(days), 'day') | ||
} | ||
const weeks = days / 7 | ||
if (Math.abs(weeks) <= 52) { | ||
return formatter.format(Math.round(weeks), 'week') | ||
} | ||
return formatter.format(Math.round(days / 365), 'year') | ||
} | ||
return this.formattedFullTime | ||
}, | ||
formattedFullTime() { | ||
const formatter = new Intl.DateTimeFormat(getCanonicalLocale(), this.format) | ||
return formatter.format(this.dateObject) | ||
}, | ||
}, | ||
|
||
watch: { | ||
/** | ||
* Set or clear interval if relative time is dis/enabled | ||
* | ||
* @param {boolean} newValue The new value of the relativeTime property | ||
* @param {boolean} _oldValue The old value of the relativeTime property | ||
*/ | ||
relativeTime(newValue, _oldValue) { | ||
window.clearInterval(this.intervalId) | ||
this.intervalId = undefined | ||
if (newValue) { | ||
this.intervalId = window.setInterval(this.setCurrentTime, 1000) | ||
} | ||
}, | ||
}, | ||
|
||
mounted() { | ||
// Start the interval for setting the current time if relative time is enabled | ||
if (this.relativeTime !== false) { | ||
this.intervalId = window.setInterval(this.setCurrentTime, 1000) | ||
} | ||
}, | ||
|
||
destroyed() { | ||
// ensure interval is cleared | ||
window.clearInterval(this.intervalId) | ||
}, | ||
|
||
methods: { | ||
/** | ||
* Set `currentTime` to the current timestamp, required as Date.now() is not reactive. | ||
*/ | ||
setCurrentTime() { | ||
this.currentTime = Date.now() | ||
}, | ||
}, | ||
} | ||
</script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
/** | ||
* @copyright 2023 Ferdinand Thiessen <opensource@fthiessen.de> | ||
* | ||
* @author Ferdinand Thiessen <opensource@fthiessen.de> | ||
* | ||
* @license AGPL-3.0-or-later | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as | ||
* published by the Free Software Foundation, either version 3 of the | ||
* License, or (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
* | ||
*/ | ||
|
||
export { default } from './NcDatetime.vue' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't it make sense to separate these into two separate props?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Which two properties? title format and main format?
Or do you mean
timeStyle
anddateStyle
?If the latter one, then I do not think so. As there are more options possible I just allowed every
Intl.DateTimeFormatOptions
option (which allow finer control over the style by setting the format ofweekday, hour, month...
directly).