diff --git a/UIAssets/src/app/_model/fabric.ts b/UIAssets/src/app/_model/fabric.ts index 8d3844b..561b792 100644 --- a/UIAssets/src/app/_model/fabric.ts +++ b/UIAssets/src/app/_model/fabric.ts @@ -15,13 +15,29 @@ export class Fabric { apic_password: string; controllers: string[]; fabric: string; + validate: boolean; + is_new: boolean; + password_confirm: string; - constructor(apic_cert?: string, apic_hostname?: string, apic_username?: string, apic_password?: string, controllers?: string[], fabric?: string) { + constructor( + apic_cert: string = '', + apic_hostname: string = '', + apic_username: string = '', + apic_password: string = '', + controllers: string[] = [], + fabric: string = '', + validate: boolean = true, + is_new: boolean = true, + password_confirm: string = '' + ) { this.apic_cert = apic_cert; this.apic_hostname = apic_hostname; this.apic_username = apic_username; this.apic_password = apic_password; this.controllers = controllers; this.fabric = fabric; + this.validate = validate; + this.is_new = is_new; + this.password_confirm = password_confirm; } } diff --git a/UIAssets/src/app/_model/user.ts b/UIAssets/src/app/_model/user.ts index c774b89..e1d1538 100644 --- a/UIAssets/src/app/_model/user.ts +++ b/UIAssets/src/app/_model/user.ts @@ -10,10 +10,25 @@ export class UserList { export class User { username: string; - role: any; + role: number; password: string; last_login: number; + is_new: boolean; + password_confirm: string; - public constructor() { + constructor( + username: string = '', + role: number = 2, + password: string = '', + last_login: number = 0, + is_new: boolean = false, + password_confirm: string = '' + ) { + this.username = username; + this.role = role; + this.password = password; + this.last_login = last_login; + this.is_new = is_new; + this.password_confirm = password_confirm; } } diff --git a/UIAssets/src/app/_service/backend.service.ts b/UIAssets/src/app/_service/backend.service.ts index 38a6993..bb6ee40 100644 --- a/UIAssets/src/app/_service/backend.service.ts +++ b/UIAssets/src/app/_service/backend.service.ts @@ -52,19 +52,30 @@ export class BackendService { } createUser(user: User): Observable { - return this.http.post(this.baseUrl + 'users', user); + let toSave = new User( + user.username, + user.role, + user.password + ); + delete toSave.last_login; + delete toSave.is_new; + delete toSave.password_confirm; + return this.http.post(this.baseUrl + 'users', toSave); } updateUser(user: User): Observable { - if (user.role === 'Admin') { - user.role = 0; - } else if (user.role === 'User') { - user.role = 1; - } else if (user.role === 'Blacklist') { - user.role = 2; + let toSave = new User( + user.username, + user.role, + user.password + ); + delete toSave.is_new; + delete toSave.password_confirm; + delete toSave.last_login; + if (toSave.password == '') { + delete toSave.password; } - delete user.last_login; - return this.http.patch(this.baseUrl + 'users/' + user.username, user); + return this.http.patch(this.baseUrl + 'users/' + toSave.username, toSave); } deleteUser(user: User): Observable { @@ -110,7 +121,19 @@ export class BackendService { } createFabric(fabric: Fabric): Observable { - return this.http.post(this.baseUrl + 'aci/fabrics', fabric); + let toSave = new Fabric( + fabric.apic_cert, + fabric.apic_hostname, + fabric.apic_username, + fabric.apic_password, + fabric.controllers, + fabric.fabric + ); + delete toSave.controllers; + delete toSave.validate; + delete toSave.is_new; + delete toSave.password_confirm; + return this.http.post(this.baseUrl + 'aci/fabrics', toSave); } getFabrics(): Observable { @@ -121,8 +144,22 @@ export class BackendService { } updateFabric(fabric: Fabric): Observable { - delete fabric.controllers; - return this.http.patch(this.baseUrl + 'aci/fabrics/' + fabric.fabric, fabric); + let toSave = new Fabric( + fabric.apic_cert, + fabric.apic_hostname, + fabric.apic_username, + fabric.apic_password, + fabric.controllers, + fabric.fabric + ); + delete toSave.controllers; + delete toSave.validate; + delete toSave.is_new; + delete toSave.password_confirm; + if (toSave.apic_password == '') { + delete toSave.apic_password; + } + return this.http.patch(this.baseUrl + 'aci/fabrics/' + toSave.fabric, toSave); } deleteFabric(fabric: Fabric): Observable { diff --git a/UIAssets/src/app/app.component.ts b/UIAssets/src/app/app.component.ts index 1c2c855..8e59c51 100644 --- a/UIAssets/src/app/app.component.ts +++ b/UIAssets/src/app/app.component.ts @@ -7,6 +7,7 @@ import {environment} from '../environments/environment'; import {BackendService} from './_service/backend.service'; import {Title} from '@angular/platform-browser'; import {CookieService} from 'ngx-cookie-service'; +import {UserList} from "./_model/user"; @Component({ selector: 'app-root', @@ -53,6 +54,10 @@ export class AppComponent implements OnInit, OnDestroy { } else { this.app_loaded = true; } + if (environment.login_required) { + this.backendService.getUsers().subscribe((results: UserList) => { + }); + } this.login_required = (localStorage.getItem('isLoggedIn') != 'true' && environment.login_required); this.router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe(event => { this.login_required = (localStorage.getItem('isLoggedIn') != 'true' && environment.login_required); diff --git a/UIAssets/src/app/comparison-detail/comparison-detail.component.html b/UIAssets/src/app/comparison-detail/comparison-detail.component.html index 8f8355b..c1796ef 100644 --- a/UIAssets/src/app/comparison-detail/comparison-detail.component.html +++ b/UIAssets/src/app/comparison-detail/comparison-detail.component.html @@ -241,7 +241,7 @@

Parameters

[sortable]="true" [flexGrow]="0.2"> - Global + Global {{ row['node_id'] | number }} diff --git a/UIAssets/src/app/comparison-result-detail/comparison-result-detail.component.html b/UIAssets/src/app/comparison-result-detail/comparison-result-detail.component.html index 5eb974f..75b939c 100644 --- a/UIAssets/src/app/comparison-result-detail/comparison-result-detail.component.html +++ b/UIAssets/src/app/comparison-result-detail/comparison-result-detail.component.html @@ -88,11 +88,11 @@
-
+
Line diff mode
-
-
-
+
+
+
+
+
+
+
+
+
-
-
- - -
- - - -
-
-
- Edit fabric -
-
-
-
+
- - + +
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
+
+
@@ -205,7 +164,9 @@

- +
diff --git a/UIAssets/src/app/fabric/fabric.component.ts b/UIAssets/src/app/fabric/fabric.component.ts index be4d74a..6efbc2e 100644 --- a/UIAssets/src/app/fabric/fabric.component.ts +++ b/UIAssets/src/app/fabric/fabric.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, TemplateRef, ViewChild} from "@angular/core"; +import {Component, OnInit, TemplateRef} from "@angular/core"; import {NotificationsService} from "angular2-notifications"; import {BsModalRef, BsModalService} from "ngx-bootstrap"; import {Fabric, FabricList} from "../_model/fabric"; @@ -16,12 +16,8 @@ export class FabricComponent implements OnInit { loadingMessage: string; selectedFabric: Fabric; fabric: Fabric; - editing = {}; fabrics: Fabric[]; - confirmPassword: string; - fromAddTemplate = false; fabricSorts: any; - @ViewChild('editTemplate') editModal: TemplateRef; constructor(private backendService: BackendService, private notificationService: NotificationsService, private modalService: BsModalService) { @@ -30,21 +26,18 @@ export class FabricComponent implements OnInit { } ngOnInit(): void { - this.getFabrics(false); + this.getFabrics(); } onSort(event) { this.backendService.prefs.fabric_sort = event.sorts; } - getFabrics(toBeVerified) { + getFabrics() { this.loading = true; this.backendService.getFabrics().subscribe((results: FabricList) => { this.fabrics = results.objects; this.rows = results.objects; - if (toBeVerified) { - this.verifyFabric(this.fabric); - } this.loading = false; }, (err) => { if (err['error'] !== undefined && err['error']['error'] !== undefined) { @@ -57,51 +50,44 @@ export class FabricComponent implements OnInit { } verifyFabric(fabric: Fabric) { - const fromAdd = this.fromAddTemplate; - this.fromAddTemplate = false; + const oldLoadingMessage = this.loadingMessage; + this.loadingMessage = 'Validating fabric ' + fabric.fabric; + this.loading = true; this.backendService.verifyFabric(fabric).subscribe((results) => { if (results['success']) { this.notificationService.success('Success', 'Credentials validated, fetching controllers'); this.backendService.updateFabricControllers(fabric).subscribe((results) => { if (results['success']) { this.notificationService.success('Success', 'Controllers fetched'); - this.getFabrics(false); - this.modalRef.hide(); + this.loadingMessage = oldLoadingMessage; + this.getFabrics(); } else { this.notificationService.error('Error', results['error']); - if (fromAdd) { - this.modalRef.hide(); - this.openModal(this.editModal, fabric); - } + this.loading = false; + this.loadingMessage = oldLoadingMessage; } }, (err) => { this.notificationService.error('Error', 'Could not get controllers'); - if (fromAdd) { - this.modalRef.hide(); - this.openModal(this.editModal, fabric); - } + this.loading = false; + this.loadingMessage = oldLoadingMessage; }); } else { this.notificationService.error('Error', results['error']); - if (fromAdd) { - this.modalRef.hide(); - this.openModal(this.editModal, fabric); - } + this.loading = false; + this.loadingMessage = oldLoadingMessage; } }, (err) => { this.notificationService.error('Error', 'Could not verify APIC'); - if (fromAdd) { - this.modalRef.hide(); - this.openModal(this.editModal, fabric); - } + this.loading = false; + this.loadingMessage = oldLoadingMessage; }); } deleteFabric() { this.loading = true; this.backendService.deleteFabric(this.selectedFabric).subscribe((results) => { - this.getFabrics(false); - this.modalRef.hide(); + this.hideModal(); + this.getFabrics(); }, (err) => { if (err['error'] !== undefined && err['error']['error'] !== undefined) { this.notificationService.error(err['error']['error']); @@ -113,32 +99,40 @@ export class FabricComponent implements OnInit { } public onSubmit() { - this.loading = true; - this.backendService.createFabric(this.fabric).subscribe((results) => { - this.getFabrics(true); - }, (err) => { - if (err['error'] !== undefined && err['error']['error'] !== undefined) { - this.notificationService.error(err['error']['error']); + if (this.fabric.apic_password !== undefined && this.fabric.apic_password != '' && this.fabric.apic_password == this.fabric.password_confirm) { + const validate = this.fabric.validate; + if (this.fabric.is_new) { + this.backendService.createFabric(this.fabric).subscribe((results) => { + if (validate) { + this.verifyFabric(this.fabric); + } else { + this.getFabrics(); + } + }, (err) => { + if (err['error'] !== undefined && err['error']['error'] !== undefined) { + this.notificationService.error(err['error']['error']); + } else { + this.notificationService.error('Error', 'Could not add fabric'); + } + this.loading = false; + }); } else { - this.notificationService.error('Error', 'Could not add fabric'); + this.backendService.updateFabric(this.fabric).subscribe((results) => { + if (validate) { + this.verifyFabric(this.fabric); + } else { + this.getFabrics(); + } + }, (err) => { + if (err['error'] !== undefined && err['error']['error'] !== undefined) { + this.notificationService.error(err['error']['error']); + } else { + this.notificationService.error('Error', 'Could not update fabric'); + } + this.loading = false; + }); } - this.loading = false; - }); - } - - public updateValue() { - if (this.confirmPassword !== this.fabric.apic_password) { - this.notificationService.error('Passwords do not match'); - return; } - this.confirmPassword = ''; - this.backendService.updateFabric(this.fabric).subscribe((results) => { - this.notificationService.success('Success', 'Changes saved'); - this.getFabrics(true); - }, (err) => { - this.notificationService.error('Error', 'Could not update fabric'); - this.loading = false; - }); } updateFilter(event) { @@ -150,7 +144,6 @@ export class FabricComponent implements OnInit { public openAddModal(template: TemplateRef) { this.fabric = new Fabric(); - this.fromAddTemplate = true; this.modalRef = this.modalService.show(template, { animated: true, keyboard: true, @@ -162,11 +155,16 @@ export class FabricComponent implements OnInit { public openModal(template: TemplateRef, fabric: Fabric) { this.selectedFabric = fabric; - if (this.editModal === template) { - this.fabric = new Fabric( - fabric.apic_cert, fabric.apic_hostname, fabric.apic_username, fabric.apic_password, fabric.controllers, fabric.fabric - ); - } + this.fabric = new Fabric( + fabric.apic_cert, + fabric.apic_hostname, + fabric.apic_username, + fabric.apic_password, + fabric.controllers, + fabric.fabric, + false, + false + ); this.modalRef = this.modalService.show(template, { animated: true, keyboard: true, diff --git a/UIAssets/src/app/login/login.component.ts b/UIAssets/src/app/login/login.component.ts index 326c86b..24c06eb 100644 --- a/UIAssets/src/app/login/login.component.ts +++ b/UIAssets/src/app/login/login.component.ts @@ -29,7 +29,6 @@ export class LoginComponent implements OnInit { localStorage.setItem('userName', this.username); this.backendService.getUserDetails(this.username).subscribe((response) => { const userDetails = response['objects'][0]; - console.log(this.cookieService.get('session')); localStorage.setItem('userRole', userDetails['role']); }, (error) => { this.notificationService.error('Could not get user details'); diff --git a/UIAssets/src/app/snapshot/snapshot.component.ts b/UIAssets/src/app/snapshot/snapshot.component.ts index 651477b..a571aa1 100644 --- a/UIAssets/src/app/snapshot/snapshot.component.ts +++ b/UIAssets/src/app/snapshot/snapshot.component.ts @@ -218,7 +218,6 @@ export class SnapshotComponent implements OnInit { if (row.status === 'complete') { this.backendService.downloadSnapshot(row._id, row.filename).subscribe( (data) => { - console.log(data); const blob = new Blob([data.data], {type: 'application/gzip'}); const blobUrl = window.URL.createObjectURL(blob); const a = document.createElement('a'); diff --git a/UIAssets/src/app/user/user.component.html b/UIAssets/src/app/user/user.component.html index c1dde0e..75297c4 100644 --- a/UIAssets/src/app/user/user.component.html +++ b/UIAssets/src/app/user/user.component.html @@ -73,7 +73,7 @@

+ (click)="openModal(addtemplate,row)">
-
- Add a new user -
+
Add a new user
+
Edit user
- +
- +
-
-
- - -
-
-
-
-   -
-
-
-
-
- - -
-
- - -
-
-
- Update user -
-
-
-
+
- - + +
- - -
-
-
-
- - -
-
-
-
- - +
@@ -187,7 +144,9 @@

- +
diff --git a/UIAssets/src/app/user/user.component.ts b/UIAssets/src/app/user/user.component.ts index 3629def..dc021b7 100644 --- a/UIAssets/src/app/user/user.component.ts +++ b/UIAssets/src/app/user/user.component.ts @@ -17,12 +17,10 @@ export class UserComponent implements OnInit { selectedUser: User; users: User[]; user: User; - roles: any[]; - editing = {}; - confirmPassword: string; usernameSort: any; userRole: number; userName: string; + roles: ({ id: number; name: string })[]; constructor(private backendService: BackendService, private notificationService: NotificationsService, private modalService: BsModalService) { @@ -79,27 +77,20 @@ export class UserComponent implements OnInit { public onSubmit() { this.modalRef.hide(); this.loading = true; - this.backendService.createUser(this.user).subscribe((results) => { - this.getUsers(); - }, (err) => { - this.notificationService.error('Error', 'Could not add user'); - this.loading = false; - }); - } - - public updateValue() { - if (this.confirmPassword === this.user.password) { - this.confirmPassword = ''; + if (this.user.is_new) { + this.backendService.createUser(this.user).subscribe((results) => { + this.getUsers(); + }, (err) => { + this.notificationService.error('Error', 'Could not add user'); + this.loading = false; + }); + } else { this.backendService.updateUser(this.user).subscribe((results) => { - this.notificationService.success('Success', 'Changes saved'); - this.hideModal(); this.getUsers(); }, (err) => { this.notificationService.error('Error', 'Could not update user'); this.loading = false; }); - } else { - this.notificationService.error('Passwords do not match'); } } @@ -116,6 +107,13 @@ export class UserComponent implements OnInit { public openModal(template: TemplateRef, user: User) { this.selectedUser = user; + this.user = new User( + user.username, + user.role, + user.password, + user.last_login, + false + ); this.modalRef = this.modalService.show(template, { animated: true, keyboard: true, @@ -128,15 +126,4 @@ export class UserComponent implements OnInit { public hideModal() { this.modalRef.hide(); } - - public editMode(template: TemplateRef, user: User) { - this.user = user; - this.modalRef = this.modalService.show(template, { - animated: true, - keyboard: true, - backdrop: false, - ignoreBackdropClick: false, - class: 'modal-lg', - }); - } } diff --git a/UIAssets/src/index.html b/UIAssets/src/index.html index 1e7ade0..b4c7df6 100644 --- a/UIAssets/src/index.html +++ b/UIAssets/src/index.html @@ -21,7 +21,7 @@ } - +