Skip to content

Commit c8eacbe

Browse files
authored
Merge pull request #4098 from LibreSign/fix/consider-filter-to-toggle-components
fix: consider filter status to toggle components
2 parents 12f8a00 + e9e207e commit c8eacbe

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

src/views/FilesList/FilesList.vue

+4-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
class="files-list__loading-icon"
4242
:size="38"
4343
:name="t('libresign', 'Loading …')" />
44-
<NcEmptyContent v-else-if="!loading && isEmptyDir"
44+
<NcEmptyContent v-else-if="!loading && isEmptyDir && filtersStore.activeChips.length === 0"
4545
:name="t('libresign', 'There are no documents')"
4646
:description="t('libresign', 'Choose the file to request signatures.')">
4747
<template #action>
@@ -79,6 +79,7 @@ import FilesListVirtual from './FilesListVirtual.vue'
7979
import RequestPicker from '../../Components/Request/RequestPicker.vue'
8080

8181
import { useFilesStore } from '../../store/files.js'
82+
import { useFiltersStore } from '../../store/filters.js'
8283
import { useUserConfigStore } from '../../store/userconfig.js'
8384

8485
export default {
@@ -99,9 +100,11 @@ export default {
99100
},
100101
setup() {
101102
const filesStore = useFilesStore()
103+
const filtersStore = useFiltersStore()
102104
const userConfigStore = useUserConfigStore()
103105
return {
104106
filesStore,
107+
filtersStore,
105108
userConfigStore,
106109
}
107110
},

src/views/FilesList/FilesListTableFooter.vue

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- SPDX-License-Identifier: AGPL-3.0-or-later
44
-->
55
<template>
6-
<tr v-show="haveFiles">
6+
<tr v-show="haveFiles || filtersStore.activeChips.length > 0">
77
<th class="files-list__row-checkbox">
88
<!-- TRANSLATORS Label for a table footer which summarizes the columns of the table -->
99
<span class="hidden-visually">{{ t('libresign', 'Total rows summary') }}</span>
@@ -25,13 +25,16 @@
2525

2626
<script>
2727
import { useFilesStore } from '../../store/files.js'
28+
import { useFiltersStore } from '../../store/filters.js'
2829

2930
export default {
3031
name: 'FilesListTableFooter',
3132
setup() {
3233
const filesStore = useFilesStore()
34+
const filtersStore = useFiltersStore()
3335
return {
3436
filesStore,
37+
filtersStore,
3538
}
3639
},
3740
computed: {

src/views/FilesList/FilesListTableHeader.vue

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
- SPDX-License-Identifier: AGPL-3.0-or-later
44
-->
55
<template>
6-
<tr class="files-list__row-head">
6+
<tr v-if="filesStore.ordered.length > 0"
7+
class="files-list__row-head">
78
<th class="files-list__column files-list__row-checkbox"
89
@keyup.esc.exact="resetSelection">
910
<NcCheckboxRadioSwitch v-bind="selectAllBind" @update:checked="onToggleAll" />
@@ -101,6 +102,7 @@ export default {
101102
},
102103
isAllSelected() {
103104
return this.selectedNodes.length === this.filesStore.ordered.length
105+
&& this.filesStore.ordered.length > 0
104106
},
105107
isNoneSelected() {
106108
return this.selectedNodes.length === 0

0 commit comments

Comments
 (0)