* ========================LICENSE_START=================================
* O-RAN-SC
* %%
- * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * Copyright (C) 2019 AT&T Intellectual Property
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
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',
+ selector: 'rd-ncr-edit-dialog',
templateUrl: './anr-edit-ncr-dialog.component.html',
styleUrls: ['./anr-edit-ncr-dialog.component.scss']
})
-export class ANREditNCRDialogComponent implements OnInit {
+export class AnrEditNcrDialogComponent implements OnInit {
private ncrDialogForm: FormGroup;
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 dialogRef: MatDialogRef<AnrEditNcrDialogComponent>,
+ 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)
}
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 to build the struct
+ 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[]) => {
+ // Success
+ },
+ (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;
}