From 51931c02865dc58c0b16d1cccaf4d7331b94ce7f Mon Sep 17 00:00:00 2001
From: cmack <conoramck@gmail.com>
Date: Fri, 7 Aug 2020 14:28:55 +0100
Subject: [PATCH] Fix for name and value fields donut

---
 .../userInterface/temporaryPanelStructure.js  | 10 +++
 packages/standard-components/components.json  |  2 +
 .../src/Chart/Donut.svelte                    | 61 +++++++++++++++----
 3 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/packages/builder/src/components/userInterface/temporaryPanelStructure.js b/packages/builder/src/components/userInterface/temporaryPanelStructure.js
index b844271b49..dc8ea3dd95 100644
--- a/packages/builder/src/components/userInterface/temporaryPanelStructure.js
+++ b/packages/builder/src/components/userInterface/temporaryPanelStructure.js
@@ -476,6 +476,16 @@ export default {
                   "yellow",
                 ],
               },
+              {
+                label: "Name Field",
+                key: "nameKey",
+                control: Input,
+              },
+              {
+                label: "Value Field",
+                key: "valueKey",
+                control: Input,
+              },
               {
                 label: "External Radius",
                 key: "externalRadius",
diff --git a/packages/standard-components/components.json b/packages/standard-components/components.json
index c3a3e646fa..6836f4981c 100644
--- a/packages/standard-components/components.json
+++ b/packages/standard-components/components.json
@@ -287,6 +287,8 @@
 			"hasLastHoverSliceHighlighted": "bool",
 			"hasHoverAnimation": "bool",
 			"numberFormat": "string",
+			"nameKey": "string",
+			"valueKey": "string",
 			"isAnimated": "bool",
 			"externalRadius": "number",
 			"internalRadius": "number",
diff --git a/packages/standard-components/src/Chart/Donut.svelte b/packages/standard-components/src/Chart/Donut.svelte
index f97e9c0825..b1031a214f 100644
--- a/packages/standard-components/src/Chart/Donut.svelte
+++ b/packages/standard-components/src/Chart/Donut.svelte
@@ -36,6 +36,8 @@
   export let width = 200
   export let margin = null
 
+  $: console.log("DATA", data)
+
   export let centeredTextFunction = null
   export let externalRadius = 25
   export let percentageFormat = null
@@ -47,6 +49,8 @@
   export let internalRadius = 25
   export let isAnimated = true
   export let radiusHoverOffset = 0
+  export let nameKey = null
+  export let valueKey = null
   // export let useLegend = true
   export let horizontalLegend = false
   export let legendWidth = null
@@ -70,13 +74,14 @@
     if (chart) {
       if (model) {
         await fetchData()
-        data = model ? $store[model] : []
+        data = checkAndReformatData($store[model])
       }
 
       chart.emptyDataConfig({
         showEmptySlice: true,
         emptySliceColor: "#F0F0F0",
       })
+
       chartContainer = select(`.${chartClass}`)
       bindChartUIProps()
       bindChartEvents()
@@ -84,6 +89,37 @@
     }
   })
 
+  function checkAndReformatData(data) {
+    let _data = [...data]
+
+    if (valueKey) {
+      _data = reformatDataKey(_data, valueKey, "quantity")
+    }
+
+    if (nameKey) {
+      _data = reformatDataKey(_data, nameKey, "name")
+    }
+
+    return _data.every(d => d.quantity) && _data.every(d => d.name) ? _data : []
+  }
+
+  function reformatDataKey(data = [], dataKey = null, formatKey = null) {
+    let ignoreList = ["_id", "_rev", "id"]
+    if (dataKey && data.every(d => d[dataKey])) {
+      return data.map(d => {
+        let obj = { ...d }
+        let value = obj[dataKey]
+        if (!ignoreList.includes(dataKey)) {
+          delete obj[dataKey]
+        }
+        obj[formatKey] = value
+        return obj
+      })
+    } else {
+      return data
+    }
+  }
+
   function bindChartUIProps() {
     chart.percentageFormat(".0f")
 
@@ -160,24 +196,23 @@
   $: if (!width && chartSvg) {
     width = chartSvg.clientWidth
     chart.width(width)
-    debugger
     chartContainer.datum(data).call(chart)
   }
 
-  // $: _data = model ? $store[model] : data
-
   $: colorSchema = getColorSchema(color)
 </script>
 
 <div>
   <div bind:this={chartElement} class={chartClass} />
-  <Legend
-    bind:legend={legendChart}
-    {colorSchema}
-    useLegend
-    isHorizontal={horizontalLegend}
-    width={legendWidth || width}
-    height={legendHeight}
-    {chartClass}
-    {data} />
+  {#if data.length > 0}
+    <Legend
+      bind:legend={legendChart}
+      {colorSchema}
+      useLegend
+      isHorizontal={horizontalLegend}
+      width={legendWidth || width}
+      height={legendHeight}
+      {chartClass}
+      {data} />
+  {/if}
 </div>