From: Manoop Talasila <talasila@research.att.com>
Date: Tue, 4 Jun 2019 20:15:39 +0000 (+0000)
Subject: Merge "Upgrade ANR client to API spec version 0.0.8"
X-Git-Tag: R2~86
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=9d33149c7bdc8566d0135406b601fc1a901ff2f5;hp=-c;p=portal%2Fric-dashboard.git

Merge "Upgrade ANR client to API spec version 0.0.8"
---

9d33149c7bdc8566d0135406b601fc1a901ff2f5
diff --combined docs/release-notes.rst
index c0ea620f,fb494f6c..0b76d824
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@@ -20,13 -20,13 +20,14 @@@
  RIC Dashboard Release Notes
  ===========================
  
- Version 1.0.4, 30 May 2019
+ Version 1.0.4, 4 June 2019
  --------------------------
 +* Add AC xApp neighbor control screen
  * Add ANR xApp neighbor cell relation table
  * Drop the pendulum xApp control screen
  * Add column sorting on xApp catalog, xApp control, ANR 
  * Add disconnect-all button to RAN connection screen
+ * Update ANR xApp client to spec version 0.0.8
  
  Version 1.0.3, 28 May 2019
  --------------------------
diff --combined webapp-frontend/src/app/anr-xapp/anr-edit-ncr-dialog.component.ts
index 046a624b,57a4b64a..96c1f3d8
--- a/webapp-frontend/src/app/anr-xapp/anr-edit-ncr-dialog.component.ts
+++ b/webapp-frontend/src/app/anr-xapp/anr-edit-ncr-dialog.component.ts
@@@ -23,6 -23,7 +23,6 @@@ import { MatDialogRef, MAT_DIALOG_DATA 
  import { ANRXappService } from '../services/anr-xapp/anr-xapp.service';
  import { ErrorDialogService } from '../services/ui/error-dialog.service';
  import { ANRNeighborCellRelation, ANRNeighborCellRelationMod } from '../interfaces/anr-xapp.types';
 -import { modelGroupProvider } from '@angular/forms/src/directives/ng_model_group';
  
  @Component({
      selector: 'app-ncr-edit-dialog',
@@@ -36,16 -37,16 +36,15 @@@ export class ANREditNCRDialogComponent 
  
      constructor(
          private dialogRef: MatDialogRef<ANREditNCRDialogComponent>,
 -        private dataService: ANRXappService, private errorService: ErrorDialogService,
 -        @Inject(MAT_DIALOG_DATA) private data: ANRNeighborCellRelation) {
 -        console.log('constructed with data ' + data);
 -    }
 +        private dataService: ANRXappService,
 +        private errorService: ErrorDialogService,
 +        @Inject(MAT_DIALOG_DATA) private data: ANRNeighborCellRelation) { }
  
      ngOnInit() {
-         const namePattern = /^([A-Z])+([0-9])+$/;
          this.ncrDialogForm = new FormGroup({
              servingCellNrcgi: new FormControl(this.data.servingCellNrcgi), // readonly
              neighborCellNrpci: new FormControl(this.data.neighborCellNrpci), // readonly
-             neighborCellNrcgi: new FormControl(this.data.neighborCellNrcgi, [Validators.required, Validators.pattern(namePattern)]),
+             neighborCellNrcgi: new FormControl(this.data.neighborCellNrcgi, [Validators.required]),
              flagNoHo: new FormControl(this.data.flagNoHo),
              flagNoXn: new FormControl(this.data.flagNoXn),
              flagNoRemove: new FormControl(this.data.flagNoRemove)
@@@ -57,31 -58,31 +56,31 @@@
      }
  
      modifyNcr = (ncrFormValue: ANRNeighborCellRelation) => {
 -      if (this.ncrDialogForm.valid) {
 -        const ncrm = {} as ANRNeighborCellRelationMod;
 -        // there must be a btter way
 -        ncrm.neighborCellNrcgi = ncrFormValue.neighborCellNrcgi;
 -        ncrm.neighborCellNrpci = ncrFormValue.neighborCellNrpci;
 -        ncrm.flagNoHo = ncrFormValue.flagNoHo;
 -        ncrm.flagNoXn = ncrFormValue.flagNoXn;
 -        ncrm.flagNoRemove = ncrFormValue.flagNoRemove;
 -        this.dataService.modifyNcr(ncrFormValue.servingCellNrcgi, ncrFormValue.neighborCellNrpci, ncrm).subscribe((val: any[]) => {},
 -            (error => {
 -                this.errorService.displayError('NCR update failed: ' + error.message);
 -            })
 -        );
 -        this.dialogRef.close();
 -      }
 +        if (this.ncrDialogForm.valid) {
 +            const ncrm = {} as ANRNeighborCellRelationMod;
 +            // there must be a better way
 +            ncrm.neighborCellNrcgi = ncrFormValue.neighborCellNrcgi;
 +            ncrm.neighborCellNrpci = ncrFormValue.neighborCellNrpci;
 +            ncrm.flagNoHo = ncrFormValue.flagNoHo;
 +            ncrm.flagNoXn = ncrFormValue.flagNoXn;
 +            ncrm.flagNoRemove = ncrFormValue.flagNoRemove;
 +            this.dataService.modifyNcr(ncrFormValue.servingCellNrcgi, ncrFormValue.neighborCellNrpci, ncrm).subscribe((val: any[]) => { },
 +                (error => {
 +                    this.errorService.displayError('NCR update failed: ' + error.message);
 +                })
 +            );
 +            this.dialogRef.close();
 +        }
      }
  
 -    public hasError(controlName: string, errorName: string) {
 +    hasError(controlName: string, errorName: string) {
          if (this.ncrDialogForm.controls[controlName].hasError(errorName)) {
 -          return true;
 +            return true;
          }
          return false;
      }
  
 -    public validateControl(controlName: string) {
 +    validateControl(controlName: string) {
          if (this.ncrDialogForm.controls[controlName].invalid && this.ncrDialogForm.controls[controlName].touched) {
              return true;
          }