fixed endpoint

added back border of tag list

lib/pages/auth/bloc/auth_bloc.dart

@@ -10,12 +10,9 @@ import 'package:syncrow_web/pages/auth/model/region_model.dart';
 import 'package:syncrow_web/pages/auth/model/token.dart';
 import 'package:syncrow_web/pages/auth/model/user_model.dart';
 import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/services/auth_api.dart';
 import 'package:syncrow_web/utils/constants/strings_manager.dart';
 import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
-import 'package:syncrow_web/utils/navigation_service.dart';
 import 'package:syncrow_web/utils/snack_bar.dart';
 
 class AuthBloc extends Bloc<AuthEvent, AuthState> {
@@ -35,7 +32,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
 
   ////////////////////////////// forget password //////////////////////////////////
   final TextEditingController forgetEmailController = TextEditingController();
-  final TextEditingController forgetPasswordController = TextEditingController();
+  final TextEditingController forgetPasswordController =
+      TextEditingController();
   final TextEditingController forgetOtp = TextEditingController();
   final forgetFormKey = GlobalKey<FormState>();
   final forgetEmailKey = GlobalKey<FormState>();
@@ -52,7 +50,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       return;
     }
     _remainingTime = 1;
-    add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
+    add(UpdateTimerEvent(
+        remainingTime: _remainingTime, isButtonEnabled: false));
     try {
       forgetEmailValidate = '';
       _remainingTime = (await AuthenticationAPI.sendOtp(
@@ -89,7 +88,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         _timer?.cancel();
         add(const UpdateTimerEvent(remainingTime: 0, isButtonEnabled: true));
       } else {
-        add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
+        add(UpdateTimerEvent(
+            remainingTime: _remainingTime, isButtonEnabled: false));
       }
     });
   }
@@ -99,7 +99,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     emit(const TimerState(isButtonEnabled: true, remainingTime: 0));
   }
 
-  Future<void> changePassword(ChangePasswordEvent event, Emitter<AuthState> emit) async {
+  Future<void> changePassword(
+      ChangePasswordEvent event, Emitter<AuthState> emit) async {
     emit(LoadingForgetState());
     try {
       var response = await AuthenticationAPI.verifyOtp(
@@ -115,7 +116,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       }
     } on DioException catch (e) {
       final errorData = e.response!.data;
-      String errorMessage = errorData['error']['message'] ?? 'something went wrong';
+      String errorMessage =
+          errorData['error']['message'] ?? 'something went wrong';
       validate = errorMessage;
       emit(AuthInitialState());
     }
@@ -129,7 +131,9 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   }
 
   void _onUpdateTimer(UpdateTimerEvent event, Emitter<AuthState> emit) {
-    emit(TimerState(isButtonEnabled: event.isButtonEnabled, remainingTime: event.remainingTime));
+    emit(TimerState(
+        isButtonEnabled: event.isButtonEnabled,
+        remainingTime: event.remainingTime));
   }
 
   /////////////////////////////////////  login  /////////////////////////////////////
@@ -179,13 +183,15 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
 
       if (token.accessTokenIsNotEmpty) {
         FlutterSecureStorage storage = const FlutterSecureStorage();
-        await storage.write(key: Token.loginAccessTokenKey, value: token.accessToken);
+        await storage.write(
+            key: Token.loginAccessTokenKey, value: token.accessToken);
         const FlutterSecureStorage().write(
             key: UserModel.userUuidKey,
             value: Token.decodeToken(token.accessToken)['uuid'].toString());
         user = UserModel.fromToken(token);
         loginEmailController.clear();
         loginPasswordController.clear();
+        debugPrint("token " + token.accessToken);
         emit(LoginSuccess());
       } else {
         emit(const LoginFailure(error: 'Something went wrong'));
@@ -336,12 +342,14 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   static Future<String> getTokenAndValidate() async {
     try {
       const storage = FlutterSecureStorage();
-      final firstLaunch =
+      final firstLaunch = await SharedPreferencesHelper.readBoolFromSP(
-          await SharedPreferencesHelper.readBoolFromSP(StringsManager.firstLaunch) ?? true;
+              StringsManager.firstLaunch) ??
+          true;
       if (firstLaunch) {
         storage.deleteAll();
       }
-      await SharedPreferencesHelper.saveBoolToSP(StringsManager.firstLaunch, false);
+      await SharedPreferencesHelper.saveBoolToSP(
+          StringsManager.firstLaunch, false);
       final value = await storage.read(key: Token.loginAccessTokenKey) ?? '';
       if (value.isEmpty) {
         return 'Token not found';
@@ -394,7 +402,9 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     final String formattedTime = [
       if (days > 0) '${days}d', // Append 'd' for days
       if (days > 0 || hours > 0)
-        hours.toString().padLeft(2, '0'), // Show hours if there are days or hours
+        hours
+            .toString()
+            .padLeft(2, '0'), // Show hours if there are days or hours
       minutes.toString().padLeft(2, '0'),
       seconds.toString().padLeft(2, '0'),
     ].join(':');
@@ -435,7 +445,6 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   static Future<void> logout(BuildContext context) async {
     final storage = FlutterSecureStorage();
     ProjectManager.clearProjectUUID();
-    context.read<SpaceTreeBloc>().add(ClearAllData());
     storage.deleteAll();
   }
 }

lib/pages/home/bloc/home_bloc.dart

@@ -2,19 +2,20 @@ 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';
+import 'package:shared_preferences/shared_preferences.dart';
+// import 'package:graphview/GraphView.dart';
 import 'package:syncrow_web/pages/auth/model/user_model.dart';
 import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/home/bloc/home_state.dart';
 import 'package:syncrow_web/pages/home/home_model/home_item_model.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/services/home_api.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
-import 'package:syncrow_web/utils/navigation_service.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 
 class HomeBloc extends Bloc<HomeEvent, HomeState> {
   // final Graph graph = Graph()..isTree = true;
@@ -51,12 +52,12 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
 
   Future _fetchUserInfo(FetchUserInfo event, Emitter<HomeState> emit) async {
     try {
-      var uuid = await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
+      var uuid =
+          await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       user = await HomeApi().fetchUserInfo(uuid);
 
       if (user != null && user!.project != null) {
         await ProjectManager.setProjectUUID(user!.project!.uuid);
-        NavigationService.navigatorKey.currentContext!.read<SpaceTreeBloc>().add(InitialEvent());
       }
       add(FetchTermEvent());
       add(FetchPolicyEvent());
@@ -92,10 +93,12 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     }
   }
 
-  Future _confirmUserAgreement(ConfirmUserAgreementEvent event, Emitter<HomeState> emit) async {
+  Future _confirmUserAgreement(
+      ConfirmUserAgreementEvent event, Emitter<HomeState> emit) async {
     try {
       emit(LoadingHome());
-      var uuid = await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
+      var uuid =
+          await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       policy = await HomeApi().confirmUserAgreements(uuid);
       emit(PolicyAgreement());
     } catch (e) {
@@ -119,7 +122,6 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
       icon: Assets.accessIcon,
       active: true,
       onPress: (context) {
-        context.read<SpaceTreeBloc>().add(ClearCachedData());
         context.go(RoutesConst.accessManagementPage);
       },
       color: null,
@@ -129,7 +131,6 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
       icon: Assets.spaseManagementIcon,
       active: true,
       onPress: (context) {
-        context.read<SpaceTreeBloc>().add(ClearCachedData());
         context.go(RoutesConst.spacesManagementPage);
       },
       color: ColorsManager.primaryColor,
@@ -139,7 +140,6 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
       icon: Assets.devicesIcon,
       active: true,
       onPress: (context) {
-        context.read<SpaceTreeBloc>().add(ClearCachedData());
         BlocProvider.of<RoutineBloc>(context)
             .add(const TriggerSwitchTabsEvent(isRoutineTab: false));
         context.go(RoutesConst.deviceManagementPage);

lib/pages/roles_and_permission/model/edit_user_model.dart

@@ -219,9 +219,6 @@ class UserSpaceModel {
   final double x;
   final double y;
   final String icon;
-  final String communityUuid;
-
-  //communityUuid
 
   UserSpaceModel({
     required this.uuid,
@@ -234,23 +231,22 @@ class UserSpaceModel {
     required this.x,
     required this.y,
     required this.icon,
-    required this.communityUuid,
   });
 
   /// Create a [UserSpaceModel] from JSON data
   factory UserSpaceModel.fromJson(Map<String, dynamic> json) {
     return UserSpaceModel(
-        uuid: json['uuid'] as String,
+      uuid: json['uuid'] as String,
-        createdAt: json['createdAt'] as String,
+      createdAt: json['createdAt'] as String,
-        updatedAt: json['updatedAt'] as String,
+      updatedAt: json['updatedAt'] as String,
-        spaceTuyaUuid: json['spaceTuyaUuid'] as String?,
+      spaceTuyaUuid: json['spaceTuyaUuid'] as String?,
-        spaceName: json['spaceName'] as String,
+      spaceName: json['spaceName'] as String,
-        invitationCode: json['invitationCode'] as String?,
+      invitationCode: json['invitationCode'] as String?,
-        disabled: json['disabled'] as bool,
+      disabled: json['disabled'] as bool,
-        x: (json['x'] as num).toDouble(),
+      x: (json['x'] as num).toDouble(),
-        y: (json['y'] as num).toDouble(),
+      y: (json['y'] as num).toDouble(),
-        icon: json['icon'] as String,
+      icon: json['icon'] as String,
-        communityUuid: json['communityUuid'] as String);
+    );
   }
 
   /// Convert the [UserSpaceModel] to JSON
@@ -266,7 +262,6 @@ class UserSpaceModel {
       'x': x,
       'y': y,
       'icon': icon,
-      'communityUuid': communityUuid
     };
   }
 }

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

@@ -1,6 +1,5 @@
 import 'package:bloc/bloc.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/custom_dialog.dart';
 import 'package:syncrow_web/pages/roles_and_permission/model/edit_user_model.dart';
@@ -9,14 +8,14 @@ import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialo
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/model/permission_option_model.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/model/tree_node_model.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
 import 'package:syncrow_web/services/user_permission.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/navigation_service.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 
 class UsersBloc extends Bloc<UsersEvent, UsersState> {
   UsersBloc() : super(UsersInitial()) {
@@ -66,10 +65,8 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
   void isCompleteSpacesFun(
       CheckSpacesStepStatus event, Emitter<UsersState> emit) {
     emit(UsersLoadingState());
-    var spaceBloc =
+    List<String> selectedIds = getSelectedIds(updatedCommunities);
-        NavigationService.navigatorKey.currentContext!.read<SpaceTreeBloc>();
+    isCompleteSpaces = selectedIds.isNotEmpty;
-
-    isCompleteSpaces = spaceBloc.state.selectedCommunities.isNotEmpty;
     emit(ChangeStatusSteps());
   }
 
@@ -343,11 +340,9 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       emit(UsersLoadingState());
-      // List<String> selectedIds =
+      List<String> selectedIds = getSelectedIds(updatedCommunities)
-      //     getSelectedIds(updatedCommunities).where((id) => !communityIds.contains(id)).toList();
+          .where((id) => !communityIds.contains(id))
-
+          .toList();
-      List<String> selectedSpacesId = getSelectedSpacesIds();
-      // List<String> selectedIds = getSelectedIds(updatedCommunities);
 
       bool res = await UserPermissionApi().sendInviteUser(
           email: emailController.text,
@@ -356,7 +351,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           lastName: lastNameController.text,
           phoneNumber: phoneController.text,
           roleUuid: roleSelected,
-          spaceUuids: selectedSpacesId,
+          spaceUuids: selectedIds,
           projectUuid: projectUuid);
 
       if (res) {
@@ -386,20 +381,12 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     }
   }
 
-  List<String> getSelectedSpacesIds() {
-    List<String> selectedSpacesId = [];
-    var spaceBloc =
-        NavigationService.navigatorKey.currentContext!.read<SpaceTreeBloc>();
-    for (var community in spaceBloc.state.selectedCommunities) {
-      selectedSpacesId
-          .addAll(spaceBloc.state.selectedCommunityAndSpaces[community] ?? []);
-    }
-    return selectedSpacesId;
-  }
-
   _editInviteUser(EditInviteUsers event, Emitter<UsersState> emit) async {
     try {
       emit(UsersLoadingState());
+      List<String> selectedIds = getSelectedIds(updatedCommunities)
+          .where((id) => !communityIds.contains(id))
+          .toList();
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       bool res = await UserPermissionApi().editInviteUser(
@@ -409,7 +396,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           lastName: lastNameController.text,
           phoneNumber: phoneController.text,
           roleUuid: roleSelected,
-          spaceUuids: getSelectedSpacesIds(),
+          spaceUuids: selectedIds,
           projectUuid: projectUuid);
       if (res == true) {
         showCustomDialog(
@@ -515,8 +502,6 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     emit(UsersLoadingState());
 
     try {
-      var spaceBloc =
-          NavigationService.navigatorKey.currentContext!.read<SpaceTreeBloc>();
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       if (event.uuid?.isNotEmpty ?? false) {
@@ -531,20 +516,13 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           phoneController.text = res.phoneNumber ?? '';
           jobTitleController.text = res.jobTitle ?? '';
           res.roleType;
-          res.spaces.map((space) {
+          if (updatedCommunities.isNotEmpty) {
-            selectedIds.add(space.uuid);
+            // Create a list of UUIDs to mark
-            CommunityModel community = spaceBloc.state.communityList
+            final uuidsToMark = res.spaces.map((space) => space.uuid).toList();
-                .firstWhere((item) => item.uuid == space.communityUuid);
+            // Print all IDs and mark nodes in updatedCommunities
-            spaceBloc.add(OnSpaceSelected(community, space.uuid, []));
+            debugPrint('Printing and marking nodes in updatedCommunities:');
-          }).toList();
+            _printAndMarkNodes(updatedCommunities, uuidsToMark);
-
+          }
-          // if (updatedCommunities.isNotEmpty) {
-          //   // Create a list of UUIDs to mark
-          //   final uuidsToMark = res.spaces.map((space) => space.uuid).toList();
-          //   // Print all IDs and mark nodes in updatedCommunities
-          //   debugPrint('Printing and marking nodes in updatedCommunities:');
-          //   _printAndMarkNodes(updatedCommunities, uuidsToMark);
-          // }
           final roleId = roles
               .firstWhere((element) =>
                   element.type ==
@@ -637,16 +615,4 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     }
     return null;
   }
-
-  @override
-  Future<void> close() {
-    emailController.dispose();
-    firstNameController.dispose();
-    lastNameController.dispose();
-    emailController.dispose();
-    phoneController.dispose();
-    jobTitleController.dispose();
-    roleSearchController.dispose();
-    return super.close();
-  }
 }

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

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
@@ -24,7 +25,7 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
   Widget build(BuildContext context) {
     return BlocProvider(
         create: (BuildContext context) => UsersBloc()
-          // ..add(const LoadCommunityAndSpacesEvent())
+          ..add(const LoadCommunityAndSpacesEvent())
           ..add(const RoleEvent()),
         child: BlocConsumer<UsersBloc, UsersState>(
             listener: (context, state) {},

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

@@ -26,12 +26,13 @@ class _EditUserDialogState extends State<EditUserDialog> {
   Widget build(BuildContext context) {
     return BlocProvider(
         create: (BuildContext context) => UsersBloc()
-          // ..add(const LoadCommunityAndSpacesEvent())
+          ..add(const LoadCommunityAndSpacesEvent())
           ..add(const RoleEvent())
           ..add(GetUserByIdEvent(uuid: widget.userId)),
         child: BlocConsumer<UsersBloc, UsersState>(listener: (context, state) {
           if (state is SpacesLoadedState) {
-            BlocProvider.of<UsersBloc>(context).add(GetUserByIdEvent(uuid: widget.userId));
+            BlocProvider.of<UsersBloc>(context)
+                .add(GetUserByIdEvent(uuid: widget.userId));
           }
         }, builder: (context, state) {
           final _blocRole = BlocProvider.of<UsersBloc>(context);
@@ -39,7 +40,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
           return Dialog(
               child: Container(
             decoration: const BoxDecoration(
-                color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(20))),
+                color: Colors.white,
+                borderRadius: BorderRadius.all(Radius.circular(20))),
             width: 900,
             child: Column(
               children: [
@@ -68,7 +70,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
                             children: [
                               _buildStep1Indicator(1, "Basics", _blocRole),
                               _buildStep2Indicator(2, "Spaces", _blocRole),
-                              _buildStep3Indicator(3, "Role & Permissions", _blocRole),
+                              _buildStep3Indicator(
+                                  3, "Role & Permissions", _blocRole),
                             ],
                           ),
                         ),
@@ -116,13 +119,15 @@ class _EditUserDialogState extends State<EditUserDialog> {
                             if (currentStep < 3) {
                               currentStep++;
                               if (currentStep == 2) {
-                                _blocRole.add(CheckStepStatus(isEditUser: true));
+                                _blocRole
+                                    .add(CheckStepStatus(isEditUser: true));
                               } else if (currentStep == 3) {
                                 _blocRole.add(const CheckSpacesStepStatus());
                               }
                             } else {
-                              _blocRole
+                              _blocRole.add(EditInviteUsers(
-                                  .add(EditInviteUsers(context: context, userId: widget.userId!));
+                                  context: context,
+                                   userId: widget.userId!));
                             }
                           });
                         },
@@ -131,7 +136,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
                           style: TextStyle(
                               color: (_blocRole.isCompleteSpaces == false ||
                                           _blocRole.isCompleteBasics == false ||
-                                          _blocRole.isCompleteRolePermissions == false) &&
+                                          _blocRole.isCompleteRolePermissions ==
+                                              false) &&
                                       currentStep == 3
                                   ? ColorsManager.grayColor
                                   : ColorsManager.secondaryColor),
@@ -204,8 +210,12 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
+                    color: currentStep == step
-                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
+                        ? ColorsManager.blackColor
+                        : ColorsManager.greyColor,
+                    fontWeight: currentStep == step
+                        ? FontWeight.bold
+                        : FontWeight.normal,
                   ),
                 ),
               ],
@@ -263,8 +273,12 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
+                    color: currentStep == step
-                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
+                        ? ColorsManager.blackColor
+                        : ColorsManager.greyColor,
+                    fontWeight: currentStep == step
+                        ? FontWeight.bold
+                        : FontWeight.normal,
                   ),
                 ),
               ],
@@ -321,8 +335,12 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
+                    color: currentStep == step
-                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
+                        ? ColorsManager.blackColor
+                        : ColorsManager.greyColor,
+                    fontWeight: currentStep == step
+                        ? FontWeight.bold
+                        : FontWeight.normal,
                   ),
                 ),
               ],

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

@@ -1,9 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart';
+import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
-import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
+import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/view/build_tree_view.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
+import 'package:syncrow_web/utils/style.dart';
 
 class SpacesAccessView extends StatelessWidget {
   final String? userId;
@@ -22,8 +27,10 @@ class SpacesAccessView extends StatelessWidget {
             children: [
               Text(
                 'Spaces access',
-                style: context.textTheme.bodyLarge
+                style: context.textTheme.bodyLarge?.copyWith(
-                    ?.copyWith(fontWeight: FontWeight.w700, fontSize: 20, color: Colors.black),
+                    fontWeight: FontWeight.w700,
+                    fontSize: 20,
+                    color: Colors.black),
               ),
               const SizedBox(
                 height: 35,
@@ -35,78 +42,77 @@ class SpacesAccessView extends StatelessWidget {
               const SizedBox(
                 height: 25,
               ),
-              Expanded(child: SpaceTreeView(onSelect: () {}))
+              Expanded(
-              // Expanded(
+                child: SizedBox(
-              //   child: SizedBox(
+                  child: Column(
-              //     child: Column(
+                    children: [
-              //       children: [
+                      Expanded(
-              //         Expanded(
+                        flex: 2,
-              //           flex: 2,
+                        child: Container(
-              //           child: Container(
+                          decoration: const BoxDecoration(
-              //             decoration: const BoxDecoration(
+                            color: ColorsManager.circleRolesBackground,
-              //               color: ColorsManager.circleRolesBackground,
+                            borderRadius: BorderRadius.only(
-              //               borderRadius: BorderRadius.only(
+                                topRight: Radius.circular(20),
-              //                   topRight: Radius.circular(20),
+                                topLeft: Radius.circular(20)),
-              //                   topLeft: Radius.circular(20)),
+                          ),
-              //             ),
+                          child: Padding(
-              //             child: Padding(
+                            padding: const EdgeInsets.all(8.0),
-              //               padding: const EdgeInsets.all(8.0),
+                            child: Row(
-              //               child: Row(
+                              children: [
-              //                 children: [
+                                Expanded(
-              //                   Expanded(
+                                  child: Container(
-              //                     child: Container(
+                                    decoration: BoxDecoration(
-              //                       decoration: BoxDecoration(
+                                        borderRadius: const BorderRadius.all(
-              //                           borderRadius: const BorderRadius.all(
+                                            Radius.circular(20)),
-              //                               Radius.circular(20)),
+                                        border: Border.all(
-              //                           border: Border.all(
+                                            color: ColorsManager.grayBorder)),
-              //                               color: ColorsManager.grayBorder)),
+                                    child: TextFormField(
-              //                       child: TextFormField(
+                                      style:
-              //                         style:
+                                          const TextStyle(color: Colors.black),
-              //                             const TextStyle(color: Colors.black),
+                                      // controller: _blocRole.firstNameController,
-              //                         // controller: _blocRole.firstNameController,
+                                      onChanged: (value) {
-              //                         onChanged: (value) {
+                                        _blocRole.add(SearchAnode(
-              //                           _blocRole.add(SearchAnode(
+                                            nodes: _blocRole.updatedCommunities,
-              //                               nodes: _blocRole.updatedCommunities,
+                                            searchTerm: value));
-              //                               searchTerm: value));
+                                      },
-              //                         },
+                                      decoration: textBoxDecoration(radios: 20)!
-              //                         decoration: textBoxDecoration(radios: 20)!
+                                          .copyWith(
-              //                             .copyWith(
+                                        fillColor: Colors.white,
-              //                           fillColor: Colors.white,
+                                        suffixIcon: Padding(
-              //                           suffixIcon: Padding(
+                                          padding:
-              //                             padding:
+                                              const EdgeInsets.only(right: 16),
-              //                                 const EdgeInsets.only(right: 16),
+                                          child: SvgPicture.asset(
-              //                             child: SvgPicture.asset(
+                                            Assets.textFieldSearch,
-              //                               Assets.textFieldSearch,
+                                            width: 24,
-              //                               width: 24,
+                                            height: 24,
-              //                               height: 24,
+                                          ),
-              //                             ),
+                                        ),
-              //                           ),
+                                        hintStyle: context.textTheme.bodyMedium
-              //                           hintStyle: context.textTheme.bodyMedium
+                                            ?.copyWith(
-              //                               ?.copyWith(
+                                                fontWeight: FontWeight.w400,
-              //                                   fontWeight: FontWeight.w400,
+                                                fontSize: 12,
-              //                                   fontSize: 12,
+                                                color: ColorsManager.textGray),
-              //                                   color: ColorsManager.textGray),
+                                      ),
-              //                         ),
+                                    ),
-              //                       ),
+                                  ),
-              //                     ),
+                                ),
-              //                   ),
+                              ],
-              //                 ],
+                            ),
-              //               ),
+                          ),
-              //             ),
+                        ),
-              //           ),
+                      ),
-              //         ),
+                      Expanded(
-              //         Expanded(
+                          flex: 7,
-              //             flex: 7,
+                          child: Container(
-              //             child: Container(
+                              color: ColorsManager.circleRolesBackground,
-              //                 color: ColorsManager.circleRolesBackground,
+                              padding: const EdgeInsets.all(8.0),
-              //                 padding: const EdgeInsets.all(8.0),
+                              child: Container(
-              //                 child: Container(
+                                  color: ColorsManager.whiteColors,
-              //                     color: ColorsManager.whiteColors,
+                                  child: TreeView(userId: userId))))
-              //                     child: TreeView(userId: userId))))
+                    ],
-              //       ],
+                  ),
-              //     ),
+                ),
-              //   ),
+              ),
-              // ),
             ],
           ),
         ),

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

@@ -13,13 +13,10 @@ import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/vi
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/view/de_activate_filter.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/view/name_filter.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/view/user_table.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/style.dart';
-
 class UsersPage extends StatelessWidget {
   UsersPage({super.key});
 
@@ -27,7 +24,8 @@ class UsersPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final TextEditingController searchController = TextEditingController();
 
-    Widget actionButton({bool isActive = false, required String title, Function()? onTap}) {
+    Widget actionButton(
+        {bool isActive = false, required String title, Function()? onTap}) {
       return InkWell(
         onTap: onTap,
         child: Padding(
@@ -60,7 +58,8 @@ class UsersPage extends StatelessWidget {
                     : ColorsManager.disabledPink.withOpacity(0.5),
           ),
           child: Padding(
-            padding: const EdgeInsets.only(left: 10, right: 10, bottom: 5, top: 5),
+            padding:
+                const EdgeInsets.only(left: 10, right: 10, bottom: 5, top: 5),
             child: Row(
               crossAxisAlignment: CrossAxisAlignment.center,
               mainAxisAlignment: MainAxisAlignment.center,
@@ -84,12 +83,15 @@ class UsersPage extends StatelessWidget {
     }
 
     Widget changeIconStatus(
-        {required String userId, required String status, required Function()? onTap}) {
+        {required String userId,
+        required String status,
+        required Function()? onTap}) {
       return Center(
         child: InkWell(
           onTap: onTap,
           child: Padding(
-            padding: const EdgeInsets.only(left: 5, right: 5, bottom: 5, top: 5),
+            padding:
+                const EdgeInsets.only(left: 5, right: 5, bottom: 5, top: 5),
             child: SvgPicture.asset(
               status == "invited"
                   ? Assets.invitedIcon
@@ -157,7 +159,6 @@ class UsersPage extends StatelessWidget {
                       const SizedBox(width: 20),
                       InkWell(
                         onTap: () {
-                          context.read<SpaceTreeBloc>().add(ClearCachedData());
                           showDialog(
                             context: context,
                             barrierDismissible: false,
@@ -196,10 +197,14 @@ class UsersPage extends StatelessWidget {
                           context: context,
                           isSelected: _blocRole.currentSortOrder,
                           aToZTap: () {
-                            context.read<UserTableBloc>().add(const SortUsersByNameAsc());
+                            context
+                                .read<UserTableBloc>()
+                                .add(const SortUsersByNameAsc());
                           },
                           zToaTap: () {
-                            context.read<UserTableBloc>().add(const SortUsersByNameDesc());
+                            context
+                                .read<UserTableBloc>()
+                                .add(const SortUsersByNameDesc());
                           },
                         );
                       }
@@ -208,8 +213,9 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.jobTitle)
                             item: _blocRole.selectedJobTitles.contains(item),
                         };
-                        final RenderBox overlay =
+                        final RenderBox overlay = Overlay.of(context)
-                            Overlay.of(context).context.findRenderObject() as RenderBox;
+                            .context
+                            .findRenderObject() as RenderBox;
 
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
@@ -249,8 +255,9 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.roleTypes)
                             item: _blocRole.selectedRoles.contains(item),
                         };
-                        final RenderBox overlay =
+                        final RenderBox overlay = Overlay.of(context)
-                            Overlay.of(context).context.findRenderObject() as RenderBox;
+                            .context
+                            .findRenderObject() as RenderBox;
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 4,
@@ -270,9 +277,10 @@ class UsersPage extends StatelessWidget {
                                 .map((entry) => entry.key)
                                 .toList();
                             Navigator.of(context).pop();
-                            context.read<UserTableBloc>().add(FilterUsersByRoleEvent(
+                            context.read<UserTableBloc>().add(
-                                selectedRoles: selectedItems,
+                                FilterUsersByRoleEvent(
-                                sortOrder: _blocRole.currentSortRole));
+                                    selectedRoles: selectedItems,
+                                    sortOrder: _blocRole.currentSortRole));
                           },
                           onSortAtoZ: (v) {
                             _blocRole.currentSortRole = v;
@@ -287,10 +295,14 @@ class UsersPage extends StatelessWidget {
                           context: context,
                           isSelected: _blocRole.currentSortOrder,
                           aToZTap: () {
-                            context.read<UserTableBloc>().add(const DateNewestToOldestEvent());
+                            context
+                                .read<UserTableBloc>()
+                                .add(const DateNewestToOldestEvent());
                           },
                           zToaTap: () {
-                            context.read<UserTableBloc>().add(const DateOldestToNewestEvent());
+                            context
+                                .read<UserTableBloc>()
+                                .add(const DateOldestToNewestEvent());
                           },
                         );
                       }
@@ -299,8 +311,9 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.createdBy)
                             item: _blocRole.selectedCreatedBy.contains(item),
                         };
-                        final RenderBox overlay =
+                        final RenderBox overlay = Overlay.of(context)
-                            Overlay.of(context).context.findRenderObject() as RenderBox;
+                            .context
+                            .findRenderObject() as RenderBox;
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 1,
@@ -338,8 +351,9 @@ class UsersPage extends StatelessWidget {
                             item: _blocRole.selectedStatuses.contains(item),
                         };
 
-                        final RenderBox overlay =
+                        final RenderBox overlay = Overlay.of(context)
-                            Overlay.of(context).context.findRenderObject() as RenderBox;
+                            .context
+                            .findRenderObject() as RenderBox;
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 0,
@@ -376,10 +390,14 @@ class UsersPage extends StatelessWidget {
                           context: context,
                           isSelected: _blocRole.currentSortOrderDate,
                           aToZTap: () {
-                            context.read<UserTableBloc>().add(const DateNewestToOldestEvent());
+                            context
+                                .read<UserTableBloc>()
+                                .add(const DateNewestToOldestEvent());
                           },
                           zToaTap: () {
-                            context.read<UserTableBloc>().add(const DateOldestToNewestEvent());
+                            context
+                                .read<UserTableBloc>()
+                                .add(const DateOldestToNewestEvent());
                           },
                         );
                       }
@@ -406,17 +424,23 @@ class UsersPage extends StatelessWidget {
                         Text(user.createdTime ?? ''),
                         Text(user.invitedBy),
                         status(
-                          status: user.isEnabled == false ? 'disabled' : user.status,
+                          status: user.isEnabled == false
+                              ? 'disabled'
+                              : user.status,
                         ),
                         changeIconStatus(
-                          status: user.isEnabled == false ? 'disabled' : user.status,
+                          status: user.isEnabled == false
+                              ? 'disabled'
+                              : user.status,
                           userId: user.uuid,
                           onTap: user.status != "invited"
                               ? () {
-                                  context.read<UserTableBloc>().add(ChangeUserStatus(
+                                  context.read<UserTableBloc>().add(
-                                      userId: user.uuid,
+                                      ChangeUserStatus(
-                                      newStatus:
+                                          userId: user.uuid,
-                                          user.isEnabled == false ? 'disabled' : user.status));
+                                          newStatus: user.isEnabled == false
+                                              ? 'disabled'
+                                              : user.status));
                                 }
                               : null,
                         ),
@@ -427,12 +451,12 @@ class UsersPage extends StatelessWidget {
                                     isActive: true,
                                     title: "Edit",
                                     onTap: () {
-                                      context.read<SpaceTreeBloc>().add(ClearCachedData());
                                       showDialog(
                                         context: context,
                                         barrierDismissible: false,
                                         builder: (BuildContext context) {
-                                          return EditUserDialog(userId: user.uuid);
+                                          return EditUserDialog(
+                                              userId: user.uuid);
                                         },
                                       ).then((v) {
                                         if (v != null) {
@@ -453,10 +477,13 @@ class UsersPage extends StatelessWidget {
                                   context: context,
                                   barrierDismissible: false,
                                   builder: (BuildContext context) {
-                                    return DeleteUserDialog(onTapDelete: () async {
+                                    return DeleteUserDialog(
+                                        onTapDelete: () async {
                                       try {
-                                        _blocRole.add(DeleteUserEvent(user.uuid, context));
+                                        _blocRole.add(DeleteUserEvent(
-                                        await Future.delayed(const Duration(seconds: 2));
+                                            user.uuid, context));
+                                        await Future.delayed(
+                                            const Duration(seconds: 2));
                                         return true;
                                       } catch (e) {
                                         return false;
@@ -486,14 +513,20 @@ class UsersPage extends StatelessWidget {
                             visiblePagesCount: 4,
                             buttonRadius: 10,
                             selectedButtonColor: ColorsManager.secondaryColor,
-                            buttonUnSelectedBorderColor: ColorsManager.grayBorder,
+                            buttonUnSelectedBorderColor:
-                            lastPageIcon: const Icon(Icons.keyboard_double_arrow_right),
+                                ColorsManager.grayBorder,
-                            firstPageIcon: const Icon(Icons.keyboard_double_arrow_left),
+                            lastPageIcon:
-                            totalPages:
+                                const Icon(Icons.keyboard_double_arrow_right),
-                                (_blocRole.totalUsersCount.length / _blocRole.itemsPerPage).ceil(),
+                            firstPageIcon:
+                                const Icon(Icons.keyboard_double_arrow_left),
+                            totalPages: (_blocRole.totalUsersCount.length /
+                                    _blocRole.itemsPerPage)
+                                .ceil(),
                             currentPage: _blocRole.currentPage,
                             onPageChanged: (int pageNumber) {
-                              context.read<UserTableBloc>().add(ChangePage(pageNumber));
+                              context
+                                  .read<UserTableBloc>()
+                                  .add(ChangePage(pageNumber));
                             },
                           ),
                         ),

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

@@ -61,8 +61,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     TriggerSwitchTabsEvent event,
     Emitter<RoutineState> emit,
   ) {
-    emit(state.copyWith(
+    emit(state.copyWith(routineTab: event.isRoutineTab, createRoutineView: false));
-        routineTab: event.isRoutineTab, createRoutineView: false));
     add(ResetRoutineState());
     if (event.isRoutineTab) {
       add(const LoadScenes());
@@ -88,8 +87,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     final updatedIfItems = List<Map<String, dynamic>>.from(state.ifItems);
 
     // Find the index of the item in teh current itemsList
-    int index = updatedIfItems.indexWhere(
+    int index =
-        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+        updatedIfItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       updatedIfItems[index] = event.item;
@@ -98,21 +97,18 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
 
     if (event.isTabToRun) {
-      emit(state.copyWith(
+      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
-          ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
     } else {
-      emit(state.copyWith(
+      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
-          ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
     }
   }
 
-  void _onAddToThenContainer(
+  void _onAddToThenContainer(AddToThenContainer event, Emitter<RoutineState> emit) {
-      AddToThenContainer event, Emitter<RoutineState> emit) {
     final currentItems = List<Map<String, dynamic>>.from(state.thenItems);
 
     // Find the index of the item in teh current itemsList
-    int index = currentItems.indexWhere(
+    int index =
-        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+        currentItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       currentItems[index] = event.item;
@@ -123,26 +119,22 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     emit(state.copyWith(thenItems: currentItems));
   }
 
-  void _onAddFunctionsToRoutine(
+  void _onAddFunctionsToRoutine(AddFunctionToRoutine event, Emitter<RoutineState> emit) {
-      AddFunctionToRoutine event, Emitter<RoutineState> emit) {
     try {
       if (event.functions.isEmpty) return;
 
-      List<DeviceFunctionData> selectedFunction =
+      List<DeviceFunctionData> selectedFunction = List<DeviceFunctionData>.from(event.functions);
-          List<DeviceFunctionData>.from(event.functions);
 
       Map<String, List<DeviceFunctionData>> currentSelectedFunctions =
           Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
       if (currentSelectedFunctions.containsKey(event.uniqueCustomId)) {
         List<DeviceFunctionData> currentFunctions =
-            List<DeviceFunctionData>.from(
+            List<DeviceFunctionData>.from(currentSelectedFunctions[event.uniqueCustomId] ?? []);
-                currentSelectedFunctions[event.uniqueCustomId] ?? []);
 
         List<String> functionCode = [];
         for (int i = 0; i < selectedFunction.length; i++) {
           for (int j = 0; j < currentFunctions.length; j++) {
-            if (selectedFunction[i].functionCode ==
+            if (selectedFunction[i].functionCode == currentFunctions[j].functionCode) {
-                currentFunctions[j].functionCode) {
               currentFunctions[j] = selectedFunction[i];
               if (!functionCode.contains(currentFunctions[j].functionCode)) {
                 functionCode.add(currentFunctions[j].functionCode);
@@ -152,15 +144,13 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
 
         for (int i = 0; i < functionCode.length; i++) {
-          selectedFunction
+          selectedFunction.removeWhere((code) => code.functionCode == functionCode[i]);
-              .removeWhere((code) => code.functionCode == functionCode[i]);
         }
 
-        currentSelectedFunctions[event.uniqueCustomId] =
+        currentSelectedFunctions[event.uniqueCustomId] = List.from(currentFunctions)
-            List.from(currentFunctions)..addAll(selectedFunction);
+          ..addAll(selectedFunction);
       } else {
-        currentSelectedFunctions[event.uniqueCustomId] =
+        currentSelectedFunctions[event.uniqueCustomId] = List.from(event.functions);
-            List.from(event.functions);
       }
 
       emit(state.copyWith(selectedFunctions: currentSelectedFunctions));
@@ -169,8 +159,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadScenes(
+  Future<void> _onLoadScenes(LoadScenes event, Emitter<RoutineState> emit) async {
-      LoadScenes event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     List<ScenesModel> scenes = [];
     try {
@@ -179,11 +168,9 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var spaceBloc = context.read<SpaceTreeBloc>();
       for (var communityId in spaceBloc.state.selectedCommunities) {
-        List<String> spacesList =
+        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
         for (var spaceId in spacesList) {
-          scenes.addAll(
+          scenes.addAll(await SceneApi.getScenes(spaceId, communityId, projectUuid));
-              await SceneApi.getScenes(spaceId, communityId, projectUuid));
         }
       }
 
@@ -201,8 +188,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadAutomation(
+  Future<void> _onLoadAutomation(LoadAutomation event, Emitter<RoutineState> emit) async {
-      LoadAutomation event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     List<ScenesModel> automations = [];
 
@@ -210,8 +196,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var spaceBloc = context.read<SpaceTreeBloc>();
       for (var communityId in spaceBloc.state.selectedCommunities) {
-        List<String> spacesList =
+        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
         for (var spaceId in spacesList) {
           automations.addAll(await SceneApi.getAutomation(spaceId));
         }
@@ -230,16 +215,14 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onSearchRoutines(
+  FutureOr<void> _onSearchRoutines(SearchRoutines event, Emitter<RoutineState> emit) async {
-      SearchRoutines event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     await Future.delayed(const Duration(seconds: 1));
     emit(state.copyWith(isLoading: false, errorMessage: null));
     emit(state.copyWith(searchText: event.query));
   }
 
-  FutureOr<void> _onAddSelectedIcon(
+  FutureOr<void> _onAddSelectedIcon(AddSelectedIcon event, Emitter<RoutineState> emit) {
-      AddSelectedIcon event, Emitter<RoutineState> emit) {
     emit(state.copyWith(selectedIcon: event.icon));
   }
 
@@ -253,8 +236,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return actions.last['deviceId'] == 'delay';
   }
 
-  Future<void> _onCreateScene(
+  Future<void> _onCreateScene(CreateSceneEvent event, Emitter<RoutineState> emit) async {
-      CreateSceneEvent event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -267,8 +249,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage:
+          errorMessage: 'A delay condition cannot be the only or the last action',
-              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -344,8 +325,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onCreateAutomation(
+  Future<void> _onCreateAutomation(CreateAutomationEvent event, Emitter<RoutineState> emit) async {
-      CreateAutomationEvent event, Emitter<RoutineState> emit) async {
     try {
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
@@ -366,8 +346,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage:
+          errorMessage: 'A delay condition cannot be the only or the last action',
-              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         CustomSnackBar.redSnackBar('Cannot have delay as the last action');
@@ -479,21 +458,17 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onRemoveDragCard(
+  FutureOr<void> _onRemoveDragCard(RemoveDragCard event, Emitter<RoutineState> emit) {
-      RemoveDragCard event, Emitter<RoutineState> emit) {
     if (event.isFromThen) {
       final thenItems = List<Map<String, dynamic>>.from(state.thenItems);
-      final selectedFunctions =
+      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
-          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       thenItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
-      emit(state.copyWith(
+      emit(state.copyWith(thenItems: thenItems, selectedFunctions: selectedFunctions));
-          thenItems: thenItems, selectedFunctions: selectedFunctions));
     } else {
       final ifItems = List<Map<String, dynamic>>.from(state.ifItems);
-      final selectedFunctions =
+      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
-          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       ifItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
@@ -504,8 +479,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             isAutomation: false,
             isTabToRun: false));
       } else {
-        emit(state.copyWith(
+        emit(state.copyWith(ifItems: ifItems, selectedFunctions: selectedFunctions));
-            ifItems: ifItems, selectedFunctions: selectedFunctions));
       }
     }
   }
@@ -517,23 +491,18 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     ));
   }
 
-  FutureOr<void> _onEffectiveTimeEvent(
+  FutureOr<void> _onEffectiveTimeEvent(EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
-      EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
     emit(state.copyWith(effectiveTime: event.effectiveTime));
   }
 
-  FutureOr<void> _onSetRoutineName(
+  FutureOr<void> _onSetRoutineName(SetRoutineName event, Emitter<RoutineState> emit) {
-      SetRoutineName event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
       routineName: event.name,
     ));
   }
 
-  (
+  (List<Map<String, dynamic>>, List<Map<String, dynamic>>, Map<String, List<DeviceFunctionData>>)
-    List<Map<String, dynamic>>,
+      _createCardData(
-    List<Map<String, dynamic>>,
-    Map<String, List<DeviceFunctionData>>
-  ) _createCardData(
     List<RoutineAction> actions,
     List<RoutineCondition>? conditions,
     Map<String, List<DeviceFunctionData>> currentFunctions,
@@ -566,8 +535,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
                 'deviceId': condition.entityId,
                 'title': matchingDevice.name ?? condition.entityId,
                 'productType': condition.entityType,
-                'imagePath':
+                'imagePath': matchingDevice.getDefaultIcon(condition.entityType),
-                    matchingDevice.getDefaultIcon(condition.entityType),
               };
 
               final functions = matchingDevice.functions;
@@ -603,11 +571,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       final cardData = {
         'entityId': action.entityId,
         'uniqueCustomId': const Uuid().v4(),
-        'deviceId':
+        'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-            action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+        'title': action.actionExecutor == 'delay' ? 'Delay' : (matchingDevice.name ?? 'Device'),
-        'title': action.actionExecutor == 'delay'
-            ? 'Delay'
-            : (matchingDevice.name ?? 'Device'),
         'productType': action.productType,
         'imagePath': matchingDevice.getDefaultIcon(action.productType),
       };
@@ -650,8 +615,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return (thenItems, ifItems, currentFunctions);
   }
 
-  Future<void> _onGetSceneDetails(
+  Future<void> _onGetSceneDetails(GetSceneDetails event, Emitter<RoutineState> emit) async {
-      GetSceneDetails event, Emitter<RoutineState> emit) async {
     try {
       emit(state.copyWith(
         isLoading: true,
@@ -699,12 +663,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         if (!deviceCards.containsKey(deviceId)) {
           deviceCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId':
+            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'uniqueCustomId': action.type == 'automation' || action.actionExecutor == 'delay'
-            'uniqueCustomId':
+                ? const Uuid().v4()
-                action.type == 'automation' || action.actionExecutor == 'delay'
+                : action.entityId,
-                    ? const Uuid().v4()
-                    : action.entityId,
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
                 : action.type == 'automation'
@@ -739,8 +701,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             ),
           );
           // emit(state.copyWith(automationActionExecutor: action.actionExecutor));
-        } else if (action.executorProperty != null &&
+        } else if (action.executorProperty != null && action.actionExecutor != 'delay') {
-            action.actionExecutor != 'delay') {
           if (!updatedFunctions.containsKey(uniqueCustomId)) {
             updatedFunctions[uniqueCustomId] = [];
           }
@@ -812,8 +773,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onResetRoutineState(
+  FutureOr<void> _onResetRoutineState(ResetRoutineState event, Emitter<RoutineState> emit) {
-      ResetRoutineState event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
         ifItems: [],
         thenItems: [],
@@ -837,20 +797,17 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         createRoutineView: false));
   }
 
-  FutureOr<void> _deleteScene(
+  FutureOr<void> _deleteScene(DeleteScene event, Emitter<RoutineState> emit) async {
-      DeleteScene event, Emitter<RoutineState> emit) async {
     try {
       emit(state.copyWith(isLoading: true));
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var spaceBloc = context.read<SpaceTreeBloc>();
       if (state.isTabToRun) {
         await SceneApi.deleteScene(
-            unitUuid: spaceBloc.state.selectedSpaces[0],
+            unitUuid: spaceBloc.state.selectedSpaces[0], sceneId: state.sceneId ?? '');
-            sceneId: state.sceneId ?? '');
       } else {
         await SceneApi.deleteAutomation(
-            unitUuid: spaceBloc.state.selectedSpaces[0],
+            unitUuid: spaceBloc.state.selectedSpaces[0], automationId: state.automationId ?? '');
-            automationId: state.automationId ?? '');
       }
 
       add(const LoadScenes());
@@ -879,8 +836,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   //   }
   // }
 
-  FutureOr<void> _fetchDevices(
+  FutureOr<void> _fetchDevices(FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
-      FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true));
     try {
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
@@ -890,11 +846,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var spaceBloc = context.read<SpaceTreeBloc>();
       for (var communityId in spaceBloc.state.selectedCommunities) {
-        List<String> spacesList =
+        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
         for (var spaceId in spacesList) {
-          devices.addAll(await DevicesManagementApi()
+          devices
-              .fetchDevices(communityId, spaceId, projectUuid));
+              .addAll(await DevicesManagementApi().fetchDevices(communityId, spaceId, projectUuid));
         }
       }
 
@@ -904,8 +859,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateScene(
+  FutureOr<void> _onUpdateScene(UpdateScene event, Emitter<RoutineState> emit) async {
-      UpdateScene event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -919,8 +873,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage:
+          errorMessage: 'A delay condition cannot be the only or the last action',
-              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -973,8 +926,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result =
+      final result = await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
-          await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
       if (result['success']) {
         add(ResetRoutineState());
         add(const LoadScenes());
@@ -993,8 +945,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateAutomation(
+  FutureOr<void> _onUpdateAutomation(UpdateAutomation event, Emitter<RoutineState> emit) async {
-      UpdateAutomation event, Emitter<RoutineState> emit) async {
     try {
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
@@ -1105,8 +1056,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result = await SceneApi.updateAutomation(
+      final result =
-          createAutomationModel, state.automationId ?? '');
+          await SceneApi.updateAutomation(createAutomationModel, state.automationId ?? '');
 
       if (result['success']) {
         add(ResetRoutineState());
@@ -1139,8 +1090,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         thenItems: [],
       ));
 
-      final automationDetails =
+      final automationDetails = await SceneApi.getAutomationDetails(event.automationId);
-          await SceneApi.getAutomationDetails(event.automationId);
 
       final Map<String, Map<String, dynamic>> deviceIfCards = {};
       final Map<String, Map<String, dynamic>> deviceThenCards = {};
@@ -1208,15 +1158,13 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           ),
         );
 
-        final deviceId = action.actionExecutor == 'delay'
+        final deviceId =
-            ? '${action.entityId}_delay'
+            action.actionExecutor == 'delay' ? '${action.entityId}_delay' : action.entityId;
-            : action.entityId;
 
         if (!deviceThenCards.containsKey(deviceId)) {
           deviceThenCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId':
+            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
             'uniqueCustomId': const Uuid().v4(),
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
@@ -1247,8 +1195,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           updatedFunctions[uniqueCustomId] = [];
         }
 
-        if (action.executorProperty != null &&
+        if (action.executorProperty != null && action.actionExecutor != 'delay') {
-            action.actionExecutor != 'delay') {
           final functions = matchingDevice.functions;
           final functionCode = action.executorProperty!.functionCode;
           for (var function in functions) {
@@ -1290,14 +1237,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
       }
 
-      final ifItems = deviceIfCards.values
+      final ifItems = deviceIfCards.values.where((card) => card['type'] == 'condition').toList();
-          .where((card) => card['type'] == 'condition')
-          .toList();
       final thenItems = deviceThenCards.values
           .where((card) =>
-              card['type'] == 'action' ||
+              card['type'] == 'action' || card['type'] == 'automation' || card['type'] == 'scene')
-              card['type'] == 'automation' ||
-              card['type'] == 'scene')
           .toList();
 
       emit(state.copyWith(

lib/pages/routines/view/routines_view.dart

@@ -7,6 +7,7 @@ import 'package:syncrow_web/pages/routines/widgets/main_routine_view/routine_vie
 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/color_manager.dart';
+import 'package:syncrow_web/utils/snack_bar.dart';
 
 class RoutinesView extends StatefulWidget {
   const RoutinesView({super.key});

lib/pages/space_tree/bloc/space_tree_bloc.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
@@ -5,8 +6,18 @@ import 'package:syncrow_web/pages/space_tree/bloc/space_tree_state.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 
 class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
+  // String selectedCommunityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
+  // String selectedSpaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
+  final TextEditingController textController = TextEditingController();
+
+  // String selectedCommunityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
+  // String selectedSpaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
+
   SpaceTreeBloc() : super(const SpaceTreeState()) {
     on<InitialEvent>(_fetchSpaces);
     on<OnCommunityExpanded>(_onCommunityExpanded);
@@ -14,8 +25,6 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     on<OnCommunitySelected>(_onCommunitySelected);
     on<OnSpaceSelected>(_onSpaceSelected);
     on<SearchQueryEvent>(_onSearch);
-    on<ClearAllData>(_clearAllData);
-    on<ClearCachedData>(_clearCachedData);
   }
 
   _fetchSpaces(InitialEvent event, Emitter<SpaceTreeState> emit) async {
@@ -91,7 +100,6 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       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> selectedSpacesInCommunity = communityAndSpaces[event.communityId] ?? [];
 
       List<String> childrenIds = _getAllChildIds(event.children);
 
@@ -99,16 +107,14 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
         // Select the community and all its children
         updatedSelectedCommunities.add(event.communityId);
         updatedSelectedSpaces.addAll(childrenIds);
-        selectedSpacesInCommunity.addAll(childrenIds);
       } else {
         // Unselect the community and all its children
         updatedSelectedCommunities.remove(event.communityId);
         updatedSelectedSpaces.removeWhere(childrenIds.contains);
         updatedSoldChecks.removeWhere(childrenIds.contains);
-        selectedSpacesInCommunity.removeWhere(childrenIds.contains);
       }
 
-      communityAndSpaces[event.communityId] = selectedSpacesInCommunity;
+      communityAndSpaces[event.communityId] = updatedSelectedSpaces;
 
       emit(state.copyWith(
           selectedCommunities: updatedSelectedCommunities,
@@ -128,8 +134,6 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
       Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);
 
-      List<String> selectedSpacesInCommunity = communityAndSpaces[event.communityModel.uuid] ?? [];
-
       List<String> childrenIds = _getAllChildIds(event.children);
       bool isChildSelected = false;
 
@@ -143,15 +147,12 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
           !updatedSoldChecks.contains(event.spaceId)) {
         // First click: Select the space and all its children
         updatedSelectedSpaces.add(event.spaceId);
-        updatedSelectedCommunities.add(event.communityModel.uuid);
+        updatedSelectedCommunities.add(event.communityId);
-        selectedSpacesInCommunity.add(event.spaceId);
-
         if (childrenIds.isNotEmpty) {
           updatedSelectedSpaces.addAll(childrenIds);
-          selectedSpacesInCommunity.addAll(childrenIds);
         }
 
-        List<String> spaces = _getThePathToChild(event.communityModel.uuid, event.spaceId);
+        List<String> spaces = _getThePathToChild(event.communityId, event.spaceId);
         for (String space in spaces) {
           if (!updatedSelectedSpaces.contains(space) && !updatedSoldChecks.contains(space)) {
             updatedSoldChecks.add(space);
@@ -161,42 +162,28 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
           childrenIds.isNotEmpty &&
           isChildSelected) {
         // Second click: Unselect space but keep children
-        selectedSpacesInCommunity.remove(event.spaceId);
         updatedSelectedSpaces.remove(event.spaceId);
         updatedSoldChecks.add(event.spaceId);
       } else {
         // Third click: Unselect space and all its children
-        selectedSpacesInCommunity.remove(event.spaceId);
         updatedSelectedSpaces.remove(event.spaceId);
         if (childrenIds.isNotEmpty) {
           updatedSelectedSpaces.removeWhere(childrenIds.contains);
           updatedSoldChecks.removeWhere(childrenIds.contains);
-          selectedSpacesInCommunity.removeWhere(childrenIds.contains);
         }
         updatedSoldChecks.remove(event.spaceId);
 
-        List<String> parents =
+        List<String> parents = _getThePathToChild(event.communityId, event.spaceId);
-            _getThePathToChild(event.communityModel.uuid, event.spaceId).toSet().toList();
+        if (!_parentSelected(parents, updatedSelectedSpaces)) {
-
-        if (updatedSelectedSpaces.isEmpty) {
           updatedSoldChecks.removeWhere(parents.contains);
-          updatedSelectedCommunities.remove(event.communityModel.uuid);
+        }
-        } else {
+        if (!_anySpacesSelectedInCommunity(
-          // Check if any parent has selected children
+            event.communityId, updatedSelectedSpaces, updatedSoldChecks)) {
-          for (String space in parents) {
+          updatedSelectedCommunities.remove(event.communityId);
-            if (!_noChildrenSelected(event.communityModel, space, updatedSelectedSpaces, parents)) {
-              updatedSoldChecks.remove(space);
-            }
-          }
-
-          if (!_anySpacesSelectedInCommunity(
-              event.communityModel, updatedSelectedSpaces, updatedSoldChecks)) {
-            updatedSelectedCommunities.remove(event.communityModel.uuid);
-          }
         }
       }
 
-      communityAndSpaces[event.communityModel.uuid] = selectedSpacesInCommunity;
+      communityAndSpaces[event.communityId] = updatedSelectedSpaces;
 
       emit(state.copyWith(
           selectedCommunities: updatedSelectedCommunities.toSet().toList(),
@@ -209,24 +196,12 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     }
   }
 
-  _noChildrenSelected(
+  _parentSelected(List<String> parents, List<String> selectedSpaces) {
-      CommunityModel community, String spaceId, List<String> selectedSpaces, List<String> parents) {
+    for (String space in parents) {
-    if (selectedSpaces.contains(spaceId)) {
+      if (selectedSpaces.contains(space)) {
-      return true;
+        return true;
-    }
-
-    List<SpaceModel> children = _getAllChildSpaces(community.spaces);
-    for (var child in children) {
-      if (spaceId == child.uuid) {
-        List<String> ids = _getAllChildIds(child.children);
-        for (var id in ids) {
-          if (selectedSpaces.contains(id)) {
-            return true;
-          }
-        }
       }
     }
-
     return false;
   }
 
@@ -254,42 +229,6 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     }
   }
 
-  _clearAllData(ClearAllData event, Emitter<SpaceTreeState> emit) async {
-    try {
-      emit(state.copyWith(
-          communitiesList: [],
-          filteredCommunity: [],
-          isSearching: false,
-          soldCheck: [],
-          selectedSpaces: [],
-          selectedCommunities: [],
-          selectedCommunityAndSpaces: {},
-          searchQuery: '',
-          expandedSpaces: [],
-          expandedCommunity: []));
-    } catch (e) {
-      emit(const SpaceTreeErrorState('Something went wrong'));
-    }
-  }
-
-  _clearCachedData(ClearCachedData event, Emitter<SpaceTreeState> emit) async {
-    try {
-      emit(state.copyWith(
-          communitiesList: state.communityList,
-          filteredCommunity: [],
-          isSearching: false,
-          soldCheck: [],
-          selectedSpaces: [],
-          selectedCommunities: [],
-          selectedCommunityAndSpaces: {},
-          searchQuery: '',
-          expandedSpaces: [],
-          expandedCommunity: []));
-    } catch (e) {
-      emit(const SpaceTreeErrorState('Something went wrong'));
-    }
-  }
-
   // Helper function to determine if any space or its children match the search query
   bool _containsQuery(SpaceModel space, String query) {
     final matchesSpace = space.name.toLowerCase().contains(query);
@@ -305,26 +244,21 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       ids.add(child.uuid!);
       ids.addAll(_getAllChildIds(child.children));
     }
-    return ids.toSet().toList();
+    return ids;
-  }
-
-  List<SpaceModel> _getAllChildSpaces(List<SpaceModel> spaces) {
-    List<SpaceModel> children = [];
-    for (var child in spaces) {
-      children.add(child);
-      children.addAll(_getAllChildSpaces(child.children));
-    }
-    return children;
   }
 
   bool _anySpacesSelectedInCommunity(
-      CommunityModel community, List<String> selectedSpaces, List<String> partialCheckedList) {
+      String communityId, List<String> selectedSpaces, List<String> partialCheckedList) {
     bool result = false;
-    List<String> ids = _getAllChildIds(community.spaces);
+    for (var community in state.communityList) {
-    for (var id in ids) {
+      if (community.uuid == communityId) {
-      result = selectedSpaces.contains(id) || partialCheckedList.contains(id);
+        List<String> ids = _getAllChildIds(community.spaces);
-      if (result) {
+        for (var id in ids) {
-        return result;
+          result = selectedSpaces.contains(id) || partialCheckedList.contains(id);
+          if (result) {
+            return result;
+          }
+        }
       }
     }
     return result;
@@ -371,6 +305,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
   @override
   Future<void> close() async {
+    textController.dispose();
     super.close();
   }
 }

lib/pages/space_tree/bloc/space_tree_event.dart

@@ -1,5 +1,4 @@
 import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 
 class SpaceTreeEvent extends Equatable {
@@ -50,14 +49,14 @@ class OnSpaceExpanded extends SpaceTreeEvent {
 }
 
 class OnSpaceSelected extends SpaceTreeEvent {
+  final String communityId;
   final String spaceId;
   final List<SpaceModel> children;
-  final CommunityModel communityModel;
 
-  const OnSpaceSelected(this.communityModel, this.spaceId, this.children);
+  const OnSpaceSelected(this.communityId, this.spaceId, this.children);
 
   @override
-  List<Object> get props => [communityModel, spaceId, children];
+  List<Object> get props => [communityId, spaceId, children];
 }
 
 class SearchQueryEvent extends SpaceTreeEvent {
@@ -68,7 +67,3 @@ class SearchQueryEvent extends SpaceTreeEvent {
   @override
   List<Object> get props => [searchQuery];
 }
-
-class ClearAllData extends SpaceTreeEvent {}
-
-class ClearCachedData extends SpaceTreeEvent {}

lib/pages/space_tree/view/space_tree_view.dart

@@ -100,8 +100,8 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                                       state.expandedSpaces.contains(space.uuid),
                                                   onItemSelected: () {
                                                     context.read<SpaceTreeBloc>().add(
-                                                        OnSpaceSelected(community, space.uuid ?? '',
+                                                        OnSpaceSelected(community.uuid,
-                                                            space.children));
+                                                            space.uuid ?? '', space.children));
                                                     widget.onSelect();
                                                   },
                                                   onExpansionChanged: () {
@@ -114,7 +114,7 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                                           state.soldCheck.contains(space.uuid),
                                                   isSoldCheck: state.soldCheck.contains(space.uuid),
                                                   children: _buildNestedSpaces(
-                                                      context, state, space, community),
+                                                      context, state, space, community.uuid),
                                                 );
                                               }).toList(),
                                             ),
@@ -197,7 +197,7 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   }
 
   List<Widget> _buildNestedSpaces(
-      BuildContext context, SpaceTreeState state, SpaceModel space, CommunityModel community) {
+      BuildContext context, SpaceTreeState state, SpaceModel space, String communityId) {
     return space.children.map((child) {
       return CustomExpansionTileSpaceTree(
         isSelected:
@@ -208,13 +208,13 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
         onItemSelected: () {
           context
               .read<SpaceTreeBloc>()
-              .add(OnSpaceSelected(community, child.uuid ?? '', child.children));
+              .add(OnSpaceSelected(communityId, child.uuid ?? '', child.children));
           widget.onSelect();
         },
         onExpansionChanged: () {
-          context.read<SpaceTreeBloc>().add(OnSpaceExpanded(community.uuid, child.uuid ?? ''));
+          context.read<SpaceTreeBloc>().add(OnSpaceExpanded(communityId, child.uuid ?? ''));
         },
-        children: _buildNestedSpaces(context, state, child, community),
+        children: _buildNestedSpaces(context, state, child, communityId),
       );
     }).toList();
   }

lib/services/user_permission.dart

@@ -34,9 +34,8 @@ class UserPermissionApi {
       path: ApiEndpoints.roleTypes,
       showServerMessage: true,
       expectedResponseModel: (json) {
-        final List<RoleTypeModel> fetchedRoles = (json['data'] as List)
+        final List<RoleTypeModel> fetchedRoles =
-            .map((item) => RoleTypeModel.fromJson(item))
+            (json['data'] as List).map((item) => RoleTypeModel.fromJson(item)).toList();
-            .toList();
         return fetchedRoles;
       },
     );
@@ -48,9 +47,7 @@ class UserPermissionApi {
       path: ApiEndpoints.permission.replaceAll("roleUuid", roleUuid),
       showServerMessage: true,
       expectedResponseModel: (json) {
-        return (json as List)
+        return (json as List).map((data) => PermissionOption.fromJson(data)).toList();
-            .map((data) => PermissionOption.fromJson(data))
-            .toList();
       },
     );
     return response ?? [];
@@ -195,14 +192,10 @@ class UserPermissionApi {
 
   Future<bool> changeUserStatusById(userUuid, status, String projectUuid) async {
     try {
-      Map<String, dynamic> bodya = {
+      Map<String, dynamic> bodya = {"disable": status, "projectUuid": projectUuid};
-        "disable": status,
-        "projectUuid": projectUuid
-      };
 
       final response = await _httpService.put(
-        path: ApiEndpoints.changeUserStatus
+        path: ApiEndpoints.changeUserStatus.replaceAll("{invitedUserUuid}", userUuid),
-            .replaceAll("{invitedUserUuid}", userUuid),
         body: bodya,
         expectedResponseModel: (json) {
           return json['success'];

lib/utils/constants/api_const.dart

@@ -1,7 +1,7 @@
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 
 abstract class ApiEndpoints {
-  static const String projectUuid = "0e62577c-06fa-41b9-8a92-99a21fbaf51c";
+  static const String projectUuid = "bcda711e-9fc2-4168-a05e-171b4026d1ff";
   static String baseUrl = dotenv.env['BASE_URL'] ?? '';
   static const String signUp = '/authentication/user/signup';
   static const String login = '/authentication/user/login';

lib/utils/constants/temp_const.dart

@@ -1,3 +1,3 @@
 class TempConst {
-  static const projectId = '0e62577c-06fa-41b9-8a92-99a21fbaf51c';
+  static const projectId = 'bcda711e-9fc2-4168-a05e-171b4026d1ff';
 }