Skip to content

Commit

Permalink
Merge pull request #225 from unipept/fix/minor-issues-v2.1
Browse files Browse the repository at this point in the history
Fix minor issues v2.1
  • Loading branch information
pverscha authored Nov 7, 2023
2 parents 5946a62 + ecc28fe commit d3edb58
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 10 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "unipept-web-components",
"version": "2.1.0",
"version": "2.1.2",
"scripts": {
"dev": "vite",
"build": "vue-tsc --emitDeclarationOnly && vite build && tsc --emitDeclarationOnly && tsc-alias && rm -rf types/test types/plugins types/main.d.ts",
Expand Down
2 changes: 2 additions & 0 deletions src/components/analysis/SinglePeptideSummary.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<a
:href="taxonomyUrl(lca(assay))"
target="_blank"
class="link primary--text"
>
{{ lca(assay)?.name }}
</a> ({{ lca(assay)?.rank }}).
Expand All @@ -42,6 +43,7 @@
v-if="node"
:href="`https://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?mode=Info&id=${node.id}`"
target="_blank"
class="link primary--text"
>
{{ node.name }}
</a>
Expand Down
5 changes: 3 additions & 2 deletions src/components/cards/EcSummaryCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<v-card-text>
<v-row v-if="!analysisInProgress">
<v-col>
<TrustLine
<trust-line
class="mb-5"
:trust="ecProcessor.getTrust()"
:fa-kind="{
Expand All @@ -23,7 +23,8 @@
>
<v-btn
icon="mdi-cog-outline"
color="grey-darken-1"
size="small"
variant="text"
@click="editFilterPercentageModalOpen = true"
/>
</v-col>
Expand Down
3 changes: 2 additions & 1 deletion src/components/cards/InterproSummaryCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
>
<v-btn
icon="mdi-cog-outline"
color="grey-darken-1"
size="small"
variant="text"
@click="editFilterPercentageModalOpen = true"
/>
</v-col>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="flex-grow-0"
/>

<DataSourceMultiTable
<data-source-table
:items="selectedDataSourceItems"
:categories="categories"
:loading="loading"
Expand All @@ -24,6 +24,7 @@ import { Ontology, NcbiTaxon, NcbiRank, EcNamespace, GoNamespace, InterproNamesp
import DataSourceMultiTable from './DataSourceMultiTable.vue';
import MultiProteomicsAnalysisStatus from '@/interface/MultiProteomicsAnalysisStatus';
import DataSourceMultiItem from './DataSourceMultiItem';
import DataSourceTable from "@/components/tables/DataSourceTable.vue";
export interface Props {
loading: boolean
Expand Down
17 changes: 12 additions & 5 deletions src/components/visualizations/heatmap/multi/HeatmapWizardMulti.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,45 @@
>
<v-stepper-header>
<v-stepper-item
color="primary"
editable
title="Horizontal axis"
:value="1"
:complete="currentStep > 1"
step="1"
/>
<v-divider />
<v-stepper-item
color="primary"
editable
title="Normalization"
:value="2"
:complete="currentStep > 2"
step="2"
/>
<v-divider />
<v-stepper-item
color="primary"
editable
title="Heatmap"
:value="3"
:complete="currentStep > 3"
step="3"
/>
</v-stepper-header>
<v-stepper-window>
<v-stepper-window-item :value="1">
<DataSourceMulti
<data-source-multi
:loading="loading"
:assays="assays"
@select="verticalItems = $event"
/>
</v-stepper-window-item>
<v-stepper-window-item :value="2">
<NormalizationSelector @update="normalizer = $event" />
<normalization-selector @update="normalizer = $event" />
</v-stepper-window-item>
<v-stepper-window-item :value="3">
<VisualizationControls
<visualization-controls
ref="heatmap"
caption="Scroll to zoom, drag to pan"
:loading="heatMapLoading"
Expand All @@ -50,7 +56,7 @@
overlap
>
<template #visualization>
<HeatMap
<heat-map
:data="heatmapData"
:row-labels="heatmapRows"
:column-labels="heatmapColumns"
Expand All @@ -64,7 +70,7 @@
@download="downloadModalOpen = $event"
/>
</template>
</VisualizationControls>
</visualization-controls>
</v-stepper-window-item>
</v-stepper-window>
<v-stepper-actions
Expand All @@ -85,6 +91,7 @@ import NormalizationSelector from '../NormalizationSelector.vue';
import DataSourceMulti from './DataSourceMulti.vue';
import DataSourceMultiItem from './DataSourceMultiItem';
import MultiProteomicsAnalysisStatus from "@/interface/MultiProteomicsAnalysisStatus";
import { VStepper, VStepperActions, VStepperHeader, VStepperItem, VStepperWindow, VStepperWindowItem } from 'vuetify/labs/VStepper';
export interface Props {
loading: boolean
Expand Down

0 comments on commit d3edb58

Please sign in to comment.