From 98fbdeab468eb0c53ca148a7ef6c660279439f40 Mon Sep 17 00:00:00 2001
From: Larie Borelle Siabou
Date: Wed, 10 Jan 2024 10:05:07 +0100
Subject: [PATCH 01/14]
94-redirection-to-ejp-rd-landing-page-via-ejp-rd-logo-on-top-of-vp-landing-page
Link added to the Logo of EJP RD Landing page
---
components/DiscoverySourcesTable.vue | 43 ++++++++++++++++------------
components/Flashcards.vue | 2 +-
2 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/components/DiscoverySourcesTable.vue b/components/DiscoverySourcesTable.vue
index d0e6693..7389615 100644
--- a/components/DiscoverySourcesTable.vue
+++ b/components/DiscoverySourcesTable.vue
@@ -6,7 +6,7 @@
-
+
+
+
+
+
+ VpContentDiscovery
+
+
+ The source is queryable via the VP Portal.
+
+
@@ -58,7 +75,7 @@
The source is a patient information register.
-
+
This source contains biological samples.
-
-
-
-
- VpContentDiscovery
-
-
- The source is queryable via the VP Portal.
-
-
@@ -171,6 +171,11 @@ export default {
}
},
methods: {
+ checkavailaibilityofresource() {
+ if (source.queryable) {
+
+ }
+ },
async fetchSources () {
await this.$axios.$get('/api/v1/resources')
.then(function (res) {
diff --git a/components/Flashcards.vue b/components/Flashcards.vue
index 045f80c..4b1138a 100644
--- a/components/Flashcards.vue
+++ b/components/Flashcards.vue
@@ -36,7 +36,7 @@ export default {
-
+
From c0807f0e4bf772d07ad74832b19d4f82068c809e Mon Sep 17 00:00:00 2001
From: Larie Borelle Siabou
Date: Wed, 10 Jan 2024 10:07:59 +0100
Subject: [PATCH 02/14] 101-improvements-of-the-dev-instanz
Remove the Flashcards delimiters and change the position of the icons in the page discovery source table.
---
components/DiscoverySourcesTable.vue | 1 -
components/Flashcards.vue | 1 -
2 files changed, 2 deletions(-)
diff --git a/components/DiscoverySourcesTable.vue b/components/DiscoverySourcesTable.vue
index 7389615..fbf78f8 100644
--- a/components/DiscoverySourcesTable.vue
+++ b/components/DiscoverySourcesTable.vue
@@ -141,7 +141,6 @@ v-avatar {
margin: 0 10px;
height: 20px;
}
-
.low-opacity-without-hover {
opacity: 0.9;
&:hover {
diff --git a/components/Flashcards.vue b/components/Flashcards.vue
index 4b1138a..d90e5db 100644
--- a/components/Flashcards.vue
+++ b/components/Flashcards.vue
@@ -59,7 +59,6 @@ export default {
margin: 0.5rem;
}
}
-
.v-carousel-item {
width: 100%;
height: 100%;
From b3248bdaddcb68bb5a5d8453f951ed57bb4273b0 Mon Sep 17 00:00:00 2001
From: Larie Borelle Siabou
Date: Wed, 17 Jan 2024 11:14:02 +0100
Subject: [PATCH 03/14] 91-Display the connected icon in green or red on the
frontend
Display icons only on queryable ressources.
---
components/DiscoverySourcesTable.vue | 46 +++++++++++++++-------------
1 file changed, 25 insertions(+), 21 deletions(-)
diff --git a/components/DiscoverySourcesTable.vue b/components/DiscoverySourcesTable.vue
index d0e6693..68c1933 100644
--- a/components/DiscoverySourcesTable.vue
+++ b/components/DiscoverySourcesTable.vue
@@ -1,4 +1,4 @@
-
+
@@ -6,7 +6,7 @@
-
+
+
+
+
+
+ VpContentDiscovery
+
+
+ The source is queryable via the VP Portal.
+
+
@@ -58,7 +75,7 @@
The source is a patient information register.
-
+
This source contains biological samples.
-
-
-
-
- VpContentDiscovery
-
-
- The source is queryable via the VP Portal.
-
-
@@ -141,7 +141,6 @@ v-avatar {
margin: 0 10px;
height: 20px;
}
-
.low-opacity-without-hover {
opacity: 0.9;
&:hover {
@@ -171,6 +170,11 @@ export default {
}
},
methods: {
+ checkavailaibilityofresource() {
+ if (source.queryable) {
+
+ }
+ },
async fetchSources () {
await this.$axios.$get('/api/v1/resources')
.then(function (res) {
From 2d7e9a2f9ef5110e5986615064a7f07ba40b501e Mon Sep 17 00:00:00 2001
From: Larie Borelle Siabou
Date: Mon, 19 Feb 2024 10:27:18 +0100
Subject: [PATCH 04/14]
91-Display-the-connected-icon-in-green-or-red-on-the-frontend
Display the connected icons in green when the resource is connected and in red when the resource is not connected.
---
components/DiscoverySourcesTable.vue | 55 +++++++++++++++++++++++-----
1 file changed, 45 insertions(+), 10 deletions(-)
diff --git a/components/DiscoverySourcesTable.vue b/components/DiscoverySourcesTable.vue
index 68c1933..5aa6ad0 100644
--- a/components/DiscoverySourcesTable.vue
+++ b/components/DiscoverySourcesTable.vue
@@ -6,7 +6,18 @@
-
+
+
+ mdi-connection
+
+ The source is actively not connected to the VP.
+
+
this.availability(source.id, 3));
+ const results = await Promise.all(promises);
+ this.availabilityResults = results.reduce((acc, result, index) => {
+ acc[this.sources[index].id] = result;
+ return acc;
+ }, {});
+ } catch (error) {
+ console.error(error);
+ throw error;
+ }
+ },
+ async availability(resourceId, period) {
+ try {
+ const res = await this.$axios.$get(`/api/v1/monitoring?resourceId=${resourceId}&periodInDays=${period}`);
+ return res;
+ } catch (error) {
+ console.error(error);
+ throw error;
+ }
}
},
beforeMount() {
this.fetchSources()
+ .then(() => this.checkAllAvailabilities());
}
+
}
From 731fc7784eee7b1398c85d843d214dca8deb51b6 Mon Sep 17 00:00:00 2001
From: Larie Borelle Siabou
Date: Wed, 13 Mar 2024 14:55:11 +0100
Subject: [PATCH 05/14]
91-Display-the-connected-icon-in-green-or-red-on-the-frontend
Display the connected icons in green when the resource is connected and in red when the resource is not connected.
---
components/DiscoverySourcesTable.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/DiscoverySourcesTable.vue b/components/DiscoverySourcesTable.vue
index 5aa6ad0..201f1ad 100644
--- a/components/DiscoverySourcesTable.vue
+++ b/components/DiscoverySourcesTable.vue
@@ -6,7 +6,7 @@
-
+
Date: Thu, 14 Mar 2024 09:45:46 +0100
Subject: [PATCH 06/14] 113-Show-resources-where-the-Filters-are-ignored
Adding the Ignored Filters information when displaying search results to resources where filters are ignored.
---
components/search/DiscoverySearchResults.vue | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/components/search/DiscoverySearchResults.vue b/components/search/DiscoverySearchResults.vue
index 0672b49..f7c2255 100644
--- a/components/search/DiscoverySearchResults.vue
+++ b/components/search/DiscoverySearchResults.vue
@@ -138,6 +138,11 @@ export default {
{{ result.content.responseSummary.numTotalResults }} result(s)
+
+
+
Ignored filters: {{ filter }}
+
+
{{ result.content.responseSummary.numTotalResults }} result(s)
+
+
+
Ignored filters: {{ filter }}
+
+
+ {{searchResults}}
From 81b9b936bbde96951893bc235d97c5cd45ebf1ec Mon Sep 17 00:00:00 2001
From: Larie Borelle Siabou
Date: Thu, 14 Mar 2024 11:00:56 +0100
Subject: [PATCH 07/14] 113-Show-resources-where-the-Filters-are-ignored
Adding the Ignored Filters information when displaying search results to resources where filters are ignored.
---
components/search/DiscoverySearchResults.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/components/search/DiscoverySearchResults.vue b/components/search/DiscoverySearchResults.vue
index f7c2255..c18d519 100644
--- a/components/search/DiscoverySearchResults.vue
+++ b/components/search/DiscoverySearchResults.vue
@@ -229,7 +229,6 @@ export default {
- {{searchResults}}
From ee4311d5879031d73fa5188e9b0240b144dfa191 Mon Sep 17 00:00:00 2001
From: Abishaa Vengadeswaran <38211976+vabishaa@users.noreply.github.com>
Date: Fri, 15 Mar 2024 15:24:58 +0100
Subject: [PATCH 08/14] #119 - Connect Negotiator - add button within BBMRI
result display - trigger negotiator request with reulst of the search query -
redirect to negotiator - TODO: error occurs regarding some missing resources
- TODO: better error handling
---
components/search/DiscoverySearchResults.vue | 63 +++++++++++++++++++-
1 file changed, 62 insertions(+), 1 deletion(-)
diff --git a/components/search/DiscoverySearchResults.vue b/components/search/DiscoverySearchResults.vue
index 0672b49..b04d749 100644
--- a/components/search/DiscoverySearchResults.vue
+++ b/components/search/DiscoverySearchResults.vue
@@ -16,7 +16,8 @@ export default {
resourceInfoDialog: {
show: false,
resourceInfo: null
- }
+ },
+ negotiatorRedirectUrl: ''
}
},
mounted() {
@@ -89,6 +90,60 @@ export default {
},
resourceHasResponseToBeListed (result) {
return !result || !result.content || !result.content.response || !result.content.response.resultSets[0].results;
+ },
+ fetchNegotiator () {
+ const url = 'https://negotiator.acc.bbmri-eric.eu/api/v3/requests';
+ let idObjects = '';
+
+ this.searchResults.forEach((resource) => {
+ if (resource.resourceName === "BBMRI-ERIC Directory"){
+ resource.content.response.resultSets[0].results.forEach(result => {
+ let idObject = '{"id": "' + result.id + '"},';
+ idObjects = idObjects + idObject;
+ });
+ }
+ });
+
+ //Test: works -> example from Vittorio
+ const result = {
+ "url": "https://vp.ejprarediseases.org/",
+ "humanReadable": "",
+ "resources": [{
+ "id": "bbmri-eric:ID:EXT_44001:collection:MainCollection"
+ }, {
+ "id": "bbmri-eric:ID:IT_1382965524316631:collection:1444717339490516"
+ }]
+ };
+
+ //Test: does not work -> generated from VP-Portal after searching for Orphacode:730
+ const result1= {
+ "url": "https://vp.ejprarediseases.org/",
+ "humanReadable": "",
+ "resources": [
+ {
+ "id": "bbmri-eric:ID:EXT_76957:collection:MainCollection"
+ },
+ {
+ "id": "bbmri-eric:ID:IT_1382965524316631:collection:1444717339490516"
+ },
+ {
+ "id": "bbmri-eric:ID:IT_1385652938842205:collection:77630"
+ }
+ ]
+ };
+
+ //final solution
+ const data = '{ "url": "https://vp.ejprarediseases.org/", "humanReadable": "", "resources": [' + idObjects.substring(0,idObjects.length-1) + '] }';
+
+ this.$axios.$post(url, result1 /*JSON.parse(data)*/)
+ .then(response => {
+ this.negotiatorRedirectUrl = response.redirectUrl;
+ //console.log(this.negotiatorUrl)
+ window.open(this.negotiatorRedirectUrl, '_blank');
+ })
+ .catch(function (error) {
+ console.error(error);
+ });
}
}
}
@@ -147,6 +202,12 @@ export default {
+ Negotiator
From c086cf2e1b90b807256ad48a689e74bdd9c285af Mon Sep 17 00:00:00 2001
From: Abishaa Vengadeswaran <38211976+vabishaa@users.noreply.github.com>
Date: Sun, 17 Mar 2024 23:24:12 +0100
Subject: [PATCH 09/14] #119 - Connect Negotiator - remove testdata
---
components/search/DiscoverySearchResults.vue | 30 +-------------------
1 file changed, 1 insertion(+), 29 deletions(-)
diff --git a/components/search/DiscoverySearchResults.vue b/components/search/DiscoverySearchResults.vue
index b04d749..ac88729 100644
--- a/components/search/DiscoverySearchResults.vue
+++ b/components/search/DiscoverySearchResults.vue
@@ -104,38 +104,10 @@ export default {
}
});
- //Test: works -> example from Vittorio
- const result = {
- "url": "https://vp.ejprarediseases.org/",
- "humanReadable": "",
- "resources": [{
- "id": "bbmri-eric:ID:EXT_44001:collection:MainCollection"
- }, {
- "id": "bbmri-eric:ID:IT_1382965524316631:collection:1444717339490516"
- }]
- };
-
- //Test: does not work -> generated from VP-Portal after searching for Orphacode:730
- const result1= {
- "url": "https://vp.ejprarediseases.org/",
- "humanReadable": "",
- "resources": [
- {
- "id": "bbmri-eric:ID:EXT_76957:collection:MainCollection"
- },
- {
- "id": "bbmri-eric:ID:IT_1382965524316631:collection:1444717339490516"
- },
- {
- "id": "bbmri-eric:ID:IT_1385652938842205:collection:77630"
- }
- ]
- };
-
//final solution
const data = '{ "url": "https://vp.ejprarediseases.org/", "humanReadable": "", "resources": [' + idObjects.substring(0,idObjects.length-1) + '] }';
- this.$axios.$post(url, result1 /*JSON.parse(data)*/)
+ this.$axios.$post(url, JSON.parse(data))
.then(response => {
this.negotiatorRedirectUrl = response.redirectUrl;
//console.log(this.negotiatorUrl)
From 297d5ee4be8e147235d8e14cbb8ef9430a992307 Mon Sep 17 00:00:00 2001
From: Abishaa Vengadeswaran <38211976+vabishaa@users.noreply.github.com>
Date: Fri, 5 Apr 2024 15:43:06 +0200
Subject: [PATCH 10/14] #101 - Improvements of the Dev Instanz - change
resourcetype as 'KNOWLEDGE_BASE' is replaced by 'DATASET' - remove
unnecessary method
---
components/DiscoverySourcesTable.vue | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/components/DiscoverySourcesTable.vue b/components/DiscoverySourcesTable.vue
index fbf78f8..75cdf2b 100644
--- a/components/DiscoverySourcesTable.vue
+++ b/components/DiscoverySourcesTable.vue
@@ -75,7 +75,7 @@
The source is a patient information register.
-
+
Date: Fri, 5 Apr 2024 17:06:30 +0200
Subject: [PATCH 11/14] #91 - Display the connected icon in green or red on the
frontend - change the visibility of the connect icon only for resources,
which are onboarded on level 2
---
components/DiscoverySourcesTable.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/components/DiscoverySourcesTable.vue b/components/DiscoverySourcesTable.vue
index 201f1ad..87dbc01 100644
--- a/components/DiscoverySourcesTable.vue
+++ b/components/DiscoverySourcesTable.vue
@@ -6,6 +6,7 @@
+
The source is actively connected to the VP.
+
{{ source.resourceName }}
From fdf3e51487f85f598974719f14125629dfd669da Mon Sep 17 00:00:00 2001
From: Abishaa Vengadeswaran <38211976+vabishaa@users.noreply.github.com>
Date: Fri, 5 Apr 2024 17:17:26 +0200
Subject: [PATCH 12/14] #91 - Display the connected icon in green or red on the
frontend - change resourcetype
---
components/DiscoverySourcesTable.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/DiscoverySourcesTable.vue b/components/DiscoverySourcesTable.vue
index 87dbc01..35f024a 100644
--- a/components/DiscoverySourcesTable.vue
+++ b/components/DiscoverySourcesTable.vue
@@ -88,7 +88,7 @@
The source is a patient information register.
-
+
Date: Wed, 22 May 2024 11:44:22 +0200
Subject: [PATCH 13/14] #123 - Error handling for negotiator - add alert with
error message
---
components/search/DiscoverySearchResults.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/search/DiscoverySearchResults.vue b/components/search/DiscoverySearchResults.vue
index ac88729..e62e698 100644
--- a/components/search/DiscoverySearchResults.vue
+++ b/components/search/DiscoverySearchResults.vue
@@ -113,8 +113,10 @@ export default {
//console.log(this.negotiatorUrl)
window.open(this.negotiatorRedirectUrl, '_blank');
})
- .catch(function (error) {
- console.error(error);
+ .catch((error) => {
+ if( error.response ){
+ alert(error.response.data.status + " " + error.response.data.title + " : " + error.response.data.detail); // => the response payload
+ }
});
}
}
From 42cf1c04820d4e79205c301e8580ab389ac1d367 Mon Sep 17 00:00:00 2001
From: Abishaa Vengadeswaran <38211976+vabishaa@users.noreply.github.com>
Date: Wed, 22 May 2024 11:54:29 +0200
Subject: [PATCH 14/14] Quickfix: show always resource name in "VP Network
Resources" list
---
components/DiscoverySourcesTable.vue | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/components/DiscoverySourcesTable.vue b/components/DiscoverySourcesTable.vue
index 052e65a..a5168f2 100644
--- a/components/DiscoverySourcesTable.vue
+++ b/components/DiscoverySourcesTable.vue
@@ -30,9 +30,8 @@
The source is actively connected to the VP.
- {{ source.resourceName }}
-
-
+
+ {{ source.resourceName }}
{{ source.resourceDescription }}
@@ -173,7 +172,7 @@ export default {
// 'BBMRI-Eric': require('../assets/images/logo/resources/bbmri-logo.png'),
// 'Orphanet': require('../assets/images/logo/resources/img_4.png'),
// 'Cellosaurus': require('../assets/images/logo/resources/cellosaurus-logo.png'),
- 'WikiPathways': require('../assets/images/logo/resources/img_5.png'),
+ //'WikiPathways': require('../assets/images/logo/resources/img_5.png'),
// 'hPSCreg': require('../assets/images/logo/resources/img_3.png'),
// 'EuRRECa': require('../assets/images/logo/resources/eurreca-logo.png'),
// 'Genturis': require('../assets/images/logo/resources/Genturis.png'),