Skip to content

Commit 9e047e9

Browse files
authored
Merge pull request #48536 from nextcloud/artonge/fix/vue_app_names
fix: Vue app names
2 parents 43b1fd7 + 657b221 commit 9e047e9

26 files changed

+399
-391
lines changed

apps/files_reminders/src/components/SetCustomReminderModal.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,16 @@ export default Vue.extend({
9393
},
9494
9595
computed: {
96-
fileId(): number {
97-
return this.node.fileid
96+
fileId(): number|undefined {
97+
return this.node?.fileid
9898
},
9999
100-
fileName(): string {
101-
return this.node.basename
100+
fileName(): string|undefined {
101+
return this.node?.basename
102102
},
103103
104104
name() {
105-
return t('files_reminders', 'Set reminder for "{fileName}"', { fileName: this.fileName })
105+
return this.fileName ? t('files_reminders', 'Set reminder for "{fileName}"', { fileName: this.fileName }) : ''
106106
},
107107
108108
label(): string {

apps/files_sharing/src/components/SharingInput.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
:clear-search-on-blur="() => false"
1818
:user-select="true"
1919
:options="options"
20+
:label-outside="true"
2021
@search="asyncFind"
2122
@option:selected="onSelected">
2223
<template #no-options="{ search }">

apps/files_versions/src/components/Version.vue

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<template>
66
<NcListItem class="version"
77
:force-display-actions="true"
8+
:actions-aria-label="t('files_versions', 'Actions for version from {versionHumanExplicitDate}', { versionHumanExplicitDate })"
89
:data-files-versions-version="version.fileVersion"
910
@click="click">
1011
<!-- Icon -->
@@ -109,11 +110,12 @@
109110
</template>
110111
</NcListItem>
111112
</template>
112-
113113
<script lang="ts">
114114
import type { PropType } from 'vue'
115115
import type { Version } from '../utils/versions'
116116
117+
import { defineComponent } from 'vue'
118+
117119
import BackupRestore from 'vue-material-design-icons/BackupRestore.vue'
118120
import Delete from 'vue-material-design-icons/Delete.vue'
119121
import Download from 'vue-material-design-icons/Download.vue'
@@ -128,13 +130,12 @@ import NcDateTime from '@nextcloud/vue/dist/Components/NcDateTime.js'
128130
import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
129131
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
130132
133+
import moment from '@nextcloud/moment'
131134
import { getRootUrl, generateOcsUrl } from '@nextcloud/router'
132135
import { joinPaths } from '@nextcloud/paths'
133136
import { loadState } from '@nextcloud/initial-state'
134137
import { Permission, formatFileSize } from '@nextcloud/files'
135138
import { translate as t } from '@nextcloud/l10n'
136-
import { defineComponent } from 'vue'
137-
138139
import axios from '@nextcloud/axios'
139140
140141
const hasPermission = (permissions: number, permission: number): boolean => (permissions & permission) !== 0
@@ -225,6 +226,10 @@ export default defineComponent({
225226
return label
226227
},
227228
229+
versionHumanExplicitDate(): string {
230+
return moment(this.version.mtime).format('LLLL')
231+
},
232+
228233
downloadURL(): string {
229234
if (this.isCurrent) {
230235
return getRootUrl() + joinPaths('/remote.php/webdav', this.fileInfo.path, this.fileInfo.name)

core/src/components/ContactsMenu.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export const setUp = () => {
1515
if (mountPoint) {
1616
// eslint-disable-next-line no-new
1717
new Vue({
18+
name: 'ContactsMenuRoot',
1819
el: mountPoint,
1920
render: h => h(ContactsMenu),
2021
})

core/src/components/UserMenu.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export const setUp = () => {
1212
if (mountPoint) {
1313
// eslint-disable-next-line no-new
1414
new Vue({
15+
name: 'AccountMenuRoot',
1516
el: mountPoint,
1617
render: h => h(AccountMenu),
1718
})

dist/4757-4757.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)