Hides compound from available metadata list on filters page and better dragndrop placeholder. #17

This commit is contained in:
mateuswetah 2020-03-19 19:10:51 -03:00
parent 72950209b6
commit bbf0dc9c24
3 changed files with 19 additions and 7 deletions

View File

@ -415,7 +415,6 @@ export default {
else
this.collectionId = this.$route.params.collectionId;
this.isLoadingFilters = true;
this.isLoadingFilterTypes = true;
this.fetchFilterTypes()
@ -552,8 +551,8 @@ export default {
},
updateListOfMetadata() {
let availableMetadata = JSON.parse(JSON.stringify(this.getMetadata())) ;
let availableMetadata = JSON.parse(JSON.stringify(this.getMetadata())).filter((aMetadatum) => aMetadatum.metadata_type_object.component != 'tainacan-compound');
for (let activeFilter of this.activeFilterList) {
for (let i = availableMetadata.length - 1; i >= 0 ; i--) {
if (activeFilter.metadatum != undefined) {
@ -681,6 +680,7 @@ export default {
return 190;
},
refreshFilters() {
this.isLoadingFilters = true;
this.fetchFilters({
collectionId: this.collectionId,
isRepositoryLevel: this.isRepositoryLevel,
@ -690,6 +690,7 @@ export default {
resp.request
.then(() => {
this.isLoadingFilters = false;
this.isLoadingMetadatumTypes = true;
// Checks URL as router watcher would not wait for list to load
@ -707,7 +708,8 @@ export default {
this.fetchMetadata({
collectionId: this.collectionId,
isRepositoryLevel: this.isRepositoryLevel,
isContextEdit: true
isContextEdit: true,
parent: 'any'
}).then((resp) => {
resp.request
.then(() => {
@ -773,6 +775,10 @@ export default {
overflow-x: hidden;
overflow-y: auto;
&>section.field {
position: absolute;
}
&:not(.available-metadata-area){
margin-right: $page-side-padding;
flex-grow: 2;
@ -937,6 +943,7 @@ export default {
}
.sortable-ghost {
border: 1px dashed var(--tainacan-gray2);
background: var(--tainacan-white);
display: block;
padding: 0.7em 0.9em;
margin: 4px;
@ -995,7 +1002,7 @@ export default {
}
.icon {
position: relative;
bottom: 4px;
bottom: 6px;
}
.metadatum-name {
text-overflow: ellipsis;

View File

@ -316,7 +316,6 @@ export default {
this.cleanMetadata();
this.isLoadingMetadatumTypes = true;
this.isLoadingMetadata = true;
this.fetchMetadatumTypes()
.then(() => {
@ -475,6 +474,7 @@ export default {
this.$router.push({ query: {}});
},
refreshMetadata() {
this.isLoadingMetadata = true;
// Cancels previous Request
if (this.metadataSearchCancel != undefined)
@ -577,6 +577,10 @@ export default {
overflow-x: hidden;
overflow-y: auto;
&>section.field {
position: absolute;
}
&:not(.available-metadata-area){
margin-right: $page-side-padding;
flex-grow: 2;
@ -744,6 +748,7 @@ export default {
}
.sortable-ghost {
border: 1px dashed var(--tainacan-gray2);
background: var(--tainacan-white);
display: block;
padding: 0.7em 0.9em;
margin: 4px;

View File

@ -27,7 +27,7 @@ export const fetchMetadata = ({commit}, {collectionId, isRepositoryLevel, isCont
.then((res) => {
let metadata = res.data;
if (!isAdvancedSearch) {
if (parent == undefined || parent == null || parent <= 0)
if (parent == undefined || parent == null || parent <= 0 || parent == 'any')
commit('setMetadata', metadata);
}