Merge pull request #5630 from nextcloud/enh/interactive-widget
This commit is contained in:
2697
package-lock.json
generated
2697
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -34,6 +34,7 @@
|
|||||||
"@babel/runtime": "^7.24.0",
|
"@babel/runtime": "^7.24.0",
|
||||||
"@nextcloud/auth": "^2.2.1",
|
"@nextcloud/auth": "^2.2.1",
|
||||||
"@nextcloud/axios": "^2.4.0",
|
"@nextcloud/axios": "^2.4.0",
|
||||||
|
"@nextcloud/capabilities": "^1.1.0",
|
||||||
"@nextcloud/dialogs": "^4.2.6",
|
"@nextcloud/dialogs": "^4.2.6",
|
||||||
"@nextcloud/event-bus": "^3.1.0",
|
"@nextcloud/event-bus": "^3.1.0",
|
||||||
"@nextcloud/files": "^3.1.0",
|
"@nextcloud/files": "^3.1.0",
|
||||||
|
|||||||
@@ -78,7 +78,7 @@
|
|||||||
required
|
required
|
||||||
@focus="$store.dispatch('toggleShortcutLock', true)"
|
@focus="$store.dispatch('toggleShortcutLock', true)"
|
||||||
@blur="$store.dispatch('toggleShortcutLock', false)">
|
@blur="$store.dispatch('toggleShortcutLock', false)">
|
||||||
<input v-tooltip="t('deck', 'Add list')"
|
<input :title="t('deck', 'Add list')"
|
||||||
class="icon-confirm"
|
class="icon-confirm"
|
||||||
type="submit"
|
type="submit"
|
||||||
value="">
|
value="">
|
||||||
@@ -86,24 +86,24 @@
|
|||||||
</div>
|
</div>
|
||||||
<div v-if="board" class="board-action-buttons">
|
<div v-if="board" class="board-action-buttons">
|
||||||
<div class="board-action-buttons__filter">
|
<div class="board-action-buttons__filter">
|
||||||
<NcPopover container=".board-action-buttons__filter"
|
<NcPopover :placement="'bottom-end'"
|
||||||
:placement="'bottom-end'"
|
|
||||||
:aria-label="t('deck', 'Active filters')"
|
:aria-label="t('deck', 'Active filters')"
|
||||||
:name="t('deck', 'Active filters')"
|
:name="t('deck', 'Active filters')"
|
||||||
:tooltip="t('deck', 'Active filters')"
|
|
||||||
@show="filterVisible=true"
|
@show="filterVisible=true"
|
||||||
@hide="filterVisible=false">
|
@hide="filterVisible=false">
|
||||||
<!-- We cannot use NcActions here are the popover trigger does not update on reactive icons -->
|
<!-- We cannot use NcActions here are the popover trigger does not update on reactive icons -->
|
||||||
<NcButton slot="trigger"
|
<template #trigger>
|
||||||
ref="filterPopover"
|
<NcButton ref="filterPopover"
|
||||||
:name="t('deck', 'Apply filter')"
|
:title="t('deck', 'Apply filter')"
|
||||||
class="filter-button"
|
:aria-label="t('deck', 'Apply filter')"
|
||||||
:type="isFilterActive ? 'primary' : 'tertiary'">
|
class="filter-button"
|
||||||
<template #icon>
|
:type="isFilterActive ? 'primary' : 'tertiary'">
|
||||||
<FilterIcon v-if="isFilterActive" :size="20" decorative />
|
<template #icon>
|
||||||
<FilterOffIcon v-else :size="20" decorative />
|
<FilterIcon v-if="isFilterActive" :size="20" decorative />
|
||||||
</template>
|
<FilterOffIcon v-else :size="20" decorative />
|
||||||
</NcButton>
|
</template>
|
||||||
|
</NcButton>
|
||||||
|
</template>
|
||||||
|
|
||||||
<div v-if="filterVisible" class="filter">
|
<div v-if="filterVisible" class="filter">
|
||||||
<h3>{{ t('deck', 'Filter by tag') }}</h3>
|
<h3>{{ t('deck', 'Filter by tag') }}</h3>
|
||||||
@@ -228,7 +228,7 @@
|
|||||||
</NcActionButton>
|
</NcActionButton>
|
||||||
</NcActions>
|
</NcActions>
|
||||||
<!-- FIXME: NcActionRouter currently doesn't work as an inline action -->
|
<!-- FIXME: NcActionRouter currently doesn't work as an inline action -->
|
||||||
<NcActions>
|
<NcActions v-if="isFullApp">
|
||||||
<NcActionButton icon="icon-menu-sidebar"
|
<NcActionButton icon="icon-menu-sidebar"
|
||||||
:aria-label="t('deck', 'Open details')"
|
:aria-label="t('deck', 'Open details')"
|
||||||
:name="t('deck', 'Details')"
|
:name="t('deck', 'Details')"
|
||||||
@@ -306,6 +306,7 @@ export default {
|
|||||||
'canManage',
|
'canManage',
|
||||||
]),
|
]),
|
||||||
...mapState({
|
...mapState({
|
||||||
|
isFullApp: state => state.isFullApp,
|
||||||
compactMode: state => state.compactMode,
|
compactMode: state => state.compactMode,
|
||||||
showCardCover: state => state.showCardCover,
|
showCardCover: state => state.showCardCover,
|
||||||
searchQuery: state => state.searchQuery,
|
searchQuery: state => state.searchQuery,
|
||||||
@@ -412,6 +413,9 @@ export default {
|
|||||||
this.showAddCardModal = false
|
this.showAddCardModal = false
|
||||||
},
|
},
|
||||||
setPageTitle(title) {
|
setPageTitle(title) {
|
||||||
|
if (!this.isFullApp) {
|
||||||
|
return
|
||||||
|
}
|
||||||
if (this.defaultPageTitle === false) {
|
if (this.defaultPageTitle === false) {
|
||||||
this.defaultPageTitle = window.document.title
|
this.defaultPageTitle = window.document.title
|
||||||
if (this.defaultPageTitle.indexOf(' - Deck - ') !== -1) {
|
if (this.defaultPageTitle.indexOf(' - Deck - ') !== -1) {
|
||||||
@@ -559,8 +563,4 @@ export default {
|
|||||||
.popover:focus {
|
.popover:focus {
|
||||||
outline: 2px solid var(--color-main-text);
|
outline: 2px solid var(--color-main-text);
|
||||||
}
|
}
|
||||||
|
|
||||||
.tooltip-inner.popover-inner {
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
* -->
|
* -->
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div v-tooltip.bottom="t('text', 'Currently present people')"
|
<div :title="t('text', 'Currently present people')"
|
||||||
class="avatar-list">
|
class="avatar-list">
|
||||||
<div v-for="session in sessionsVisible"
|
<div v-for="session in sessionsVisible"
|
||||||
:key="session.uid"
|
:key="session.uid"
|
||||||
@@ -37,16 +37,13 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { NcAvatar, Tooltip } from '@nextcloud/vue'
|
import { NcAvatar } from '@nextcloud/vue'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'SessionList',
|
name: 'SessionList',
|
||||||
components: {
|
components: {
|
||||||
NcAvatar,
|
NcAvatar,
|
||||||
},
|
},
|
||||||
directives: {
|
|
||||||
tooltip: Tooltip,
|
|
||||||
},
|
|
||||||
props: {
|
props: {
|
||||||
sessions: {
|
sessions: {
|
||||||
type: Array,
|
type: Array,
|
||||||
|
|||||||
@@ -52,7 +52,7 @@
|
|||||||
class="no-close"
|
class="no-close"
|
||||||
:placeholder="t('deck', 'List name')"
|
:placeholder="t('deck', 'List name')"
|
||||||
required>
|
required>
|
||||||
<input v-tooltip="t('deck', 'Add list')"
|
<input title="t('deck', 'Add list')"
|
||||||
class="icon-confirm"
|
class="icon-confirm"
|
||||||
type="submit"
|
type="submit"
|
||||||
value="">
|
value="">
|
||||||
@@ -81,7 +81,16 @@
|
|||||||
</Container>
|
</Container>
|
||||||
</div>
|
</div>
|
||||||
</transition>
|
</transition>
|
||||||
<GlobalSearchResults />
|
<GlobalSearchResults v-if="isFullApp" />
|
||||||
|
<NcModal v-if="localModal"
|
||||||
|
:clear-view-delay="0"
|
||||||
|
:close-button-contained="true"
|
||||||
|
size="large"
|
||||||
|
@close="localModal = null">
|
||||||
|
<div class="modal__content modal__card">
|
||||||
|
<CardSidebar :id="localModal" @close="localModal = null" />
|
||||||
|
</div>
|
||||||
|
</NcModal>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -91,11 +100,11 @@ import { mapState, mapGetters } from 'vuex'
|
|||||||
import Controls from '../Controls.vue'
|
import Controls from '../Controls.vue'
|
||||||
import DeckIcon from '../icons/DeckIcon.vue'
|
import DeckIcon from '../icons/DeckIcon.vue'
|
||||||
import Stack from './Stack.vue'
|
import Stack from './Stack.vue'
|
||||||
import { NcEmptyContent } from '@nextcloud/vue'
|
import { NcEmptyContent, NcModal } from '@nextcloud/vue'
|
||||||
import GlobalSearchResults from '../search/GlobalSearchResults.vue'
|
import GlobalSearchResults from '../search/GlobalSearchResults.vue'
|
||||||
import { showError } from '../../helpers/errors.js'
|
import { showError } from '../../helpers/errors.js'
|
||||||
import { createSession } from '../../sessions.js'
|
import { createSession } from '../../sessions.js'
|
||||||
|
import CardSidebar from '../card/CardSidebar.vue'
|
||||||
export default {
|
export default {
|
||||||
name: 'Board',
|
name: 'Board',
|
||||||
components: {
|
components: {
|
||||||
@@ -106,6 +115,8 @@ export default {
|
|||||||
Draggable,
|
Draggable,
|
||||||
Stack,
|
Stack,
|
||||||
NcEmptyContent,
|
NcEmptyContent,
|
||||||
|
NcModal,
|
||||||
|
CardSidebar,
|
||||||
},
|
},
|
||||||
inject: [
|
inject: [
|
||||||
'boardApi',
|
'boardApi',
|
||||||
@@ -123,10 +134,12 @@ export default {
|
|||||||
newStackTitle: '',
|
newStackTitle: '',
|
||||||
currentScrollPosX: null,
|
currentScrollPosX: null,
|
||||||
currentMousePosX: null,
|
currentMousePosX: null,
|
||||||
|
localModal: null,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapState({
|
...mapState({
|
||||||
|
isFullApp: state => state.isFullApp,
|
||||||
board: state => state.currentBoard,
|
board: state => state.currentBoard,
|
||||||
showArchived: state => state.showArchived,
|
showArchived: state => state.showArchived,
|
||||||
}),
|
}),
|
||||||
@@ -155,6 +168,9 @@ export default {
|
|||||||
created() {
|
created() {
|
||||||
this.session = createSession(this.id)
|
this.session = createSession(this.id)
|
||||||
this.fetchData()
|
this.fetchData()
|
||||||
|
this.$root.$on('open-card', (cardId) => {
|
||||||
|
this.localModal = cardId
|
||||||
|
})
|
||||||
},
|
},
|
||||||
beforeDestroy() {
|
beforeDestroy() {
|
||||||
this.session.close()
|
this.session.close()
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
class="shareWithList">
|
class="shareWithList">
|
||||||
<li>
|
<li>
|
||||||
<NcAvatar :user="board.owner.uid" />
|
<NcAvatar :user="board.owner.uid" />
|
||||||
<span class="has-tooltip username">
|
<span class="username">
|
||||||
{{ board.owner.displayname }}
|
{{ board.owner.displayname }}
|
||||||
<span v-if="!isCurrentUser(board.owner.uid)" class="board-owner-label">
|
<span v-if="!isCurrentUser(board.owner.uid)" class="board-owner-label">
|
||||||
{{ t('deck', 'Board owner') }}
|
{{ t('deck', 'Board owner') }}
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
<NcAvatar v-if="acl.type===0" :user="acl.participant.uid" />
|
<NcAvatar v-if="acl.type===0" :user="acl.participant.uid" />
|
||||||
<div v-if="acl.type===1" class="avatardiv icon icon-group" />
|
<div v-if="acl.type===1" class="avatardiv icon icon-group" />
|
||||||
<div v-if="acl.type===7" class="avatardiv icon icon-circles" />
|
<div v-if="acl.type===7" class="avatardiv icon icon-circles" />
|
||||||
<span class="has-tooltip username">
|
<span class="username">
|
||||||
{{ acl.participant.displayname }}
|
{{ acl.participant.displayname }}
|
||||||
<span v-if="acl.type===1">{{ t('deck', '(Group)') }}</span>
|
<span v-if="acl.type===1">{{ t('deck', '(Group)') }}</span>
|
||||||
<span v-if="acl.type===7">{{ t('deck', '(Team)') }}</span>
|
<span v-if="acl.type===7">{{ t('deck', '(Team)') }}</span>
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
{{ stack.title }}
|
{{ stack.title }}
|
||||||
</h3>
|
</h3>
|
||||||
<h3 v-else-if="!editing"
|
<h3 v-else-if="!editing"
|
||||||
v-tooltip="stack.title"
|
title="stack.title"
|
||||||
dir="auto"
|
dir="auto"
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
:aria-label="stack.title"
|
:aria-label="stack.title"
|
||||||
@@ -51,7 +51,7 @@
|
|||||||
dir="auto"
|
dir="auto"
|
||||||
type="text"
|
type="text"
|
||||||
required="required">
|
required="required">
|
||||||
<input v-tooltip="t('deck', 'Edit list title')"
|
<input title="t('deck', 'Edit list title')"
|
||||||
class="icon-confirm"
|
class="icon-confirm"
|
||||||
type="submit"
|
type="submit"
|
||||||
value="">
|
value="">
|
||||||
|
|||||||
@@ -12,20 +12,21 @@
|
|||||||
<div :style="{ backgroundColor: '#' + editingLabel.color }" class="color0 icon-colorpicker" />
|
<div :style="{ backgroundColor: '#' + editingLabel.color }" class="color0 icon-colorpicker" />
|
||||||
</NcColorPicker>
|
</NcColorPicker>
|
||||||
<input v-model="editingLabel.title" type="text">
|
<input v-model="editingLabel.title" type="text">
|
||||||
<input v-tooltip="{content: missingDataLabel, show: !editLabelObjValidated, trigger: 'manual' }"
|
<input :disabled="!editLabelObjValidated"
|
||||||
:disabled="!editLabelObjValidated"
|
|
||||||
type="submit"
|
type="submit"
|
||||||
value=""
|
value=""
|
||||||
class="icon-confirm">
|
class="icon-confirm">
|
||||||
<NcActions>
|
<NcActions>
|
||||||
<NcActionButton v-tooltip="{content: missingDataLabel, show: !editLabelObjValidated, trigger: 'manual' }"
|
<NcActionButton :disabled="!editLabelObjValidated"
|
||||||
:disabled="!editLabelObjValidated"
|
|
||||||
icon="icon-close"
|
icon="icon-close"
|
||||||
@click="editingLabelId = null">
|
@click="editingLabelId = null">
|
||||||
{{ t('deck', 'Cancel') }}
|
{{ t('deck', 'Cancel') }}
|
||||||
</NcActionButton>
|
</NcActionButton>
|
||||||
</NcActions>
|
</NcActions>
|
||||||
</form>
|
</form>
|
||||||
|
<p v-if="!editLabelObjValidated">
|
||||||
|
{{ missingDataLabel }}
|
||||||
|
</p>
|
||||||
</template>
|
</template>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<div v-if="canManage && !isArchived" class="label-title" @click="clickEdit(label)">
|
<div v-if="canManage && !isArchived" class="label-title" @click="clickEdit(label)">
|
||||||
@@ -58,8 +59,7 @@
|
|||||||
<div :style="{ backgroundColor: '#' + addLabelObj.color }" class="color0 icon-colorpicker" />
|
<div :style="{ backgroundColor: '#' + addLabelObj.color }" class="color0 icon-colorpicker" />
|
||||||
</NcColorPicker>
|
</NcColorPicker>
|
||||||
<input v-model="addLabelObj.title" type="text">
|
<input v-model="addLabelObj.title" type="text">
|
||||||
<input v-tooltip="{content: missingDataLabel, show: !addLabelObjValidated, trigger: 'manual' }"
|
<input :disabled="!addLabelObjValidated"
|
||||||
:disabled="!addLabelObjValidated"
|
|
||||||
type="submit"
|
type="submit"
|
||||||
value=""
|
value=""
|
||||||
class="icon-confirm">
|
class="icon-confirm">
|
||||||
@@ -69,6 +69,9 @@
|
|||||||
</NcActionButton>
|
</NcActionButton>
|
||||||
</NcActions>
|
</NcActions>
|
||||||
</form>
|
</form>
|
||||||
|
<p v-if="!addLabelObjValidated">
|
||||||
|
{{ missingDataLabel }}
|
||||||
|
</p>
|
||||||
</li>
|
</li>
|
||||||
<button v-if="canManage && !isArchived" @click="clickShowAddLabel()">
|
<button v-if="canManage && !isArchived" @click="clickShowAddLabel()">
|
||||||
<span class="icon-add" />{{ t('deck', 'Add a new tag') }}
|
<span class="icon-add" />{{ t('deck', 'Add a new tag') }}
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
:user="user.participant.uid"
|
:user="user.participant.uid"
|
||||||
:display-name="user.participant.displayname"
|
:display-name="user.participant.displayname"
|
||||||
class="board-list-avatar" />
|
class="board-list-avatar" />
|
||||||
<div v-if="board.acl.length > 5" v-tooltip="otherAcl" class="avatardiv popovermenu-wrapper board-list-avatar icon-more" />
|
<div v-if="board.acl.length > 5" :title="otherAcl" class="avatardiv popovermenu-wrapper board-list-avatar icon-more" />
|
||||||
</div>
|
</div>
|
||||||
<div class="board-list-actions-cell" />
|
<div class="board-list-actions-cell" />
|
||||||
</router-link>
|
</router-link>
|
||||||
|
|||||||
@@ -32,10 +32,10 @@
|
|||||||
@submit-title="handleSubmitTitle"
|
@submit-title="handleSubmitTitle"
|
||||||
@close="closeSidebar">
|
@close="closeSidebar">
|
||||||
<template #secondary-actions>
|
<template #secondary-actions>
|
||||||
<NcActionButton v-if="cardDetailsInModal" icon="icon-menu-sidebar" @click.stop="closeModal()">
|
<NcActionButton v-if="cardDetailsInModal && isFullApp" icon="icon-menu-sidebar" @click.stop="closeModal()">
|
||||||
{{ t('deck', 'Open in sidebar view') }}
|
{{ t('deck', 'Open in sidebar view') }}
|
||||||
</NcActionButton>
|
</NcActionButton>
|
||||||
<NcActionButton v-else icon="icon-external" @click.stop="showModal()">
|
<NcActionButton v-else-if="isFullApp" icon="icon-external" @click.stop="showModal()">
|
||||||
{{ t('deck', 'Open in bigger view') }}
|
{{ t('deck', 'Open in bigger view') }}
|
||||||
</NcActionButton>
|
</NcActionButton>
|
||||||
|
|
||||||
@@ -83,6 +83,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { NcActionButton, NcAppSidebar, NcAppSidebarTab } from '@nextcloud/vue'
|
import { NcActionButton, NcAppSidebar, NcAppSidebarTab } from '@nextcloud/vue'
|
||||||
|
import { getCapabilities } from '@nextcloud/capabilities'
|
||||||
import { mapState, mapGetters } from 'vuex'
|
import { mapState, mapGetters } from 'vuex'
|
||||||
import CardSidebarTabDetails from './CardSidebarTabDetails.vue'
|
import CardSidebarTabDetails from './CardSidebarTabDetails.vue'
|
||||||
import CardSidebarTabAttachments from './CardSidebarTabAttachments.vue'
|
import CardSidebarTabAttachments from './CardSidebarTabAttachments.vue'
|
||||||
@@ -99,7 +100,7 @@ import { showError } from '@nextcloud/dialogs'
|
|||||||
import { getLocale } from '@nextcloud/l10n'
|
import { getLocale } from '@nextcloud/l10n'
|
||||||
import CardMenuEntries from '../cards/CardMenuEntries.vue'
|
import CardMenuEntries from '../cards/CardMenuEntries.vue'
|
||||||
|
|
||||||
const capabilities = window.OC.getCapabilities()
|
const capabilities = getCapabilities()
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'CardSidebar',
|
name: 'CardSidebar',
|
||||||
@@ -144,6 +145,7 @@ export default {
|
|||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapState({
|
...mapState({
|
||||||
|
isFullApp: state => state.isFullApp,
|
||||||
currentBoard: state => state.currentBoard,
|
currentBoard: state => state.currentBoard,
|
||||||
}),
|
}),
|
||||||
...mapGetters(['canEdit', 'assignables', 'cardActions', 'stackById']),
|
...mapGetters(['canEdit', 'assignables', 'cardActions', 'stackById']),
|
||||||
@@ -188,7 +190,8 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
closeSidebar() {
|
closeSidebar() {
|
||||||
this.$router.push({ name: 'board' })
|
this.$router?.push({ name: 'board' })
|
||||||
|
this.$emit('close')
|
||||||
},
|
},
|
||||||
|
|
||||||
showModal() {
|
showModal() {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<div>
|
<div>
|
||||||
<div class="comment--header">
|
<div class="comment--header">
|
||||||
<NcAvatar :user="currentUser.uid" />
|
<NcAvatar :user="currentUser.uid" />
|
||||||
<span class="has-tooltip username">
|
<span class="username">
|
||||||
{{ currentUser.displayName }}
|
{{ currentUser.displayName }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -49,7 +49,7 @@
|
|||||||
@blur="error = null"
|
@blur="error = null"
|
||||||
@input="validate()" />
|
@input="validate()" />
|
||||||
</At>
|
</At>
|
||||||
<input v-tooltip="t('deck', 'Save')"
|
<input :title="t('deck', 'Save')"
|
||||||
class="icon-confirm"
|
class="icon-confirm"
|
||||||
type="submit"
|
type="submit"
|
||||||
value=""
|
value=""
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
<li v-else class="comment">
|
<li v-else class="comment">
|
||||||
<div class="comment--header">
|
<div class="comment--header">
|
||||||
<NcAvatar :user="comment.actorId" />
|
<NcAvatar :user="comment.actorId" />
|
||||||
<span class="has-tooltip username">
|
<span class="username">
|
||||||
{{ comment.actorDisplayName }}
|
{{ comment.actorDisplayName }}
|
||||||
</span>
|
</span>
|
||||||
<NcActions v-show="!edit" :force-menu="true">
|
<NcActions v-show="!edit" :force-menu="true">
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
<span v-if="descriptionLastEdit && !descriptionSaving">{{ t('deck', '(Unsaved)') }}</span>
|
<span v-if="descriptionLastEdit && !descriptionSaving">{{ t('deck', '(Unsaved)') }}</span>
|
||||||
<span v-if="descriptionSaving">{{ t('deck', '(Saving…)') }}</span>
|
<span v-if="descriptionSaving">{{ t('deck', '(Saving…)') }}</span>
|
||||||
<a v-if="!textAppAvailable"
|
<a v-if="!textAppAvailable"
|
||||||
v-tooltip="t('deck', 'Formatting help')"
|
:title="t('deck', 'Formatting help')"
|
||||||
href="https://deck.readthedocs.io/en/latest/Markdown/"
|
href="https://deck.readthedocs.io/en/latest/Markdown/"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
class="icon icon-info" />
|
class="icon icon-info" />
|
||||||
|
|||||||
@@ -85,7 +85,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { NcAvatar, NcPopover, Tooltip } from '@nextcloud/vue'
|
import { NcAvatar, NcPopover } from '@nextcloud/vue'
|
||||||
import { generateUrl } from '@nextcloud/router'
|
import { generateUrl } from '@nextcloud/router'
|
||||||
import AccountMultiple from 'vue-material-design-icons/AccountMultiple.vue'
|
import AccountMultiple from 'vue-material-design-icons/AccountMultiple.vue'
|
||||||
|
|
||||||
@@ -96,9 +96,6 @@ export default {
|
|||||||
NcPopover,
|
NcPopover,
|
||||||
AccountMultiple,
|
AccountMultiple,
|
||||||
},
|
},
|
||||||
directives: {
|
|
||||||
tooltip: Tooltip,
|
|
||||||
},
|
|
||||||
props: {
|
props: {
|
||||||
users: {
|
users: {
|
||||||
type: Array,
|
type: Array,
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
<CardId v-if="idBadge" class="icon-badge" :card="card" />
|
<CardId v-if="idBadge" class="icon-badge" :card="card" />
|
||||||
|
|
||||||
<div v-if="card.commentsCount > 0"
|
<div v-if="card.commentsCount > 0"
|
||||||
v-tooltip="commentsHint"
|
:title="commentsHint"
|
||||||
class="icon-badge"
|
class="icon-badge"
|
||||||
@click.stop="openComments">
|
@click.stop="openComments">
|
||||||
<CommentUnreadIcon v-if="card.commentsUnread > 0" :size="16" />
|
<CommentUnreadIcon v-if="card.commentsUnread > 0" :size="16" />
|
||||||
|
|||||||
@@ -212,8 +212,14 @@ export default {
|
|||||||
if (this.dragging) {
|
if (this.dragging) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const boardId = this.card && this.card.boardId ? this.card.boardId : this.$route.params.id
|
const boardId = this.card && this.card.boardId ? this.card.boardId : (this.$route?.params.id ?? this.currentBoard.id)
|
||||||
this.$router.push({ name: 'card', params: { id: boardId, cardId: this.card.id } }).catch(() => {})
|
|
||||||
|
if (this.$router) {
|
||||||
|
this.$router.push({ name: 'card', params: { id: boardId, cardId: this.card.id } }).catch(() => {})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
this.$root.$emit('open-card', this.card.id)
|
||||||
},
|
},
|
||||||
onTitleBlur(e) {
|
onTitleBlur(e) {
|
||||||
// TODO Handle empty title
|
// TODO Handle empty title
|
||||||
|
|||||||
@@ -144,8 +144,14 @@ export default {
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
openCard() {
|
openCard() {
|
||||||
const boardId = this.card?.boardId ? this.card.boardId : this.$route.params.id
|
const boardId = this.card?.boardId ? this.card.boardId : this.$route?.params.id ?? this.currentBoard.id
|
||||||
this.$router.push({ name: 'card', params: { id: boardId, cardId: this.card.id } }).catch(() => {})
|
|
||||||
|
if (this.$router) {
|
||||||
|
this.$router?.push({ name: 'card', params: { id: boardId, cardId: this.card.id } }).catch(() => {})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
this.$root.$emit('open-card', this.card.id)
|
||||||
},
|
},
|
||||||
deleteCard() {
|
deleteCard() {
|
||||||
this.$store.dispatch('deleteCard', this.card)
|
this.$store.dispatch('deleteCard', this.card)
|
||||||
|
|||||||
@@ -20,34 +20,39 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { registerWidget, registerCustomPickerElement, NcCustomPickerRenderResult } from '@nextcloud/vue/dist/Functions/registerReference.js'
|
import { registerWidget, registerCustomPickerElement, NcCustomPickerRenderResult } from '@nextcloud/vue/dist/Functions/registerReference.js'
|
||||||
|
|
||||||
import { translate, translatePlural } from '@nextcloud/l10n'
|
import { translate, translatePlural } from '@nextcloud/l10n'
|
||||||
|
|
||||||
import './shared-init.js'
|
import './shared-init.js'
|
||||||
|
|
||||||
const prepareVue = (Vue) => {
|
const prepareVue = async (Component = null) => {
|
||||||
|
const { default: Vue } = await import('vue')
|
||||||
|
const { default: ClickOutside } = await import('vue-click-outside')
|
||||||
|
|
||||||
Vue.prototype.t = translate
|
Vue.prototype.t = translate
|
||||||
Vue.prototype.n = translatePlural
|
Vue.prototype.n = translatePlural
|
||||||
Vue.prototype.OC = window.OC
|
Vue.prototype.OC = window.OC
|
||||||
Vue.prototype.OCA = window.OCA
|
Vue.prototype.OCA = window.OCA
|
||||||
|
Vue.directive('click-outside', ClickOutside)
|
||||||
Vue.directive('focus', {
|
Vue.directive('focus', {
|
||||||
inserted(el) {
|
inserted(el) {
|
||||||
el.focus()
|
el.focus()
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
if (!Component) {
|
||||||
|
return Vue
|
||||||
|
}
|
||||||
|
|
||||||
|
return Vue.extend(Component)
|
||||||
}
|
}
|
||||||
|
|
||||||
registerWidget('deck-card', async (el, { richObjectType, richObject, accessible }) => {
|
registerWidget('deck-card', async (el, { richObjectType, richObject, accessible }) => {
|
||||||
const { default: Vue } = await import('vue')
|
|
||||||
prepareVue(Vue)
|
|
||||||
const { default: CardReferenceWidget } = await import('./views/CardReferenceWidget.vue')
|
const { default: CardReferenceWidget } = await import('./views/CardReferenceWidget.vue')
|
||||||
|
const Widget = await prepareVue(CardReferenceWidget)
|
||||||
// trick to change the wrapper element size, otherwise it always is 100%
|
// trick to change the wrapper element size, otherwise it always is 100%
|
||||||
// which is not very nice with a simple card
|
// which is not very nice with a simple card
|
||||||
el.parentNode.style['max-width'] = '400px'
|
el.parentNode.style['max-width'] = '400px'
|
||||||
el.parentNode.style['margin-left'] = '0'
|
el.parentNode.style['margin-left'] = '0'
|
||||||
el.parentNode.style['margin-right'] = '0'
|
el.parentNode.style['margin-right'] = '0'
|
||||||
|
|
||||||
const Widget = Vue.extend(CardReferenceWidget)
|
|
||||||
new Widget({
|
new Widget({
|
||||||
propsData: {
|
propsData: {
|
||||||
richObjectType,
|
richObjectType,
|
||||||
@@ -57,34 +62,33 @@ registerWidget('deck-card', async (el, { richObjectType, richObject, accessible
|
|||||||
}).$mount(el)
|
}).$mount(el)
|
||||||
})
|
})
|
||||||
|
|
||||||
registerWidget('deck-board', async (el, { richObjectType, richObject, accessible }) => {
|
const boardWidgets = {}
|
||||||
const { default: Vue } = await import('vue')
|
registerWidget('deck-board', async (el, { richObjectType, richObject, accessible, interactive }) => {
|
||||||
prepareVue(Vue)
|
|
||||||
const { default: BoardReferenceWidget } = await import('./views/BoardReferenceWidget.vue')
|
const { default: BoardReferenceWidget } = await import('./views/BoardReferenceWidget.vue')
|
||||||
el.parentNode.style['max-width'] = '400px'
|
const Widget = await prepareVue(BoardReferenceWidget)
|
||||||
el.parentNode.style['margin-left'] = '0'
|
boardWidgets[el] = new Widget({
|
||||||
el.parentNode.style['margin-right'] = '0'
|
|
||||||
|
|
||||||
const Widget = Vue.extend(BoardReferenceWidget)
|
|
||||||
new Widget({
|
|
||||||
propsData: {
|
propsData: {
|
||||||
richObjectType,
|
richObjectType,
|
||||||
richObject,
|
richObject,
|
||||||
accessible,
|
accessible,
|
||||||
|
interactive,
|
||||||
},
|
},
|
||||||
}).$mount(el)
|
}).$mount(el)
|
||||||
|
}, (el) => {
|
||||||
|
boardWidgets[el].$destroy()
|
||||||
|
delete boardWidgets[el]
|
||||||
|
}, {
|
||||||
|
fullWidth: true,
|
||||||
})
|
})
|
||||||
|
|
||||||
registerWidget('deck-comment', async (el, { richObjectType, richObject, accessible }) => {
|
registerWidget('deck-comment', async (el, { richObjectType, richObject, accessible }) => {
|
||||||
const { default: Vue } = await import('vue')
|
|
||||||
prepareVue(Vue)
|
|
||||||
const { default: CommentReferenceWidget } = await import('./views/CommentReferenceWidget.vue')
|
const { default: CommentReferenceWidget } = await import('./views/CommentReferenceWidget.vue')
|
||||||
|
const Widget = await prepareVue(CommentReferenceWidget)
|
||||||
|
|
||||||
el.parentNode.style['max-width'] = '400px'
|
el.parentNode.style['max-width'] = '400px'
|
||||||
el.parentNode.style['margin-left'] = '0'
|
el.parentNode.style['margin-left'] = '0'
|
||||||
el.parentNode.style['margin-right'] = '0'
|
el.parentNode.style['margin-right'] = '0'
|
||||||
|
|
||||||
const Widget = Vue.extend(CommentReferenceWidget)
|
|
||||||
new Widget({
|
new Widget({
|
||||||
propsData: {
|
propsData: {
|
||||||
richObjectType,
|
richObjectType,
|
||||||
@@ -95,10 +99,8 @@ registerWidget('deck-comment', async (el, { richObjectType, richObject, accessib
|
|||||||
})
|
})
|
||||||
|
|
||||||
registerCustomPickerElement('create-new-deck-card', async (el, { providerId, accessible }) => {
|
registerCustomPickerElement('create-new-deck-card', async (el, { providerId, accessible }) => {
|
||||||
const { default: Vue } = await import('vue')
|
|
||||||
Vue.mixin({ methods: { t, n } })
|
|
||||||
const { default: CreateNewCardCustomPicker } = await import('./views/CreateNewCardCustomPicker.vue')
|
const { default: CreateNewCardCustomPicker } = await import('./views/CreateNewCardCustomPicker.vue')
|
||||||
const Element = Vue.extend(CreateNewCardCustomPicker)
|
const Element = await prepareVue(CreateNewCardCustomPicker)
|
||||||
const vueElement = new Element({
|
const vueElement = new Element({
|
||||||
propsData: {
|
propsData: {
|
||||||
providerId,
|
providerId,
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ import { sync } from 'vuex-router-sync'
|
|||||||
import { translate, translatePlural } from '@nextcloud/l10n'
|
import { translate, translatePlural } from '@nextcloud/l10n'
|
||||||
import { showError } from '@nextcloud/dialogs'
|
import { showError } from '@nextcloud/dialogs'
|
||||||
import { subscribe } from '@nextcloud/event-bus'
|
import { subscribe } from '@nextcloud/event-bus'
|
||||||
import { Tooltip } from '@nextcloud/vue'
|
|
||||||
import ClickOutside from 'vue-click-outside'
|
import ClickOutside from 'vue-click-outside'
|
||||||
import './shared-init.js'
|
import './shared-init.js'
|
||||||
import './models/index.js'
|
import './models/index.js'
|
||||||
@@ -41,7 +40,6 @@ sync(store, router)
|
|||||||
Vue.prototype.t = translate
|
Vue.prototype.t = translate
|
||||||
Vue.prototype.n = translatePlural
|
Vue.prototype.n = translatePlural
|
||||||
|
|
||||||
Vue.directive('tooltip', Tooltip)
|
|
||||||
Vue.directive('click-outside', ClickOutside)
|
Vue.directive('click-outside', ClickOutside)
|
||||||
|
|
||||||
Vue.directive('focus', {
|
Vue.directive('focus', {
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ export default new Vuex.Store({
|
|||||||
},
|
},
|
||||||
strict: debug,
|
strict: debug,
|
||||||
state: {
|
state: {
|
||||||
|
isFullApp: true,
|
||||||
config: loadState('deck', 'config', {}),
|
config: loadState('deck', 'config', {}),
|
||||||
showArchived: false,
|
showArchived: false,
|
||||||
navShown: localStorage.getItem('deck.navShown') === null || localStorage.getItem('deck.navShown') === 'true',
|
navShown: localStorage.getItem('deck.navShown') === null || localStorage.getItem('deck.navShown') === 'true',
|
||||||
@@ -78,6 +79,10 @@ export default new Vuex.Store({
|
|||||||
},
|
},
|
||||||
getters: {
|
getters: {
|
||||||
config: state => (key) => {
|
config: state => (key) => {
|
||||||
|
if (!state.isFullApp && key === 'cardDetailsInModal') {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
return state.config[key]
|
return state.config[key]
|
||||||
},
|
},
|
||||||
getSearchQuery: state => {
|
getSearchQuery: state => {
|
||||||
@@ -140,6 +145,9 @@ export default new Vuex.Store({
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
mutations: {
|
mutations: {
|
||||||
|
setFullApp(state, isFullApp) {
|
||||||
|
Vue.set(state, 'isFullApp', isFullApp)
|
||||||
|
},
|
||||||
SET_CONFIG(state, { key, value }) {
|
SET_CONFIG(state, { key, value }) {
|
||||||
const [scope, id, configKey] = key.split(':', 3)
|
const [scope, id, configKey] = key.split(':', 3)
|
||||||
let indexExisting = -1
|
let indexExisting = -1
|
||||||
@@ -313,6 +321,9 @@ export default new Vuex.Store({
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
actions: {
|
actions: {
|
||||||
|
setFullApp({ commit }, isFullApp) {
|
||||||
|
commit('setFullApp', isFullApp)
|
||||||
|
},
|
||||||
async setConfig({ commit }, config) {
|
async setConfig({ commit }, config) {
|
||||||
for (const key in config) {
|
for (const key in config) {
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -20,7 +20,10 @@
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="deck-board-reference">
|
<div v-if="interactive" class="deck-board-reference-interactive">
|
||||||
|
<Board :id="board.id" />
|
||||||
|
</div>
|
||||||
|
<div v-else class="deck-board-reference">
|
||||||
<div class="line">
|
<div class="line">
|
||||||
<DeckIcon :size="20" class="title-icon" />
|
<DeckIcon :size="20" class="title-icon" />
|
||||||
<strong>
|
<strong>
|
||||||
@@ -41,19 +44,33 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import Board from '../components/board/Board.vue'
|
||||||
import DeckIcon from '../components/icons/DeckIcon.vue'
|
import DeckIcon from '../components/icons/DeckIcon.vue'
|
||||||
|
import { BoardApi } from './../services/BoardApi.js'
|
||||||
|
import store from './../store/main.js'
|
||||||
|
|
||||||
import NcUserBubble from '@nextcloud/vue/dist/Components/NcUserBubble.js'
|
import NcUserBubble from '@nextcloud/vue/dist/Components/NcUserBubble.js'
|
||||||
|
|
||||||
import moment from '@nextcloud/moment'
|
import moment from '@nextcloud/moment'
|
||||||
import { generateUrl } from '@nextcloud/router'
|
import { generateUrl } from '@nextcloud/router'
|
||||||
|
|
||||||
|
const boardApi = new BoardApi()
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'BoardReferenceWidget',
|
name: 'BoardReferenceWidget',
|
||||||
|
|
||||||
|
store,
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
DeckIcon,
|
DeckIcon,
|
||||||
NcUserBubble,
|
NcUserBubble,
|
||||||
|
Board,
|
||||||
|
},
|
||||||
|
|
||||||
|
provide() {
|
||||||
|
return {
|
||||||
|
boardApi,
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
props: {
|
props: {
|
||||||
@@ -69,6 +86,10 @@ export default {
|
|||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true,
|
default: true,
|
||||||
},
|
},
|
||||||
|
interactive: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
@@ -92,8 +113,10 @@ export default {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
created() {
|
||||||
|
this.$store.commit('setFullApp', false)
|
||||||
},
|
},
|
||||||
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -123,6 +146,22 @@ export default {
|
|||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.deck-board-reference-interactive {
|
||||||
|
width: 100%;
|
||||||
|
min-height: min(50vh, calc(100vh - 100px));
|
||||||
|
max-height: calc(100vh - 120px);
|
||||||
|
&:deep(.controls) {
|
||||||
|
padding-left: 12px;
|
||||||
|
}
|
||||||
|
&:deep(.board) {
|
||||||
|
padding-left: 0;
|
||||||
|
}
|
||||||
|
&:deep(*) {
|
||||||
|
-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
|
||||||
|
-moz-box-sizing: border-box; /* Firefox, other Gecko */
|
||||||
|
box-sizing: border-box; /* Opera/IE 8+ */
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
</strong>
|
</strong>
|
||||||
<div v-if="dueDate" class="spacer" />
|
<div v-if="dueDate" class="spacer" />
|
||||||
<span v-if="dueDate"
|
<span v-if="dueDate"
|
||||||
v-tooltip.top="{ content: formattedDueDate }"
|
:title="t('Due date') + ': ' + formattedDueDate"
|
||||||
class="due-date">
|
class="due-date">
|
||||||
<CalendarBlankIcon :size="20"
|
<CalendarBlankIcon :size="20"
|
||||||
class="icon" />
|
class="icon" />
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="line">
|
<div class="line">
|
||||||
<DeckIcon :size="20" class="title-icon" />
|
<DeckIcon :size="20" class="title-icon" />
|
||||||
<a v-tooltip.top="{ content: stackTooltip }"
|
<a :title="stackTooltip"
|
||||||
:href="boardLink"
|
:href="boardLink"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
class="link">
|
class="link">
|
||||||
@@ -67,7 +67,7 @@
|
|||||||
'description': true,
|
'description': true,
|
||||||
'short-description': shortDescription,
|
'short-description': shortDescription,
|
||||||
}">
|
}">
|
||||||
<NcRichText v-tooltip.top="{ content: shortDescription ? t('deck', 'Click to expand description') : undefined }"
|
<NcRichText :title="shortDescription ? t('deck', 'Click to expand description') : undefined"
|
||||||
:text="card.description"
|
:text="card.description"
|
||||||
:use-markdown="true"
|
:use-markdown="true"
|
||||||
@click.native="shortDescription = !shortDescription" />
|
@click.native="shortDescription = !shortDescription" />
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
</strong>
|
</strong>
|
||||||
<div v-if="dueDate" class="spacer" />
|
<div v-if="dueDate" class="spacer" />
|
||||||
<span v-if="dueDate"
|
<span v-if="dueDate"
|
||||||
v-tooltip.top="{ content: formattedDueDate }"
|
:title="t('Due date') + ': ' + formattedDueDate"
|
||||||
class="due-date">
|
class="due-date">
|
||||||
<CalendarBlankIcon :size="20"
|
<CalendarBlankIcon :size="20"
|
||||||
class="icon" />
|
class="icon" />
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="line">
|
<div class="line">
|
||||||
<DeckIcon :size="20" class="title-icon" />
|
<DeckIcon :size="20" class="title-icon" />
|
||||||
<a v-tooltip.top="{ content: stackTooltip }"
|
<a :title="stackTooltip"
|
||||||
:href="boardLink"
|
:href="boardLink"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
class="link">
|
class="link">
|
||||||
@@ -67,7 +67,7 @@
|
|||||||
'description': true,
|
'description': true,
|
||||||
'short-description': shortDescription,
|
'short-description': shortDescription,
|
||||||
}">
|
}">
|
||||||
<NcRichText v-tooltip.top="{ content: shortDescription ? t('deck', 'Click to expand description') : undefined }"
|
<NcRichText :title="shortDescription ? t('deck', 'Click to expand description') : undefined"
|
||||||
:text="card.description"
|
:text="card.description"
|
||||||
:use-markdown="true"
|
:use-markdown="true"
|
||||||
@click.native="shortDescription = !shortDescription" />
|
@click.native="shortDescription = !shortDescription" />
|
||||||
@@ -84,7 +84,7 @@
|
|||||||
'comment': true,
|
'comment': true,
|
||||||
'short-comment': shortComment,
|
'short-comment': shortComment,
|
||||||
}">
|
}">
|
||||||
<NcRichText v-tooltip.top="{ content: shortComment ? t('deck', 'Click to expand comment') : undefined }"
|
<NcRichText :title="shortComment ? t('deck', 'Click to expand comment') : undefined"
|
||||||
:text="commentMessageText"
|
:text="commentMessageText"
|
||||||
:use-markdown="false"
|
:use-markdown="false"
|
||||||
@click.native="shortComment = !shortComment" />
|
@click.native="shortComment = !shortComment" />
|
||||||
|
|||||||
Reference in New Issue
Block a user