Skip to content

fix(component): utilized NcDateTime component #41334

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
emoral435 merged 4 commits into from
Nov 16, 2023
Merged

fix(component): utilized NcDateTime component #41334

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b48af2
fix(component): utilized NcDateTime component
emoral435 Nov 7, 2023
59e75d7
fix(component): changed moment to date object for Nc Component using …
emoral435 Nov 9, 2023
b1ecd99
fix(chore) - built and changed this.source -> source
emoral435 Nov 14, 2023
75796ba
chore(assets): Recompile assets
nextcloud-command Nov 16, 2023
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
Next Next commit
fix(component): utilized NcDateTime component 
Resolves #41261
Replaces span element with custom Nc Vue Component
Signed-off-by: Eduardo Morales <[email protected]>
  • Loading branch information
@emoral435
emoral435 committed Nov 16, 2023
commit 3b48af212244fa48a8e8864181da4794d2eabb52
12 changes: 10 additions & 2 deletions apps/files/src/components/FileEntry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
-
-->

<template>
<template>
<tr :class="{'files-list__row--dragover': dragover, 'files-list__row--loading': isLoading}"
data-cy-files-list-row
:data-cy-files-list-row-fileid="fileid"
Expand Down Expand Up @@ -83,7 +83,7 @@
class="files-list__row-mtime"
data-cy-files-list-row-mtime
@click="openDetailsIfAvailable">
<span>{{ mtime }}</span>
<NcDateTime :timestamp="mDateTime"/>
</td>

<!-- View columns -->
Expand Down Expand Up @@ -122,6 +122,7 @@ import { useDragAndDropStore } from '../store/dragging.ts'
import { useFilesStore } from '../store/files.ts'
import { useRenamingStore } from '../store/renaming.ts'
import { useSelectionStore } from '../store/selection.ts'
import NcDateTime from '@nextcloud/vue/dist/Components/NcDateTime.js'
import CustomElementRender from './CustomElementRender.vue'
import FileEntryActions from './FileEntry/FileEntryActions.vue'
import FileEntryCheckbox from './FileEntry/FileEntryCheckbox.vue'
Expand All @@ -140,6 +141,7 @@ export default Vue.extend({
FileEntryCheckbox,
FileEntryName,
FileEntryPreview,
NcDateTime,
},

props: {
Expand Down Expand Up @@ -262,6 +264,12 @@ export default Vue.extend({
}
return t('files_trashbin', 'A long time ago')
},
mDateTime() {
if (this.source.mtime) {
return moment(this.source.mtime)
}
return t('files_trashbin', 'A long time ago')
},
mtimeOpacity() {
const maxOpacityTime = 31 * 24 * 60 * 60 * 1000 // 31 days

Expand Down