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/roles/roles-create-edit/RolesCreateEditComponent.html b/src/app/roles/roles-create-edit/RolesCreateEditComponent.html
index 7bb2a1f..7f33a21 100644
--- a/src/app/roles/roles-create-edit/RolesCreateEditComponent.html
+++ b/src/app/roles/roles-create-edit/RolesCreateEditComponent.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">
{{ (getRoleType == 'Add' ? 'PAGE.ROLES.CREATEROLE' : 'PAGE.ROLES.EDITROLE') | translate}}</div>
<span class="button">
@@ -30,22 +30,22 @@
<label class="col-sm-12 col-form-label mandatory-label"
[ngClass]="{'text-danger': roleForm.invalid === true && submitted === true}">{{'MANDATORYCHECK' | translate}}</label>
<label class="col-sm-2 col-form-label">{{'NAME' | translate}}*</label>
- <div class="col-sm-5">
+ <div class="col-sm-5 mb-3">
<input placeholder="{{'NAME' | translate}}" type="text" class="form-control" maxlength="30"
formControlName="roleName" [ngClass]="{ 'is-invalid': submitted && f.roleName.errors }" required>
</div>
</div>
<div class="form-group row" *ngIf="viewMode == 'text'">
<label class="col-sm-2 col-form-label">{{'PAGE.ROLES.PERMISSIONS' | translate}}</label>
- <div class="col-sm-5">
+ <div class="col-sm-5 mb-3">
<textarea placeholder="{{'PAGE.ROLES.YAMLPERMISSIONS' | translate}}" rows="10" cols="50" type="text"
class="form-control" formControlName="permissions"></textarea>
</div>
</div>
<div class="form-group row" [ngClass]="{ 'justify-content-end': viewMode == 'text' }">
- <div class="col-sm-6">
+ <div class="col-sm-6 mb-3">
<button type="button" class="btn btn-danger" routerLink="/roles/details">{{'CANCEL' | translate}}</button>
- <button class="btn btn-primary ml-3"
+ <button class="btn btn-primary ms-3"
type="submit">{{ (getRoleType == 'Add' ? 'CREATE' : 'APPLY') | translate}}</button>
</div>
</div>
@@ -54,7 +54,7 @@
<ngb-panel *ngFor="let permissionGroup of rolePermissions; let i = index">
<ng-template ngbPanelHeader let-opened="opened">
<div class="d-flex align-items-center justify-content-between">
- <button ngbPanelToggle class="btn text-dark container-fluid text-left pl-0"><i
+ <button ngbPanelToggle class="btn text-dark container-fluid text-start ps-0 p-10"><i
[ngClass]="{ 'fas': true, 'fa-angle-down': opened, 'fa-angle-right': !opened }"></i> {{permissionGroup.title}}</button>
</div>
</ng-template>
@@ -84,9 +84,9 @@
</ng-template>
</ngb-panel>
</ngb-accordion>
-<div class="float-right" *ngIf="viewMode == 'preview'">
+<div class="float-end" *ngIf="viewMode == 'preview'">
<button type="button" class="btn btn-danger" routerLink="/roles/details">{{'CANCEL' | translate}}</button>
- <button class="btn btn-primary ml-3"
+ <button class="btn btn-primary ms-3"
(click)="roleCheck()">{{ (getRoleType == 'Add' ? 'CREATE' : 'APPLY') | translate}}</button>
</div>
<app-loader [waitingMessage]="message" *ngIf="isLoadingResults"></app-loader>
\ No newline at end of file
diff --git a/src/app/roles/roles-create-edit/RolesCreateEditComponent.scss b/src/app/roles/roles-create-edit/RolesCreateEditComponent.scss
index 362973a..c2d0885 100644
--- a/src/app/roles/roles-create-edit/RolesCreateEditComponent.scss
+++ b/src/app/roles/roles-create-edit/RolesCreateEditComponent.scss
@@ -15,14 +15,19 @@
Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.in), BARATH KUMAR R (barath.r@tataelxsi.co.in)
*/
-@import '../../../assets/scss/mixins/mixin';
-@import '../../../assets/scss/variable';
- .custom-button{
+@import "../../../assets/scss/mixins/mixin";
+@import "../../../assets/scss/variable";
+button:focus:not(:focus-visible) {
+ border-color: $gray-400;
+}
+.custom-button {
label {
- @include padding-value(2,2,2,2);
+ @include padding-value(2, 2, 2, 2);
+ border: none;
&.active {
+ border: none;
@include background(null, $white, null, null, null);
- span{
+ span {
img {
opacity: 1;
}
@@ -33,16 +38,16 @@
}
span {
display: inline-block;
- @include wh-value(30px,30px);
+ @include wh-value(30px, 30px);
cursor: pointer;
border-radius: 50%;
- @include border(all,2,solid, $white);
+ @include border(all, 2, solid, $white);
@include box-shadow(0px, 1px, 3px, 0px, $dark);
@include background(null, null, null, no-repeat, center);
text-align: center;
@include line-height(25px);
img {
- width:50%;
+ width: 50%;
opacity: 0;
@include transition(all, 0.3, null, ease);
}
diff --git a/src/app/roles/roles-create-edit/RolesCreateEditComponent.ts b/src/app/roles/roles-create-edit/RolesCreateEditComponent.ts
index 59196ea..ae85112 100644
--- a/src/app/roles/roles-create-edit/RolesCreateEditComponent.ts
+++ b/src/app/roles/roles-create-edit/RolesCreateEditComponent.ts
@@ -18,7 +18,6 @@
/**
* @file Roles Create and Edit Component
*/
-import { isNullOrUndefined } from 'util';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Component, Injector, Input, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
@@ -30,7 +29,7 @@
import * as jsonpath from 'jsonpath';
import { RestService } from 'RestService';
import { Permission, PermissionGroup, RoleConfig, RoleData } from 'RolesModel';
-import { SharedService } from 'SharedService';
+import { SharedService, isNullOrUndefined } from 'SharedService';
/**
* Creating component
diff --git a/src/app/roles/roles-details/RolesDetailsComponent.html b/src/app/roles/roles-details/RolesDetailsComponent.html
index 28a3fe7..7ee4a2e 100644
--- a/src/app/roles/roles-details/RolesDetailsComponent.html
+++ b/src/app/roles/roles-details/RolesDetailsComponent.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">{{'ROLES' | translate}}</div>
<span class="button">
<button class="btn btn-primary" type="button" (click)="createRole()" placement="top"
@@ -25,8 +25,8 @@
</button>
</span>
</div>
-<div class="row mt-2 mb-0 form-group justify-content-end list-utilites-actions">
- <page-per-row class="mr-2" (pagePerRow)="onChange($event)"></page-per-row>
+<div class="mt-2 mb-2 form-group justify-content-end list-utilites-actions">
+ <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/roles/roles-details/RolesDetailsComponent.ts b/src/app/roles/roles-details/RolesDetailsComponent.ts
index 9c2e3e3..473a0c6 100644
--- a/src/app/roles/roles-details/RolesDetailsComponent.ts
+++ b/src/app/roles/roles-details/RolesDetailsComponent.ts
@@ -18,7 +18,6 @@
/**
* @file Roles Deatils component.
*/
-import { isNullOrUndefined } from 'util';
import { Component, Injector, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { TranslateService } from '@ngx-translate/core';
@@ -30,7 +29,7 @@
import { RolesActionComponent } from 'RolesAction';
import { RoleData, RoleDetails } from 'RolesModel';
import { Subscription } from 'rxjs';
-import { SharedService } from 'SharedService';
+import { SharedService, isNullOrUndefined } from 'SharedService';
/**
* Creating component