Bug fixes

Author: acoumb

src/Umbraco.Cms.Integrations.PIM.Inriver/App_Plugins/UmbracoCms.Integrations/PIM/Inriver/js/entitypickereditor.controller.js

@@ -59,7 +59,7 @@
                         fields: obj.fieldValues.map(fieldObj => {
                             return {
                                 fieldType: fieldTypes.find(fieldTypeObj => fieldTypeObj.fieldTypeId === fieldObj.fieldTypeId).fieldTypeDisplayName,
-                                value: fieldObj.value
+                                value: fieldObj.display
                             }
                         })
                     }

src/Umbraco.Cms.Integrations.PIM.Inriver/App_Plugins/UmbracoCms.Integrations/PIM/Inriver/views/entitypickereditor.html

@@ -4,14 +4,14 @@
     <uui-box headline="{{model.title}}" class="inriver-container">
         <div>
             <uui-icon-registry-essential>
-                <uui-input id="inSearch" class="inriver-search" label="search" 
+                <uui-input id="inSearch" class="inriver-search" label="search"
                            ng-on-input="vm.search()" ng-model="vm.searchTerm"
                            placeholder="Enter a name to search...">
                     <uui-icon style="padding-left: 10px;" slot="prepend" name="search"></uui-icon>
                 </uui-input>
             </uui-icon-registry-essential>
         </div>
-        <uui-scroll-container class="mt2" style="width:100%">
+        <uui-scroll-container class="mt2" style="width:100%;height:600px;">
             <uui-form ng-if="vm.filteredEntities.length > 0">
                 <uui-form-layout-item>
                     <uui-table class="uui-text">
@@ -35,10 +35,10 @@
                     </uui-table>
                 </uui-form-layout-item>
             </uui-form>
-            <div ng-show="!vm.loading" class="inriver-center">
-                <uui-pagination></uui-pagination>
-            </div>
         </uui-scroll-container>
+        <div ng-show="!vm.loading" class="inriver-center">
+            <uui-pagination></uui-pagination>
+        </div>
     </uui-box>
     <umb-editor-footer>
         <umb-editor-footer-content-right>

src/Umbraco.Cms.Integrations.PIM.Inriver/Models/FieldValue.cs

@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace Umbraco.Cms.Integrations.PIM.Inriver.Models
 {
@@ -8,6 +9,33 @@ public class FieldValue
         public string FieldTypeId { get; set; }
 
         [JsonPropertyName("value")]
-        public string Value { get; set; }
+        public object Value { get; set; }
+
+        public Dictionary<string, string> ValueDictionary
+        {
+            get
+            {
+                try
+                {
+                    if (Value == null) return null;
+
+                    return JsonSerializer.Deserialize<Dictionary<string, string>>(Value.ToString());
+                }
+                catch { return null; }
+            }
+        }
+
+        public string Display
+        {
+            get
+            {
+                if(ValueDictionary != null)
+                {
+                    return string.Join(",", ValueDictionary);
+                }
+
+                return Value?.ToString();
+            }
+        }
     }
 }

src/Umbraco.Cms.Integrations.PIM.Inriver/Models/ViewModels/InriverEntityViewModel.cs

@@ -5,7 +5,7 @@ public class InriverEntityViewModel
     {
         public InriverEntityViewModel()
         {
-            Fields = new Dictionary<string, string>();
+            Fields = new Dictionary<string, object>();
         }
 
         public int Id { get; set; }
@@ -14,6 +14,6 @@ public InriverEntityViewModel()
 
         public string DisplayDescription { get; set; }
 
-        public Dictionary<string, string> Fields { get; set; }
+        public Dictionary<string, object> Fields { get; set; }
     }
 }