Skip to content

Commit

Permalink
Merge pull request #48536 from nextcloud/artonge/fix/vue_app_names
Browse files Browse the repository at this point in the history
fix: Vue app names
  • Loading branch information
artonge authored Oct 9, 2024
2 parents 43b1fd7 + 657b221 commit 9e047e9
Show file tree
Hide file tree
Showing 26 changed files with 399 additions and 391 deletions.
10 changes: 5 additions & 5 deletions apps/files_reminders/src/components/SetCustomReminderModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,16 @@ export default Vue.extend({
},

computed: {
fileId(): number {
return this.node.fileid
fileId(): number|undefined {
return this.node?.fileid
},

fileName(): string {
return this.node.basename
fileName(): string|undefined {
return this.node?.basename
},

name() {
return t('files_reminders', 'Set reminder for "{fileName}"', { fileName: this.fileName })
return this.fileName ? t('files_reminders', 'Set reminder for "{fileName}"', { fileName: this.fileName }) : ''
},

label(): string {
Expand Down
1 change: 1 addition & 0 deletions apps/files_sharing/src/components/SharingInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
:clear-search-on-blur="() => false"
:user-select="true"
:options="options"
:label-outside="true"
@search="asyncFind"
@option:selected="onSelected">
<template #no-options="{ search }">
Expand Down
11 changes: 8 additions & 3 deletions apps/files_versions/src/components/Version.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<template>
<NcListItem class="version"
:force-display-actions="true"
:actions-aria-label="t('files_versions', 'Actions for version from {versionHumanExplicitDate}', { versionHumanExplicitDate })"
:data-files-versions-version="version.fileVersion"
@click="click">
<!-- Icon -->
Expand Down Expand Up @@ -109,11 +110,12 @@
</template>
</NcListItem>
</template>

<script lang="ts">
import type { PropType } from 'vue'
import type { Version } from '../utils/versions'

import { defineComponent } from 'vue'

import BackupRestore from 'vue-material-design-icons/BackupRestore.vue'
import Delete from 'vue-material-design-icons/Delete.vue'
import Download from 'vue-material-design-icons/Download.vue'
Expand All @@ -128,13 +130,12 @@ import NcDateTime from '@nextcloud/vue/dist/Components/NcDateTime.js'
import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'

import moment from '@nextcloud/moment'
import { getRootUrl, generateOcsUrl } from '@nextcloud/router'
import { joinPaths } from '@nextcloud/paths'
import { loadState } from '@nextcloud/initial-state'
import { Permission, formatFileSize } from '@nextcloud/files'
import { translate as t } from '@nextcloud/l10n'
import { defineComponent } from 'vue'

import axios from '@nextcloud/axios'

const hasPermission = (permissions: number, permission: number): boolean => (permissions & permission) !== 0
Expand Down Expand Up @@ -225,6 +226,10 @@ export default defineComponent({
return label
},

versionHumanExplicitDate(): string {
return moment(this.version.mtime).format('LLLL')
},

downloadURL(): string {
if (this.isCurrent) {
return getRootUrl() + joinPaths('/remote.php/webdav', this.fileInfo.path, this.fileInfo.name)
Expand Down
1 change: 1 addition & 0 deletions core/src/components/ContactsMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export const setUp = () => {
if (mountPoint) {
// eslint-disable-next-line no-new
new Vue({
name: 'ContactsMenuRoot',
el: mountPoint,
render: h => h(ContactsMenu),
})
Expand Down
1 change: 1 addition & 0 deletions core/src/components/UserMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export const setUp = () => {
if (mountPoint) {
// eslint-disable-next-line no-new
new Vue({
name: 'AccountMenuRoot',
el: mountPoint,
render: h => h(AccountMenu),
})
Expand Down
2 changes: 2 additions & 0 deletions dist/4757-4757.js

Large diffs are not rendered by default.

Loading

0 comments on commit 9e047e9

Please sign in to comment.