From f03c28f7fdc1bcc11eba3aabea3b05bc8a06da3c Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 16 Jul 2025 11:47:27 +0300
Subject: [PATCH] Add recursive insertion method in SpacesRecursiveHelper for
 managing space hierarchy. Update CommunityStructureCanvas to utilize this
 method for inserting new spaces under the correct parent, enhancing community
 state management during space creation.

---
 .../helpers/spaces_recursive_helper.dart      | 20 +++++++++++++++++++
 .../widgets/community_structure_canvas.dart   | 17 ++++++++--------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/lib/pages/space_management_v2/main_module/helpers/spaces_recursive_helper.dart b/lib/pages/space_management_v2/main_module/helpers/spaces_recursive_helper.dart
index b725bf31..4322c4e8 100644
--- a/lib/pages/space_management_v2/main_module/helpers/spaces_recursive_helper.dart
+++ b/lib/pages/space_management_v2/main_module/helpers/spaces_recursive_helper.dart
@@ -40,4 +40,24 @@ abstract final class SpacesRecursiveHelper {
     final nonNullSpaces = updatedSpaces.whereType<SpaceModel>().toList();
     return nonNullSpaces;
   }
+
+  static List<SpaceModel> recusrivelyInsert(
+    List<SpaceModel> spaces,
+    SpaceModel newSpace,
+    String parentUuid,
+  ) {
+    return spaces.map((space) {
+      if (space.uuid == parentUuid) {
+        return space.copyWith(
+          children: [...space.children, newSpace],
+        );
+      }
+      if (space.children.isNotEmpty) {
+        return space.copyWith(
+          children: recusrivelyInsert(space.children, newSpace, parentUuid),
+        );
+      }
+      return space;
+    }).toList();
+  }
 }
diff --git a/lib/pages/space_management_v2/main_module/widgets/community_structure_canvas.dart b/lib/pages/space_management_v2/main_module/widgets/community_structure_canvas.dart
index 63f8e8ec..03efab7d 100644
--- a/lib/pages/space_management_v2/main_module/widgets/community_structure_canvas.dart
+++ b/lib/pages/space_management_v2/main_module/widgets/community_structure_canvas.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/main_module/helpers/spaces_recursive_helper.dart';
 import 'package:syncrow_web/pages/space_management_v2/main_module/models/space_connection_model.dart';
 import 'package:syncrow_web/pages/space_management_v2/main_module/models/space_reorder_data_model.dart';
 import 'package:syncrow_web/pages/space_management_v2/main_module/painters/spaces_connections_arrow_painter.dart';
@@ -329,15 +330,15 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
           communityUuid: widget.community.uuid,
           parentUuid: space.uuid,
           onSuccess: (updatedSpaceModel) {
-            // TODO(FarisArmoush): insert the space under the parent, which is the space that was tapped
-            final newCommunity = widget.community.copyWith();
-            final parentIndex =
-                newCommunity.spaces.indexWhere((s) => s.uuid == space.uuid);
-            if (parentIndex != -1) {
-              newCommunity.spaces.insert(parentIndex + 1, updatedSpaceModel);
-            }
+            final updatedSpaces = SpacesRecursiveHelper.recusrivelyInsert(
+              spaces,
+              updatedSpaceModel,
+              space.uuid,
+            );
             context.read<CommunitiesBloc>().add(
-                  CommunitiesUpdateCommunity(newCommunity),
+                  CommunitiesUpdateCommunity(
+                    widget.community.copyWith(spaces: updatedSpaces),
+                  ),
                 );
           },
         ),