Skip to content
Snippets Groups Projects
Commit e63a3bd3 authored by Remi  PLANEL's avatar Remi PLANEL
Browse files

Merge branch 'dev'

parents cd848bf7 38c32878
No related branches found
No related tags found
No related merge requests found
Pipeline #117917 failed
...@@ -17,6 +17,7 @@ const props = withDefaults(defineProps<Props>(), { ...@@ -17,6 +17,7 @@ const props = withDefaults(defineProps<Props>(), {
}); });
const show = ref(false); const show = ref(false);
...@@ -37,12 +38,12 @@ const show = ref(false); ...@@ -37,12 +38,12 @@ const show = ref(false);
</span> </span>
<span v-else class="d-flex flex-wrap align-center justify-start"> <span v-else class="d-flex flex-wrap align-center justify-start">
<template v-for="(item, index) in items" :key="item.title"> <template v-for="(item, index) in items" :key="item.title">
<v-chip v-if="index < itemsToDisplay || itemsToDisplay < 0" :href="item?.href" <v-chip v-if="index < itemsToDisplay || itemsToDisplay < 0 || items.length - itemsToDisplay === 1" :href="item?.href"
:target="item?.href === undefined ? item?.href : '_blank'" color="info" class="mr-1 my-1 align-self-center" :target="item?.href === undefined ? item?.href : '_blank'" color="info" class="mr-1 my-1 align-self-center"
size="small"> size="small">
{{ item.title }} {{ item.title }}
</v-chip> </v-chip>
<template v-if="index === itemsToDisplay"> <template v-if="index === itemsToDisplay && items.length - itemsToDisplay > 1">
<v-chip v-if="!show" variant="text" class="text-grey text-caption align-self-center px-1" <v-chip v-if="!show" variant="text" class="text-grey text-caption align-self-center px-1"
@click="show = !show"> @click="show = !show">
(+{{ items.length - itemsToDisplay }} others) (+{{ items.length - itemsToDisplay }} others)
......
...@@ -173,7 +173,7 @@ watch(filterInputValues, (newSoF) => { ...@@ -173,7 +173,7 @@ watch(filterInputValues, (newSoF) => {
if (isFilter.value && filterInputValues.value !== null && filterInputValues.value?.length % 3 === 0) { if (isFilter.value && filterInputValues.value !== null && filterInputValues.value?.length % 3 === 0) {
msFilter.value = filterInputValues.value.map((it, index) => { msFilter.value = filterInputValues.value.map((it, index) => {
const sanitizedValue = it.value.split("-")[0] const sanitizedValue = it.value.split("-").slice(0, -1).join("-")
if (index >= 1 && (index + 1) % 3 === 1) { if (index >= 1 && (index + 1) % 3 === 1) {
return ` AND ${sanitizedValue}` return ` AND ${sanitizedValue}`
} else if ((index + 1) % 3 === 0) { } else if ((index + 1) % 3 === 0) {
......
...@@ -13,7 +13,9 @@ const { width } = useDisplay(); ...@@ -13,7 +13,9 @@ const { width } = useDisplay();
const distriTool: Ref<string[]> = ref([]) const distriTool: Ref<string[]> = ref([])
const facets = ref([ const facets = ref([
"replicon",
"type", "type",
"subtype",
"Superkingdom", "Superkingdom",
"phylum", "phylum",
"order", "order",
...@@ -43,7 +45,8 @@ const headers = ref([ ...@@ -43,7 +45,8 @@ const headers = ref([
}, },
{ {
title: "Accessions", title: "Accessions",
key: "accession_in_sys" key: "accession_in_sys",
sortable: false
} }
]) ])
const logTransform = computed(() => { const logTransform = computed(() => {
......
...@@ -86,6 +86,7 @@ def update_refseq( ...@@ -86,6 +86,7 @@ def update_refseq(
index.update_pagination_settings({"maxTotalHits": 1000000}) index.update_pagination_settings({"maxTotalHits": 1000000})
index.update_filterable_attributes( index.update_filterable_attributes(
body=[ body=[
"replicon",
"type", "type",
"subtype", "subtype",
"Superkingdom", "Superkingdom",
...@@ -98,6 +99,7 @@ def update_refseq( ...@@ -98,6 +99,7 @@ def update_refseq(
) )
index.update_sortable_attributes( index.update_sortable_attributes(
[ [
"replicon",
"type", "type",
"subtype", "subtype",
"Superkingdom", "Superkingdom",
...@@ -113,7 +115,6 @@ def update_refseq( ...@@ -113,7 +115,6 @@ def update_refseq(
"sortFacetValuesBy": {"*": "count"}, "sortFacetValuesBy": {"*": "count"},
} }
index.update_faceting_settings(params) index.update_faceting_settings(params)
print("typo toler")
index.update_typo_tolerance( index.update_typo_tolerance(
{ {
"enabled": False "enabled": False
...@@ -154,12 +155,25 @@ def update_structure( ...@@ -154,12 +155,25 @@ def update_structure(
"plddts", "plddts",
] ]
) )
params = {
"maxValuesPerFacet": 1000000,
"sortFacetValuesBy": {"*": "count"},
}
index.update_faceting_settings(params)
print(attr_task) print(attr_task)
index.update_sortable_attributes( index.update_sortable_attributes(
[ [
"system", "system",
"completed", "completed",
"plddts", "plddts",
"nb_sys",
"completed",
"prediction_type",
"system_number_of_genes",
"iptm+ptm",
"pDockQ",
"type",
] ]
) )
index.update_typo_tolerance({"enabled": False}) index.update_typo_tolerance({"enabled": False})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment