diff --git a/src/views/admin/components/metadata-types/compound/child-metadata-list.vue b/src/views/admin/components/metadata-types/compound/child-metadata-list.vue index 26ce8a56b..04fc21d7d 100644 --- a/src/views/admin/components/metadata-types/compound/child-metadata-list.vue +++ b/src/views/admin/components/metadata-types/compound/child-metadata-list.vue @@ -42,6 +42,18 @@
+ + + - - - + @@ -118,6 +113,24 @@ }"> + + +
+ + +
import { mapActions } from 'vuex'; import MetadatumEditionForm from '../../edition/metadatum-edition-form.vue'; + import MetadatumDetails from '../../other/metadatum-details.vue'; import CustomDialog from '../../other/custom-dialog.vue'; export default { components: { - MetadatumEditionForm + MetadatumEditionForm, + MetadatumDetails }, props: { isRepositoryLevel: Boolean, parent: Object, isParentMultiple: Boolean, - metadataNameFilterString: String + metadataNameFilterString: String, + collapseAll: { + type: Boolean, + default: new Boolean() + } }, data() { return { @@ -209,7 +233,8 @@ hightlightedMetadatum: '', editForms: {}, metadataSearchCancel: undefined, - childrenMetadata: [] + childrenMetadata: [], + collapses: {} } }, watch: { @@ -232,6 +257,9 @@ this.childrenMetadata = []; }, immediate: true + }, + collapseAll(isCollapsed) { + this.childrenMetadata.forEach((metadatum) => this.$set(this.collapses, metadatum.id, isCollapsed)); } }, beforeRouteLeave ( to, from, next ) { @@ -397,6 +425,9 @@ isAvailableChildMetadata(to, from, item) { return !['tainacan-compound', 'tainacan-taxonomy'].includes(item.id); }, + isCollapseOpen(metadatumId) { + return this.collapses[metadatumId] == true; + } } } diff --git a/src/views/admin/components/search/filters-items-list.vue b/src/views/admin/components/search/filters-items-list.vue index ebff775c1..fed4d6533 100644 --- a/src/views/admin/components/search/filters-items-list.vue +++ b/src/views/admin/components/search/filters-items-list.vue @@ -22,11 +22,13 @@ isRepositoryLevel) || filters.length > 0)" class="link-style collapse-all" @click="collapseAll = !collapseAll"> - {{ !collapseAll ? $i18n.get('label_collapse_all') : $i18n.get('label_expand_all') }} + class="has-text-secondary tainacan-icon tainacan-icon-1-125em"/> + + + {{ !collapseAll ? $i18n.get('label_collapse_all') : $i18n.get('label_expand_all') }} @@ -495,6 +497,9 @@ .collapse-all { display: inline-flex; align-items: center; + margin-left: -0.65em; + } + .collapse-all__text { font-size: 0.75em !important; } .filters-components-list { diff --git a/src/views/admin/pages/lists/filters-page.vue b/src/views/admin/pages/lists/filters-page.vue index b2b9d33ee..94aa6e81d 100644 --- a/src/views/admin/pages/lists/filters-page.vue +++ b/src/views/admin/pages/lists/filters-page.vue @@ -18,7 +18,7 @@
-

{{ $i18n.get('filters') }}

+

{{ $i18n.get('filters') }}

@@ -873,7 +873,7 @@ export default { display: flex; align-items: center; justify-content: space-between; - padding: 0.5em; + padding: 0.5em 1em 0.5em 0.5em; .header-item { margin-left: 0.75rem; @@ -899,7 +899,6 @@ export default { .active-filters-area { font-size: 0.875em; - margin-right: 0.8em; margin-left: -0.8em; padding-right: 3em; min-height: 330px; @@ -1010,6 +1009,10 @@ export default { } } } + .active-filter-item:not(:hover) .icon-level-identifier .tainacan-icon::before, + .active-filter-item:hover.not-sortable-item .icon-level-identifier .tainacan-icon::before { + color: var(--tainacan-gray3) !important; + } .active-filter-item:hover:not(.not-sortable-item) { background-color: var(--tainacan-turquoise1); border-color: var(--tainacan-turquoise1); @@ -1090,7 +1093,7 @@ export default { font-weight: bold; margin-left: 0.4em; display: inline-block; - width: calc(100% - 80px); + width: calc(100% - 60px); } &:after, &:before { @@ -1134,6 +1137,10 @@ export default { position: relative; top: 2px; } + .available-metadatum-item:not(:hover) .icon-level-identifier .tainacan-icon::before, + .available-filter-item:hover.not-sortable-item .icon-level-identifier .tainacan-icon::before { + color: var(--tainacan-gray3) !important; + } .available-metadatum-item:not(.disabled-metadatum):hover{ background-color: var(--tainacan-turquoise1); border-color: var(--tainacan-turquoise2); @@ -1155,7 +1162,7 @@ export default { .inherited-filter { &.active-filter-item:hover:not(.not-sortable-item) { background-color: var(--tainacan-blue1); - border-color: var(--tainacan-blue1); + border-color: var(--tainacan-blue2); .grip-icon { color: var(--tainacan-blue5) !important; diff --git a/src/views/admin/pages/lists/metadata-page.vue b/src/views/admin/pages/lists/metadata-page.vue index 8affe3830..e07441749 100644 --- a/src/views/admin/pages/lists/metadata-page.vue +++ b/src/views/admin/pages/lists/metadata-page.vue @@ -19,57 +19,12 @@ ref="metadataEditionPageColumns"> -
+
-

{{ $i18n.get('metadata') }}

+

{{ $i18n.get('metadata') }}

-