fix: Adapt to new nextcloud vue version

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2024-02-08 10:12:57 +01:00
parent 2e3b169b69
commit e1de6d317b
26 changed files with 252 additions and 184 deletions

View File

@@ -25,7 +25,7 @@
<div class="activity--header">
<img :src="activity.icon" class="activity--icon">
<NcRichText class="activity--subject" :text="message.subject" :arguments="message.parameters" />
<div class="activity--timestamp" :title="formatReadableDate(activity.datetime)">
<div class="activity--timestamp" :name="formatReadableDate(activity.datetime)">
{{ relativeDate(activity.datetime) }}
</div>
</div>

View File

@@ -41,7 +41,7 @@
</div>
</transition>
<NcModal v-if="modalShow" :title="t('deck', 'File already exists')" @close="modalShow=false">
<NcModal v-if="modalShow" :name="t('deck', 'File already exists')" @close="modalShow=false">
<div class="modal__content">
<h2>{{ t('deck', 'File already exists') }}</h2>
<p>

View File

@@ -89,14 +89,14 @@
<NcPopover container=".board-action-buttons__filter"
:placement="'bottom-end'"
:aria-label="t('deck', 'Active filters')"
:title="t('deck', 'Active filters')"
:name="t('deck', 'Active filters')"
:tooltip="t('deck', 'Active filters')"
@show="filterVisible=true"
@hide="filterVisible=false">
<!-- We cannot use NcActions here are the popover trigger does not update on reactive icons -->
<NcButton slot="trigger"
ref="filterPopover"
:title="t('deck', 'Apply filter')"
:name="t('deck', 'Apply filter')"
class="filter-button"
:type="isFilterActive ? 'primary' : 'tertiary'">
<template #icon>
@@ -203,7 +203,7 @@
</div>
<NcActions :aria-label="t('deck', 'View Modes')"
:title="t('deck', 'Toggle View Modes')">
:name="t('deck', 'Toggle View Modes')">
<NcActionButton @click="toggleShowArchived">
<template #icon>
<ArchiveIcon :size="20" decorative />
@@ -231,7 +231,7 @@
<NcActions>
<NcActionButton icon="icon-menu-sidebar"
:aria-label="t('deck', 'Open details')"
:title="t('deck', 'Details')"
:name="t('deck', 'Details')"
@click="toggleDetailsView" />
</NcActions>
</div>

View File

@@ -23,7 +23,7 @@
<template>
<NcAppSidebar v-if="board != null"
:actions="[]"
:title="board.title"
:name="board.title"
@close="closeSidebar">
<NcAppSidebarTab id="sharing"
:order="0"

View File

@@ -1,8 +1,8 @@
<template>
<div>
<NcMultiselect v-if="canShare"
<NcSelect v-if="canShare"
v-model="addAcl"
:placeholder="t('deck', 'Share board with a user, group or team …')"
:input-label="t('deck', 'Share board with a user, group or team ')"
:options="formatedSharees"
:user-select="true"
label="displayName"
@@ -11,14 +11,14 @@
track-by="multiselectKey"
:internal-search="false"
@input="clickAddAcl"
@search-change="asyncFind">
@search="(search, loading) => asyncFind(search, loading)">
<template #noOptions>
{{ isSearching ? t('deck', 'Searching for users, groups and teams …') : t('deck', 'No participants found') }}
</template>
<template #noResult>
{{ isSearching ? t('deck', 'Searching for users, groups and teams …') : t('deck', 'No participants found') }}
</template>
</NcMultiselect>
</NcSelect>
<ul id="shareWithList"
class="shareWithList">
@@ -88,7 +88,7 @@
</template>
<script>
import { NcAvatar, NcMultiselect, NcActions, NcActionButton, NcActionCheckbox, NcRelatedResourcesPanel } from '@nextcloud/vue'
import { NcAvatar, NcSelect, NcActions, NcActionButton, NcActionCheckbox, NcRelatedResourcesPanel } from '@nextcloud/vue'
import { CollectionList } from 'nextcloud-vue-collections'
import { mapGetters, mapState } from 'vuex'
import { getCurrentUser } from '@nextcloud/auth'
@@ -103,7 +103,7 @@ export default {
NcActions,
NcActionButton,
NcActionCheckbox,
NcMultiselect,
NcSelect,
CollectionList,
NcRelatedResourcesPanel,
},
@@ -170,7 +170,7 @@ export default {
},
},
mounted() {
this.asyncFind('')
this.asyncFind('', () => {})
},
methods: {
debouncedFind: debounce(async function(query) {
@@ -178,8 +178,10 @@ export default {
await this.$store.dispatch('loadSharees', query)
this.isSearching = false
}, 300),
async asyncFind(query) {
async asyncFind(query, loading) {
loading(true)
await this.debouncedFind(query)
loading(false)
},
async clickAddAcl() {
this.addAclForAPI = {

View File

@@ -3,19 +3,19 @@
<div class="selector-wrapper--icon">
<AccountMultiple :size="20" />
</div>
<NcMultiselect v-if="canEdit"
<NcSelect v-if="canEdit"
v-model="assignedUsers"
class="selector-wrapper--selector"
:disabled="assignables.length === 0"
:multiple="true"
:options="formatedAssignables"
:user-select="true"
:auto-limit="false"
:placeholder="t('deck', 'Assign a user to this card…')"
:aria-label-combobox="t('deck', 'Assign a user to this card')"
:placeholder="t('deck', 'Select a user to assign to this card…')"
label="displayname"
track-by="multiselectKey"
@select="onSelect"
@remove="onRemove">
@option:selected="onSelect"
@option:deselected="onRemove">
<template #tag="scope">
<div class="avatarlist--inline">
<NcAvatar :user="scope.option.uid"
@@ -25,7 +25,7 @@
:disable-menu="true" />
</div>
</template>
</NcMultiselect>
</NcSelect>
<div v-else class="avatar-list--readonly">
<NcAvatar v-for="option in assignedUsers"
:key="option.primaryKey"
@@ -39,14 +39,14 @@
<script>
import { defineComponent } from 'vue'
import { NcAvatar, NcMultiselect } from '@nextcloud/vue'
import { NcAvatar, NcSelect } from '@nextcloud/vue'
import AccountMultiple from 'vue-material-design-icons/AccountMultiple.vue'
export default defineComponent({
name: 'AssignmentSelector',
components: {
AccountMultiple,
NcMultiselect,
NcSelect,
NcAvatar,
},
props: {
@@ -117,11 +117,12 @@ export default defineComponent({
this.assignedUsers = []
}
},
onSelect(user) {
this.$emit('select', user)
onSelect(options) {
const addition = options.filter((item) => !this.card.assignedUsers.find((user) => user.participant.primaryKey === item.primaryKey))
this.$emit('select', addition[0])
},
onRemove(user) {
this.$emit('remove', user)
onRemove(removed) {
this.$emit('remove', removed)
},
},
})

View File

@@ -23,7 +23,7 @@
<template>
<NcAppSidebar v-if="currentBoard && currentCard"
:active="tabId"
:title="title"
:name="title"
:subtitle="subtitle"
:subtitle-tooltip="subtitleTooltip"
:title-editable="titleEditable"

View File

@@ -178,14 +178,13 @@ export default {
},
async addLabelToBoardAndCard(name) {
const newLabel = await this.$store.dispatch('addLabelToCurrentBoardAndCard', {
await this.$store.dispatch('addLabelToCurrentBoardAndCard', {
card: this.copiedCard,
newLabel: {
title: name,
color: this.randomColor(),
},
})
this.copiedCard.labels.push(newLabel)
},
removeLabelFromCard(removedLabel) {

View File

@@ -66,7 +66,7 @@
<div class="due-actions">
<NcButton v-if="!card.archived"
type="tertiary"
:title="t('deck', 'Not completed')"
:name="t('deck', 'Not completed')"
@click="changeCardDoneStatus()">
<template #icon>
<ClearIcon :size="20" />

View File

@@ -3,46 +3,48 @@
<div class="selector-wrapper--icon">
<TagMultiple :size="20" />
</div>
<NcMultiselect :value="assignedLabels"
<NcSelect :value="assignedLabels"
class="selector-wrapper--selector"
:multiple="true"
:disabled="disabled"
:options="labelsSorted"
:placeholder="t('deck', 'Assign a tag to this card…')"
:aria-label-combobox="t('deck', 'Assign a tag to this card')"
:placeholder="t('deck', 'Select or create a tag…')"
:taggable="true"
:close-on-select="false"
label="title"
track-by="id"
tag-position="bottom"
@select="onSelect"
@remove="onRemove"
@tag="onNewTag">
@option:selected="onSelect"
@option:deselected="onRemove"
@option:created="onNewTag">
<template #option="scope">
<div v-if="!scope.option?.isTag" :style="{ backgroundColor: '#' + scope.option.color, color: textColor(scope.option.color)}" class="tag">
{{ scope.option.title }}
<div v-if="!scope?.isTag" :style="{ backgroundColor: '#' + scope.color, color: textColor(scope.color)}" class="tag">
{{ scope.title }}
</div>
<div v-else>
{{ t('deck', 'Create a new tag:') }} <div class="tag">
{{ scope.option.label }}
{{ scope.label }}
</div>
</div>
</template>
<template #tag="scope">
<div :style="{ backgroundColor: '#' + scope.option.color, color: textColor(scope.option.color)}" class="tag">
{{ scope.option.title }}
<template #selected-option="scope">
<div :style="{ backgroundColor: '#' + scope.color, color: textColor(scope.color)}" class="tag">
{{ scope.title }}
</div>
</template>
</NcMultiselect>
</NcSelect>
</div>
</template>
<script>
import { NcMultiselect } from '@nextcloud/vue'
import { NcSelect } from '@nextcloud/vue'
import Color from '../../mixins/color.js'
import TagMultiple from 'vue-material-design-icons/TagMultiple.vue'
export default {
name: 'TagSelector',
components: { TagMultiple, NcMultiselect },
components: { TagMultiple, NcSelect },
mixins: [Color],
props: {
card: {
@@ -61,20 +63,22 @@ export default {
computed: {
labelsSorted() {
return [...this.labels].sort((a, b) => (a.title < b.title) ? -1 : 1)
.filter(label => this.card.labels.findIndex((l) => l.id === label.id) === -1)
},
assignedLabels() {
return [...this.card.labels].sort((a, b) => (a.title < b.title) ? -1 : 1)
},
},
methods: {
onSelect(newLabel) {
this.$emit('select', newLabel)
onSelect(options) {
const addedLabel = options.filter(option => !this.card.labels.includes(option))
this.$emit('select', addedLabel[0])
},
onRemove(removedLabel) {
this.$emit('remove', removedLabel)
},
async onNewTag(name) {
this.$emit('newtag', name)
async onNewTag(option) {
this.$emit('newtag', option.title)
},
},
}
@@ -83,17 +87,17 @@ export default {
<style lang="scss" scoped>
@import '../../css/selector';
.multiselect--active {
z-index: 10022;
.v-select:deep(.vs__selected) {
padding-left: 0 !important;
}
.tag {
flex-grow: 0;
flex-shrink: 1;
overflow: hidden;
padding: 0px 5px;
border-radius: 15px;
font-size: 85%;
padding: 3px 12px;
display: inline-block;
border-radius: var(--border-radius-pill);
margin-right: 3px;
}
</style>

View File

@@ -22,37 +22,52 @@
<template>
<div class="avatars">
<div class="avatar-list" @click.stop="togglePopover">
<div v-if="popover.length > 0">
<AccountMultiple class="avatardiv more-avatars" :size="24" />
</div>
<div v-for="user in firstUsers" :key="user.id">
<NcAvatar v-if="user.type === 0"
:user="user.participant.uid"
:display-name="user.participant.displayname"
:disable-menu="true"
:show-user-status="false"
:size="32" />
<NcAvatar v-if="user.type === 1"
:user="user.participant.uid"
:display-name="user.participant.displayname"
:tooltip-message="user.participant.displayname + ' ' + t('deck', '(Group)')"
:is-no-user="true"
:disable-="true"
:size="32" />
<NcAvatar v-if="user.type === 7"
:user="user.participant.uid"
:display-name="user.participant.displayname"
:tooltip-message="user.participant.displayname + ' ' + t('deck', '(Team)')"
:is-no-user="true"
:disable-="true"
:size="32" />
</div>
</div>
<div v-show="popoverVisible" class="popovermenu menu-right">
<NcPopoverMenu :menu="popover" />
<slot />
<div>
<NcPopover>
<template #trigger="{ attrs }">
<button class="avatar-list" v-bind="attrs" @click.stop>
<div v-if="popover.length > 0">
<AccountMultiple class="avatardiv more-avatars" :size="24" />
</div>
<div v-for="user in firstUsers" :key="user.id">
<NcAvatar v-if="user.type === 0"
:user="user.participant.uid"
:display-name="user.participant.displayname"
:disable-menu="true"
:show-user-status="false"
:size="32" />
<NcAvatar v-if="user.type === 1"
:user="user.participant.uid"
:display-name="user.participant.displayname"
:tooltip-message="user.participant.displayname + ' ' + t('deck', '(Group)')"
:is-no-user="true"
:disable-="true"
:size="32" />
<NcAvatar v-if="user.type === 7"
:user="user.participant.uid"
:display-name="user.participant.displayname"
:tooltip-message="user.participant.displayname + ' ' + t('deck', '(Team)')"
:is-no-user="true"
:disable-="true"
:size="32" />
</div>
</button>
</template>
<div>
<div v-for="user in users"
:key="user.id"
class="avatar-list-entry">
<NcAvatar :user="user.participant.uid"
:display-name="user.participant.displayname"
:disable-menu="true"
:is-no-user="user.type !== 0"
:size="32" />
<div class="avatar-list-entry__label">
{{ user.participant.displayname }}
</div>
</div>
</div>
</NcPopover>
</div>
<div class="avatar-print-list">
@@ -70,7 +85,7 @@
</template>
<script>
import { NcAvatar, NcPopoverMenu, Tooltip } from '@nextcloud/vue'
import { NcAvatar, NcPopover, Tooltip } from '@nextcloud/vue'
import { generateUrl } from '@nextcloud/router'
import AccountMultiple from 'vue-material-design-icons/AccountMultiple.vue'
@@ -78,7 +93,7 @@ export default {
name: 'AvatarList',
components: {
NcAvatar,
NcPopoverMenu,
NcPopover,
AccountMultiple,
},
directives: {
@@ -172,8 +187,12 @@ export default {
.avatar-list {
float: right;
display: inline-flex;
padding-right: $avatar-offset;
flex-direction: row-reverse;
padding: 0;
padding-right: $avatar-offset;
margin: 0;
border: 0;
background: transparent;
& > div {
height: 32px;
@@ -199,6 +218,15 @@ export default {
}
.avatar-list-entry {
display: flex;
padding: 6px 12px;
&__label {
padding: 4px 12px;
}
}
.popovermenu {
display: block;
margin: 40px -6px;

View File

@@ -68,7 +68,7 @@
tag="ul"
class="labels"
@click.stop="openCard">
<li v-for="label in labelsSorted" :key="label.id" :style="labelStyle(label)">
<li v-for="label in labelsSorted" :key="label?.id ?? label?.title" :style="labelStyle(label)">
<span @click.stop="applyLabelFilter(label)">{{ label.title }}</span>
</li>
</transition-group>

View File

@@ -23,7 +23,7 @@
<template>
<div v-if="card" class="duedate" :data-due-state="dueState">
<transition name="zoom">
<div v-if="card.duedate || card.done" class="due" :title="absoluteDate">
<div v-if="card.duedate || card.done" class="due" :name="absoluteDate">
<CheckCircle v-if="card.done" :size="16" />
<Clock v-else-if="overdue" :size="16" />
<ClockOutline v-else :size="16" />

View File

@@ -23,7 +23,7 @@
<template>
<NcAppNavigation :class="{'icon-loading': loading}">
<template #list>
<NcAppNavigationItem :title="t('deck', 'Upcoming cards')"
<NcAppNavigationItem :name="t('deck', 'Upcoming cards')"
:exact="true"
to="/">
<template #icon>
@@ -61,7 +61,7 @@
<AppNavigationAddBoard v-if="canCreate" />
</template>
<template #footer>
<NcAppNavigationSettings :title="t('deck', 'Deck settings')">
<NcAppNavigationSettings :name="t('deck', 'Deck settings')">
<NcButton @click="showHelp = true">
{{ t('deck', 'Keyboard shortcuts') }}
</NcButton>
@@ -97,14 +97,14 @@
</label>
</div>
<NcMultiselect v-if="isAdmin"
<NcSelect v-if="isAdmin"
v-model="groupLimit"
:class="{'icon-loading-small': groupLimitDisabled}"
open-direction="bottom"
:options="groups"
:multiple="true"
:disabled="groupLimitDisabled"
:placeholder="t('deck', 'Limit board creation to some groups')"
:input-label="t('deck', 'Limit board creation to some groups')"
label="displayname"
track-by="id"
@input="updateConfig" />
@@ -121,7 +121,7 @@
import axios from '@nextcloud/axios'
import { mapGetters } from 'vuex'
import ClickOutside from 'vue-click-outside'
import { NcAppNavigation, NcAppNavigationItem, NcAppNavigationSettings, NcMultiselect, NcButton } from '@nextcloud/vue'
import { NcAppNavigation, NcAppNavigationItem, NcAppNavigationSettings, NcSelect, NcButton } from '@nextcloud/vue'
import AppNavigationAddBoard from './AppNavigationAddBoard.vue'
import AppNavigationBoardCategory from './AppNavigationBoardCategory.vue'
import { loadState } from '@nextcloud/initial-state'
@@ -144,7 +144,7 @@ export default {
NcButton,
AppNavigationAddBoard,
AppNavigationBoardCategory,
NcMultiselect,
NcSelect,
NcAppNavigationItem,
ArchiveIcon,
CalendarIcon,

View File

@@ -21,7 +21,7 @@
-->
<template>
<NcAppNavigationItem v-if="!editing"
:title="t('deck', 'Add board')"
:name="t('deck', 'Add board')"
icon="icon-add"
@click.prevent.stop="startCreateBoard" />
<div v-else class="board-create">

View File

@@ -21,7 +21,7 @@
-->
<template>
<NcAppNavigationItem v-if="!editing"
:title="!deleted ? board.title : undoText"
:name="!deleted ? board.title : undoText"
:loading="loading"
:to="routeTo"
:undo="deleted"
@@ -29,10 +29,9 @@
@undo="unDelete">
<NcAppNavigationIconBullet slot="icon" :color="board.color" />
<NcAppNavigationCounter v-if="board.acl.length"
slot="counter"
class="icon-shared"
style="opacity: 0.5" />
<template #counter>
<AccountIcon v-if="board.acl.length > 0" />
</template>
<template v-if="!deleted" slot="actions">
<template v-if="!isDueSubmenuActive">
@@ -113,7 +112,7 @@
</NcActionButton>
</template>
<NcActionButton v-else-if="!board.archived && board.acl.length > 0"
:title="t('deck', 'Due date reminders')"
:name="t('deck', 'Due date reminders')"
:icon="dueDateReminderIcon"
@click="isDueSubmenuActive=true">
{{ dueDateReminderText }}
@@ -144,20 +143,21 @@
</template>
<script>
import { NcAppNavigationIconBullet, NcAppNavigationCounter, NcAppNavigationItem, NcColorPicker, NcActions, NcActionButton } from '@nextcloud/vue'
import { NcAppNavigationIconBullet, NcAppNavigationItem, NcColorPicker, NcActions, NcActionButton } from '@nextcloud/vue'
import ClickOutside from 'vue-click-outside'
import ArchiveIcon from 'vue-material-design-icons/Archive.vue'
import CloneIcon from 'vue-material-design-icons/ContentDuplicate.vue'
import AccountIcon from 'vue-material-design-icons/Account.vue'
export default {
name: 'AppNavigationBoard',
components: {
NcAppNavigationIconBullet,
NcAppNavigationCounter,
NcAppNavigationItem,
NcColorPicker,
NcActions,
NcActionButton,
AccountIcon,
ArchiveIcon,
CloneIcon,
},

View File

@@ -21,7 +21,7 @@
-->
<template>
<NcAppNavigationItem v-if="boards.length > 0"
:title="text"
:name="text"
:to="to"
:exact="true"
:allow-collapse="collapsible"