Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DK vision genomics update #767

Merged
merged 2 commits into from
Oct 29, 2024
Merged

DK vision genomics update #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8e3ba8
in-section search label
dkjang Oct 29, 2024
6c06c21
Grouped tabs option added to BYOR visualizers
dkjang Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/components/researchPortal/ResearchMultiSectionsSearch.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<h4 class="card-title">Build search criteria</h4>
<div class="filtering-ui-content row">
<div class="col" :class="!!parameter.display && parameter.display == 'false' ? 'hidden-search' : ''"
:type="!!parameter['in-section search']? 'in-section search':''"
v-for="parameter, paramIndex in searchParameters" :key="parameter.parameter">
<div class="label">
<span v-html="parameter.label"></span>
Expand Down
61 changes: 57 additions & 4 deletions src/components/researchPortal/ResearchSection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
"><b-icon icon="arrow-right-circle"></b-icon></span>
</form>
</div>

<!-- viz tabs-->
<template v-if="!!multiVisualizers && !!sectionData && multiVisualizersType == 'tabs'">
<div class="sub-tab-ui-wrapper" :id="'tabUiGroup' + sectionID">
<div v-for="tab, tabIndex in multiVisualizers" :id="'tabUi' + sectionID + tabIndex"
Expand All @@ -167,14 +167,56 @@
</div>
</div>
</template>
<div v-if="!!multiVisualizers && !!sectionData"

<!-- viz tab groups -->
<template v-if="!!vizGroups && !!sectionData && multiVisualizersType == 'grouped tabs'">
<div class="sub-tab-ui-wrapper" :id="'tabUiGroup' + sectionID">
<div v-for="tab, tabIndex in vizGroups" :id="'tabUi' + sectionID + tabIndex"
class="tab-ui-tab" :class="tabIndex == 0 ? 'active' : ''" @click="utils.uiUtils.setTabActive('tabUi' + sectionID + tabIndex,
'tabUiGroup' + sectionID,
'tabContent' + sectionID + tabIndex, 'tabContentGroup' + sectionID, true)">
{{ utils.Formatters.replaceWithParams(tab.label, pageParams) }}
</div>
</div>
</template>

<!-- viz in grouped tabs -->
<div v-if="!!vizGroups && !!sectionData && multiVisualizersType == 'grouped tabs'"
:id="multiVisualizersType == 'grouped tabs' ? 'tabContentGroup' + sectionID : ''">

<div v-for="group, groupIndex in vizGroups"
:id="'tabContent' + sectionID + groupIndex"
class="plot-tab-content-wrapper"
:class="(groupIndex == 0) ? '' : 'hidden-content'">
<!-- visualizers in group -->

<div v-for="plotConfig, plotIndex in group.visualizers"
class="plot-content-wrapper">
<h6 v-html="utils.Formatters.replaceWithParams(plotConfig.label, pageParams)"></h6>
<research-section-visualizers
:plotConfig="plotConfig"
:plotData="(!groups || (!!groups && groups.length <= 1) || !dataComparisonConfig) ? sectionData : mergedData"
:phenotypeMap="phenotypeMap" :colors="colors" :plotMargin="plotMargin"
:plotLegend="getSectionPlotLegend(sectionID + groupIndex + '_' + plotIndex)" :sectionId="sectionID + groupIndex + '_' + plotIndex"
:utils="utils" :dataComparisonConfig="dataComparisonConfig"
:searchParameters="groupSearchParameters" :regionZoom="regionZoom"
:regionViewArea="regionViewArea" :region="regionParam" :starItems="starItems"
@on-star="starColumn">
</research-section-visualizers>
</div>
</div>
</div>


<!-- viz as individual tabs-->
<div v-if="!!multiVisualizers && !!sectionData && (multiVisualizersType == 'tabs' || multiVisualizersType == 'divs')"
:id="multiVisualizersType == 'tabs' ? 'tabContentGroup' + sectionID : ''">

<div v-for="plotConfig, plotIndex in multiVisualizers"
:id="multiVisualizersType == 'tabs' ? 'tabContent' + sectionID + plotIndex : ''"
class="plot-tab-content-wrapper"
:class="(multiVisualizersType == 'tabs') ? (plotIndex == 0) ? '' : 'hidden-content' : ''">
<h6 v-html="plotConfig.label" v-if="multiVisualizersType != 'tabs'"></h6>
<h6 v-html="utils.Formatters.replaceWithParams(plotConfig.label, pageParams)" v-if="multiVisualizersType != 'tabs'"></h6>
<research-section-visualizers :plotConfig="plotConfig"
:plotData="(!groups || (!!groups && groups.length <= 1) || !dataComparisonConfig) ? sectionData : mergedData"
:phenotypeMap="phenotypeMap" :colors="colors" :plotMargin="plotMargin"
Expand Down Expand Up @@ -390,7 +432,7 @@ export default Vue.component("research-section", {
},
multiVisualizers() {
if (!!this.sectionData) {
if (!!this.sectionConfig["visualizers"]) {
if (!!this.sectionConfig["visualizers"] && this.sectionConfig["visualizers"]["wrapper type"] != "grouped tabs") {
return this.sectionConfig["visualizers"]["visualizers"];
} else {
return null;
Expand All @@ -399,6 +441,17 @@ export default Vue.component("research-section", {
return null
}
},
vizGroups() {
if (!!this.sectionData) {
if (!!this.sectionConfig["visualizers"] && this.sectionConfig["visualizers"]["wrapper type"] == "grouped tabs") {
return this.sectionConfig["visualizers"]["groups"];
} else {
return null;
}
} else {
return null
}
},
multiVisualizersType() {
if (!!this.sectionData) {
if (!!this.sectionConfig["visualizers"]) {
Expand Down
1 change: 1 addition & 0 deletions src/views/Papers/Research/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ new Vue({
this.sectionConfigs.sections.map((section) => {
if (!!section["search parameters"]) {
section["search parameters"].map((s) => {
s["in-section search"] = true;
parameters.push(s);
});
}
Expand Down
Loading