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/wim-accounts/new-wim-account/NewWIMAccountComponent.html b/src/app/wim-accounts/new-wim-account/NewWIMAccountComponent.html
index 925a5a2..b69ae7c 100644
--- a/src/app/wim-accounts/new-wim-account/NewWIMAccountComponent.html
+++ b/src/app/wim-accounts/new-wim-account/NewWIMAccountComponent.html
@@ -27,14 +27,14 @@
<label class="col-sm-12 col-form-label mandatory-label"
[ngClass]="{'text-danger': wimNewAccountForm.invalid === true && submitted === true}">{{'MANDATORYCHECK' | translate}}</label>
<label class="col-sm-4 col-form-label" for="name">{{'NAME' | translate}}*</label>
- <div class="col-sm-8">
+ <div class="col-sm-8 mb-3">
<input autocomplete="off" class="form-control" placeholder="{{'NAME' | translate}}" type="text"
formControlName="name" id="name" [ngClass]="{ 'is-invalid': submitted && f.name.errors }" required>
</div>
</div>
<div class="form-group row">
<label class="col-sm-4 col-form-label" for="wim_type">{{'TYPE' | translate}}*</label>
- <div class="col-sm-8">
+ <div class="col-sm-8 mb-3">
<ng-select bindLabel="title" bindValue="value" [items]="wimType" placeholder="{{'SELECT' | translate}}"
formControlName="wim_type" id="wim_type" [(ngModel)]="wimTypeMod" [addTag]="sharedService.addCustomTag"
[ngClass]="{ 'is-invalid': submitted && f.wim_type.errors }" required>
@@ -44,7 +44,7 @@
</div>
<div class="form-group row">
<label class="col-sm-4 col-form-label" for="wim_url">{{'URL' | translate}}*</label>
- <div class="col-sm-8">
+ <div class="col-sm-8 mb-3">
<input autocomplete="off" class="form-control" placeholder="{{'URL' | translate}}" type="url"
formControlName="wim_url" id="wim_url" [ngClass]="{ 'is-invalid': submitted && f.wim_url.errors }"
required>
@@ -55,7 +55,7 @@
</div>
<div class="form-group row">
<label class="col-sm-4 col-form-label" for="user">{{'PAGE.WIMACCOUNTS.USERNAME' | translate}}*</label>
- <div class="col-sm-8">
+ <div class="col-sm-8 mb-3">
<input autocomplete="off" class="form-control" placeholder="{{'PAGE.WIMACCOUNTS.USERNAME' | translate}}"
type="text" formControlName="user" id="user"
[ngClass]="{ 'is-invalid': submitted && f.user.errors }" required>
@@ -63,7 +63,7 @@
</div>
<div class="form-group row">
<label class="col-sm-4 col-form-label" for="password">{{'PAGE.WIMACCOUNTS.PASSWORD' | translate}}*</label>
- <div class="col-sm-8">
+ <div class="col-sm-8 mb-3">
<input autocomplete="off" class="form-control" placeholder="{{'PAGE.WIMACCOUNTS.PASSWORD' | translate}}"
type="password" formControlName="password" id="password"
[ngClass]="{ 'is-invalid': submitted && f.password.errors }" required>
@@ -71,7 +71,7 @@
</div>
<div class="form-group row">
<label class="col-sm-4 col-form-label" for="description">{{'DESCRIPTION' | translate}}</label>
- <div class="col-sm-8">
+ <div class="col-sm-8 mb-3">
<textarea class="form-control" placeholder="{{'DESCRIPTION' | translate}}" type="text"
formControlName="description" id="description"></textarea>
</div>
@@ -83,9 +83,8 @@
id="config"></textarea>
<div class="fileupload-text mt-1 mb-1">{{'FILEUPLOADLABEL' | translate}}</div>
<div class="custom-file">
- <input type="file" #fileInputConfig class="custom-file-input"
+ <input type="file" #fileInputConfig class="fileupload custom-file-input"
(change)="configFile($event.target.files)" id="customFile">
- <label class="custom-file-label" #fileInputConfigLabel for="customFile">{{'CHOOSEFILE' | translate}}</label>
</div>
</div>
</div>
diff --git a/src/app/wim-accounts/new-wim-account/NewWIMAccountComponent.ts b/src/app/wim-accounts/new-wim-account/NewWIMAccountComponent.ts
index 65ae937..2fa3b96 100644
--- a/src/app/wim-accounts/new-wim-account/NewWIMAccountComponent.ts
+++ b/src/app/wim-accounts/new-wim-account/NewWIMAccountComponent.ts
@@ -18,7 +18,6 @@
/**
* @file WIM Account Component.
*/
-import { isNullOrUndefined } from 'util';
import { HttpHeaders } from '@angular/common/http';
import { Component, ElementRef, Injector, OnInit, ViewChild } from '@angular/core';
import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
@@ -29,7 +28,7 @@
import { environment } from 'environment';
import * as jsyaml from 'js-yaml';
import { RestService } from 'RestService';
-import { SharedService } from 'SharedService';
+import { SharedService, isNullOrUndefined } from 'SharedService';
/**
* Creating component
diff --git a/src/app/wim-accounts/wim-account-details/WIMAccountDetailsComponent.html b/src/app/wim-accounts/wim-account-details/WIMAccountDetailsComponent.html
index 2c2d839..2b34ea2 100644
--- a/src/app/wim-accounts/wim-account-details/WIMAccountDetailsComponent.html
+++ b/src/app/wim-accounts/wim-account-details/WIMAccountDetailsComponent.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">{{'WIMACCOUNTS' | translate}}</div>
<span class="button">
<button class="btn btn-primary" type="button" placement="top" container="body" ngbTooltip="{{'PAGE.WIMACCOUNTS.NEWWIM' | translate}}"
@@ -24,15 +24,15 @@
</button>
</span>
</div>
-<div class="row mt-2 mb-0 list-utilites-actions">
- <div class="col-auto mr-auto">
+<div class="mt-2 mb-0 list-utilites-actions">
+ <div class="col-auto me-auto">
<nav class="custom-items-config">
<span><i class="fas fa-clock text-warning"></i>{{operationalStateFirstStep}}</span>
<span><i class="fas fa-check-circle text-success"></i>{{operationalStateSecondStep}}</span>
<span><i class="fas fa-times-circle text-danger"></i>{{operationalStateThirdStep}}</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/wim-accounts/wim-account-info/WIMAccountInfoComponent.html b/src/app/wim-accounts/wim-account-info/WIMAccountInfoComponent.html
index 930b63d..7f4fd92 100644
--- a/src/app/wim-accounts/wim-account-info/WIMAccountInfoComponent.html
+++ b/src/app/wim-accounts/wim-account-info/WIMAccountInfoComponent.html
@@ -22,7 +22,7 @@
</button>
</div>
<div class="modal-body modal-body-custom-height p-0">
- <table class="table table-striped table-layout-fixed mb-0" *ngIf="wimDetails">
+ <table class="table table-borderless table-layout-fixed mb-0" *ngIf="wimDetails">
<tr>
<td colspan="2">
<b>{{'ID' | translate}}:</b> {{(wimDetails._id)?wimDetails._id:''}}
@@ -35,9 +35,9 @@
</tr>
<tr>
<td>
- <b>{{'OPERATIONALSTATE' | translate}}:</b><span class="ml-1 badge" [ngClass]="{'badge-warning text-white':wimDetails._admin.operationalState === operationalStateFirstStep,
- 'badge-success':wimDetails._admin.operationalState === operationalStateSecondStep,
- 'badge-danger':wimDetails._admin.operationalState === operationalStateThirdStep}">
+ <b>{{'OPERATIONALSTATE' | translate}}:</b><span class="ms-1 badge" [ngClass]="{'badge bg-warning text-white p-1':wimDetails._admin.operationalState === operationalStateFirstStep,
+ 'badge bg-success text-white p-1':wimDetails._admin.operationalState === operationalStateSecondStep,
+ 'badge bg-danger text-white p-1':wimDetails._admin.operationalState === operationalStateThirdStep}">
{{(wimDetails._admin.operationalState)?wimDetails._admin.operationalState:''}}
</span>
</td>
diff --git a/src/app/wim-accounts/wim-account-info/WIMAccountInfoComponent.scss b/src/app/wim-accounts/wim-account-info/WIMAccountInfoComponent.scss
index 021d205..34a3091 100644
--- a/src/app/wim-accounts/wim-account-info/WIMAccountInfoComponent.scss
+++ b/src/app/wim-accounts/wim-account-info/WIMAccountInfoComponent.scss
@@ -14,4 +14,21 @@
limitations under the License.
Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.in), BARATH KUMAR R (barath.r@tataelxsi.co.in)
-*/
\ No newline at end of file
+*/
+@import "../../../assets/scss/variable.scss";
+.table thead th {
+ vertical-align: bottom;
+ border-bottom: 2px solid rgba(0, 0, 0, .1);
+ }
+ .table th, .table td {
+ padding: 1rem;
+ vertical-align: top;
+ border-top: 1px solid rgba(0, 0, 0, .1);
+ border-bottom: transparent;
+ }
+ .table b {
+ background: none;
+ color: $body-color;
+ padding-right: 0px;
+ padding-left: 0px;
+ }
\ No newline at end of file