summaryrefslogtreecommitdiffstats
path: root/portal-FE-common/src
diff options
context:
space:
mode:
authorRachitha Ramappa <rachitha.ramappa@att.com>2020-05-14 18:33:19 +0530
committerSunder Tattavarada <statta@research.att.com>2020-05-19 15:51:20 +0000
commita942e5cdc2998560a2810d4eec028301339623b5 (patch)
treea9ea8f7f5248a5a559fdb05e57f56e0bbfc83a3c /portal-FE-common/src
parent8e3d0ff5ce27cd87a257a2a95430add3dd3596ce (diff)
Adding search-user to portal-FE-os3.2.33.2.2
Change-Id: I7578f95d0e4f91d8499e9c973fc5bfc5a2e45e27 Issue-ID: PORTAL-867 Signed-off-by: rachitha.ramappa@att.com
Diffstat (limited to 'portal-FE-common/src')
-rw-r--r--portal-FE-common/src/app/layout/components/search-users/search-users.component.html70
-rw-r--r--portal-FE-common/src/app/layout/components/search-users/search-users.component.scss56
-rw-r--r--portal-FE-common/src/app/layout/components/search-users/search-users.component.spec.ts67
-rw-r--r--portal-FE-common/src/app/layout/components/search-users/search-users.component.ts107
-rw-r--r--portal-FE-common/src/app/shared/services/users/users.service.ts3
5 files changed, 1 insertions, 302 deletions
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 @@
-<!--
- ============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============================================
-
-
- -->
-
-<form>
- {{searchTitle}}
- <div class="form-row">
- <div class="col-md-6 my-1">
- <label for="inputSearch" class="sr-only"></label>
- <input id="inputSearch" pattern="[a-zA-Z0-9-'\s]{3,}" [(ngModel)]="searchString" (keyup)="passSystemUserInfo($event.srcElement.value)" maxlength="80"
- required="true" name="searchString" #searchInput auto-focus tabindex="0" autocomplete="off" type="text"
- class="form-control" value="searchString" placeholder="{{placeHolder}}">
- </div>
-
- <div class="col-auto my-1">
- <button id="button-search-users" *ngIf="!isSystemUser" [disabled]="!searchInput.validity.valid || isLoading " type="submit"
- class="btn btn-primary mb-2" (click)="searchUsers()"> Search
- </button>
- </div>
- </div>
-</form>
-<span class="ecomp-spinner" *ngIf="isLoading"></span>
-<div class="search-user-container" *ngIf="showUserTable && !isSystemUser">
- <table mat-table [dataSource]="dataSourceMap">
- <!-- Search Result Column-->
- <ng-container matColumnDef="firstName">
- <th id="rowheader-result" mat-header-cell *matHeaderCellDef> Showing {{searchUsersResults.length}} {{txtResults}} </th>
- <td id="table-data-{{i}}" mat-cell *matCellDef="let element; let i = index;">
- {{element.firstName}} {{element.lastName}} <br> {{element.jobTitle}}
- </td>
- </ng-container>
- <tr mat-header-row *matHeaderRowDef="displayedColumns; sticky: true"></tr>
- <tr mat-row (click)="setSelectedUser(row)" id="table-row-{{i}}" [ngClass]="{ 'selected': row === selectedUser }"
- *matRowDef="let row; columns: displayedColumns; let i = index;"></tr>
- </table>
-</div> \ 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<SearchUsersComponent>;
-
- 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<any> = 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);
}
}