From 8e830463211d79fd17eb6e4a56137108d486baf5 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 27 Jun 2024 15:38:22 +0100
Subject: [PATCH] Fix bindings not working with grid conditions

---
 .../settings/controls/DraggableList/DraggableList.svelte      | 2 ++
 .../controls/GridColumnConfiguration/FieldSetting.svelte      | 4 +++-
 .../GridColumnConfiguration/GridColumnConfiguration.svelte    | 2 ++
 packages/client/manifest.json                                 | 1 -
 .../frontend-core/src/components/grid/stores/conditions.js    | 1 +
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte b/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte
index 0ba7de42c2..2bfa7d39fd 100644
--- a/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte
+++ b/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte
@@ -12,6 +12,7 @@
   export let listItemKey
   export let draggable = true
   export let focus
+  export let bindings = []
 
   let zoneType = generate()
 
@@ -126,6 +127,7 @@
           anchor={anchors[draggableItem.id]}
           item={draggableItem.item}
           {...listTypeProps}
+          {bindings}
           on:change={onItemChanged}
         />
       </div>
diff --git a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/FieldSetting.svelte b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/FieldSetting.svelte
index a16fe9273e..85eb4603e1 100644
--- a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/FieldSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/FieldSetting.svelte
@@ -7,6 +7,7 @@
 
   export let item
   export let anchor
+  export let bindings
 
   const dispatch = createEventDispatcher()
 
@@ -39,8 +40,9 @@
 <div class="list-item-body">
   <div class="list-item-left">
     <EditComponentPopover
-      {anchor}
       componentInstance={item}
+      {bindings}
+      {anchor}
       {parseSettings}
       on:change
     >
diff --git a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
index 19d61e1f2a..87a4174e60 100644
--- a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
@@ -9,6 +9,7 @@
 
   export let value
   export let componentInstance
+  export let bindings
 
   const dispatch = createEventDispatcher()
   let primaryDisplayColumnAnchor
@@ -63,6 +64,7 @@
   items={columns.sortable}
   listItemKey={"_id"}
   listType={FieldSetting}
+  {bindings}
 />
 
 <style>
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index c8a5f8e1a4..b4061c7043 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -7308,7 +7308,6 @@
           {
             "type": "columns/grid",
             "key": "columns",
-            "nested": true,
             "resetOn": "table"
           }
         ]
diff --git a/packages/frontend-core/src/components/grid/stores/conditions.js b/packages/frontend-core/src/components/grid/stores/conditions.js
index 127cd24bcb..100e6e665c 100644
--- a/packages/frontend-core/src/components/grid/stores/conditions.js
+++ b/packages/frontend-core/src/components/grid/stores/conditions.js
@@ -91,6 +91,7 @@ export const initialise = context => {
 
   // Recompute all metadata if conditions change
   conditions.subscribe($conditions => {
+    console.log($conditions)
     console.log("recomputing all conditions")
     let metadata = {}
     if ($conditions.length) {