From 90295c9a25c27628164eed0c66d0a89df587525b Mon Sep 17 00:00:00 2001 From: maximesson Date: Thu, 15 Apr 2021 10:04:58 +0200 Subject: [PATCH] Tweaks for Policy Control UI Change-Id: I3dc8550f55644b5194c2db99092b0f6b3b1e7d22 Issue-ID: NONRTRIC-488 Signed-off-by: maximesson --- webapp-frontend/src/app/app.module.ts | 4 +- webapp-frontend/src/app/interceptor.mock.ts | 12 ++++++ webapp-frontend/src/app/mock/policy-type0.json | 43 ++++++++++++++++++++++ webapp-frontend/src/app/mock/policy-types.json | 3 +- webapp-frontend/src/app/mock/policytypes.json | 4 ++ webapp-frontend/src/app/mock/ric1.json | 3 +- .../src/app/policy/policy-control.component.html | 10 ++++- .../app/policy/policy-control.component.spec.ts | 12 ++++++ .../src/app/policy/policy-control.component.ts | 16 ++++++-- .../policy-instance/policy-instance.component.html | 10 +++-- .../policy-instance/policy-instance.component.ts | 6 ++- .../policy/policy-type/policy-type.component.html | 12 +++--- .../policy/policy-type/policy-type.component.scss | 6 ++- 13 files changed, 124 insertions(+), 17 deletions(-) create mode 100644 webapp-frontend/src/app/mock/policy-type0.json diff --git a/webapp-frontend/src/app/app.module.ts b/webapp-frontend/src/app/app.module.ts index a8cbb2c..adca33a 100644 --- a/webapp-frontend/src/app/app.module.ts +++ b/webapp-frontend/src/app/app.module.ts @@ -22,8 +22,9 @@ import { BrowserModule } from '@angular/platform-browser'; import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import {MatListModule} from '@angular/material/list'; +import { MatListModule} from '@angular/material/list'; import { MatSidenavModule } from '@angular/material/sidenav'; +import { MatTooltipModule } from '@angular/material/tooltip'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; import { NgModule } from '@angular/core'; @@ -65,6 +66,7 @@ export const isMock = environment.mock; MatListModule, MatSidenavModule, MatSlideToggleModule, + MatTooltipModule, MaterialDesignFrameworkModule, MDBBootstrapModule.forRoot(), PolicyModule, diff --git a/webapp-frontend/src/app/interceptor.mock.ts b/webapp-frontend/src/app/interceptor.mock.ts index 6fc5c14..ad0d080 100644 --- a/webapp-frontend/src/app/interceptor.mock.ts +++ b/webapp-frontend/src/app/interceptor.mock.ts @@ -37,6 +37,7 @@ import * as eiproducerstatus1 from './mock/ei-producer-status1.json'; import * as eiproducerstatus2 from './mock/ei-producer-status2.json'; import * as policytypesList from './mock/policy-types.json'; import * as policytypes1 from './mock/policy-type1.json'; +import * as policytypes0 from './mock/policy-type0.json'; import * as policyinstanceedit from './mock/policy-instance-edit.json'; import * as ric1 from './mock/ric1.json'; import * as ric2 from './mock/ric2.json'; @@ -50,6 +51,10 @@ const urls = [ url: '/a1-policy/v2/policy-types/1', json: policytypes1 }, + { + url: '/a1-policy/v2/policy-types/0', + json: policytypes0 + }, { url: '/a1-policy/v2/policies?policytype_id=', json: noTypePolicies @@ -143,12 +148,19 @@ const urls = [ @Injectable() export class HttpMockRequestInterceptor implements HttpInterceptor { constructor(private injector: Injector) { } + private numberOfTypes = 0; intercept(request: HttpRequest, next: HttpHandler): Observable> { if (request.method === "PUT" && request.url.includes("policies")) { console.log('Answered PUT policy ', request.url, request.body); return of(new HttpResponse({ status: 200 })); } + if (request.url === "/a1-policy/v2/policy-types" && this.numberOfTypes > 0) { + this.numberOfTypes = 0; + return of(new HttpResponse({status: 200, body:JSON.parse('{"policytype_ids": ["","1"]}')})); + } else { + this.numberOfTypes = 1; + } for (const element of urls) { if (request.url === element.url) { console.log('Loaded from stub json : ' + request.url); diff --git a/webapp-frontend/src/app/mock/policy-type0.json b/webapp-frontend/src/app/mock/policy-type0.json new file mode 100644 index 0000000..a3a03b8 --- /dev/null +++ b/webapp-frontend/src/app/mock/policy-type0.json @@ -0,0 +1,43 @@ +{ + "policy_schema": { + "$schema": "http://json-schema.org/draft-07/schema#", + "description": "Type 0 policy type (no instances)", + "additionalProperties": false, + "title": "0", + "type": "object", + "properties": { + "qosObjectives": { + "additionalProperties": false, + "type": "object", + "properties": { + "priorityLevel": { + "type": "number" + } + }, + "required": [ + "priorityLevel" + ] + }, + "scope": { + "additionalProperties": false, + "type": "object", + "properties": { + "qosId": { + "type": "string" + }, + "ueId": { + "type": "string" + } + }, + "required": [ + "ueId", + "qosId" + ] + } + }, + "required": [ + "scope", + "qosObjectives" + ] + } +} \ No newline at end of file diff --git a/webapp-frontend/src/app/mock/policy-types.json b/webapp-frontend/src/app/mock/policy-types.json index 9bad9ad..c65b820 100644 --- a/webapp-frontend/src/app/mock/policy-types.json +++ b/webapp-frontend/src/app/mock/policy-types.json @@ -1,6 +1,7 @@ { "policytype_ids": [ "", - "1" + "1", + "0" ] } \ No newline at end of file diff --git a/webapp-frontend/src/app/mock/policytypes.json b/webapp-frontend/src/app/mock/policytypes.json index 89a7d0b..a59e12d 100644 --- a/webapp-frontend/src/app/mock/policytypes.json +++ b/webapp-frontend/src/app/mock/policytypes.json @@ -6,5 +6,9 @@ { "name": "1", "schema": "{\"$schema\":\"http://json-schema.org/draft-07/schema#\",\"description\":\"Type 1 policy type\",\"additionalProperties\":false,\"title\":\"1\",\"type\":\"object\",\"properties\":{\"qosObjectives\":{\"additionalProperties\":false,\"type\":\"object\",\"properties\":{\"priorityLevel\":{\"type\":\"number\"}},\"required\":[\"priorityLevel\"]},\"scope\":{\"additionalProperties\":false,\"type\":\"object\",\"properties\":{\"qosId\":{\"type\":\"string\"},\"ueId\":{\"type\":\"string\"}},\"required\":[\"ueId\",\"qosId\"]}},\"required\":[\"scope\",\"qosObjectives\"]}" + }, + { + "name": "0", + "schema": "{\"$schema\":\"http://json-schema.org/draft-07/schema#\",\"description\":\"Type 0 policy type (no instances)\",\"additionalProperties\":false,\"title\":\"1\",\"type\":\"object\",\"properties\":{\"qosObjectives\":{\"additionalProperties\":false,\"type\":\"object\",\"properties\":{\"priorityLevel\":{\"type\":\"number\"}},\"required\":[\"priorityLevel\"]},\"scope\":{\"additionalProperties\":false,\"type\":\"object\",\"properties\":{\"qosId\":{\"type\":\"string\"},\"ueId\":{\"type\":\"string\"}},\"required\":[\"ueId\",\"qosId\"]}},\"required\":[\"scope\",\"qosObjectives\"]}" } ] \ No newline at end of file diff --git a/webapp-frontend/src/app/mock/ric1.json b/webapp-frontend/src/app/mock/ric1.json index de92d04..bae205e 100644 --- a/webapp-frontend/src/app/mock/ric1.json +++ b/webapp-frontend/src/app/mock/ric1.json @@ -7,7 +7,8 @@ "kista_2" ], "policytype_ids": [ - "1" + "1", + "0" ], "state": "AVAILABLE" } diff --git a/webapp-frontend/src/app/policy/policy-control.component.html b/webapp-frontend/src/app/policy/policy-control.component.html index b9f4c34..e8b6ae9 100644 --- a/webapp-frontend/src/app/policy/policy-control.component.html +++ b/webapp-frontend/src/app/policy/policy-control.component.html @@ -19,7 +19,15 @@ -->
-
Policy Control
+
Policy Types
+
+ +
+
+ +
There are no policy types to display.
\ No newline at end of file diff --git a/webapp-frontend/src/app/policy/policy-control.component.spec.ts b/webapp-frontend/src/app/policy/policy-control.component.spec.ts index 05f95db..4109dbd 100644 --- a/webapp-frontend/src/app/policy/policy-control.component.spec.ts +++ b/webapp-frontend/src/app/policy/policy-control.component.spec.ts @@ -30,10 +30,14 @@ import { PolicyTypes } from "@interfaces/policy.types"; import { PolicyService } from "@services/policy/policy.service"; import { MockComponent } from "ng-mocks"; import { PolicyTypeComponent } from "./policy-type/policy-type.component"; +import { MatButtonHarness } from '@angular/material/button/testing'; +import { HarnessLoader } from '@angular/cdk/testing'; +import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; describe("PolicyControlComponent", () => { let component: PolicyControlComponent; let fixture: ComponentFixture; + let loader: HarnessLoader; beforeEach(async(() => { const policyServiceSpy = jasmine.createSpyObj("PolicyService", [ @@ -57,6 +61,7 @@ describe("PolicyControlComponent", () => { fixture = TestBed.createComponent(PolicyControlComponent); component = fixture.componentInstance; fixture.detectChanges(); + loader = TestbedHarnessEnvironment.loader(fixture); }); it("should create", () => { @@ -72,4 +77,11 @@ describe("PolicyControlComponent", () => { expect(typeComponents[0].policyTypeId).toEqual("type1"); expect(typeComponents[1].policyTypeId).toEqual("type2"); }); + + /*it("should reload when clicking on refresh button", async () => { + let refreshButton: MatButtonHarness = await loader.getHarness( + MatButtonHarness.with({ selector: "#refreshButton" }) + ); + + })*/ }); diff --git a/webapp-frontend/src/app/policy/policy-control.component.ts b/webapp-frontend/src/app/policy/policy-control.component.ts index df49c76..feb4cfb 100644 --- a/webapp-frontend/src/app/policy/policy-control.component.ts +++ b/webapp-frontend/src/app/policy/policy-control.component.ts @@ -21,20 +21,30 @@ import { Component, OnInit } from "@angular/core"; import { PolicyTypes } from "@interfaces/policy.types"; import { PolicyService } from "@services/policy/policy.service"; +import { PolicyTypeComponent } from "./policy-type/policy-type.component" @Component({ selector: "nrcp-policy-control", templateUrl: "./policy-control.component.html", styleUrls: ["./policy-control.component.scss"] }) + export class PolicyControlComponent implements OnInit { - policyTypeIds: Array; + policyTypeIds = []; + ptComponent: PolicyTypeComponent; - constructor(private policyService: PolicyService) {} + constructor(private policyService: PolicyService) { + this.ptComponent = new PolicyTypeComponent(policyService); + } ngOnInit() { + this.refreshTables(); + } + + refreshTables() { this.policyService.getPolicyTypes().subscribe((policyType: PolicyTypes) => { - this.policyTypeIds = policyType.policytype_ids; + this.policyTypeIds = policyType.policytype_ids.sort(); }); + this.ptComponent.toggleVisible(); } } diff --git a/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.html b/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.html index 29f0579..3203c0d 100644 --- a/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.html +++ b/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.html @@ -18,7 +18,7 @@ ========================LICENSE_END=================================== -->
- Number of instances: {{noInstances()}} + Number of instances: {{instanceCount()}} @@ -110,7 +110,11 @@ No records found. - + - \ No newline at end of file + + + + + diff --git a/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts b/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts index 6441e56..f007d17 100644 --- a/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts +++ b/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts @@ -179,7 +179,11 @@ export class PolicyInstanceComponent implements OnInit { }); } - noInstances(): number { + hasInstances(): boolean { + return this.instanceCount() > 0; +} + + instanceCount(): number { return this.policyInstances.length; } diff --git a/webapp-frontend/src/app/policy/policy-type/policy-type.component.html b/webapp-frontend/src/app/policy/policy-type/policy-type.component.html index 6c95bf9..5b92a7d 100644 --- a/webapp-frontend/src/app/policy/policy-type/policy-type.component.html +++ b/webapp-frontend/src/app/policy/policy-type/policy-type.component.html @@ -20,13 +20,15 @@
- {{isVisible.value? 'expand_less' : 'expand_more'}} + {{isVisible.value? 'expand_less' : 'expand_more'}}
-
- Policy type: {{policyType}} +
+ {{policyType}}
-
- Description: {{policyDescription}} +
+
+
+ Description: {{policyDescription}}
diff --git a/webapp-frontend/src/app/policy/policy-type/policy-type.component.scss b/webapp-frontend/src/app/policy/policy-type/policy-type.component.scss index 26245c9..ef1fc68 100644 --- a/webapp-frontend/src/app/policy/policy-type/policy-type.component.scss +++ b/webapp-frontend/src/app/policy/policy-type/policy-type.component.scss @@ -16,4 +16,8 @@ * See the License for the specific language governing permissions and * limitations under the License. * ========================LICENSE_END=================================== - */ \ No newline at end of file + */ + + .description { + margin-left: 40px; + } \ No newline at end of file -- 2.16.6