From 9270b8c6aac3c121109506c17dfb216a8e29cb7f Mon Sep 17 00:00:00 2001
From: kbeyro <121854496+kbeyro@users.noreply.github.com>
Date: Mon, 26 Jun 2023 16:06:57 +0200
Subject: [PATCH] fix error handle

---
 .../app-add-json-app/app-add-json-app.component.html |  2 +-
 .../app-add-json-app/app-add-json-app.component.ts   | 12 ++++++++++--
 .../app-add-json-version-app.component.html          |  2 +-
 .../app-add-json-version-app.component.ts            | 12 ++++++++++--
 4 files changed, 22 insertions(+), 6 deletions(-)

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 9e60ee4c..4e103de0 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 62638c29..72a926ff 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 ca1889da..7b228696 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 54532ee8..f91cffb8 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')
-- 
GitLab