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 b4f81cd5d..2e5cbff83 100755
--- a/src/app/pages/repository/update/sources-update-repo.component.ts
+++ b/src/app/pages/repository/update/sources-update-repo.component.ts
@@ -8,7 +8,7 @@ import { DatasourceUpdateFormComponent } from '../../../shared/reusablecomponent
import { ConfirmationDialogComponent } from '../../../shared/reusablecomponents/confirmation-dialog.component';
import { AuthenticationService } from '../../../services/authentication.service';
import { DatasourceNewInterfaceFormComponent } from '../../../shared/reusablecomponents/sources-forms/datasource-new-interface-form.component';
-import {SharedService} from "../../../services/shared.service";
+import { SharedService } from '../../../services/shared.service';
@Component ({
selector: 'sources-update-repo',
diff --git a/src/app/pages/repository/update/update-repo-admins.component.html b/src/app/pages/repository/update/update-repo-admins.component.html
new file mode 100644
index 000000000..feff0f0bd
--- /dev/null
+++ b/src/app/pages/repository/update/update-repo-admins.component.html
@@ -0,0 +1,129 @@
+
+
Update the users who can access the dashboard to manage the datasource.
+
+
{{errorMessage}}
+
+
+ {{ loadingMessage }}
+
+
+
+
+
+
+
+
+
+
+
+
+ Email:
+ {{repoAdmin.email}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{modalErrorMessage}}
+
+
+
+ {{ modalLoadingMessage }}
+
+
+
+
Are you sure you want to remove this user admin?
+
+
+ {{selectedAdminForDelete.firstName}} {{selectedAdminForDelete.lastName}}
+
+ {{ selectedAdminForDelete.email }}
+
+
+
+
+
+
+ {{modalErrorMessage}}
+
+
+
+ {{ modalLoadingMessage }}
+
+
+
Add the email address of the new user admin. Make sure the user already has an OpenAIRE account with this email address.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/repository/update/update-repo-admins.component.ts b/src/app/pages/repository/update/update-repo-admins.component.ts
new file mode 100644
index 000000000..7adbae643
--- /dev/null
+++ b/src/app/pages/repository/update/update-repo-admins.component.ts
@@ -0,0 +1,147 @@
+import {Component, Input, OnChanges, SimpleChanges, ViewChild} from '@angular/core';
+import { Repository, User } from '../../../domain/typeScriptClasses';
+import { RepositoryService } from '../../../services/repository.service';
+import {loadingRepoMessage} from '../../../domain/shared-messages';
+import {ConfirmationDialogComponent} from '../../../shared/reusablecomponents/confirmation-dialog.component';
+import {FormControl} from '@angular/forms';
+
+declare var UIkit: any;
+
+@Component ({
+ selector: 'app-update-repo-admins',
+ templateUrl: 'update-repo-admins.component.html',
+})
+
+export class UpdateRepoAdminsComponent implements OnChanges {
+
+ @Input() repo: Repository;
+
+ loadingMessage: string;
+ errorMessage: string;
+
+ repoAdmins: User[];
+
+ selectedAdminForDelete: User;
+
+ isDeleteModalShown: boolean;
+ @ViewChild('deleteRepositoryAdminModal')
+ public deleteRepositoryAdminModal: ConfirmationDialogComponent;
+
+ isAddModalShown: boolean;
+ @ViewChild('addRepositoryAdminModal')
+ public addRepositoryAdminModal: ConfirmationDialogComponent;
+
+ modalErrorMessage: string;
+ modalLoadingMessage: string;
+
+ emailControl = new FormControl();
+
+ constructor (private repoService: RepositoryService) { }
+
+ ngOnChanges(changes: SimpleChanges): void {
+ this.getRepositoryAdmins();
+ }
+
+ getRepositoryAdmins() {
+
+ this.loadingMessage = 'Retrieving repository\'s admins...';
+
+ this.repoService.getRepositoryAdmins(this.repo.id).subscribe(
+ users => {
+ this.repoAdmins = users;
+ },
+ error => {
+ console.log(error);
+ this.loadingMessage = '';
+ this.errorMessage = 'Error retrieving the repository\'s admins';
+ },
+ () => {
+ this.loadingMessage = '';
+ }
+ );
+ }
+
+ showDeletionModal(repoAdmin: User) {
+
+ this.errorMessage = '';
+ this.loadingMessage = '';
+
+ this.selectedAdminForDelete = repoAdmin;
+ if (this.selectedAdminForDelete) {
+ this.deleteRepositoryAdminModal.showModal();
+ // UIkit.modal('#deletionModal').show();
+ }
+ }
+
+ closeDeletionModal() {
+ this.selectedAdminForDelete = null;
+ this.deleteRepositoryAdminModal.hideModal();
+ // UIkit.modal('#deletionModal').hide();
+ }
+
+ deleteRepoAdmin(event: any) {
+ console.log('deleting: ', this.selectedAdminForDelete.email);
+
+ // this.deleteRepositoryAdminModal.hideModal();
+ this.modalLoadingMessage = 'Deleting admin...';
+
+ this.repoService.deleteRepositoryAdmin(this.repo.id, this.selectedAdminForDelete.email).subscribe(
+ res => {
+ this.selectedAdminForDelete = null;
+ this.deleteRepositoryAdminModal.hideModal();
+ this.getRepositoryAdmins();
+ },
+ error => {
+ console.log('Error deleting repository\'s admins', error);
+ this.modalLoadingMessage = '';
+ this.modalErrorMessage = 'Error deleting admin';
+ },
+ () => {
+ this.modalLoadingMessage = '';
+ // this.deleteRepositoryAdminModal.hideModal();
+ }
+ );
+
+ }
+
+ showAddRepoAdminModal() {
+
+ this.emailControl.reset();
+
+ this.modalErrorMessage = '';
+ this.modalLoadingMessage = '';
+
+ this.addRepositoryAdminModal.showModal();
+ // UIkit.modal('#addAdminModal').show();
+ }
+
+ addRepositoryAdmin() {
+
+ this.modalLoadingMessage = 'Adding repository admin';
+
+ console.log('Adding repository admin..', this.emailControl.value);
+
+ this.repoService.addRepositoryAdmin(this.repo.id, this.emailControl.value).subscribe(
+ res => {
+ this.addRepositoryAdminModal.hideModal();
+ this.getRepositoryAdmins();
+ }, error => {
+ console.log('Error adding repository admin', error);
+ this.modalLoadingMessage = '';
+ if(error.status === 404) {
+ this.modalErrorMessage = 'This email address is not associated with an OpenAIRE user account.\n' +
+ 'Please make sure the user has an OpenAIRE account and then try again.';
+ } else {
+ this.modalErrorMessage = 'Error deleting the user admin, please try again. If the error persists, ' +
+ 'please contact helpdesk@openaire.eu';
+ }
+ },
+ () => {
+ this.modalLoadingMessage = '';
+ }
+ );
+
+ // UIkit.modal('#addAdminModal').hide();
+ }
+
+}
diff --git a/src/app/services/repository.service.ts b/src/app/services/repository.service.ts
index 2c649035e..6a8b67f5a 100755
--- a/src/app/services/repository.service.ts
+++ b/src/app/services/repository.service.ts
@@ -12,7 +12,7 @@ import {
RepositoryInterface,
RepositorySnippet, RepositorySummaryInfo,
Timezone,
- Typology
+ Typology, User
} from '../domain/typeScriptClasses';
import { Observable, of } from 'rxjs';
import { timezones } from '../domain/timezones';
@@ -28,7 +28,7 @@ const headerOptions = {
@Injectable ()
export class RepositoryService {
- private apiUrl = environment.API_ENDPOINT + '/repository/';
+ private apiUrl = environment.API_ENDPOINT + '/repositories/';
private dashboardAPIUrl = environment.API_ENDPOINT + '/dashboard/';
constructor(private httpClient: HttpClient) { }
@@ -91,15 +91,15 @@ export class RepositoryService {
return this.httpClient.get
(url, headerOptions);
}
- getRepositoriesOfUser(): Observable {
- const url = `${this.apiUrl}getRepositoriesOfUser/0/100`;
+ getRepositoriesSnippetsOfUser(): Observable {
+ const url = `${this.apiUrl}snippets/user`;
console.log(`knocking on: ${url}`);
return this.httpClient.get(url, headerOptions);
}
getRepositoryById(id: string): Observable {
- const url = `${this.apiUrl}getRepositoryById/${id}`;
+ const url = `${this.apiUrl}getRepositoryById/${id}`;
console.log(`knocking on: ${url}`);
return this.httpClient.get(url, headerOptions);
}
@@ -144,7 +144,7 @@ export class RepositoryService {
}
getCountries(): Observable {
- const url = `${this.apiUrl}getCountries`;
+ const url = `${this.apiUrl}countries`;
console.log(`knocking on: ${url}`);
return this.httpClient.get(url, headerOptions);
}
@@ -193,4 +193,22 @@ export class RepositoryService {
console.log(`knocking on: ${url}`);
return this.httpClient.get(url, headerOptions);
}
+
+ getRepositoryAdmins(repoId: string): Observable {
+ const url = `${this.apiUrl}${repoId}/admins`;
+ console.log(`knocking on: ${url}`);
+ return this.httpClient.get(url, headerOptions);
+ }
+
+ deleteRepositoryAdmin(repoId: string, repoAdminEmail: string) {
+ const url = `${this.apiUrl}${repoId}/admins/${repoAdminEmail}`;
+ console.log(`knocking on: ${url}`);
+
+ return this.httpClient.delete(url, headerOptions);
+ }
+
+ addRepositoryAdmin(repoId: string, repoAdminEmail: string) {
+ const url = `${this.apiUrl}${repoId}/admins`;
+ return this.httpClient.post(url, repoAdminEmail, headerOptions);
+ }
}
diff --git a/src/app/shared/reusablecomponents/confirmation-dialog.component.html b/src/app/shared/reusablecomponents/confirmation-dialog.component.html
index cb6903103..de14ddbbc 100755
--- a/src/app/shared/reusablecomponents/confirmation-dialog.component.html
+++ b/src/app/shared/reusablecomponents/confirmation-dialog.component.html
@@ -31,6 +31,7 @@