Various fixes for BMT search [SCI-6077] (#3673)

* Various fixes for BMT search [SCI-6077]

* Add vue linter support [SCI-6077]
This commit is contained in:
artoscinote 2022-01-25 12:28:38 +01:00 committed by GitHub
parent 86b26cfade
commit 790451c96f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 6 deletions

View file

@ -6,7 +6,7 @@
"node": true
},
"plugins": ["flowtype", "react", "prettier"],
"extends": ["airbnb", "prettier", "prettier/react"],
"extends": ["airbnb", "prettier", "prettier/react", "plugin:vue/base"],
"parser": "babel-eslint",
"parserOptions": {
"sourceType": "module",

View file

@ -134,7 +134,8 @@
},
fetchAdditionalDataAttributes() {
$.get(this.bmtApiBaseUrl + '/admin/macromolecules/attributes', (data) => {
this.additionalDataAttributes = data
// Cid filter works as a special filter, not as additional data
this.additionalDataAttributes = data.filter((a) => a.name != 'Cid')
});
},
loadFilters(filters) {

View file

@ -3,7 +3,6 @@
<b class='filter-title'>Filter</b>
<div class="filter-element">
<div class="form-group filter-action">
<div class="sci-input-container">
<DropdownSelector
:options="typeOptions"
@ -29,6 +28,7 @@
</template>
<script>
// Filter types
import additionalDataFilter from 'vue/bmt_filter/filters/additionalDataFilter.vue'
import entityTypeFilter from 'vue/bmt_filter/filters/entityTypeFilter.vue'
import monomerTypeFilter from 'vue/bmt_filter/filters/monomerTypeFilter.vue'
@ -36,6 +36,9 @@
import variantSequenceFilter from 'vue/bmt_filter/filters/variantSequenceFilter.vue'
import fullsequenceFilter from 'vue/bmt_filter/filters/fullsequenceFilter.vue'
import monomerSubstructureSearchFilter from 'vue/bmt_filter/filters/monomerSubstructureSearchFilter.vue'
import cidFilter from 'vue/bmt_filter/filters/cidFilter.vue'
// Other components
import DropdownSelector from 'vue/shared/dropdown_selector.vue'
export default {
@ -52,7 +55,8 @@
'subsequenceFilter',
'variantSequenceFilter',
'fullsequenceFilter',
'monomerSubstructureSearchFilter'
'monomerSubstructureSearchFilter',
'cidFilter'
]
}
},
@ -64,6 +68,7 @@
variantSequenceFilter,
fullsequenceFilter,
monomerSubstructureSearchFilter,
cidFilter,
DropdownSelector
},
computed: {
@ -83,12 +88,12 @@
}
);
},
updateFilter(value) {
updateFilter(data) {
this.$emit(
'filter:update',
{
id: this.filter.id,
data: value
data: data
}
);
}

View file

@ -0,0 +1,25 @@
<template>
<div class="filter-form">
<input
@input="updateFilterData"
class="form-control"
type="text"
name="cid"
v-model="cid"
:placeholder="i18n.t('repositories.show.bmt_search.filters.types.cidFilter.placeholder')"
/>
</div>
</template>
<script>
import FilterMixin from 'vue/bmt_filter/mixins/filter.js'
export default {
name: 'cidFilter',
mixins: [FilterMixin],
data() {
return {
cid: ""
}
}
}
</script>

View file

@ -1502,6 +1502,9 @@ en:
monomerSubstructureSearchFilter:
name: "Monomere substructure"
placeholder: "Enter substructure"
cidFilter:
name: "Cid"
placeholder: "Enter Cid"
table:
id: 'ID'
external_id: 'External ID'