fixed assign tag issue

Bugifx/tag-validation

lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart

@@ -1,6 +1,8 @@
 import 'package:equatable/equatable.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 
 part 'device_managment_event.dart';
@@ -32,7 +34,20 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
   Future<void> _onFetchDevices(FetchDevices event, Emitter<DeviceManagementState> emit) async {
     emit(DeviceManagementLoading());
     try {
-      final devices = await DevicesManagementApi().fetchDevices(event.communityId, event.spaceId);
+      List<AllDevicesModel> devices = [];
+      _devices.clear();
+      var spaceBloc = event.context.read<SpaceTreeBloc>();
+      if (spaceBloc.state.selectedCommunities.isEmpty) {
+        devices = await DevicesManagementApi().fetchDevices('', '');
+      } else {
+        for (var community in spaceBloc.state.selectedCommunities) {
+          List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[community] ?? [];
+          for (var space in spacesList) {
+            devices.addAll(await DevicesManagementApi().fetchDevices(community, space));
+          }
+        }
+      }
+
       _selectedDevices.clear();
       _devices = devices;
       _filteredDevices = devices;

lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_event.dart

@@ -8,12 +8,13 @@ abstract class DeviceManagementEvent extends Equatable {
 }
 
 class FetchDevices extends DeviceManagementEvent {
-  final String communityId;
-  final String spaceId;
+  // final Map<String, List<String>> selectedCommunitiesSpaces;
+  // final String spaceId;
+  final BuildContext context;
 
-  const FetchDevices(this.communityId, this.spaceId);
+  const FetchDevices(this.context);
   @override
-  List<Object?> get props => [communityId, spaceId];
+  List<Object?> get props => [context];
 }
 
 class FilterDevices extends DeviceManagementEvent {

lib/pages/device_managment/all_devices/view/device_managment_page.dart

@@ -19,7 +19,7 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
     return MultiBlocProvider(
       providers: [
         BlocProvider(
-          create: (context) => DeviceManagementBloc()..add(const FetchDevices('', '')),
+          create: (context) => DeviceManagementBloc()..add(FetchDevices(context)),
         ),
       ],
       child: WebScaffold(

lib/pages/device_managment/all_devices/widgets/device_managment_body.dart

@@ -8,6 +8,7 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 import 'package:syncrow_web/pages/device_managment/all_devices/widgets/device_search_filters.dart';
 import 'package:syncrow_web/pages/device_managment/shared/device_batch_control_dialog.dart';
 import 'package:syncrow_web/pages/device_managment/shared/device_control_dialog.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
 import 'package:syncrow_web/utils/format_date_time.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
@@ -62,11 +63,10 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
 
         return Row(
           children: [
-            const Expanded(
-                child: SpaceTreeView(
-                    // onSelectAction: (String communityId, String spaceId) {
-                    //   context.read<DeviceManagementBloc>().add(FetchDevices(communityId, spaceId));
-                    // },
+            Expanded(child: SpaceTreeView(
+              onSelect: () {
+                context.read<DeviceManagementBloc>().add(FetchDevices(context));
+              },
             )),
             Expanded(
               flex: 3,

lib/pages/device_managment/all_devices/widgets/device_search_filters.dart

@@ -85,7 +85,7 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperRe
         productNameController.clear();
         context.read<DeviceManagementBloc>()
           ..add(ResetFilters())
-          ..add(const FetchDevices('', ''));
+          ..add(FetchDevices(context));
       },
     );
   }

lib/pages/home/bloc/home_bloc.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:go_router/go_router.dart';
@@ -52,8 +51,6 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
           await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       user = await HomeApi().fetchUserInfo(uuid);
       add(FetchTermEvent());
-      add(FetchPolicyEvent());
-
       emit(HomeInitial());
     } catch (e) {
       return;
@@ -64,9 +61,8 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     try {
       emit(LoadingHome());
       terms = await HomeApi().fetchTerms();
-      emit(HomeInitial());
-
-      // emit(PolicyAgreement());
+      add(FetchPolicyEvent());
+      emit(PolicyAgreement());
     } catch (e) {
       return;
     }
@@ -76,11 +72,8 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     try {
       emit(LoadingHome());
       policy = await HomeApi().fetchPolicy();
-      debugPrint("Fetched policy: $policy");
-      // Emit a state to trigger the UI update
-      emit(HomeInitial());
+      emit(PolicyAgreement());
     } catch (e) {
-      debugPrint("Error fetching policy: $e");
       return;
     }
   }

lib/pages/home/view/home_page_web.dart

@@ -9,24 +9,9 @@ import 'package:syncrow_web/pages/home/view/home_card.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
-class HomeWebPage extends StatefulWidget {
+class HomeWebPage extends StatelessWidget {
   const HomeWebPage({super.key});
 
-  @override
-  State<HomeWebPage> createState() => _HomeWebPageState();
-}
-
-class _HomeWebPageState extends State<HomeWebPage> {
-  // Flag to track whether the dialog is already shown.
-  bool _dialogShown = false;
-
-  @override
-  void initState() {
-    super.initState();
-    final homeBloc = BlocProvider.of<HomeBloc>(context);
-    homeBloc.add(FetchUserInfo());
-  }
-
   @override
   Widget build(BuildContext context) {
     Size size = MediaQuery.of(context).size;
@@ -37,13 +22,9 @@ class _HomeWebPageState extends State<HomeWebPage> {
         onPopInvoked: (didPop) => false,
         child: BlocConsumer<HomeBloc, HomeState>(
           listener: (BuildContext context, state) {
-          print('state=$state');
             if (state is HomeInitial) {
-            if (homeBloc.user!.hasAcceptedWebAgreement == false &&
-                !_dialogShown) {
-              _dialogShown =
-                  true; // Set the flag to true to indicate the dialog is showing.
-              Future.delayed(const Duration(seconds: 1), () {
+              if (homeBloc.user!.hasAcceptedWebAgreement == false) {
+                Future.delayed(const Duration(seconds: 2), () {
                   showDialog(
                     context: context,
                     barrierDismissible: false,
@@ -54,7 +35,6 @@ class _HomeWebPageState extends State<HomeWebPage> {
                       );
                     },
                   ).then((v) {
-                  _dialogShown = false;
                     if (v != null) {
                       homeBloc.add(ConfirmUserAgreementEvent());
                       homeBloc.add(const FetchUserInfo());
@@ -100,10 +80,9 @@ class _HomeWebPageState extends State<HomeWebPage> {
                             height: size.height * 0.6,
                             width: size.width * 0.68,
                             child: GridView.builder(
-                            itemCount: 3, // Change this count if needed.
-                            gridDelegate:
-                                const SliverGridDelegateWithFixedCrossAxisCount(
-                              crossAxisCount: 3, // Adjust as needed.
+                              itemCount: 3, //8
+                              gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                                crossAxisCount: 3, //4
                                 crossAxisSpacing: 20.0,
                                 mainAxisSpacing: 20.0,
                                 childAspectRatio: 1.5,
@@ -114,8 +93,7 @@ class _HomeWebPageState extends State<HomeWebPage> {
                                   active: homeBloc.homeItems[index].active!,
                                   name: homeBloc.homeItems[index].title!,
                                   img: homeBloc.homeItems[index].icon!,
-                                onTap: () =>
-                                    homeBloc.homeItems[index].onPress(context),
+                                  onTap: () => homeBloc.homeItems[index].onPress(context),
                                 );
                               },
                             ),
@@ -128,7 +106,6 @@ class _HomeWebPageState extends State<HomeWebPage> {
               ),
             );
           },
-      ),
-    );
+        ));
   }
 }

lib/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart

@@ -102,19 +102,12 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           );
         }).toList(),
       );
-      originalCommunities = updatedCommunities;
       emit(const SpacesLoadedState());
     } catch (e) {
       emit(ErrorState('Error loading communities and spaces: $e'));
     }
   }
 
-// This variable holds the full original list.
-  List<TreeNode> originalCommunities = [];
-
-// This variable holds the working list that may be filtered.
-
-// Build tree nodes from your data model.
   List<TreeNode> _buildTreeNodes(List<SpaceModel> spaces) {
     return spaces.map((space) {
       List<TreeNode> childNodes =
@@ -130,39 +123,12 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     }).toList();
   }
 
-// Optional helper method to deep clone a TreeNode.
-  TreeNode _cloneNode(TreeNode node) {
-    return TreeNode(
-      uuid: node.uuid,
-      title: node.title,
-      isChecked: node.isChecked,
-      isHighlighted: node.isHighlighted,
-      isExpanded: node.isExpanded,
-      children: node.children.map(_cloneNode).toList(),
-    );
-  }
-
-// Clone an entire list of tree nodes.
-  List<TreeNode> _cloneNodes(List<TreeNode> nodes) {
-    return nodes.map(_cloneNode).toList();
-  }
-
-// Your search event handler.
   void searchTreeNode(SearchAnode event, Emitter<UsersState> emit) {
     emit(UsersLoadingState());
-
-    // If the search term is empty, restore the original list.
     if (event.searchTerm!.isEmpty) {
-      // Clear any highlights on the restored copy.
-      updatedCommunities = _cloneNodes(originalCommunities);
       _clearHighlights(updatedCommunities);
     } else {
-      // Start with a fresh clone of the original tree.
-      List<TreeNode> freshClone = _cloneNodes(originalCommunities);
-
-      _searchAndHighlightNodes(freshClone, event.searchTerm!);
-
-      updatedCommunities = _filterNodes(freshClone, event.searchTerm!);
+      _searchAndHighlightNodes(updatedCommunities, event.searchTerm!);
     }
     emit(ChangeStatusSteps());
   }
@@ -189,91 +155,6 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     return anyMatch;
   }
 
-  List<TreeNode> _filterNodes(List<TreeNode> nodes, String searchTerm) {
-    List<TreeNode> filteredNodes = [];
-    for (var node in nodes) {
-      bool isMatch =
-          node.title.toLowerCase().contains(searchTerm.toLowerCase());
-      List<TreeNode> filteredChildren = _filterNodes(node.children, searchTerm);
-      if (isMatch || filteredChildren.isNotEmpty) {
-        node.isHighlighted = isMatch;
-        node.children = filteredChildren;
-        filteredNodes.add(node);
-      }
-    }
-    return filteredNodes;
-  }
-
-  // List<TreeNode> _buildTreeNodes(List<SpaceModel> spaces) {
-  //   return spaces.map((space) {
-  //     List<TreeNode> childNodes =
-  //         space.children.isNotEmpty ? _buildTreeNodes(space.children) : [];
-  //     return TreeNode(
-  //       uuid: space.uuid!,
-  //       title: space.name,
-  //       isChecked: false,
-  //       isHighlighted: false,
-  //       isExpanded: childNodes.isNotEmpty,
-  //       children: childNodes,
-  //     );
-  //   }).toList();
-  // }
-
-  // void searchTreeNode(SearchAnode event, Emitter<UsersState> emit) {
-  //   emit(UsersLoadingState());
-  //   if (event.searchTerm!.isEmpty) {
-  //     _clearHighlights(updatedCommunities);
-  //   } else {
-  //     _searchAndHighlightNodes(updatedCommunities, event.searchTerm!);
-  //     updatedCommunities = _filterNodes(updatedCommunities, event.searchTerm!);
-  //   }
-  //   emit(ChangeStatusSteps());
-  // }
-
-  // void _clearHighlights(List<TreeNode> nodes) {
-  //   for (var node in nodes) {
-  //     node.isHighlighted = false;
-  //     if (node.children.isNotEmpty) {
-  //       _clearHighlights(node.children);
-  //     }
-  //   }
-  // }
-
-  // bool _searchAndHighlightNodes(List<TreeNode> nodes, String searchTerm) {
-  //   bool anyMatch = false;
-  //   for (var node in nodes) {
-  //     bool isMatch =
-  //         node.title.toLowerCase().contains(searchTerm.toLowerCase());
-  //     bool childMatch = _searchAndHighlightNodes(node.children, searchTerm);
-  //     node.isHighlighted = isMatch || childMatch;
-
-  //     anyMatch = anyMatch || node.isHighlighted;
-  //   }
-  //   return anyMatch;
-  // }
-
-  // List<TreeNode> _filterNodes(List<TreeNode> nodes, String searchTerm) {
-  //   List<TreeNode> filteredNodes = [];
-  //   for (var node in nodes) {
-  //     // Check if the current node's title contains the search term.
-  //     bool isMatch =
-  //         node.title.toLowerCase().contains(searchTerm.toLowerCase());
-
-  //     // Recursively filter the children.
-  //     List<TreeNode> filteredChildren = _filterNodes(node.children, searchTerm);
-
-  //     // If the current node is a match or any of its children are, include it.
-  //     if (isMatch || filteredChildren.isNotEmpty) {
-  //       // Optionally, update any properties (like isHighlighted) if you still need them.
-  //       node.isHighlighted = isMatch;
-  //       // Replace the children with the filtered ones.
-  //       node.children = filteredChildren;
-  //       filteredNodes.add(node);
-  //     }
-  //   }
-  //   return filteredNodes;
-  // }
-
   List<String> selectedIds = [];
 
   List<String> getSelectedIds(List<TreeNode> nodes) {
@@ -370,6 +251,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     }
   }
 
+
   _editInviteUser(EditInviteUsers event, Emitter<UsersState> emit) async {
     try {
       emit(UsersLoadingState());

lib/pages/roles_and_permission/users_page/add_user_dialog/view/add_user_dialog.dart

@@ -26,13 +26,9 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
         create: (BuildContext context) => UsersBloc()
           ..add(const LoadCommunityAndSpacesEvent())
           ..add(const RoleEvent()),
-        child: BlocConsumer<UsersBloc, UsersState>(listener: (context, state) {
-          //          print('88888==${state}');
-          // if (state is SpacesLoadedState) {
-          //   print('object');
-          //   _blocRole.add(const CheckRoleStepStatus());
-          // }
-        }, builder: (context, state) {
+        child: BlocConsumer<UsersBloc, UsersState>(
+            listener: (context, state) {},
+            builder: (context, state) {
               final _blocRole = BlocProvider.of<UsersBloc>(context);
 
               return Dialog(
@@ -120,10 +116,12 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                                     _blocRole.add(
                                         const CheckStepStatus(isEditUser: false));
                                   } else if (currentStep == 3) {
-                                _blocRole.add(const CheckSpacesStepStatus());
+                                    _blocRole
+                                        .add(const CheckSpacesStepStatus());
                                   }
                                 } else {
-                              _blocRole.add(SendInviteUsers(context: context));
+                                  _blocRole
+                                      .add(SendInviteUsers(context: context));
                                 }
                               });
                             },
@@ -131,8 +129,10 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                               currentStep < 3 ? "Next" : "Save",
                               style: TextStyle(
                                   color: (_blocRole.isCompleteSpaces == false ||
-                                          _blocRole.isCompleteBasics == false ||
-                                          _blocRole.isCompleteRolePermissions ==
+                                              _blocRole.isCompleteBasics ==
+                                                  false ||
+                                              _blocRole
+                                                      .isCompleteRolePermissions ==
                                                   false) &&
                                           currentStep == 3
                                       ? ColorsManager.grayColor
@@ -236,16 +236,12 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
     return GestureDetector(
       onTap: () {
         setState(() {
-          bloc.add(const CheckStepStatus(isEditUser: false));
           currentStep = step;
-          Future.delayed(const Duration(milliseconds: 500), () {
           bloc.add(const CheckStepStatus(isEditUser: false));
-          });
           if (step3 == 3) {
-            Future.delayed(const Duration(seconds: 1), () {
             bloc.add(const CheckRoleStepStatus());
-            });
           }
+          
         });
       },
       child: Column(

lib/pages/roles_and_permission/users_page/add_user_dialog/view/basics_view.dart

@@ -46,9 +46,8 @@ class BasicsView extends StatelessWidget {
             ),
             Row(
               children: [
-                Flexible(
-                  child: SizedBox(
-                    // width: MediaQuery.of(context).size.width * 0.18,
+                SizedBox(
+                  width: MediaQuery.of(context).size.width * 0.18,
                   height: MediaQuery.of(context).size.width * 0.08,
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
@@ -76,8 +75,8 @@ class BasicsView extends StatelessWidget {
                       Padding(
                         padding: const EdgeInsets.all(8.0),
                         child: TextFormField(
-                            style: const TextStyle(
-                                color: ColorsManager.blackColor),
+                          style:
+                              const TextStyle(color: ColorsManager.blackColor),
                           // onChanged: (value) {
                           //   Future.delayed(const Duration(milliseconds: 200),
                           //       () {
@@ -104,11 +103,9 @@ class BasicsView extends StatelessWidget {
                     ],
                   ),
                 ),
-                ),
                 const SizedBox(width: 10),
-                Flexible(
-                  child: SizedBox(
-                    // width: MediaQuery.of(context).size.width * 0.18,
+                SizedBox(
+                  width: MediaQuery.of(context).size.width * 0.18,
                   height: MediaQuery.of(context).size.width * 0.08,
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
@@ -145,7 +142,8 @@ class BasicsView extends StatelessWidget {
                           decoration:
                               inputTextFormDeco(hintText: "Enter last name")
                                   .copyWith(
-                                        hintStyle: context.textTheme.bodyMedium
+                                      hintStyle: context
+                                          .textTheme.bodyMedium
                                           ?.copyWith(
                                               fontWeight: FontWeight.w400,
                                               fontSize: 12,
@@ -161,7 +159,6 @@ class BasicsView extends StatelessWidget {
                     ],
                   ),
                 ),
-                ),
               ],
             ),
             const SizedBox(height: 10),

lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_bloc.dart

@@ -27,16 +27,7 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   int currentPage = 1;
   List<RolesUserModel> users = [];
   List<RolesUserModel> initialUsers = [];
-
-  List<RolesUserModel> totalUsersCount = [];
   String currentSortOrder = '';
-
-  String currentSortJopTitle = '';
-  String currentSortRole = '';
-  String currentSortCreatedDate = '';
-  String currentSortStatus = '';
-  String currentSortCreatedBy = '';
-
   String currentSortOrderDate = '';
   List<String> roleTypes = [];
   List<String> jobTitle = [];
@@ -69,7 +60,6 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
       jobTitle = jobTitle.toSet().toList();
       createdBy = createdBy.toSet().toList();
       _handlePageChange(ChangePage(1), emit);
-      totalUsersCount = initialUsers;
       add(ChangePage(currentPage));
       emit(UsersLoadedState(users: users));
     } catch (e) {
@@ -101,6 +91,26 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
           event.userId, event.newStatus == "disabled" ? false : true);
       if (res == true) {
         add(const GetUsers());
+        // users = users.map((user) {
+        //   if (user.uuid == event.userId) {
+        //     return RolesUserModel(
+        //       uuid: user.uuid,
+        //       createdAt: user.createdAt,
+        //       email: user.email,
+        //       firstName: user.firstName,
+        //       lastName: user.lastName,
+        //       roleType: user.roleType,
+        //       status: event.newStatus,
+        //       isEnabled: event.newStatus == "disabled" ? false : true,
+        //       invitedBy: user.invitedBy,
+        //       phoneNumber: user.phoneNumber,
+        //       jobTitle: user.jobTitle,
+        //       createdDate: user.createdDate,
+        //       createdTime: user.createdTime,
+        //     );
+        //   }
+        //   return user;
+        // }).toList();
       }
       emit(UsersLoadedState(users: users));
     } catch (e) {
@@ -118,6 +128,7 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
       emit(UsersLoadingState());
       currentSortOrder = "";
       users = List.from(users);
+      emit(UsersLoadedState(users: users));
     } else {
       emit(UsersLoadingState());
       currentSortOrder = "Asc";
@@ -125,13 +136,9 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
           .toString()
           .toLowerCase()
           .compareTo(b.firstName.toString().toLowerCase()));
-    }
-    currentSortJopTitle = '';
-    currentSortCreatedDate = '';
-    currentSortStatus = '';
-    currentSortCreatedBy = '';
       emit(UsersLoadedState(users: users));
     }
+  }
 
   void _toggleSortUsersByNameDesc(
       SortUsersByNameDesc event, Emitter<UserTableState> emit) {
@@ -143,17 +150,14 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
       emit(UsersLoadingState());
       currentSortOrder = "";
       users = List.from(initialUsers);
+      emit(UsersLoadedState(users: users));
     } else {
       emit(UsersLoadingState());
       currentSortOrder = "Desc";
       users.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    }
-    currentSortJopTitle = '';
-    currentSortCreatedDate = '';
-    currentSortStatus = '';
-    currentSortCreatedBy = '';
       emit(UsersLoadedState(users: users));
     }
+  }
 
   void _toggleSortUsersByDateNewestToOldest(
       DateNewestToOldestEvent event, Emitter<UserTableState> emit) {
@@ -218,7 +222,6 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   Future<void> _searchUsers(
       SearchUsers event, Emitter<UserTableState> emit) async {
     try {
-      emit(TableSearch());
       final query = event.query.toLowerCase();
       final filteredUsers = initialUsers.where((user) {
         final fullName = "${user.firstName} ${user.lastName}".toLowerCase();
@@ -247,8 +250,7 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   }
 
   void _handlePageChange(ChangePage event, Emitter<UserTableState> emit) {
-    currentPage = event.pageNumber;
-    const itemsPerPage = 20;
+    const itemsPerPage = 10;
     final startIndex = (event.pageNumber - 1) * itemsPerPage;
     final endIndex = startIndex + itemsPerPage;
     if (startIndex >= users.length) {
@@ -285,15 +287,9 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {}
+    } else {
       currentSortOrder = "";
-    currentSortCreatedDate = '';
-    currentSortStatus = '';
-    currentSortCreatedBy = '';
-    currentSortJopTitle = '';
-    currentSortOrderDate = "";
-
-    totalUsersCount = filteredUsers;
+    }
 
     emit(UsersLoadedState(users: filteredUsers));
   }
@@ -315,16 +311,9 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {}
+    } else {
       currentSortOrder = "";
-    currentSortCreatedDate = '';
-    currentSortStatus = '';
-    currentSortCreatedBy = '';
-    currentSortRole = '';
-    currentSortOrderDate = "";
-
-    totalUsersCount = filteredUsers;
-
+    }
     emit(UsersLoadedState(users: filteredUsers));
   }
 
@@ -346,15 +335,9 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {}
-    currentSortOrder = '';
-    currentSortRole = '';
-    currentSortCreatedDate = '';
-    currentSortStatus = '';
-    currentSortOrderDate = "";
-
-    totalUsersCount = filteredUsers;
-
+    } else {
+      currentSortOrder = "";
+    }
     emit(UsersLoadedState(users: filteredUsers));
   }
 
@@ -388,17 +371,14 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-      totalUsersCount = filteredUsers;
-    } else {}
-    currentSortOrder = '';
-    currentSortRole = '';
-    currentSortCreatedDate = '';
-    currentSortCreatedBy = '';
-    currentSortOrderDate = "";
+    } else {
+      currentSortOrder = "";
+    }
 
     emit(UsersLoadedState(users: filteredUsers));
   }
 
+
   void _resetAllFilters(Emitter<UserTableState> emit) {
     selectedRoles.clear();
     selectedJobTitles.clear();

lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_state.dart

@@ -9,10 +9,7 @@ final class TableInitial extends UserTableState {
   @override
   List<Object> get props => [];
 }
-final class TableSearch extends UserTableState {
-  @override
-  List<Object> get props => [];
-}
+
 final class RolesLoadingState extends UserTableState {
   @override
   List<Object> get props => [];

lib/pages/roles_and_permission/users_page/users_table/view/users_page.dart

@@ -129,12 +129,9 @@ class UsersPage extends StatelessWidget {
                         child: TextFormField(
                           controller: searchController,
                           onChanged: (value) {
-                            final bloc = context.read<UserTableBloc>();
-                            bloc.add(FilterClearEvent());
-                            bloc.add(SearchUsers(value));
-                            if (value == '') {
-                              bloc.add(ChangePage(1));
-                            }
+                            context
+                                .read<UserTableBloc>()
+                                .add(SearchUsers(value));
                           },
                           style: const TextStyle(color: Colors.black),
                           decoration: textBoxDecoration(radios: 15)!.copyWith(
@@ -225,7 +222,7 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.jobTitle,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortJopTitle,
+                          isSelected: _blocRole.currentSortOrder,
                           onOkPressed: () {
                             searchController.clear();
                             _blocRole.add(FilterClearEvent());
@@ -236,14 +233,14 @@ class UsersPage extends StatelessWidget {
                             Navigator.of(context).pop();
                             _blocRole.add(FilterUsersByJobEvent(
                               selectedJob: selectedItems,
-                              sortOrder: _blocRole.currentSortJopTitle,
+                              sortOrder: _blocRole.currentSortOrder,
                             ));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortJopTitle = v;
+                            _blocRole.currentSortOrder = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortJopTitle = v;
+                            _blocRole.currentSortOrder = v;
                           },
                         );
                       }
@@ -266,7 +263,7 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.roleTypes,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortRole,
+                          isSelected: _blocRole.currentSortOrder,
                           onOkPressed: () {
                             searchController.clear();
                             _blocRole.add(FilterClearEvent());
@@ -278,13 +275,13 @@ class UsersPage extends StatelessWidget {
                             context.read<UserTableBloc>().add(
                                 FilterUsersByRoleEvent(
                                     selectedRoles: selectedItems,
-                                    sortOrder: _blocRole.currentSortRole));
+                                    sortOrder: _blocRole.currentSortOrder));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortRole = v;
+                            _blocRole.currentSortOrder = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortRole = v;
+                            _blocRole.currentSortOrder = v;
                           },
                         );
                       }
@@ -322,7 +319,7 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.createdBy,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortCreatedBy,
+                          isSelected: _blocRole.currentSortOrder,
                           onOkPressed: () {
                             searchController.clear();
                             _blocRole.add(FilterClearEvent());
@@ -333,13 +330,13 @@ class UsersPage extends StatelessWidget {
                             Navigator.of(context).pop();
                             _blocRole.add(FilterUsersByCreatedEvent(
                                 selectedCreatedBy: selectedItems,
-                                sortOrder: _blocRole.currentSortCreatedBy));
+                                sortOrder: _blocRole.currentSortOrder));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortCreatedBy = v;
+                            _blocRole.currentSortOrder = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortCreatedBy = v;
+                            _blocRole.currentSortOrder = v;
                           },
                         );
                       }
@@ -362,7 +359,7 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.status,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortStatus,
+                          isSelected: _blocRole.currentSortOrder,
                           onOkPressed: () {
                             searchController.clear();
                             _blocRole.add(FilterClearEvent());
@@ -373,13 +370,13 @@ class UsersPage extends StatelessWidget {
                             Navigator.of(context).pop();
                             _blocRole.add(FilterUsersByDeActevateEvent(
                                 selectedActivate: selectedItems,
-                                sortOrder: _blocRole.currentSortStatus));
+                                sortOrder: _blocRole.currentSortOrder));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortStatus = v;
+                            _blocRole.currentSortOrder = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortStatus = v;
+                            _blocRole.currentSortOrder = v;
                           },
                         );
                       }
@@ -511,11 +508,12 @@ class UsersPage extends StatelessWidget {
                                 const Icon(Icons.keyboard_double_arrow_right),
                             firstPageIcon:
                                 const Icon(Icons.keyboard_double_arrow_left),
-                            totalPages: (_blocRole.totalUsersCount.length /
+                            totalPages: (_blocRole.users.length /
                                     _blocRole.itemsPerPage)
                                 .ceil(),
                             currentPage: _blocRole.currentPage,
                             onPageChanged: (int pageNumber) {
+                              _blocRole.currentPage = pageNumber;
                               context
                                   .read<UserTableBloc>()
                                   .add(ChangePage(pageNumber));

lib/pages/routines/bloc/routine_bloc/routine_bloc.dart

@@ -816,7 +816,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   FutureOr<void> _fetchDevices(FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true));
     try {
-      final devices = await DevicesManagementApi().fetchDevices(communityId, spaceId);
+      final devices = await DevicesManagementApi().fetchDevices('', '');
 
       emit(state.copyWith(isLoading: false, devices: devices));
     } catch (e) {

lib/pages/routines/view/routines_view.dart

@@ -32,7 +32,7 @@ class _RoutinesViewState extends State<RoutinesView> {
         }
         return Row(
           children: [
-            const Expanded(
+            Expanded(
                 child:
                     // SideSpacesView(
                     //   onSelectAction: (String communityId, String spaceId) {
@@ -41,7 +41,9 @@ class _RoutinesViewState extends State<RoutinesView> {
                     //     //   ..add(LoadAutomation(spaceId));
                     //   },
                     // )
-                    SpaceTreeView()),
+                    SpaceTreeView(
+              onSelect: () {},
+            )),
             Expanded(
               flex: 3,
               child: Padding(

lib/pages/space_tree/bloc/space_tree_bloc.dart

@@ -6,8 +6,8 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model
 import 'package:syncrow_web/services/space_mana_api.dart';
 
 class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
-  String selectedCommunityId = '';
-  String selectedSpaceId = '';
+  String selectedCommunityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
+  String selectedSpaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
 
   SpaceTreeBloc() : super(const SpaceTreeState()) {
     on<InitialEvent>(_fetchSpaces);
@@ -87,6 +87,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
           List.from(state.selectedCommunities.toSet().toList());
       List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
       List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
+      Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);
 
       List<String> childrenIds = _getAllChildIds(event.children);
 
@@ -101,10 +102,13 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
         updatedSoldChecks.removeWhere(childrenIds.contains);
       }
 
+      communityAndSpaces[event.communityId] = updatedSelectedSpaces;
+
       emit(state.copyWith(
           selectedCommunities: updatedSelectedCommunities,
           selectedSpaces: updatedSelectedSpaces,
-          soldCheck: updatedSoldChecks));
+          soldCheck: updatedSoldChecks,
+          selectedCommunityAndSpaces: communityAndSpaces));
     } catch (e) {
       emit(const SpaceTreeErrorState('Something went wrong'));
     }
@@ -116,6 +120,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
           List.from(state.selectedCommunities.toSet().toList());
       List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
       List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
+      Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);
 
       List<String> childrenIds = _getAllChildIds(event.children);
       bool isChildSelected = false;
@@ -166,10 +171,13 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
         }
       }
 
+      communityAndSpaces[event.communityId] = updatedSelectedSpaces;
+
       emit(state.copyWith(
           selectedCommunities: updatedSelectedCommunities,
           selectedSpaces: updatedSelectedSpaces,
-          soldCheck: updatedSoldChecks));
+          soldCheck: updatedSoldChecks,
+          selectedCommunityAndSpaces: communityAndSpaces));
       emit(state.copyWith(selectedSpaces: updatedSelectedSpaces));
     } catch (e) {
       emit(const SpaceTreeErrorState('Something went wrong'));

lib/pages/space_tree/bloc/space_tree_state.dart

@@ -2,6 +2,7 @@ import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 
 class SpaceTreeState extends Equatable {
+  final Map<String, List<String>> selectedCommunityAndSpaces;
   final List<CommunityModel> communityList;
   final List<CommunityModel> filteredCommunity;
   final List<String> expandedCommunities;
@@ -19,7 +20,8 @@ class SpaceTreeState extends Equatable {
       this.selectedCommunities = const [],
       this.selectedSpaces = const [],
       this.soldCheck = const [],
-      this.isSearching = false});
+      this.isSearching = false,
+      this.selectedCommunityAndSpaces = const {}});
 
   SpaceTreeState copyWith(
       {List<CommunityModel>? communitiesList,
@@ -29,7 +31,8 @@ class SpaceTreeState extends Equatable {
       List<String>? selectedCommunities,
       List<String>? selectedSpaces,
       List<String>? soldCheck,
-      bool? isSearching}) {
+      bool? isSearching,
+      Map<String, List<String>>? selectedCommunityAndSpaces}) {
     return SpaceTreeState(
         communityList: communitiesList ?? this.communityList,
         filteredCommunity: filteredCommunity ?? this.filteredCommunity,
@@ -38,7 +41,8 @@ class SpaceTreeState extends Equatable {
         selectedCommunities: selectedCommunities ?? this.selectedCommunities,
         selectedSpaces: selectedSpaces ?? this.selectedSpaces,
         soldCheck: soldCheck ?? this.soldCheck,
-        isSearching: isSearching ?? this.isSearching);
+        isSearching: isSearching ?? this.isSearching,
+        selectedCommunityAndSpaces: selectedCommunityAndSpaces ?? this.selectedCommunityAndSpaces);
   }
 
   @override
@@ -50,7 +54,8 @@ class SpaceTreeState extends Equatable {
         selectedCommunities,
         selectedSpaces,
         soldCheck,
-        isSearching
+        isSearching,
+        selectedCommunityAndSpaces
       ];
 }
 

lib/pages/space_tree/view/space_tree_view.dart

@@ -11,7 +11,8 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/style.dart';
 
 class SpaceTreeView extends StatelessWidget {
-  const SpaceTreeView({super.key});
+  final Function onSelect;
+  const SpaceTreeView({required this.onSelect, super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -64,6 +65,8 @@ class SpaceTreeView extends StatelessWidget {
                                       onItemSelected: () {
                                         context.read<SpaceTreeBloc>().add(
                                             OnCommunitySelected(community.uuid, community.spaces));
+
+                                        onSelect();
                                       },
                                       children: community.spaces.map((space) {
                                         return CustomExpansionTileSpaceTree(
@@ -72,6 +75,7 @@ class SpaceTreeView extends StatelessWidget {
                                           onItemSelected: () {
                                             context.read<SpaceTreeBloc>().add(OnSpaceSelected(
                                                 community.uuid, space.uuid ?? '', space.children));
+                                            onSelect();
                                           },
                                           onExpansionChanged: () {
                                             context.read<SpaceTreeBloc>().add(
@@ -109,6 +113,7 @@ class SpaceTreeView extends StatelessWidget {
           context
               .read<SpaceTreeBloc>()
               .add(OnSpaceSelected(communityId, child.uuid ?? '', child.children));
+          onSelect();
         },
         onExpansionChanged: () {
           context.read<SpaceTreeBloc>().add(OnSpaceExpanded(communityId, child.uuid ?? ''));

lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart

@@ -87,6 +87,7 @@ class SpaceManagementBloc
         prevSpaceModels = List<SpaceTemplateModel>.from(
           (previousState as dynamic).spaceModels ?? [],
         );
+        allSpaces.addAll(prevSpaceModels);
       }
 
       if (prevSpaceModels.isEmpty) {
@@ -314,7 +315,6 @@ class SpaceManagementBloc
     SelectSpaceEvent event,
     Emitter<SpaceManagementState> emit,
   ) {
-    
     _handleCommunitySpaceStateUpdate(
       emit: emit,
       selectedCommunity: event.selectedCommunity,

lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart

@@ -22,7 +22,9 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/curved_li
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/duplicate_process_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_card_widget.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_container_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/helper/connection_helper.dart';
 import 'package:syncrow_web/pages/spaces_management/helper/space_helper.dart';
+import 'package:syncrow_web/pages/spaces_management/helper/tag_helper.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
@@ -131,7 +133,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
               communities: widget.communities,
               communityName: widget.selectedCommunity?.name,
               community: widget.selectedCommunity,
-              isSave: isSave(spaces),
+              isSave: SpaceHelper.isSave(spaces),
               isEditingName: isEditingName,
               nameController: _nameController,
               onSave: _saveSpaces,
@@ -176,7 +178,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
                       children: [
                         for (var connection in connections)
                           Opacity(
-                            opacity: _isHighlightedConnection(connection)
+                            opacity: ConnectionHelper.isHighlightedConnection(
+                                    connection, widget.selectedSpace)
                                 ? 1.0
                                 : 0.3, // Adjust opacity
                             child: CustomPaint(
@@ -209,7 +212,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
                                 },
                                 buildSpaceContainer: (int index) {
                                   final bool isHighlighted =
-                                      _isHighlightedSpace(spaces[index]);
+                                      SpaceHelper.isHighlightedSpace(
+                                          spaces[index], widget.selectedSpace);
 
                                   return Opacity(
                                       opacity: isHighlighted ? 1.0 : 0.3,
@@ -295,7 +299,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         return CreateSpaceDialog(
           products: widget.products,
           spaceModels: widget.spaceModels,
-          allTags: _getAllTagValues(spaces),
+          allTags:
+              TagHelper.getAllTagValues(widget.communities, widget.spaceModels),
           parentSpace: parentIndex != null ? spaces[parentIndex] : null,
           onCreateSpace: (String name,
               String icon,
@@ -306,7 +311,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
             setState(() {
               // Set the first space in the center or use passed position
               Offset centerPosition =
-                  position ?? _getCenterPosition(screenSize);
+                  position ?? ConnectionHelper.getCenterPosition(screenSize);
               SpaceModel newSpace = SpaceModel(
                   name: name,
                   icon: icon,
@@ -358,7 +363,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
             tags: widget.selectedSpace?.tags,
             subspaces: widget.selectedSpace?.subspaces,
             isEdit: true,
-            allTags: _getAllTagValues(spaces),
+            allTags: TagHelper.getAllTagValues(
+                widget.communities, widget.spaceModels),
             onCreateSpace: (String name,
                 String icon,
                 List<SelectedProduct> selectedProducts,
@@ -527,17 +533,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         );
   }
 
-  bool _isHighlightedSpace(SpaceModel space) {
-    final selectedSpace = widget.selectedSpace;
-    if (selectedSpace == null) return true;
-
-    return space == selectedSpace ||
-        selectedSpace.parent?.internalId == space.internalId ||
-        selectedSpace.children
-                ?.any((child) => child.internalId == space.internalId) ==
-            true;
-  }
-
   void _deselectSpace(BuildContext context) {
     context.read<SpaceManagementBloc>().add(
           SelectSpaceEvent(
@@ -545,28 +540,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         );
   }
 
-  bool _isHighlightedConnection(Connection connection) {
-    if (widget.selectedSpace == null) return true;
-
-    return connection.startSpace == widget.selectedSpace ||
-        connection.endSpace == widget.selectedSpace;
-  }
-
-  Offset _getCenterPosition(Size screenSize) {
-    return Offset(
-      screenSize.width / 2 - 260,
-      screenSize.height / 2 - 200,
-    );
-  }
-
-  bool isSave(List<SpaceModel> spaces) {
-    return spaces.isNotEmpty &&
-        spaces.any((space) =>
-            space.status == SpaceStatus.newSpace ||
-            space.status == SpaceStatus.modified ||
-            space.status == SpaceStatus.deleted);
-  }
-
   void _onDuplicate(BuildContext parentContext) {
     final screenWidth = MediaQuery.of(context).size.width;
 
@@ -652,11 +625,10 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     const double horizontalGap = 200.0;
     const double verticalGap = 100.0;
 
-    final Map<String, int> nameCounters = {};
-
     SpaceModel duplicateRecursive(SpaceModel original, Offset parentPosition,
         SpaceModel? duplicatedParent) {
-      Offset newPosition = parentPosition + Offset(horizontalGap, 0);
+      Offset newPosition =
+          Offset(parentPosition.dx + horizontalGap, original.position.dy);
 
       while (spaces.any((s) =>
           (s.position - newPosition).distance < horizontalGap &&
@@ -667,6 +639,16 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
       final duplicatedName =
           SpaceHelper.generateUniqueSpaceName(original.name, spaces);
 
+      final List<SubspaceModel>? duplicatedSubspaces;
+      final List<Tag>? duplicatedTags;
+      if (original.spaceModel != null) {
+        duplicatedTags = [];
+        duplicatedSubspaces = [];
+      } else {
+        duplicatedTags = original.tags;
+        duplicatedSubspaces = original.subspaces;
+      }
+
       final duplicated = SpaceModel(
         name: duplicatedName,
         icon: original.icon,
@@ -676,8 +658,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         status: SpaceStatus.newSpace,
         parent: duplicatedParent,
         spaceModel: original.spaceModel,
-        subspaces: original.subspaces,
-        tags: original.tags,
+        subspaces: duplicatedSubspaces,
+        tags: duplicatedTags,
       );
 
       originalToDuplicate[original] = duplicated;
@@ -690,7 +672,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
           final newConnection = Connection(
             startSpace: duplicatedParent,
             endSpace: duplicated,
-            direction: "down",
+            direction: original.incomingConnection?.direction ?? 'down',
           );
           connections.add(newConnection);
           duplicated.incomingConnection = newConnection;
@@ -729,10 +711,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
             child.incomingConnection?.direction == "down" ?? false;
 
         if (isDownDirection && childrenWithDownDirection.length == 1) {
-          // Place the only "down" child vertically aligned with the parent
           childStartPosition = duplicated.position + Offset(0, verticalGap);
         } else if (!isDownDirection) {
-          // Position children with other directions horizontally
           childStartPosition = duplicated.position + Offset(horizontalGap, 0);
         }
 
@@ -753,14 +733,4 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
       duplicateRecursive(space, space.position, duplicatedParent);
     }
   }
-
-  List<String> _getAllTagValues(List<SpaceModel> spaces) {
-    final List<String> allTags = [];
-    for (final space in spaces) {
-      if (space.tags != null) {
-        allTags.addAll(space.listAllTagValues());
-      }
-    }
-    return allTags;
-  }
 }

lib/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart

@@ -12,6 +12,7 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/icon_selection_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/assign_tag/views/assign_tag_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart';
+import 'package:syncrow_web/pages/spaces_management/helper/space_helper.dart';
 import 'package:syncrow_web/pages/spaces_management/helper/tag_helper.dart';
 import 'package:syncrow_web/pages/spaces_management/link_space_model/view/link_space_model_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
@@ -83,13 +84,22 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
         widget.selectedProducts.isNotEmpty ? widget.selectedProducts : [];
     isOkButtonEnabled =
         enteredName.isNotEmpty || nameController.text.isNotEmpty;
+    if (widget.currentSpaceModel != null) {
+      subspaces = [];
+      tags = [];
+    } else {
       tags = widget.tags ?? [];
       subspaces = widget.subspaces ?? [];
+    }
     selectedSpaceModel = widget.currentSpaceModel;
   }
 
   @override
   Widget build(BuildContext context) {
+    bool isSpaceModelDisabled = (tags != null && tags!.isNotEmpty ||
+        subspaces != null && subspaces!.isNotEmpty);
+    bool isTagsAndSubspaceModelDisabled = (selectedSpaceModel != null);
+
     final screenWidth = MediaQuery.of(context).size.width;
     return AlertDialog(
       title: widget.isEdit
@@ -168,7 +178,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                             isNameFieldInvalid = value.isEmpty;
 
                             if (!isNameFieldInvalid) {
-                              if (_isNameConflict(value)) {
+                              if (SpaceHelper.isNameConflict(value, widget.parentSpace, widget.editSpace)) {
                                 isNameFieldExist = true;
                                 isOkButtonEnabled = false;
                               } else {
@@ -235,11 +245,14 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                               padding: EdgeInsets.zero,
                             ),
                             onPressed: () {
-                              _showLinkSpaceModelDialog(context);
+                              isSpaceModelDisabled
+                                  ? null
+                                  : _showLinkSpaceModelDialog(context);
                             },
-                            child: const ButtonContentWidget(
+                            child: ButtonContentWidget(
                               svgAssets: Assets.link,
                               label: 'Link a space model',
+                              disabled: isSpaceModelDisabled,
                             ),
                           )
                         : Container(
@@ -328,12 +341,15 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                               overlayColor: ColorsManager.transparentColor,
                             ),
                             onPressed: () async {
-                              _showSubSpaceDialog(context, enteredName, [],
-                                  false, widget.products, subspaces);
+                              isTagsAndSubspaceModelDisabled
+                                  ? null
+                                  : _showSubSpaceDialog(context, enteredName,
+                                      [], false, widget.products, subspaces);
                             },
-                            child: const ButtonContentWidget(
+                            child: ButtonContentWidget(
                               icon: Icons.add,
                               label: 'Create Sub Space',
+                              disabled: isTagsAndSubspaceModelDisabled,
                             ),
                           )
                         : SizedBox(
@@ -461,6 +477,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                       builder: (context) => AssignTagDialog(
                                         products: widget.products,
                                         subspaces: subspaces,
+                                        allTags: widget.allTags,
                                         addedProducts: TagHelper
                                             .createInitialSelectedProductsForTags(
                                                 tags ?? [], subspaces),
@@ -486,7 +503,9 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                           )
                         : TextButton(
                             onPressed: () {
-                              _showTagCreateDialog(
+                              isTagsAndSubspaceModelDisabled
+                                  ? null
+                                  : _showTagCreateDialog(
                                       context,
                                       enteredName,
                                       widget.isEdit,
@@ -496,9 +515,10 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                             style: TextButton.styleFrom(
                               padding: EdgeInsets.zero,
                             ),
-                            child: const ButtonContentWidget(
+                            child: ButtonContentWidget(
                               icon: Icons.add,
                               label: 'Add Devices',
+                              disabled: isTagsAndSubspaceModelDisabled,
                             ))
                   ],
                 ),
@@ -572,25 +592,6 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
     );
   }
 
-  bool _isNameConflict(String value) {
-    final parentSpace = widget.parentSpace;
-    final editSpace = widget.editSpace;
-    final siblings = parentSpace?.children
-            .where((child) => child.uuid != editSpace?.uuid)
-            .toList() ??
-        [];
-    final siblingConflict = siblings.any((child) => child.name == value);
-    final parentConflict =
-        parentSpace?.name == value && parentSpace?.uuid != editSpace?.uuid;
-    final parentOfEditSpaceConflict = editSpace?.parent?.name == value &&
-        editSpace?.parent?.uuid != editSpace?.uuid;
-    final childConflict =
-        editSpace?.children.any((child) => child.name == value) ?? false;
-    return siblingConflict ||
-        parentConflict ||
-        parentOfEditSpaceConflict ||
-        childConflict;
-  }
  
   void _showLinkSpaceModelDialog(BuildContext context) {
     showDialog(

lib/pages/spaces_management/assign_tag/bloc/assign_tag_bloc.dart

@@ -57,6 +57,7 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
       if (currentState is AssignTagLoaded && currentState.tags.isNotEmpty) {
         final tags = List<Tag>.from(currentState.tags);
         tags[event.index].tag = event.tag;
+
         emit(AssignTagLoaded(
           tags: tags,
           isSaveEnabled: _validateTags(tags),
@@ -78,6 +79,7 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
         emit(AssignTagLoaded(
           tags: tags,
           isSaveEnabled: _validateTags(tags),
+          errorMessage: _getValidationError(tags),
         ));
       }
     });
@@ -106,12 +108,13 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
         emit(AssignTagLoaded(
           tags: updatedTags,
           isSaveEnabled: _validateTags(updatedTags),
+          errorMessage: _getValidationError(updatedTags),
         ));
       } else {
         emit(const AssignTagLoaded(
             tags: [],
             isSaveEnabled: false,
-        ));
+            errorMessage: 'Failed to delete tag'));
       }
     });
   }
@@ -125,7 +128,10 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
 
   String? _getValidationError(List<Tag> tags) {
     final hasEmptyTag = tags.any((tag) => (tag.tag?.trim() ?? '').isEmpty);
-    if (hasEmptyTag) return 'Tags cannot be empty.';
+    if (hasEmptyTag) {
+      return 'Tags cannot be empty.';
+    }
+
     final duplicateTags = tags
         .map((tag) => tag.tag?.trim() ?? '')
         .fold<Map<String, int>>({}, (map, tag) {

lib/pages/spaces_management/assign_tag/bloc/assign_tag_state.dart

@@ -21,11 +21,11 @@ class AssignTagLoaded extends AssignTagState {
   const AssignTagLoaded({
     required this.tags,
     required this.isSaveEnabled,
-    this.errorMessage,
+    required this.errorMessage,
   });
 
   @override
-  List<Object> get props => [tags, isSaveEnabled];
+  List<Object> get props => [tags, isSaveEnabled, errorMessage ?? ''];
 }
 
 class AssignTagError extends AssignTagState {

lib/pages/spaces_management/assign_tag/views/assign_tag_dialog.dart

@@ -71,6 +71,7 @@ class AssignTagDialog extends StatelessWidget {
                       child: DataTable(
                         headingRowColor: WidgetStateProperty.all(
                             ColorsManager.dataHeaderGrey),
+                        key: ValueKey(state.tags.length),
                         border: TableBorder.all(
                           color: ColorsManager.dataHeaderGrey,
                           width: 1,
@@ -120,6 +121,7 @@ class AssignTagDialog extends StatelessWidget {
                                 final controller = controllers[index];
                                 final availableTags = getAvailableTags(
                                     allTags ?? [], state.tags, tag);
+
                                 return DataRow(
                                   cells: [
                                     DataCell(Text((index + 1).toString())),
@@ -158,6 +160,8 @@ class AssignTagDialog extends StatelessWidget {
                                                     .add(DeleteTag(
                                                         tagToDelete: tag,
                                                         tags: state.tags));
+
+                                                controllers.removeAt(index);
                                               },
                                               tooltip: 'Delete Tag',
                                               padding: EdgeInsets.zero,
@@ -255,6 +259,7 @@ class AssignTagDialog extends StatelessWidget {
                                 spaceTags: processedTags,
                                 isCreate: false,
                                 onSave: onSave,
+                                allTags: allTags,
                               ),
                             );
                           },
@@ -265,10 +270,10 @@ class AssignTagDialog extends StatelessWidget {
                     Expanded(
                       child: DefaultButton(
                         borderRadius: 10,
-                        backgroundColor: state.isSaveEnabled
-                            ? ColorsManager.secondaryColor
-                            : ColorsManager.grayColor,
-                        foregroundColor: ColorsManager.whiteColors,
+                        backgroundColor: ColorsManager.secondaryColor,
+                        foregroundColor: state.isSaveEnabled
+                            ? ColorsManager.whiteColors
+                            : ColorsManager.whiteColorsWithOpacity,
                         onPressed: state.isSaveEnabled
                             ? () async {
                                 final updatedTags = List<Tag>.from(state.tags);

lib/pages/spaces_management/assign_tag_models/views/assign_tag_models_dialog.dart

@@ -82,6 +82,7 @@ class AssignTagModelsDialog extends StatelessWidget {
                           child: DataTable(
                             headingRowColor: WidgetStateProperty.all(
                                 ColorsManager.dataHeaderGrey),
+                            key: ValueKey(state.tags.length),
                             border: TableBorder.all(
                               color: ColorsManager.dataHeaderGrey,
                               width: 1,
@@ -176,6 +177,7 @@ class AssignTagModelsDialog extends StatelessWidget {
                                                         .add(DeleteTagModel(
                                                             tagToDelete: tag,
                                                             tags: state.tags));
+                                                    controllers.removeAt(index);
                                                   },
                                                   tooltip: 'Delete Tag',
                                                   padding: EdgeInsets.zero,
@@ -302,10 +304,10 @@ class AssignTagModelsDialog extends StatelessWidget {
                         Expanded(
                           child: DefaultButton(
                             borderRadius: 10,
-                            backgroundColor: state.isSaveEnabled
-                                ? ColorsManager.secondaryColor
-                                : ColorsManager.grayColor,
-                            foregroundColor: ColorsManager.whiteColors,
+                            backgroundColor: ColorsManager.secondaryColor,
+                            foregroundColor: state.isSaveEnabled
+                                ? ColorsManager.whiteColors
+                                : ColorsManager.whiteColorsWithOpacity,
                             onPressed: state.isSaveEnabled
                                 ? () async {
                                     final updatedTags =

lib/pages/spaces_management/helper/connection_helper.dart

@@ -0,0 +1,21 @@
+import 'dart:ui';
+
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/connection_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+
+class ConnectionHelper {
+  static Offset getCenterPosition(Size screenSize) {
+    return Offset(
+      screenSize.width / 2 - 260,
+      screenSize.height / 2 - 200,
+    );
+  }
+
+  static bool isHighlightedConnection(
+      Connection connection, SpaceModel? selectedSpace) {
+    if (selectedSpace == null) return true;
+
+    return connection.startSpace == selectedSpace ||
+        connection.endSpace == selectedSpace;
+  }
+}

lib/pages/spaces_management/helper/space_helper.dart

@@ -40,4 +40,55 @@ class SpaceHelper {
 
     return "$baseName(${maxNumber + 1})";
   }
+
+  static bool isSave(List<SpaceModel> spaces) {
+    return spaces.isNotEmpty &&
+        spaces.any((space) =>
+            space.status == SpaceStatus.newSpace ||
+            space.status == SpaceStatus.modified ||
+            space.status == SpaceStatus.deleted);
+  }
+
+  static bool isHighlightedSpace(SpaceModel space, SpaceModel? selectedSpace) {
+    if (selectedSpace == null) return true;
+
+    return space == selectedSpace ||
+        selectedSpace.parent?.internalId == space.internalId ||
+        selectedSpace.children
+                ?.any((child) => child.internalId == space.internalId) ==
+            true;
+  }
+
+  static bool isNameConflict(
+      String value, SpaceModel? parentSpace, SpaceModel? editSpace) {
+    final siblings = parentSpace?.children
+            .where((child) => child.internalId != editSpace?.internalId)
+            .toList() ??
+        [];
+
+    final editSiblings = editSpace?.parent?.children
+            .where((child) => child.internalId != editSpace.internalId)
+            .toList() ??
+        [];
+
+    final editSiblingConflict =
+        editSiblings.any((child) => child.name == value);
+
+    final siblingConflict = siblings.any((child) => child.name == value);
+
+    final parentConflict = parentSpace?.name == value &&
+        parentSpace?.internalId != editSpace?.internalId;
+
+    final parentOfEditSpaceConflict = editSpace?.parent?.name == value &&
+        editSpace?.parent?.internalId != editSpace?.internalId;
+
+    final childConflict =
+        editSpace?.children.any((child) => child.name == value) ?? false;
+
+    return siblingConflict ||
+        parentConflict ||
+        editSiblingConflict ||
+        parentOfEditSpaceConflict ||
+        childConflict;
+  }
 }

lib/pages/spaces_management/helper/tag_helper.dart

@@ -1,8 +1,11 @@
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/base_tag.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/subspace_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
+import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 
@@ -337,4 +340,25 @@ class TagHelper {
       checkTagExistInSubspace: checkTagExistInSubspace,
     );
   }
+
+  static List<String> getAllTagValues(
+      List<CommunityModel> communities, List<SpaceTemplateModel>? spaceModels) {
+    final Set<String> allTags = {};
+
+    if (spaceModels != null) {
+      for (var model in spaceModels) {
+        allTags.addAll(model.listAllTagValues());
+      }
+    }
+
+    for (final community in communities) {
+      for (final space in community.spaces) {
+        if (space.tags != null) {
+          allTags.addAll(space.listAllTagValues());
+        }
+      }
+    }
+
+    return allTags.toList();
+  }
 }

lib/pages/spaces_management/space_model/widgets/button_content_widget.dart

@@ -6,16 +6,23 @@ class ButtonContentWidget extends StatelessWidget {
   final IconData? icon;
   final String label;
   final String? svgAssets;
+  final bool disabled;
 
-  const ButtonContentWidget(
-      {Key? key, this.icon, required this.label, this.svgAssets})
-      : super(key: key);
+  const ButtonContentWidget({
+    Key? key,
+    this.icon,
+    required this.label,
+    this.svgAssets,
+    this.disabled = false,
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     final screenWidth = MediaQuery.of(context).size.width;
 
-    return SizedBox(
+    return Opacity(
+      opacity: disabled ? 0.5 : 1.0,
+      child: SizedBox(
         width: screenWidth * 0.25,
         child: Container(
           decoration: BoxDecoration(
@@ -27,7 +34,8 @@ class ButtonContentWidget extends StatelessWidget {
             borderRadius: BorderRadius.circular(20),
           ),
           child: Padding(
-          padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 16.0),
+            padding:
+                const EdgeInsets.symmetric(vertical: 10.0, horizontal: 16.0),
             child: Row(
               children: [
                 if (icon != null)
@@ -58,6 +66,7 @@ class ButtonContentWidget extends StatelessWidget {
             ),
           ),
         ),
+      ),
     );
   }
 }

lib/services/devices_mang_api.dart

@@ -23,7 +23,8 @@ class DevicesManagementApi {
             : ApiEndpoints.getAllDevices,
         showServerMessage: true,
         expectedResponseModel: (json) {
-          List<dynamic> jsonData = json;
+          List<dynamic> jsonData =
+              communityId.isNotEmpty && spaceId.isNotEmpty ? json['data'] : json;
           List<AllDevicesModel> devicesList = jsonData.map((jsonItem) {
             return AllDevicesModel.fromJson(jsonItem);
           }).toList();