From 6b14111b24ebe47d172aa860b5518373b48a2e61 Mon Sep 17 00:00:00 2001
From: Dion Moult <dion@thinkmoult.com>
Date: Fri, 6 Sep 2024 16:40:09 +1000
Subject: [PATCH] More grid panel to spatial subpanel

---
 src/bonsai/bonsai/bim/__init__.py                |  2 +-
 src/bonsai/bonsai/bim/module/model/__init__.py   |  1 -
 src/bonsai/bonsai/bim/module/model/ui.py         | 13 -------------
 src/bonsai/bonsai/bim/module/spatial/__init__.py |  1 +
 src/bonsai/bonsai/bim/module/spatial/ui.py       | 16 ++++++++++++++--
 src/bonsai/bonsai/bim/ui.py                      |  4 ++--
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/bonsai/bonsai/bim/__init__.py b/src/bonsai/bonsai/bim/__init__.py
index 546cd52b05..4a60f49845 100644
--- a/src/bonsai/bonsai/bim/__init__.py
+++ b/src/bonsai/bonsai/bim/__init__.py
@@ -144,7 +144,7 @@ classes = [
     # Project overview
     ui.BIM_PT_tab_new_project_wizard,
     ui.BIM_PT_tab_project_info,
-    ui.BIM_PT_tab_spatial_decomposition,
+    ui.BIM_PT_tab_spatial,
     ui.BIM_PT_tab_project_setup,
     ui.BIM_PT_tab_geometry,
     ui.BIM_PT_tab_stakeholders,
diff --git a/src/bonsai/bonsai/bim/module/model/__init__.py b/src/bonsai/bonsai/bim/module/model/__init__.py
index 0d87693dfc..ab391e20c3 100644
--- a/src/bonsai/bonsai/bim/module/model/__init__.py
+++ b/src/bonsai/bonsai/bim/module/model/__init__.py
@@ -136,7 +136,6 @@ classes = (
     ui.BIM_PT_roof,
     ui.LaunchTypeManager,
     ui.BIM_MT_model,
-    ui.BIM_PT_Grids,
     grid.BIM_OT_add_object,
     stair.BIM_OT_add_stair,
     stair.AddStair,
diff --git a/src/bonsai/bonsai/bim/module/model/ui.py b/src/bonsai/bonsai/bim/module/model/ui.py
index 3e18849af7..439104d891 100644
--- a/src/bonsai/bonsai/bim/module/model/ui.py
+++ b/src/bonsai/bonsai/bim/module/model/ui.py
@@ -160,19 +160,6 @@ class BIM_PT_authoring(Panel):
         row.operator("bim.toggle_space_visibility")
 
 
-class BIM_PT_Grids(Panel):
-    bl_label = "Grids"
-    bl_idname = "BIM_PT_Grids"
-    bl_options = {"DEFAULT_CLOSED"}
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "scene"
-    bl_parent_id = "BIM_PT_tab_project_setup"
-
-    def draw(self, context):
-        self.layout.row().operator("mesh.add_grid", icon="ADD", text="Add Grids")
-
-
 class BIM_PT_array(bpy.types.Panel):
     bl_label = "Array"
     bl_idname = "BIM_PT_array"
diff --git a/src/bonsai/bonsai/bim/module/spatial/__init__.py b/src/bonsai/bonsai/bim/module/spatial/__init__.py
index 49e93034f9..2061055974 100644
--- a/src/bonsai/bonsai/bim/module/spatial/__init__.py
+++ b/src/bonsai/bonsai/bim/module/spatial/__init__.py
@@ -48,6 +48,7 @@ classes = (
     ui.BIM_UL_containers_manager,
     ui.BIM_UL_elements,
     ui.BIM_PT_spatial_decomposition,
+    ui.BIM_PT_grids,
     workspace.Hotkey,
 )
 
diff --git a/src/bonsai/bonsai/bim/module/spatial/ui.py b/src/bonsai/bonsai/bim/module/spatial/ui.py
index d7f9569ace..dff3f0fef9 100644
--- a/src/bonsai/bonsai/bim/module/spatial/ui.py
+++ b/src/bonsai/bonsai/bim/module/spatial/ui.py
@@ -95,8 +95,7 @@ class BIM_PT_spatial_decomposition(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_tab_spatial_decomposition"
-    bl_options = {"HIDE_HEADER"}
+    bl_parent_id = "BIM_PT_tab_spatial"
 
     @classmethod
     def poll(cls, context):
@@ -196,6 +195,19 @@ class BIM_PT_spatial_decomposition(Panel):
         )
 
 
+class BIM_PT_grids(Panel):
+    bl_label = "Grids"
+    bl_idname = "BIM_PT_grids"
+    bl_options = {"DEFAULT_CLOSED"}
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+    bl_parent_id = "BIM_PT_tab_spatial"
+
+    def draw(self, context):
+        self.layout.row().operator("mesh.add_grid", icon="ADD", text="Add Grids")
+
+
 class BIM_UL_containers_manager(UIList):
     def __init__(self):
         self.use_filter_show = True
diff --git a/src/bonsai/bonsai/bim/ui.py b/src/bonsai/bonsai/bim/ui.py
index 611e45591b..914ea43f74 100644
--- a/src/bonsai/bonsai/bim/ui.py
+++ b/src/bonsai/bonsai/bim/ui.py
@@ -522,8 +522,8 @@ class BIM_PT_tab_project_info(Panel):
         pass
 
 
-class BIM_PT_tab_spatial_decomposition(Panel):
-    bl_label = "Spatial Decomposition"
+class BIM_PT_tab_spatial(Panel):
+    bl_label = "Spatial"
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"