From 9b46ab4fa5ecd3e84fb679ae4ce540a170881cc5 Mon Sep 17 00:00:00 2001 From: Rachitha Ramappa Date: Thu, 14 May 2020 18:33:19 +0530 Subject: Adding search-user to portal-FE-os Change-Id: I7578f95d0e4f91d8499e9c973fc5bfc5a2e45e27 Issue-ID: PORTAL-867 Signed-off-by: rachitha.ramappa@att.com --- .../search-users/search-users.component.html | 70 -------------- .../search-users/search-users.component.scss | 56 ----------- .../search-users/search-users.component.spec.ts | 67 ------------- .../search-users/search-users.component.ts | 107 --------------------- .../src/app/shared/services/users/users.service.ts | 3 +- 5 files changed, 1 insertion(+), 302 deletions(-) delete mode 100644 portal-FE-common/src/app/layout/components/search-users/search-users.component.html delete mode 100644 portal-FE-common/src/app/layout/components/search-users/search-users.component.scss delete mode 100644 portal-FE-common/src/app/layout/components/search-users/search-users.component.spec.ts delete mode 100644 portal-FE-common/src/app/layout/components/search-users/search-users.component.ts (limited to 'portal-FE-common/src') diff --git a/portal-FE-common/src/app/layout/components/search-users/search-users.component.html b/portal-FE-common/src/app/layout/components/search-users/search-users.component.html deleted file mode 100644 index 03624491..00000000 --- a/portal-FE-common/src/app/layout/components/search-users/search-users.component.html +++ /dev/null @@ -1,70 +0,0 @@ - - -
- {{searchTitle}} -
-
- - -
- -
- -
-
-
- -
- - - - - - - - -
Showing {{searchUsersResults.length}} {{txtResults}} - {{element.firstName}} {{element.lastName}}
{{element.jobTitle}} -
-
\ No newline at end of file diff --git a/portal-FE-common/src/app/layout/components/search-users/search-users.component.scss b/portal-FE-common/src/app/layout/components/search-users/search-users.component.scss deleted file mode 100644 index 95a2a5ec..00000000 --- a/portal-FE-common/src/app/layout/components/search-users/search-users.component.scss +++ /dev/null @@ -1,56 +0,0 @@ -/*- - * ============LICENSE_START========================================== - * ONAP Portal - * =================================================================== - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * - * Unless otherwise specified, all software contained herein is licensed - * under the Apache License, Version 2.0 (the "License"); - * you may not use this software except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ============LICENSE_END============================================ - * - * - */ - -@import "../../../pages/pages.component"; - -.mat-row { - cursor: pointer; - background-color: #f2f2f2; -} -.selected { - background-color: #ffffff !important; -} - -.search-user-container { - overflow-y: auto; - height: 250px; -} - -.ecomp-spinner{ - opacity: 10; -} diff --git a/portal-FE-common/src/app/layout/components/search-users/search-users.component.spec.ts b/portal-FE-common/src/app/layout/components/search-users/search-users.component.spec.ts deleted file mode 100644 index 9db3e395..00000000 --- a/portal-FE-common/src/app/layout/components/search-users/search-users.component.spec.ts +++ /dev/null @@ -1,67 +0,0 @@ -/*- - * ============LICENSE_START========================================== - * ONAP Portal - * =================================================================== - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * - * Unless otherwise specified, all software contained herein is licensed - * under the Apache License, Version 2.0 (the "License"); - * you may not use this software except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ============LICENSE_END============================================ - * - * - */ - -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { SearchUsersComponent } from './search-users.component'; -import { NgMaterialModule } from 'src/app/ng-material-module'; -import { FormsModule } from '@angular/forms'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; - -describe('SearchUsersComponent', () => { - let component: SearchUsersComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ SearchUsersComponent ], - imports: [FormsModule,NgMaterialModule,HttpClientTestingModule] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(SearchUsersComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/portal-FE-common/src/app/layout/components/search-users/search-users.component.ts b/portal-FE-common/src/app/layout/components/search-users/search-users.component.ts deleted file mode 100644 index b93ffd61..00000000 --- a/portal-FE-common/src/app/layout/components/search-users/search-users.component.ts +++ /dev/null @@ -1,107 +0,0 @@ -/*- - * ============LICENSE_START========================================== - * ONAP Portal - * =================================================================== - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * - * Unless otherwise specified, all software contained herein is licensed - * under the Apache License, Version 2.0 (the "License"); - * you may not use this software except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ============LICENSE_END============================================ - * - * - */ -import { Component, OnInit, Input, ViewChild, Output, EventEmitter } from '@angular/core'; -import { UsersService } from 'src/app/shared/services'; -import { MatTableDataSource, MatPaginator, MatSort } from '@angular/material'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { ConfirmationModalComponent } from 'src/app/modals/confirmation-modal/confirmation-modal.component'; -import { PortalAdmin } from 'src/app/shared/model/PortalAdmin'; - -@Component({ - selector: 'app-search-users', - templateUrl: './search-users.component.html', - styleUrls: ['./search-users.component.scss'] -}) -export class SearchUsersComponent implements OnInit { - - constructor(private userService: UsersService, private ngModal: NgbModal) { } - @Input() searchTitle: string; - @Input() placeHolder: string; - @Input() isSystemUser: boolean; - @ViewChild(MatSort) sort: MatSort; - @ViewChild(MatPaginator) paginator: MatPaginator; - @Output() passBackSelectedUser: EventEmitter = new EventEmitter(); - searchString: string; - txtResults = 'result'; - searchUsersResults: any; - selected: any; - isLoading: boolean; - showUserTable: boolean; - selectedUser: any; - displayedColumns: string[] = ['firstName']; - dataSourceMap = new MatTableDataSource(this.searchUsersResults); - - ngOnInit() { - this.searchString = ''; - this.showUserTable = false; - this.isSystemUser = false; - } - - passSystemUserInfo(systemUser: string) { - if (this.isSystemUser) - this.passBackSelectedUser.emit(systemUser); - } - - searchUsers() { - if (!this.isSystemUser) { - this.isLoading = true; - this.showUserTable = false; - this.passBackSelectedUser.emit(this.selectedUser = ''); - 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.isLoading = false; - } else { - this.showUserTable = true; - this.isLoading = false; - this.dataSourceMap = new MatTableDataSource(this.searchUsersResults); - this.txtResults = (this.searchUsersResults && this.searchUsersResults.length > 1) ? 'results' : 'result'; - } - }); - } - } - - setSelectedUser(user: PortalAdmin) { - this.selectedUser = user; - this.passBackSelectedUser.emit(this.selectedUser); - } - -} diff --git a/portal-FE-common/src/app/shared/services/users/users.service.ts b/portal-FE-common/src/app/shared/services/users/users.service.ts index 38ebedd8..d977f724 100644 --- a/portal-FE-common/src/app/shared/services/users/users.service.ts +++ b/portal-FE-common/src/app/shared/services/users/users.service.ts @@ -78,8 +78,7 @@ export class UsersService { addNewUser(newUserData){ console.log("User service : ", newUserData); - return this.http.post(this.api.saveNewUser, newUserData).subscribe((response)=>{ - }); + return this.http.post(this.api.saveNewUser, newUserData); } } -- cgit 1.2.3-korg