Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Estelle/controlled keywords #243

Merged
merged 19 commits into from
Aug 22, 2024
Merged

Estelle/controlled keywords #243

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a105ee9
Draft. Haven't modified Home page score set Highlights Keywords secti…
EstelleDa Apr 23, 2024
022f755
Remove keyword from score set
EstelleDa Apr 29, 2024
263f3b8
Merge remote-tracking branch 'origin/release-2024.1.2' into estelle/c…
EstelleDa May 22, 2024
223dd35
Draft of new controlled keywords
EstelleDa Jun 11, 2024
4dcf4bd
Modify controlled keywords part and remove keywords from creating sco…
EstelleDa Jun 24, 2024
7959c3d
Fix a wrong import
EstelleDa Jun 25, 2024
b160a7a
Modify editing function to handle empty keywords case. Will change it…
EstelleDa Jun 26, 2024
0cb4e08
Handle partial saving keywords and empty keyword list cases.
EstelleDa Jun 27, 2024
cccc9a5
Simplify resetKeywords codes.
EstelleDa Jul 2, 2024
fd88b25
Modify UI
EstelleDa Jul 11, 2024
bb2e7f4
Improve button appearance.
ashsny Jul 12, 2024
7a77572
Simplify codes and add features
EstelleDa Jul 19, 2024
7cc846d
Simplified codes but can't show validation error msg correctly yet.
EstelleDa Jul 29, 2024
4699077
Modified codes and debug
EstelleDa Aug 2, 2024
0663a7b
Remove unnecessary console.
EstelleDa Aug 20, 2024
34c527f
minimal keyword searching
bencap Aug 21, 2024
af70f15
Merge branch 'bencap/keywordSearch' into estelle/controlledKeywords
EstelleDa Aug 21, 2024
841ae33
Remove old keywords from Home page
EstelleDa Aug 21, 2024
ee497c1
Change Config URLs Away from Localhost
bencap Aug 21, 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
17 changes: 2 additions & 15 deletions src/components/common/HighlightsView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,6 @@
:href="`${config.appBaseUrl}/#/publication-identifiers/${slotProps.data.dbName}/${slotProps.data[col.field]}`">{{
slotProps.data[col.field] }}</a>
</template>
<!-- Link keywords and Doi Identifiers to an internal MaveDB search page -->
<template v-else-if="this.field == 'keywords' && col.field == 'column'" #body="slotProps">
<a :href="`${config.appBaseUrl}/#/search?search=${slotProps.data[col.field]}`">{{
slotProps.data[col.field] }}</a>
</template>
<template v-else-if="this.field == 'doi-identifiers' && col.field == 'identifier'" #body="slotProps">
<a :href="`${config.appBaseUrl}/#/search?search=${slotProps.data[col.field]}`">{{
slotProps.data[col.field] }}</a>
Expand Down Expand Up @@ -138,11 +133,6 @@
:href="`${config.appBaseUrl}/#/publication-identifiers/${slotProps.data.dbName}/${slotProps.data[col.field]}`">{{
slotProps.data[col.field] }}</a>
</template>
<!-- Link keywords to an internal MaveDB search page -->
<template v-else-if="this.field == 'keywords' && col.field == 'column'" #body="slotProps">
<a :href="`${config.appBaseUrl}/#/search?search=${slotProps.data[col.field]}`">{{
slotProps.data[col.field] }}</a>
</template>
<!-- Link out any URLs to the appropriate location -->
<template v-else-if="col.field == 'url'" #body="slotProps">
<a :href="`${slotProps.data.url}`" target="_blank">{{
Expand Down Expand Up @@ -200,7 +190,6 @@ export default defineComponent({
},

ScoreSet: {
keywords: { model: 'record', name: 'score-set', field: 'keywords' },
'publication-identifiers': { model: 'record', name: 'score-set', field: 'publication-identifiers' },
'doi-identifiers': { model: 'record', name: 'score-set', field: 'doi-identifiers' },
},
Expand All @@ -222,9 +211,8 @@ export default defineComponent({
'refseq-identifier': 'RefSeq ID',
'ensembl-identifier': 'Ensembl ID',
}
const scoreSetLeaderboardFields = ['keywords', 'publication-identifiers', 'doi-identifiers']
const scoreSetLeaderboardFields = ['publication-identifiers', 'doi-identifiers']
const scoreSetLeaderboardFieldTitles = {
keywords: 'Keyword',
'publication-identifiers': 'Publication ID',
'doi-identifiers': 'DOI',
}
Expand Down Expand Up @@ -269,12 +257,11 @@ export default defineComponent({
'ensembl-identifier': [{ field: 'identifier', header: 'Ensembl Id', width: '25%' }, { field: 'count', header: 'Associated Score Sets', width: '20%' }, { field: 'url', header: 'URL', width: '55%' }]
},
scoreSetLeaderboardColumns: {
keywords: [{ field: 'column', header: 'Keyword', width: '50%' }, { field: 'count', header: 'Associated Score Sets', width: '50%' }],
'publication-identifiers': [{ field: 'identifier', header: 'Identifier', width: '7.5%' }, { field: 'count', header: 'Associated Score Sets', width: '12.5%' }, { field: 'title', header: 'Title', width: '47%' }, { field: 'url', header: 'URL', width: '33%' }],
'doi-identifiers': [{ field: 'identifier', header: 'Identifier', width: '33%' }, { field: 'count', header: 'Associated Score Sets', width: '33%' }, { field: 'url', header: 'URL', width: '33%' }]
},
experimentLeaderboardColumns: {
keywords: [{ field: 'column', header: 'Keyword' }, { field: 'count', header: 'Associated Score Sets' }],
'keywords': [{ field: 'column', header: 'Keyword' }, { field: 'count', header: 'Associated Score Sets' }],
'raw-read-identifiers': [{ field: 'identifier', header: 'Raw Read Identifier' }, { field: 'count', header: 'Associated Score Sets' }, { field: 'url', header: 'URL' }],
'publication-identifiers': [{ field: 'identifier', header: 'Identifier' }, { field: 'count', header: 'Associated Score Sets' }, { field: 'title', header: 'Title' }, { field: 'url', header: 'URL' }],
'doi-identifiers': [{ field: 'identifier', header: 'Identifier' }, { field: 'count', header: 'Associated Score Sets' }, { field: 'url', header: 'URL' }]
Expand Down
Loading