mirror of
https://github.com/LibreSign/libresign.git
synced 2025-12-18 05:20:45 +01:00
Merge pull request #6134 from LibreSign/refactor/replace-bullet-with-ncchip
refactor: Replace Bullet component with NcChip and fix signer reactivity
This commit is contained in:
commit
309794bb13
3 changed files with 9 additions and 48 deletions
|
|
@ -1,40 +0,0 @@
|
||||||
<!--
|
|
||||||
- SPDX-FileCopyrightText: 2024 LibreCode coop and LibreCode contributors
|
|
||||||
- SPDX-License-Identifier: AGPL-3.0-or-later
|
|
||||||
-->
|
|
||||||
<template>
|
|
||||||
<div class="bullet__wrapper">
|
|
||||||
<span class="bullet__name">
|
|
||||||
{{ name }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<script>
|
|
||||||
export default {
|
|
||||||
name: 'Bullet',
|
|
||||||
props: {
|
|
||||||
name: {
|
|
||||||
type: String,
|
|
||||||
required: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
<style lang="scss" scoped>
|
|
||||||
.bullet {
|
|
||||||
&__wrapper {
|
|
||||||
display: inline-block;
|
|
||||||
vertical-align: middle;
|
|
||||||
min-width: 0;
|
|
||||||
max-width: 100%;
|
|
||||||
}
|
|
||||||
&__name {
|
|
||||||
border-radius: 10px;
|
|
||||||
display: inline-flex;
|
|
||||||
max-width: 100%;
|
|
||||||
background-color: var(--color-background-dark);
|
|
||||||
padding-right: 8px;
|
|
||||||
padding-left: 8px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
@ -15,7 +15,10 @@
|
||||||
</template>
|
</template>
|
||||||
<template #subname>
|
<template #subname>
|
||||||
<div class="signer-subname">
|
<div class="signer-subname">
|
||||||
<Bullet v-for="method in identifyMethodsNames" :key="method" :name="method" />
|
<NcChip v-for="method in identifyMethodsNames"
|
||||||
|
:key="method"
|
||||||
|
:text="method"
|
||||||
|
:no-close="true" />
|
||||||
<NcChip :text="signer.statusText"
|
<NcChip :text="signer.statusText"
|
||||||
:type="chipType"
|
:type="chipType"
|
||||||
:icon-path="statusIconPath"
|
:icon-path="statusIconPath"
|
||||||
|
|
@ -48,8 +51,6 @@ import NcAvatar from '@nextcloud/vue/components/NcAvatar'
|
||||||
import NcChip from '@nextcloud/vue/components/NcChip'
|
import NcChip from '@nextcloud/vue/components/NcChip'
|
||||||
import NcListItem from '@nextcloud/vue/components/NcListItem'
|
import NcListItem from '@nextcloud/vue/components/NcListItem'
|
||||||
|
|
||||||
import Bullet from '../Bullet/Bullet.vue'
|
|
||||||
|
|
||||||
import { useFilesStore } from '../../store/files.js'
|
import { useFilesStore } from '../../store/files.js'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|
@ -59,10 +60,9 @@ export default {
|
||||||
NcAvatar,
|
NcAvatar,
|
||||||
NcChip,
|
NcChip,
|
||||||
DragVertical,
|
DragVertical,
|
||||||
Bullet,
|
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
currentSigner: {
|
signerIndex: {
|
||||||
type: Number,
|
type: Number,
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
|
|
@ -94,7 +94,8 @@ export default {
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
signer() {
|
signer() {
|
||||||
return this.filesStore.getFile().signers[this.currentSigner]
|
const file = this.filesStore.getFile()
|
||||||
|
return file?.signers?.[this.signerIndex]
|
||||||
},
|
},
|
||||||
signerName() {
|
signerName() {
|
||||||
return this.signer.displayName
|
return this.signer.displayName
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
<transition-group name="signer-list" tag="div">
|
<transition-group name="signer-list" tag="div">
|
||||||
<Signer v-for="(signer, index) in sortableSigners"
|
<Signer v-for="(signer, index) in sortableSigners"
|
||||||
:key="signer.identify || index"
|
:key="signer.identify || index"
|
||||||
:current-signer="index"
|
:signer-index="index"
|
||||||
:event="event"
|
:event="event"
|
||||||
:draggable="!signer.signed">
|
:draggable="!signer.signed">
|
||||||
<template #actions="{closeActions}">
|
<template #actions="{closeActions}">
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
<ul v-else>
|
<ul v-else>
|
||||||
<Signer v-for="(signer, index) in signers"
|
<Signer v-for="(signer, index) in signers"
|
||||||
:key="signer.identify || index"
|
:key="signer.identify || index"
|
||||||
:current-signer="index"
|
:signer-index="index"
|
||||||
:event="event">
|
:event="event">
|
||||||
<template #actions="{closeActions}">
|
<template #actions="{closeActions}">
|
||||||
<slot name="actions" :signer="signer" :closeActions="closeActions" />
|
<slot name="actions" :signer="signer" :closeActions="closeActions" />
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue