change community and spaces in user manage

fixed device endpoint

lib/common/dialog_textfield_dropdown.dart

@@ -20,15 +20,22 @@ class DialogTextfieldDropdown extends StatefulWidget {
 
 class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
   bool _isOpen = false;
-  late OverlayEntry _overlayEntry;
+  OverlayEntry? _overlayEntry;
   final TextEditingController _controller = TextEditingController();
-  late List<String> _filteredItems; // Filtered items list
+  final FocusNode _focusNode = FocusNode();
+  List<String> _filteredItems = [];
 
   @override
   void initState() {
     super.initState();
-    _controller.text = widget.initialValue ?? 'Select Tag';
+    _controller.text = widget.initialValue ?? '';
-    _filteredItems = List.from(widget.items); // Initialize filtered items
+    _filteredItems = List.from(widget.items);
+
+    _focusNode.addListener(() {
+      if (!_focusNode.hasFocus) {
+        _closeDropdown();
+      }
+    });
   }
 
   void _toggleDropdown() {
@@ -41,13 +48,16 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
 
   void _openDropdown() {
     _overlayEntry = _createOverlayEntry();
-    Overlay.of(context).insert(_overlayEntry);
+    Overlay.of(context).insert(_overlayEntry!);
     _isOpen = true;
   }
 
   void _closeDropdown() {
-    _overlayEntry.remove();
+    if (_isOpen && _overlayEntry != null) {
-    _isOpen = false;
+      _overlayEntry!.remove();
+      _overlayEntry = null;
+      _isOpen = false;
+    }
   }
 
   OverlayEntry _createOverlayEntry() {
@@ -58,9 +68,7 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
     return OverlayEntry(
       builder: (context) {
         return GestureDetector(
-          onTap: () {
+          onTap: _closeDropdown,
-            _closeDropdown();
-          },
           behavior: HitTestBehavior.translucent,
           child: Stack(
             children: [
@@ -72,40 +80,44 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
                   elevation: 4.0,
                   child: Container(
                     color: ColorsManager.whiteColors,
-                    constraints: const BoxConstraints(
+                    constraints: const BoxConstraints(maxHeight: 200.0),
-                      maxHeight: 200.0,
+                    child: StatefulBuilder(
-                    ),
+                      builder: (context, setStateDropdown) {
-                    child: ListView.builder(
+                        return ListView.builder(
-                      shrinkWrap: true,
+                          shrinkWrap: true,
-                      itemCount: _filteredItems.length,
+                          itemCount: _filteredItems.length,
-                      itemBuilder: (context, index) {
+                          itemBuilder: (context, index) {
-                        final item = _filteredItems[index];
+                            final item = _filteredItems[index];
-                        return Container(
+
-                          decoration: const BoxDecoration(
+                            return Container(
-                            border: Border(
+                              decoration: const BoxDecoration(
-                              bottom: BorderSide(
+                                border: Border(
-                                color: ColorsManager.lightGrayBorderColor,
+                                  bottom: BorderSide(
-                                width: 1.0,
+                                    color: ColorsManager.lightGrayBorderColor,
+                                    width: 1.0,
+                                  ),
+                                ),
                               ),
-                            ),
+                              child: ListTile(
-                          ),
+                                title: Text(item,
-                          child: ListTile(
+                                    style: Theme.of(context)
-                            title: Text(item,
+                                        .textTheme
-                                style: Theme.of(context)
+                                        .bodyMedium
-                                    .textTheme
+                                        ?.copyWith(
-                                    .bodyMedium
+                                            color: ColorsManager
-                                    ?.copyWith(
+                                                .textPrimaryColor)),
-                                        color: ColorsManager.textPrimaryColor)),
+                                onTap: () {
-                            onTap: () {
+                                  _controller.text = item;
-                              _controller.text = item;
+                                  widget.onSelected(item);
-                              widget.onSelected(item);
+                                  setState(() {
-                              setState(() {
+                                    _filteredItems
-                                _filteredItems
+                                        .remove(item); // Remove selected item
-                                    .remove(item); // Remove selected item
+                                  });
-                              });
+                                  _closeDropdown();
-                              _closeDropdown();
+                                },
-                            },
+                              ),
-                          ),
+                            );
+                          },
                         );
                       },
                     ),
@@ -122,7 +134,8 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: _toggleDropdown,
+      onTap: () => FocusScope.of(context).unfocus(),
+      behavior: HitTestBehavior.opaque,
       child: Container(
         padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
         decoration: BoxDecoration(
@@ -135,23 +148,26 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
             Expanded(
               child: TextFormField(
                 controller: _controller,
-                onChanged: (value) {
+                focusNode: _focusNode,
-                  setState(() {
+                onFieldSubmitted: (value) {
-                    _filteredItems = widget.items
-                        .where((item) =>
-                            item.toLowerCase().contains(value.toLowerCase()))
-                        .toList(); // Filter items dynamically
-                  });
                   widget.onSelected(value);
+                  _closeDropdown();
+                },
+                onTapOutside: (event) {
+                  widget.onSelected(_controller.text);
+                  _closeDropdown();
                 },
                 style: Theme.of(context).textTheme.bodyMedium,
                 decoration: const InputDecoration(
-                  hintText: 'Enter or Select tag',
+                  hintText: 'Enter or Select a tag',
                   border: InputBorder.none,
                 ),
               ),
             ),
-            const Icon(Icons.arrow_drop_down),
+            GestureDetector(
+              onTap: _toggleDropdown,
+              child: const Icon(Icons.arrow_drop_down),
+            ),
           ],
         ),
       ),

lib/common/widgets/search_bar.dart

@@ -3,18 +3,33 @@ import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
-class CustomSearchBar extends StatelessWidget {
+class CustomSearchBar extends StatefulWidget {
   final TextEditingController? controller;
   final String hintText;
+  final String? searchQuery;
   final Function(String)? onSearchChanged; // Callback for search input changes
 
   const CustomSearchBar({
     super.key,
     this.controller,
+    this.searchQuery = '',
     this.hintText = 'Search',
     this.onSearchChanged,
   });
 
+  @override
+  State<CustomSearchBar> createState() => _CustomSearchBarState();
+}
+
+class _CustomSearchBarState extends State<CustomSearchBar> {
+  @override
+  void dispose() {
+    if (widget.controller != null) {
+      widget.controller!.dispose();
+    }
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -36,16 +51,17 @@ class CustomSearchBar extends StatelessWidget {
         decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(12),
         ),
-        child: TextField(
+        child: TextFormField(
-          controller: controller,
+          controller: widget.controller,
+          initialValue: widget.searchQuery,
           style: const TextStyle(
             color: Colors.black,
           ),
-          onChanged: onSearchChanged, // Call the callback on text change
+          onChanged: widget.onSearchChanged, // Call the callback on text change
           decoration: InputDecoration(
             filled: true,
             fillColor: ColorsManager.textFieldGreyColor,
-            hintText: hintText,
+            hintText: widget.hintText,
             hintStyle: Theme.of(context).textTheme.bodyLarge!.copyWith(
                   color: ColorsManager.lightGrayColor,
                   fontSize: 12,

lib/common/widgets/spaces_side_tree.dart

@@ -1,25 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-
-class SpacesSideTree extends StatefulWidget {
-  final List<CommunityModel> communities;
-  final String? selectedSpaceUuid;
-  const SpacesSideTree({
-    super.key,
-    required this.communities,
-    this.selectedSpaceUuid,
-  });
-
-  @override
-  State<SpacesSideTree> createState() => _SpacesSideTreeState();
-}
-
-class _SpacesSideTreeState extends State<SpacesSideTree> {
-  String _searchQuery = '';
-  String? _selectedSpaceUuid;
-  String? _selectedId;
-  @override
-  Widget build(BuildContext context) {
-    return const Placeholder();
-  }
-}

lib/main.dart

@@ -2,10 +2,8 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
 import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
@@ -15,25 +13,22 @@ import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.da
 import 'package:syncrow_web/services/locator.dart';
 import 'package:syncrow_web/utils/app_routes.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
+import 'package:syncrow_web/utils/navigation_service.dart';
 import 'package:syncrow_web/utils/theme/theme.dart';
 
 Future<void> main() async {
   try {
-    const environment =
+    const environment = String.fromEnvironment('FLAVOR', defaultValue: 'development');
-        String.fromEnvironment('FLAVOR', defaultValue: 'development');
     await dotenv.load(fileName: '.env.$environment');
     WidgetsFlutterBinding.ensureInitialized();
     initialSetup();
   } catch (_) {}
-  final storage = FlutterSecureStorage();
+  runApp(MyApp());
-  final projectCubit = ProjectCubit(storage);
-  runApp(MyApp(projectCubit: projectCubit));
 }
 
 class MyApp extends StatelessWidget {
-  final ProjectCubit projectCubit;
 
-  MyApp({super.key, required this.projectCubit});
+  MyApp({super.key});
 
   final GoRouter _router = GoRouter(
     initialLocation: RoutesConst.auth,
@@ -54,17 +49,15 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MultiBlocProvider(
         providers: [
-          BlocProvider(create: (context) => projectCubit),
+          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
-          BlocProvider(
-              create: (context) => HomeBloc(projectCubit)..add(const FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
-            create: (context) => VisitorPasswordBloc(projectCubit),
+            create: (context) => VisitorPasswordBloc(),
           ),
           BlocProvider<RoutineBloc>(
-            create: (context) => RoutineBloc(projectCubit),
+            create: (context) => RoutineBloc(),
           ),
           BlocProvider<SpaceTreeBloc>(
-            create: (context) => SpaceTreeBloc(projectCubit)..add(InitialEvent()),
+            create: (context) => SpaceTreeBloc()..add(InitialEvent()),
           ),
         ],
         child: MaterialApp.router(
@@ -77,6 +70,8 @@ class MyApp extends StatelessWidget {
               PointerDeviceKind.unknown,
             },
           ),
+          key: NavigationService.navigatorKey,
+          // scaffoldMessengerKey: NavigationService.snackbarKey,
           theme: myTheme,
           routerConfig: _router,
         ));

lib/pages/access_management/bloc/access_bloc.dart

@@ -3,18 +3,18 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_event.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_state.dart';
 import 'package:syncrow_web/pages/access_management/model/password_model.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/hour_picker_dialog.dart';
 import 'package:syncrow_web/services/access_mang_api.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/app_enum.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';
 import 'package:syncrow_web/utils/snack_bar.dart';
 
 class AccessBloc extends Bloc<AccessEvent, AccessState> {
-  final ProjectCubit projectCubit;
+  AccessBloc() : super((AccessInitial())) {
-
-  AccessBloc(this.projectCubit) : super((AccessInitial())) {
     on<FetchTableData>(_onFetchTableData);
     on<SelectTime>(selectTime);
     on<FilterDataEvent>(_filterData);
@@ -34,10 +34,9 @@ class AccessBloc extends Bloc<AccessEvent, AccessState> {
   Future<void> _onFetchTableData(
       FetchTableData event, Emitter<AccessState> emit) async {
     try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
       emit(AccessLoaded());
-      data = await AccessMangApi()
+      data = await AccessMangApi().fetchVisitorPassword(projectUuid);
-          .fetchVisitorPassword(projectUuid ?? TempConst.projectId);
       filteredData = data;
       updateTabsCount();
       emit(TableLoaded(data));

lib/pages/access_management/view/access_management.dart

@@ -3,7 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_bloc.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_event.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_state.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/common/buttons/search_reset_buttons.dart';
 import 'package:syncrow_web/pages/common/custom_table.dart';
@@ -28,7 +28,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
     final isLargeScreen = isLargeScreenSize(context);
     final isSmallScreen = isSmallScreenSize(context);
     final isHalfMediumScreen = isHafMediumScreenSize(context);
-    final padding = isLargeScreen ? const EdgeInsets.all(30) : const EdgeInsets.all(15);
+    final padding =
+        isLargeScreen ? const EdgeInsets.all(30) : const EdgeInsets.all(15);
 
     return WebScaffold(
         enableMenuSidebar: false,
@@ -40,7 +41,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
         ),
         rightBody: const NavigateHomeGridView(),
         scaffoldBody: BlocProvider(
-            create: (BuildContext context) => AccessBloc(context.read<ProjectCubit>())..add(FetchTableData()),
+            create: (BuildContext context) =>
+                AccessBloc()..add(FetchTableData()),
             child: BlocConsumer<AccessBloc, AccessState>(
                 listener: (context, state) {},
                 builder: (context, state) {
@@ -94,11 +96,14 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
                                   return [
                                     item.passwordName,
                                     item.passwordType.value,
-                                    accessBloc.timestampToDate(item.effectiveTime),
+                                    accessBloc
-                                    accessBloc.timestampToDate(item.invalidTime),
+                                        .timestampToDate(item.effectiveTime),
+                                    accessBloc
+                                        .timestampToDate(item.invalidTime),
                                     item.deviceName.toString(),
                                     item.authorizerEmail.toString(),
-                                    accessBloc.timestampToDate(item.invalidTime),
+                                    accessBloc
+                                        .timestampToDate(item.invalidTime),
                                     item.passwordStatus.value,
                                   ];
                                 }).toList(),
@@ -109,7 +114,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
                 })));
   }
 
-  Wrap _buildVisitorAdminPasswords(BuildContext context, AccessBloc accessBloc) {
+  Wrap _buildVisitorAdminPasswords(
+      BuildContext context, AccessBloc accessBloc) {
     return Wrap(
       spacing: 10,
       runSpacing: 10,
@@ -135,7 +141,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
               borderRadius: 8,
               child: Text(
                 'Create Visitor Password ',
-                style: context.textTheme.titleSmall!.copyWith(color: Colors.white, fontSize: 12),
+                style: context.textTheme.titleSmall!
+                    .copyWith(color: Colors.white, fontSize: 12),
               )),
         ),
         // Container(
@@ -173,8 +180,10 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
             description: '',
             onSubmitted: (value) {
               accessBloc.add(FilterDataEvent(
-                  emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
+                  emailAuthorizer:
-                  selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                      accessBloc.emailAuthorizer.text.toLowerCase(),
+                  selectedTabIndex:
+                      BlocProvider.of<AccessBloc>(context).selectedIndex,
                   passwordName: accessBloc.passwordName.text.toLowerCase(),
                   startTime: accessBloc.effectiveTimeTimeStamp,
                   endTime: accessBloc.expirationTimeTimeStamp));
@@ -192,8 +201,10 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
             description: '',
             onSubmitted: (value) {
               accessBloc.add(FilterDataEvent(
-                  emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
+                  emailAuthorizer:
-                  selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                      accessBloc.emailAuthorizer.text.toLowerCase(),
+                  selectedTabIndex:
+                      BlocProvider.of<AccessBloc>(context).selectedIndex,
                   passwordName: accessBloc.passwordName.text.toLowerCase(),
                   startTime: accessBloc.effectiveTimeTimeStamp,
                   endTime: accessBloc.expirationTimeTimeStamp));
@@ -222,7 +233,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
           onSearch: () {
             accessBloc.add(FilterDataEvent(
                 emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
-                selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                selectedTabIndex:
+                    BlocProvider.of<AccessBloc>(context).selectedIndex,
                 passwordName: accessBloc.passwordName.text.toLowerCase(),
                 startTime: accessBloc.effectiveTimeTimeStamp,
                 endTime: accessBloc.expirationTimeTimeStamp));
@@ -250,8 +262,10 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
               description: '',
               onSubmitted: (value) {
                 accessBloc.add(FilterDataEvent(
-                    emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
+                    emailAuthorizer:
-                    selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                        accessBloc.emailAuthorizer.text.toLowerCase(),
+                    selectedTabIndex:
+                        BlocProvider.of<AccessBloc>(context).selectedIndex,
                     passwordName: accessBloc.passwordName.text.toLowerCase(),
                     startTime: accessBloc.effectiveTimeTimeStamp,
                     endTime: accessBloc.expirationTimeTimeStamp));
@@ -275,7 +289,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
           onSearch: () {
             accessBloc.add(FilterDataEvent(
                 emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
-                selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                selectedTabIndex:
+                    BlocProvider.of<AccessBloc>(context).selectedIndex,
                 passwordName: accessBloc.passwordName.text.toLowerCase(),
                 startTime: accessBloc.effectiveTimeTimeStamp,
                 endTime: accessBloc.expirationTimeTimeStamp));

lib/pages/auth/bloc/auth_bloc.dart

@@ -9,10 +9,13 @@ import 'package:syncrow_web/pages/auth/model/login_with_email_model.dart';
 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_cubit.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> {
@@ -32,8 +35,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
 
   ////////////////////////////// forget password //////////////////////////////////
   final TextEditingController forgetEmailController = TextEditingController();
-  final TextEditingController forgetPasswordController =
+  final TextEditingController forgetPasswordController = TextEditingController();
-      TextEditingController();
   final TextEditingController forgetOtp = TextEditingController();
   final forgetFormKey = GlobalKey<FormState>();
   final forgetEmailKey = GlobalKey<FormState>();
@@ -50,8 +52,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       return;
     }
     _remainingTime = 1;
-    add(UpdateTimerEvent(
+    add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
-        remainingTime: _remainingTime, isButtonEnabled: false));
     try {
       forgetEmailValidate = '';
       _remainingTime = (await AuthenticationAPI.sendOtp(
@@ -88,8 +89,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         _timer?.cancel();
         add(const UpdateTimerEvent(remainingTime: 0, isButtonEnabled: true));
       } else {
-        add(UpdateTimerEvent(
+        add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
-            remainingTime: _remainingTime, isButtonEnabled: false));
       }
     });
   }
@@ -99,8 +99,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     emit(const TimerState(isButtonEnabled: true, remainingTime: 0));
   }
 
-  Future<void> changePassword(
+  Future<void> changePassword(ChangePasswordEvent event, Emitter<AuthState> emit) async {
-      ChangePasswordEvent event, Emitter<AuthState> emit) async {
     emit(LoadingForgetState());
     try {
       var response = await AuthenticationAPI.verifyOtp(
@@ -116,8 +115,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       }
     } on DioException catch (e) {
       final errorData = e.response!.data;
-      String errorMessage =
+      String errorMessage = errorData['error']['message'] ?? 'something went wrong';
-          errorData['error']['message'] ?? 'something went wrong';
       validate = errorMessage;
       emit(AuthInitialState());
     }
@@ -131,9 +129,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   }
 
   void _onUpdateTimer(UpdateTimerEvent event, Emitter<AuthState> emit) {
-    emit(TimerState(
+    emit(TimerState(isButtonEnabled: event.isButtonEnabled, remainingTime: event.remainingTime));
-        isButtonEnabled: event.isButtonEnabled,
-        remainingTime: event.remainingTime));
   }
 
   /////////////////////////////////////  login  /////////////////////////////////////
@@ -183,15 +179,13 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
 
       if (token.accessTokenIsNotEmpty) {
         FlutterSecureStorage storage = const FlutterSecureStorage();
-        await storage.write(
+        await storage.write(key: Token.loginAccessTokenKey, value: token.accessToken);
-            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'));
@@ -342,14 +336,12 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   static Future<String> getTokenAndValidate() async {
     try {
       const storage = FlutterSecureStorage();
-      final firstLaunch = await SharedPreferencesHelper.readBoolFromSP(
+      final firstLaunch =
-              StringsManager.firstLaunch) ??
+          await SharedPreferencesHelper.readBoolFromSP(StringsManager.firstLaunch) ?? true;
-          true;
       if (firstLaunch) {
         storage.deleteAll();
       }
-      await SharedPreferencesHelper.saveBoolToSP(
+      await SharedPreferencesHelper.saveBoolToSP(StringsManager.firstLaunch, false);
-          StringsManager.firstLaunch, false);
       final value = await storage.read(key: Token.loginAccessTokenKey) ?? '';
       if (value.isEmpty) {
         return 'Token not found';
@@ -402,9 +394,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     final String formattedTime = [
       if (days > 0) '${days}d', // Append 'd' for days
       if (days > 0 || hours > 0)
-        hours
+        hours.toString().padLeft(2, '0'), // Show hours if there are days or hours
-            .toString()
-            .padLeft(2, '0'), // Show hours if there are days or hours
       minutes.toString().padLeft(2, '0'),
       seconds.toString().padLeft(2, '0'),
     ].join(':');
@@ -442,13 +432,10 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     emit(LoginInitial());
   }
 
-  static Future<void> logout(
+  static Future<void> logout(BuildContext context) async {
-      BuildContext context, ProjectCubit projectCubit) async {
     final storage = FlutterSecureStorage();
-
+    ProjectManager.clearProjectUUID();
-    await storage.delete(key: ProjectCubit.projectKey);
+    context.read<SpaceTreeBloc>().add(ClearAllData());
-
-    projectCubit.clearProjectUUID();
     storage.deleteAll();
   }
 }

lib/pages/common/bloc/project_cubit.dart

@@ -1,19 +0,0 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-
-class ProjectCubit extends Cubit<String?> {
-  final FlutterSecureStorage storage;
-  static const String projectKey = "selected_project_uuid";
-
-  ProjectCubit(this.storage) : super(null);
-
-  Future<void> setProjectUUID(String newUUID) async {
-    await storage.write(key: projectKey, value: newUUID);
-    emit(newUUID);
-  }
-
-  Future<void> clearProjectUUID() async {
-    await storage.delete(key: projectKey);
-    emit(null);
-  }
-}

lib/pages/common/bloc/project_manager.dart

@@ -0,0 +1,19 @@
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
+
+class ProjectManager {
+  static Future<String?> getProjectUUID() async {
+    final projectUuid = await SharedPreferencesHelper.readStringFromSP(
+        StringsManager.projectKey);
+    return projectUuid.isNotEmpty ? projectUuid : null;
+  }
+
+  static Future<void> setProjectUUID(String newUUID) async {
+    await SharedPreferencesHelper.saveStringToSP(
+        StringsManager.projectKey, newUUID);
+  }
+
+  static Future<void> clearProjectUUID() async {
+    await SharedPreferencesHelper.removeValueFromSP(StringsManager.projectKey);
+  }
+}

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

@@ -1,11 +1,13 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.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';
+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';
 
 part 'device_managment_event.dart';
 part 'device_managment_state.dart';
@@ -22,9 +24,8 @@ class DeviceManagementBloc
   String currentProductName = '';
   String? currentCommunity;
   String? currentUnitName;
-  final ProjectCubit projectCubit;
 
-  DeviceManagementBloc(this.projectCubit) : super(DeviceManagementInitial()) {
+  DeviceManagementBloc() : super(DeviceManagementInitial()) {
     on<FetchDevices>(_onFetchDevices);
     on<FilterDevices>(_onFilterDevices);
     on<SelectedFilterChanged>(_onSelectedFilterChanged);
@@ -42,18 +43,18 @@ class DeviceManagementBloc
       List<AllDevicesModel> devices = [];
       _devices.clear();
       var spaceBloc = event.context.read<SpaceTreeBloc>();
-      final projectUuid = projectCubit.state;
+           final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       if (spaceBloc.state.selectedCommunities.isEmpty) {
         devices = await DevicesManagementApi()
-            .fetchDevices('', '', projectUuid ?? TempConst.projectId);
+            .fetchDevices('', '', projectUuid );
       } 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, projectUuid ?? TempConst.projectId));
+                community, space, projectUuid));
           }
         }
       }

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

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/widgets/device_managment_body.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
@@ -20,7 +20,8 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
     return MultiBlocProvider(
       providers: [
         BlocProvider(
-          create: (context) => DeviceManagementBloc(context.read<ProjectCubit>())..add(FetchDevices(context)),
+          create: (context) =>
+              DeviceManagementBloc()..add(FetchDevices(context)),
         ),
       ],
       child: WebScaffold(
@@ -42,6 +43,7 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                   context
                       .read<RoutineBloc>()
                       .add(const TriggerSwitchTabsEvent(isRoutineTab: false));
+                  context.read<DeviceManagementBloc>().add(FetchDevices(context));
                 },
                 child: Text(
                   'Devices',

lib/pages/home/bloc/home_bloc.dart

@@ -2,17 +2,19 @@ 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:graphview/GraphView.dart';
 import 'package:syncrow_web/pages/auth/model/user_model.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.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';
 
 class HomeBloc extends Bloc<HomeEvent, HomeState> {
   // final Graph graph = Graph()..isTree = true;
@@ -22,9 +24,8 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
   UserModel? user;
   String terms = '';
   String policy = '';
-  final ProjectCubit projectCubit;
 
-  HomeBloc(this.projectCubit) : super((HomeInitial())) {
+  HomeBloc() : super((HomeInitial())) {
     // on<CreateNewNode>(_createNode);
     on<FetchUserInfo>(_fetchUserInfo);
     on<FetchTermEvent>(_fetchTerms);
@@ -50,12 +51,12 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
 
   Future _fetchUserInfo(FetchUserInfo event, Emitter<HomeState> emit) async {
     try {
-      var uuid =
+      var uuid = await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
-          await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       user = await HomeApi().fetchUserInfo(uuid);
 
       if (user != null && user!.project != null) {
-        projectCubit.setProjectUUID(user!.project!.uuid);
+        await ProjectManager.setProjectUUID(user!.project!.uuid);
+        NavigationService.navigatorKey.currentContext!.read<SpaceTreeBloc>().add(InitialEvent());
       }
       add(FetchTermEvent());
       add(FetchPolicyEvent());
@@ -91,12 +92,10 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     }
   }
 
-  Future _confirmUserAgreement(
+  Future _confirmUserAgreement(ConfirmUserAgreementEvent event, Emitter<HomeState> emit) async {
-      ConfirmUserAgreementEvent event, Emitter<HomeState> emit) async {
     try {
       emit(LoadingHome());
-      var uuid =
+      var uuid = await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
-          await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       policy = await HomeApi().confirmUserAgreements(uuid);
       emit(PolicyAgreement());
     } catch (e) {
@@ -120,6 +119,7 @@ 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,6 +129,7 @@ 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,
@@ -138,6 +139,7 @@ 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/home/view/agreement_and_privacy_dialog.dart

@@ -3,7 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -164,8 +164,7 @@ class _AgreementAndPrivacyDialogState extends State<AgreementAndPrivacyDialog> {
               children: [
                 InkWell(
                   onTap: () {
-                    final projectCubit = BlocProvider.of<ProjectCubit>(context);
+                    AuthBloc.logout(context);
-                    AuthBloc.logout(context, projectCubit);
                     context.go(RoutesConst.auth);
                   },
                   child: const Text("Cancel"),

lib/pages/roles_and_permission/model/edit_user_model.dart

@@ -219,6 +219,9 @@ class UserSpaceModel {
   final double x;
   final double y;
   final String icon;
+  final String communityUuid;
+
+  //communityUuid
 
   UserSpaceModel({
     required this.uuid,
@@ -231,22 +234,23 @@ 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
@@ -262,6 +266,7 @@ 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,7 @@
 import 'package:bloc/bloc.dart';
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.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';
 import 'package:syncrow_web/pages/roles_and_permission/model/role_type_model.dart';
@@ -8,17 +9,17 @@ 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/constants/temp_const.dart';
+import 'package:syncrow_web/utils/navigation_service.dart';
 
 class UsersBloc extends Bloc<UsersEvent, UsersState> {
-  final ProjectCubit projectCubit;
+  UsersBloc() : super(UsersInitial()) {
-
-  UsersBloc(this.projectCubit) : super(UsersInitial()) {
     on<CheckStepStatus>(isCompleteBasicsFun);
     on<LoadCommunityAndSpacesEvent>(_onLoadCommunityAndSpaces);
     on<SearchAnode>(searchTreeNode);
@@ -65,8 +66,10 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
   void isCompleteSpacesFun(
       CheckSpacesStepStatus event, Emitter<UsersState> emit) {
     emit(UsersLoadingState());
-    List<String> selectedIds = getSelectedIds(updatedCommunities);
+    var spaceBloc =
-    isCompleteSpaces = selectedIds.isNotEmpty;
+        NavigationService.navigatorKey.currentContext!.read<SpaceTreeBloc>();
+
+    isCompleteSpaces = spaceBloc.state.selectedCommunities.isNotEmpty;
     emit(ChangeStatusSteps());
   }
 
@@ -78,10 +81,10 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
 
   Future<List<SpaceModel>> _fetchSpacesForCommunity(
       String communityUuid) async {
-    final projectUuid = projectCubit.state;
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
     return await CommunitySpaceManagementApi()
-        .getSpaceHierarchy(communityUuid, projectUuid ?? TempConst.projectId);
+        .getSpaceHierarchy(communityUuid, projectUuid);
   }
 
   List<TreeNode> updatedCommunities = [];
@@ -91,9 +94,10 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
       LoadCommunityAndSpacesEvent event, Emitter<UsersState> emit) async {
     try {
       emit(UsersLoadingState());
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-      List<CommunityModel> communities = await CommunitySpaceManagementApi()
+
-          .fetchCommunities(projectUuid ?? TempConst.projectId);
+      List<CommunityModel> communities =
+          await CommunitySpaceManagementApi().fetchCommunities(projectUuid);
       communityIds = communities.map((community) => community.uuid).toList();
       updatedCommunities = await Future.wait(
         communities.map((community) async {
@@ -336,12 +340,14 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
 
   void _sendInvitUser(SendInviteUsers event, Emitter<UsersState> emit) async {
     try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       emit(UsersLoadingState());
-      List<String> selectedIds = getSelectedIds(updatedCommunities)
+      // List<String> selectedIds =
-          .where((id) => !communityIds.contains(id))
+      //     getSelectedIds(updatedCommunities).where((id) => !communityIds.contains(id)).toList();
-          .toList();
+
+      List<String> selectedSpacesId = getSelectedSpacesIds();
+      // List<String> selectedIds = getSelectedIds(updatedCommunities);
 
       bool res = await UserPermissionApi().sendInviteUser(
           email: emailController.text,
@@ -350,8 +356,8 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           lastName: lastNameController.text,
           phoneNumber: phoneController.text,
           roleUuid: roleSelected,
-          spaceUuids: selectedIds,
+          spaceUuids: selectedSpacesId,
-          projectUuid: projectUuid ?? TempConst.projectId);
+          projectUuid: projectUuid);
 
       if (res) {
         showCustomDialog(
@@ -380,13 +386,21 @@ 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)
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-          .where((id) => !communityIds.contains(id))
-          .toList();
-      final projectUuid = projectCubit.state;
 
       bool res = await UserPermissionApi().editInviteUser(
           userId: event.userId,
@@ -395,8 +409,8 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           lastName: lastNameController.text,
           phoneNumber: phoneController.text,
           roleUuid: roleSelected,
-          spaceUuids: selectedIds,
+          spaceUuids: getSelectedSpacesIds(),
-          projectUuid: projectUuid ?? TempConst.projectId);
+          projectUuid: projectUuid);
       if (res == true) {
         showCustomDialog(
           barrierDismissible: false,
@@ -501,11 +515,13 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     emit(UsersLoadingState());
 
     try {
-      final projectUuid = projectCubit.state;
+      var spaceBloc =
+          NavigationService.navigatorKey.currentContext!.read<SpaceTreeBloc>();
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       if (event.uuid?.isNotEmpty ?? false) {
-        final res = await UserPermissionApi()
+        final res =
-            .fetchUserById(event.uuid, projectUuid ?? TempConst.projectId);
+            await UserPermissionApi().fetchUserById(event.uuid, projectUuid);
 
         if (res != null) {
           // Populate the text controllers
@@ -515,13 +531,20 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           phoneController.text = res.phoneNumber ?? '';
           jobTitleController.text = res.jobTitle ?? '';
           res.roleType;
-          if (updatedCommunities.isNotEmpty) {
+          res.spaces.map((space) {
-            // Create a list of UUIDs to mark
+            selectedIds.add(space.uuid);
-            final uuidsToMark = res.spaces.map((space) => space.uuid).toList();
+            CommunityModel community = spaceBloc.state.communityList
-            // Print all IDs and mark nodes in updatedCommunities
+                .firstWhere((item) => item.uuid == space.communityUuid);
-            debugPrint('Printing and marking nodes in updatedCommunities:');
+            spaceBloc.add(OnSpaceSelected(community, space.uuid, []));
-            _printAndMarkNodes(updatedCommunities, uuidsToMark);
+          }).toList();
-          }
+
+          // 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 ==
@@ -614,4 +637,16 @@ 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,7 +1,6 @@
 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_cubit.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,8 +23,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-        create: (BuildContext context) => UsersBloc(context.read<ProjectCubit>())
+        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/build_tree_view.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.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';
@@ -22,7 +22,7 @@ class TreeView extends StatelessWidget {
     final _blocRole = BlocProvider.of<UsersBloc>(context);
     debugPrint('TreeView constructed with userId = $userId');
     return BlocProvider(
-      create: (_) => UsersBloc(context.read<ProjectCubit>()),
+      create: (_) => UsersBloc(),
       // ..add(const LoadCommunityAndSpacesEvent()),
       child: BlocConsumer<UsersBloc, UsersState>(
         listener: (context, state) {

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

@@ -1,7 +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_cubit.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';
@@ -25,14 +25,13 @@ class _EditUserDialogState extends State<EditUserDialog> {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-        create: (BuildContext context) => UsersBloc(context.read<ProjectCubit>())
+        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)
+            BlocProvider.of<UsersBloc>(context).add(GetUserByIdEvent(uuid: widget.userId));
-                .add(GetUserByIdEvent(uuid: widget.userId));
           }
         }, builder: (context, state) {
           final _blocRole = BlocProvider.of<UsersBloc>(context);
@@ -40,8 +39,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
           return Dialog(
               child: Container(
             decoration: const BoxDecoration(
-                color: Colors.white,
+                color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(20))),
-                borderRadius: BorderRadius.all(Radius.circular(20))),
             width: 900,
             child: Column(
               children: [
@@ -70,8 +68,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
                             children: [
                               _buildStep1Indicator(1, "Basics", _blocRole),
                               _buildStep2Indicator(2, "Spaces", _blocRole),
-                              _buildStep3Indicator(
+                              _buildStep3Indicator(3, "Role & Permissions", _blocRole),
-                                  3, "Role & Permissions", _blocRole),
                             ],
                           ),
                         ),
@@ -119,15 +116,13 @@ class _EditUserDialogState extends State<EditUserDialog> {
                             if (currentStep < 3) {
                               currentStep++;
                               if (currentStep == 2) {
-                                _blocRole
+                                _blocRole.add(CheckStepStatus(isEditUser: true));
-                                    .add(CheckStepStatus(isEditUser: true));
                               } else if (currentStep == 3) {
                                 _blocRole.add(const CheckSpacesStepStatus());
                               }
                             } else {
-                              _blocRole.add(EditInviteUsers(
+                              _blocRole
-                                  context: context,
+                                  .add(EditInviteUsers(context: context, userId: widget.userId!));
-                                   userId: widget.userId!));
                             }
                           });
                         },
@@ -136,8 +131,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
                           style: TextStyle(
                               color: (_blocRole.isCompleteSpaces == false ||
                                           _blocRole.isCompleteBasics == false ||
-                                          _blocRole.isCompleteRolePermissions ==
+                                          _blocRole.isCompleteRolePermissions == false) &&
-                                              false) &&
                                       currentStep == 3
                                   ? ColorsManager.grayColor
                                   : ColorsManager.secondaryColor),
@@ -210,12 +204,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                        ? ColorsManager.blackColor
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
                   ),
                 ),
               ],
@@ -273,12 +263,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                        ? ColorsManager.blackColor
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
                   ),
                 ),
               ],
@@ -335,12 +321,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                        ? ColorsManager.blackColor
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
-                        : 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,14 +1,9 @@
 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/roles_and_permission/users_page/add_user_dialog/view/build_tree_view.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/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;
@@ -27,10 +22,8 @@ class SpacesAccessView extends StatelessWidget {
             children: [
               Text(
                 'Spaces access',
-                style: context.textTheme.bodyLarge?.copyWith(
+                style: context.textTheme.bodyLarge
-                    fontWeight: FontWeight.w700,
+                    ?.copyWith(fontWeight: FontWeight.w700, fontSize: 20, color: Colors.black),
-                    fontSize: 20,
-                    color: Colors.black),
               ),
               const SizedBox(
                 height: 35,
@@ -42,77 +35,78 @@ class SpacesAccessView extends StatelessWidget {
               const SizedBox(
                 height: 25,
               ),
-              Expanded(
+              Expanded(child: SpaceTreeView(onSelect: () {}))
-                child: SizedBox(
+              // Expanded(
-                  child: Column(
+              //   child: SizedBox(
-                    children: [
+              //     child: Column(
-                      Expanded(
+              //       children: [
-                        flex: 2,
+              //         Expanded(
-                        child: Container(
+              //           flex: 2,
-                          decoration: const BoxDecoration(
+              //           child: Container(
-                            color: ColorsManager.circleRolesBackground,
+              //             decoration: const BoxDecoration(
-                            borderRadius: BorderRadius.only(
+              //               color: ColorsManager.circleRolesBackground,
-                                topRight: Radius.circular(20),
+              //               borderRadius: BorderRadius.only(
-                                topLeft: Radius.circular(20)),
+              //                   topRight: Radius.circular(20),
-                          ),
+              //                   topLeft: Radius.circular(20)),
-                          child: Padding(
+              //             ),
-                            padding: const EdgeInsets.all(8.0),
+              //             child: Padding(
-                            child: Row(
+              //               padding: const EdgeInsets.all(8.0),
-                              children: [
+              //               child: Row(
-                                Expanded(
+              //                 children: [
-                                  child: Container(
+              //                   Expanded(
-                                    decoration: BoxDecoration(
+              //                     child: Container(
-                                        borderRadius: const BorderRadius.all(
+              //                       decoration: BoxDecoration(
-                                            Radius.circular(20)),
+              //                           borderRadius: const BorderRadius.all(
-                                        border: Border.all(
+              //                               Radius.circular(20)),
-                                            color: ColorsManager.grayBorder)),
+              //                           border: Border.all(
-                                    child: TextFormField(
+              //                               color: ColorsManager.grayBorder)),
-                                      style:
+              //                       child: TextFormField(
-                                          const TextStyle(color: Colors.black),
+              //                         style:
-                                      // controller: _blocRole.firstNameController,
+              //                             const TextStyle(color: Colors.black),
-                                      onChanged: (value) {
+              //                         // controller: _blocRole.firstNameController,
-                                        _blocRole.add(SearchAnode(
+              //                         onChanged: (value) {
-                                            nodes: _blocRole.updatedCommunities,
+              //                           _blocRole.add(SearchAnode(
-                                            searchTerm: value));
+              //                               nodes: _blocRole.updatedCommunities,
-                                      },
+              //                               searchTerm: value));
-                                      decoration: textBoxDecoration(radios: 20)!
+              //                         },
-                                          .copyWith(
+              //                         decoration: textBoxDecoration(radios: 20)!
-                                        fillColor: Colors.white,
+              //                             .copyWith(
-                                        suffixIcon: Padding(
+              //                           fillColor: Colors.white,
-                                          padding:
+              //                           suffixIcon: Padding(
-                                              const EdgeInsets.only(right: 16),
+              //                             padding:
-                                          child: SvgPicture.asset(
+              //                                 const EdgeInsets.only(right: 16),
-                                            Assets.textFieldSearch,
+              //                             child: SvgPicture.asset(
-                                            width: 24,
+              //                               Assets.textFieldSearch,
-                                            height: 24,
+              //                               width: 24,
-                                          ),
+              //                               height: 24,
-                                        ),
+              //                             ),
-                                        hintStyle: context.textTheme.bodyMedium
+              //                           ),
-                                            ?.copyWith(
+              //                           hintStyle: context.textTheme.bodyMedium
-                                                fontWeight: FontWeight.w400,
+              //                               ?.copyWith(
-                                                fontSize: 12,
+              //                                   fontWeight: FontWeight.w400,
-                                                color: ColorsManager.textGray),
+              //                                   fontSize: 12,
-                                      ),
+              //                                   color: ColorsManager.textGray),
-                                    ),
+              //                         ),
-                                  ),
+              //                       ),
-                                ),
+              //                     ),
-                              ],
+              //                   ),
-                            ),
+              //                 ],
-                          ),
+              //               ),
-                        ),
+              //             ),
-                      ),
+              //           ),
-                      Expanded(
+              //         ),
-                          flex: 7,
+              //         Expanded(
-                          child: Container(
+              //             flex: 7,
-                              color: ColorsManager.circleRolesBackground,
+              //             child: Container(
-                              padding: const EdgeInsets.all(8.0),
+              //                 color: ColorsManager.circleRolesBackground,
-                              child: Container(
+              //                 padding: const EdgeInsets.all(8.0),
-                                  color: ColorsManager.whiteColors,
+              //                 child: Container(
-                                  child: TreeView(userId: userId))))
+              //                     color: ColorsManager.whiteColors,
-                    ],
+              //                     child: TreeView(userId: userId))))
-                  ),
+              //       ],
-                ),
+              //     ),
-              ),
+              //   ),
+              // ),
             ],
           ),
         ),

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

@@ -1,17 +1,16 @@
 import 'dart:async';
-import 'package:bloc/bloc.dart';
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/roles_and_permission/model/roles_user_model.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/bloc/user_table_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/bloc/user_table_state.dart';
 import 'package:syncrow_web/services/user_permission.dart';
-import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 
 class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
-  final ProjectCubit _projectCubit;
+  UserTableBloc() : super(TableInitial()) {
-
-  UserTableBloc(this._projectCubit) : super(TableInitial()) {
     on<GetUsers>(_getUsers);
     on<ChangeUserStatus>(_changeUserStatus);
     on<SortUsersByNameAsc>(_toggleSortUsersByNameAsc);
@@ -50,13 +49,12 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   Future<void> _getUsers(GetUsers event, Emitter<UserTableState> emit) async {
     emit(UsersLoadingState());
     try {
-      final projectUuid = _projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       roleTypes.clear();
       jobTitle.clear();
       createdBy.clear();
-      users = await UserPermissionApi()
+      users = await UserPermissionApi().fetchUsers(projectUuid);
-          .fetchUsers(projectUuid ?? TempConst.projectId);
       users.sort((a, b) {
         final dateA = _parseDateTime(a.createdDate);
         final dateB = _parseDateTime(b.createdDate);
@@ -103,13 +101,11 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   Future<void> _changeUserStatus(
       ChangeUserStatus event, Emitter<UserTableState> emit) async {
     try {
-      final projectUuid = _projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       emit(UsersLoadingState());
-      bool res = await UserPermissionApi().changeUserStatusById(
+      bool res = await UserPermissionApi().changeUserStatusById(event.userId,
-          event.userId,
+          event.newStatus == "disabled" ? false : true, projectUuid);
-          event.newStatus == "disabled" ? false : true,
-          projectUuid ?? TempConst.projectId);
       if (res == true) {
         add(const GetUsers());
       }

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

@@ -13,6 +13,8 @@ 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';
@@ -25,8 +27,7 @@ class UsersPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final TextEditingController searchController = TextEditingController();
 
-    Widget actionButton(
+    Widget actionButton({bool isActive = false, required String title, Function()? onTap}) {
-        {bool isActive = false, required String title, Function()? onTap}) {
       return InkWell(
         onTap: onTap,
         child: Padding(
@@ -59,8 +60,7 @@ class UsersPage extends StatelessWidget {
                     : ColorsManager.disabledPink.withOpacity(0.5),
           ),
           child: Padding(
-            padding:
+            padding: const EdgeInsets.only(left: 10, right: 10, bottom: 5, top: 5),
-                const EdgeInsets.only(left: 10, right: 10, bottom: 5, top: 5),
             child: Row(
               crossAxisAlignment: CrossAxisAlignment.center,
               mainAxisAlignment: MainAxisAlignment.center,
@@ -84,15 +84,12 @@ class UsersPage extends StatelessWidget {
     }
 
     Widget changeIconStatus(
-        {required String userId,
+        {required String userId, required String status, required Function()? onTap}) {
-        required String status,
-        required Function()? onTap}) {
       return Center(
         child: InkWell(
           onTap: onTap,
           child: Padding(
-            padding:
+            padding: const EdgeInsets.only(left: 5, right: 5, bottom: 5, top: 5),
-                const EdgeInsets.only(left: 5, right: 5, bottom: 5, top: 5),
             child: SvgPicture.asset(
               status == "invited"
                   ? Assets.invitedIcon
@@ -160,6 +157,7 @@ class UsersPage extends StatelessWidget {
                       const SizedBox(width: 20),
                       InkWell(
                         onTap: () {
+                          context.read<SpaceTreeBloc>().add(ClearCachedData());
                           showDialog(
                             context: context,
                             barrierDismissible: false,
@@ -198,14 +196,10 @@ class UsersPage extends StatelessWidget {
                           context: context,
                           isSelected: _blocRole.currentSortOrder,
                           aToZTap: () {
-                            context
+                            context.read<UserTableBloc>().add(const SortUsersByNameAsc());
-                                .read<UserTableBloc>()
-                                .add(const SortUsersByNameAsc());
                           },
                           zToaTap: () {
-                            context
+                            context.read<UserTableBloc>().add(const SortUsersByNameDesc());
-                                .read<UserTableBloc>()
-                                .add(const SortUsersByNameDesc());
                           },
                         );
                       }
@@ -214,9 +208,8 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.jobTitle)
                             item: _blocRole.selectedJobTitles.contains(item),
                         };
-                        final RenderBox overlay = Overlay.of(context)
+                        final RenderBox overlay =
-                            .context
+                            Overlay.of(context).context.findRenderObject() as RenderBox;
-                            .findRenderObject() as RenderBox;
 
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
@@ -256,9 +249,8 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.roleTypes)
                             item: _blocRole.selectedRoles.contains(item),
                         };
-                        final RenderBox overlay = Overlay.of(context)
+                        final RenderBox overlay =
-                            .context
+                            Overlay.of(context).context.findRenderObject() as RenderBox;
-                            .findRenderObject() as RenderBox;
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 4,
@@ -278,10 +270,9 @@ class UsersPage extends StatelessWidget {
                                 .map((entry) => entry.key)
                                 .toList();
                             Navigator.of(context).pop();
-                            context.read<UserTableBloc>().add(
+                            context.read<UserTableBloc>().add(FilterUsersByRoleEvent(
-                                FilterUsersByRoleEvent(
+                                selectedRoles: selectedItems,
-                                    selectedRoles: selectedItems,
+                                sortOrder: _blocRole.currentSortRole));
-                                    sortOrder: _blocRole.currentSortRole));
                           },
                           onSortAtoZ: (v) {
                             _blocRole.currentSortRole = v;
@@ -296,14 +287,10 @@ class UsersPage extends StatelessWidget {
                           context: context,
                           isSelected: _blocRole.currentSortOrder,
                           aToZTap: () {
-                            context
+                            context.read<UserTableBloc>().add(const DateNewestToOldestEvent());
-                                .read<UserTableBloc>()
-                                .add(const DateNewestToOldestEvent());
                           },
                           zToaTap: () {
-                            context
+                            context.read<UserTableBloc>().add(const DateOldestToNewestEvent());
-                                .read<UserTableBloc>()
-                                .add(const DateOldestToNewestEvent());
                           },
                         );
                       }
@@ -312,9 +299,8 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.createdBy)
                             item: _blocRole.selectedCreatedBy.contains(item),
                         };
-                        final RenderBox overlay = Overlay.of(context)
+                        final RenderBox overlay =
-                            .context
+                            Overlay.of(context).context.findRenderObject() as RenderBox;
-                            .findRenderObject() as RenderBox;
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 1,
@@ -352,9 +338,8 @@ class UsersPage extends StatelessWidget {
                             item: _blocRole.selectedStatuses.contains(item),
                         };
 
-                        final RenderBox overlay = Overlay.of(context)
+                        final RenderBox overlay =
-                            .context
+                            Overlay.of(context).context.findRenderObject() as RenderBox;
-                            .findRenderObject() as RenderBox;
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 0,
@@ -391,14 +376,10 @@ class UsersPage extends StatelessWidget {
                           context: context,
                           isSelected: _blocRole.currentSortOrderDate,
                           aToZTap: () {
-                            context
+                            context.read<UserTableBloc>().add(const DateNewestToOldestEvent());
-                                .read<UserTableBloc>()
-                                .add(const DateNewestToOldestEvent());
                           },
                           zToaTap: () {
-                            context
+                            context.read<UserTableBloc>().add(const DateOldestToNewestEvent());
-                                .read<UserTableBloc>()
-                                .add(const DateOldestToNewestEvent());
                           },
                         );
                       }
@@ -425,23 +406,17 @@ class UsersPage extends StatelessWidget {
                         Text(user.createdTime ?? ''),
                         Text(user.invitedBy),
                         status(
-                          status: user.isEnabled == false
+                          status: user.isEnabled == false ? 'disabled' : user.status,
-                              ? 'disabled'
-                              : user.status,
                         ),
                         changeIconStatus(
-                          status: user.isEnabled == false
+                          status: user.isEnabled == false ? 'disabled' : user.status,
-                              ? 'disabled'
-                              : user.status,
                           userId: user.uuid,
                           onTap: user.status != "invited"
                               ? () {
-                                  context.read<UserTableBloc>().add(
+                                  context.read<UserTableBloc>().add(ChangeUserStatus(
-                                      ChangeUserStatus(
+                                      userId: user.uuid,
-                                          userId: user.uuid,
+                                      newStatus:
-                                          newStatus: user.isEnabled == false
+                                          user.isEnabled == false ? 'disabled' : user.status));
-                                              ? 'disabled'
-                                              : user.status));
                                 }
                               : null,
                         ),
@@ -452,12 +427,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(
+                                          return EditUserDialog(userId: user.uuid);
-                                              userId: user.uuid);
                                         },
                                       ).then((v) {
                                         if (v != null) {
@@ -478,13 +453,10 @@ class UsersPage extends StatelessWidget {
                                   context: context,
                                   barrierDismissible: false,
                                   builder: (BuildContext context) {
-                                    return DeleteUserDialog(
+                                    return DeleteUserDialog(onTapDelete: () async {
-                                        onTapDelete: () async {
                                       try {
-                                        _blocRole.add(DeleteUserEvent(
+                                        _blocRole.add(DeleteUserEvent(user.uuid, context));
-                                            user.uuid, context));
+                                        await Future.delayed(const Duration(seconds: 2));
-                                        await Future.delayed(
-                                            const Duration(seconds: 2));
                                         return true;
                                       } catch (e) {
                                         return false;
@@ -514,20 +486,14 @@ class UsersPage extends StatelessWidget {
                             visiblePagesCount: 4,
                             buttonRadius: 10,
                             selectedButtonColor: ColorsManager.secondaryColor,
-                            buttonUnSelectedBorderColor:
+                            buttonUnSelectedBorderColor: ColorsManager.grayBorder,
-                                ColorsManager.grayBorder,
+                            lastPageIcon: const Icon(Icons.keyboard_double_arrow_right),
-                            lastPageIcon:
+                            firstPageIcon: const Icon(Icons.keyboard_double_arrow_left),
-                                const Icon(Icons.keyboard_double_arrow_right),
+                            totalPages:
-                            firstPageIcon:
+                                (_blocRole.totalUsersCount.length / _blocRole.itemsPerPage).ceil(),
-                                const Icon(Icons.keyboard_double_arrow_left),
-                            totalPages: (_blocRole.totalUsersCount.length /
-                                    _blocRole.itemsPerPage)
-                                .ceil(),
                             currentPage: _blocRole.currentPage,
                             onPageChanged: (int pageNumber) {
-                              context
+                              context.read<UserTableBloc>().add(ChangePage(pageNumber));
-                                  .read<UserTableBloc>()
-                                  .add(ChangePage(pageNumber));
                             },
                           ),
                         ),

lib/pages/roles_and_permission/view/roles_and_permission_page.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
 import 'package:syncrow_web/pages/roles_and_permission/bloc/roles_permission_bloc.dart';
 import 'package:syncrow_web/pages/roles_and_permission/bloc/roles_permission_state.dart';
@@ -77,7 +77,7 @@ class RolesAndPermissionPage extends StatelessWidget {
                     ],
                   ),
                   scaffoldBody: BlocProvider<UserTableBloc>(
-                    create: (context) => UserTableBloc(context.read<ProjectCubit>())..add(const GetUsers()),
+                    create: (context) => UserTableBloc()..add(const GetUsers()),
                     child: UsersPage(),
                   )
                   // _blocRole.tapSelect == false

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

@@ -3,7 +3,8 @@ import 'dart:async';
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.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/routines/models/create_scene_and_autoamtion/create_automation_model.dart';
 import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_scene_model.dart';
@@ -11,23 +12,25 @@ import 'package:syncrow_web/pages/routines/models/delay/delay_fucntions.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/routine_details_model.dart';
 import 'package:syncrow_web/pages/routines/models/routine_model.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 import 'package:syncrow_web/services/routines_api.dart';
 import 'package:syncrow_web/utils/constants/assets.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';
+import 'package:syncrow_web/utils/navigation_service.dart';
 import 'package:syncrow_web/utils/snack_bar.dart';
 import 'package:uuid/uuid.dart';
 
 part 'routine_event.dart';
 part 'routine_state.dart';
 
-String spaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
+// String spaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
-String communityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
+// String communityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
 
 class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
-  final ProjectCubit projectCubit;
+  RoutineBloc() : super(const RoutineState()) {
-
-  RoutineBloc(this.projectCubit) : super(const RoutineState()) {
     on<AddToIfContainer>(_onAddToIfContainer);
     on<AddToThenContainer>(_onAddToThenContainer);
     on<LoadScenes>(_onLoadScenes);
@@ -62,8 +65,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         routineTab: event.isRoutineTab, createRoutineView: false));
     add(ResetRoutineState());
     if (event.isRoutineTab) {
-      add(LoadScenes(spaceId, communityId));
+      add(const LoadScenes());
-      add(LoadAutomation(spaceId));
+      add(const LoadAutomation());
     }
   }
 
@@ -169,18 +172,21 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   Future<void> _onLoadScenes(
       LoadScenes event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
-
+    List<ScenesModel> scenes = [];
     try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
-      spaceId = event.spaceId;
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
-      communityId = event.communityId;
+      var spaceBloc = context.read<SpaceTreeBloc>();
-
+      for (var communityId in spaceBloc.state.selectedCommunities) {
-      List<ScenesModel> scenes = [];
+        List<String> spacesList =
-
+            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-      if (communityId.isNotEmpty && spaceId.isNotEmpty) {
+        for (var spaceId in spacesList) {
-        scenes = await SceneApi.getScenes(event.spaceId, event.communityId, projectUuid ?? TempConst.projectId);
+          scenes.addAll(
+              await SceneApi.getScenes(spaceId, communityId, projectUuid));
+        }
       }
+
       emit(state.copyWith(
         scenes: scenes,
         isLoading: false,
@@ -191,19 +197,24 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           loadScenesErrorMessage: 'Failed to load scenes',
           errorMessage: '',
           loadAutomationErrorMessage: '',
-          scenes: []));
+          scenes: scenes));
     }
   }
 
   Future<void> _onLoadAutomation(
       LoadAutomation event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
+    List<ScenesModel> automations = [];
 
     try {
-      spaceId = event.spaceId;
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
-      List<ScenesModel> automations = [];
+      var spaceBloc = context.read<SpaceTreeBloc>();
-      if (spaceId.isNotEmpty) {
+      for (var communityId in spaceBloc.state.selectedCommunities) {
-        automations = await SceneApi.getAutomation(event.spaceId);
+        List<String> spacesList =
+            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        for (var spaceId in spacesList) {
+          automations.addAll(await SceneApi.getAutomation(spaceId));
+        }
       }
       emit(state.copyWith(
         automations: automations,
@@ -215,7 +226,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           loadAutomationErrorMessage: 'Failed to load automations',
           errorMessage: '',
           loadScenesErrorMessage: '',
-          automations: []));
+          automations: automations));
     }
   }
 
@@ -302,8 +313,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         });
       }).toList();
 
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();
+
       final createSceneModel = CreateSceneModel(
-        spaceUuid: spaceId,
+        spaceUuid: spaceBloc.state.selectedSpaces[0],
         iconId: state.selectedIcon ?? '',
         showInDevice: true,
         sceneName: state.routineName ?? '',
@@ -314,8 +328,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       final result = await SceneApi.createScene(createSceneModel);
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadScenes(spaceId, communityId));
+        add(const LoadScenes());
-        add(LoadAutomation(spaceId));
+        add(const LoadAutomation());
       } else {
         emit(state.copyWith(
           isLoading: false,
@@ -428,9 +442,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           );
         });
       }).toList();
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();
 
       final createAutomationModel = CreateAutomationModel(
-        spaceUuid: spaceId,
+        spaceUuid: spaceBloc.state.selectedSpaces[0],
         automationName: state.routineName ?? '',
         decisionExpr: state.selectedAutomationOperator,
         effectiveTime: EffectiveTime(
@@ -445,8 +461,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       final result = await SceneApi.createAutomation(createAutomationModel);
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadAutomation(spaceId));
+        add(const LoadAutomation());
-        add(LoadScenes(spaceId, communityId));
+        add(const LoadScenes());
       } else {
         emit(state.copyWith(
           isLoading: false,
@@ -821,18 +837,24 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         createRoutineView: false));
   }
 
-  FutureOr<void> _deleteScene(DeleteScene event, Emitter<RoutineState> emit) {
+  FutureOr<void> _deleteScene(
+      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) {
-        SceneApi.deleteScene(unitUuid: spaceId, sceneId: state.sceneId ?? '');
+        await SceneApi.deleteScene(
+            unitUuid: spaceBloc.state.selectedSpaces[0],
+            sceneId: state.sceneId ?? '');
       } else {
-        SceneApi.deleteAutomation(
+        await SceneApi.deleteAutomation(
-            unitUuid: spaceId, automationId: state.automationId ?? '');
+            unitUuid: spaceBloc.state.selectedSpaces[0],
+            automationId: state.automationId ?? '');
       }
 
-      add(LoadScenes(spaceId, communityId));
+      add(const LoadScenes());
-      add(LoadAutomation(spaceId));
+      add(const LoadAutomation());
       add(ResetRoutineState());
       emit(state.copyWith(isLoading: false, createRoutineView: false));
     } catch (e) {
@@ -861,9 +883,20 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true));
     try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-      final devices = await DevicesManagementApi()
+
-          .fetchDevices('', '', projectUuid ?? TempConst.projectId);
+      List<AllDevicesModel> devices = [];
+
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();
+      for (var communityId in spaceBloc.state.selectedCommunities) {
+        List<String> spacesList =
+            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        for (var spaceId in spacesList) {
+          devices.addAll(await DevicesManagementApi()
+              .fetchDevices(communityId, spaceId, projectUuid));
+        }
+      }
 
       emit(state.copyWith(isLoading: false, devices: devices));
     } catch (e) {
@@ -944,8 +977,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadScenes(spaceId, communityId));
+        add(const LoadScenes());
-        add(LoadAutomation(spaceId));
+        add(const LoadAutomation());
       } else {
         emit(state.copyWith(
           isLoading: false,
@@ -1056,8 +1089,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         });
       }).toList();
 
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();
+
       final createAutomationModel = CreateAutomationModel(
-        spaceUuid: spaceId,
+        spaceUuid: spaceBloc.state.selectedSpaces[0],
         automationName: state.routineName ?? '',
         decisionExpr: state.selectedAutomationOperator,
         effectiveTime: EffectiveTime(
@@ -1074,8 +1110,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadAutomation(spaceId));
+        add(LoadAutomation());
-        add(LoadScenes(spaceId, communityId));
+        add(LoadScenes());
       } else {
         emit(state.copyWith(
           isLoading: false,

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

@@ -27,22 +27,24 @@ class AddToThenContainer extends RoutineEvent {
 }
 
 class LoadScenes extends RoutineEvent {
-  final String spaceId;
+  // final String spaceId;
-  final String communityId;
+  // final String communityId;
+  // final BuildContext context;
 
-  const LoadScenes(this.spaceId, this.communityId);
+  const LoadScenes();
 
   @override
-  List<Object> get props => [spaceId, communityId];
+  List<Object> get props => [];
 }
 
 class LoadAutomation extends RoutineEvent {
-  final String spaceId;
+  // final String spaceId;
+  // final BuildContext context;
 
-  const LoadAutomation(this.spaceId);
+  const LoadAutomation();
 
   @override
-  List<Object> get props => [spaceId];
+  List<Object> get props => [];
 }
 
 class AddFunctionToRoutine extends RoutineEvent {

lib/pages/routines/view/routines_view.dart

@@ -7,7 +7,6 @@ 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});
@@ -20,7 +19,7 @@ class _RoutinesViewState extends State<RoutinesView> {
   @override
   void initState() {
     super.initState();
-    context.read<RoutineBloc>().add(FetchDevicesInRoutine());
+    // context.read<RoutineBloc>().add(FetchDevicesInRoutine());
   }
 
   @override
@@ -32,9 +31,12 @@ class _RoutinesViewState extends State<RoutinesView> {
         }
         return Row(
           children: [
-            Expanded(
+            Expanded(child: SpaceTreeView(
-                child: SpaceTreeView(
+              onSelect: () {
-              onSelect: () {},
+                context.read<RoutineBloc>()
+                  ..add(const LoadScenes())
+                  ..add(const LoadAutomation());
+              },
             )),
             Expanded(
               flex: 4,
@@ -59,8 +61,8 @@ class _RoutinesViewState extends State<RoutinesView> {
                       ),
                       RoutineViewCard(
                         onTap: () {
-                          if (context.read<SpaceTreeBloc>().selectedCommunityId.isNotEmpty &&
+                          if (context.read<SpaceTreeBloc>().state.selectedCommunities.length == 1 &&
-                              context.read<SpaceTreeBloc>().selectedSpaceId.isNotEmpty) {
+                              context.read<SpaceTreeBloc>().state.selectedSpaces.length == 1) {
                             context.read<RoutineBloc>().add(
                                   (ResetRoutineState()),
                                 );
@@ -68,7 +70,18 @@ class _RoutinesViewState extends State<RoutinesView> {
                               const CreateNewRoutineViewEvent(createRoutineView: true),
                             );
                           } else {
-                            CustomSnackBar.redSnackBar('Please select a space');
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              SnackBar(
+                                content: Text(
+                                    context.read<SpaceTreeBloc>().state.selectedSpaces.isEmpty
+                                        ? 'Please select a space'
+                                        : 'Please select only one space to proceed'),
+                              ),
+                            );
+                            // CustomSnackBar.redSnackBar(
+                            //     context.read<SpaceTreeBloc>().state.selectedSpaces.isEmpty
+                            //         ? 'Please select a space'
+                            //         : 'Please select only one space to proceed');
                           }
                         },
                         icon: Icons.add,

lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart

@@ -20,10 +20,6 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
   @override
   void initState() {
     super.initState();
-    context.read<RoutineBloc>()
-      ..add(LoadScenes(context.read<SpaceTreeBloc>().selectedSpaceId,
-          context.read<SpaceTreeBloc>().selectedCommunityId))
-      ..add(LoadAutomation(context.read<SpaceTreeBloc>().selectedSpaceId));
   }
 
   @override

lib/pages/routines/widgets/routine_devices.dart

@@ -4,9 +4,20 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
 
-class RoutineDevices extends StatelessWidget {
+class RoutineDevices extends StatefulWidget {
   const RoutineDevices({super.key});
 
+  @override
+  State<RoutineDevices> createState() => _RoutineDevicesState();
+}
+
+class _RoutineDevicesState extends State<RoutineDevices> {
+  @override
+  void initState() {
+    super.initState();
+    context.read<RoutineBloc>().add(FetchDevicesInRoutine());
+  }
+
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<RoutineBloc, RoutineState>(

lib/pages/routines/widgets/scenes_and_automations.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 class ScenesAndAutomations extends StatefulWidget {
@@ -19,9 +18,8 @@ class _ScenesAndAutomationsState extends State<ScenesAndAutomations> {
   void initState() {
     super.initState();
     context.read<RoutineBloc>()
-      ..add(LoadScenes(context.read<SpaceTreeBloc>().selectedSpaceId,
+      ..add(const LoadScenes())
-          context.read<SpaceTreeBloc>().selectedCommunityId))
+      ..add(const LoadAutomation());
-      ..add(LoadAutomation(context.read<SpaceTreeBloc>().selectedSpaceId));
   }
 
   @override

lib/pages/space_tree/bloc/space_tree_bloc.dart

@@ -1,39 +1,35 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 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/temp_const.dart';
 
 class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
-  String selectedCommunityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
+  SpaceTreeBloc() : super(const SpaceTreeState()) {
-  String selectedSpaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
-  final ProjectCubit projectCubit;
-
-  SpaceTreeBloc(this.projectCubit) : super(const SpaceTreeState()) {
     on<InitialEvent>(_fetchSpaces);
     on<OnCommunityExpanded>(_onCommunityExpanded);
     on<OnSpaceExpanded>(_onSpaceExpanded);
     on<OnCommunitySelected>(_onCommunitySelected);
     on<OnSpaceSelected>(_onSpaceSelected);
     on<SearchQueryEvent>(_onSearch);
+    on<ClearAllData>(_clearAllData);
+    on<ClearCachedData>(_clearCachedData);
   }
 
   _fetchSpaces(InitialEvent event, Emitter<SpaceTreeState> emit) async {
     emit(SpaceTreeLoadingState());
     try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
-      List<CommunityModel> communities = await CommunitySpaceManagementApi()
+      List<CommunityModel> communities =
-          .fetchCommunities(projectUuid ?? TempConst.projectId);
+          await CommunitySpaceManagementApi().fetchCommunities(projectUuid);
 
       List<CommunityModel> updatedCommunities = await Future.wait(
         communities.map((community) async {
-          List<SpaceModel> spaces = await CommunitySpaceManagementApi()
+          List<SpaceModel> spaces =
-              .getSpaceHierarchy(
+              await CommunitySpaceManagementApi().getSpaceHierarchy(community.uuid, projectUuid);
-                  community.uuid, projectUuid ?? TempConst.projectId);
 
           return CommunityModel(
             uuid: community.uuid,
@@ -48,19 +44,15 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       );
 
       emit(state.copyWith(
-          communitiesList: updatedCommunities,
+          communitiesList: updatedCommunities, expandedCommunity: [], expandedSpaces: []));
-          expandedCommunity: [],
-          expandedSpaces: []));
     } catch (e) {
       emit(SpaceTreeErrorState('Error loading communities and spaces: $e'));
     }
   }
 
-  _onCommunityExpanded(
+  _onCommunityExpanded(OnCommunityExpanded event, Emitter<SpaceTreeState> emit) async {
-      OnCommunityExpanded event, Emitter<SpaceTreeState> emit) async {
     try {
-      List<String> updatedExpandedCommunityList =
+      List<String> updatedExpandedCommunityList = List.from(state.expandedCommunities);
-          List.from(state.expandedCommunities);
 
       if (updatedExpandedCommunityList.contains(event.communityId)) {
         updatedExpandedCommunityList.remove(event.communityId);
@@ -92,17 +84,14 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     }
   }
 
-  _onCommunitySelected(
+  _onCommunitySelected(OnCommunitySelected event, Emitter<SpaceTreeState> emit) async {
-      OnCommunitySelected event, Emitter<SpaceTreeState> emit) async {
     try {
       List<String> updatedSelectedCommunities =
           List.from(state.selectedCommunities.toSet().toList());
-      List<String> updatedSelectedSpaces =
+      List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
-          List.from(state.selectedSpaces.toSet().toList());
+      List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
-      List<String> updatedSoldChecks =
+      Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);
-          List.from(state.soldCheck.toSet().toList());
+      List<String> selectedSpacesInCommunity = communityAndSpaces[event.communityId] ?? [];
-      Map<String, List<String>> communityAndSpaces =
-          Map.from(state.selectedCommunityAndSpaces);
 
       List<String> childrenIds = _getAllChildIds(event.children);
 
@@ -110,14 +99,16 @@ 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] = updatedSelectedSpaces;
+      communityAndSpaces[event.communityId] = selectedSpacesInCommunity;
 
       emit(state.copyWith(
           selectedCommunities: updatedSelectedCommunities,
@@ -133,12 +124,11 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     try {
       List<String> updatedSelectedCommunities =
           List.from(state.selectedCommunities.toSet().toList());
-      List<String> updatedSelectedSpaces =
+      List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
-          List.from(state.selectedSpaces.toSet().toList());
+      List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
-      List<String> updatedSoldChecks =
+      Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);
-          List.from(state.soldCheck.toSet().toList());
+
-      Map<String, List<String>> communityAndSpaces =
+      List<String> selectedSpacesInCommunity = communityAndSpaces[event.communityModel.uuid] ?? [];
-          Map.from(state.selectedCommunityAndSpaces);
 
       List<String> childrenIds = _getAllChildIds(event.children);
       bool isChildSelected = false;
@@ -153,16 +143,17 @@ 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.communityId);
+        updatedSelectedCommunities.add(event.communityModel.uuid);
+        selectedSpacesInCommunity.add(event.spaceId);
+
         if (childrenIds.isNotEmpty) {
           updatedSelectedSpaces.addAll(childrenIds);
+          selectedSpacesInCommunity.addAll(childrenIds);
         }
 
-        List<String> spaces =
+        List<String> spaces = _getThePathToChild(event.communityModel.uuid, event.spaceId);
-            _getThePathToChild(event.communityId, event.spaceId);
         for (String space in spaces) {
-          if (!updatedSelectedSpaces.contains(space) &&
+          if (!updatedSelectedSpaces.contains(space) && !updatedSoldChecks.contains(space)) {
-              !updatedSoldChecks.contains(space)) {
             updatedSoldChecks.add(space);
           }
         }
@@ -170,32 +161,45 @@ 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 =
-            _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);
-        if (!_anySpacesSelectedInCommunity(
+        } else {
-            event.communityId, updatedSelectedSpaces, updatedSoldChecks)) {
+          // Check if any parent has selected children
-          updatedSelectedCommunities.remove(event.communityId);
+          for (String space in parents) {
+            if (!_noChildrenSelected(event.communityModel, space, updatedSelectedSpaces, parents)) {
+              updatedSoldChecks.remove(space);
+            }
+          }
+
+          if (!_anySpacesSelectedInCommunity(
+              event.communityModel, updatedSelectedSpaces, updatedSoldChecks)) {
+            updatedSelectedCommunities.remove(event.communityModel.uuid);
+          }
         }
       }
 
-      communityAndSpaces[event.communityId] = updatedSelectedSpaces;
+      communityAndSpaces[event.communityModel.uuid] = selectedSpacesInCommunity;
 
       emit(state.copyWith(
-          selectedCommunities: updatedSelectedCommunities,
+          selectedCommunities: updatedSelectedCommunities.toSet().toList(),
           selectedSpaces: updatedSelectedSpaces,
           soldCheck: updatedSoldChecks,
           selectedCommunityAndSpaces: communityAndSpaces));
@@ -205,12 +209,24 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     }
   }
 
-  _parentSelected(List<String> parents, List<String> selectedSpaces) {
+  _noChildrenSelected(
-    for (String space in parents) {
+      CommunityModel community, String spaceId, List<String> selectedSpaces, List<String> parents) {
-      if (selectedSpaces.contains(space)) {
+    if (selectedSpaces.contains(spaceId)) {
-        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;
   }
 
@@ -221,18 +237,54 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
       // Filter communities and expand only those that match the query
       filteredCommunity = communities.where((community) {
-        final containsQueryInCommunity = community.name
+        final containsQueryInCommunity =
-            .toLowerCase()
+            community.name.toLowerCase().contains(event.searchQuery.toLowerCase());
-            .contains(event.searchQuery.toLowerCase());
+        final containsQueryInSpaces =
-        final containsQueryInSpaces = community.spaces.any(
+            community.spaces.any((space) => _containsQuery(space, event.searchQuery.toLowerCase()));
-            (space) => _containsQuery(space, event.searchQuery.toLowerCase()));
 
         return containsQueryInCommunity || containsQueryInSpaces;
       }).toList();
 
       emit(state.copyWith(
           filteredCommunity: filteredCommunity,
-          isSearching: event.searchQuery.isNotEmpty));
+          isSearching: event.searchQuery.isNotEmpty,
+          searchQuery: event.searchQuery));
+    } catch (e) {
+      emit(const SpaceTreeErrorState('Something went wrong'));
+    }
+  }
+
+  _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'));
     }
@@ -241,8 +293,8 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
   // 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);
-    final matchesChildren = space.children.any((child) =>
+    final matchesChildren =
-        _containsQuery(child, query)); // Recursive check for children
+        space.children.any((child) => _containsQuery(child, query)); // Recursive check for children
 
     return matchesSpace || matchesChildren;
   }
@@ -253,22 +305,26 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       ids.add(child.uuid!);
       ids.addAll(_getAllChildIds(child.children));
     }
-    return ids;
+    return ids.toSet().toList();
   }
 
-  bool _anySpacesSelectedInCommunity(String communityId,
+  List<SpaceModel> _getAllChildSpaces(List<SpaceModel> spaces) {
-      List<String> selectedSpaces, List<String> partialCheckedList) {
+    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) {
     bool result = false;
-    for (var community in state.communityList) {
+    List<String> ids = _getAllChildIds(community.spaces);
-      if (community.uuid == communityId) {
+    for (var id in ids) {
-        List<String> ids = _getAllChildIds(community.spaces);
+      result = selectedSpaces.contains(id) || partialCheckedList.contains(id);
-        for (var id in ids) {
+      if (result) {
-          result =
+        return result;
-              selectedSpaces.contains(id) || partialCheckedList.contains(id);
-          if (result) {
-            return result;
-          }
-        }
       }
     }
     return result;
@@ -291,8 +347,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     return ids;
   }
 
-  List<String> _getAllParentsIds(
+  List<String> _getAllParentsIds(SpaceModel child, String spaceId, List<String> listIds) {
-      SpaceModel child, String spaceId, List<String> listIds) {
     List<String> ids = listIds;
 
     ids.add(child.uuid ?? '');
@@ -313,4 +368,9 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     ids.removeLast();
     return [];
   }
+
+  @override
+  Future<void> close() async {
+    super.close();
+  }
 }

lib/pages/space_tree/bloc/space_tree_event.dart

@@ -1,4 +1,5 @@
 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 {
@@ -49,14 +50,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.communityId, this.spaceId, this.children);
+  const OnSpaceSelected(this.communityModel, this.spaceId, this.children);
 
   @override
-  List<Object> get props => [communityId, spaceId, children];
+  List<Object> get props => [communityModel, spaceId, children];
 }
 
 class SearchQueryEvent extends SpaceTreeEvent {
@@ -67,3 +68,7 @@ class SearchQueryEvent extends SpaceTreeEvent {
   @override
   List<Object> get props => [searchQuery];
 }
+
+class ClearAllData extends SpaceTreeEvent {}
+
+class ClearCachedData extends SpaceTreeEvent {}

lib/pages/space_tree/bloc/space_tree_state.dart

@@ -11,6 +11,7 @@ class SpaceTreeState extends Equatable {
   final List<String> selectedSpaces;
   final List<String> soldCheck;
   final bool isSearching;
+  final String searchQuery;
 
   const SpaceTreeState(
       {this.communityList = const [],
@@ -21,7 +22,8 @@ class SpaceTreeState extends Equatable {
       this.selectedSpaces = const [],
       this.soldCheck = const [],
       this.isSearching = false,
-      this.selectedCommunityAndSpaces = const {}});
+      this.selectedCommunityAndSpaces = const {},
+      this.searchQuery = ''});
 
   SpaceTreeState copyWith(
       {List<CommunityModel>? communitiesList,
@@ -32,7 +34,8 @@ class SpaceTreeState extends Equatable {
       List<String>? selectedSpaces,
       List<String>? soldCheck,
       bool? isSearching,
-      Map<String, List<String>>? selectedCommunityAndSpaces}) {
+      Map<String, List<String>>? selectedCommunityAndSpaces,
+      String? searchQuery}) {
     return SpaceTreeState(
         communityList: communitiesList ?? this.communityList,
         filteredCommunity: filteredCommunity ?? this.filteredCommunity,
@@ -42,7 +45,8 @@ class SpaceTreeState extends Equatable {
         selectedSpaces: selectedSpaces ?? this.selectedSpaces,
         soldCheck: soldCheck ?? this.soldCheck,
         isSearching: isSearching ?? this.isSearching,
-        selectedCommunityAndSpaces: selectedCommunityAndSpaces ?? this.selectedCommunityAndSpaces);
+        selectedCommunityAndSpaces: selectedCommunityAndSpaces ?? this.selectedCommunityAndSpaces,
+        searchQuery: searchQuery ?? this.searchQuery);
   }
 
   @override
@@ -55,7 +59,8 @@ class SpaceTreeState extends Equatable {
         selectedSpaces,
         soldCheck,
         isSearching,
-        selectedCommunityAndSpaces
+        selectedCommunityAndSpaces,
+        searchQuery
       ];
 }
 

lib/pages/space_tree/view/space_tree_view.dart

@@ -39,6 +39,7 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
             : Column(
                 children: [
                   CustomSearchBar(
+                    searchQuery: state.searchQuery,
                     onSearchChanged: (query) {
                       context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
                     },
@@ -99,8 +100,8 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                                       state.expandedSpaces.contains(space.uuid),
                                                   onItemSelected: () {
                                                     context.read<SpaceTreeBloc>().add(
-                                                        OnSpaceSelected(community.uuid,
+                                                        OnSpaceSelected(community, space.uuid ?? '',
-                                                            space.uuid ?? '', space.children));
+                                                            space.children));
                                                     widget.onSelect();
                                                   },
                                                   onExpansionChanged: () {
@@ -113,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.uuid),
+                                                      context, state, space, community),
                                                 );
                                               }).toList(),
                                             ),
@@ -196,7 +197,7 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   }
 
   List<Widget> _buildNestedSpaces(
-      BuildContext context, SpaceTreeState state, SpaceModel space, String communityId) {
+      BuildContext context, SpaceTreeState state, SpaceModel space, CommunityModel community) {
     return space.children.map((child) {
       return CustomExpansionTileSpaceTree(
         isSelected:
@@ -207,13 +208,13 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
         onItemSelected: () {
           context
               .read<SpaceTreeBloc>()
-              .add(OnSpaceSelected(communityId, child.uuid ?? '', child.children));
+              .add(OnSpaceSelected(community, child.uuid ?? '', child.children));
           widget.onSelect();
         },
         onExpansionChanged: () {
-          context.read<SpaceTreeBloc>().add(OnSpaceExpanded(communityId, child.uuid ?? ''));
+          context.read<SpaceTreeBloc>().add(OnSpaceExpanded(community.uuid, child.uuid ?? ''));
         },
-        children: _buildNestedSpaces(context, state, child, communityId),
+        children: _buildNestedSpaces(context, state, child, community),
       );
     }).toList();
   }

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

@@ -1,5 +1,8 @@
+import 'dart:developer';
+
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/create_subspace_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
@@ -15,19 +18,19 @@ import 'package:syncrow_web/services/product_api.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
 import 'package:syncrow_web/services/space_model_mang_api.dart';
 import 'package:syncrow_web/utils/constants/action_enum.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 SpaceManagementBloc
     extends Bloc<SpaceManagementEvent, SpaceManagementState> {
   final CommunitySpaceManagementApi _api;
   final ProductApi _productApi;
   final SpaceModelManagementApi _spaceModelApi;
-  final ProjectCubit projectCubit;
 
   List<ProductModel>? _cachedProducts;
 
-  SpaceManagementBloc(
+  SpaceManagementBloc(this._api, this._productApi, this._spaceModelApi)
-      this._api, this._productApi, this._spaceModelApi, this.projectCubit)
       : super(SpaceManagementInitial()) {
     on<LoadCommunityAndSpacesEvent>(_onLoadCommunityAndSpaces);
     on<UpdateSpacePositionEvent>(_onUpdateSpacePosition);
@@ -43,17 +46,23 @@ class SpaceManagementBloc
     on<SpaceModelLoadEvent>(_onLoadSpaceModel);
   }
 
+  void _logEvent(String eventName) {
+    log('Event Triggered: $eventName');
+  }
+
   void _onUpdateCommunity(
     UpdateCommunityEvent event,
     Emitter<SpaceManagementState> emit,
   ) async {
+    _logEvent('UpdateCommunityEvent');
+
     final previousState = state;
     try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       emit(SpaceManagementLoading());
       final success = await _api.updateCommunity(
-          event.communityUuid, event.name, projectUuid ?? TempConst.projectId);
+          event.communityUuid, event.name, projectUuid);
       if (success) {
         if (previousState is SpaceManagementLoaded) {
           final updatedCommunities =
@@ -85,7 +94,7 @@ class SpaceManagementBloc
   Future<List<SpaceTemplateModel>> fetchSpaceModels(
       SpaceManagementState previousState) async {
     try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       List<SpaceTemplateModel> allSpaces = [];
       List<SpaceTemplateModel> prevSpaceModels = [];
@@ -104,7 +113,7 @@ class SpaceManagementBloc
 
         while (hasNext) {
           final spaces = await _spaceModelApi.listSpaceModels(
-              page: page, projectId: projectUuid ?? TempConst.projectId);
+              page: page, projectId: projectUuid);
           if (spaces.isNotEmpty) {
             allSpaces.addAll(spaces);
             page++;
@@ -113,7 +122,7 @@ class SpaceManagementBloc
           }
         }
         prevSpaceModels = await _spaceModelApi.listSpaceModels(
-            page: 1, projectId: projectUuid ?? TempConst.projectId);
+            page: 1, projectId: projectUuid);
       }
 
       return allSpaces;
@@ -142,10 +151,9 @@ class SpaceManagementBloc
 
   Future<List<SpaceModel>> _fetchSpacesForCommunity(
       String communityUuid) async {
-    final projectUuid = projectCubit.state;
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
-    return await _api.getSpaceHierarchy(
+    return await _api.getSpaceHierarchy(communityUuid, projectUuid);
-        communityUuid, projectUuid ?? TempConst.projectId);
   }
 
   Future<void> _onNewCommunity(
@@ -176,7 +184,7 @@ class SpaceManagementBloc
       BlankStateEvent event, Emitter<SpaceManagementState> emit) async {
     try {
       final previousState = state;
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       var prevSpaceModels = await fetchSpaceModels(previousState);
 
@@ -191,8 +199,7 @@ class SpaceManagementBloc
         return;
       }
 
-      final communities =
+      final communities = await _api.fetchCommunities(projectUuid);
-          await _api.fetchCommunities(projectUuid ?? TempConst.projectId);
       final updatedCommunities =
           await Future.wait(communities.map((community) async {
         final spaces = await _fetchSpacesForCommunity(community.uuid);
@@ -222,14 +229,16 @@ class SpaceManagementBloc
     LoadCommunityAndSpacesEvent event,
     Emitter<SpaceManagementState> emit,
   ) async {
+    _logEvent('LoadCommunityAndSpacesEvent');
+
     var prevState = state;
     emit(SpaceManagementLoading());
     try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       _onloadProducts();
       List<CommunityModel> communities =
-          await _api.fetchCommunities(projectUuid ?? TempConst.projectId);
+          await _api.fetchCommunities(projectUuid);
 
       List<CommunityModel> updatedCommunities = await Future.wait(
         communities.map((community) async {
@@ -263,10 +272,10 @@ class SpaceManagementBloc
   ) async {
     try {
       emit(SpaceManagementLoading());
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
-      final success = await _api.deleteCommunity(
+      final success =
-          event.communityUuid, projectUuid ?? TempConst.projectId);
+          await _api.deleteCommunity(event.communityUuid, projectUuid);
       if (success) {
         add(LoadCommunityAndSpacesEvent());
       } else {
@@ -291,9 +300,10 @@ class SpaceManagementBloc
     emit(SpaceManagementLoading());
 
     try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       CommunityModel? newCommunity = await _api.createCommunity(
-          event.name, event.description, projectUuid ?? TempConst.projectId);
+          event.name, event.description, projectUuid);
       var prevSpaceModels = await fetchSpaceModels(previousState);
 
       if (newCommunity != null) {
@@ -436,7 +446,7 @@ class SpaceManagementBloc
   Future<List<SpaceModel>> saveSpacesHierarchically(
       List<SpaceModel> spaces, String communityUuid) async {
     final orderedSpaces = flattenHierarchy(spaces);
-    final projectUuid = projectCubit.state;
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
     final parentsToDelete = orderedSpaces.where((space) =>
         space.status == SpaceStatus.deleted &&
@@ -445,8 +455,7 @@ class SpaceManagementBloc
     for (var parent in parentsToDelete) {
       try {
         if (parent.uuid != null) {
-          await _api.deleteSpace(
+          await _api.deleteSpace(communityUuid, parent.uuid!, projectUuid);
-              communityUuid, parent.uuid!, projectUuid ?? TempConst.projectId);
         }
       } catch (e) {
         rethrow;
@@ -459,8 +468,8 @@ class SpaceManagementBloc
         if (space.uuid != null && space.uuid!.isNotEmpty) {
           List<TagModelUpdate> tagUpdates = [];
 
-          final prevSpace = await _api.getSpace(
+          final prevSpace =
-              communityUuid, space.uuid!, projectUuid ?? TempConst.projectId);
+              await _api.getSpace(communityUuid, space.uuid!, projectUuid);
           final List<UpdateSubspaceTemplateModel> subspaceUpdates = [];
           final List<SubspaceModel>? prevSubspaces = prevSpace?.subspaces;
           final List<SubspaceModel>? newSubspaces = space.subspaces;
@@ -539,7 +548,7 @@ class SpaceManagementBloc
               subspaces: subspaceUpdates,
               tags: tagUpdates,
               direction: space.incomingConnection?.direction,
-              projectId: projectUuid ?? TempConst.projectId);
+              projectId: projectUuid);
         } else {
           // Call create if the space does not have a UUID
           final List<CreateTagBodyModel> tagBodyModels = space.tags != null
@@ -568,7 +577,7 @@ class SpaceManagementBloc
               spaceModelUuid: space.spaceModel?.uuid,
               tags: tagBodyModels,
               subspaces: createSubspaceBodyModels,
-              projectId: projectUuid ?? TempConst.projectId);
+              projectId: projectUuid);
           space.uuid = response?.uuid;
         }
       } catch (e) {
@@ -608,10 +617,10 @@ class SpaceManagementBloc
     emit(SpaceManagementLoading());
     try {
       var prevState = state;
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       List<CommunityModel> communities =
-          await _api.fetchCommunities(projectUuid ?? TempConst.projectId);
+          await _api.fetchCommunities(projectUuid);
 
       List<CommunityModel> updatedCommunities = await Future.wait(
         communities.map((community) async {

lib/pages/spaces_management/all_spaces/view/spaces_management_page.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
@@ -33,7 +32,6 @@ class SpaceManagementPageState extends State<SpaceManagementPage> {
             _api,
             _productApi,
             _spaceModelApi,
-            context.read<ProjectCubit>(),
           )..add(LoadCommunityAndSpacesEvent()),
         ),
         BlocProvider(

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

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/space_tree/view/space_tree_view.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/space_model.dart';
@@ -75,20 +75,14 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
     return Stack(
       clipBehavior: Clip.none,
       children: [
-        Row(
+        widget.shouldNavigateToSpaceModelPage
-          children: [
+            ? Row(
-            SidebarWidget(
+                children: [
-              communities: widget.communities,
+                  SizedBox(width: 300, child: SpaceTreeView(onSelect: () {})),
-              selectedSpaceUuid: widget.selectedSpace?.uuid ??
+                  Expanded(
-                  widget.selectedCommunity?.uuid ??
-                  '',
-            ),
-            widget.shouldNavigateToSpaceModelPage
-                ? Expanded(
                     child: BlocProvider(
                       create: (context) => SpaceModelBloc(
                         api: SpaceModelManagementApi(),
-                        projectCubit: context.read<ProjectCubit>(),
                         initialSpaceModels: _spaceModels,
                       ),
                       child: SpaceModelPage(
@@ -96,8 +90,17 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
                         onSpaceModelsUpdated: _onSpaceModelsUpdated,
                       ),
                     ),
-                  )
+                  ),
-                : CommunityStructureArea(
+                ],
+              )
+            : Row(
+                children: [
+                  SidebarWidget(
+                    communities: widget.communities,
+                    selectedSpaceUuid:
+                        widget.selectedSpace?.uuid ?? widget.selectedCommunity?.uuid ?? '',
+                  ),
+                  CommunityStructureArea(
                     selectedCommunity: widget.selectedCommunity,
                     selectedSpace: widget.selectedSpace,
                     spaces: widget.selectedCommunity?.spaces ?? [],
@@ -105,8 +108,8 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
                     communities: widget.communities,
                     spaceModels: _spaceModels,
                   ),
-          ],
+                ],
-        ),
+              ),
         const GradientCanvasBorderWidget(),
       ],
     );

lib/pages/spaces_management/space_model/bloc/create_space_model_bloc.dart

@@ -1,5 +1,5 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/create_space_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/create_space_model_state.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/create_space_template_body_model.dart';
@@ -9,20 +9,21 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_update_model.dart';
 import 'package:syncrow_web/services/space_model_mang_api.dart';
 import 'package:syncrow_web/utils/constants/action_enum.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 CreateSpaceModelBloc
     extends Bloc<CreateSpaceModelEvent, CreateSpaceModelState> {
   SpaceTemplateModel? _space;
 
   final SpaceModelManagementApi _api;
-  final ProjectCubit _projectCubit;
 
-  CreateSpaceModelBloc(this._api, this._projectCubit)
+  CreateSpaceModelBloc(this._api) : super(CreateSpaceModelInitial()) {
-      : super(CreateSpaceModelInitial()) {
     on<CreateSpaceTemplate>((event, emit) async {
       try {
-        final projectUuid = _projectCubit.state;
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
         late SpaceTemplateModel spaceTemplate = event.spaceTemplate;
 
         final tagBodyModels =
@@ -45,8 +46,8 @@ class CreateSpaceModelBloc
             tags: tagBodyModels,
             subspaceModels: subspaceTemplateBodyModels);
 
-        final newSpaceTemplate = await _api.createSpaceModel(
+        final newSpaceTemplate =
-            spaceModelBody, projectUuid ?? TempConst.projectId);
+            await _api.createSpaceModel(spaceModelBody, projectUuid);
         spaceTemplate.uuid = newSpaceTemplate?.uuid ?? '';
 
         if (newSpaceTemplate != null) {
@@ -207,12 +208,11 @@ class CreateSpaceModelBloc
 
     on<ModifySpaceTemplate>((event, emit) async {
       try {
-        final projectUuid = _projectCubit.state;
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
         if (event.spaceTemplate.uuid != null) {
           final prevSpaceModel = await _api.getSpaceModel(
-              event.spaceTemplate.uuid ?? '',
+              event.spaceTemplate.uuid ?? '', projectUuid);
-              projectUuid ?? TempConst.projectId);
 
           final newSpaceModel = event.updatedSpaceTemplate;
           String? spaceModelName;
@@ -295,8 +295,8 @@ class CreateSpaceModelBloc
               tags: tagUpdates,
               subspaceModels: subspaceUpdates);
 
-          final res = await _api.updateSpaceModel(spaceModelBody,
+          final res = await _api.updateSpaceModel(
-              prevSpaceModel?.uuid ?? '', projectUuid ?? TempConst.projectId);
+              spaceModelBody, prevSpaceModel?.uuid ?? '', projectUuid);
 
           if (res != null) {
             emit(CreateSpaceModelLoaded(newSpaceModel));

lib/pages/spaces_management/space_model/bloc/space_model_bloc.dart

@@ -1,18 +1,18 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/space_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/space_model_state.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/services/space_model_mang_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 SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
   final SpaceModelManagementApi api;
-  final ProjectCubit projectCubit;
 
   SpaceModelBloc({
     required this.api,
-    required this.projectCubit,
     required List<SpaceTemplateModel> initialSpaceModels,
   }) : super(SpaceModelLoaded(spaceModels: initialSpaceModels)) {
     on<CreateSpaceModel>(_onCreateSpaceModel);
@@ -25,9 +25,10 @@ class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
 
     if (currentState is SpaceModelLoaded) {
       try {
-        final projectUuid = projectCubit.state;
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
         final newSpaceModel = await api.getSpaceModel(
-            event.newSpaceModel.uuid ?? '', projectUuid ?? TempConst.projectId);
+            event.newSpaceModel.uuid ?? '', projectUuid);
 
         if (newSpaceModel != null) {
           final updatedSpaceModels =
@@ -46,10 +47,10 @@ class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
     final currentState = state;
     if (currentState is SpaceModelLoaded) {
       try {
-        final projectUuid = projectCubit.state;
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
-        final newSpaceModel = await api.getSpaceModel(
+        final newSpaceModel =
-            event.spaceModelUuid ?? '', projectUuid ?? TempConst.projectId);
+            await api.getSpaceModel(event.spaceModelUuid ?? '', projectUuid);
         if (newSpaceModel != null) {
           final updatedSpaceModels = currentState.spaceModels.map((model) {
             return model.uuid == event.spaceModelUuid ? newSpaceModel : model;

lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
 import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
@@ -53,7 +52,6 @@ class CreateSpaceModelDialog extends StatelessWidget {
           create: (_) {
             final bloc = CreateSpaceModelBloc(
               _spaceModelApi,
-              context.read<ProjectCubit>(),
             );
             if (spaceModel != null) {
               bloc.add(UpdateSpaceTemplate(spaceModel!, otherSpaceModels));

lib/pages/visitor_password/bloc/visitor_password_bloc.dart

@@ -3,7 +3,7 @@ import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:intl/intl.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.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/common/hour_picker_dialog.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_event.dart';
@@ -14,14 +14,15 @@ import 'package:syncrow_web/pages/visitor_password/model/schedule_model.dart';
 import 'package:syncrow_web/services/access_mang_api.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.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';
 import 'package:syncrow_web/utils/snack_bar.dart';
 
 class VisitorPasswordBloc
     extends Bloc<VisitorPasswordEvent, VisitorPasswordState> {
-  final ProjectCubit projectCubit;
 
-  VisitorPasswordBloc(this.projectCubit) : super(VisitorPasswordInitial()) {
+  VisitorPasswordBloc() : super(VisitorPasswordInitial()) {
     on<SelectUsageFrequency>(selectUsageFrequency);
     on<FetchDevice>(_onFetchDevice);
     on<SelectPasswordType>(selectAccessType);
@@ -191,10 +192,9 @@ class VisitorPasswordBloc
       FetchDevice event, Emitter<VisitorPasswordState> emit) async {
     try {
       emit(DeviceLoaded());
-      final projectUuid = projectCubit.state;
+         final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
-      data = await AccessMangApi()
+      data = await AccessMangApi().fetchDevices(projectUuid);
-          .fetchDevices(projectUuid ?? TempConst.projectId);
       emit(TableLoaded(data));
     } catch (e) {
       emit(FailedState(e.toString()));

lib/pages/visitor_password/model/device_model.dart

@@ -23,6 +23,7 @@ class DeviceModel {
   dynamic timeZone;
   dynamic updateTime;
   dynamic uuid;
+  dynamic spaceName;
 
   DeviceModel({
     required this.productUuid,
@@ -45,6 +46,7 @@ class DeviceModel {
     required this.timeZone,
     required this.updateTime,
     required this.uuid,
+    required this.spaceName,
   });
 
   // Deserialize from JSON
@@ -53,7 +55,8 @@ class DeviceModel {
     DeviceType type = devicesTypesMap[json['productType']] ?? DeviceType.Other;
     if (type == DeviceType.LightBulb) {
       tempIcon = Assets.lightBulb;
-    } else if (type == DeviceType.CeilingSensor || type == DeviceType.WallSensor) {
+    } else if (type == DeviceType.CeilingSensor ||
+        type == DeviceType.WallSensor) {
       tempIcon = Assets.sensors;
     } else if (type == DeviceType.AC) {
       tempIcon = Assets.ac;
@@ -102,6 +105,7 @@ class DeviceModel {
       timeZone: json['timeZone'],
       updateTime: json['updateTime'],
       uuid: json['uuid'],
+      spaceName: json['spaceName'],
     );
   }
 
@@ -128,6 +132,7 @@ class DeviceModel {
       'timeZone': timeZone,
       'updateTime': updateTime,
       'uuid': uuid,
+      'spaceName': spaceName
     };
   }
 }

lib/pages/visitor_password/view/add_device_dialog.dart

@@ -2,7 +2,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/access_device_table.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/text_field/custom_web_textfield.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.dart';
@@ -20,7 +20,8 @@ class AddDeviceDialog extends StatelessWidget {
   Widget build(BuildContext context) {
     Size size = MediaQuery.of(context).size;
     return BlocProvider(
-      create: (context) => VisitorPasswordBloc(context.read<ProjectCubit>())..add(FetchDevice()),
+      create: (context) =>
+          VisitorPasswordBloc()..add(FetchDevice()),
       child: BlocBuilder<VisitorPasswordBloc, VisitorPasswordState>(
         builder: (BuildContext context, VisitorPasswordState state) {
           final visitorBloc = BlocProvider.of<VisitorPasswordBloc>(context);
@@ -36,10 +37,10 @@ class AddDeviceDialog extends StatelessWidget {
             backgroundColor: Colors.white,
             title: Text(
               'Add Accessible Device',
-              style: Theme.of(context)
+              style: Theme.of(context).textTheme.headlineLarge!.copyWith(
-                  .textTheme
+                  fontWeight: FontWeight.w400,
-                  .headlineLarge!
+                  fontSize: 24,
-                  .copyWith(fontWeight: FontWeight.w400, fontSize: 24, color: Colors.black),
+                  color: Colors.black),
             ),
             content: SizedBox(
               height: MediaQuery.of(context).size.height / 1.7,
@@ -69,10 +70,13 @@ class AddDeviceDialog extends StatelessWidget {
                             ),
                             Text(
                               'Only online accessible devices can be added',
-                              style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                              style: Theme.of(context)
-                                  fontWeight: FontWeight.w400,
+                                  .textTheme
-                                  fontSize: 12,
+                                  .bodySmall!
-                                  color: ColorsManager.grayColor),
+                                  .copyWith(
+                                      fontWeight: FontWeight.w400,
+                                      fontSize: 12,
+                                      color: ColorsManager.grayColor),
                             ),
                           ],
                         )),
@@ -153,7 +157,8 @@ class AddDeviceDialog extends StatelessWidget {
                                 visitorBloc.deviceNameController.clear();
                                 visitorBloc.deviceIdController.clear();
                                 visitorBloc.unitNameController.clear();
-                                visitorBloc.add(FetchDevice()); // Reset to original list
+                                visitorBloc.add(
+                                    FetchDevice()); // Reset to original list
                               },
                             ),
                           ),
@@ -173,7 +178,8 @@ class AddDeviceDialog extends StatelessWidget {
                                 selectAll: (p0) {
                                   visitorBloc.selectedDeviceIds.clear();
                                   for (var item in state.data) {
-                                    visitorBloc.add(SelectDeviceEvent(item.uuid));
+                                    visitorBloc
+                                        .add(SelectDeviceEvent(item.uuid));
                                   }
                                 },
                                 onRowSelected: (index, isSelected, row) {
@@ -194,7 +200,7 @@ class AddDeviceDialog extends StatelessWidget {
                                     item.name.toString(),
                                     item.uuid.toString(),
                                     item.productType.toString(),
-                                    '',
+                                    item.spaceName.toString(),
                                     item.online.value.toString(),
                                   ];
                                 }).toList(),

lib/pages/visitor_password/view/visitor_password_dialog.dart

@@ -2,7 +2,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/common/date_time_widget.dart';
 import 'package:syncrow_web/pages/common/text_field/custom_web_textfield.dart';
@@ -23,7 +23,7 @@ class VisitorPasswordDialog extends StatelessWidget {
     Size size = MediaQuery.of(context).size;
     var text = Theme.of(context).textTheme.bodySmall!.copyWith(color: Colors.black, fontSize: 13);
     return BlocProvider(
-      create: (context) => VisitorPasswordBloc(context.read<ProjectCubit>()),
+      create: (context) => VisitorPasswordBloc(),
       child: BlocListener<VisitorPasswordBloc, VisitorPasswordState>(
         listener: (context, state) {
           final visitorBloc = BlocProvider.of<VisitorPasswordBloc>(context);

lib/services/user_permission.dart

@@ -14,7 +14,7 @@ class UserPermissionApi {
   Future<List<RolesUserModel>> fetchUsers(String projectId) async {
     try {
       final response = await _httpService.get(
-        path: ApiEndpoints.getUsers.replaceAll('{projectUuid}', projectId),
+        path: ApiEndpoints.getUsers.replaceAll('{projectId}', projectId),
         showServerMessage: true,
         expectedResponseModel: (json) {
           debugPrint('fetchUsers Response: $json');

lib/utils/constants/api_const.dart

@@ -25,7 +25,7 @@ abstract class ApiEndpoints {
 
   ////// Devices Management ////////////////
 
-  static const String getAllDevices = '/projects/{projectId}/device';
+  static const String getAllDevices = '/projects/{projectId}/devices';
   static const String getSpaceDevices =
       '/projects/{projectId}/communities/{communityUuid}/spaces/{spaceUuid}/devices';
   static const String getDeviceStatus = '/device/{uuid}/functions/status';
@@ -95,8 +95,8 @@ abstract class ApiEndpoints {
   static const String inviteUser = '/invite-user';
 
   static const String checkEmail = '/invite-user/check-email';
-  static const String getUsers = '/projects/{projectUuid}/user';
+  static const String getUsers = '/projects/{projectId}/user';
-  static const String getUserById = '/projects/{projectUuid}/user/{userUuid}';
+  static const String getUserById = '/projects/{projectId}/user/{userUuid}';
   static const String editUser = '/invite-user/{inviteUserUuid}';
   static const String deleteUser = '/invite-user/{inviteUserUuid}';
   static const String changeUserStatus = '/invite-user/{invitedUserUuid}/disable';

lib/utils/constants/strings_manager.dart

@@ -40,4 +40,5 @@ class StringsManager {
   static const String firstLaunch = "firstLaunch";
   static const String deleteScene = 'Delete Scene';
   static const String deleteAutomation = 'Delete Automation';
+  static const String projectKey = 'selected_project_uuid';
 }

lib/utils/user_drop_down_menu.dart

@@ -4,7 +4,7 @@ import 'package:flutter_svg/svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
 import 'package:syncrow_web/pages/auth/model/user_model.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
@@ -220,10 +220,7 @@ class _UserDropdownMenuState extends State<UserDropdownMenu> {
                       ),
                       GestureDetector(
                         onTap: () {
-                          final projectCubit =
+                          AuthBloc.logout(context);
-                              BlocProvider.of<ProjectCubit>(context);
-
-                          AuthBloc.logout(context, projectCubit);
                           context.go(RoutesConst.auth);
                         },
                         child: SizedBox(