From: SANDHYA.JS Date: Tue, 4 Jun 2024 16:20:03 +0000 (+0530) Subject: Angular upgrade X-Git-Tag: release-v16.0-start~7 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=c84f1123f8ba69f9e2211b2d816bb415e595efaa;p=osm%2FNG-UI.git Angular upgrade - Upgraded Angular from 14 to 15 version. Change-Id: I2339a04020153cbc9ed7a14bfe8e0aa265e507da Signed-off-by: SANDHYA.JS --- diff --git a/angular.json b/angular.json index 1a6d042..066e675 100644 --- a/angular.json +++ b/angular.json @@ -75,6 +75,11 @@ "type": "initial", "maximumWarning": "2mb", "maximumError": "5mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "6kb", + "maximumError": "10kb" } ] }, diff --git a/package.json b/package.json index bb99e9b..6574349 100644 --- a/package.json +++ b/package.json @@ -16,32 +16,32 @@ "private": true, "dependencies": { "@akveo/ng2-completer": "^9.0.1", - "@angular/animations": "^14.2.12", - "@angular/cdk": "^13.3.9", - "@angular/common": "^14.2.12", - "@angular/compiler": "^14.2.12", - "@angular/core": "^14.2.12", + "@angular/animations": "^15.2.10", + "@angular/cdk": "^15.2.9", + "@angular/common": "^15.2.10", + "@angular/compiler": "^15.2.10", + "@angular/core": "^15.2.10", "@angular/flex-layout": "^9.0.0-beta.29", - "@angular/forms": "^14.2.12", - "@angular/localize": "^14.2.12", - "@angular/platform-browser": "^14.2.12", - "@angular/platform-browser-dynamic": "^14.2.12", - "@angular/router": "^14.2.12", + "@angular/forms": "^15.2.10", + "@angular/localize": "^15.2.10", + "@angular/platform-browser": "^15.2.10", + "@angular/platform-browser-dynamic": "^15.2.10", + "@angular/router": "^15.2.10", "@ctrl/ngx-codemirror": "^5.1.1", "@fortawesome/fontawesome-free": "^5.13.0", "@ng-bootstrap/ng-bootstrap": "^11.0.1", - "@ng-idle/core": "^11.0.3", - "@ng-idle/keepalive": "^11.0.3", - "@ng-select/ng-select": "^8.0.0", - "@ngx-translate/core": "^13.0.0", - "@ngx-translate/http-loader": "^4.0.0", + "@ng-idle/core": "^12.0.4", + "@ng-idle/keepalive": "^12.0.4", + "@ng-select/ng-select": "^10.0.3", + "@ngx-translate/core": "^14.0.0", + "@ngx-translate/http-loader": "^7.0.0", "@nomadreservations/ngx-codemirror": "^2.0.0", "@types/d3": "^5.7.2", "@types/js-yaml": "^3.12.1", "@types/jsonpath": "^0.2.0", "@types/ol": "^5.3.5", - "angular-notifier": "^9.1.0", - "bootstrap": "^4.6.2", + "angular-notifier": "^12.0.0", + "bootstrap": "^5.2.3", "chart.js": "^3.9.1", "chartjs-plugin-datalabels": "^2.2.0", "codemirror": "^5.51.0", @@ -50,7 +50,7 @@ "http-status-codes": "^1.3.2", "js-untar": "^2.0.0", "js-yaml": "^3.13.1", - "jsonpath": "^1.0.2", + "jsonpath": "^1.1.1", "ng-sidebar": "~9.2.0", "ng2-charts": "^3.0.0-rc.7", "ng2-file-upload": "^1.3.0", @@ -61,28 +61,29 @@ "rxjs": "^6.5.4", "rxjs-compat": "^6.5.5", "stream": "0.0.2", - "tslib": "^2.5.0", - "util": "^0.12.4", - "zone.js": "~0.11.8", - "@popperjs/core": "~2.10.1", - "ngx-toastr": "^13.2.1" + "ts-evaluator": "^1.2.0", + "tslib": "^2.6.0", + "util": "^0.12.5", + "zone.js": "~0.13.3", + "@popperjs/core": "^2.11.6", + "ngx-toastr": "^16.0.0" }, "devDependencies": { - "@angular-devkit/build-angular": "^14.2.10", + "@angular-devkit/build-angular": "^15.2.10", "@angular-eslint/builder": "13.5.0", "@angular-eslint/eslint-plugin": "13.5.0", "@angular-eslint/eslint-plugin-template": "13.5.0", "@angular-eslint/schematics": "13.5.0", "@angular-eslint/template-parser": "13.5.0", - "@angular/cli": "^14.2.10", - "@angular/compiler-cli": "^14.2.12", - "@angular/language-service": "^14.2.12", + "@angular/cli": "^15.2.10", + "@angular/compiler-cli": "^15.2.10", + "@angular/language-service": "^15.2.10", "@cypress/schematic": "^2.3.0", "@microsoft/eslint-plugin-sdl": "~0.2.0", "@types/jasmine": "~3.10.0", "@types/jasminewd2": "~2.0.3", "@types/jquery": "^3.3.31", - "@types/node": "^8.10.59", + "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "4.28.2", "@typescript-eslint/parser": "4.28.2", "cypress": "^12.10.0", @@ -99,14 +100,14 @@ "eslint-plugin-security": "~1.5.0", "jasmine-core": "~4.0.0", "jasmine-spec-reporter": "~5.0.0", - "karma": "~6.3.0", + "karma": "~6.4.2", "karma-chrome-launcher": "~3.1.0", "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "~1.7.0", "ng2-completer": "^3.0.3", "sass": "^1.58.0", - "ts-node": "~7.0.0", - "typescript": "~4.6.2" + "ts-node": "~8.3.0", + "typescript": "^4.9.3" } } diff --git a/src/app/AppComponent.ts b/src/app/AppComponent.ts index 1c5886a..26d7aab 100644 --- a/src/app/AppComponent.ts +++ b/src/app/AppComponent.ts @@ -19,13 +19,12 @@ /** * @file App Components */ -import { isNullOrUndefined } from 'util'; import { Component, HostListener, Injector } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { DEFAULT_INTERRUPTSOURCES, Idle } from '@ng-idle/core'; import { AuthenticationService } from 'AuthenticationService'; import { DeviceCheckService } from 'DeviceCheckService'; -import { SharedService } from 'SharedService'; +import { SharedService, isNullOrUndefined } from 'SharedService'; /** * Creating component diff --git a/src/app/AppModule.ts b/src/app/AppModule.ts index 5a9c306..bdf27fc 100644 --- a/src/app/AppModule.ts +++ b/src/app/AppModule.ts @@ -158,7 +158,7 @@ const customNotifierOptions: NotifierOptions = { }), NgbModule, NgSelectModule, - RouterModule.forRoot(appRoutes, { useHash: false, relativeLinkResolution: 'legacy' }), + RouterModule.forRoot(appRoutes, { useHash: false }), NgIdleKeepaliveModule.forRoot(), LoaderModule, SharedModule, diff --git a/src/app/dashboard/DashboardComponent.html b/src/app/dashboard/DashboardComponent.html index 9689e03..d7dabe3 100644 --- a/src/app/dashboard/DashboardComponent.html +++ b/src/app/dashboard/DashboardComponent.html @@ -66,7 +66,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
@@ -88,7 +88,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
@@ -110,7 +110,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
@@ -135,20 +135,20 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
{{'PAGE.VIMDETAILS.VIMRESOURCES' | translate}}
-
-
+
-
diff --git a/src/app/dashboard/DashboardComponent.scss b/src/app/dashboard/DashboardComponent.scss index df3c6b1..4f14da5 100644 --- a/src/app/dashboard/DashboardComponent.scss +++ b/src/app/dashboard/DashboardComponent.scss @@ -20,6 +20,7 @@ $min-height-set: 200px; .dashboard { .custom-card { + background-color: $white; word-wrap: break-word; @include box-shadow(0px, 1px, 15px, 0px, rgba(69, 90, 100, 0.1)); @include transition(all, 0.2s, null, null); @@ -37,7 +38,7 @@ } &.pink-card { @include background( - linear-gradient(to left top, #d81b60, #e0306d, #e7407a, #ee4f87, #f55c94), + linear-gradient(to left top,#d81b60,#e0306d,#e7407a,#ee4f87,#f55c94), null, null, null, @@ -46,7 +47,7 @@ } &.purple-card { @include background( - linear-gradient(to left top, #605ca8, #736ebb, #8681ce, #9994e2, #aca7f6), + linear-gradient(to left top,#605ca8,#736ebb,#8681ce,#9994e2,#aca7f6), null, null, null, @@ -55,7 +56,7 @@ } &.aqua-card { @include background( - linear-gradient(to left top, #00c0ef, #00cdf5, #00dafa, #00e6fd, #0af3ff), + linear-gradient(to left top,#00c0ef,#00cdf5,#00dafa,#00e6fd,#0af3ff), null, null, null, @@ -63,6 +64,7 @@ ); } .custom-card-header { + padding: 12px 20px 12px 20px; @include background(null, $primary, null, null, null); @include roundedTop(5); a { @@ -77,6 +79,7 @@ overflow-y: scroll; .list-group { .list-group-item { + background-color: $white; cursor: default; @include border(all, 0, solid, $black-coral); @include border(bottom, 1, solid, rgba(0, 0, 0, 0.125)); @@ -117,9 +120,9 @@ &.show-canvas { @include flexbox(block !important, null, null, null, null, null); } - #canvas{ - @include wh-value(100%, $min-height-set); - } + #canvas { + @include wh-value(100%, $min-height-set); + } } } } @@ -157,4 +160,19 @@ } } } + .font-weight-bold { + border-radius: 10px; + } + .form-row { + display: flex; + flex-wrap: wrap; + .form-group { + flex: 0 0 auto; + width: 47%; + margin-right: 25px; + } + } + .vimdetails { + width: 100%; + } } \ No newline at end of file diff --git a/src/app/dashboard/DashboardComponent.ts b/src/app/dashboard/DashboardComponent.ts index d49f708..8112c06 100644 --- a/src/app/dashboard/DashboardComponent.ts +++ b/src/app/dashboard/DashboardComponent.ts @@ -18,7 +18,6 @@ /** * @file Dashboard Component */ -import { isNullOrUndefined } from 'util'; import { Component, Injector, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { NotifierService } from 'angular-notifier'; @@ -35,7 +34,7 @@ import { ProjectService } from 'ProjectService'; import { RestService } from 'RestService'; import { Observable, Subscription } from 'rxjs'; import { SDNControllerModel } from 'SDNControllerModel'; -import { SharedService } from 'SharedService'; +import { SharedService, isNullOrUndefined } from 'SharedService'; import { ProjectRoleMappings, UserDetail } from 'UserModel'; import { VimAccountDetails } from 'VimAccountModel'; import { VNFInstanceDetails } from 'VNFInstanceModel'; diff --git a/src/app/instances/netslice-instances/NetsliceInstancesComponent.html b/src/app/instances/netslice-instances/NetsliceInstancesComponent.html index e8b3c0c..90342fd 100644 --- a/src/app/instances/netslice-instances/NetsliceInstancesComponent.html +++ b/src/app/instances/netslice-instances/NetsliceInstancesComponent.html @@ -15,7 +15,7 @@ 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) --> -
+
{{'PAGE.DASHBOARD.NETSLICEINSTANCE' | translate}}
-
-
+
+
- +
diff --git a/src/app/instances/ns-history-operations/HistoryOperationsComponent.html b/src/app/instances/ns-history-operations/HistoryOperationsComponent.html index 7890a13..aabdd78 100644 --- a/src/app/instances/ns-history-operations/HistoryOperationsComponent.html +++ b/src/app/instances/ns-history-operations/HistoryOperationsComponent.html @@ -15,18 +15,18 @@ 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) --> -
+
{{'HISTORYOFOPERATIONS' | translate}}
-
-
+
+
- +
diff --git a/src/app/instances/ns-history-operations/HistoryOperationsComponent.ts b/src/app/instances/ns-history-operations/HistoryOperationsComponent.ts index afbefdb..da3ff10 100644 --- a/src/app/instances/ns-history-operations/HistoryOperationsComponent.ts +++ b/src/app/instances/ns-history-operations/HistoryOperationsComponent.ts @@ -18,7 +18,6 @@ /** * @file NS History Of Operations Component */ -import { isNullOrUndefined } from 'util'; import { Component, Injector, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Router } from '@angular/router'; @@ -32,7 +31,7 @@ import { LocalDataSource } from 'ng2-smart-table'; import { NSDInstanceData } from 'NSInstanceModel'; import { RestService } from 'RestService'; import { Subscription } from 'rxjs'; -import { SharedService } from 'SharedService'; +import { SharedService, isNullOrUndefined } from 'SharedService'; import { ShowInfoComponent } from 'ShowInfoComponent'; /** diff --git a/src/app/instances/ns-instances/NSInstancesComponent.html b/src/app/instances/ns-instances/NSInstancesComponent.html index 568ac86..8ee93b8 100644 --- a/src/app/instances/ns-instances/NSInstancesComponent.html +++ b/src/app/instances/ns-instances/NSInstancesComponent.html @@ -15,17 +15,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) --> -
+
{{'NSINSTANCES' | translate}}
-
-
-
+
+
- +
- +
\ No newline at end of file diff --git a/src/app/instances/ns-primitive/NSPrimitiveComponent.html b/src/app/instances/ns-primitive/NSPrimitiveComponent.html index 34b8a0e..f5344ff 100644 --- a/src/app/instances/ns-primitive/NSPrimitiveComponent.html +++ b/src/app/instances/ns-primitive/NSPrimitiveComponent.html @@ -23,33 +23,33 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
-
+
-
+
-
+
-
+
@@ -65,7 +65,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
diff --git a/src/app/instances/ns-primitive/NSPrimitiveComponent.ts b/src/app/instances/ns-primitive/NSPrimitiveComponent.ts index 8f39a20..cf60b57 100644 --- a/src/app/instances/ns-primitive/NSPrimitiveComponent.ts +++ b/src/app/instances/ns-primitive/NSPrimitiveComponent.ts @@ -18,7 +18,6 @@ /** * @file NS Instance Primitive Component */ -import { isNullOrUndefined } from 'util'; import { Component, Injector, Input, OnInit } from '@angular/core'; import { AbstractControl, FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; @@ -30,7 +29,7 @@ import { environment } from 'environment'; import { KDUPRIMITIVELEVEL, NSData, VDUPRIMITIVELEVEL, VNFPROFILE } from 'NSDModel'; import { NSPrimitiveParams } from 'NSInstanceModel'; import { RestService } from 'RestService'; -import { SharedService } from 'SharedService'; +import { SharedService, isNullOrUndefined } from 'SharedService'; import { CONFIGPRIMITIVE, DF, VDUCONFIG, VDUPROFILE, VNFCONFIG, VNFD } from 'VNFDModel'; import { VNFInstanceDetails } from 'VNFInstanceModel'; diff --git a/src/app/instances/ns-topology/NSTopologyComponent.html b/src/app/instances/ns-topology/NSTopologyComponent.html index 084f90e..108a4ed 100644 --- a/src/app/instances/ns-topology/NSTopologyComponent.html +++ b/src/app/instances/ns-topology/NSTopologyComponent.html @@ -26,7 +26,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
@@ -137,7 +137,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
-
+

VNFR diff --git a/src/app/instances/ns-topology/NSTopologyComponent.ts b/src/app/instances/ns-topology/NSTopologyComponent.ts index 8981e26..57e9ca2 100644 --- a/src/app/instances/ns-topology/NSTopologyComponent.ts +++ b/src/app/instances/ns-topology/NSTopologyComponent.ts @@ -30,8 +30,8 @@ import * as HttpStatus from 'http-status-codes'; import { CCI, DF, VLC, VNFPROFILE } from 'NSDModel'; import { COMPOSERNODES, CONNECTIONPOINT, NSD, NSDVLD, NSINFO, NSInstanceDetails, NSINSTANCENODES, VLINFO, VNFRINFO } from 'NSInstanceModel'; import { GRAPHDETAILS, Tick, TickPath } from 'NSTopologyModel'; -import { RestService } from 'src/services/RestService'; -import { isNullOrUndefined } from 'util'; +import { RestService } from 'RestService'; +import { isNullOrUndefined } from 'SharedService'; /** * Creating component diff --git a/src/app/instances/pdu-instances/PDUInstancesComponent.html b/src/app/instances/pdu-instances/PDUInstancesComponent.html index 3c18bfa..8e7ac45 100644 --- a/src/app/instances/pdu-instances/PDUInstancesComponent.html +++ b/src/app/instances/pdu-instances/PDUInstancesComponent.html @@ -15,7 +15,7 @@ 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) --> -
+
{{'PDUINSTANCES' | translate}}
-
- +
+
diff --git a/src/app/instances/pdu-instances/add-pdu-instances/AddPDUInstancesComponent.html b/src/app/instances/pdu-instances/add-pdu-instances/AddPDUInstancesComponent.html index 54e36fa..1a9a0a7 100644 --- a/src/app/instances/pdu-instances/add-pdu-instances/AddPDUInstancesComponent.html +++ b/src/app/instances/pdu-instances/add-pdu-instances/AddPDUInstancesComponent.html @@ -22,8 +22,8 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
-
+
+
@@ -35,7 +35,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
-
+
{{'PAGE.PDUINSTANCE.PARAMETERS' | translate}}
-
+
@@ -87,7 +87,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
diff --git a/src/app/instances/pdu-instances/add-pdu-instances/AddPDUInstancesComponent.scss b/src/app/instances/pdu-instances/add-pdu-instances/AddPDUInstancesComponent.scss index 950bb39..81553bb 100644 --- a/src/app/instances/pdu-instances/add-pdu-instances/AddPDUInstancesComponent.scss +++ b/src/app/instances/pdu-instances/add-pdu-instances/AddPDUInstancesComponent.scss @@ -31,4 +31,5 @@ align-items: center; font-size: 20px; cursor: pointer; + margin-bottom: 15px; } \ No newline at end of file diff --git a/src/app/instances/vnf-instances/VNFInstancesComponent.html b/src/app/instances/vnf-instances/VNFInstancesComponent.html index e36cc3d..609af69 100644 --- a/src/app/instances/vnf-instances/VNFInstancesComponent.html +++ b/src/app/instances/vnf-instances/VNFInstancesComponent.html @@ -15,11 +15,11 @@ 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) --> -
+
{{'VNFINSTANCES' | translate}}
-
- +
+
diff --git a/src/app/k8s/k8s-add-cluster/K8sAddClusterComponent.html b/src/app/k8s/k8s-add-cluster/K8sAddClusterComponent.html index f06d098..707d8d6 100644 --- a/src/app/k8s/k8s-add-cluster/K8sAddClusterComponent.html +++ b/src/app/k8s/k8s-add-cluster/K8sAddClusterComponent.html @@ -23,7 +23,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
@@ -32,7 +32,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i formControlName="name" id="name" [ngClass]="{ 'is-invalid': submitted && f.name.errors }" required>
-
+
-
+
-
+
-
+
-
+
{{'FILEUPLOADLABEL' | translate}}
- -
-
+
{{'FILEUPLOADLABEL' | translate}}
- -
diff --git a/src/app/k8s/k8s-add-cluster/K8sAddClusterComponent.ts b/src/app/k8s/k8s-add-cluster/K8sAddClusterComponent.ts index 4eb70f7..8115b6f 100644 --- a/src/app/k8s/k8s-add-cluster/K8sAddClusterComponent.ts +++ b/src/app/k8s/k8s-add-cluster/K8sAddClusterComponent.ts @@ -18,7 +18,6 @@ /** * @file K8sAddClusterComponent.ts. */ -import { isNullOrUndefined } from 'util'; import { HttpHeaders } from '@angular/common/http'; import { Component, ElementRef, Injector, OnInit, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @@ -29,7 +28,7 @@ import { APIURLHEADER, ERRORDATA, MODALCLOSERESPONSEDATA, TYPESECTION } from 'Co import { environment } from 'environment'; import * as jsyaml from 'js-yaml'; import { RestService } from 'RestService'; -import { SharedService } from 'SharedService'; +import { SharedService, isNullOrUndefined } from 'SharedService'; import { VimAccountDetails } from 'VimAccountModel'; /** * Creating Component diff --git a/src/app/k8s/k8s-add-repo/K8sAddRepoComponent.html b/src/app/k8s/k8s-add-repo/K8sAddRepoComponent.html index 8caec5e..d2c68e8 100644 --- a/src/app/k8s/k8s-add-repo/K8sAddRepoComponent.html +++ b/src/app/k8s/k8s-add-repo/K8sAddRepoComponent.html @@ -23,7 +23,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
@@ -32,7 +32,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i formControlName="name" id="name" [ngClass]="{ 'is-invalid': submitted && f.name.errors }" required>
-
+
-
+
-
+
-
+
-
+
@@ -63,29 +63,27 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
{{'FILEUPLOADLABEL' | translate}}
- -
-
+
{{'FILEUPLOADLABEL' | translate}}
- - +
diff --git a/src/app/packages/instantiate-net-slice-template/InstantiateNetSliceTemplateComponent.ts b/src/app/packages/instantiate-net-slice-template/InstantiateNetSliceTemplateComponent.ts index fb0abda..ab8b72f 100644 --- a/src/app/packages/instantiate-net-slice-template/InstantiateNetSliceTemplateComponent.ts +++ b/src/app/packages/instantiate-net-slice-template/InstantiateNetSliceTemplateComponent.ts @@ -18,7 +18,6 @@ /** * @file Instantiate NS Modal Component. */ -import { isNullOrUndefined } from 'util'; import { HttpHeaders } from '@angular/common/http'; import { Component, ElementRef, Injector, OnInit, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @@ -33,7 +32,7 @@ import * as jsyaml from 'js-yaml'; import { NetworkSliceData } from 'NetworkSliceModel'; import { NSICREATEPARAMS } from 'NSDModel'; import { RestService } from 'RestService'; -import { SharedService } from 'SharedService'; +import { SharedService, isNullOrUndefined } from 'SharedService'; import { VimAccountDetails } from 'VimAccountModel'; /** * Creating component diff --git a/src/app/packages/instantiate-ns/InstantiateNsComponent.html b/src/app/packages/instantiate-ns/InstantiateNsComponent.html index 2bbd837..428515e 100644 --- a/src/app/packages/instantiate-ns/InstantiateNsComponent.html +++ b/src/app/packages/instantiate-ns/InstantiateNsComponent.html @@ -23,7 +23,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
-
+
@@ -44,7 +44,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i [ngClass]="{ 'is-invalid': submitted && f.nsDescription.errors }" required>
-
+
-
+
@@ -82,7 +82,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
@@ -90,24 +90,20 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i formControlName="ssh_keys" id="ssh_keys">
{{'FILEUPLOADLABEL' | translate}}
- -
-
+
{{'FILEUPLOADLABEL' | translate}}
- -
diff --git a/src/app/packages/instantiate-ns/InstantiateNsComponent.ts b/src/app/packages/instantiate-ns/InstantiateNsComponent.ts index e0798d1..9ba89da 100644 --- a/src/app/packages/instantiate-ns/InstantiateNsComponent.ts +++ b/src/app/packages/instantiate-ns/InstantiateNsComponent.ts @@ -18,7 +18,6 @@ /** * @file Instantiate NS Modal Component. */ -import { isNullOrUndefined } from 'util'; import { Component, ElementRef, Injector, OnInit, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; @@ -31,7 +30,7 @@ import { environment } from 'environment'; import * as jsyaml from 'js-yaml'; import { NSCREATEPARAMS, NSData, NSDDetails } from 'NSDModel'; import { RestService } from 'RestService'; -import { SharedService } from 'SharedService'; +import { SharedService, isNullOrUndefined } from 'SharedService'; import { VimAccountDetails } from 'VimAccountModel'; /** diff --git a/src/app/packages/netslice-template/NetsliceTemplateComponent.html b/src/app/packages/netslice-template/NetsliceTemplateComponent.html index 6d41e11..176af9c 100644 --- a/src/app/packages/netslice-template/NetsliceTemplateComponent.html +++ b/src/app/packages/netslice-template/NetsliceTemplateComponent.html @@ -15,7 +15,7 @@ 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) --> -
+
{{'PAGE.DASHBOARD.NETSLICETEMPLATE' | translate}}
@@ -27,8 +27,8 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
- +
+
diff --git a/src/app/packages/ns-packages/NSPackagesComponent.html b/src/app/packages/ns-packages/NSPackagesComponent.html index 5b67268..c8229f3 100644 --- a/src/app/packages/ns-packages/NSPackagesComponent.html +++ b/src/app/packages/ns-packages/NSPackagesComponent.html @@ -15,7 +15,7 @@ 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) --> -
+
NS {{'PACKAGES' | translate}}
-
- +
+
diff --git a/src/app/packages/ns-packages/ns-composer/NSComposerComponent.html b/src/app/packages/ns-packages/ns-composer/NSComposerComponent.html index c4ec96d..d8c7df3 100644 --- a/src/app/packages/ns-packages/ns-composer/NSComposerComponent.html +++ b/src/app/packages/ns-packages/ns-composer/NSComposerComponent.html @@ -23,44 +23,44 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i {{'PAGE.TOPOLOGY.VIRTUALLINK' | translate}} {{'PAGE.TOPOLOGY.VNF' | translate}} {{'PAGE.TOPOLOGY.CONNECTIONPOINT' | translate}} -
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -172,7 +172,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
  • -  {{'PAGE.TOPOLOGY.VL' | translate}} +  {{'PAGE.TOPOLOGY.VL' | translate}}
@@ -190,7 +190,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i [attr.data-id]="list['id']" *ngFor="let list of vnfList" placement="top" container="body" ngbTooltip="{{ list['product-name'] }}"> -  {{ list['product-name'] }} +  {{ list['product-name'] }} @@ -200,7 +200,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
-
+

{{'PAGE.TOPOLOGY.VNF' | translate}} diff --git a/src/app/packages/ns-packages/ns-composer/NSComposerComponent.scss b/src/app/packages/ns-packages/ns-composer/NSComposerComponent.scss index d750ccc..34eb552 100644 --- a/src/app/packages/ns-packages/ns-composer/NSComposerComponent.scss +++ b/src/app/packages/ns-packages/ns-composer/NSComposerComponent.scss @@ -14,4 +14,12 @@ 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 +*/ +.close-nsd { + opacity: 1; + background-color: transparent; + border: 0; + position: absolute; + right: 4px; + font-size: 1.3125rem; +} \ No newline at end of file diff --git a/src/app/packages/ns-packages/ns-composer/NSComposerComponent.ts b/src/app/packages/ns-packages/ns-composer/NSComposerComponent.ts index 4552226..916ac8b 100644 --- a/src/app/packages/ns-packages/ns-composer/NSComposerComponent.ts +++ b/src/app/packages/ns-packages/ns-composer/NSComposerComponent.ts @@ -18,7 +18,6 @@ /** * @file NS Compose Component */ -import { isNullOrUndefined } from 'util'; import { HttpHeaders } from '@angular/common/http'; import { Component, ElementRef, Injector, ViewChild, ViewEncapsulation } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; @@ -43,7 +42,7 @@ import { Tick, TickPath, VLC, VLD, VNFPROFILE } from 'NSDModel'; import { RestService } from 'RestService'; -import { SharedService } from 'SharedService'; +import { SharedService, isNullOrUndefined } from 'SharedService'; import { VNFD, VNFData } from 'VNFDModel'; /** diff --git a/src/app/packages/ns-packages/vnf-composer/VNFComposerComponent.html b/src/app/packages/ns-packages/vnf-composer/VNFComposerComponent.html index a947069..3ed9543 100644 --- a/src/app/packages/ns-packages/vnf-composer/VNFComposerComponent.html +++ b/src/app/packages/ns-packages/vnf-composer/VNFComposerComponent.html @@ -27,44 +27,44 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i translate}} {{'PAGE.TOPOLOGY.INTCONNECTIONPOINT' | translate}} -
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -212,7 +212,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
-
+

{{'PAGE.TOPOLOGY.VDU' | translate}} diff --git a/src/app/packages/ns-packages/vnf-composer/VNFComposerComponent.scss b/src/app/packages/ns-packages/vnf-composer/VNFComposerComponent.scss index 4473c67..aa6b894 100644 --- a/src/app/packages/ns-packages/vnf-composer/VNFComposerComponent.scss +++ b/src/app/packages/ns-packages/vnf-composer/VNFComposerComponent.scss @@ -14,4 +14,12 @@ 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 +*/ +.close-vnfd { + opacity: 1; + background-color: transparent; + border: 0; + position: absolute; + right: 4px; + font-size: 1.3125rem; +} \ No newline at end of file diff --git a/src/app/packages/ns-packages/vnf-composer/VNFComposerComponent.ts b/src/app/packages/ns-packages/vnf-composer/VNFComposerComponent.ts index eabd2b7..9fab0da 100644 --- a/src/app/packages/ns-packages/vnf-composer/VNFComposerComponent.ts +++ b/src/app/packages/ns-packages/vnf-composer/VNFComposerComponent.ts @@ -18,7 +18,6 @@ /** * @file VNFComposerComponent */ - import { isNullOrUndefined } from 'util'; import { HttpHeaders } from '@angular/common/http'; import { Component, ElementRef, Injector, ViewChild, ViewEncapsulation } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; @@ -33,7 +32,7 @@ import { environment } from 'environment'; import * as HttpStatus from 'http-status-codes'; import * as jsyaml from 'js-yaml'; import { RestService } from 'RestService'; -import { SharedService } from 'SharedService'; +import { SharedService, isNullOrUndefined } from 'SharedService'; import { COMPOSERNODES, EXTCPD, GRAPHDETAILS, INTCPD, IVLD, Tick, TickPath, VDU, VDUINTCPD, VNFD, VNFDATA, VNIR } from 'VNFDModel'; /** diff --git a/src/app/packages/vnf-packages/VNFPackagesComponent.html b/src/app/packages/vnf-packages/VNFPackagesComponent.html index 2d7298d..675e6d7 100644 --- a/src/app/packages/vnf-packages/VNFPackagesComponent.html +++ b/src/app/packages/vnf-packages/VNFPackagesComponent.html @@ -15,7 +15,7 @@ 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) --> -
+
VNF {{'PACKAGES' | translate}}
-
- +
+
diff --git a/src/app/projects/ProjectsComponent.html b/src/app/projects/ProjectsComponent.html index ec15861..9186210 100644 --- a/src/app/projects/ProjectsComponent.html +++ b/src/app/projects/ProjectsComponent.html @@ -15,17 +15,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) --> -
+
{{'PAGE.DASHBOARD.PROJECTS' | translate}}
- +
-
- +
+
diff --git a/src/app/projects/ProjectsComponent.ts b/src/app/projects/ProjectsComponent.ts index 982421e..2c0e105 100644 --- a/src/app/projects/ProjectsComponent.ts +++ b/src/app/projects/ProjectsComponent.ts @@ -18,7 +18,6 @@ /** * @file Project 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'; @@ -32,7 +31,7 @@ import { ProjectData, ProjectDetails } from 'ProjectModel'; import { ProjectsActionComponent } from 'ProjectsAction'; import { RestService } from 'RestService'; import { Subscription } from 'rxjs'; -import { SharedService } from 'SharedService'; +import { SharedService, isNullOrUndefined } from 'SharedService'; /** * Creating component 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 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
-
-
+
-
- + - +
-
-
+
+
-
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 { environment } from 'environment'; 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 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 @@ 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) --> -
+
{{ (getRoleType == 'Add' ? 'PAGE.ROLES.CREATEROLE' : 'PAGE.ROLES.EDITROLE') | translate}}
@@ -30,22 +30,22 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i -
+
-
+
-
+
-
@@ -54,7 +54,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
@@ -84,9 +84,9 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i -
+
-
\ 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 { environment } from 'environment'; 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 @@ 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) --> -
+
{{'ROLES' | translate}}
-
- +
+
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 { RestService } from 'RestService'; import { RolesActionComponent } from 'RolesAction'; import { RoleData, RoleDetails } from 'RolesModel'; import { Subscription } from 'rxjs'; -import { SharedService } from 'SharedService'; +import { SharedService, isNullOrUndefined } from 'SharedService'; /** * Creating component diff --git a/src/app/sdn-controller/new-sdn-controller/NewSDNControllerComponent.html b/src/app/sdn-controller/new-sdn-controller/NewSDNControllerComponent.html index 5937862..c9893c1 100644 --- a/src/app/sdn-controller/new-sdn-controller/NewSDNControllerComponent.html +++ b/src/app/sdn-controller/new-sdn-controller/NewSDNControllerComponent.html @@ -23,7 +23,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
@@ -32,7 +32,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i formControlName="name" id="name" [ngClass]="{ 'is-invalid': submitted && f.name.errors }" required>
-
+
{{'TYPEINFO' | translate}}
-
+
-
+
-
+
-
+
-
+
-
+
-
+
{{'PAGE.SDNCONTROLLER.REGISTEREDSDNCONTROLLER' | translate}}
-
-
+
+
- +
diff --git a/src/app/sdn-controller/sdn-controller-info/SDNControllerInfoComponent.html b/src/app/sdn-controller/sdn-controller-info/SDNControllerInfoComponent.html index d89ad24..3c1c15e 100644 --- a/src/app/sdn-controller/sdn-controller-info/SDNControllerInfoComponent.html +++ b/src/app/sdn-controller/sdn-controller-info/SDNControllerInfoComponent.html @@ -23,91 +23,89 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
{{'NS' | translate}} {{'INSTANCE' | translate}} Id
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- {{'ID' | translate}} - - {{(sdnDetails._id)?sdnDetails._id:'-'}} -
- {{'NAME' | translate}} - - {{(sdnDetails.name)?sdnDetails.name:'-'}} -
- {{'TYPE' | translate}} - - {{(sdnDetails.type)?sdnDetails.type:'-'}} -
- {{'OPERATIONALSTATE' | translate}} - - - {{(sdnDetails._admin.operationalState)?sdnDetails._admin.operationalState:'-'}} -
- {{'URL' | translate}} - - {{(sdnDetails.url)?sdnDetails.url:'-'}} -
- {{'USER' | translate}} - - {{(sdnDetails.user)?sdnDetails.user:'-'}} -
- {{'VERSION' | translate}} - - {{(sdnDetails.version)?sdnDetails.version:'-'}} -
- {{'PAGE.SDNCONTROLLER.DPID' | translate}} - - {{(sdnDetails.dpid)?sdnDetails.dpid:'-'}} -
- {{'CREATED' | translate}} - - {{(sdnDetails._admin.created)?this.sharedService.convertEpochTime(sdnDetails._admin.created):'-'}} -
- {{'MODIFIED' | translate}} - - {{(sdnDetails._admin.modified)?this.sharedService.convertEpochTime(sdnDetails._admin.modified):'-'}} -
+ {{'ID' | translate}} + + {{(sdnDetails._id)?sdnDetails._id:'-'}} +
+ {{'NAME' | translate}} + + {{(sdnDetails.name)?sdnDetails.name:'-'}} +
+ {{'TYPE' | translate}} + + {{(sdnDetails.type)?sdnDetails.type:'-'}} +
+ {{'OPERATIONALSTATE' | translate}} + + + {{(sdnDetails._admin.operationalState)?sdnDetails._admin.operationalState:'-'}} +
+ {{'URL' | translate}} + + {{(sdnDetails.url)?sdnDetails.url:'-'}} +
+ {{'USER' | translate}} + + {{(sdnDetails.user)?sdnDetails.user:'-'}} +
+ {{'VERSION' | translate}} + + {{(sdnDetails.version)?sdnDetails.version:'-'}} +
+ {{'PAGE.SDNCONTROLLER.DPID' | translate}} + + {{(sdnDetails.dpid)?sdnDetails.dpid:'-'}} +
+ {{'CREATED' | translate}} + + {{(sdnDetails._admin.created)?this.sharedService.convertEpochTime(sdnDetails._admin.created):'-'}} +
+ {{'MODIFIED' | translate}} + + {{(sdnDetails._admin.modified)?this.sharedService.convertEpochTime(sdnDetails._admin.modified):'-'}} +
{{'DEPLOYED' | translate}} diff --git a/src/app/sdn-controller/sdn-controller-info/SDNControllerInfoComponent.scss b/src/app/sdn-controller/sdn-controller-info/SDNControllerInfoComponent.scss index c68960c..7ff1ee9 100644 --- a/src/app/sdn-controller/sdn-controller-info/SDNControllerInfoComponent.scss +++ b/src/app/sdn-controller/sdn-controller-info/SDNControllerInfoComponent.scss @@ -14,4 +14,25 @@ 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 tr:hover { + color: $body-color; + background-color: #f6fafe; + } + .table thead th { + vertical-align: bottom; + border-bottom: 2px solid rgba(0, 0, 0, .1); + } + .table th, .table td { + padding: 5px; + 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 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 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i -
+
@@ -43,7 +43,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
@@ -53,7 +53,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i [ngClass]="{ 'is-invalid': submitted && f.old_password.errors }" required>
-
+
@@ -68,7 +68,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i {{'PAGE.LOGIN.PASSWORDMINLENGTHVALIDMESSAGE' | translate}}
-
+
@@ -83,7 +83,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i {{'PAGE.LOGIN.PASSWORDMINLENGTHVALIDMESSAGE' | translate}}
-
+
@@ -100,7 +100,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
{{'PAGE.USERS.ADDMAPPINGS' | translate}}
-
@@ -40,8 +40,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
- + [ngClass]="{ 'is-invalid': submitted && params.controls.project_name.errors }">
@@ -52,16 +51,16 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
-
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 @@ 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) --> -
+
{{'PAGE.DASHBOARD.USERS' | translate}}
-
-
+
+
- +
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 { LocalDataSource } from 'ng2-smart-table'; 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'; diff --git a/src/app/utilities/compose-packages/ComposePackages.html b/src/app/utilities/compose-packages/ComposePackages.html index 0d66e0f..1067054 100644 --- a/src/app/utilities/compose-packages/ComposePackages.html +++ b/src/app/utilities/compose-packages/ComposePackages.html @@ -23,7 +23,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
diff --git a/src/app/utilities/confirmation-topology/ConfirmationTopologyComponent.html b/src/app/utilities/confirmation-topology/ConfirmationTopologyComponent.html index 92a2726..3594a37 100644 --- a/src/app/utilities/confirmation-topology/ConfirmationTopologyComponent.html +++ b/src/app/utilities/confirmation-topology/ConfirmationTopologyComponent.html @@ -50,7 +50,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
{{'DELETECONFIRMPOPUPMESSAGE' | translate}} {{ topologyname }} ?
  • diff --git a/src/app/utilities/edit-packages/EditPackagesComponent.html b/src/app/utilities/edit-packages/EditPackagesComponent.html index f099af1..30ae5e0 100644 --- a/src/app/utilities/edit-packages/EditPackagesComponent.html +++ b/src/app/utilities/edit-packages/EditPackagesComponent.html @@ -15,34 +15,34 @@ 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) --> -
    -
    {{'EDIT' | translate}}  +
    {{'EDIT' | translate}} {{pacakgeType}} {{'DESCRIPTOR' | translate}}
    -
    +
    -
    -
    +
    -
    - -
    -
    +
    -
    +
    @@ -49,8 +49,8 @@ Author: SANDHYA JS (sandhya.j@tataelxsi.co.in)
    -
    -
    +
    +
    @@ -60,34 +60,34 @@ Author: SANDHYA JS (sandhya.j@tataelxsi.co.in)
    -
    -