From e1f92dfd5e4d8bdb4b4b8357bcfa7d31b7df1873 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 15 Jan 2020 21:55:45 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/ObjectFields.cs | 12 ++++++++++--
 server/AyaNova/biz/WidgetBiz.cs    | 13 ++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/server/AyaNova/biz/ObjectFields.cs b/server/AyaNova/biz/ObjectFields.cs
index edb58ef3..d6651b2f 100644
--- a/server/AyaNova/biz/ObjectFields.cs
+++ b/server/AyaNova/biz/ObjectFields.cs
@@ -133,6 +133,14 @@ namespace AyaNova.Biz
         }
 
 
+
+        //Standard mini COLUMN definition
+        public static string GenerateMINIListColumnJSON(AyaType defaultLinkType)
+        {
+            return $"[ {{\"cm\":\"_df_\",\"dt\":0,\"ay\":{(int)defaultLinkType}}},{{\"cm\":\"Widget\",\"dt\":{(int)AyaDataType.Text},\"ay\":{(int)defaultLinkType}}}]";
+        }
+
+
         //Accept a json template
         //return a column list suitable for api list return
         public static string GenerateListColumnJSONFromTemplate(AyaType defaultLinkType, string ObjectKey, string template)
@@ -149,8 +157,8 @@ namespace AyaNova.Biz
 
             sb.Append("[");
             //_df_ First column is always the _df_ column
-             sb.Append($"{{\"cm\":\"_df_\",\"dt\":{(int)defaultLinkType}}}");
-            
+            sb.Append($"{{\"cm\":\"_df_\",\"dt\":0,\"ay\":{(int)defaultLinkType}}}");
+
             foreach (string s in fullFields)
             {
                 ObjectField o = fields.FirstOrDefault(x => x.Key == s);
diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs
index 8fdebcd7..0162c858 100644
--- a/server/AyaNova/biz/WidgetBiz.cs
+++ b/server/AyaNova/biz/WidgetBiz.cs
@@ -326,19 +326,14 @@ namespace AyaNova.Biz
             }
             ";
 
-            //TODO: BUILD THE COLUMNS RETURN PROPERTY JSON FRAGMENT
-            //for MINI format we just use a static column definition built in to this list object
-            //for FULL we build it from the template automatically
+            //BUILD THE COLUMNS RETURN PROPERTY JSON FRAGMENT          
             string ColumnsJSON = string.Empty;
             if (listOptions.Mini)
-            {
-                //all mini lists will have an id so include the type to open
-                ColumnsJSON = $"[ {{\"cm\":\"_df_\",\"dt\":0,\"ay\":{(int)AyaType.Widget}}},{{\"cm\":\"Widget\",\"dt\":{(int)AyaDataType.Text},\"ay\":{(int)AyaType.Widget}}}]";
-                //"[{\"cm\":\"WidgetName\",\"dt\":4},{\"cm\":\"WidgetSerial\",\"dt\":5},{\"cm\":\"WidgetDollarAmount\",\"dt\":8},{\"cm\":\"WidgetRoles\",\"dt\":10},{\"cm\":\"WidgetStartDate\",\"dt\":1},{\"cm\":\"Active\",\"dt\":6}]"
+            {  
+                ColumnsJSON = ObjectFields.GenerateMINIListColumnJSON(AyaType.Widget);                
             }
             else
-            {
-                //TODO: need at least one column to be the openable object here or else nothing will open
+            {              
                 ColumnsJSON = ObjectFields.GenerateListColumnJSONFromTemplate(AyaType.Widget, ObjectFields.WIDGET_KEY, MOCK_WIDGET_DISPLAY_TEMPLATE_JSON);
             }