1 files changed, 25 insertions, 6 deletions

diff --git a/src/app/identity-page/identity-page.component.ts b/src/app/identity-page/identity-page.component.ts
index 296fe4c..0d6e784 100644
--- a/src/app/identity-page/identity-page.component.ts
+++ b/src/app/identity-page/identity-page.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Pipe } from "@angular/core";
 import { ApiService } from '../api.service';
 import { IdentityAPI } from '../identity-api';
+import { MessagesService } from '../messages.service';
 
 @Component({
   selector: 'app-identity-page',
@@ -12,14 +13,19 @@ export class IdentityPageComponent implements OnInit {
   identities: IdentityAPI[];
   filteredItems: IdentityAPI[];
   rename: boolean = false;
+  delete: boolean = false;
   changeIdentity: IdentityAPI;
   json: any;
+  is_displayed: boolean = true;
+  request: boolean = false;
 
-  constructor(private apiService: ApiService) { }
+  constructor(private apiService: ApiService,private message: MessagesService) { }
 
   getAPIs(): void {
+    this.request = true;
     this.apiService.getIdentities().subscribe(data => {
       this.identities = data;
+      this.request = false;
       this.assignCopy();
     });
   }
@@ -33,7 +39,7 @@ export class IdentityPageComponent implements OnInit {
   }
 
   filterItem(value : string){
-    this.onRenameCancel();
+    this.onReset();
     if(!value) this.assignCopy(); //when nothing has typed
     this.filteredItems = Object.assign([], this.identities).filter(
     item => {
@@ -44,27 +50,40 @@ export class IdentityPageComponent implements OnInit {
   }
 
   onClickRename(identity: IdentityAPI){
+    this.is_displayed = false;
     this.rename = true;
     this.changeIdentity = Object.assign({},identity);
   }
 
   onRename(identity: IdentityAPI){
-    this.rename = false;
+    this.request = true;
+    this.onReset();
     this.filteredItems = [];
     this.json = {'newname':identity.name};
     this.apiService.changeIdentity(identity.id,this.json).subscribe(data => {
+      this.message.pushSuccess('Rename was successful.');
       this.getAPIs();
     });
   }
 
-  onRenameCancel(){
+  onReset(){
     this.rename = false;
+    this.delete = false;
+    this.is_displayed = true;
+  }
+
+  onClickDelete(identity: IdentityAPI){
+    this.is_displayed = false;
+    this.delete = true;
+    this.changeIdentity = Object.assign({},identity);
   }
 
-  onClickDelete(id: string){
-    this.onRenameCancel();
+  onDelete(id:string){
+    this.request = true;
+    this.onReset();
     this.filteredItems = [];
     this.apiService.deleteIdentity(id).subscribe(data => {
+      this.message.pushSuccess('Delete was successful.');
       this.getAPIs();
     });
   }