From c0b791a9978a243b6ef45a897b49ae12433d4bac Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 27 Oct 2020 00:08:07 +0000
Subject: [PATCH]

---
 server/AyaNova/Controllers/ImportController.cs | 8 ++++----
 server/AyaNova/biz/WidgetBiz.cs                | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/server/AyaNova/Controllers/ImportController.cs b/server/AyaNova/Controllers/ImportController.cs
index fd74ea70..d79c949f 100644
--- a/server/AyaNova/Controllers/ImportController.cs
+++ b/server/AyaNova/Controllers/ImportController.cs
@@ -58,7 +58,8 @@ namespace AyaNova.Api.Controllers
 
             // AyaTypeId attachToObject = null;
             ApiUploadProcessor.ApiUploadedFilesResult uploadFormData = null;
-            List<string> ImportResult=new List<string>();
+            List<string> ImportResult = new List<string>();
+            ImportResult.Add("Import results\n");
             try
             {
                 if (!MultipartRequestHelper.IsMultipartContentType(Request.ContentType))
@@ -104,7 +105,7 @@ namespace AyaNova.Api.Controllers
                     foreach (UploadedFileInfo a in uploadFormData.UploadedFiles)
                     {
                         JArray ja = JArray.Parse(System.IO.File.ReadAllText(a.InitialUploadedPathName));
-                       ImportResult.AddRange(await ((IImportAbleObject)biz).ImportData(ja));
+                        ImportResult.AddRange(await ((IImportAbleObject)biz).ImportData(ja));
                     }
                 }
             }
@@ -119,8 +120,7 @@ namespace AyaNova.Api.Controllers
                 ApiUploadProcessor.DeleteTempUploadFile(uploadFormData);
             }
 
-            //TODO: Return results of operation here
-            return Ok(ImportResult);
+            return Ok(ApiOkResponse.Response(ImportResult));
         }
 
 
diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs
index cdf01add..4879ad7e 100644
--- a/server/AyaNova/biz/WidgetBiz.cs
+++ b/server/AyaNova/biz/WidgetBiz.cs
@@ -9,7 +9,6 @@ using AyaNova.Models;
 using Newtonsoft.Json.Linq;
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace AyaNova.Biz
 {
@@ -344,14 +343,16 @@ namespace AyaNova.Biz
                 var res = await CreateAsync(w);
                 if (res == null)
                 {
-                    ImportResult.Add($"{w.Name} - no {this.GetErrorsAsString()}");
+                    ImportResult.Add($"{w.Name} - {this.GetErrorsAsString()}");
                     this.ClearErrors();
                 }
                 else
                 {
                     ImportResult.Add($"{w.Name} - ok");
                 }
+
             }
+
             return ImportResult;
         }