+
This will pull all the data for the user (id: {{data.id}}, user-id: {{data.userId}}) again in the specified date range.
+
+
+
You can now change the date range if required:
+
+
+
+
+
+
+
+
+
+
+
+
-
{{ errorMessage}}
+
+
+
diff --git a/authorizer-app/src/app/components/rest-source-authorization/rest-source-user-list.component.ts b/authorizer-app/src/app/components/rest-source-authorization/rest-source-user-list.component.ts
index 589df6bd..7b2ce964 100644
--- a/authorizer-app/src/app/components/rest-source-authorization/rest-source-user-list.component.ts
+++ b/authorizer-app/src/app/components/rest-source-authorization/rest-source-user-list.component.ts
@@ -1,7 +1,25 @@
-import { Component, OnInit, AfterViewInit, ViewChild } from '@angular/core';
-import { MatPaginator, MatSort, MatTableDataSource} from '@angular/material';
+import {
+ AfterViewInit,
+ Component,
+ Inject,
+ OnInit,
+ ViewChild
+} from '@angular/core';
+import {
+ MAT_DIALOG_DATA,
+ MatDatepickerInputEvent,
+ MatDialog,
+ MatDialogRef,
+ MatPaginator,
+ MatSort,
+ MatTableDataSource
+} from '@angular/material';
import { RestSourceUser } from '../../models/rest-source-user.model';
import { RestSourceUserService } from '../../services/rest-source-user.service';
+import { FormControl } from '@angular/forms';
+import { HttpErrorResponse } from '@angular/common/http';
+import * as moment from 'moment';
+import deepcopy from 'ts-deepcopy';
@Component({
selector: 'rest-source-list',
@@ -9,9 +27,20 @@ import { RestSourceUserService } from '../../services/rest-source-user.service';
styleUrls: ['./rest-source-user-list.component.css']
})
export class RestSourceUserListComponent implements OnInit, AfterViewInit {
-
- displayedColumns = ['id', 'projectId', 'userId', 'sourceId', 'startDate',
- 'endDate', 'externalUserId', 'authorized', 'edit', 'delete'];
+ displayedColumns = [
+ 'id',
+ 'projectId',
+ 'userId',
+ 'sourceId',
+ 'startDate',
+ 'endDate',
+ 'externalUserId',
+ 'authorized',
+ 'version',
+ 'edit',
+ 'reset',
+ 'delete'
+ ];
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
@@ -22,7 +51,10 @@ export class RestSourceUserListComponent implements OnInit, AfterViewInit {
dataSource: MatTableDataSource
;
- constructor(private restSourceUserService: RestSourceUserService) { }
+ constructor(
+ private restSourceUserService: RestSourceUserService,
+ public dialog: MatDialog
+ ) {}
ngOnInit() {
this.loadAllRestSourceUsers();
@@ -45,13 +77,15 @@ export class RestSourceUserListComponent implements OnInit, AfterViewInit {
}
private loadAllRestSourceUsers() {
- this.restSourceUserService.getAllUsers().subscribe((data: any) => {
+ this.restSourceUserService.getAllUsers().subscribe(
+ (data: any) => {
this.restSourceUsers = data.users;
this.dataSource.data = this.restSourceUsers;
},
() => {
this.errorMessage = 'Cannot load registered users!';
- });
+ }
+ );
}
removeDevice(restSourceUser: RestSourceUser) {
@@ -60,4 +94,104 @@ export class RestSourceUserListComponent implements OnInit, AfterViewInit {
});
}
+ resetUser(restSourceUser: RestSourceUser) {
+ this.restSourceUserService.resetUser(restSourceUser.id).subscribe(() => {
+ this.loadAllRestSourceUsers();
+ });
+ }
+
+ openDeleteDialog(restSourceUser: RestSourceUser) {
+ const dialogRef = this.dialog.open(RestSourceUserListDeleteDialog, {
+ data: restSourceUser
+ });
+
+ dialogRef.afterClosed().subscribe(user => {
+ console.log('Deleting user...');
+ this.removeDevice(user);
+ });
+ }
+
+ openResetDialog(restSourceUser: RestSourceUser) {
+ const dialogRef = this.dialog.open(RestSourceUserListResetDialog, {
+ data: restSourceUser
+ });
+
+ dialogRef.afterClosed().subscribe((user: RestSourceUser) => {
+ if (
+ user.startDate != restSourceUser.startDate ||
+ user.endDate != restSourceUser.endDate
+ ) {
+ console.log('Updating user details...');
+ this.restSourceUserService.updateUser(user).subscribe(
+ () => {
+ console.log('Resetting user...');
+ this.resetUser(user);
+ },
+ (err: HttpErrorResponse) => {
+ if (err.error instanceof ErrorEvent) {
+ // A client-side or network error occurred. Handle it accordingly.
+ this.errorMessage =
+ 'Something went wrong. Please check your connection.';
+ } else {
+ // The backend returned an unsuccessful response code.
+ // The response body may contain clues as to what went wrong,
+ this.errorMessage = `Backend Error: Status=${err.status},
+ Body: ${err.error.error}, ${err.error.message}`;
+ }
+ }
+ );
+ } else {
+ console.log('Resetting user...');
+ this.resetUser(user);
+ }
+ });
+ }
+}
+
+@Component({
+ selector: 'rest-source-user-list-delete-dialog',
+ templateUrl: 'rest-source-user-list-delete-dialog.html'
+})
+export class RestSourceUserListDeleteDialog {
+ constructor(
+ public dialogRef: MatDialogRef,
+ @Inject(MAT_DIALOG_DATA) public data: RestSourceUser
+ ) {}
+
+ closeDeleteDialog(): void {
+ this.dialogRef.close();
+ }
+}
+
+@Component({
+ selector: 'rest-source-user-list-reset-dialog',
+ templateUrl: 'rest-source-user-list-reset-dialog.html'
+})
+export class RestSourceUserListResetDialog {
+ startDateFormControl: FormControl;
+ endDateFormControl: FormControl;
+
+ // Stores a copy of the data so as to not modify the original content
+ dataCopy: RestSourceUser;
+
+ constructor(
+ public dialogRef: MatDialogRef,
+ @Inject(MAT_DIALOG_DATA) public data: RestSourceUser
+ ) {
+ this.startDateFormControl = new FormControl(moment(this.data.startDate));
+ this.endDateFormControl = new FormControl(moment(this.data.endDate));
+ this.dataCopy = deepcopy(this.data);
+ }
+
+ closeResetDialog(): void {
+ this.dialogRef.close();
+ }
+
+ updateStartDateValue(event: MatDatepickerInputEvent) {
+ this.dataCopy.startDate = event.value.toISOString();
+ }
+
+ updateEndDateValue(event: MatDatepickerInputEvent) {
+ this.dataCopy.endDate = event.value.toISOString();
+ }
}
diff --git a/authorizer-app/src/app/components/rest-source-authorization/rest-source-user-registration-form.component.ts b/authorizer-app/src/app/components/rest-source-authorization/rest-source-user-registration-form.component.ts
index 1295a52b..0e86c710 100644
--- a/authorizer-app/src/app/components/rest-source-authorization/rest-source-user-registration-form.component.ts
+++ b/authorizer-app/src/app/components/rest-source-authorization/rest-source-user-registration-form.component.ts
@@ -1,9 +1,9 @@
-import {Component, OnInit} from "@angular/core";
-import {RestSourceUserService} from "../../services/rest-source-user.service";
-import {PlatformLocation} from "@angular/common";
-import {SourceClientAuthorizationService} from "../../services/source-client-authorization.service";
-import {FormBuilder} from "@angular/forms";
-import {RestSourceClientDetails} from "../../models/source-client-details.model";
+import {Component, OnInit} from '@angular/core';
+import {RestSourceUserService} from '../../services/rest-source-user.service';
+import {PlatformLocation} from '@angular/common';
+import {SourceClientAuthorizationService} from '../../services/source-client-authorization.service';
+import {FormBuilder} from '@angular/forms';
+import {RestSourceClientDetails} from '../../models/source-client-details.model';
@Component({
selector: 'rest-source-user-registration-form',
@@ -32,7 +32,7 @@ export class RestSourceUserRegistrationFormComponent implements OnInit {
data => {
this.sourceTypes = data;
}
- )
+ );
}
createForm() {
@@ -49,7 +49,7 @@ export class RestSourceUserRegistrationFormComponent implements OnInit {
+ this.platformLocation.getBaseHrefFromDOM()
+ 'users:new';
}
- )
+ );
}
}
diff --git a/authorizer-app/src/app/components/rest-source-authorization/update-rest-source-user.component.html b/authorizer-app/src/app/components/rest-source-authorization/update-rest-source-user.component.html
index 96dfe9fd..0f26fe75 100644
--- a/authorizer-app/src/app/components/rest-source-authorization/update-rest-source-user.component.html
+++ b/authorizer-app/src/app/components/rest-source-authorization/update-rest-source-user.component.html
@@ -67,6 +67,10 @@ Enter details for User with External User Id: {{restSourceUser.externalUser
+