Skip to content

Commit eb27681

Browse files
committed
Merge branch 'fix/new-tools-model'
2 parents 5cbaf6b + 667fac8 commit eb27681

3 files changed

Lines changed: 5 additions & 10 deletions

File tree

components/observatory/evaluation/Metadata/MetadataEdit.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<v-container>
33
<v-expansion-panels v-model="open_panels" multiple>
4-
<v-expansion-panel>
4+
<v-expansion-panel class="flex-grow-0">
55
<v-expansion-panel-header>
66
<PanelHeader
77
title="0. Identity"
@@ -47,7 +47,6 @@
4747
/>
4848
</template>
4949
</MetaField>
50-
5150
<!-- Version -->
5251
<MetaField
5352
title="Version"
@@ -59,7 +58,7 @@
5958
<template #inputField>
6059
<VersionCombo
6160
field="version"
62-
:selected-version="toolMetadata.version"
61+
:initial-selected-version="toolMetadata.version"
6362
:versions="toolMetadata.other_versions"
6463
/>
6564
</template>

components/observatory/evaluation/Observatory/ToolSearchRow.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
<v-chip label color="blue lighten-5">
33
<span class="font-weight-medium text-body-2">{{ data.item.label }}</span>
44
<v-chip
5+
v-for="(type, i) in data.item.types || []"
6+
:key="`${data.item.label}-type-${i}-${type}`"
57
label
68
dense
79
small
810
color="white"
911
text-color="grey darken-3"
1012
class="text-caption ml-3"
1113
>
12-
{{ data.item.type.toUpperCase() }}
14+
{{ String(type).toUpperCase() }}
1315
</v-chip>
1416
</v-chip>
1517

store/observatory/evaluation/metadata.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,6 @@ export const actions = {
140140
return el != null;
141141
});
142142

143-
// version as one string
144-
result.other_versions = result.version.filter((val) => val != null);
145-
result.version = result.version[0];
146-
147143
// New filed e_infrastructures as array of strings
148144
const eInfrastructures = {
149145
galaxy: 'usegalaxy',
@@ -194,8 +190,6 @@ export const actions = {
194190
payload
195191
);
196192

197-
console.debug(result);
198-
199193
commit('setMetadataCFF', result);
200194
},
201195

0 commit comments

Comments
 (0)