From 069b9e7e072dff9a9c76525de2c617ba6db64051 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Fri, 13 Aug 2021 17:04:56 +0300
Subject: [PATCH] Fixed parse CSV type; UI: Refactoring

---
 .../main/java/org/thingsboard/server/utils/TypeCastUtil.java | 2 +-
 .../components/import-export/import-dialog-csv.component.ts  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/utils/TypeCastUtil.java b/application/src/main/java/org/thingsboard/server/utils/TypeCastUtil.java
index f2b7219ce0..6bc9a4d249 100644
--- a/application/src/main/java/org/thingsboard/server/utils/TypeCastUtil.java
+++ b/application/src/main/java/org/thingsboard/server/utils/TypeCastUtil.java
@@ -45,7 +45,7 @@ public class TypeCastUtil {
     }
 
     private static boolean isNumber(String value) {
-        return NumberUtils.isParsable(value.replace(',', '.'));
+        return NumberUtils.isNumber(value.replace(',', '.'));
     }
 
     private static boolean isSimpleDouble(String valueAsString) {
diff --git a/ui-ngx/src/app/modules/home/components/import-export/import-dialog-csv.component.ts b/ui-ngx/src/app/modules/home/components/import-export/import-dialog-csv.component.ts
index 29ab0857de..e61aa21d02 100644
--- a/ui-ngx/src/app/modules/home/components/import-export/import-dialog-csv.component.ts
+++ b/ui-ngx/src/app/modules/home/components/import-export/import-dialog-csv.component.ts
@@ -247,11 +247,11 @@ export class ImportDialogCsvComponent extends DialogComponent<ImportDialogCsvCom
 
   initEditor() {
     if (!this.initEditorComponent) {
-      this.createEditor(this.failureDetailsEditorElmRef, this.statistical.errorsList.join('\n'));
+      this.createEditor(this.failureDetailsEditorElmRef, this.statistical.errorsList);
     }
   }
 
-  private createEditor(editorElementRef: ElementRef, content: string): void {
+  private createEditor(editorElementRef: ElementRef, contents: string[]): void {
     const editorElement = editorElementRef.nativeElement;
     let editorOptions: Partial<Ace.EditorOptions> = {
       mode: 'ace/mode/java',
@@ -268,6 +268,7 @@ export class ImportDialogCsvComponent extends DialogComponent<ImportDialogCsvCom
     };
 
     editorOptions = {...editorOptions, ...advancedOptions};
+    const content = contents.map(error => error.replace('\n', '')).join('\n');
     getAce().subscribe(
       (ace) => {
         const editor = ace.edit(editorElement, editorOptions);