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/projects/project-create-update/ProjectCreateUpdateComponent.html b/src/app/projects/project-create-update/ProjectCreateUpdateComponent.html
index 4e613fe..26a16c8 100644
--- a/src/app/projects/project-create-update/ProjectCreateUpdateComponent.html
+++ b/src/app/projects/project-create-update/ProjectCreateUpdateComponent.html
@@ -19,13 +19,13 @@
<div class="modal-header">
<h4 class="modal-title" id="modal-basic-title">{{ (getProjectType == 'Add' ? 'NEW' : 'EDIT') | translate}}
{{'PROJECT' | translate}}</h4>
- <button class="button-xs" type="button" class="close" aria-label="Close" (click)="activeModal.close()">
+ <button class="button-xs-2" type="button" class="close" aria-label="Close" (click)="activeModal.close()">
<i class="fas fa-times-circle text-danger"></i>
</button>
</div>
<div class="modal-body modal-body-custom-height">
<div class="row" *ngIf="getProjectType === 'Add'">
- <label class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">{{'RECENTLY' | translate}}
+ <label class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10 mb-2">{{'RECENTLY' | translate}}
{{'CREATED' | translate}} {{'PROJECT' | translate}}:
<b>{{(recentProject)?recentProject.name:''}}</b>
</label>
@@ -39,7 +39,7 @@
formControlName="project_name" [ngClass]="{ 'is-invalid': submitted && f.project_name.errors }" required>
</div>
</div>
- <div class="form-group row" *ngIf="getProjectType === 'Add'">
+ <div class="form-group row mt-3" *ngIf="getProjectType === 'Add'">
<label class="col-sm-4 col-form-label">{{'DOMAIN' | translate}} {{'NAME' | translate}}</label>
<div class="col-sm-4">
<ng-select [clearable]="false" placeholder="{{'SELECT' | translate}}" [items]="domains" bindLabel="title"
@@ -47,17 +47,17 @@
[ngClass]="{ 'is-invalid': submitted && f.domain_name.errors }"></ng-select>
</div>
</div>
- <div class="form-check form-check-inline ml-2">
- <input class="form-check-input" type="checkbox" formControlName="enable_quota" (change)="checkQuota()"
+ <div class="form-check form-check-inline mt-3">
+ <input class="quotacheck form-check-input" type="checkbox" formControlName="enable_quota" (change)="checkQuota()"
id="quotaCheck" *ngIf="getProjectType === 'Add' || quotaRefs === null">
- <label class="form-check-label" for="quotaCheck"><b>{{'PAGE.PROJECT.QUOTA' | translate}}</b></label>
+ <label class="form-check-label" for="quotaCheck" [ngClass]="getProjectType === 'Edit'&& quotaRefs !== null?'quotaCheck-label':''"><b>{{'PAGE.PROJECT.QUOTA' | translate}}</b></label>
</div>
- <div class="row mt-1" [ngbCollapse]="!f.enable_quota.value">
- <div class="form-group col-sm-6" *ngFor="let quota of quotaItems;">
+ <div class="row" [ngbCollapse]="!f.enable_quota.value">
+ <div class="form-group col-sm-6 mb-2 mt-2" *ngFor="let quota of quotaItems;">
<div class="row">
<label class="col-sm-7 col-form-label">{{quota.title | translate}}*</label>
<div class="col-sm-5">
- <input placeholder="{{'COUNT' | translate}}" type="number"
+ <input placeholder="{{'COUNT' | translate}}" type="number" min="0"
class="form-control" [formControlName]="quota.value" [ngClass]="{ 'is-invalid': submitted && f[quota.value].errors }">
</div>
</div>
diff --git a/src/app/projects/project-create-update/ProjectCreateUpdateComponent.scss b/src/app/projects/project-create-update/ProjectCreateUpdateComponent.scss
index 021d205..568a9c9 100644
--- a/src/app/projects/project-create-update/ProjectCreateUpdateComponent.scss
+++ b/src/app/projects/project-create-update/ProjectCreateUpdateComponent.scss
@@ -14,4 +14,17 @@
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";
+.quotacheck {
+ box-shadow: none;
+ border-radius: 2px;
+ border-color: $gray-600;
+}
+.form-check {
+ padding-left: 30px;
+}
+.quotaCheck-label {
+ position: absolute;
+ left: 26px;
+}
\ No newline at end of file
diff --git a/src/app/projects/project-create-update/ProjectCreateUpdateComponent.ts b/src/app/projects/project-create-update/ProjectCreateUpdateComponent.ts
index af6388d..2d45ef6 100644
--- a/src/app/projects/project-create-update/ProjectCreateUpdateComponent.ts
+++ b/src/app/projects/project-create-update/ProjectCreateUpdateComponent.ts
@@ -18,7 +18,6 @@
/**
* @file Project Add Modal
*/
-import { isNullOrUndefined } from 'util';
import { Component, Injector, Input, OnInit } from '@angular/core';
import { AbstractControl, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
@@ -30,7 +29,7 @@
import { ProjectData, ProjectDetails, QUOTAITEM, QUOTA_ITEMS } from 'ProjectModel';
import { ProjectService } from 'ProjectService';
import { RestService } from 'RestService';
-import { SharedService } from 'SharedService';
+import { SharedService, isNullOrUndefined } from 'SharedService';
/**
* Creating component