Angular upgrade
- Upgraded Angular from 14 to 15 version.
Change-Id: I2339a04020153cbc9ed7a14bfe8e0aa265e507da
Signed-off-by: SANDHYA.JS <sandhya.j@tataelxsi.co.in>
diff --git a/src/app/users/add-user/AddEditUserComponent.html b/src/app/users/add-user/AddEditUserComponent.html
index d3a0b08..6ae0f32 100644
--- a/src/app/users/add-user/AddEditUserComponent.html
+++ b/src/app/users/add-user/AddEditUserComponent.html
@@ -28,7 +28,7 @@
<label class="col-sm-12 col-form-label mandatory-label"
[ngClass]="{'text-danger': userForm.invalid === true && submitted === true,'message': isPassword && userForm.invalid === true && submitted }">{{'MANDATORYCHECK'|
translate}}</label>
- <div class="row form-group" *ngIf="userType === 'add' || userType === 'editUserName'">
+ <div class="row form-group mb-3" *ngIf="userType === 'add' || userType === 'editUserName'">
<div class="col-sm-4">
<label for="userName">{{'PAGE.USERS.USERNAME' | translate}} *</label>
</div>
@@ -43,7 +43,7 @@
</div>
</div>
<ng-container *ngIf="userType === 'add' || userType === 'editPassword' || userType === 'changePassword'">
- <div class="row form-group" *ngIf=" userType === 'changePassword'">
+ <div class="row form-group mb-3" *ngIf=" userType === 'changePassword'">
<div class="col-sm-4">
<label for="oldpassword">{{'PAGE.USERS.OLDPASSWORD' | translate}} *</label>
</div>
@@ -53,7 +53,7 @@
[ngClass]="{ 'is-invalid': submitted && f.old_password.errors }" required>
</div>
</div>
- <div class="row form-group" *ngIf="userType === 'add' || userType === 'editPassword'">
+ <div class="row form-group mb-3" *ngIf="userType === 'add' || userType === 'editPassword'">
<div class="col-sm-4">
<label for="password">{{'PAGE.USERS.PASSWORD' | translate}} *</label>
</div>
@@ -68,7 +68,7 @@
{{'PAGE.LOGIN.PASSWORDMINLENGTHVALIDMESSAGE' | translate}} </div>
</div>
</div>
- <div class="row form-group" *ngIf="userType === 'changePassword'">
+ <div class="row form-group mb-3" *ngIf="userType === 'changePassword'">
<div class="col-sm-4">
<label for="password">{{'PAGE.USERS.NEWPASSWORD' | translate}} *</label>
</div>
@@ -83,7 +83,7 @@
{{'PAGE.LOGIN.PASSWORDMINLENGTHVALIDMESSAGE' | translate}} </div>
</div>
</div>
- <div class="row form-group">
+ <div class="row form-group mb-3">
<div class="col-sm-4">
<label for="password2">{{'PAGE.USERS.CONFPASSWORD' | translate}} *</label>
</div>
@@ -100,7 +100,7 @@
</div>
</div>
</ng-container>
- <div class="form-group row" *ngIf="userType === 'add'">
+ <div class="form-group row mb-3" *ngIf="userType === 'add'">
<label class="col-sm-4 col-form-label">{{'DOMAIN' | translate}} {{'NAME' | translate}}</label>
<div class="col-sm-8">
<ng-select [clearable]="false" placeholder="{{'SELECT' | translate}}" [items]="domains" bindLabel="title"
diff --git a/src/app/users/add-user/AddEditUserComponent.scss b/src/app/users/add-user/AddEditUserComponent.scss
index 3520b4e..fc31506 100644
--- a/src/app/users/add-user/AddEditUserComponent.scss
+++ b/src/app/users/add-user/AddEditUserComponent.scss
@@ -57,4 +57,7 @@
@include padding-value(0, 0, 0, 10);
@include margin-value(0, 0, 10, 0);
@include font(null, 11px, null);
+}
+.mandatory-label {
+ margin-left: 10px;
}
\ No newline at end of file
diff --git a/src/app/users/add-user/AddEditUserComponent.ts b/src/app/users/add-user/AddEditUserComponent.ts
index 2931d79..a816c62 100644
--- a/src/app/users/add-user/AddEditUserComponent.ts
+++ b/src/app/users/add-user/AddEditUserComponent.ts
@@ -18,7 +18,6 @@
/**
* @file Add Edit Component.
*/
-import { isNullOrUndefined } from 'util';
import { HttpHeaders } from '@angular/common/http';
import { Component, Injector, Input, OnInit } from '@angular/core';
import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms';
@@ -29,7 +28,7 @@
import { APIURLHEADER, ERRORDATA, LOGINPARAMS, MODALCLOSERESPONSEDATA, TYPESECTION } from 'CommonModel';
import { environment } from 'environment';
import { RestService } from 'RestService';
-import { SharedService } from 'SharedService';
+import { SharedService, isNullOrUndefined } from 'SharedService';
/**
* Creating component
diff --git a/src/app/users/project-role/ProjectRoleComponent.html b/src/app/users/project-role/ProjectRoleComponent.html
index 31f71e4..477549c 100644
--- a/src/app/users/project-role/ProjectRoleComponent.html
+++ b/src/app/users/project-role/ProjectRoleComponent.html
@@ -29,7 +29,7 @@
<i class="fas fa-plus-circle"></i> {{'PAGE.USERS.ADDMAPPINGS' | translate}}</button>
</div>
</div>
- <label class="col-sm-12 col-form-label mandatory-label"
+ <label class="col-sm-12 col-form-label mandatory-label ps-2"
[ngClass]="{'text-danger': projectRoleForm.invalid === true && submitted === true}">{{'MANDATORYCHECK' |
translate}}</label>
<div *ngFor="let params of getControls(); let i = index;" [formGroupName]="i">
@@ -40,8 +40,7 @@
<div class="col-sm-8 col-md-8">
<ng-select placeholder="{{'SELECT' | translate}}" [items]="projects" bindLabel="name"
bindValue="name" formControlName="project_name" id="project_{{i}}"
- [ngClass]="{ 'is-invalid': submitted && params.controls.project_name.errors }">
- </ng-select>
+ [ngClass]="{ 'is-invalid': submitted && params.controls.project_name.errors }"></ng-select>
</div>
<label class="col-sm-3 col-md-3 col-form-label" for="roles_{{i}}">{{'ROLES' |
translate}}*</label>
@@ -52,16 +51,16 @@
</div>
<div class="col-sm-1"
*ngIf="userDetails.project_role_mappings[i] ? userDetails.project_role_mappings[i].project_name === '' : true">
- <button class="button-xs" type="button" class="close" (click)="removeMapping(i)"
+ <button class="button-xs" type="button" class="delete" (click)="removeMapping(i)"
placement="right" ngbTooltip="{{ 'CANCEL' | translate }}">
<i class="fas fa-minus-circle text-danger"></i>
</button>
</div>
<div class="col-sm-1"
*ngIf="userDetails.project_role_mappings[i] ? userDetails.project_role_mappings[i].project_name !== '' : false">
- <button class="button-xs" type="button" class="close"
- (click)="deleteProjectAndRoleMapping(userDetails.project_role_mappings[i])" placement="right"
- ngbTooltip="{{ 'DELETE' | translate }}">
+ <button class="button-xs" type="button" class="delete"
+ (click)="deleteProjectAndRoleMapping(userDetails.project_role_mappings[i])"
+ placement="right" ngbTooltip="{{ 'DELETE' | translate }}">
<i class="fas fa-trash-alt text-danger"></i>
</button>
</div>
diff --git a/src/app/users/project-role/ProjectRoleComponent.scss b/src/app/users/project-role/ProjectRoleComponent.scss
index c80a776..09ff918 100644
--- a/src/app/users/project-role/ProjectRoleComponent.scss
+++ b/src/app/users/project-role/ProjectRoleComponent.scss
@@ -33,5 +33,17 @@
}
.col-sm-1{
- bottom: 10px;
-}
\ No newline at end of file
+ position: relative;
+ bottom: 10px;
+}
+.modal-body .row{
+ margin-bottom: 0px;
+}
+.delete{
+ position: absolute;
+ bottom: 8px;
+ left: 3px;
+ border: 0;
+ font-size: 1.3125rem;
+ background-color: transparent;
+}
diff --git a/src/app/users/user-details/UserDetailsComponent.html b/src/app/users/user-details/UserDetailsComponent.html
index 49661cb..985d64f 100644
--- a/src/app/users/user-details/UserDetailsComponent.html
+++ b/src/app/users/user-details/UserDetailsComponent.html
@@ -15,7 +15,7 @@
Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.in), BARATH KUMAR R (barath.r@tataelxsi.co.in)
-->
-<div class="row d-flex flex-row justify-content-between">
+<div class="d-flex flex-row justify-content-between">
<div class="d-flex align-items-center header-style">{{'PAGE.DASHBOARD.USERS' | translate}}</div>
<span class="button">
<button class="btn btn-primary" type="button" (click)="composeUser()" placement="top" container="body"
@@ -25,8 +25,8 @@
</button>
</span>
</div>
-<div class="row mt-2 mb-0 form-group justify-content-end list-utilites-actions">
- <div *ngIf="isAdminShow" class="col-auto mr-auto">
+<div class="mt-2 mb-2 form-group justify-content-end list-utilites-actions">
+ <div *ngIf="isAdminShow" class="col-auto me-auto">
<nav class="custom-items-config">
<span><i class="fas fa-user-check text-success"></i>{{userActive}}</span>
<span><i class="fas fa-user-lock text-danger"></i>{{userLocked}}</span>
@@ -34,7 +34,7 @@
<span><i class="fas fa-user-shield text-info"></i>{{userAlwaysActive}}</span>
</nav>
</div>
- <page-per-row class="mr-2" (pagePerRow)="onChange($event)"></page-per-row>
+ <page-per-row class="me-2" (pagePerRow)="onChange($event)"></page-per-row>
<page-reload></page-reload>
</div>
<div class="smarttable-style bg-white mt-1">
diff --git a/src/app/users/user-details/UserDetailsComponent.ts b/src/app/users/user-details/UserDetailsComponent.ts
index c56f43a..65ef878 100644
--- a/src/app/users/user-details/UserDetailsComponent.ts
+++ b/src/app/users/user-details/UserDetailsComponent.ts
@@ -19,7 +19,6 @@
/**
* @file users details Component.
*/
-import { isNullOrUndefined } from 'util';
import { Component, Injector, OnDestroy, OnInit } from '@angular/core';
import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
import { TranslateService } from '@ngx-translate/core';
@@ -31,7 +30,7 @@
import { ProjectService } from 'ProjectService';
import { RestService } from 'RestService';
import { Subscription } from 'rxjs';
-import { SharedService } from 'SharedService';
+import { SharedService, isNullOrUndefined } from 'SharedService';
import { UserData, UserDetail } from 'UserModel';
import { UsersActionComponent } from 'UsersActionComponent';