Skip to content
Snippets Groups Projects
Commit a4b659e8 authored by David Mendez's avatar David Mendez
Browse files

Eubopen: add more properties to probe profile and try to redirect target from chembl id

parent a11949fe
No related branches found
No related tags found
1 merge request!29Compound: add probe profile section with activity data.
...@@ -46,6 +46,9 @@ export default { ...@@ -46,6 +46,9 @@ export default {
process.env.EUBOPEN_TARGET_REPORT_CARDS_BASE_URL || '/target', process.env.EUBOPEN_TARGET_REPORT_CARDS_BASE_URL || '/target',
eubopenTextSearchBaseUrl: eubopenTextSearchBaseUrl:
process.env.EUBOPEN_TEXT_SEARCH_BASE_URL || '/search', process.env.EUBOPEN_TEXT_SEARCH_BASE_URL || '/search',
assayReportCardsBaseUrl:
process.env.ASSAY_REPORT_CARDS_BASE_URL ||
'https://wwwdev.ebi.ac.uk/chembl/assay_report_card',
}, },
// Global CSS: https://go.nuxtjs.dev/config-css // Global CSS: https://go.nuxtjs.dev/config-css
......
...@@ -3479,8 +3479,7 @@ ...@@ -3479,8 +3479,7 @@
"asynckit": { "asynckit": {
"version": "0.4.0", "version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
"dev": true
}, },
"at-least-node": { "at-least-node": {
"version": "1.0.0", "version": "1.0.0",
...@@ -4706,7 +4705,6 @@ ...@@ -4706,7 +4705,6 @@
"version": "1.0.8", "version": "1.0.8",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
"dev": true,
"requires": { "requires": {
"delayed-stream": "~1.0.0" "delayed-stream": "~1.0.0"
} }
...@@ -5776,8 +5774,7 @@ ...@@ -5776,8 +5774,7 @@
"delayed-stream": { "delayed-stream": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
"dev": true
}, },
"depd": { "depd": {
"version": "1.1.2", "version": "1.1.2",
...@@ -7566,6 +7563,16 @@ ...@@ -7566,6 +7563,16 @@
"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
"dev": true "dev": true
}, },
"form-data": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
"requires": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.8",
"mime-types": "^2.1.12"
}
},
"fragment-cache": { "fragment-cache": {
"version": "0.2.1", "version": "0.2.1",
"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
"core-js": "^3.8.3", "core-js": "^3.8.3",
"d3": "^6.7.0", "d3": "^6.7.0",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"form-data": "^4.0.0",
"nuxt": "^2.14.12", "nuxt": "^2.14.12",
"vue-apexcharts": "^1.6.1" "vue-apexcharts": "^1.6.1"
}, },
......
...@@ -3,31 +3,70 @@ ...@@ -3,31 +3,70 @@
</template> </template>
<script> <script>
import IndexNames from '~/web-components-submodule/standardisation/IndexNames.js'
import TargetReportCard from '~/components/report_cards/target/TargetReportCard.vue' import TargetReportCard from '~/components/report_cards/target/TargetReportCard.vue'
import MetadataLoader from '~/web-components-submodule/metadata/MetadataLoader.js' import MetadataLoader from '~/web-components-submodule/metadata/MetadataLoader.js'
import EntityNames from '~/web-components-submodule/standardisation/EntityNames.js' import EntityNames from '~/web-components-submodule/standardisation/EntityNames.js'
import ESProxyService from '~/web-components-submodule/services/ESProxyService.js'
import LinksToEntities from '~/web-components-submodule/standardisation/LinksToEntities.js'
export default { export default {
components: { components: {
TargetReportCard, TargetReportCard,
}, },
layout: 'reportCard', layout: 'reportCard',
async asyncData({ $axios, error, params }) { async asyncData({ $axios, error, params, redirect }) {
try { const entityID = EntityNames.EubopenTarget.entityID
const docSource = ['pref_name'] const receivedID = params.id
const result = await MetadataLoader.getMetadataForEntity( let itemID = receivedID
EntityNames.EubopenTarget.entityID,
params.id, const isChemblID = /^CHEMBL\d+$/.test(receivedID)
docSource
) // If it is a chembl id, get the eubopen id and redirect
return { if (isChemblID) {
rawMetadata: result.data._source, try {
const indexName = IndexNames.getIndexNameFromEntityID(entityID)
const docSource = ['_id']
const customIDProperty = 'target_chembl_id'
const docResponse = await ESProxyService.getESDocument(
indexName,
receivedID,
docSource,
customIDProperty
)
itemID = docResponse.data._id
const reportCardURL = LinksToEntities[entityID].getLinkToReportCard(
itemID
)
console.log('going to redirect: ', reportCardURL)
redirect(reportCardURL)
return
} catch (e) {
error({
statusCode: 404,
message: `No ${EntityNames.EubopenTarget.singularEntityName} found with target_chembl_id ${params.id}`,
})
}
} else {
console.log('show report card for : ', itemID)
try {
const docSource = ['pref_name']
const result = await MetadataLoader.getMetadataForEntity(
entityID,
itemID,
docSource
)
return {
rawMetadata: result.data._source,
}
} catch (e) {
error({
statusCode: 404,
message: `No ${EntityNames.EubopenTarget.singularEntityName} found with id ${params.id}`,
})
} }
} catch (e) {
error({
statusCode: 404,
message: `No ${EntityNames.EubopenTarget.singularEntityName} found with id ${params.id}`,
})
} }
}, },
head() { head() {
......
Subproject commit 11257a066e00627de771f1aa223e4325197e75a1 Subproject commit 6caa04a10333c2bc750b89d8cafd7d3951acc16a
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment