From 30112f0628d18fdde8863dcce63837ecc75dec01 Mon Sep 17 00:00:00 2001
From: Maud Marty <maud.marty@inrae.fr>
Date: Thu, 21 Jan 2021 11:34:57 +0100
Subject: [PATCH 1/3] fix: remove @ in email GNP-5968
---
frontend/src/app/study-card/study-card.component.html | 2 +-
frontend/src/app/study-card/study-card.component.ts | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/frontend/src/app/study-card/study-card.component.html b/frontend/src/app/study-card/study-card.component.html
index b650a37a..6a22fd28 100644
--- a/frontend/src/app/study-card/study-card.component.html
+++ b/frontend/src/app/study-card/study-card.component.html
@@ -210,7 +210,7 @@
<tr>
<td>{{ row.type }}</td>
<td>{{ row.name }}</td>
- <td>{{ row.email }}</td>
+ <td>{{ parseEmail(row.email) }}</td>
<td>{{ row.institutionName }}</td>
</tr>
</ng-template>
diff --git a/frontend/src/app/study-card/study-card.component.ts b/frontend/src/app/study-card/study-card.component.ts
index 1fa0d7f5..d56d1509 100644
--- a/frontend/src/app/study-card/study-card.component.ts
+++ b/frontend/src/app/study-card/study-card.component.ts
@@ -103,4 +103,8 @@ export class StudyCardComponent implements OnInit {
});
}
+
+ parseEmail(email: string){
+ return email.replace("@", "_at_")
+ }
}
--
GitLab
From 4b468d59bb05a7dd9490c59ed69daff52deeff18 Mon Sep 17 00:00:00 2001
From: Maud Marty <maud.marty@inrae.fr>
Date: Thu, 21 Jan 2021 11:57:48 +0100
Subject: [PATCH 2/3] fix: fix lint
---
.../app/study-card/study-card.component.ts | 22 ++++++++++++-------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/frontend/src/app/study-card/study-card.component.ts b/frontend/src/app/study-card/study-card.component.ts
index d56d1509..69a9a816 100644
--- a/frontend/src/app/study-card/study-card.component.ts
+++ b/frontend/src/app/study-card/study-card.component.ts
@@ -1,8 +1,14 @@
-import { Component, OnInit } from '@angular/core';
-import { BrapiService } from '../brapi.service';
-import { ActivatedRoute } from '@angular/router';
-import { BrapiGermplasm, BrapiLocation, BrapiObservationVariable, BrapiStudy, BrapiTrial } from '../models/brapi.model';
-import { KeyValueObject, toKeyValueObjects } from '../utils';
+import {Component, OnInit} from '@angular/core';
+import {BrapiService} from '../brapi.service';
+import {ActivatedRoute} from '@angular/router';
+import {
+ BrapiGermplasm,
+ BrapiLocation,
+ BrapiObservationVariable,
+ BrapiStudy,
+ BrapiTrial
+} from '../models/brapi.model';
+import {KeyValueObject, toKeyValueObjects} from '../utils';
@Component({
selector: 'faidare-study-card',
@@ -96,7 +102,7 @@ export class StudyCardComponent implements OnInit {
});
- this.loaded = Promise.all([ study$, variable$, germplasm$ ]);
+ this.loaded = Promise.all([study$, variable$, germplasm$]);
this.loaded.then(() => {
this.loading = false;
});
@@ -104,7 +110,7 @@ export class StudyCardComponent implements OnInit {
}
- parseEmail(email: string){
- return email.replace("@", "_at_")
+ parseEmail(email: string) {
+ return email.replace('@', '_at_');
}
}
--
GitLab
From 74f5aa49c49950c1f12c887a4ac4bdaeec1e6875 Mon Sep 17 00:00:00 2001
From: Maud Marty <maud.marty@inrae.fr>
Date: Thu, 21 Jan 2021 15:12:35 +0100
Subject: [PATCH 3/3] fix: fix int
---
frontend/src/app/study-card/study-card.component.ts | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/frontend/src/app/study-card/study-card.component.ts b/frontend/src/app/study-card/study-card.component.ts
index 69a9a816..3f5392c8 100644
--- a/frontend/src/app/study-card/study-card.component.ts
+++ b/frontend/src/app/study-card/study-card.component.ts
@@ -1,6 +1,6 @@
-import {Component, OnInit} from '@angular/core';
-import {BrapiService} from '../brapi.service';
-import {ActivatedRoute} from '@angular/router';
+import { Component, OnInit } from '@angular/core';
+import { BrapiService } from '../brapi.service';
+import { ActivatedRoute } from '@angular/router';
import {
BrapiGermplasm,
BrapiLocation,
@@ -8,7 +8,7 @@ import {
BrapiStudy,
BrapiTrial
} from '../models/brapi.model';
-import {KeyValueObject, toKeyValueObjects} from '../utils';
+import { KeyValueObject, toKeyValueObjects } from '../utils';
@Component({
selector: 'faidare-study-card',
--
GitLab