diff --git a/client/src/components/home/HomeRoadmap.vue b/client/src/components/home/HomeRoadmap.vue index a16b84a9..a87d08fc 100644 --- a/client/src/components/home/HomeRoadmap.vue +++ b/client/src/components/home/HomeRoadmap.vue @@ -146,7 +146,14 @@

First release

Add data, release version.

-
+
+
+ +
+

RNA types

+

Add tRNA.

+
+
diff --git a/client/src/presets/windscm/radiobutton/index.js b/client/src/presets/windscm/radiobutton/index.js index d9d4521e..fbf962b7 100644 --- a/client/src/presets/windscm/radiobutton/index.js +++ b/client/src/presets/windscm/radiobutton/index.js @@ -36,21 +36,32 @@ export default { { 'text-surface-700 dark:text-white/80': props.value !== props.modelValue && props.value !== undefined, - 'bg-surface-0 dark:bg-surface-900': - props.value !== props.modelValue && props.value !== undefined, + // 'bg-surface-0 dark:bg-surface-900': + // props.value !== props.modelValue && props.value !== undefined, 'border-surface-300 dark:border-surface-700': props.value !== props.modelValue && props.value !== undefined, - 'border-primary-500 dark:border-primary-400': + 'bg-primary-500 border-primary-500 dark:bg-primary-400 dark:border-primary-400': props.value == props.modelValue && props.value !== undefined }, - // States { - 'outline-none outline-offset-0': !props.disabled, - 'peer-focus-visible:ring-2 peer-focus-visible:ring-offset-2 peer-focus-visible:ring-offset-surface-0 dark:focus-visible:ring-offset-surface-800 peer-focus-visible:ring-primary-500 dark:peer-focus-visible:ring-primary-400': + 'peer-hover:border-surface-400 dark:peer-hover:border-surface-400': + !props.disabled && !props.invalid && props.value !== props.modelValue, + 'peer-hover:border-primary-hover': + !props.disabled && props.value == props.modelValue && props.value !== void 0, + 'peer-hover:[&>*:first-child]:bg-primary-600 dark:peer-hover:[&>*:first-child]:bg-primary-300': + !props.disabled && props.value == props.modelValue && props.value !== void 0, + 'peer-focus-visible:ring-1 peer-focus-visible:ring-primary-500 dark:peer-focus-visible:ring-primary-400': !props.disabled, - 'opacity-60 cursor-default': props.disabled + 'bg-surface-200 [&>*:first-child]:bg-surface-600 dark:bg-surface-700 dark:[&>*:first-child]:bg-surface-400 border-surface-300 dark:border-surface-700 select-none pointer-events-none cursor-default': + props.disabled } + // { + // 'outline-none outline-offset-0': !props.disabled, + // 'peer-focus-visible:ring-2 peer-focus-visible:ring-offset-2 peer-focus-visible:ring-offset-surface-0 dark:focus-visible:ring-offset-surface-800 peer-focus-visible:ring-primary-500 dark:peer-focus-visible:ring-primary-400': + // !props.disabled, + // 'opacity-60 cursor-default': props.disabled + // } ] }), input: { diff --git a/client/src/utils/selection.js b/client/src/utils/selection.js index a10a8c46..b2375400 100644 --- a/client/src/utils/selection.js +++ b/client/src/utils/selection.js @@ -5,7 +5,7 @@ import { toTree, toCascade, nestedSort, toIds } from '@/utils/index.js' export const updModification = (selection) => { // update modification // grouped Dropdown works with one child tree - let tree = toTree(selection, ['rna', 'modomics_sname'], 'modification_id') + let tree = toTree(selection, ['rna_name', 'modomics_sname'], 'modification_id') nestedSort(tree, ['children']) return tree } @@ -58,6 +58,7 @@ export const updSelectionFromAll = (selection, slctMod, slctOrg, slctTech) => { ) let selection_id = opts.map((item) => item.selection_id) let taxid = [...new Set(opts.map((item) => item.taxa_id))] + // there should be only one RNA type, bt we don't check... let rna = [...new Set(opts.map((item) => item.rna))] return { selection: selection_id, technology: idsTech, taxid: taxid[0], rna: rna[0] } } diff --git a/client/src/views/BrowseView.vue b/client/src/views/BrowseView.vue index c62f63c5..138e3944 100644 --- a/client/src/views/BrowseView.vue +++ b/client/src/views/BrowseView.vue @@ -33,11 +33,11 @@ const initFilters = (defaultGlobal) => { }, modomics_sname: { operator: FilterOperator.AND, - constraints: [{ value: null, matchMode: FilterMatchMode.CONTAINS }] + constraints: [{ value: null, matchMode: FilterMatchMode.EQUALS }] }, tech: { operator: FilterOperator.AND, - constraints: [{ value: null, matchMode: FilterMatchMode.CONTAINS }] + constraints: [{ value: null, matchMode: FilterMatchMode.EQUALS }] }, taxa_sname: { operator: FilterOperator.AND, @@ -45,11 +45,6 @@ const initFilters = (defaultGlobal) => { }, cto: { operator: FilterOperator.AND, - constraints: [{ value: null, matchMode: FilterMatchMode.CONTAINS }] - }, - // access: { value: null, matchMode: FilterMatchMode.IN }, - access: { - operator: FilterOperator.OR, constraints: [{ value: null, matchMode: FilterMatchMode.EQUALS }] } } @@ -108,8 +103,7 @@ onMounted(() => { 'modomics_sname', 'tech', 'taxa_sname', - 'cto', - 'access' + 'cto' ]" paginatorTemplate="FirstPageLink PrevPageLink CurrentPageReport NextPageLink LastPageLink RowsPerPageDropdown" :rowsPerPageOptions="[5, 10, 25]" diff --git a/client/src/views/CompareView.vue b/client/src/views/CompareView.vue index 62641d94..530af6d7 100644 --- a/client/src/views/CompareView.vue +++ b/client/src/views/CompareView.vue @@ -201,7 +201,7 @@ const tablePt = {