Fix Bug 2294: Incorrect notification in update descriptor
- Fixed the update descriptor issue to show 'Please Change something'
when no changes is made.
Change-Id: I042835c1934c1b94a8e8d880dae8d97b289750df
Signed-off-by: SANDHYA.JS <sandhya.j@tataelxsi.co.in>
diff --git a/src/app/utilities/edit-packages/EditPackagesComponent.ts b/src/app/utilities/edit-packages/EditPackagesComponent.ts
index 42998b8..3cf75c9 100644
--- a/src/app/utilities/edit-packages/EditPackagesComponent.ts
+++ b/src/app/utilities/edit-packages/EditPackagesComponent.ts
@@ -141,6 +141,9 @@
/** Data @private */
private data: string = '';
+ /** Contains updated data @private */
+ private updateData: string;
+
/** contains http options @private */
private httpOptions: HttpHeaders;
@@ -239,7 +242,7 @@
/** Update function @public */
public update(showgraph: boolean): void {
- if (this.data === '') {
+ if (this.data === '' || this.data === this.updateData) {
this.notifierService.notify('warning', this.translateService.instant('PAGE.TOPOLOGY.DATAEMPTY'));
} else {
this.updateCheck(showgraph);
@@ -255,11 +258,11 @@
if (packageType === 'nsd') {
this.router.navigate(['/packages/ns/compose/' + this.paramsID]).catch((): void => {
// Catch Navigation Error
- });
+ });
} else if (packageType === 'vnf') {
this.router.navigate(['/packages/vnf/compose/' + this.paramsID]).catch((): void => {
// Catch Navigation Error
- });
+ });
}
}
this.getEditFileData();
@@ -277,10 +280,11 @@
};
let descriptorInfo: string = '';
if (this.mode === 'text/json') {
- descriptorInfo = jsyaml.dump(JSON.parse(this.data), {sortKeys: true});
+ descriptorInfo = jsyaml.dump(JSON.parse(this.data), { sortKeys: true });
} else {
descriptorInfo = this.data;
}
+ this.updateData = this.data;
if (this.getFileContentType !== 'nst') {
this.sharedService.targzFile({ packageType: this.pacakgeType, id: this.paramsID, descriptor: descriptorInfo })
.then((content: ArrayBuffer): void => {
@@ -309,10 +313,10 @@
this.isLoadingResults = false;
}, (error: ERRORDATA) => {
error.error = typeof error.error === 'string' ? jsyaml.load(error.error) : error.error;
- if (error.error.status === HttpStatus.NOT_FOUND || error.error.status === HttpStatus.UNAUTHORIZED ) {
+ if (error.error.status === HttpStatus.NOT_FOUND || error.error.status === HttpStatus.UNAUTHORIZED) {
this.router.navigateByUrl('404', { skipLocationChange: true }).catch((): void => {
// Catch Navigation Error
- });
+ });
} else {
this.restService.handleError(error, 'get');
}