From 452dc30484db7b07170f44b9872d8a11dd83472d Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 23 Jan 2020 20:47:22 +0000
Subject: [PATCH]

---
 server/AyaNova/ControllerHelpers/ApiPagedResponse.cs | 4 ++--
 server/AyaNova/DataList/AyaDataList.cs               | 4 ++--
 server/AyaNova/DataList/DataListFetcher.cs           | 2 +-
 server/AyaNova/DataList/IAyaDataList.cs              | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/AyaNova/ControllerHelpers/ApiPagedResponse.cs b/server/AyaNova/ControllerHelpers/ApiPagedResponse.cs
index 3e98f2e9..bac55b21 100644
--- a/server/AyaNova/ControllerHelpers/ApiPagedResponse.cs
+++ b/server/AyaNova/ControllerHelpers/ApiPagedResponse.cs
@@ -27,9 +27,9 @@ namespace AyaNova.Api.ControllerHelpers
 
         public object items { get; }
         public object PageLinks { get; }
-        public object Columns { get; }
+        public Newtonsoft.Json.Linq.JArray Columns { get; }
 
-        public ApiPagedResponse(object returnItems, object pageLinks, object columns)
+        public ApiPagedResponse(object returnItems, object pageLinks, Newtonsoft.Json.Linq.JArray columns)
         {
             items = returnItems;
             PageLinks = pageLinks;
diff --git a/server/AyaNova/DataList/AyaDataList.cs b/server/AyaNova/DataList/AyaDataList.cs
index d264a40f..78226d4c 100644
--- a/server/AyaNova/DataList/AyaDataList.cs
+++ b/server/AyaNova/DataList/AyaDataList.cs
@@ -26,13 +26,13 @@ namespace AyaNova.DataList
         public string ListKey { get; set; }
         public string DefaultDataListDisplayTemplate { get; set; }
 
-        public object GenerateMINIListColumnsJSON()
+        public Newtonsoft.Json.Linq.JArray GenerateMINIListColumnsJSON()
         {
             //return $"[ {{\"cm\":\"df\",\"dt\":0,\"ay\":{(int)DefaultListObjectType}}},{{\"cm\":\"Widget\",\"dt\":{(int)AyaUiFieldDataType.Text},\"ay\":{(int)DefaultListObjectType}}}]";
             return JArray.Parse($"[ {{\"cm\":\"df\",\"dt\":0,\"ay\":{(int)DefaultListObjectType}}},{{\"cm\":\"Widget\",\"dt\":{(int)AyaUiFieldDataType.Text},\"ay\":{(int)DefaultListObjectType}}}]");
         }
 
-        public object GenerateListColumnsJSONFromTemplate(string template)
+        public Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromTemplate(string template)
         {
             //parse the template
             var jtemplate = JObject.Parse(template);
diff --git a/server/AyaNova/DataList/DataListFetcher.cs b/server/AyaNova/DataList/DataListFetcher.cs
index 69a3d832..daec721d 100644
--- a/server/AyaNova/DataList/DataListFetcher.cs
+++ b/server/AyaNova/DataList/DataListFetcher.cs
@@ -181,7 +181,7 @@ namespace AyaNova.DataList
             var pageLinks = new PaginationLinkBuilder(Url, routeName, null, listOptions, totalRecordCount).PagingLinksObject();
 
             //BUILD THE COLUMNS RETURN PROPERTY JSON FRAGMENT          
-            object ColumnsJSON = string.Empty;
+            Newtonsoft.Json.Linq.JArray ColumnsJSON = null;
             if (listOptions.Mini)
             {
                 ColumnsJSON = DataList.GenerateMINIListColumnsJSON();
diff --git a/server/AyaNova/DataList/IAyaDataList.cs b/server/AyaNova/DataList/IAyaDataList.cs
index 069717a7..d8969272 100644
--- a/server/AyaNova/DataList/IAyaDataList.cs
+++ b/server/AyaNova/DataList/IAyaDataList.cs
@@ -28,8 +28,8 @@ namespace AyaNova.DataList
         //Default list display template if none found in db or is invalid, this ensures the data will flow even if people fuck up the templates somehow
         string DefaultDataListDisplayTemplate { get; set; }
 
-        object GenerateMINIListColumnsJSON();
-        object GenerateListColumnsJSONFromTemplate(string template);
+        Newtonsoft.Json.Linq.JArray GenerateMINIListColumnsJSON();
+        Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromTemplate(string template);
 
         bool ValidateTemplate(string template);