diff --git a/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.html b/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.html index 9e60ee4c58b3b97e668f511af26dfa6afef19270..4e103de0b2a785623baf7e8081165b046e789229 100644 --- a/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.html +++ b/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.html @@ -14,7 +14,7 @@ <div style="margin-bottom: 10px"> {{ 'APPS_MANAGEMENT.ADD_JSON_TEXTAREA'| translate}} </div> - <textarea rows="10" cols="100" pInputTextarea [(ngModel)]="jsonText" (keyup)="this.JsonError = false"></textarea> + <textarea rows="10" cols="100" pInputTextarea [(ngModel)]="jsonText" (keyup)="this.JsonError = false; this.error = ''"></textarea> </div> <div class="flex flex-row justify-content-center justify-content-center mt-2"> <button *ngIf="jsonText.length >0" pButton class="btn btn-success" diff --git a/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.ts b/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.ts index 62638c292ab2e1df41073e8aa0f606e036379548..72a926ff40e141030bd298b5c5253dc280b2ca99 100644 --- a/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.ts +++ b/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.ts @@ -44,7 +44,11 @@ export class AppAddJsonAppComponent implements OnInit { }, error => { console.log(error) - this.error = error.message + if (error.message === null) { + this.JsonError = true; + } else { + this.error = error.message + } }) } catch (e) { console.warn('invalid json') @@ -68,7 +72,11 @@ export class AppAddJsonAppComponent implements OnInit { }, error => { console.log(error) - this.error = error.message + if (error.message === null) { + this.JsonError = true; + } else { + this.error = error.message + } }) } catch (e) { console.warn('invalid json') diff --git a/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.html b/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.html index ca1889da3b63b88290cd60d4fffe655f1c572a08..7b228696a1610a3f2de818942a34ec135aca945a 100644 --- a/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.html +++ b/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.html @@ -14,7 +14,7 @@ <div style="margin-bottom: 10px"> {{ 'APPS_MANAGEMENT.ADD_JSON_TEXTAREA'| translate}} </div> - <textarea rows="10" cols="100" pInputTextarea [(ngModel)]="jsonText" (keyup)="this.JsonError = false"></textarea> + <textarea rows="10" cols="100" pInputTextarea [(ngModel)]="jsonText" (keyup)="this.JsonError = false; this.error = ''"></textarea> </div> <div class="flex flex-row justify-content-center justify-content-center mt-2"> <button *ngIf="jsonText.length >0" pButton class="btn btn-success" diff --git a/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.ts b/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.ts index 54532ee89bd6fdb61eea4d0016e933f79c40d422..f91cffb80728c3530d6f108cf04ebe0c4593a377 100644 --- a/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.ts +++ b/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.ts @@ -48,7 +48,11 @@ export class AppAddJsonVersionAppComponent implements OnInit { }, error => { console.log(error) - this.error = error.error.message + if (error.message === null) { + this.JsonError = true; + } else { + this.error = error.message + } }) } catch (e) { console.warn('invalid json') @@ -72,7 +76,11 @@ export class AppAddJsonVersionAppComponent implements OnInit { }, error => { console.log(error) - this.error = error.error.message + if (error.message === null) { + this.JsonError = true; + } else { + this.error = error.message + } }) } catch (e) { console.warn('invalid json')