diff --git a/src/app/pages/repository/metrics/metrics-usagestats.component.ts b/src/app/pages/repository/metrics/metrics-usagestats.component.ts
index 9ae1d8595..c9bc243e7 100755
--- a/src/app/pages/repository/metrics/metrics-usagestats.component.ts
+++ b/src/app/pages/repository/metrics/metrics-usagestats.component.ts
@@ -27,13 +27,13 @@ export class MetricsUsagestatsComponent implements OnInit {
if(this.sharedService.getRepository()) {
this.repo = this.sharedService.getRepository();
- this.title = this.title + ' for ' + this.repo.officialName;
+ this.title = this.title + ' for ' + this.repo.officialname;
}
this.sharedService.repository$.subscribe(
r => {
this.repo = r;
- this.title = this.title + ' for ' + this.repo.officialName;
+ this.title = this.title + ' for ' + this.repo.officialname;
}
);
diff --git a/src/app/pages/repository/repository.component.html b/src/app/pages/repository/repository.component.html
index 20cd8d17b..97b8ab5e4 100644
--- a/src/app/pages/repository/repository.component.html
+++ b/src/app/pages/repository/repository.component.html
@@ -15,9 +15,9 @@
-
-
- {{ repository.officialName }}
+
+
+ {{ repository.officialname }}
diff --git a/src/app/pages/repository/update/sources-update-repo.component.ts b/src/app/pages/repository/update/sources-update-repo.component.ts
index c1d09ff90..0a01af3df 100755
--- a/src/app/pages/repository/update/sources-update-repo.component.ts
+++ b/src/app/pages/repository/update/sources-update-repo.component.ts
@@ -61,7 +61,7 @@ export class SourcesUpdateRepoComponent implements OnInit {
} else if (this.repo.id.includes('aggregator')) {
this.mode = 'aggregator';
}
- this.logoURL = this.repo.logoUrl;
+ this.logoURL = this.repo.logourl;
this.getRepoInterfaces();
}
@@ -69,7 +69,7 @@ export class SourcesUpdateRepoComponent implements OnInit {
r => {
this.repo = r;
if (this.repo) {
- this.logoURL = this.repo.logoUrl;
+ this.logoURL = this.repo.logourl;
this.getRepoInterfaces();
}
}
@@ -145,9 +145,9 @@ export class SourcesUpdateRepoComponent implements OnInit {
false, i,
{
id: this.repo.id,
- datasourceType: this.repo.datasourceType,
+ datasourceType: this.repo.eoscDatasourceType,
datasourceClass: this.repo.eoscDatasourceType,
- registeredBy: this.repo.registeredBy
+ registeredBy: this.repo.registeredby
},
this.repoInterfaces[i]
]);
@@ -157,9 +157,9 @@ export class SourcesUpdateRepoComponent implements OnInit {
false, 0,
{
id: this.repo.id,
- datasourceType: this.repo.datasourceType,
+ datasourceType: this.repo.eoscDatasourceType,
datasourceClass: this.repo.eoscDatasourceType,
- registeredBy: this.repo.registeredBy
+ registeredBy: this.repo.registeredby
}
]);
}
@@ -168,8 +168,8 @@ export class SourcesUpdateRepoComponent implements OnInit {
addInterfaceToList(intrf?: RepositoryInterface) {
const curIndex = this.dataForInterfaceComp.length;
const curRepoInfo = {
- id: this.repo.id, datasourceType: this.repo.datasourceType,
- datasourceClass: this.repo.eoscDatasourceType, registeredBy: this.repo.registeredBy
+ id: this.repo.id, datasourceType: this.repo.eoscDatasourceType,
+ datasourceClass: this.repo.eoscDatasourceType, registeredBy: this.repo.registeredby
};
if (intrf) {
this.dataForInterfaceComp.push([false, curIndex, curRepoInfo, intrf]);
@@ -204,7 +204,7 @@ export class SourcesUpdateRepoComponent implements OnInit {
}
updatedLogoUrl(event: any) {
- this.repo.logoUrl = this.logoURL;
+ this.repo.logourl = this.logoURL;
this.datasourceUpdateForm.updateGroup.get('logoUrl').setValue(this.logoURL);
this.datasourceUpdateForm.updateRepo();
diff --git a/src/app/pages/sources/sources-register/register-existing-datasource.component.ts b/src/app/pages/sources/sources-register/register-existing-datasource.component.ts
index 88bd22c9d..34811c8bd 100644
--- a/src/app/pages/sources/sources-register/register-existing-datasource.component.ts
+++ b/src/app/pages/sources/sources-register/register-existing-datasource.component.ts
@@ -165,8 +165,8 @@ export class RegisterExistingDatasourceComponent implements OnInit {
addInterfaceToList(intrf?: RepositoryInterface) {
const curIndex = this.dataForInterfaceComp.length;
- const curRepoInfo = { id: this.repo.id, datasourceType: this.repo.datasourceType,
- datasourceClass: this.repo.eoscDatasourceType, registeredBy: this.repo.registeredBy };
+ const curRepoInfo = { id: this.repo.id, datasourceType: this.repo.eoscDatasourceType,
+ datasourceClass: this.repo.eoscDatasourceType, registeredBy: this.repo.registeredby };
if (intrf) {
this.dataForInterfaceComp.push([true, curIndex, curRepoInfo, intrf]);
} else {
@@ -221,9 +221,9 @@ export class RegisterExistingDatasourceComponent implements OnInit {
this.dataForInterfaceComp.push([
true, i,
{ id: this.repo.id,
- datasourceType: this.repo.datasourceType,
+ datasourceType: this.repo.eoscDatasourceType,
datasourceClass: this.repo.eoscDatasourceType,
- registeredBy: this.repo.registeredBy
+ registeredBy: this.repo.registeredby
},
this.repoInterfaces[i]
]);
@@ -232,9 +232,9 @@ export class RegisterExistingDatasourceComponent implements OnInit {
this.dataForInterfaceComp.push([
true, 0,
{ id: this.repo.id,
- datasourceType: this.repo.datasourceType,
+ datasourceType: this.repo.eoscDatasourceType,
datasourceClass: this.repo.eoscDatasourceType,
- registeredBy: this.repo.registeredBy
+ registeredBy: this.repo.registeredby
}
]);
}
@@ -328,9 +328,9 @@ export class RegisterExistingDatasourceComponent implements OnInit {
this.loadingMessage = 'Saving changes';
this.errorMessage = '';
console.log('reg this.repo', this.repo);
- this.repoService.addRepository( this.repo.datasourceType, this.repo).subscribe( //this.repo.collectedFrom
+ this.repoService.addRepository( this.repo.eoscDatasourceType, this.repo).subscribe( //this.repo.collectedfrom
response => {
- console.log(`addRepository responded: ${response.id}, ${response.registeredBy}`);
+ console.log(`addRepository responded: ${response.id}, ${response.registeredby}`);
this.repo = response;
},
error => {
@@ -353,15 +353,15 @@ export class RegisterExistingDatasourceComponent implements OnInit {
if (intrf.id) {
let req;
if (this.interfacesToDelete.some(id => id === intrf.id)) {
- req = this.repoService.deleteInterface(intrf.id, this.repo.registeredBy);
+ req = this.repoService.deleteInterface(intrf.id, this.repo.registeredby);
} else {
// console.log('comments', intrf.comments);
- req = this.repoService.updateInterface(this.repo.id, this.repo.registeredBy, intrf.comments, intrf);
+ req = this.repoService.updateInterface(this.repo.id, this.repo.registeredby, intrf.comments, intrf);
}
return req;
} else {
// console.log('comments', intrf.comments);
- return this.repoService.addInterface(this.repo.datasourceType, this.repo.id, this.repo.registeredBy, intrf.comments, intrf);
+ return this.repoService.addInterface(this.repo.eoscDatasourceType, this.repo.id, this.repo.registeredby, intrf.comments, intrf);
}
})
).subscribe(
diff --git a/src/app/pages/sources/sources-register/register-new-datasource.component.ts b/src/app/pages/sources/sources-register/register-new-datasource.component.ts
index 163cc55b9..c96f8fd15 100644
--- a/src/app/pages/sources/sources-register/register-new-datasource.component.ts
+++ b/src/app/pages/sources/sources-register/register-new-datasource.component.ts
@@ -137,8 +137,8 @@ export class RegisterNewDatasourceComponent implements OnInit {
addInterfaceToList(intrf?: RepositoryInterface) {
const curIndex = this.dataForInterfaceComp.length;
- const curRepoInfo = { id: this.repo.id, datasourceType: this.repo.datasourceType,
- datasourceClass: this.repo.eoscDatasourceType, registeredBy: this.repo.registeredBy };
+ const curRepoInfo = { id: this.repo.id, datasourceType: this.repo.eoscDatasourceType,
+ datasourceClass: this.repo.eoscDatasourceType, registeredBy: this.repo.registeredby };
if (intrf) {
this.dataForInterfaceComp.push([true, curIndex, curRepoInfo, intrf]);
} else {
@@ -180,9 +180,9 @@ export class RegisterNewDatasourceComponent implements OnInit {
this.dataForInterfaceComp.push([
true, i,
{ id: this.repo.id,
- datasourceType: this.repo.datasourceType,
+ datasourceType: this.repo.eoscDatasourceType,
datasourceClass: this.repo.eoscDatasourceType,
- registeredBy: this.repo.registeredBy
+ registeredBy: this.repo.registeredby
},
this.repoInterfaces[i]
]);
@@ -191,9 +191,9 @@ export class RegisterNewDatasourceComponent implements OnInit {
this.dataForInterfaceComp.push([
true, 0,
{ id: this.repo.id,
- datasourceType: this.repo.datasourceType,
+ datasourceType: this.repo.eoscDatasourceType,
datasourceClass: this.repo.eoscDatasourceType,
- registeredBy: this.repo.registeredBy
+ registeredBy: this.repo.registeredby
}
]);
}
@@ -223,9 +223,9 @@ export class RegisterNewDatasourceComponent implements OnInit {
this.loadingMessage = 'Saving changes';
this.errorMessage = '';
console.log('add this.repo', this.repo);
- this.repoService.addRepository(this.repo.datasourceType, this.repo).subscribe(
+ this.repoService.addRepository(this.repo.eoscDatasourceType, this.repo).subscribe(
response => {
- console.log(`addRepository responded: ${response.id}, ${response.registeredBy}`);
+ console.log(`addRepository responded: ${response.id}, ${response.registeredby}`);
this.repo = response;
},
error => {
@@ -246,10 +246,10 @@ export class RegisterNewDatasourceComponent implements OnInit {
concatMap(intrf => {
if (intrf.id) {
// console.log('comments', intrf.comments);
- return this.repoService.updateInterface(this.repo.id, this.repo.registeredBy, intrf.comments, intrf);
+ return this.repoService.updateInterface(this.repo.id, this.repo.registeredby, intrf.comments, intrf);
} else {
// console.log('comments', intrf.comments);
- return this.repoService.addInterface(this.repo.datasourceType, this.repo.id, this.repo.registeredBy, intrf.comments, intrf);
+ return this.repoService.addInterface(this.repo.eoscDatasourceType, this.repo.id, this.repo.registeredby, intrf.comments, intrf);
}
})
).subscribe(
diff --git a/src/app/services/repository.service.ts b/src/app/services/repository.service.ts
index d3a52c4e8..99b1a031b 100755
--- a/src/app/services/repository.service.ts
+++ b/src/app/services/repository.service.ts
@@ -47,6 +47,7 @@ export class RepositoryService {
updateInterface(repoId: string, registeredBy: string, comment: string, interfaceInfo: RepositoryInterface): Observable
{
let url;
+ console.log(comment);
if (comment == null || comment === '') {
url = `${this.apiUrl}updateRepositoryInterface?repoId=${repoId}®isteredBy=${registeredBy}`;
} else {
@@ -161,7 +162,7 @@ export class RepositoryService {
return this.httpClient.get>(url, headerOptions);
}
- getDatasourceClasses(mode: string): Observable> {
+ getDatasourceClasses(mode: string): Observable {
const url = `${this.apiUrl}getDatasourceClasses/${mode}`;
console.log(`knocking on: ${url}`);
return this.httpClient.get>(url, headerOptions);
diff --git a/src/app/shared/reusablecomponents/sources-forms/datasource-create-form.component.html b/src/app/shared/reusablecomponents/sources-forms/datasource-create-form.component.html
index 58a349e78..c7aa08463 100755
--- a/src/app/shared/reusablecomponents/sources-forms/datasource-create-form.component.html
+++ b/src/app/shared/reusablecomponents/sources-forms/datasource-create-form.component.html
@@ -57,7 +57,7 @@
Issn needs to be of the form: "1111-1111" or "1111-111X"
+ style="margin-top: 0px; margin-bottom: 0px; padding-left: 10px;">Issn needs to be of the form: "1111-1111" or "1111-111X" or "11111111" or "1111111X"
@@ -71,7 +71,7 @@
Eissn needs to be of the form: "1111-1111" or "1111-111X"
+ style="margin-top: 0px; margin-bottom: 0px; padding-left: 10px;">Eissn needs to be of the form: "1111-1111" or "1111-111X" or "11111111" or "1111111X"
@@ -85,7 +85,7 @@
Lissn needs to be of the form: "1111-1111" or "1111-111X"
+ style="margin-top: 0px; margin-bottom: 0px; padding-left: 10px;">Lissn needs to be of the form: "1111-1111" or "1111-111X" or "11111111" or "1111111X"
@@ -277,7 +277,7 @@
-- none selected --
- {{ datasourceClasses[key] }}
+ {{ datasourceClasses.get(key) }}
diff --git a/src/app/shared/reusablecomponents/sources-forms/datasource-create-form.component.ts b/src/app/shared/reusablecomponents/sources-forms/datasource-create-form.component.ts
index ceaae32f5..c8e212411 100755
--- a/src/app/shared/reusablecomponents/sources-forms/datasource-create-form.component.ts
+++ b/src/app/shared/reusablecomponents/sources-forms/datasource-create-form.component.ts
@@ -41,6 +41,7 @@ export class DatasourceCreateFormComponent implements OnInit {
countries: Country[] = [];
datasourceClasses: Map