- id: policies
uri: https://localhost:8433
predicates:
- - Path=/a1-policy/v2/policies
+ - Path=/a1-policy/v2/policies/**
management:
endpoint:
gateway:
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
- "url": "http://localhost:9876",
+ "url": "http://localhost:4200",
"webRoot": "${workspaceFolder}"
},
{
const urls = [
{
- url: 'a1-policy/v2/policy-types',
+ url: '/a1-policy/v2/policy-types',
json: policytypesList
},
{
- url: 'a1-policy/v2/policy-types/',
+ url: '/a1-policy/v2/policy-types/',
json: policytypes1
},
{
- url: 'a1-policy/v2/policy-types/1',
+ url: '/a1-policy/v2/policy-types/1',
json: policytypes1
},
{
- url: 'a1-policy/v2/policies?policytype_id=',
+ url: '/a1-policy/v2/policies?policytype_id=',
json: policies
},
{
- url: 'a1-policy/v2/policies?policytype_id=1',
+ url: '/a1-policy/v2/policies?policytype_id=1',
json: policies
},
{
- url: 'a1-policy/v2/policies/2000',
+ url: '/a1-policy/v2/policies/2000',
json: policyinstances1
},
{
- url: 'a1-policy/v2/policies/2100',
+ url: '/a1-policy/v2/policies/2100',
json: policyinstances2
},
{
- url: 'a1-policy/v2/policies/2000/status',
+ url: '/a1-policy/v2/policies/2000/status',
json: policyinstances1Status
},
{
- url: 'a1-policy/v2/policies/2100/status',
+ url: '/a1-policy/v2/policies/2100/status',
json: policyinstances2Status
},
{
- url: 'a1-policy/v2/policies/2000?type=',
+ url: '/a1-policy/v2/policies/2000?type=',
json: policyinstanceedit
},
{
- url: 'a1-policy/v2/policies/2100?type=',
+ url: '/a1-policy/v2/policies/2100?type=',
json: policyinstanceedit
},
{
- url: 'a1-policy/v2/policies/2000?type=1',
+ url: '/a1-policy/v2/policies/2000?type=1',
json: policyinstanceedit
},
{
- url: 'a1-policy/v2/policies/2100?type=1',
+ url: '/a1-policy/v2/policies/2100?type=1',
json: policyinstanceedit
},
{
- url: 'a1-policy/v2/policies/2000?ric=ric1&type=1',
+ url: '/a1-policy/v2/policies/2000?ric=ric1&type=1',
json: ''
},
{
onSubmit() {
if (this.policyInstanceId == null) {
- this.policyInstanceId = uuid.v4();
+ this.policyInstanceId = uuid.v4();
}
const self: NoTypePolicyInstanceDialogComponent = this;
this.policySvc.putPolicy('', this.policyInstanceId, this.policyJsonTextArea.value, this.ric).subscribe(
});
}
- private formatJsonString(jsonToFormat: string) {
- return JSON.stringify(JSON.parse(jsonToFormat), null, 2);
- }
+ private formatJsonString(jsonToFormat: any) {
+ return JSON.stringify(jsonToFormat, null, 2);
+ }
- formatJsonInput() {
- this.policyJson = this.formatJsonString(this.policyJsonTextArea.value);
- }
+ formatJsonInput() {
+ this.policyJson = this.formatJsonString(JSON.parse(this.policyJsonTextArea.value));
+ }
}
export function jsonValidator(): ValidatorFn {
import { UiService } from '../services/ui/ui.service';
import { HttpErrorResponse } from '@angular/common/http';
import { FormGroup, FormControl, Validators } from '@angular/forms';
+import { ChangeDetectorRef } from '@angular/core';
@Component({
}
constructor(
+ private cdr: ChangeDetectorRef,
private dataService: PolicyService,
private errorService: ErrorDialogService,
private notificationService: NotificationService,
this.policyInstanceId = data.instanceId;
this.policyTypeName = data.name;
this.jsonSchemaObject = data.createSchema;
- this.jsonObject = this.parseJson(data.instanceJson);
+ this.jsonObject = data.instanceJson;
this.ric = data.ric;
}
}
ngAfterViewInit() {
+ this.cdr.detectChanges();
}
get ricSelector() { return this.instanceForm.get('ricSelector'); }
{
next(_) {
self.notificationService.success('Policy ' + self.policyTypeName + ':' + self.policyInstanceId +
- ' submitted');
+ ' submitted');
},
error(error: HttpErrorResponse) {
self.errorService.displayError('Submit failed: ' + error.error);
}
ngOnInit() {
- this.instanceDataSource = new PolicyInstanceDataSource(this.policySvc, this.sort, this.notificationService,this.policyTypeSchema);
+ this.instanceDataSource = new PolicyInstanceDataSource(this.policySvc, this.sort, this.notificationService, this.policyTypeSchema);
this.expanded.subscribe((isExpanded: boolean) => this.onExpand(isExpanded));
this.ui.darkModeState.subscribe((isDark) => {
this.darkMode = isDark;
}
private isSchemaEmpty(): boolean {
- return Object.keys(this.policyTypeSchema.schemaObject).length === 0;
+ return this.policyTypeSchema.schemaObject === '{}';
}
modifyInstance(instance: PolicyInstance): void {
- this.policySvc.getPolicy(this.policyTypeSchema.name, instance.policy_id).subscribe(
+ this.policySvc.getPolicyInstance(instance.policy_id).subscribe(
(refreshedJson: any) => {
- instance.policy_data = JSON.stringify(refreshedJson);
+ instance = refreshedJson;
if (this.isSchemaEmpty()) {
this.dialog.open(
NoTypePolicyInstanceDialogComponent,
getPolicyDialogProperties(this.policyTypeSchema, instance, this.darkMode)).afterClosed().subscribe(
- (_: any) => {
+ (_: any) => {
this.instanceDataSource.getPolicyInstances();
- }
+ }
);
} else {
this.dialog.open(
PolicyInstanceDialogComponent,
getPolicyDialogProperties(this.policyTypeSchema, instance, this.darkMode)).afterClosed().subscribe(
- (_: any) => {
+ (_: any) => {
this.instanceDataSource.getPolicyInstances();
- }
+ }
);
}
})
export class PolicyService {
- private apiVersion2 = 'v2'
- private basePath = '/a1-policy/';
+ private apiVersion2 = '/v2'
+ private basePath = '/a1-policy';
policyTypesPath = 'policy-types';
policyPath = 'policies';