tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Final adjustments to conditinal metadata section handling arrays.

This commit is contained in:
mateuswetah 2023-11-20 15:00:00 -03:00
parent f60755ed92
commit 19e1f52917
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/admin/components/edition/metadata-section-edition-form.vue
View File

@ -210,7 +210,7 @@
:is="selectedConditionalMetadatum.metadata_type_object.component" :is="selectedConditionalMetadatum.metadata_type_object.component"
:forced-component-type="selectedConditionalMetadatum.metadata_type_object.component.includes('taxonomy') ? 'tainacan-taxonomy-tag-input' : ''" :forced-component-type="selectedConditionalMetadatum.metadata_type_object.component.includes('taxonomy') ? 'tainacan-taxonomy-tag-input' : ''"
:item-metadatum="{ metadatum: selectedConditionalMetadatum }" :item-metadatum="{ metadatum: selectedConditionalMetadatum }"
:value="selectedConditionalValue" :value="Array.isArray(selectedConditionalValue) ? selectedConditionalValue[0] : selectedConditionalValue"
:allow-new="false" :allow-new="false"
:maxtags="1" :maxtags="1"
@input="selectConditionalValue" @input="selectConditionalValue"

11
src/views/admin/components/metadata-types/taxonomy/Taxonomy.vue
View File

@ -184,14 +184,15 @@
this.valueComponent = (values.length > 0 && this.itemMetadatum.metadatum && this.itemMetadatum.metadatum.multiple === 'no') ? values[0] : values; this.valueComponent = (values.length > 0 && this.itemMetadatum.metadatum && this.itemMetadatum.metadatum.multiple === 'no') ? values[0] : values;
} else if (this.value && this.itemMetadatum.metadatum && this.getComponent == 'tainacan-taxonomy-tag-input') { } else if (this.value && this.itemMetadatum.metadatum && this.getComponent == 'tainacan-taxonomy-tag-input') {
// This first scenario happens in the item edition form, as the item metadata returns the terms as objects // This first scenario happens in the item edition form, as the item metadata returns the terms as objects
if ( this.value[0] && this.value[0] && this.value[0].id ) { const valuesInArray = Array.isArray(this.value) ? this.value : [this.value];
values = this.value.map((term) => { return { label: term.name, value: term.id } }); if ( valuesInArray[0] && valuesInArray[0] && valuesInArray[0].id ) {
values = valuesInArray.map((term) => { return { label: term.name, value: term.id } });
this.valueComponent = values; this.valueComponent = values;
// If the term is not returned as object, we're in bulk edition modal or in the metadata section condition metadata input, where value is a an array of IDs // If the term is not returned as object, we're in bulk edition modal or in the metadata section condition metadata input, where value is a an array of IDs
} else if ( this.value.length ) { } else if ( valuesInArray.length > 0 ) {
this.isFetchingTerms = true; this.isFetchingTerms = true;
this.fetchTerms({ this.fetchTerms({
taxonomyId: this.taxonomyId, taxonomyId: this.taxonomyId,
@ -202,7 +203,7 @@
} }
}, },
all: true, all: true,
include: this.value include: valuesInArray
}).then((res) => { }).then((res) => {
values = res.terms.map((term) => { return { label: term.name, value: term.id } }); values = res.terms.map((term) => { return { label: term.name, value: term.id } });
this.valueComponent = values; this.valueComponent = values;