From 88f30df2d86b7aa6b34eae771b7203846ac6f453 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Wed, 24 Aug 2022 12:07:51 +0100
Subject: [PATCH] Code review updates

---
 .../builder/src/builderStore/dataBinding.js   | 23 +++++++++++-----
 .../common/bindings/BindingPanel.svelte       | 27 ++++++++-----------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index 79ada2d7de..0466f95476 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -359,8 +359,9 @@ const getProviderContextBindings = (asset, dataProviders) => {
           providerId,
           // Table ID is used by JSON fields to know what table the field is in
           tableId: table?._id,
-          category: "Dataprovider",
-          display: { name: readableBinding, type: fieldSchema.type },
+          category: component._instanceName,
+          icon: def.icon,
+          display: { name: fieldSchema.name || key, type: fieldSchema.type },
         })
       })
     })
@@ -388,6 +389,7 @@ const getUserBindings = () => {
       fieldSchema,
       providerId: "user",
       category: "Current User",
+      icon: "User",
       display: fieldSchema,
     })
   })
@@ -406,14 +408,16 @@ const getDeviceBindings = () => {
       runtimeBinding: `${safeDevice}.${makePropSafe("mobile")}`,
       readableBinding: `Device.Mobile`,
       category: "Device",
-      display: { type: "string", name: "mobile" },
+      icon: "DevicePhone",
+      display: { type: "boolean", name: "mobile" },
     })
     bindings.push({
       type: "context",
       runtimeBinding: `${safeDevice}.${makePropSafe("tablet")}`,
       readableBinding: `Device.Tablet`,
       category: "Device",
-      display: { type: "string", name: "tablet" },
+      icon: "DevicePhone",
+      display: { type: "boolean", name: "tablet" },
     })
   }
   return bindings
@@ -437,7 +441,8 @@ const getSelectedRowsBindings = asset => {
           "selectedRows"
         )}`,
         readableBinding: `${table._instanceName}.Selected rows`,
-        category: "Dataprovider",
+        category: "Selected rows",
+        icon: "ViewRow",
       }))
     )
 
@@ -470,6 +475,7 @@ const getStateBindings = () => {
       runtimeBinding: `${safeState}.${makePropSafe(key)}`,
       readableBinding: `State.${key}`,
       category: "State",
+      icon: "AutomatedSegment",
       display: { name: key },
     }))
   }
@@ -494,12 +500,16 @@ const getUrlBindings = asset => {
     runtimeBinding: `${safeURL}.${makePropSafe(param)}`,
     readableBinding: `URL.${param}`,
     category: "URL",
+    icon: "RailTop",
+    display: { type: "string" },
   }))
   const queryParamsBinding = {
     type: "context",
     runtimeBinding: makePropSafe("query"),
     readableBinding: "Query params",
     category: "URL",
+    icon: "RailTop",
+    display: { type: "object" },
   }
   return urlParamBindings.concat([queryParamsBinding])
 }
@@ -511,7 +521,8 @@ const getRoleBindings = () => {
       runtimeBinding: `trim "${role._id}"`,
       readableBinding: `Role.${role.name}`,
       category: "Role",
-      display: { name: role.name },
+      icon: "UserGroup",
+      display: { type: "string", name: role.name },
     }
   })
 }
diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index 36fa191038..63d8638bfe 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -49,15 +49,6 @@
   let hbsValue = initialValueJS ? null : value
 
   let selectedCategory = null
-  let categoryIcons = {
-    Device: "DevicePhone",
-    "Current User": "User",
-    Helpers: "MagicWand",
-    Dataprovider: "Data",
-    State: "AutomatedSegment",
-    URL: "RailTop",
-    Role: "UserGroup",
-  }
 
   let popover
   let popoverAnchor
@@ -66,6 +57,16 @@
   $: usingJS = mode === "JavaScript"
   $: searchRgx = new RegExp(search, "ig")
   $: categories = Object.entries(groupBy("category", bindings))
+
+  $: bindingIcons = bindings?.reduce((acc, ele) => {
+    if (ele.icon) {
+      acc[ele.category] = acc[ele.category] || ele.icon
+    }
+    return acc
+  }, {})
+
+  $: categoryIcons = { ...bindingIcons, Helpers: "MagicWand" }
+
   $: filteredCategories = categories
     .map(([name, categoryBindings]) => ({
       name,
@@ -84,13 +85,7 @@
     return helper.label.match(searchRgx) || helper.description.match(searchRgx)
   })
 
-  $: categoryNames = [
-    ...categories.reduce((acc, cat) => {
-      acc.push(cat[0])
-      return acc
-    }, []),
-    "Helpers",
-  ]
+  $: categoryNames = [...categories.map(cat => cat[0]), "Helpers"]
 
   $: codeMirrorHints = bindings?.map(x => `$("${x.readableBinding}")`)