Code Review
/
portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Adding search-user to portal-FE-os
[portal.git]
/
portal-FE-os
/
src
/
app
/
layout
/
components
/
search-users
/
search-users.component.ts
diff --git
a/portal-FE-common/src/app/layout/components/search-users/search-users.component.ts
b/portal-FE-os/src/app/layout/components/search-users/search-users.component.ts
similarity index 91%
rename from
portal-FE-common/src/app/layout/components/search-users/search-users.component.ts
rename to
portal-FE-os/src/app/layout/components/search-users/search-users.component.ts
index
b93ffd6
..
10e4e04
100644
(file)
--- a/
portal-FE-common/src/app/layout/components/search-users/search-users.component.ts
+++ b/
portal-FE-os/src/app/layout/components/search-users/search-users.component.ts
@@
-56,6
+56,7
@@
export class SearchUsersComponent implements OnInit {
@ViewChild(MatSort) sort: MatSort;
@ViewChild(MatPaginator) paginator: MatPaginator;
@Output() passBackSelectedUser: EventEmitter<any> = new EventEmitter();
@ViewChild(MatSort) sort: MatSort;
@ViewChild(MatPaginator) paginator: MatPaginator;
@Output() passBackSelectedUser: EventEmitter<any> = new EventEmitter();
+ @Output() userNotFoundFlag = new EventEmitter<boolean>();
searchString: string;
txtResults = 'result';
searchUsersResults: any;
searchString: string;
txtResults = 'result';
searchUsersResults: any;
@@
-65,6
+66,8
@@
export class SearchUsersComponent implements OnInit {
selectedUser: any;
displayedColumns: string[] = ['firstName'];
dataSourceMap = new MatTableDataSource(this.searchUsersResults);
selectedUser: any;
displayedColumns: string[] = ['firstName'];
dataSourceMap = new MatTableDataSource(this.searchUsersResults);
+ submitted = false;
+ message = " No users found with your query. Please change your search and try again.";
ngOnInit() {
this.searchString = '';
ngOnInit() {
this.searchString = '';
@@
-77,6
+80,7
@@
export class SearchUsersComponent implements OnInit {
this.passBackSelectedUser.emit(systemUser);
}
this.passBackSelectedUser.emit(systemUser);
}
+ noUserFlag: boolean = false;
searchUsers() {
if (!this.isSystemUser) {
this.isLoading = true;
searchUsers() {
if (!this.isSystemUser) {
this.isLoading = true;
@@
-85,11
+89,10
@@
export class SearchUsersComponent implements OnInit {
this.userService.searchUsers(this.searchString).subscribe((_data: PortalAdmin) => {
this.searchUsersResults = _data;
if (this.searchUsersResults == null || this.searchUsersResults.length == 0) {
this.userService.searchUsers(this.searchString).subscribe((_data: PortalAdmin) => {
this.searchUsersResults = _data;
if (this.searchUsersResults == null || this.searchUsersResults.length == 0) {
- const modelRef = this.ngModal.open(ConfirmationModalComponent)
- modelRef.componentInstance.title = "Confirmation";
- modelRef.componentInstance.message = " No users found with your query. Please change your search and try again."
+ this.noUserFlag = true;
this.isLoading = false;
} else {
this.isLoading = false;
} else {
+ this.noUserFlag = false;
this.showUserTable = true;
this.isLoading = false;
this.dataSourceMap = new MatTableDataSource(this.searchUsersResults);
this.showUserTable = true;
this.isLoading = false;
this.dataSourceMap = new MatTableDataSource(this.searchUsersResults);
@@
-104,4
+107,9
@@
export class SearchUsersComponent implements OnInit {
this.passBackSelectedUser.emit(this.selectedUser);
}
this.passBackSelectedUser.emit(this.selectedUser);
}
+ addNewUser() {
+ console.log("Emit the value to parent");
+ this.userNotFoundFlag.emit(true);
+ }
+
}
}