fixed device endpoint

fixed text theme of tag list

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

@@ -13,6 +13,7 @@ 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 {
@@ -26,9 +27,8 @@ Future<void> main() async {
 }
 
 class MyApp extends StatelessWidget {
-  MyApp({
+
-    super.key,
+  MyApp({super.key});
-  });
 
   final GoRouter _router = GoRouter(
     initialLocation: RoutesConst.auth,
@@ -70,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,10 +3,14 @@ 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_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> {
@@ -30,8 +34,9 @@ class AccessBloc extends Bloc<AccessEvent, AccessState> {
   Future<void> _onFetchTableData(
       FetchTableData event, Emitter<AccessState> emit) async {
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
       emit(AccessLoaded());
-      data = await AccessMangApi().fetchVisitorPassword();
+      data = await AccessMangApi().fetchVisitorPassword(projectUuid);
       filteredData = data;
       updateTabsCount();
       emit(TableLoaded(data));

lib/pages/access_management/view/access_management.dart

@@ -3,6 +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_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';
@@ -27,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,
@@ -39,7 +41,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
         ),
         rightBody: const NavigateHomeGridView(),
         scaffoldBody: BlocProvider(
-            create: (BuildContext context) => AccessBloc()..add(FetchTableData()),
+            create: (BuildContext context) =>
+                AccessBloc()..add(FetchTableData()),
             child: BlocConsumer<AccessBloc, AccessState>(
                 listener: (context, state) {},
                 builder: (context, state) {
@@ -93,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(),
@@ -108,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,
@@ -134,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(
@@ -172,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));
@@ -191,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));
@@ -221,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));
@@ -249,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));
@@ -274,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,6 +9,7 @@ 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_manager.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';
@@ -31,7 +32,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
 
   ////////////////////////////// forget password //////////////////////////////////
   final TextEditingController forgetEmailController = TextEditingController();
-  final TextEditingController forgetPasswordController = TextEditingController();
+  final TextEditingController forgetPasswordController =
+      TextEditingController();
   final TextEditingController forgetOtp = TextEditingController();
   final forgetFormKey = GlobalKey<FormState>();
   final forgetEmailKey = GlobalKey<FormState>();
@@ -48,7 +50,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       return;
     }
     _remainingTime = 1;
-    add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
+    add(UpdateTimerEvent(
+        remainingTime: _remainingTime, isButtonEnabled: false));
     try {
       forgetEmailValidate = '';
       _remainingTime = (await AuthenticationAPI.sendOtp(
@@ -85,7 +88,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         _timer?.cancel();
         add(const UpdateTimerEvent(remainingTime: 0, isButtonEnabled: true));
       } else {
-        add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
+        add(UpdateTimerEvent(
+            remainingTime: _remainingTime, isButtonEnabled: false));
       }
     });
   }
@@ -95,7 +99,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     emit(const TimerState(isButtonEnabled: true, remainingTime: 0));
   }
 
-  Future<void> changePassword(ChangePasswordEvent event, Emitter<AuthState> emit) async {
+  Future<void> changePassword(
+      ChangePasswordEvent event, Emitter<AuthState> emit) async {
     emit(LoadingForgetState());
     try {
       var response = await AuthenticationAPI.verifyOtp(
@@ -111,7 +116,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       }
     } on DioException catch (e) {
       final errorData = e.response!.data;
-      String errorMessage = errorData['error']['message'] ?? 'something went wrong';
+      String errorMessage =
+          errorData['error']['message'] ?? 'something went wrong';
       validate = errorMessage;
       emit(AuthInitialState());
     }
@@ -125,7 +131,9 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   }
 
   void _onUpdateTimer(UpdateTimerEvent event, Emitter<AuthState> emit) {
-    emit(TimerState(isButtonEnabled: event.isButtonEnabled, remainingTime: event.remainingTime));
+    emit(TimerState(
+        isButtonEnabled: event.isButtonEnabled,
+        remainingTime: event.remainingTime));
   }
 
   /////////////////////////////////////  login  /////////////////////////////////////
@@ -161,15 +169,22 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
             password: event.password,
           ),
         );
-      } catch (failure) {
+      } on DioException catch (e) {
-        validate = 'Invalid Credentials!';
+        final errorData = e.response!.data;
+        String errorMessage = errorData['error']['message'];
+        if (errorMessage == "Access denied for web platform") {
+          validate = errorMessage;
+        } else {
+          validate = 'Invalid Credentials!';
+        }
         emit(LoginInitial());
         return;
       }
 
       if (token.accessTokenIsNotEmpty) {
         FlutterSecureStorage storage = const FlutterSecureStorage();
-        await storage.write(key: Token.loginAccessTokenKey, value: token.accessToken);
+        await storage.write(
+            key: Token.loginAccessTokenKey, value: token.accessToken);
         const FlutterSecureStorage().write(
             key: UserModel.userUuidKey,
             value: Token.decodeToken(token.accessToken)['uuid'].toString());
@@ -327,12 +342,14 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   static Future<String> getTokenAndValidate() async {
     try {
       const storage = FlutterSecureStorage();
-      final firstLaunch =
+      final firstLaunch = await SharedPreferencesHelper.readBoolFromSP(
-          await SharedPreferencesHelper.readBoolFromSP(StringsManager.firstLaunch) ?? true;
+              StringsManager.firstLaunch) ??
+          true;
       if (firstLaunch) {
         storage.deleteAll();
       }
-      await SharedPreferencesHelper.saveBoolToSP(StringsManager.firstLaunch, false);
+      await SharedPreferencesHelper.saveBoolToSP(
+          StringsManager.firstLaunch, false);
       final value = await storage.read(key: Token.loginAccessTokenKey) ?? '';
       if (value.isEmpty) {
         return 'Token not found';
@@ -385,7 +402,9 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     final String formattedTime = [
       if (days > 0) '${days}d', // Append 'd' for days
       if (days > 0 || hours > 0)
-        hours.toString().padLeft(2, '0'), // Show hours if there are days or hours
+        hours
+            .toString()
+            .padLeft(2, '0'), // Show hours if there are days or hours
       minutes.toString().padLeft(2, '0'),
       seconds.toString().padLeft(2, '0'),
     ].join(':');
@@ -423,8 +442,9 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     emit(LoginInitial());
   }
 
-  static logout() {
+  static Future<void> logout(BuildContext context) async {
-    const storage = FlutterSecureStorage();
+    final storage = FlutterSecureStorage();
+    ProjectManager.clearProjectUUID();
     storage.deleteAll();
   }
 }

lib/pages/auth/model/login_with_email_model.dart

@@ -21,7 +21,9 @@ class LoginWithEmailModel {
     return {
       'email': email,
       'password': password,
+      "platform": "web"
       // 'regionUuid': regionUuid,
     };
   }
 }
+//tst@tst.com

lib/pages/auth/model/project_model.dart

@@ -0,0 +1,27 @@
+class Project {
+  final String uuid;
+  final String name;
+  final String description;
+
+  const Project({
+    required this.uuid,
+    required this.name,
+    required this.description,
+  });
+
+  factory Project.fromJson(Map<String, dynamic> json) {
+    return Project(
+      uuid: json['uuid'] as String,
+      name: json['name'] as String,
+      description: json['description'] as String,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'uuid': uuid,
+      'name': name,
+      'description': description,
+    };
+  }
+}

lib/pages/auth/model/user_model.dart

@@ -1,3 +1,4 @@
+import 'package:syncrow_web/pages/auth/model/project_model.dart';
 import 'package:syncrow_web/pages/auth/model/token.dart';
 
 class UserModel {
@@ -13,6 +14,7 @@ class UserModel {
   final bool? hasAcceptedWebAgreement;
   final DateTime? webAgreementAcceptedAt;
   final UserRole? role;
+  final Project? project;
 
   UserModel({
     required this.uuid,
@@ -26,6 +28,7 @@ class UserModel {
     required this.hasAcceptedWebAgreement,
     required this.webAgreementAcceptedAt,
     required this.role,
+    required this.project,
   });
 
   factory UserModel.fromJson(Map<String, dynamic> json) {
@@ -43,6 +46,8 @@ class UserModel {
           ? DateTime.parse(json['webAgreementAcceptedAt'])
           : null,
       role: json['role'] != null ? UserRole.fromJson(json['role']) : null,
+      project:
+          json['project'] != null ? Project.fromJson(json['project']) : null,
     );
   }
 
@@ -64,6 +69,7 @@ class UserModel {
       phoneNumber: null,
       isEmailVerified: null,
       isAgreementAccepted: null,
+      project: 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,14 +1,19 @@
 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_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';
 
-class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementState> {
+class DeviceManagementBloc
+    extends Bloc<DeviceManagementEvent, DeviceManagementState> {
   int _selectedIndex = 0;
   List<AllDevicesModel> _devices = [];
   int _onlineCount = 0;
@@ -31,19 +36,25 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     on<UpdateSelection>(_onUpdateSelection);
   }
 
-  Future<void> _onFetchDevices(FetchDevices event, Emitter<DeviceManagementState> emit) async {
+  Future<void> _onFetchDevices(
+      FetchDevices event, Emitter<DeviceManagementState> emit) async {
     emit(DeviceManagementLoading());
     try {
       List<AllDevicesModel> devices = [];
       _devices.clear();
       var spaceBloc = event.context.read<SpaceTreeBloc>();
+           final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       if (spaceBloc.state.selectedCommunities.isEmpty) {
-        devices = await DevicesManagementApi().fetchDevices('', '');
+        devices = await DevicesManagementApi()
+            .fetchDevices('', '', projectUuid );
       } else {
         for (var community in spaceBloc.state.selectedCommunities) {
-          List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[community] ?? [];
+          List<String> spacesList =
+              spaceBloc.state.selectedCommunityAndSpaces[community] ?? [];
           for (var space in spacesList) {
-            devices.addAll(await DevicesManagementApi().fetchDevices(community, space));
+            devices.addAll(await DevicesManagementApi().fetchDevices(
+                community, space, projectUuid));
           }
         }
       }
@@ -66,7 +77,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     }
   }
 
-  void _onFilterDevices(FilterDevices event, Emitter<DeviceManagementState> emit) async {
+  void _onFilterDevices(
+      FilterDevices event, Emitter<DeviceManagementState> emit) async {
     if (_devices.isNotEmpty) {
       _filteredDevices = List.from(_devices.where((device) {
         switch (event.filter) {
@@ -97,7 +109,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     }
   }
 
-  Future<void> _onResetFilters(ResetFilters event, Emitter<DeviceManagementState> emit) async {
+  Future<void> _onResetFilters(
+      ResetFilters event, Emitter<DeviceManagementState> emit) async {
     currentProductName = '';
     _selectedDevices.clear();
     _filteredDevices = List.from(_devices);
@@ -113,7 +126,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     ));
   }
 
-  void _onResetSelectedDevices(ResetSelectedDevices event, Emitter<DeviceManagementState> emit) {
+  void _onResetSelectedDevices(
+      ResetSelectedDevices event, Emitter<DeviceManagementState> emit) {
     _selectedDevices.clear();
 
     if (state is DeviceManagementLoaded) {
@@ -139,12 +153,14 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     }
   }
 
-  void _onSelectedFilterChanged(SelectedFilterChanged event, Emitter<DeviceManagementState> emit) {
+  void _onSelectedFilterChanged(
+      SelectedFilterChanged event, Emitter<DeviceManagementState> emit) {
     _selectedIndex = event.selectedIndex;
     add(FilterDevices(_getFilterFromIndex(_selectedIndex)));
   }
 
-  void _onSelectDevice(SelectDevice event, Emitter<DeviceManagementState> emit) {
+  void _onSelectDevice(
+      SelectDevice event, Emitter<DeviceManagementState> emit) {
     final selectedUuid = event.selectedDevice.uuid;
 
     if (_selectedDevices.any((device) => device.uuid == selectedUuid)) {
@@ -155,7 +171,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
 
     List<AllDevicesModel> clonedSelectedDevices = List.from(_selectedDevices);
 
-    bool isControlButtonEnabled = _checkIfControlButtonEnabled(clonedSelectedDevices);
+    bool isControlButtonEnabled =
+        _checkIfControlButtonEnabled(clonedSelectedDevices);
 
     if (state is DeviceManagementLoaded) {
       emit(DeviceManagementLoaded(
@@ -164,7 +181,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
         onlineCount: _onlineCount,
         offlineCount: _offlineCount,
         lowBatteryCount: _lowBatteryCount,
-        selectedDevice: clonedSelectedDevices.isNotEmpty ? clonedSelectedDevices : null,
+        selectedDevice:
+            clonedSelectedDevices.isNotEmpty ? clonedSelectedDevices : null,
         isControlButtonEnabled: isControlButtonEnabled,
       ));
     } else if (state is DeviceManagementFiltered) {
@@ -174,13 +192,15 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
         onlineCount: _onlineCount,
         offlineCount: _offlineCount,
         lowBatteryCount: _lowBatteryCount,
-        selectedDevice: clonedSelectedDevices.isNotEmpty ? clonedSelectedDevices : null,
+        selectedDevice:
+            clonedSelectedDevices.isNotEmpty ? clonedSelectedDevices : null,
         isControlButtonEnabled: isControlButtonEnabled,
       ));
     }
   }
 
-  void _onUpdateSelection(UpdateSelection event, Emitter<DeviceManagementState> emit) {
+  void _onUpdateSelection(
+      UpdateSelection event, Emitter<DeviceManagementState> emit) {
     List<AllDevicesModel> selectedDevices = [];
     List<AllDevicesModel> devicesToSelectFrom = [];
 
@@ -223,7 +243,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
 
   bool _checkIfControlButtonEnabled(List<AllDevicesModel> selectedDevices) {
     if (selectedDevices.length > 1) {
-      final productTypes = selectedDevices.map((device) => device.productType).toSet();
+      final productTypes =
+          selectedDevices.map((device) => device.productType).toSet();
       return productTypes.length == 1;
     } else if (selectedDevices.length == 1) {
       return true;
@@ -234,8 +255,10 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
   void _calculateDeviceCounts() {
     _onlineCount = _devices.where((device) => device.online == true).length;
     _offlineCount = _devices.where((device) => device.online == false).length;
-    _lowBatteryCount =
+    _lowBatteryCount = _devices
-        _devices.where((device) => device.batteryLevel != null && device.batteryLevel! < 20).length;
+        .where((device) =>
+            device.batteryLevel != null && device.batteryLevel! < 20)
+        .length;
   }
 
   String _getFilterFromIndex(int index) {
@@ -251,7 +274,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     }
   }
 
-  void _onSearchDevices(SearchDevices event, Emitter<DeviceManagementState> emit) {
+  void _onSearchDevices(
+      SearchDevices event, Emitter<DeviceManagementState> emit) {
     if ((event.community == null || event.community!.isEmpty) &&
         (event.unitName == null || event.unitName!.isEmpty) &&
         (event.productName == null || event.productName!.isEmpty)) {
@@ -280,22 +304,33 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
       final filteredDevices = devicesToSearch.where((device) {
         final matchesCommunity = event.community == null ||
             event.community!.isEmpty ||
-            (device.community?.name?.toLowerCase().contains(event.community!.toLowerCase()) ??
+            (device.community?.name
+                    ?.toLowerCase()
+                    .contains(event.community!.toLowerCase()) ??
                 false);
         final matchesUnit = event.unitName == null ||
             event.unitName!.isEmpty ||
             (device.spaces != null &&
                 device.spaces!.isNotEmpty &&
-                device.spaces![0].spaceName!.toLowerCase().contains(event.unitName!.toLowerCase()));
+                device.spaces![0].spaceName!
+                    .toLowerCase()
+                    .contains(event.unitName!.toLowerCase()));
         final matchesProductName = event.productName == null ||
             event.productName!.isEmpty ||
-            (device.name?.toLowerCase().contains(event.productName!.toLowerCase()) ?? false);
+            (device.name
+                    ?.toLowerCase()
+                    .contains(event.productName!.toLowerCase()) ??
+                false);
         final matchesDeviceName = event.productName == null ||
             event.productName!.isEmpty ||
-            (device.categoryName?.toLowerCase().contains(event.productName!.toLowerCase()) ??
+            (device.categoryName
+                    ?.toLowerCase()
+                    .contains(event.productName!.toLowerCase()) ??
                 false);
 
-        return matchesCommunity && matchesUnit && (matchesProductName || matchesDeviceName);
+        return matchesCommunity &&
+            matchesUnit &&
+            (matchesProductName || matchesDeviceName);
       }).toList();
 
       emit(DeviceManagementFiltered(

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

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/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';
@@ -19,7 +20,8 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
     return MultiBlocProvider(
       providers: [
         BlocProvider(
-          create: (context) => DeviceManagementBloc()..add(FetchDevices(context)),
+          create: (context) =>
+              DeviceManagementBloc()..add(FetchDevices(context)),
         ),
       ],
       child: WebScaffold(
@@ -41,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

@@ -1,8 +1,11 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:go_router/go_router.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 // import 'package:graphview/GraphView.dart';
 import 'package:syncrow_web/pages/auth/model/user_model.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/home/bloc/home_state.dart';
 import 'package:syncrow_web/pages/home/home_model/home_item_model.dart';
@@ -11,6 +14,8 @@ 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/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 
 class HomeBloc extends Bloc<HomeEvent, HomeState> {
   // final Graph graph = Graph()..isTree = true;
@@ -50,7 +55,13 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
       var uuid =
           await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       user = await HomeApi().fetchUserInfo(uuid);
+
+      if (user != null && user!.project != null) {
+        await ProjectManager.setProjectUUID(user!.project!.uuid);
+      }
       add(FetchTermEvent());
+      add(FetchPolicyEvent());
+
       emit(HomeInitial());
     } catch (e) {
       return;
@@ -61,7 +72,9 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     try {
       emit(LoadingHome());
       terms = await HomeApi().fetchTerms();
-      add(FetchPolicyEvent());
+      emit(HomeInitial());
+
+      // emit(PolicyAgreement());
     } catch (e) {
       return;
     }
@@ -71,7 +84,11 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     try {
       emit(LoadingHome());
       policy = await HomeApi().fetchPolicy();
+      debugPrint("Fetched policy: $policy");
+      // Emit a state to trigger the UI update
+      emit(HomeInitial());
     } catch (e) {
+      debugPrint("Error fetching policy: $e");
       return;
     }
   }

lib/pages/home/view/agreement_and_privacy_dialog.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
+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_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';
@@ -63,9 +65,11 @@ class _AgreementAndPrivacyDialogState extends State<AgreementAndPrivacyDialog> {
   }
 
   String get _dialogTitle =>
-      _currentPage == 2 ? 'User Agreement' : 'Privacy Policy';
+      _currentPage == 1 ? 'User Agreement' : 'Privacy Policy';
 
-  String get _dialogContent => _currentPage == 2 ? widget.terms : widget.policy;
+  String get _dialogContent => _currentPage == 1 ? widget.terms : widget.policy;
+  final String staticText =
+      '<h5 style="color: #FF5722;">If you cancel you will be logged out.</h5>';
 
   Widget _buildScrollableContent() {
     return Container(
@@ -85,7 +89,7 @@ class _AgreementAndPrivacyDialogState extends State<AgreementAndPrivacyDialog> {
           controller: _scrollController,
           padding: const EdgeInsets.all(25),
           child: Html(
-            data: _dialogContent,
+            data: "$_dialogContent $staticText",
             onLinkTap: (url, attributes, element) async {
               if (url != null) {
                 final uri = Uri.parse(url);
@@ -160,7 +164,7 @@ class _AgreementAndPrivacyDialogState extends State<AgreementAndPrivacyDialog> {
               children: [
                 InkWell(
                   onTap: () {
-                    AuthBloc.logout();
+                    AuthBloc.logout(context);
                     context.go(RoutesConst.auth);
                   },
                   child: const Text("Cancel"),

lib/pages/home/view/home_page_web.dart

@@ -9,103 +9,121 @@ import 'package:syncrow_web/pages/home/view/home_card.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
-class HomeWebPage extends StatelessWidget {
+class HomeWebPage extends StatefulWidget {
   const HomeWebPage({super.key});
 
+  @override
+  State<HomeWebPage> createState() => _HomeWebPageState();
+}
+
+class _HomeWebPageState extends State<HomeWebPage> {
+  // Flag to track whether the dialog is already shown.
+  bool _dialogShown = false;
+
+  @override
+  void initState() {
+    super.initState();
+    final homeBloc = BlocProvider.of<HomeBloc>(context);
+    homeBloc.add(FetchUserInfo());
+  }
+
   @override
   Widget build(BuildContext context) {
     Size size = MediaQuery.of(context).size;
     final homeBloc = BlocProvider.of<HomeBloc>(context);
 
     return PopScope(
-        canPop: false,
+      canPop: false,
-        onPopInvoked: (didPop) => false,
+      onPopInvoked: (didPop) => false,
-        child: BlocConsumer<HomeBloc, HomeState>(
+      child: BlocConsumer<HomeBloc, HomeState>(
-          listener: (BuildContext context, state) {
+        listener: (BuildContext context, state) {
-            if (state is HomeInitial) {
+          if (state is HomeInitial) {
-              if (homeBloc.user!.hasAcceptedWebAgreement == false) {
+            if (homeBloc.user!.hasAcceptedWebAgreement == false && !_dialogShown) {
-                Future.delayed(const Duration(seconds: 1), () {
+              _dialogShown = true; // Set the flag to true to indicate the dialog is showing.
-                  showDialog(
+              Future.delayed(const Duration(seconds: 1), () {
-                    context: context,
+                showDialog(
-                    barrierDismissible: false,
+                  context: context,
-                    builder: (BuildContext context) {
+                  barrierDismissible: false,
-                      return AgreementAndPrivacyDialog(
+                  builder: (BuildContext context) {
-                        terms: homeBloc.terms,
+                    return AgreementAndPrivacyDialog(
-                        policy: homeBloc.policy,
+                      terms: homeBloc.terms,
-                      );
+                      policy: homeBloc.policy,
-                    },
+                    );
-                  ).then((v) {
+                  },
-                    if (v != null) {
+                ).then((v) {
-                      homeBloc.add(ConfirmUserAgreementEvent());
+                  _dialogShown = false;
-                      homeBloc.add(const FetchUserInfo());
+                  if (v != null) {
-                    }
+                    homeBloc.add(ConfirmUserAgreementEvent());
-                  });
+                    homeBloc.add(const FetchUserInfo());
+                  }
                 });
-              }
+              });
             }
-          },
+          }
-          builder: (context, state) {
+        },
-            return WebScaffold(
+        builder: (context, state) {
-              enableMenuSidebar: false,
+          return WebScaffold(
-              appBarTitle: Row(
+            enableMenuSidebar: false,
+            appBarTitle: Row(
+              children: [
+                SvgPicture.asset(
+                  Assets.loginLogo,
+                  width: 150,
+                ),
+              ],
+            ),
+            scaffoldBody: SizedBox(
+              height: size.height,
+              width: size.width,
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  SvgPicture.asset(
+                  Column(
-                    Assets.loginLogo,
+                    mainAxisAlignment: MainAxisAlignment.center,
-                    width: 150,
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      SizedBox(height: size.height * 0.1),
+                      Text(
+                        'ACCESS YOUR APPS',
+                        style: Theme.of(context)
+                            .textTheme
+                            .headlineLarge!
+                            .copyWith(color: Colors.black, fontSize: 40),
+                      ),
+                      const SizedBox(height: 30),
+                      Expanded(
+                        flex: 4,
+                        child: SizedBox(
+                          height: size.height * 0.6,
+                          width: size.width * 0.68,
+                          child: GridView.builder(
+                            itemCount: 3, // Change this count if needed.
+                            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                              crossAxisCount: 3, // Adjust as needed.
+                              crossAxisSpacing: 20.0,
+                              mainAxisSpacing: 20.0,
+                              childAspectRatio: 1.5,
+                            ),
+                            itemBuilder: (context, index) {
+                              return HomeCard(
+                                index: index,
+                                active: homeBloc.homeItems[index].active!,
+                                name: homeBloc.homeItems[index].title!,
+                                img: homeBloc.homeItems[index].icon!,
+                                onTap: () => homeBloc.homeItems[index].onPress(context),
+                              );
+                            },
+                          ),
+                        ),
+                      ),
+                    ],
                   ),
                 ],
               ),
-              scaffoldBody: SizedBox(
+            ),
-                height: size.height,
+          );
-                width: size.width,
+        },
-                child: Row(
+      ),
-                  mainAxisAlignment: MainAxisAlignment.center,
+    );
-                  children: [
-                    Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      crossAxisAlignment: CrossAxisAlignment.center,
-                      children: [
-                        SizedBox(height: size.height * 0.1),
-                        Text(
-                          'ACCESS YOUR APPS',
-                          style: Theme.of(context)
-                              .textTheme
-                              .headlineLarge!
-                              .copyWith(color: Colors.black, fontSize: 40),
-                        ),
-                        const SizedBox(height: 30),
-                        Expanded(
-                          flex: 4,
-                          child: SizedBox(
-                            height: size.height * 0.6,
-                            width: size.width * 0.68,
-                            child: GridView.builder(
-                              itemCount: 3, //8
-                              gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                                crossAxisCount: 3, //4
-                                crossAxisSpacing: 20.0,
-                                mainAxisSpacing: 20.0,
-                                childAspectRatio: 1.5,
-                              ),
-                              itemBuilder: (context, index) {
-                                return HomeCard(
-                                  index: index,
-                                  active: homeBloc.homeItems[index].active!,
-                                  name: homeBloc.homeItems[index].title!,
-                                  img: homeBloc.homeItems[index].icon!,
-                                  onTap: () => homeBloc.homeItems[index].onPress(context),
-                                );
-                              },
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ],
-                ),
-              ),
-            );
-          },
-        ));
   }
 }

lib/pages/roles_and_permission/model/roles_user_model.dart

@@ -42,7 +42,9 @@ class RolesUserModel {
       invitedBy:
           json['invitedBy'].toString().toLowerCase().replaceAll("_", " "),
       phoneNumber: json['phoneNumber'],
-      jobTitle: json['jobTitle'] ?? "-",
+      jobTitle: json['jobTitle'] == null || json['jobTitle'] == " "
+          ? "_"
+          : json['jobTitle'],
       createdDate: json['createdDate'],
       createdTime: json['createdTime'],
     );

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

@@ -1,5 +1,6 @@
 import 'package:bloc/bloc.dart';
 import 'package:flutter/material.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';
@@ -12,6 +13,9 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model
 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/strings_manager.dart';
+import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 
 class UsersBloc extends Bloc<UsersEvent, UsersState> {
   UsersBloc() : super(UsersInitial()) {
@@ -74,18 +78,24 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
 
   Future<List<SpaceModel>> _fetchSpacesForCommunity(
       String communityUuid) async {
-    return await CommunitySpaceManagementApi().getSpaceHierarchy(communityUuid);
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+    return await CommunitySpaceManagementApi()
+        .getSpaceHierarchy(communityUuid, projectUuid);
   }
 
   List<TreeNode> updatedCommunities = [];
   List<TreeNode> spacesNodes = [];
-
+  List<String> communityIds = [];
   _onLoadCommunityAndSpaces(
       LoadCommunityAndSpacesEvent event, Emitter<UsersState> emit) async {
     try {
       emit(UsersLoadingState());
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       List<CommunityModel> communities =
-          await CommunitySpaceManagementApi().fetchCommunities();
+          await CommunitySpaceManagementApi().fetchCommunities(projectUuid);
+      communityIds = communities.map((community) => community.uuid).toList();
       updatedCommunities = await Future.wait(
         communities.map((community) async {
           List<SpaceModel> spaces =
@@ -101,13 +111,19 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           );
         }).toList(),
       );
+      originalCommunities = updatedCommunities;
       emit(const SpacesLoadedState());
-      return updatedCommunities;
     } catch (e) {
       emit(ErrorState('Error loading communities and spaces: $e'));
     }
   }
 
+// This variable holds the full original list.
+  List<TreeNode> originalCommunities = [];
+
+// This variable holds the working list that may be filtered.
+
+// Build tree nodes from your data model.
   List<TreeNode> _buildTreeNodes(List<SpaceModel> spaces) {
     return spaces.map((space) {
       List<TreeNode> childNodes =
@@ -123,12 +139,39 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     }).toList();
   }
 
+// Optional helper method to deep clone a TreeNode.
+  TreeNode _cloneNode(TreeNode node) {
+    return TreeNode(
+      uuid: node.uuid,
+      title: node.title,
+      isChecked: node.isChecked,
+      isHighlighted: node.isHighlighted,
+      isExpanded: node.isExpanded,
+      children: node.children.map(_cloneNode).toList(),
+    );
+  }
+
+// Clone an entire list of tree nodes.
+  List<TreeNode> _cloneNodes(List<TreeNode> nodes) {
+    return nodes.map(_cloneNode).toList();
+  }
+
+// Your search event handler.
   void searchTreeNode(SearchAnode event, Emitter<UsersState> emit) {
     emit(UsersLoadingState());
+
+    // If the search term is empty, restore the original list.
     if (event.searchTerm!.isEmpty) {
+      // Clear any highlights on the restored copy.
+      updatedCommunities = _cloneNodes(originalCommunities);
       _clearHighlights(updatedCommunities);
     } else {
-      _searchAndHighlightNodes(updatedCommunities, event.searchTerm!);
+      // Start with a fresh clone of the original tree.
+      List<TreeNode> freshClone = _cloneNodes(originalCommunities);
+
+      _searchAndHighlightNodes(freshClone, event.searchTerm!);
+
+      updatedCommunities = _filterNodes(freshClone, event.searchTerm!);
     }
     emit(ChangeStatusSteps());
   }
@@ -155,6 +198,91 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     return anyMatch;
   }
 
+  List<TreeNode> _filterNodes(List<TreeNode> nodes, String searchTerm) {
+    List<TreeNode> filteredNodes = [];
+    for (var node in nodes) {
+      bool isMatch =
+          node.title.toLowerCase().contains(searchTerm.toLowerCase());
+      List<TreeNode> filteredChildren = _filterNodes(node.children, searchTerm);
+      if (isMatch || filteredChildren.isNotEmpty) {
+        node.isHighlighted = isMatch;
+        node.children = filteredChildren;
+        filteredNodes.add(node);
+      }
+    }
+    return filteredNodes;
+  }
+
+  // List<TreeNode> _buildTreeNodes(List<SpaceModel> spaces) {
+  //   return spaces.map((space) {
+  //     List<TreeNode> childNodes =
+  //         space.children.isNotEmpty ? _buildTreeNodes(space.children) : [];
+  //     return TreeNode(
+  //       uuid: space.uuid!,
+  //       title: space.name,
+  //       isChecked: false,
+  //       isHighlighted: false,
+  //       isExpanded: childNodes.isNotEmpty,
+  //       children: childNodes,
+  //     );
+  //   }).toList();
+  // }
+
+  // void searchTreeNode(SearchAnode event, Emitter<UsersState> emit) {
+  //   emit(UsersLoadingState());
+  //   if (event.searchTerm!.isEmpty) {
+  //     _clearHighlights(updatedCommunities);
+  //   } else {
+  //     _searchAndHighlightNodes(updatedCommunities, event.searchTerm!);
+  //     updatedCommunities = _filterNodes(updatedCommunities, event.searchTerm!);
+  //   }
+  //   emit(ChangeStatusSteps());
+  // }
+
+  // void _clearHighlights(List<TreeNode> nodes) {
+  //   for (var node in nodes) {
+  //     node.isHighlighted = false;
+  //     if (node.children.isNotEmpty) {
+  //       _clearHighlights(node.children);
+  //     }
+  //   }
+  // }
+
+  // bool _searchAndHighlightNodes(List<TreeNode> nodes, String searchTerm) {
+  //   bool anyMatch = false;
+  //   for (var node in nodes) {
+  //     bool isMatch =
+  //         node.title.toLowerCase().contains(searchTerm.toLowerCase());
+  //     bool childMatch = _searchAndHighlightNodes(node.children, searchTerm);
+  //     node.isHighlighted = isMatch || childMatch;
+
+  //     anyMatch = anyMatch || node.isHighlighted;
+  //   }
+  //   return anyMatch;
+  // }
+
+  // List<TreeNode> _filterNodes(List<TreeNode> nodes, String searchTerm) {
+  //   List<TreeNode> filteredNodes = [];
+  //   for (var node in nodes) {
+  //     // Check if the current node's title contains the search term.
+  //     bool isMatch =
+  //         node.title.toLowerCase().contains(searchTerm.toLowerCase());
+
+  //     // Recursively filter the children.
+  //     List<TreeNode> filteredChildren = _filterNodes(node.children, searchTerm);
+
+  //     // If the current node is a match or any of its children are, include it.
+  //     if (isMatch || filteredChildren.isNotEmpty) {
+  //       // Optionally, update any properties (like isHighlighted) if you still need them.
+  //       node.isHighlighted = isMatch;
+  //       // Replace the children with the filtered ones.
+  //       node.children = filteredChildren;
+  //       filteredNodes.add(node);
+  //     }
+  //   }
+  //   return filteredNodes;
+  // }
+
   List<String> selectedIds = [];
 
   List<String> getSelectedIds(List<TreeNode> nodes) {
@@ -177,7 +305,6 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     try {
       emit(UsersLoadingState());
       roles = await UserPermissionApi().fetchRoles();
-      //  add(PermissionEvent(roleUuid: roles.first.uuid));
       emit(RolePermissionInitial());
     } catch (e) {
       emit(ErrorState('Error loading communities and spaces: $e'));
@@ -208,20 +335,26 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     return anyMatch;
   }
 
-  _sendInvitUser(SendInviteUsers event, Emitter<UsersState> emit) async {
+  void _sendInvitUser(SendInviteUsers event, Emitter<UsersState> emit) async {
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       emit(UsersLoadingState());
-      List<String> selectedIds = getSelectedIds(updatedCommunities);
+      List<String> selectedIds = getSelectedIds(updatedCommunities)
+          .where((id) => !communityIds.contains(id))
+          .toList();
+
       bool res = await UserPermissionApi().sendInviteUser(
-        email: emailController.text,
+          email: emailController.text,
-        firstName: firstNameController.text,
+          firstName: firstNameController.text,
-        jobTitle: jobTitleController.text,
+          jobTitle: jobTitleController.text,
-        lastName: lastNameController.text,
+          lastName: lastNameController.text,
-        phoneNumber: phoneController.text,
+          phoneNumber: phoneController.text,
-        roleUuid: roleSelected,
+          roleUuid: roleSelected,
-        spaceUuids: selectedIds,
+          spaceUuids: selectedIds,
-      );
+          projectUuid: projectUuid);
-      if (res == true) {
+
+      if (res) {
         showCustomDialog(
           barrierDismissible: false,
           context: event.context,
@@ -251,16 +384,20 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
   _editInviteUser(EditInviteUsers event, Emitter<UsersState> emit) async {
     try {
       emit(UsersLoadingState());
-      List<String> selectedIds = getSelectedIds(updatedCommunities);
+      List<String> selectedIds = getSelectedIds(updatedCommunities)
+          .where((id) => !communityIds.contains(id))
+          .toList();
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       bool res = await UserPermissionApi().editInviteUser(
-        userId: event.userId,
+          userId: event.userId,
-        firstName: firstNameController.text,
+          firstName: firstNameController.text,
-        jobTitle: jobTitleController.text,
+          jobTitle: jobTitleController.text,
-        lastName: lastNameController.text,
+          lastName: lastNameController.text,
-        phoneNumber: phoneController.text,
+          phoneNumber: phoneController.text,
-        roleUuid: roleSelected,
+          roleUuid: roleSelected,
-        spaceUuids: selectedIds,
+          spaceUuids: selectedIds,
-      );
+          projectUuid: projectUuid);
       if (res == true) {
         showCustomDialog(
           barrierDismissible: false,
@@ -365,8 +502,11 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     emit(UsersLoadingState());
 
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       if (event.uuid?.isNotEmpty ?? false) {
-        final res = await UserPermissionApi().fetchUserById(event.uuid);
+        final res =
+            await UserPermissionApi().fetchUserById(event.uuid, projectUuid);
 
         if (res != null) {
           // Populate the text controllers

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

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
@@ -34,8 +35,7 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
               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: [
@@ -64,8 +64,7 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                                 children: [
                                   _buildStep1Indicator(1, "Basics", _blocRole),
                                   _buildStep2Indicator(2, "Spaces", _blocRole),
-                                  _buildStep3Indicator(
+                                  _buildStep3Indicator(3, "Role & Permissions", _blocRole),
-                                      3, "Role & Permissions", _blocRole),
                                 ],
                               ),
                             ),
@@ -113,15 +112,12 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                                 if (currentStep < 3) {
                                   currentStep++;
                                   if (currentStep == 2) {
-                                    _blocRole.add(
+                                    _blocRole.add(const CheckStepStatus(isEditUser: false));
-                                        const CheckStepStatus(isEditUser: false));
                                   } else if (currentStep == 3) {
-                                    _blocRole
+                                    _blocRole.add(const CheckSpacesStepStatus());
-                                        .add(const CheckSpacesStepStatus());
                                   }
                                 } else {
-                                  _blocRole
+                                  _blocRole.add(SendInviteUsers(context: context));
-                                      .add(SendInviteUsers(context: context));
                                 }
                               });
                             },
@@ -129,11 +125,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                               currentStep < 3 ? "Next" : "Save",
                               style: TextStyle(
                                   color: (_blocRole.isCompleteSpaces == false ||
-                                              _blocRole.isCompleteBasics ==
+                                              _blocRole.isCompleteBasics == false ||
-                                                  false ||
+                                              _blocRole.isCompleteRolePermissions == false) &&
-                                              _blocRole
-                                                      .isCompleteRolePermissions ==
-                                                  false) &&
                                           currentStep == 3
                                       ? ColorsManager.grayColor
                                       : ColorsManager.secondaryColor),
@@ -204,12 +197,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   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,
                   ),
                 ),
               ],
@@ -236,12 +225,16 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
     return GestureDetector(
       onTap: () {
         setState(() {
-          currentStep = step;
           bloc.add(const CheckStepStatus(isEditUser: false));
+          currentStep = step;
+          Future.delayed(const Duration(milliseconds: 500), () {
+            bloc.add(const CheckStepStatus(isEditUser: false));
+          });
           if (step3 == 3) {
-            bloc.add(const CheckRoleStepStatus());
+            Future.delayed(const Duration(seconds: 1), () {
+              bloc.add(const CheckRoleStepStatus());
+            });
           }
-          
         });
       },
       child: Column(
@@ -268,12 +261,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   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,
                   ),
                 ),
               ],
@@ -330,12 +319,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   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/basics_view.dart

@@ -46,117 +46,120 @@ class BasicsView extends StatelessWidget {
             ),
             Row(
               children: [
-                SizedBox(
+                Flexible(
-                  width: MediaQuery.of(context).size.width * 0.18,
+                  child: SizedBox(
-                  height: MediaQuery.of(context).size.width * 0.08,
+                    // width: MediaQuery.of(context).size.width * 0.18,
-                  child: Column(
+                    height: MediaQuery.of(context).size.width * 0.08,
-                    crossAxisAlignment: CrossAxisAlignment.start,
+                    child: Column(
-                    children: [
+                      crossAxisAlignment: CrossAxisAlignment.start,
-                      SizedBox(
+                      children: [
-                          child: Row(
+                        SizedBox(
-                        children: [
+                            child: Row(
-                          const Text(
+                          children: [
-                            " * ",
+                            const Text(
-                            style: TextStyle(
+                              " * ",
-                              color: ColorsManager.red,
+                              style: TextStyle(
-                              fontWeight: FontWeight.w900,
+                                color: ColorsManager.red,
-                              fontSize: 15,
+                                fontWeight: FontWeight.w900,
+                                fontSize: 15,
+                              ),
                             ),
-                          ),
+                            Text(
-                          Text(
+                              'First Name',
-                            'First Name',
-                            style: context.textTheme.bodyMedium?.copyWith(
-                              fontWeight: FontWeight.w400,
-                              fontSize: 13,
-                            ),
-                          ),
-                        ],
-                      )),
-                      Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: TextFormField(
-                          style:
-                              const TextStyle(color: ColorsManager.blackColor),
-                          // onChanged: (value) {
-                          //   Future.delayed(const Duration(milliseconds: 200),
-                          //       () {
-                          //     _blocRole.add(const ValidateBasicsStep());
-                          //   });
-                          // },
-                          controller: _blocRole.firstNameController,
-                          decoration: inputTextFormDeco(
-                            hintText: "Enter first name",
-                          ).copyWith(
-                            hintStyle: context.textTheme.bodyMedium?.copyWith(
-                                fontWeight: FontWeight.w400,
-                                fontSize: 12,
-                                color: ColorsManager.textGray),
-                          ),
-                          validator: (value) {
-                            if (value == null || value.isEmpty) {
-                              return 'Enter first name';
-                            }
-                            return null;
-                          },
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-                const SizedBox(width: 10),
-                SizedBox(
-                  width: MediaQuery.of(context).size.width * 0.18,
-                  height: MediaQuery.of(context).size.width * 0.08,
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      SizedBox(
-                          child: Row(
-                        children: [
-                          const Text(
-                            " * ",
-                            style: TextStyle(
-                              color: ColorsManager.red,
-                              fontWeight: FontWeight.w900,
-                              fontSize: 15,
-                            ),
-                          ),
-                          Text('Last Name',
                               style: context.textTheme.bodyMedium?.copyWith(
                                 fontWeight: FontWeight.w400,
                                 fontSize: 13,
-                              )),
+                              ),
-                        ],
+                            ),
-                      )),
+                          ],
-                      Padding(
+                        )),
-                        padding: const EdgeInsets.all(8.0),
+                        Padding(
-                        child: TextFormField(
+                          padding: const EdgeInsets.all(8.0),
-                          // onChanged: (value) {
+                          child: TextFormField(
-                          //   Future.delayed(const Duration(milliseconds: 200),
+                            style: const TextStyle(
-                          //       () {
+                                color: ColorsManager.blackColor),
-                          //     _blocRole.add(ValidateBasicsStep());
+                            // onChanged: (value) {
-                          //   });
+                            //   Future.delayed(const Duration(milliseconds: 200),
-                          // },
+                            //       () {
-                          controller: _blocRole.lastNameController,
+                            //     _blocRole.add(const ValidateBasicsStep());
-                          style: const TextStyle(color: Colors.black),
+                            //   });
-                          decoration:
+                            // },
-                              inputTextFormDeco(hintText: "Enter last name")
+                            controller: _blocRole.firstNameController,
-                                  .copyWith(
+                            decoration: inputTextFormDeco(
-                                      hintStyle: context
+                              hintText: "Enter first name",
-                                          .textTheme.bodyMedium
+                            ).copyWith(
-                                          ?.copyWith(
+                              hintStyle: context.textTheme.bodyMedium?.copyWith(
-                                              fontWeight: FontWeight.w400,
+                                  fontWeight: FontWeight.w400,
-                                              fontSize: 12,
+                                  fontSize: 12,
-                                              color: ColorsManager.textGray)),
+                                  color: ColorsManager.textGray),
-                          validator: (value) {
+                            ),
-                            if (value == null || value.isEmpty) {
+                            validator: (value) {
-                              return 'Enter last name';
+                              if (value == null || value.isEmpty) {
-                            }
+                                return 'Enter first name';
-                            return null;
+                              }
-                          },
+                              return null;
+                            },
+                          ),
                         ),
-                      ),
+                      ],
-                    ],
+                    ),
+                  ),
+                ),
+                const SizedBox(width: 10),
+                Flexible(
+                  child: SizedBox(
+                    // width: MediaQuery.of(context).size.width * 0.18,
+                    height: MediaQuery.of(context).size.width * 0.08,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        SizedBox(
+                            child: Row(
+                          children: [
+                            const Text(
+                              " * ",
+                              style: TextStyle(
+                                color: ColorsManager.red,
+                                fontWeight: FontWeight.w900,
+                                fontSize: 15,
+                              ),
+                            ),
+                            Text('Last Name',
+                                style: context.textTheme.bodyMedium?.copyWith(
+                                  fontWeight: FontWeight.w400,
+                                  fontSize: 13,
+                                )),
+                          ],
+                        )),
+                        Padding(
+                          padding: const EdgeInsets.all(8.0),
+                          child: TextFormField(
+                            // onChanged: (value) {
+                            //   Future.delayed(const Duration(milliseconds: 200),
+                            //       () {
+                            //     _blocRole.add(ValidateBasicsStep());
+                            //   });
+                            // },
+                            controller: _blocRole.lastNameController,
+                            style: const TextStyle(color: Colors.black),
+                            decoration:
+                                inputTextFormDeco(hintText: "Enter last name")
+                                    .copyWith(
+                                        hintStyle: context.textTheme.bodyMedium
+                                            ?.copyWith(
+                                                fontWeight: FontWeight.w400,
+                                                fontSize: 12,
+                                                color: ColorsManager.textGray)),
+                            validator: (value) {
+                              if (value == null || value.isEmpty) {
+                                return 'Enter last name';
+                              }
+                              return null;
+                            },
+                          ),
+                        ),
+                      ],
+                    ),
                   ),
                 ),
               ],
@@ -218,7 +221,7 @@ class BasicsView extends StatelessWidget {
                       if (_blocRole.checkEmailValid != "Valid email") {
                         return _blocRole.checkEmailValid;
                       }
-                      return null;
+                      // return null;
                     },
                   ),
                 ),

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

@@ -1,6 +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_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';

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

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';

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

@@ -81,7 +81,7 @@ Future<void> showPopUpFilterMenu({
                 ),
                 const Divider(),
                 const Text(
-                  "Filter by Status",
+                  "Filter by ",
                   style: TextStyle(fontWeight: FontWeight.bold),
                 ),
                 Container(

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

@@ -1,10 +1,13 @@
 import 'dart:async';
-import 'package:bloc/bloc.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/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/strings_manager.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 
 class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   UserTableBloc() : super(TableInitial()) {
@@ -27,7 +30,16 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   int currentPage = 1;
   List<RolesUserModel> users = [];
   List<RolesUserModel> initialUsers = [];
+
+  List<RolesUserModel> totalUsersCount = [];
   String currentSortOrder = '';
+
+  String currentSortJopTitle = '';
+  String currentSortRole = '';
+  String currentSortCreatedDate = '';
+  String currentSortStatus = '';
+  String currentSortCreatedBy = '';
+
   String currentSortOrderDate = '';
   List<String> roleTypes = [];
   List<String> jobTitle = [];
@@ -37,12 +49,12 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   Future<void> _getUsers(GetUsers event, Emitter<UserTableState> emit) async {
     emit(UsersLoadingState());
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       roleTypes.clear();
       jobTitle.clear();
       createdBy.clear();
-      // deActivate.clear();
+      users = await UserPermissionApi().fetchUsers(projectUuid);
-      users = await UserPermissionApi().fetchUsers();
-
       users.sort((a, b) {
         final dateA = _parseDateTime(a.createdDate);
         final dateB = _parseDateTime(b.createdDate);
@@ -57,15 +69,13 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
       for (var user in users) {
         createdBy.add(user.invitedBy.toString());
       }
-      // for (var user in users) {
-      //   deActivate.add(user.status.toString());
-      // }
       initialUsers = List.from(users);
       roleTypes = roleTypes.toSet().toList();
       jobTitle = jobTitle.toSet().toList();
       createdBy = createdBy.toSet().toList();
-      // deActivate = deActivate.toSet().toList();
       _handlePageChange(ChangePage(1), emit);
+      totalUsersCount = initialUsers;
+      add(ChangePage(currentPage));
       emit(UsersLoadedState(users: users));
     } catch (e) {
       emit(ErrorState(e.toString()));
@@ -91,31 +101,13 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   Future<void> _changeUserStatus(
       ChangeUserStatus event, Emitter<UserTableState> emit) async {
     try {
+      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);
+          event.newStatus == "disabled" ? false : true, projectUuid);
       if (res == true) {
         add(const GetUsers());
-        // users = users.map((user) {
-        //   if (user.uuid == event.userId) {
-        //     return RolesUserModel(
-        //       uuid: user.uuid,
-        //       createdAt: user.createdAt,
-        //       email: user.email,
-        //       firstName: user.firstName,
-        //       lastName: user.lastName,
-        //       roleType: user.roleType,
-        //       status: event.newStatus,
-        //       isEnabled: event.newStatus == "disabled" ? false : true,
-        //       invitedBy: user.invitedBy,
-        //       phoneNumber: user.phoneNumber,
-        //       jobTitle: user.jobTitle,
-        //       createdDate: user.createdDate,
-        //       createdTime: user.createdTime,
-        //     );
-        //   }
-        //   return user;
-        // }).toList();
       }
       emit(UsersLoadedState(users: users));
     } catch (e) {
@@ -125,11 +117,14 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
 
   void _toggleSortUsersByNameAsc(
       SortUsersByNameAsc event, Emitter<UserTableState> emit) {
+    selectedRoles.clear();
+    selectedJobTitles.clear();
+    selectedCreatedBy.clear();
+    selectedStatuses.clear();
     if (currentSortOrder == "Asc") {
       emit(UsersLoadingState());
       currentSortOrder = "";
       users = List.from(users);
-      emit(UsersLoadedState(users: users));
     } else {
       emit(UsersLoadingState());
       currentSortOrder = "Asc";
@@ -137,28 +132,42 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
           .toString()
           .toLowerCase()
           .compareTo(b.firstName.toString().toLowerCase()));
-      emit(UsersLoadedState(users: users));
     }
+    currentSortJopTitle = '';
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortCreatedBy = '';
+    emit(UsersLoadedState(users: users));
   }
 
   void _toggleSortUsersByNameDesc(
       SortUsersByNameDesc event, Emitter<UserTableState> emit) {
+    selectedRoles.clear();
+    selectedJobTitles.clear();
+    selectedCreatedBy.clear();
+    selectedStatuses.clear();
     if (currentSortOrder == "Desc") {
       emit(UsersLoadingState());
       currentSortOrder = "";
-      users = List.from(initialUsers); // Reset to saved initial state
+      users = List.from(initialUsers);
-      emit(UsersLoadedState(users: users));
     } else {
-      // Sort descending
       emit(UsersLoadingState());
       currentSortOrder = "Desc";
       users.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-      emit(UsersLoadedState(users: users));
     }
+    currentSortJopTitle = '';
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortCreatedBy = '';
+    emit(UsersLoadedState(users: users));
   }
 
   void _toggleSortUsersByDateNewestToOldest(
       DateNewestToOldestEvent event, Emitter<UserTableState> emit) {
+    selectedRoles.clear();
+    selectedJobTitles.clear();
+    selectedCreatedBy.clear();
+    selectedStatuses.clear();
     if (currentSortOrderDate == "NewestToOldest") {
       emit(UsersLoadingState());
       currentSortOrder = "";
@@ -179,6 +188,10 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
 
   void _toggleSortUsersByDateOldestToNewest(
       DateOldestToNewestEvent event, Emitter<UserTableState> emit) {
+    selectedRoles.clear();
+    selectedJobTitles.clear();
+    selectedCreatedBy.clear();
+    selectedStatuses.clear();
     if (currentSortOrderDate == "OldestToNewest") {
       emit(UsersLoadingState());
       currentSortOrder = "";
@@ -212,6 +225,7 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   Future<void> _searchUsers(
       SearchUsers event, Emitter<UserTableState> emit) async {
     try {
+      emit(TableSearch());
       final query = event.query.toLowerCase();
       final filteredUsers = initialUsers.where((user) {
         final fullName = "${user.firstName} ${user.lastName}".toLowerCase();
@@ -240,7 +254,8 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   }
 
   void _handlePageChange(ChangePage event, Emitter<UserTableState> emit) {
-    const itemsPerPage = 10;
+    currentPage = event.pageNumber;
+    const itemsPerPage = 20;
     final startIndex = (event.pageNumber - 1) * itemsPerPage;
     final endIndex = startIndex + itemsPerPage;
     if (startIndex >= users.length) {
@@ -277,9 +292,15 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {
+    } else {}
-      currentSortOrder = "";
+    currentSortOrder = "";
-    }
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortCreatedBy = '';
+    currentSortJopTitle = '';
+    currentSortOrderDate = "";
+
+    totalUsersCount = filteredUsers;
 
     emit(UsersLoadedState(users: filteredUsers));
   }
@@ -301,9 +322,16 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {
+    } else {}
-      currentSortOrder = "";
+    currentSortOrder = "";
-    }
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortCreatedBy = '';
+    currentSortRole = '';
+    currentSortOrderDate = "";
+
+    totalUsersCount = filteredUsers;
+
     emit(UsersLoadedState(users: filteredUsers));
   }
 
@@ -325,9 +353,15 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {
+    } else {}
-      currentSortOrder = "";
+    currentSortOrder = '';
-    }
+    currentSortRole = '';
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortOrderDate = "";
+
+    totalUsersCount = filteredUsers;
+
     emit(UsersLoadedState(users: filteredUsers));
   }
 
@@ -337,7 +371,20 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
 
     final filteredUsers = initialUsers.where((user) {
       if (selectedStatuses.isEmpty) return true;
-      return selectedStatuses.contains(user.status);
+
+      return selectedStatuses.any((status) {
+        final userStatus = user.status?.toLowerCase() ?? '';
+        switch (status.toLowerCase()) {
+          case 'active':
+            return user.isEnabled == true && userStatus != 'invited';
+          case 'disabled':
+            return user.isEnabled == false;
+          case 'invited':
+            return userStatus == 'invited';
+          default:
+            return false;
+        }
+      });
     }).toList();
     if (event.sortOrder == "Asc") {
       currentSortOrder = "Asc";
@@ -348,9 +395,14 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {
+      totalUsersCount = filteredUsers;
-      currentSortOrder = "";
+    } else {}
-    }
+    currentSortOrder = '';
+    currentSortRole = '';
+    currentSortCreatedDate = '';
+    currentSortCreatedBy = '';
+    currentSortOrderDate = "";
+
     emit(UsersLoadedState(users: filteredUsers));
   }
 

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

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

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

@@ -12,7 +12,7 @@ Future<void> showDateFilterMenu({
       Overlay.of(context).context.findRenderObject() as RenderBox;
   final RelativeRect position = RelativeRect.fromRect(
     Rect.fromLTRB(
-      overlay.size.width / 2,
+      overlay.size.width / 3,
       240,
       0,
       overlay.size.height,
@@ -40,7 +40,6 @@ Future<void> showDateFilterMenu({
           ),
           title: Text(
             "Sort from newest to oldest",
-            // style: context.textTheme.bodyMedium,
             style: TextStyle(
                 color: isSelected == "NewestToOldest"
                     ? Colors.black
@@ -65,9 +64,5 @@ Future<void> showDateFilterMenu({
         ),
       ),
     ],
-  ).then((value) {
+  ).then((value) {});
-    // setState(() {
-    //   _isDropdownOpen = false;
-    // });
-  });
 }

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

@@ -40,7 +40,6 @@ Future<void> showDeActivateFilterMenu({
           ),
           title: Text(
             "Sort A to Z",
-            // style: context.textTheme.bodyMedium,
             style: TextStyle(
                 color: isSelected == "NewestToOldest"
                     ? Colors.black
@@ -65,9 +64,5 @@ Future<void> showDeActivateFilterMenu({
         ),
       ),
     ],
-  ).then((value) {
+  ).then((value) {});
-    // setState(() {
-    //   _isDropdownOpen = false;
-    // });
-  });
 }

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

@@ -12,7 +12,7 @@ Future<void> showNameMenu({
       Overlay.of(context).context.findRenderObject() as RenderBox;
   final RelativeRect position = RelativeRect.fromRect(
     Rect.fromLTRB(
-      overlay.size.width / 25,
+      overlay.size.width / 35,
       240,
       0,
       overlay.size.height,
@@ -40,7 +40,6 @@ Future<void> showNameMenu({
           ),
           title: Text(
             "Sort A to Z",
-            // style: context.textTheme.bodyMedium,
             style: TextStyle(
                 color: isSelected == "Asc" ? Colors.black : Colors.blueGrey),
           ),
@@ -61,9 +60,5 @@ Future<void> showNameMenu({
         ),
       ),
     ],
-  ).then((value) {
+  ).then((value) {});
-    // setState(() {
-    //   _isDropdownOpen = false;
-    // });
-  });
 }

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

@@ -1,256 +1,59 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/style.dart';
 
-class DynamicTableScreen extends StatefulWidget {
+class _HeaderColumn extends StatelessWidget {
-  final List<String> titles;
+  final String title;
-  final List<List<Widget>> rows;
+  final double width;
-  final void Function(int columnIndex)? onFilter;
+  final bool showFilter;
+  final VoidCallback? onFilter;
+  final Function(double) onResize;
 
-  DynamicTableScreen(
+  const _HeaderColumn({
-      {required this.titles, required this.rows, required this.onFilter});
+    required this.title,
-
+    required this.width,
-  @override
+    required this.showFilter,
-  _DynamicTableScreenState createState() => _DynamicTableScreenState();
+    required this.onResize,
-}
+    this.onFilter,
-
+    Key? key,
-class _DynamicTableScreenState extends State<DynamicTableScreen>
+  }) : super(key: key);
-    with WidgetsBindingObserver {
-  late List<double> columnWidths;
-  late double totalWidth;
-
-  @override
-  void initState() {
-    super.initState();
-    columnWidths = List<double>.filled(widget.titles.length, 150.0);
-    totalWidth = columnWidths.reduce((a, b) => a + b);
-    WidgetsBinding.instance.addObserver(this);
-  }
-
-  @override
-  void dispose() {
-    WidgetsBinding.instance.removeObserver(this);
-    super.dispose();
-  }
-
-  @override
-  void didChangeMetrics() {
-    super.didChangeMetrics();
-    final newScreenWidth = MediaQuery.of(context).size.width;
-    setState(() {
-      columnWidths = List<double>.generate(widget.titles.length, (index) {
-        if (index == 1) {
-          return newScreenWidth *
-              0.12; // 20% of screen width for the second column
-        } else if (index == 9) {
-          return newScreenWidth *
-              0.1; // 25% of screen width for the tenth column
-        }
-        return newScreenWidth *
-            0.09; // Default to 10% of screen width for other columns
-      });
-    });
-  }
 
   @override
   Widget build(BuildContext context) {
-    final screenWidth = MediaQuery.of(context).size.width;
+    return MouseRegion(
-    if (columnWidths.every((width) => width == screenWidth * 7)) {
+      cursor: SystemMouseCursors.resizeColumn,
-      columnWidths = List<double>.generate(widget.titles.length, (index) {
+      child: GestureDetector(
-        if (index == 1) {
+        onHorizontalDragUpdate: (details) => onResize(details.delta.dx),
-          return screenWidth * 0.11;
+        child: Container(
-        } else if (index == 9) {
+          width: width,
-          return screenWidth * 0.1;
+          padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
-        }
+          decoration: const BoxDecoration(
-        return screenWidth * 0.09;
+            border: Border(right: BorderSide(color: ColorsManager.boxDivider)),
-      });
+          ),
-      setState(() {});
+          child: Row(
-    }
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-    return SingleChildScrollView(
-      clipBehavior: Clip.none,
-      scrollDirection: Axis.horizontal,
-      child: Container(
-        decoration: containerDecoration.copyWith(
-            color: ColorsManager.whiteColors,
-            borderRadius: const BorderRadius.all(Radius.circular(20))),
-        child: FittedBox(
-          child: Column(
             children: [
-              Container(
+              Expanded(
-                width: totalWidth,
+                child: Text(
-                decoration: containerDecoration.copyWith(
+                  title,
-                    color: ColorsManager.circleRolesBackground,
+                  maxLines: 2,
-                    borderRadius: const BorderRadius.only(
+                  overflow: TextOverflow.ellipsis,
-                        topLeft: Radius.circular(15),
+                  style: const TextStyle(
-                        topRight: Radius.circular(15))),
+                    fontWeight: FontWeight.w400,
-                child: Row(
+                    fontSize: 13,
-                  children: List.generate(widget.titles.length, (index) {
+                    color: ColorsManager.grayColor,
-                    return Row(
+                  ),
-                      mainAxisAlignment: MainAxisAlignment.start,
-                      children: [
-                        FittedBox(
-                          child: Container(
-                            padding: const EdgeInsets.only(left: 5, right: 5),
-                            width: columnWidths[index],
-                            child: Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              crossAxisAlignment: CrossAxisAlignment.center,
-                              children: [
-                                SizedBox(
-                                  child: Text(
-                                    widget.titles[index],
-                                    maxLines: 2,
-                                    style: const TextStyle(
-                                      overflow: TextOverflow.ellipsis,
-                                      fontWeight: FontWeight.w400,
-                                      fontSize: 13,
-                                      color: ColorsManager.grayColor,
-                                    ),
-                                  ),
-                                ),
-                                if (index != 1 &&
-                                    index != 9 &&
-                                    index != 8 &&
-                                    index != 5)
-                                  FittedBox(
-                                    child: IconButton(
-                                      icon: SvgPicture.asset(
-                                        Assets.filterTableIcon,
-                                        fit: BoxFit.none,
-                                      ),
-                                      onPressed: () {
-                                        if (widget.onFilter != null) {
-                                          widget.onFilter!(index);
-                                        }
-                                      },
-                                    ),
-                                  )
-                              ],
-                            ),
-                          ),
-                        ),
-                        GestureDetector(
-                          onHorizontalDragUpdate: (details) {
-                            setState(() {
-                              columnWidths[index] =
-                                  (columnWidths[index] + details.delta.dx)
-                                      .clamp(150.0, 300.0);
-                              totalWidth = columnWidths.reduce((a, b) => a + b);
-                            });
-                          },
-                          child: MouseRegion(
-                            cursor: SystemMouseCursors.resizeColumn,
-                            child: Container(
-                              color: Colors.green,
-                              child: Container(
-                                color: ColorsManager.boxDivider,
-                                width: 1,
-                                height: 50,
-                              ),
-                            ),
-                          ),
-                        ),
-                      ],
-                    );
-                  }),
                 ),
               ),
-              widget.rows.isEmpty
+              if (showFilter)
-                  ? SizedBox(
+                IconButton(
-                      height: MediaQuery.of(context).size.height / 2,
+                  icon: SvgPicture.asset(Assets.filterTableIcon),
-                      child: Column(
+                  onPressed: onFilter,
-                        crossAxisAlignment: CrossAxisAlignment.center,
+                  padding: EdgeInsets.zero,
-                        mainAxisAlignment: MainAxisAlignment.center,
+                  constraints: const BoxConstraints(),
-                        children: [
+                ),
-                          Column(
-                            children: [
-                              SvgPicture.asset(Assets.emptyTable),
-                              const SizedBox(
-                                height: 15,
-                              ),
-                              const Text(
-                                'No Users',
-                                style: TextStyle(
-                                    color: ColorsManager.lightGrayColor,
-                                    fontSize: 16,
-                                    fontWeight: FontWeight.w700),
-                              )
-                            ],
-                          ),
-                        ],
-                      ),
-                    )
-                  : Center(
-                      child: Container(
-                        width: totalWidth,
-                        decoration: containerDecoration.copyWith(
-                            color: ColorsManager.whiteColors,
-                            borderRadius: const BorderRadius.only(
-                                bottomLeft: Radius.circular(15),
-                                bottomRight: Radius.circular(15))),
-                        child: ListView.builder(
-                          physics: const NeverScrollableScrollPhysics(),
-                          shrinkWrap: true,
-                          itemCount: widget.rows.length,
-                          itemBuilder: (context, rowIndex) {
-                            if (columnWidths.every((width) => width == 120.0)) {
-                              columnWidths = List<double>.generate(
-                                  widget.titles.length, (index) {
-                                if (index == 1) {
-                                  return screenWidth * 0.11;
-                                } else if (index == 9) {
-                                  return screenWidth * 0.2;
-                                }
-                                return screenWidth * 0.11;
-                              });
-                              setState(() {});
-                            }
-                            final row = widget.rows[rowIndex];
-                            return Column(
-                              children: [
-                                Container(
-                                  child: Padding(
-                                    padding: const EdgeInsets.only(
-                                        left: 5, top: 10, right: 5, bottom: 10),
-                                    child: Row(
-                                      children:
-                                          List.generate(row.length, (index) {
-                                        return SizedBox(
-                                          width: columnWidths[index],
-                                          child: SizedBox(
-                                            child: Padding(
-                                              padding: const EdgeInsets.only(
-                                                  left: 15, right: 10),
-                                              child: row[index],
-                                            ),
-                                          ),
-                                        );
-                                      }),
-                                    ),
-                                  ),
-                                ),
-                                if (rowIndex < widget.rows.length - 1)
-                                  Row(
-                                    children: List.generate(
-                                        widget.titles.length, (index) {
-                                      return SizedBox(
-                                        width: columnWidths[index],
-                                        child: const Divider(
-                                          color: ColorsManager.boxDivider,
-                                          thickness: 1,
-                                          height: 1,
-                                        ),
-                                      );
-                                    }),
-                                  ),
-                              ],
-                            );
-                          },
-                        ),
-                      ),
-                    ),
             ],
           ),
         ),
@@ -258,3 +61,204 @@ class _DynamicTableScreenState extends State<DynamicTableScreen>
     );
   }
 }
+
+class _TableRow extends StatelessWidget {
+  final List<Widget> cells;
+  final List<double> columnWidths;
+  final bool isLast;
+
+  const _TableRow({
+    required this.cells,
+    required this.columnWidths,
+    required this.isLast,
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Row(
+          children: [
+            for (int i = 0; i < cells.length; i++)
+              Container(
+                width: columnWidths[i],
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+                // decoration: BoxDecoration(
+                //   border: Border(
+                //     right: BorderSide(color: ColorsManager.boxDivider),
+                //   ),
+                // ),
+                child: cells[i],
+              ),
+          ],
+        ),
+        if (!isLast)
+          Divider(
+            height: 1,
+            thickness: 1,
+            color: ColorsManager.boxDivider,
+          ),
+      ],
+    );
+  }
+}
+//===========================================================================
+
+class DynamicTableScreen extends StatefulWidget {
+  final List<String> titles;
+  final List<List<Widget>> rows;
+  final void Function(int columnIndex)? onFilter;
+
+  const DynamicTableScreen({
+    required this.titles,
+    required this.rows,
+    required this.onFilter,
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  _DynamicTableScreenState createState() => _DynamicTableScreenState();
+}
+
+class _DynamicTableScreenState extends State<DynamicTableScreen> {
+  late List<double> columnWidths;
+  final double _minColumnWidth = 100.0;
+  final double _maxColumnWidth = 300.0;
+  final double _dividerWidth = 1.0;
+  double _lastAvailableWidth = 0;
+
+  @override
+  void initState() {
+    super.initState();
+    columnWidths = List.filled(widget.titles.length, _minColumnWidth);
+  }
+
+  void _handleColumnResize(int index, double delta) {
+    setState(() {
+      double newWidth = columnWidths[index] + delta;
+      newWidth = newWidth.clamp(_minColumnWidth, _maxColumnWidth);
+      double actualDelta = newWidth - columnWidths[index];
+      if (actualDelta == 0) return;
+
+      int nextIndex = (index + 1) % columnWidths.length;
+      columnWidths[index] = newWidth;
+      columnWidths[nextIndex] = (columnWidths[nextIndex] - actualDelta)
+          .clamp(_minColumnWidth, _maxColumnWidth);
+    });
+  }
+
+  Widget _buildHeader() {
+    return Container(
+      decoration: containerDecoration.copyWith(
+        color: ColorsManager.circleRolesBackground,
+        borderRadius: const BorderRadius.only(
+          topLeft: Radius.circular(15),
+          topRight: Radius.circular(15),
+        ),
+      ),
+      child: Row(
+        children: [
+          for (int i = 0; i < widget.titles.length; i++)
+            _HeaderColumn(
+              title: widget.titles[i],
+              width: columnWidths[i],
+              showFilter: i != 1 && i != 9 && i != 8 && i != 5,
+              onFilter: () => widget.onFilter?.call(i),
+              onResize: (delta) => _handleColumnResize(i, delta),
+            ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildBody() {
+    if (widget.rows.isEmpty) {
+      return SizedBox(
+        height: 300,
+        child: Center(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              SvgPicture.asset(Assets.emptyTable),
+              const SizedBox(height: 15),
+              const Text(
+                'No Users',
+                style: TextStyle(
+                  color: ColorsManager.lightGrayColor,
+                  fontSize: 16,
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+            ],
+          ),
+        ),
+      );
+    }
+
+    return Container(
+      decoration: containerDecoration.copyWith(
+        color: ColorsManager.whiteColors,
+        borderRadius: const BorderRadius.only(
+          bottomLeft: Radius.circular(15),
+          bottomRight: Radius.circular(15),
+        ),
+      ),
+      child: Column(
+        children: [
+          for (int rowIndex = 0; rowIndex < widget.rows.length; rowIndex++)
+            _TableRow(
+              cells: widget.rows[rowIndex],
+              columnWidths: columnWidths,
+              isLast: rowIndex == widget.rows.length - 1,
+            ),
+        ],
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final availableWidth = constraints.maxWidth;
+        final totalDividersWidth = (widget.titles.length - 1) * _dividerWidth;
+
+        if (_lastAvailableWidth != availableWidth) {
+          final equalWidth =
+              (availableWidth - totalDividersWidth) / widget.titles.length;
+          final clampedWidth =
+              equalWidth.clamp(_minColumnWidth, _maxColumnWidth);
+
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            setState(() {
+              columnWidths = List.filled(widget.titles.length, clampedWidth);
+              _lastAvailableWidth = availableWidth;
+            });
+          });
+        }
+
+        final totalTableWidth =
+            columnWidths.fold(0.0, (sum, w) => sum + w) + totalDividersWidth;
+        return SingleChildScrollView(
+          scrollDirection: Axis.horizontal,
+          child: Container(
+            width: totalTableWidth,
+            decoration: containerDecoration.copyWith(
+              color: ColorsManager.whiteColors,
+              borderRadius: const BorderRadius.all(Radius.circular(20)),
+            ),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                _buildHeader(),
+                _buildBody(),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+}

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

@@ -25,7 +25,8 @@ class UsersPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final TextEditingController searchController = TextEditingController();
 
-    Widget actionButton({required String title, required Function()? onTap}) {
+    Widget actionButton(
+        {bool isActive = false, required String title, Function()? onTap}) {
       return InkWell(
         onTap: onTap,
         child: Padding(
@@ -33,9 +34,11 @@ class UsersPage extends StatelessWidget {
           child: Text(
             title,
             style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                  color: title == "Delete"
+                  color: isActive == false && title != "Delete"
-                      ? ColorsManager.red
+                      ? Colors.grey
-                      : ColorsManager.spaceColor,
+                      : title == "Delete"
+                          ? ColorsManager.red
+                          : ColorsManager.spaceColor,
                   fontWeight: FontWeight.w400,
                 ),
           ),
@@ -108,7 +111,6 @@ class UsersPage extends StatelessWidget {
         final screenSize = MediaQuery.of(context).size;
         final _blocRole = BlocProvider.of<UserTableBloc>(context);
         if (state is UsersLoadingState) {
-          _blocRole.add(ChangePage(_blocRole.currentPage));
           return const Center(child: CircularProgressIndicator());
         } else if (state is UsersLoadedState) {
           return Padding(
@@ -130,9 +132,12 @@ class UsersPage extends StatelessWidget {
                         child: TextFormField(
                           controller: searchController,
                           onChanged: (value) {
-                            context
+                            final bloc = context.read<UserTableBloc>();
-                                .read<UserTableBloc>()
+                            bloc.add(FilterClearEvent());
-                                .add(SearchUsers(value));
+                            bloc.add(SearchUsers(value));
+                            if (value == '') {
+                              bloc.add(ChangePage(1));
+                            }
                           },
                           style: const TextStyle(color: Colors.black),
                           decoration: textBoxDecoration(radios: 15)!.copyWith(
@@ -215,7 +220,7 @@ class UsersPage extends StatelessWidget {
 
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
-                            overlay.size.width / 4,
+                            overlay.size.width / 5.3,
                             240,
                             overlay.size.width / 4,
                             0,
@@ -223,8 +228,9 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.jobTitle,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortOrder,
+                          isSelected: _blocRole.currentSortJopTitle,
                           onOkPressed: () {
+                            searchController.clear();
                             _blocRole.add(FilterClearEvent());
                             final selectedItems = checkboxStates.entries
                                 .where((entry) => entry.value)
@@ -233,14 +239,14 @@ class UsersPage extends StatelessWidget {
                             Navigator.of(context).pop();
                             _blocRole.add(FilterUsersByJobEvent(
                               selectedJob: selectedItems,
-                              sortOrder: _blocRole.currentSortOrder,
+                              sortOrder: _blocRole.currentSortJopTitle,
                             ));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortJopTitle = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortJopTitle = v;
                           },
                         );
                       }
@@ -263,8 +269,9 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.roleTypes,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortOrder,
+                          isSelected: _blocRole.currentSortRole,
                           onOkPressed: () {
+                            searchController.clear();
                             _blocRole.add(FilterClearEvent());
                             final selectedItems = checkboxStates.entries
                                 .where((entry) => entry.value)
@@ -274,13 +281,13 @@ class UsersPage extends StatelessWidget {
                             context.read<UserTableBloc>().add(
                                 FilterUsersByRoleEvent(
                                     selectedRoles: selectedItems,
-                                    sortOrder: _blocRole.currentSortOrder));
+                                    sortOrder: _blocRole.currentSortRole));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortRole = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortRole = v;
                           },
                         );
                       }
@@ -318,8 +325,9 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.createdBy,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortOrder,
+                          isSelected: _blocRole.currentSortCreatedBy,
                           onOkPressed: () {
+                            searchController.clear();
                             _blocRole.add(FilterClearEvent());
                             final selectedItems = checkboxStates.entries
                                 .where((entry) => entry.value)
@@ -328,13 +336,13 @@ class UsersPage extends StatelessWidget {
                             Navigator.of(context).pop();
                             _blocRole.add(FilterUsersByCreatedEvent(
                                 selectedCreatedBy: selectedItems,
-                                sortOrder: _blocRole.currentSortOrder));
+                                sortOrder: _blocRole.currentSortCreatedBy));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortCreatedBy = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortCreatedBy = v;
                           },
                         );
                       }
@@ -343,6 +351,7 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.status)
                             item: _blocRole.selectedStatuses.contains(item),
                         };
+
                         final RenderBox overlay = Overlay.of(context)
                             .context
                             .findRenderObject() as RenderBox;
@@ -350,16 +359,16 @@ class UsersPage extends StatelessWidget {
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 0,
                             240,
-                            overlay.size.width / 4,
+                            overlay.size.width / 5,
                             0,
                           ),
                           list: _blocRole.status,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortOrder,
+                          isSelected: _blocRole.currentSortStatus,
                           onOkPressed: () {
+                            searchController.clear();
                             _blocRole.add(FilterClearEvent());
-
                             final selectedItems = checkboxStates.entries
                                 .where((entry) => entry.value)
                                 .map((entry) => entry.key)
@@ -367,13 +376,13 @@ class UsersPage extends StatelessWidget {
                             Navigator.of(context).pop();
                             _blocRole.add(FilterUsersByDeActevateEvent(
                                 selectedActivate: selectedItems,
-                                sortOrder: _blocRole.currentSortOrder));
+                                sortOrder: _blocRole.currentSortStatus));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortStatus = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortStatus = v;
                           },
                         );
                       }
@@ -410,7 +419,7 @@ class UsersPage extends StatelessWidget {
                       return [
                         Text('${user.firstName} ${user.lastName}'),
                         Text(user.email),
-                        Text(user.jobTitle ?? '-'),
+                        Text(user.jobTitle),
                         Text(user.roleType ?? ''),
                         Text(user.createdDate ?? ''),
                         Text(user.createdTime ?? ''),
@@ -427,11 +436,6 @@ class UsersPage extends StatelessWidget {
                           userId: user.uuid,
                           onTap: user.status != "invited"
                               ? () {
-                                  // final newStatus = user.status == 'active'
-                                  //     ? 'disabled'
-                                  //     : user.status == 'disabled'
-                                  //         ? 'invited'
-                                  //         : 'active';
                                   context.read<UserTableBloc>().add(
                                       ChangeUserStatus(
                                           userId: user.uuid,
@@ -443,28 +447,30 @@ class UsersPage extends StatelessWidget {
                         ),
                         Row(
                           children: [
-                            // actionButton(
+                            user.isEnabled != false
-                            //   title: "Activity Log",
+                                ? actionButton(
-                            //   onTap: () {},
+                                    isActive: true,
-                            // ),
+                                    title: "Edit",
-                            actionButton(
+                                    onTap: () {
-                              title: "Edit",
+                                      showDialog(
-                              onTap: () {
+                                        context: context,
-                                showDialog(
+                                        barrierDismissible: false,
-                                  context: context,
+                                        builder: (BuildContext context) {
-                                  barrierDismissible: false,
+                                          return EditUserDialog(
-                                  builder: (BuildContext context) {
+                                              userId: user.uuid);
-                                    return EditUserDialog(userId: user.uuid);
+                                        },
-                                  },
+                                      ).then((v) {
-                                ).then((v) {
+                                        if (v != null) {
-                                  if (v != null) {
+                                          if (v != null) {
-                                    if (v != null) {
+                                            _blocRole.add(const GetUsers());
-                                      _blocRole.add(const GetUsers());
+                                          }
-                                    }
+                                        }
-                                  }
+                                      });
-                                });
+                                    },
-                              },
+                                  )
-                            ),
+                                : actionButton(
+                                    title: "Edit",
+                                  ),
                             actionButton(
                               title: "Delete",
                               onTap: () {
@@ -487,9 +493,7 @@ class UsersPage extends StatelessWidget {
                                   },
                                 ).then((v) {
                                   if (v != null) {
-                                    if (v != null) {
+                                    _blocRole.add(const GetUsers());
-                                      _blocRole.add(const GetUsers());
-                                    }
                                   }
                                 });
                               },
@@ -516,12 +520,11 @@ class UsersPage extends StatelessWidget {
                                 const Icon(Icons.keyboard_double_arrow_right),
                             firstPageIcon:
                                 const Icon(Icons.keyboard_double_arrow_left),
-                            totalPages: (_blocRole.users.length /
+                            totalPages: (_blocRole.totalUsersCount.length /
                                     _blocRole.itemsPerPage)
                                 .ceil(),
                             currentPage: _blocRole.currentPage,
                             onPageChanged: (int pageNumber) {
-                              _blocRole.currentPage = pageNumber;
                               context
                                   .read<UserTableBloc>()
                                   .add(ChangePage(pageNumber));

lib/pages/roles_and_permission/view/roles_and_permission_page.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/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';

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

@@ -3,6 +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_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';
@@ -10,17 +12,22 @@ 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> {
   RoutineBloc() : super(const RoutineState()) {
@@ -54,11 +61,12 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     TriggerSwitchTabsEvent event,
     Emitter<RoutineState> emit,
   ) {
-    emit(state.copyWith(routineTab: event.isRoutineTab, createRoutineView: false));
+    emit(state.copyWith(
+        routineTab: event.isRoutineTab, createRoutineView: false));
     add(ResetRoutineState());
     if (event.isRoutineTab) {
-      add(LoadScenes(spaceId, communityId));
+      add(const LoadScenes());
-      add(LoadAutomation(spaceId));
+      add(const LoadAutomation());
     }
   }
 
@@ -80,8 +88,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     final updatedIfItems = List<Map<String, dynamic>>.from(state.ifItems);
 
     // Find the index of the item in teh current itemsList
-    int index =
+    int index = updatedIfItems.indexWhere(
-        updatedIfItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       updatedIfItems[index] = event.item;
@@ -90,18 +98,21 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
 
     if (event.isTabToRun) {
-      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
+      emit(state.copyWith(
+          ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
     } else {
-      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
+      emit(state.copyWith(
+          ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
     }
   }
 
-  void _onAddToThenContainer(AddToThenContainer event, Emitter<RoutineState> emit) {
+  void _onAddToThenContainer(
+      AddToThenContainer event, Emitter<RoutineState> emit) {
     final currentItems = List<Map<String, dynamic>>.from(state.thenItems);
 
     // Find the index of the item in teh current itemsList
-    int index =
+    int index = currentItems.indexWhere(
-        currentItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       currentItems[index] = event.item;
@@ -112,22 +123,26 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     emit(state.copyWith(thenItems: currentItems));
   }
 
-  void _onAddFunctionsToRoutine(AddFunctionToRoutine event, Emitter<RoutineState> emit) {
+  void _onAddFunctionsToRoutine(
+      AddFunctionToRoutine event, Emitter<RoutineState> emit) {
     try {
       if (event.functions.isEmpty) return;
 
-      List<DeviceFunctionData> selectedFunction = List<DeviceFunctionData>.from(event.functions);
+      List<DeviceFunctionData> selectedFunction =
+          List<DeviceFunctionData>.from(event.functions);
 
       Map<String, List<DeviceFunctionData>> currentSelectedFunctions =
           Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
       if (currentSelectedFunctions.containsKey(event.uniqueCustomId)) {
         List<DeviceFunctionData> currentFunctions =
-            List<DeviceFunctionData>.from(currentSelectedFunctions[event.uniqueCustomId] ?? []);
+            List<DeviceFunctionData>.from(
+                currentSelectedFunctions[event.uniqueCustomId] ?? []);
 
         List<String> functionCode = [];
         for (int i = 0; i < selectedFunction.length; i++) {
           for (int j = 0; j < currentFunctions.length; j++) {
-            if (selectedFunction[i].functionCode == currentFunctions[j].functionCode) {
+            if (selectedFunction[i].functionCode ==
+                currentFunctions[j].functionCode) {
               currentFunctions[j] = selectedFunction[i];
               if (!functionCode.contains(currentFunctions[j].functionCode)) {
                 functionCode.add(currentFunctions[j].functionCode);
@@ -137,13 +152,15 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
 
         for (int i = 0; i < functionCode.length; i++) {
-          selectedFunction.removeWhere((code) => code.functionCode == functionCode[i]);
+          selectedFunction
+              .removeWhere((code) => code.functionCode == functionCode[i]);
         }
 
-        currentSelectedFunctions[event.uniqueCustomId] = List.from(currentFunctions)
+        currentSelectedFunctions[event.uniqueCustomId] =
-          ..addAll(selectedFunction);
+            List.from(currentFunctions)..addAll(selectedFunction);
       } else {
-        currentSelectedFunctions[event.uniqueCustomId] = List.from(event.functions);
+        currentSelectedFunctions[event.uniqueCustomId] =
+            List.from(event.functions);
       }
 
       emit(state.copyWith(selectedFunctions: currentSelectedFunctions));
@@ -152,18 +169,24 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadScenes(LoadScenes event, Emitter<RoutineState> emit) async {
+  Future<void> _onLoadScenes(
+      LoadScenes event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
-
+    List<ScenesModel> scenes = [];
     try {
-      spaceId = event.spaceId;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-      communityId = event.communityId;
 
-      List<ScenesModel> scenes = [];
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
-
+      var spaceBloc = context.read<SpaceTreeBloc>();
-      if (communityId.isNotEmpty && spaceId.isNotEmpty) {
+      for (var communityId in spaceBloc.state.selectedCommunities) {
-        scenes = await SceneApi.getScenes(event.spaceId, event.communityId);
+        List<String> spacesList =
+            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        for (var spaceId in spacesList) {
+          scenes.addAll(
+              await SceneApi.getScenes(spaceId, communityId, projectUuid));
+        }
       }
+
       emit(state.copyWith(
         scenes: scenes,
         isLoading: false,
@@ -174,18 +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 {
+  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,
@@ -197,18 +226,20 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           loadAutomationErrorMessage: 'Failed to load automations',
           errorMessage: '',
           loadScenesErrorMessage: '',
-          automations: []));
+          automations: automations));
     }
   }
 
-  FutureOr<void> _onSearchRoutines(SearchRoutines event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onSearchRoutines(
+      SearchRoutines event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     await Future.delayed(const Duration(seconds: 1));
     emit(state.copyWith(isLoading: false, errorMessage: null));
     emit(state.copyWith(searchText: event.query));
   }
 
-  FutureOr<void> _onAddSelectedIcon(AddSelectedIcon event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onAddSelectedIcon(
+      AddSelectedIcon event, Emitter<RoutineState> emit) {
     emit(state.copyWith(selectedIcon: event.icon));
   }
 
@@ -222,7 +253,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return actions.last['deviceId'] == 'delay';
   }
 
-  Future<void> _onCreateScene(CreateSceneEvent event, Emitter<RoutineState> emit) async {
+  Future<void> _onCreateScene(
+      CreateSceneEvent event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -235,7 +267,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage: 'A delay condition cannot be the only or the last action',
+          errorMessage:
+              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -280,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 ?? '',
@@ -292,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,
@@ -308,7 +344,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onCreateAutomation(CreateAutomationEvent event, Emitter<RoutineState> emit) async {
+  Future<void> _onCreateAutomation(
+      CreateAutomationEvent event, Emitter<RoutineState> emit) async {
     try {
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
@@ -329,7 +366,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage: 'A delay condition cannot be the only or the last action',
+          errorMessage:
+              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         CustomSnackBar.redSnackBar('Cannot have delay as the last action');
@@ -404,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(
@@ -421,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,
@@ -439,17 +479,21 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onRemoveDragCard(RemoveDragCard event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onRemoveDragCard(
+      RemoveDragCard event, Emitter<RoutineState> emit) {
     if (event.isFromThen) {
       final thenItems = List<Map<String, dynamic>>.from(state.thenItems);
-      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
+      final selectedFunctions =
+          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       thenItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
-      emit(state.copyWith(thenItems: thenItems, selectedFunctions: selectedFunctions));
+      emit(state.copyWith(
+          thenItems: thenItems, selectedFunctions: selectedFunctions));
     } else {
       final ifItems = List<Map<String, dynamic>>.from(state.ifItems);
-      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
+      final selectedFunctions =
+          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       ifItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
@@ -460,7 +504,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             isAutomation: false,
             isTabToRun: false));
       } else {
-        emit(state.copyWith(ifItems: ifItems, selectedFunctions: selectedFunctions));
+        emit(state.copyWith(
+            ifItems: ifItems, selectedFunctions: selectedFunctions));
       }
     }
   }
@@ -472,18 +517,23 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     ));
   }
 
-  FutureOr<void> _onEffectiveTimeEvent(EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onEffectiveTimeEvent(
+      EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
     emit(state.copyWith(effectiveTime: event.effectiveTime));
   }
 
-  FutureOr<void> _onSetRoutineName(SetRoutineName event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onSetRoutineName(
+      SetRoutineName event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
       routineName: event.name,
     ));
   }
 
-  (List<Map<String, dynamic>>, List<Map<String, dynamic>>, Map<String, List<DeviceFunctionData>>)
+  (
-      _createCardData(
+    List<Map<String, dynamic>>,
+    List<Map<String, dynamic>>,
+    Map<String, List<DeviceFunctionData>>
+  ) _createCardData(
     List<RoutineAction> actions,
     List<RoutineCondition>? conditions,
     Map<String, List<DeviceFunctionData>> currentFunctions,
@@ -516,7 +566,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
                 'deviceId': condition.entityId,
                 'title': matchingDevice.name ?? condition.entityId,
                 'productType': condition.entityType,
-                'imagePath': matchingDevice.getDefaultIcon(condition.entityType),
+                'imagePath':
+                    matchingDevice.getDefaultIcon(condition.entityType),
               };
 
               final functions = matchingDevice.functions;
@@ -552,8 +603,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       final cardData = {
         'entityId': action.entityId,
         'uniqueCustomId': const Uuid().v4(),
-        'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+        'deviceId':
-        'title': action.actionExecutor == 'delay' ? 'Delay' : (matchingDevice.name ?? 'Device'),
+            action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+        'title': action.actionExecutor == 'delay'
+            ? 'Delay'
+            : (matchingDevice.name ?? 'Device'),
         'productType': action.productType,
         'imagePath': matchingDevice.getDefaultIcon(action.productType),
       };
@@ -596,7 +650,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return (thenItems, ifItems, currentFunctions);
   }
 
-  Future<void> _onGetSceneDetails(GetSceneDetails event, Emitter<RoutineState> emit) async {
+  Future<void> _onGetSceneDetails(
+      GetSceneDetails event, Emitter<RoutineState> emit) async {
     try {
       emit(state.copyWith(
         isLoading: true,
@@ -644,10 +699,12 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         if (!deviceCards.containsKey(deviceId)) {
           deviceCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'deviceId':
-            'uniqueCustomId': action.type == 'automation' || action.actionExecutor == 'delay'
+                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-                ? const Uuid().v4()
+            'uniqueCustomId':
-                : action.entityId,
+                action.type == 'automation' || action.actionExecutor == 'delay'
+                    ? const Uuid().v4()
+                    : action.entityId,
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
                 : action.type == 'automation'
@@ -682,7 +739,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             ),
           );
           // emit(state.copyWith(automationActionExecutor: action.actionExecutor));
-        } else if (action.executorProperty != null && action.actionExecutor != 'delay') {
+        } else if (action.executorProperty != null &&
+            action.actionExecutor != 'delay') {
           if (!updatedFunctions.containsKey(uniqueCustomId)) {
             updatedFunctions[uniqueCustomId] = [];
           }
@@ -754,7 +812,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onResetRoutineState(ResetRoutineState event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onResetRoutineState(
+      ResetRoutineState event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
         ifItems: [],
         thenItems: [],
@@ -778,17 +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(unitUuid: spaceId, automationId: state.automationId ?? '');
+        await SceneApi.deleteAutomation(
+            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) {
@@ -813,10 +879,24 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   //   }
   // }
 
-  FutureOr<void> _fetchDevices(FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _fetchDevices(
+      FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true));
     try {
-      final devices = await DevicesManagementApi().fetchDevices('', '');
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+      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) {
@@ -824,7 +904,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateScene(UpdateScene event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onUpdateScene(
+      UpdateScene event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -838,7 +919,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage: 'A delay condition cannot be the only or the last action',
+          errorMessage:
+              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -891,11 +973,12 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result = await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
+      final result =
+          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,
@@ -910,7 +993,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateAutomation(UpdateAutomation event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onUpdateAutomation(
+      UpdateAutomation event, Emitter<RoutineState> emit) async {
     try {
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
@@ -1005,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(
@@ -1018,13 +1105,13 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result =
+      final result = await SceneApi.updateAutomation(
-          await SceneApi.updateAutomation(createAutomationModel, state.automationId ?? '');
+          createAutomationModel, state.automationId ?? '');
 
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadAutomation(spaceId));
+        add(LoadAutomation());
-        add(LoadScenes(spaceId, communityId));
+        add(LoadScenes());
       } else {
         emit(state.copyWith(
           isLoading: false,
@@ -1052,7 +1139,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         thenItems: [],
       ));
 
-      final automationDetails = await SceneApi.getAutomationDetails(event.automationId);
+      final automationDetails =
+          await SceneApi.getAutomationDetails(event.automationId);
 
       final Map<String, Map<String, dynamic>> deviceIfCards = {};
       final Map<String, Map<String, dynamic>> deviceThenCards = {};
@@ -1120,13 +1208,15 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           ),
         );
 
-        final deviceId =
+        final deviceId = action.actionExecutor == 'delay'
-            action.actionExecutor == 'delay' ? '${action.entityId}_delay' : action.entityId;
+            ? '${action.entityId}_delay'
+            : action.entityId;
 
         if (!deviceThenCards.containsKey(deviceId)) {
           deviceThenCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'deviceId':
+                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
             'uniqueCustomId': const Uuid().v4(),
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
@@ -1157,7 +1247,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           updatedFunctions[uniqueCustomId] = [];
         }
 
-        if (action.executorProperty != null && action.actionExecutor != 'delay') {
+        if (action.executorProperty != null &&
+            action.actionExecutor != 'delay') {
           final functions = matchingDevice.functions;
           final functionCode = action.executorProperty!.functionCode;
           for (var function in functions) {
@@ -1199,10 +1290,14 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
       }
 
-      final ifItems = deviceIfCards.values.where((card) => card['type'] == 'condition').toList();
+      final ifItems = deviceIfCards.values
+          .where((card) => card['type'] == 'condition')
+          .toList();
       final thenItems = deviceThenCards.values
           .where((card) =>
-              card['type'] == 'action' || card['type'] == 'automation' || card['type'] == 'scene')
+              card['type'] == 'action' ||
+              card['type'] == 'automation' ||
+              card['type'] == 'scene')
           .toList();
 
       emit(state.copyWith(

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

@@ -20,7 +20,7 @@ class _RoutinesViewState extends State<RoutinesView> {
   @override
   void initState() {
     super.initState();
-    context.read<RoutineBloc>().add(FetchDevicesInRoutine());
+    // context.read<RoutineBloc>().add(FetchDevicesInRoutine());
   }
 
   @override
@@ -32,9 +32,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 +62,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 +71,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,4 +1,5 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 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';
@@ -6,9 +7,6 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model
 import 'package:syncrow_web/services/space_mana_api.dart';
 
 class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
-  String selectedCommunityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
-  String selectedSpaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
-
   SpaceTreeBloc() : super(const SpaceTreeState()) {
     on<InitialEvent>(_fetchSpaces);
     on<OnCommunityExpanded>(_onCommunityExpanded);
@@ -21,12 +19,15 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
   _fetchSpaces(InitialEvent event, Emitter<SpaceTreeState> emit) async {
     emit(SpaceTreeLoadingState());
     try {
-      List<CommunityModel> communities = await CommunitySpaceManagementApi().fetchCommunities();
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+      List<CommunityModel> communities =
+          await CommunitySpaceManagementApi().fetchCommunities(projectUuid);
 
       List<CommunityModel> updatedCommunities = await Future.wait(
         communities.map((community) async {
           List<SpaceModel> spaces =
-              await CommunitySpaceManagementApi().getSpaceHierarchy(community.uuid);
+              await CommunitySpaceManagementApi().getSpaceHierarchy(community.uuid, projectUuid);
 
           return CommunityModel(
             uuid: community.uuid,
@@ -135,12 +136,12 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
           !updatedSoldChecks.contains(event.spaceId)) {
         // First click: Select the space and all its children
         updatedSelectedSpaces.add(event.spaceId);
-        updatedSelectedCommunities.add(event.communityId);
+        updatedSelectedCommunities.add(event.communityModel.uuid);
         if (childrenIds.isNotEmpty) {
           updatedSelectedSpaces.addAll(childrenIds);
         }
 
-        List<String> spaces = _getThePathToChild(event.communityId, event.spaceId);
+        List<String> spaces = _getThePathToChild(event.communityModel.uuid, event.spaceId);
         for (String space in spaces) {
           if (!updatedSelectedSpaces.contains(space) && !updatedSoldChecks.contains(space)) {
             updatedSoldChecks.add(space);
@@ -161,20 +162,31 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
         }
         updatedSoldChecks.remove(event.spaceId);
 
-        List<String> parents = _getThePathToChild(event.communityId, event.spaceId);
+        List<String> parents =
-        if (!_parentSelected(parents, updatedSelectedSpaces)) {
+            _getThePathToChild(event.communityModel.uuid, event.spaceId).toSet().toList();
+
+        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] = updatedSelectedSpaces;
 
       emit(state.copyWith(
-          selectedCommunities: updatedSelectedCommunities,
+          selectedCommunities: updatedSelectedCommunities.toSet().toList(),
           selectedSpaces: updatedSelectedSpaces,
           soldCheck: updatedSoldChecks,
           selectedCommunityAndSpaces: communityAndSpaces));
@@ -184,12 +196,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;
   }
 
@@ -209,7 +233,9 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       }).toList();
 
       emit(state.copyWith(
-          filteredCommunity: filteredCommunity, isSearching: event.searchQuery.isNotEmpty));
+          filteredCommunity: filteredCommunity,
+          isSearching: event.searchQuery.isNotEmpty,
+          searchQuery: event.searchQuery));
     } catch (e) {
       emit(const SpaceTreeErrorState('Something went wrong'));
     }
@@ -230,21 +256,26 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       ids.add(child.uuid!);
       ids.addAll(_getAllChildIds(child.children));
     }
-    return ids;
+    return ids.toSet().toList();
+  }
+
+  List<SpaceModel> _getAllChildSpaces(List<SpaceModel> spaces) {
+    List<SpaceModel> children = [];
+    for (var child in spaces) {
+      children.add(child);
+      children.addAll(_getAllChildSpaces(child.children));
+    }
+    return children;
   }
 
   bool _anySpacesSelectedInCommunity(
-      String communityId, List<String> selectedSpaces, List<String> partialCheckedList) {
+      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 = selectedSpaces.contains(id) || partialCheckedList.contains(id);
+        return result;
-          if (result) {
-            return result;
-          }
-        }
       }
     }
     return result;
@@ -288,4 +319,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 {

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,4 +1,8 @@
+import 'dart:developer';
+
 import 'package:flutter_bloc/flutter_bloc.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';
@@ -14,6 +18,9 @@ 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> {
@@ -39,15 +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 = await ProjectManager.getProjectUUID() ?? '';
+
       emit(SpaceManagementLoading());
-      final success =
+      final success = await _api.updateCommunity(
-          await _api.updateCommunity(event.communityUuid, event.name);
+          event.communityUuid, event.name, projectUuid);
       if (success) {
         if (previousState is SpaceManagementLoaded) {
           final updatedCommunities =
@@ -79,6 +94,8 @@ class SpaceManagementBloc
   Future<List<SpaceTemplateModel>> fetchSpaceModels(
       SpaceManagementState previousState) async {
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       List<SpaceTemplateModel> allSpaces = [];
       List<SpaceTemplateModel> prevSpaceModels = [];
 
@@ -87,6 +104,7 @@ class SpaceManagementBloc
         prevSpaceModels = List<SpaceTemplateModel>.from(
           (previousState as dynamic).spaceModels ?? [],
         );
+        allSpaces.addAll(prevSpaceModels);
       }
 
       if (prevSpaceModels.isEmpty) {
@@ -94,7 +112,8 @@ class SpaceManagementBloc
         int page = 1;
 
         while (hasNext) {
-          final spaces = await _spaceModelApi.listSpaceModels(page: page);
+          final spaces = await _spaceModelApi.listSpaceModels(
+              page: page, projectId: projectUuid);
           if (spaces.isNotEmpty) {
             allSpaces.addAll(spaces);
             page++;
@@ -102,7 +121,8 @@ class SpaceManagementBloc
             hasNext = false;
           }
         }
-        prevSpaceModels = await _spaceModelApi.listSpaceModels(page: 1);
+        prevSpaceModels = await _spaceModelApi.listSpaceModels(
+            page: 1, projectId: projectUuid);
       }
 
       return allSpaces;
@@ -131,7 +151,9 @@ class SpaceManagementBloc
 
   Future<List<SpaceModel>> _fetchSpacesForCommunity(
       String communityUuid) async {
-    return await _api.getSpaceHierarchy(communityUuid);
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+    return await _api.getSpaceHierarchy(communityUuid, projectUuid);
   }
 
   Future<void> _onNewCommunity(
@@ -162,6 +184,8 @@ class SpaceManagementBloc
       BlankStateEvent event, Emitter<SpaceManagementState> emit) async {
     try {
       final previousState = state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       var prevSpaceModels = await fetchSpaceModels(previousState);
 
       if (previousState is SpaceManagementLoaded ||
@@ -175,10 +199,11 @@ class SpaceManagementBloc
         return;
       }
 
-      final communities = await _api.fetchCommunities();
+      final communities = await _api.fetchCommunities(projectUuid);
       final updatedCommunities =
           await Future.wait(communities.map((community) async {
         final spaces = await _fetchSpacesForCommunity(community.uuid);
+
         return CommunityModel(
           uuid: community.uuid,
           createdAt: community.createdAt,
@@ -204,11 +229,16 @@ class SpaceManagementBloc
     LoadCommunityAndSpacesEvent event,
     Emitter<SpaceManagementState> emit,
   ) async {
+    _logEvent('LoadCommunityAndSpacesEvent');
+
     var prevState = state;
     emit(SpaceManagementLoading());
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       _onloadProducts();
-      List<CommunityModel> communities = await _api.fetchCommunities();
+      List<CommunityModel> communities =
+          await _api.fetchCommunities(projectUuid);
 
       List<CommunityModel> updatedCommunities = await Future.wait(
         communities.map((community) async {
@@ -242,8 +272,10 @@ class SpaceManagementBloc
   ) async {
     try {
       emit(SpaceManagementLoading());
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
-      final success = await _api.deleteCommunity(event.communityUuid);
+      final success =
+          await _api.deleteCommunity(event.communityUuid, projectUuid);
       if (success) {
         add(LoadCommunityAndSpacesEvent());
       } else {
@@ -268,8 +300,10 @@ class SpaceManagementBloc
     emit(SpaceManagementLoading());
 
     try {
-      CommunityModel? newCommunity =
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-          await _api.createCommunity(event.name, event.description);
+
+      CommunityModel? newCommunity = await _api.createCommunity(
+          event.name, event.description, projectUuid);
       var prevSpaceModels = await fetchSpaceModels(previousState);
 
       if (newCommunity != null) {
@@ -412,6 +446,7 @@ class SpaceManagementBloc
   Future<List<SpaceModel>> saveSpacesHierarchically(
       List<SpaceModel> spaces, String communityUuid) async {
     final orderedSpaces = flattenHierarchy(spaces);
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
     final parentsToDelete = orderedSpaces.where((space) =>
         space.status == SpaceStatus.deleted &&
@@ -420,7 +455,7 @@ class SpaceManagementBloc
     for (var parent in parentsToDelete) {
       try {
         if (parent.uuid != null) {
-          await _api.deleteSpace(communityUuid, parent.uuid!);
+          await _api.deleteSpace(communityUuid, parent.uuid!, projectUuid);
         }
       } catch (e) {
         rethrow;
@@ -433,7 +468,8 @@ class SpaceManagementBloc
         if (space.uuid != null && space.uuid!.isNotEmpty) {
           List<TagModelUpdate> tagUpdates = [];
 
-          final prevSpace = await _api.getSpace(communityUuid, space.uuid!);
+          final prevSpace =
+              await _api.getSpace(communityUuid, space.uuid!, projectUuid);
           final List<UpdateSubspaceTemplateModel> subspaceUpdates = [];
           final List<SubspaceModel>? prevSubspaces = prevSpace?.subspaces;
           final List<SubspaceModel>? newSubspaces = space.subspaces;
@@ -502,17 +538,17 @@ class SpaceManagementBloc
           }
 
           final response = await _api.updateSpace(
-            communityId: communityUuid,
+              communityId: communityUuid,
-            spaceId: space.uuid!,
+              spaceId: space.uuid!,
-            name: space.name,
+              name: space.name,
-            parentId: space.parent?.uuid,
+              parentId: space.parent?.uuid,
-            isPrivate: space.isPrivate,
+              isPrivate: space.isPrivate,
-            position: space.position,
+              position: space.position,
-            icon: space.icon,
+              icon: space.icon,
-            subspaces: subspaceUpdates,
+              subspaces: subspaceUpdates,
-            tags: tagUpdates,
+              tags: tagUpdates,
-            direction: space.incomingConnection?.direction,
+              direction: space.incomingConnection?.direction,
-          );
+              projectId: projectUuid);
         } else {
           // Call create if the space does not have a UUID
           final List<CreateTagBodyModel> tagBodyModels = space.tags != null
@@ -531,17 +567,17 @@ class SpaceManagementBloc
               [];
 
           final response = await _api.createSpace(
-            communityId: communityUuid,
+              communityId: communityUuid,
-            name: space.name,
+              name: space.name,
-            parentId: space.parent?.uuid,
+              parentId: space.parent?.uuid,
-            isPrivate: space.isPrivate,
+              isPrivate: space.isPrivate,
-            position: space.position,
+              position: space.position,
-            icon: space.icon,
+              icon: space.icon,
-            direction: space.incomingConnection?.direction,
+              direction: space.incomingConnection?.direction,
-            spaceModelUuid: space.spaceModel?.uuid,
+              spaceModelUuid: space.spaceModel?.uuid,
-            tags: tagBodyModels,
+              tags: tagBodyModels,
-            subspaces: createSubspaceBodyModels,
+              subspaces: createSubspaceBodyModels,
-          );
+              projectId: projectUuid);
           space.uuid = response?.uuid;
         }
       } catch (e) {
@@ -581,8 +617,10 @@ class SpaceManagementBloc
     emit(SpaceManagementLoading());
     try {
       var prevState = state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
-      List<CommunityModel> communities = await _api.fetchCommunities();
+      List<CommunityModel> communities =
+          await _api.fetchCommunities(projectUuid);
 
       List<CommunityModel> updatedCommunities = await Future.wait(
         communities.map((community) async {

lib/pages/spaces_management/all_spaces/model/space_model.dart

@@ -95,6 +95,9 @@ class SpaceModel {
       icon: json['icon'] ?? Assets.location,
       position: Offset(json['x'] ?? 0, json['y'] ?? 0),
       isHovered: false,
+      spaceModel: json['spaceModel'] != null
+          ? SpaceTemplateModel.fromJson(json['spaceModel'])
+          : null,
       tags: (json['tags'] as List<dynamic>?)
               ?.where((item) => item is Map<String, dynamic>) // Validate type
               .map((item) => Tag.fromJson(item as Map<String, dynamic>))

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

@@ -28,8 +28,11 @@ class SpaceManagementPageState extends State<SpaceManagementPage> {
     return MultiBlocProvider(
       providers: [
         BlocProvider(
-          create: (_) => SpaceManagementBloc(_api, _productApi, _spaceModelApi)
+          create: (_) => SpaceManagementBloc(
-            ..add(LoadCommunityAndSpacesEvent()),
+            _api,
+            _productApi,
+            _spaceModelApi,
+          )..add(LoadCommunityAndSpacesEvent()),
         ),
         BlocProvider(
           create: (_) => CenterBodyBloc(),
@@ -64,11 +67,11 @@ class SpaceManagementPageState extends State<SpaceManagementPage> {
               );
             } else if (state is SpaceModelLoaded) {
               return LoadedSpaceView(
-                  communities: state.communities,
+                communities: state.communities,
-                  products: state.products,
+                products: state.products,
-                  spaceModels: state.spaceModels,
+                spaceModels: state.spaceModels,
-                  shouldNavigateToSpaceModelPage: true,
+                shouldNavigateToSpaceModelPage: true,
-                  );
+              );
             } else if (state is SpaceManagementError) {
               return Center(child: Text('Error: ${state.errorMessage}'));
             }

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

@@ -22,6 +22,9 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/curved_li
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/duplicate_process_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_card_widget.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_container_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/helper/connection_helper.dart';
+import 'package:syncrow_web/pages/spaces_management/helper/space_helper.dart';
+import 'package:syncrow_web/pages/spaces_management/helper/tag_helper.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
@@ -130,7 +133,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
               communities: widget.communities,
               communityName: widget.selectedCommunity?.name,
               community: widget.selectedCommunity,
-              isSave: isSave(spaces),
+              isSave: SpaceHelper.isSave(spaces),
               isEditingName: isEditingName,
               nameController: _nameController,
               onSave: _saveSpaces,
@@ -175,7 +178,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
                       children: [
                         for (var connection in connections)
                           Opacity(
-                            opacity: _isHighlightedConnection(connection)
+                            opacity: ConnectionHelper.isHighlightedConnection(
+                                    connection, widget.selectedSpace)
                                 ? 1.0
                                 : 0.3, // Adjust opacity
                             child: CustomPaint(
@@ -195,7 +199,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
                                     screenSize,
                                     position:
                                         spaces[index].position + newPosition,
-                                    
                                     parentIndex: index,
                                     direction: direction,
                                   );
@@ -209,7 +212,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
                                 },
                                 buildSpaceContainer: (int index) {
                                   final bool isHighlighted =
-                                      _isHighlightedSpace(spaces[index]);
+                                      SpaceHelper.isHighlightedSpace(
+                                          spaces[index], widget.selectedSpace);
 
                                   return Opacity(
                                       opacity: isHighlighted ? 1.0 : 0.3,
@@ -295,7 +299,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         return CreateSpaceDialog(
           products: widget.products,
           spaceModels: widget.spaceModels,
-          allTags: _getAllTagValues(spaces),
+          allTags:
+              TagHelper.getAllTagValues(widget.communities, widget.spaceModels),
           parentSpace: parentIndex != null ? spaces[parentIndex] : null,
           onCreateSpace: (String name,
               String icon,
@@ -306,7 +311,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
             setState(() {
               // Set the first space in the center or use passed position
               Offset centerPosition =
-                  position ?? _getCenterPosition(screenSize);
+                  position ?? ConnectionHelper.getCenterPosition(screenSize);
               SpaceModel newSpace = SpaceModel(
                   name: name,
                   icon: icon,
@@ -351,11 +356,15 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
             spaceModels: widget.spaceModels,
             name: widget.selectedSpace!.name,
             icon: widget.selectedSpace!.icon,
+            parentSpace: SpaceHelper.findSpaceByInternalId(
+                widget.selectedSpace?.parent?.internalId, spaces),
             editSpace: widget.selectedSpace,
+            currentSpaceModel: widget.selectedSpace?.spaceModel,
             tags: widget.selectedSpace?.tags,
             subspaces: widget.selectedSpace?.subspaces,
             isEdit: true,
-          allTags: _getAllTagValues(spaces),
+            allTags: TagHelper.getAllTagValues(
+                widget.communities, widget.spaceModels),
             onCreateSpace: (String name,
                 String icon,
                 List<SelectedProduct> selectedProducts,
@@ -374,6 +383,15 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
                   widget.selectedSpace!.status =
                       SpaceStatus.modified; // Mark as modified
                 }
+
+                for (var space in spaces) {
+                  if (space.internalId == widget.selectedSpace?.internalId) {
+                    space.status = SpaceStatus.modified;
+                    space.subspaces = subspaces;
+                    space.tags = tags;
+                    space.name = name;
+                  }
+                }
               });
             },
             key: Key(widget.selectedSpace!.name),
@@ -452,7 +470,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     }).toList();
 
     if (spacesToSave.isEmpty) {
-      debugPrint("No new or modified spaces to save.");
       return;
     }
 
@@ -516,17 +533,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         );
   }
 
-  bool _isHighlightedSpace(SpaceModel space) {
-    final selectedSpace = widget.selectedSpace;
-    if (selectedSpace == null) return true;
-
-    return space == selectedSpace ||
-        selectedSpace.parent?.internalId == space.internalId ||
-        selectedSpace.children
-                ?.any((child) => child.internalId == space.internalId) ==
-            true;
-  }
-
   void _deselectSpace(BuildContext context) {
     context.read<SpaceManagementBloc>().add(
           SelectSpaceEvent(
@@ -534,28 +540,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         );
   }
 
-  bool _isHighlightedConnection(Connection connection) {
-    if (widget.selectedSpace == null) return true;
-
-    return connection.startSpace == widget.selectedSpace ||
-        connection.endSpace == widget.selectedSpace;
-  }
-
-  Offset _getCenterPosition(Size screenSize) {
-    return Offset(
-      screenSize.width / 2 - 260,
-      screenSize.height / 2 - 200,
-    );
-  }
-
-  bool isSave(List<SpaceModel> spaces) {
-    return spaces.isNotEmpty &&
-        spaces.any((space) =>
-            space.status == SpaceStatus.newSpace ||
-            space.status == SpaceStatus.modified ||
-            space.status == SpaceStatus.deleted);
-  }
-
   void _onDuplicate(BuildContext parentContext) {
     final screenWidth = MediaQuery.of(context).size.width;
 
@@ -641,17 +625,10 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     const double horizontalGap = 200.0;
     const double verticalGap = 100.0;
 
-    final Map<String, int> nameCounters = {};
-
-    String _generateCopyName(String originalName) {
-      final baseName = originalName.replaceAll(RegExp(r'\(\d+\)$'), '').trim();
-      nameCounters[baseName] = (nameCounters[baseName] ?? 0) + 1;
-      return "$baseName(${nameCounters[baseName]})";
-    }
-
     SpaceModel duplicateRecursive(SpaceModel original, Offset parentPosition,
         SpaceModel? duplicatedParent) {
-      Offset newPosition = parentPosition + Offset(horizontalGap, 0);
+      Offset newPosition =
+          Offset(parentPosition.dx + horizontalGap, original.position.dy);
 
       while (spaces.any((s) =>
           (s.position - newPosition).distance < horizontalGap &&
@@ -659,7 +636,18 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         newPosition += Offset(horizontalGap, 0);
       }
 
-      final duplicatedName = _generateCopyName(original.name);
+      final duplicatedName =
+          SpaceHelper.generateUniqueSpaceName(original.name, spaces);
+
+      final List<SubspaceModel>? duplicatedSubspaces;
+      final List<Tag>? duplicatedTags;
+      if (original.spaceModel != null) {
+        duplicatedTags = [];
+        duplicatedSubspaces = [];
+      } else {
+        duplicatedTags = original.tags;
+        duplicatedSubspaces = original.subspaces;
+      }
 
       final duplicated = SpaceModel(
         name: duplicatedName,
@@ -670,8 +658,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         status: SpaceStatus.newSpace,
         parent: duplicatedParent,
         spaceModel: original.spaceModel,
-        subspaces: original.subspaces,
+        subspaces: duplicatedSubspaces,
-        tags: original.tags,
+        tags: duplicatedTags,
       );
 
       originalToDuplicate[original] = duplicated;
@@ -684,7 +672,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
           final newConnection = Connection(
             startSpace: duplicatedParent,
             endSpace: duplicated,
-            direction: "down",
+            direction: original.incomingConnection?.direction ?? 'down',
           );
           connections.add(newConnection);
           duplicated.incomingConnection = newConnection;
@@ -723,10 +711,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
             child.incomingConnection?.direction == "down" ?? false;
 
         if (isDownDirection && childrenWithDownDirection.length == 1) {
-          // Place the only "down" child vertically aligned with the parent
           childStartPosition = duplicated.position + Offset(0, verticalGap);
         } else if (!isDownDirection) {
-          // Position children with other directions horizontally
           childStartPosition = duplicated.position + Offset(horizontalGap, 0);
         }
 
@@ -747,14 +733,4 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
       duplicateRecursive(space, space.position, duplicatedParent);
     }
   }
-
-    List<String> _getAllTagValues(List<SpaceModel> spaces) {
-    final List<String> allTags = [];
-    for (final space in spaces) {
-      if (space.tags != null) {
-        allTags.addAll(space.listAllTagValues());
-      }
-    }
-    return allTags;
-  }
 }

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

@@ -12,6 +12,7 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/icon_selection_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/assign_tag/views/assign_tag_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart';
+import 'package:syncrow_web/pages/spaces_management/helper/space_helper.dart';
 import 'package:syncrow_web/pages/spaces_management/helper/tag_helper.dart';
 import 'package:syncrow_web/pages/spaces_management/link_space_model/view/link_space_model_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
@@ -40,6 +41,7 @@ class CreateSpaceDialog extends StatefulWidget {
   final List<SubspaceModel>? subspaces;
   final List<Tag>? tags;
   final List<String>? allTags;
+  final SpaceTemplateModel? currentSpaceModel;
 
   const CreateSpaceDialog(
       {super.key,
@@ -54,7 +56,8 @@ class CreateSpaceDialog extends StatefulWidget {
       this.selectedProducts = const [],
       this.spaceModels,
       this.subspaces,
-      this.tags});
+      this.tags,
+      this.currentSpaceModel});
 
   @override
   CreateSpaceDialogState createState() => CreateSpaceDialogState();
@@ -81,12 +84,22 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
         widget.selectedProducts.isNotEmpty ? widget.selectedProducts : [];
     isOkButtonEnabled =
         enteredName.isNotEmpty || nameController.text.isNotEmpty;
-    tags = widget.tags ?? [];
+    if (widget.currentSpaceModel != null) {
-    subspaces = widget.subspaces ?? [];
+      subspaces = [];
+      tags = [];
+    } else {
+      tags = widget.tags ?? [];
+      subspaces = widget.subspaces ?? [];
+    }
+    selectedSpaceModel = widget.currentSpaceModel;
   }
 
   @override
   Widget build(BuildContext context) {
+    bool isSpaceModelDisabled = (tags != null && tags!.isNotEmpty ||
+        subspaces != null && subspaces!.isNotEmpty);
+    bool isTagsAndSubspaceModelDisabled = (selectedSpaceModel != null);
+
     final screenWidth = MediaQuery.of(context).size.width;
     return AlertDialog(
       title: widget.isEdit
@@ -165,7 +178,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                             isNameFieldInvalid = value.isEmpty;
 
                             if (!isNameFieldInvalid) {
-                              if (_isNameConflict(value)) {
+                              if (SpaceHelper.isNameConflict(value, widget.parentSpace, widget.editSpace)) {
                                 isNameFieldExist = true;
                                 isOkButtonEnabled = false;
                               } else {
@@ -232,11 +245,14 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                               padding: EdgeInsets.zero,
                             ),
                             onPressed: () {
-                              _showLinkSpaceModelDialog(context);
+                              isSpaceModelDisabled
+                                  ? null
+                                  : _showLinkSpaceModelDialog(context);
                             },
-                            child: const ButtonContentWidget(
+                            child: ButtonContentWidget(
                               svgAssets: Assets.link,
                               label: 'Link a space model',
+                              disabled: isSpaceModelDisabled,
                             ),
                           )
                         : Container(
@@ -325,12 +341,15 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                               overlayColor: ColorsManager.transparentColor,
                             ),
                             onPressed: () async {
-                              _showSubSpaceDialog(context, enteredName, [],
+                              isTagsAndSubspaceModelDisabled
-                                  false, widget.products, subspaces);
+                                  ? null
+                                  : _showSubSpaceDialog(context, enteredName,
+                                      [], false, widget.products, subspaces);
                             },
-                            child: const ButtonContentWidget(
+                            child: ButtonContentWidget(
                               icon: Icons.add,
                               label: 'Create Sub Space',
+                              disabled: isTagsAndSubspaceModelDisabled,
                             ),
                           )
                         : SizedBox(
@@ -457,7 +476,8 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                       context: context,
                                       builder: (context) => AssignTagDialog(
                                         products: widget.products,
-                                        subspaces: widget.subspaces,
+                                        subspaces: subspaces,
+                                        allTags: widget.allTags,
                                         addedProducts: TagHelper
                                             .createInitialSelectedProductsForTags(
                                                 tags ?? [], subspaces),
@@ -483,20 +503,22 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                           )
                         : TextButton(
                             onPressed: () {
-                              _showTagCreateDialog(
+                              isTagsAndSubspaceModelDisabled
-                                context,
+                                  ? null
-                                enteredName,
+                                  : _showTagCreateDialog(
-                                widget.isEdit,
+                                      context,
-                                widget.products,
+                                      enteredName,
-                                subspaces,
+                                      widget.isEdit,
-                              );
+                                      widget.products,
+                                    );
                             },
                             style: TextButton.styleFrom(
                               padding: EdgeInsets.zero,
                             ),
-                            child: const ButtonContentWidget(
+                            child: ButtonContentWidget(
                               icon: Icons.add,
                               label: 'Add Devices',
+                              disabled: isTagsAndSubspaceModelDisabled,
                             ))
                   ],
                 ),
@@ -570,14 +592,6 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
     );
   }
 
-  bool _isNameConflict(String value) {
-    return (widget.parentSpace?.children.any((child) => child.name == value) ??
-            false) ||
-        (widget.parentSpace?.name == value) ||
-        (widget.editSpace?.parent?.name == value) ||
-        (widget.editSpace?.children.any((child) => child.name == value) ??
-            false);
-  }
  
   void _showLinkSpaceModelDialog(BuildContext context) {
     showDialog(
@@ -617,9 +631,26 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
             products: products,
             existingSubSpaces: existingSubSpaces,
             onSave: (slectedSubspaces) {
+              final List<Tag> tagsToAppendToSpace = [];
+
+              if (slectedSubspaces != null) {
+                final updatedIds =
+                    slectedSubspaces.map((s) => s.internalId).toSet();
+                if (existingSubSpaces != null) {
+                  final deletedSubspaces = existingSubSpaces
+                      .where((s) => !updatedIds.contains(s.internalId))
+                      .toList();
+                  for (var s in deletedSubspaces) {
+                    if (s.tags != null) {
+                      tagsToAppendToSpace.addAll(s.tags!);
+                    }
+                  }
+                }
+              }
               if (slectedSubspaces != null) {
                 setState(() {
                   subspaces = slectedSubspaces;
+                  tags?.addAll(tagsToAppendToSpace);
                   selectedSpaceModel = null;
                 });
               }
@@ -629,7 +660,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
   }
 
   void _showTagCreateDialog(BuildContext context, String name, bool isEdit,
-      List<ProductModel>? products, List<SubspaceModel>? subspaces) {
+      List<ProductModel>? products) {
     isEdit
         ? showDialog(
             context: context,

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

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.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';
@@ -11,7 +12,7 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/space_tem
 import 'package:syncrow_web/pages/spaces_management/space_model/view/space_model_page.dart';
 import 'package:syncrow_web/services/space_model_mang_api.dart';
 
-class LoadedSpaceView extends StatelessWidget {
+class LoadedSpaceView extends StatefulWidget {
   final List<CommunityModel> communities;
   final CommunityModel? selectedCommunity;
   final SpaceModel? selectedSpace;
@@ -26,55 +27,91 @@ class LoadedSpaceView extends StatelessWidget {
     this.selectedSpace,
     this.products,
     this.spaceModels,
-    required this.shouldNavigateToSpaceModelPage
+    required this.shouldNavigateToSpaceModelPage,
   });
 
   @override
-  Widget build(BuildContext context) {
+  _LoadedSpaceViewState createState() => _LoadedSpaceViewState();
+}
 
+class _LoadedSpaceViewState extends State<LoadedSpaceView> {
+  late List<SpaceTemplateModel> _spaceModels;
+
+  @override
+  void initState() {
+    super.initState();
+    _spaceModels = List.from(widget.spaceModels ?? []);
+  }
+
+  @override
+  @override
+  void didUpdateWidget(covariant LoadedSpaceView oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.spaceModels != oldWidget.spaceModels) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (mounted) {
+          setState(() {
+            _spaceModels = List.from(widget.spaceModels ?? []);
+          });
+        }
+      });
+    }
+  }
+
+  void _onSpaceModelsUpdated(List<SpaceTemplateModel> updatedModels) {
+    if (mounted && updatedModels != _spaceModels) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (mounted) {
+          setState(() {
+            _spaceModels = updatedModels;
+          });
+        }
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
     return Stack(
       clipBehavior: Clip.none,
       children: [
-        Row(
+        widget.shouldNavigateToSpaceModelPage
-          children: [
+            ? Row(
-            SidebarWidget(
+                children: [
-              communities: communities,
+                  SizedBox(width: 300, child: SpaceTreeView(onSelect: () {})),
-              selectedSpaceUuid:
+                  Expanded(
-                  selectedSpace?.uuid ?? selectedCommunity?.uuid ?? '',
-            ),
-            shouldNavigateToSpaceModelPage
-                ? Expanded(
                     child: BlocProvider(
                       create: (context) => SpaceModelBloc(
                         api: SpaceModelManagementApi(),
-                        initialSpaceModels: spaceModels ?? [],
+                        initialSpaceModels: _spaceModels,
                       ),
                       child: SpaceModelPage(
-                        products: products,
+                        products: widget.products,
+                        onSpaceModelsUpdated: _onSpaceModelsUpdated,
                       ),
                     ),
-                  )
-                : CommunityStructureArea(
-                    selectedCommunity: selectedCommunity,
-                    selectedSpace: selectedSpace,
-                    spaces: selectedCommunity?.spaces ?? [],
-                    products: products,
-                    communities: communities,
-                    spaceModels: spaceModels,
                   ),
-          ],
+                ],
-        ),
+              )
+            : Row(
+                children: [
+                  SidebarWidget(
+                    communities: widget.communities,
+                    selectedSpaceUuid:
+                        widget.selectedSpace?.uuid ?? widget.selectedCommunity?.uuid ?? '',
+                  ),
+                  CommunityStructureArea(
+                    selectedCommunity: widget.selectedCommunity,
+                    selectedSpace: widget.selectedSpace,
+                    spaces: widget.selectedCommunity?.spaces ?? [],
+                    products: widget.products,
+                    communities: widget.communities,
+                    spaceModels: _spaceModels,
+                  ),
+                ],
+              ),
         const GradientCanvasBorderWidget(),
       ],
     );
   }
-
-  SpaceModel? findSpaceByUuid(String? uuid, List<CommunityModel> communities) {
-    for (var community in communities) {
-      for (var space in community.spaces) {
-        if (space.uuid == uuid) return space;
-      }
-    }
-    return null;
-  }
 }

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

@@ -4,7 +4,9 @@ import 'package:syncrow_web/pages/spaces_management/assign_tag/bloc/assign_tag_e
 import 'package:syncrow_web/pages/spaces_management/assign_tag/bloc/assign_tag_state.dart';
 
 class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
-  AssignTagBloc() : super(AssignTagInitial()) {
+  final List<String> allTags;
+
+  AssignTagBloc(this.allTags) : super(AssignTagInitial()) {
     on<InitializeTags>((event, emit) {
       final initialTags = event.initialTags ?? [];
 
@@ -16,25 +18,25 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
         }
       }
 
-      final allTags = <Tag>[];
+      final tags = <Tag>[];
 
       for (var selectedProduct in event.addedProducts) {
         final existingCount = existingTagCounts[selectedProduct.productId] ?? 0;
 
         if (selectedProduct.count == 0 ||
             selectedProduct.count <= existingCount) {
-          allTags.addAll(initialTags
+          tags.addAll(initialTags
               .where((tag) => tag.product?.uuid == selectedProduct.productId));
           continue;
         }
 
         final missingCount = selectedProduct.count - existingCount;
 
-        allTags.addAll(initialTags
+        tags.addAll(initialTags
             .where((tag) => tag.product?.uuid == selectedProduct.productId));
 
         if (missingCount > 0) {
-          allTags.addAll(List.generate(
+          tags.addAll(List.generate(
             missingCount,
             (index) => Tag(
               tag: '',
@@ -45,10 +47,14 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
         }
       }
 
+      final updatedTags = _calculateAvailableTags(allTags, tags);
+
       emit(AssignTagLoaded(
-          tags: allTags,
+        tags: tags,
-          isSaveEnabled: _validateTags(allTags),
+        updatedTags: updatedTags, 
-          errorMessage: ''));
+        isSaveEnabled: _validateTags(tags),
+        errorMessage: '',
+      ));
     });
 
     on<UpdateTagEvent>((event, emit) {
@@ -56,9 +62,13 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
 
       if (currentState is AssignTagLoaded && currentState.tags.isNotEmpty) {
         final tags = List<Tag>.from(currentState.tags);
-        tags[event.index].tag = event.tag;
+        tags[event.index] = tags[event.index].copyWith(tag: event.tag);
+
+        final updatedTags = _calculateAvailableTags(allTags, tags);
+
         emit(AssignTagLoaded(
           tags: tags,
+          updatedTags: updatedTags,
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
@@ -71,13 +81,17 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
       if (currentState is AssignTagLoaded && currentState.tags.isNotEmpty) {
         final tags = List<Tag>.from(currentState.tags);
 
-        // Use copyWith for immutability
+        // Update the location
         tags[event.index] =
             tags[event.index].copyWith(location: event.location);
 
+        final updatedTags = _calculateAvailableTags(allTags, tags);
+
         emit(AssignTagLoaded(
           tags: tags,
+          updatedTags: updatedTags,
           isSaveEnabled: _validateTags(tags),
+          errorMessage: _getValidationError(tags),
         ));
       }
     });
@@ -90,6 +104,7 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
 
         emit(AssignTagLoaded(
           tags: tags,
+          updatedTags: _calculateAvailableTags(allTags, tags),
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
@@ -100,34 +115,37 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
       final currentState = state;
 
       if (currentState is AssignTagLoaded && currentState.tags.isNotEmpty) {
-        final updatedTags = List<Tag>.from(currentState.tags)
+        final tags = List<Tag>.from(currentState.tags)
           ..remove(event.tagToDelete);
 
+        // Recalculate available tags
+        final updatedTags = _calculateAvailableTags(allTags, tags);
+
         emit(AssignTagLoaded(
-          tags: updatedTags,
+          tags: tags,
-          isSaveEnabled: _validateTags(updatedTags),
+          updatedTags: updatedTags,
-        ));
+          isSaveEnabled: _validateTags(tags),
-      } else {
+          errorMessage: _getValidationError(tags),
-        emit(const AssignTagLoaded(
-          tags: [],
-          isSaveEnabled: false,
         ));
       }
     });
   }
 
+  // Validate the tags for duplicates or empty values
   bool _validateTags(List<Tag> tags) {
     final uniqueTags = tags.map((tag) => tag.tag?.trim() ?? '').toSet();
     final hasEmptyTag = tags.any((tag) => (tag.tag?.trim() ?? '').isEmpty);
-    final isValid = uniqueTags.length == tags.length && !hasEmptyTag;
+    return uniqueTags.length == tags.length && !hasEmptyTag;
-    return isValid;
   }
 
+  // Get validation error for duplicate tags
   String? _getValidationError(List<Tag> tags) {
-    final hasEmptyTag = tags.any((tag) => (tag.tag?.trim() ?? '').isEmpty);
+    final nonEmptyTags = tags
-    if (hasEmptyTag) return 'Tags cannot be empty.';
-    final duplicateTags = tags
         .map((tag) => tag.tag?.trim() ?? '')
+        .where((tag) => tag.isNotEmpty)
+        .toList();
+
+    final duplicateTags = nonEmptyTags
         .fold<Map<String, int>>({}, (map, tag) {
           map[tag] = (map[tag] ?? 0) + 1;
           return map;
@@ -143,4 +161,15 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
 
     return null;
   }
+
+  List<String> _calculateAvailableTags(List<String> allTags, List<Tag> tags) {
+    final selectedTags = tags
+        .where((tag) => (tag.tag?.trim().isNotEmpty ?? false))
+        .map((tag) => tag.tag!.trim())
+        .toSet();
+
+    final availableTags =
+        allTags.where((tag) => !selectedTags.contains(tag.trim())).toList();
+    return availableTags;
+  }
 }

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

@@ -1,6 +1,5 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
-import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 
 abstract class AssignTagState extends Equatable {
   const AssignTagState();
@@ -15,17 +14,21 @@ class AssignTagLoading extends AssignTagState {}
 
 class AssignTagLoaded extends AssignTagState {
   final List<Tag> tags;
+  final List<String> updatedTags; 
+
   final bool isSaveEnabled;
-  final String?  errorMessage;
+  final String? errorMessage;
 
   const AssignTagLoaded({
     required this.tags,
     required this.isSaveEnabled,
-    this.errorMessage,
+    required this.updatedTags,
+    required this.errorMessage,
   });
 
   @override
-  List<Object> get props => [tags, isSaveEnabled];
+  List<Object> get props =>
+      [tags, updatedTags, isSaveEnabled, errorMessage ?? ''];
 }
 
 class AssignTagError extends AssignTagState {

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

@@ -14,6 +14,7 @@ import 'package:syncrow_web/pages/spaces_management/assign_tag/bloc/assign_tag_e
 import 'package:syncrow_web/pages/spaces_management/assign_tag/bloc/assign_tag_state.dart';
 import 'package:syncrow_web/pages/spaces_management/helper/tag_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:uuid/uuid.dart';
 
 class AssignTagDialog extends StatelessWidget {
   final List<ProductModel>? products;
@@ -47,7 +48,7 @@ class AssignTagDialog extends StatelessWidget {
       ..add('Main Space');
 
     return BlocProvider(
-      create: (_) => AssignTagBloc()
+      create: (_) => AssignTagBloc(allTags ?? [])
         ..add(InitializeTags(
           initialTags: initialTags,
           addedProducts: addedProducts,
@@ -71,6 +72,7 @@ class AssignTagDialog extends StatelessWidget {
                       child: DataTable(
                         headingRowColor: WidgetStateProperty.all(
                             ColorsManager.dataHeaderGrey),
+                        key: ValueKey(state.tags.length),
                         border: TableBorder.all(
                           color: ColorsManager.dataHeaderGrey,
                           width: 1,
@@ -118,8 +120,7 @@ class AssignTagDialog extends StatelessWidget {
                             : List.generate(state.tags.length, (index) {
                                 final tag = state.tags[index];
                                 final controller = controllers[index];
-                                final availableTags = getAvailableTags(
+
-                                    allTags ?? [], state.tags, tag);
                                 return DataRow(
                                   cells: [
                                     DataCell(Text((index + 1).toString())),
@@ -158,6 +159,8 @@ class AssignTagDialog extends StatelessWidget {
                                                     .add(DeleteTag(
                                                         tagToDelete: tag,
                                                         tags: state.tags));
+
+                                                controllers.removeAt(index);
                                               },
                                               tooltip: 'Delete Tag',
                                               padding: EdgeInsets.zero,
@@ -176,7 +179,9 @@ class AssignTagDialog extends StatelessWidget {
                                           width: double
                                               .infinity, // Ensure full width for dropdown
                                           child: DialogTextfieldDropdown(
-                                            items: availableTags,
+                                            key: ValueKey(
+                                                'dropdown_${Uuid().v4()}_${index}'),
+                                            items: state.updatedTags,
                                             initialValue: tag.tag,
                                             onSelected: (value) {
                                               controller.text = value;
@@ -233,11 +238,13 @@ class AssignTagDialog extends StatelessWidget {
                           label: 'Add New Device',
                           onPressed: () async {
                             final updatedTags = List<Tag>.from(state.tags);
-                            final result = processTags(updatedTags, subspaces);
+                            final result =
+                                TagHelper.processTags(updatedTags, subspaces);
 
                             final processedTags =
                                 result['updatedTags'] as List<Tag>;
-                            final processedSubspaces = result['subspaces'];
+                            final processedSubspaces = List<SubspaceModel>.from(
+                                result['subspaces'] as List<dynamic>);
 
                             Navigator.of(context).pop();
 
@@ -253,6 +260,7 @@ class AssignTagDialog extends StatelessWidget {
                                 spaceTags: processedTags,
                                 isCreate: false,
                                 onSave: onSave,
+                                allTags: allTags,
                               ),
                             );
                           },
@@ -263,20 +271,21 @@ class AssignTagDialog extends StatelessWidget {
                     Expanded(
                       child: DefaultButton(
                         borderRadius: 10,
-                        backgroundColor: state.isSaveEnabled
+                        backgroundColor: ColorsManager.secondaryColor,
-                            ? ColorsManager.secondaryColor
+                        foregroundColor: state.isSaveEnabled
-                            : ColorsManager.grayColor,
+                            ? ColorsManager.whiteColors
-                        foregroundColor: ColorsManager.whiteColors,
+                            : ColorsManager.whiteColorsWithOpacity,
                         onPressed: state.isSaveEnabled
                             ? () async {
                                 final updatedTags = List<Tag>.from(state.tags);
-                                final result =
+                                final result = TagHelper.processTags(
-                                    processTags(updatedTags, subspaces);
+                                    updatedTags, subspaces);
 
                                 final processedTags =
                                     result['updatedTags'] as List<Tag>;
                                 final processedSubspaces =
-                                    result['subspaces'] as List<SubspaceModel>;
+                                    List<SubspaceModel>.from(
+                                        result['subspaces'] as List<dynamic>);
                                 onSave?.call(processedTags, processedSubspaces);
                                 Navigator.of(context).pop();
                               }
@@ -298,118 +307,4 @@ class AssignTagDialog extends StatelessWidget {
       ),
     );
   }
-
-  List<String> getAvailableTags(
-      List<String> allTags, List<Tag> currentTags, Tag currentTag) {
-    return allTags
-        .where((tagValue) => !currentTags
-            .where((e) => e != currentTag) // Exclude the current row
-            .map((e) => e.tag)
-            .contains(tagValue))
-        .toList();
-  }
-
-  Map<String, dynamic> processTags(
-      List<Tag> updatedTags, List<SubspaceModel>? subspaces) {
-    final modifiedTags = List<Tag>.from(updatedTags);
-    final modifiedSubspaces = List<SubspaceModel>.from(subspaces ?? []);
-
-    if (subspaces != null) {
-      for (var subspace in subspaces) {
-        subspace.tags?.removeWhere(
-          (tag) => !modifiedTags
-              .any((updatedTag) => updatedTag.internalId == tag.internalId),
-        );
-      }
-    }
-    for (var tag in modifiedTags.toList()) {
-      if (modifiedSubspaces.isEmpty) continue;
-
-      final prevIndice = checkTagExistInSubspace(tag, modifiedSubspaces);
-
-      if ((tag.location == 'Main Space' || tag.location == null) &&
-          (prevIndice == null ||
-              modifiedSubspaces[prevIndice].subspaceName == 'Main Space')) {
-        continue;
-      }
-
-      if ((tag.location == 'Main Space' || tag.location == null) &&
-          prevIndice != null) {
-        modifiedSubspaces[prevIndice]
-            .tags
-            ?.removeWhere((t) => t.internalId == tag.internalId);
-        continue;
-      }
-
-      if ((tag.location != 'Main Space' && tag.location != null) &&
-          prevIndice == null) {
-        final newIndex = modifiedSubspaces
-            .indexWhere((subspace) => subspace.subspaceName == tag.location);
-        if (newIndex != -1) {
-          if (modifiedSubspaces[newIndex]
-                  .tags
-                  ?.any((t) => t.internalId == tag.internalId) !=
-              true) {
-            tag.location = modifiedSubspaces[newIndex].subspaceName;
-            modifiedSubspaces[newIndex].tags?.add(tag);
-          }
-        }
-        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
-        continue;
-      }
-
-      if ((tag.location != 'Main Space' && tag.location != null) &&
-          tag.location != modifiedSubspaces[prevIndice!].subspaceName) {
-        modifiedSubspaces[prevIndice]
-            .tags
-            ?.removeWhere((t) => t.internalId == tag.internalId);
-        final newIndex = modifiedSubspaces
-            .indexWhere((subspace) => subspace.subspaceName == tag.location);
-        if (newIndex != -1) {
-          if (modifiedSubspaces[newIndex]
-                  .tags
-                  ?.any((t) => t.internalId == tag.internalId) !=
-              true) {
-            tag.location = modifiedSubspaces[newIndex].subspaceName;
-            modifiedSubspaces[newIndex].tags?.add(tag);
-          }
-        }
-
-        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
-        continue;
-      }
-
-      if ((tag.location != 'Main Space' && tag.location != null) &&
-          tag.location == modifiedSubspaces[prevIndice!].subspaceName) {
-        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
-        continue;
-      }
-
-      if ((tag.location == 'Main Space' || tag.location == null) &&
-          prevIndice != null) {
-        modifiedSubspaces[prevIndice]
-            .tags
-            ?.removeWhere((t) => t.internalId == tag.internalId);
-      }
-    }
-
-    return {
-      'updatedTags': modifiedTags,
-      'subspaces': modifiedSubspaces,
-    };
-  }
-
-  int? checkTagExistInSubspace(Tag tag, List<SubspaceModel>? subspaces) {
-    if (subspaces == null) return null;
-    for (int i = 0; i < subspaces.length; i++) {
-      final subspace = subspaces[i];
-      if (subspace.tags == null) continue;
-      for (var t in subspace.tags!) {
-        if (tag.internalId == t.internalId) {
-          return i;
-        }
-      }
-    }
-    return null;
-  }
 }

lib/pages/spaces_management/assign_tag_models/bloc/assign_tag_model_bloc.dart

@@ -5,7 +5,9 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model
 
 class AssignTagModelBloc
     extends Bloc<AssignTagModelEvent, AssignTagModelState> {
-  AssignTagModelBloc() : super(AssignTagModelInitial()) {
+  final List<String> allTags;
+
+  AssignTagModelBloc(this.allTags) : super(AssignTagModelInitial()) {
     on<InitializeTagModels>((event, emit) {
       final initialTags = event.initialTags ?? [];
 
@@ -17,25 +19,25 @@ class AssignTagModelBloc
         }
       }
 
-      final allTags = <TagModel>[];
+      final tags = <TagModel>[];
 
       for (var selectedProduct in event.addedProducts) {
         final existingCount = existingTagCounts[selectedProduct.productId] ?? 0;
 
         if (selectedProduct.count == 0 ||
             selectedProduct.count <= existingCount) {
-          allTags.addAll(initialTags
+          tags.addAll(initialTags
               .where((tag) => tag.product?.uuid == selectedProduct.productId));
           continue;
         }
 
         final missingCount = selectedProduct.count - existingCount;
 
-        allTags.addAll(initialTags
+        tags.addAll(initialTags
             .where((tag) => tag.product?.uuid == selectedProduct.productId));
 
         if (missingCount > 0) {
-          allTags.addAll(List.generate(
+          tags.addAll(List.generate(
             missingCount,
             (index) => TagModel(
               tag: '',
@@ -46,9 +48,12 @@ class AssignTagModelBloc
         }
       }
 
+      final updatedTags = _calculateAvailableTags(allTags, tags);
+
       emit(AssignTagModelLoaded(
-          tags: allTags,
+          tags: tags,
-          isSaveEnabled: _validateTags(allTags),
+          updatedTags: updatedTags,
+          isSaveEnabled: _validateTags(tags),
           errorMessage: ''));
     });
 
@@ -57,9 +62,12 @@ class AssignTagModelBloc
       if (currentState is AssignTagModelLoaded &&
           currentState.tags.isNotEmpty) {
         final tags = List<TagModel>.from(currentState.tags);
-        tags[event.index].tag = event.tag;
+        tags[event.index] = tags[event.index].copyWith(tag: event.tag);
+        final updatedTags = _calculateAvailableTags(allTags, tags);
+
         emit(AssignTagModelLoaded(
           tags: tags,
+          updatedTags: updatedTags,
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
@@ -77,9 +85,13 @@ class AssignTagModelBloc
         tags[event.index] =
             tags[event.index].copyWith(location: event.location);
 
+        final updatedTags = _calculateAvailableTags(allTags, tags);
+
         emit(AssignTagModelLoaded(
           tags: tags,
+          updatedTags: updatedTags,
           isSaveEnabled: _validateTags(tags),
+          errorMessage: _getValidationError(tags),
         ));
       }
     });
@@ -93,6 +105,7 @@ class AssignTagModelBloc
 
         emit(AssignTagModelLoaded(
           tags: tags,
+          updatedTags: _calculateAvailableTags(allTags, tags),
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
@@ -104,24 +117,22 @@ class AssignTagModelBloc
 
       if (currentState is AssignTagModelLoaded &&
           currentState.tags.isNotEmpty) {
-        final updatedTags = List<TagModel>.from(currentState.tags)
+        final tags = List<TagModel>.from(currentState.tags)
           ..remove(event.tagToDelete);
 
+        final updatedTags = _calculateAvailableTags(allTags, tags);
+
         emit(AssignTagModelLoaded(
-          tags: updatedTags,
+          tags: tags,
-          isSaveEnabled: _validateTags(updatedTags),
+          updatedTags: updatedTags,
-        ));
+          isSaveEnabled: _validateTags(tags),
-      } else {
+          errorMessage: _getValidationError(tags),
-        emit(const AssignTagModelLoaded(
-          tags: [],
-          isSaveEnabled: false,
         ));
       } 
     });
   }
 
   bool _validateTags(List<TagModel> tags) {
-    
     final uniqueTags = tags.map((tag) => tag.tag?.trim() ?? '').toSet();
     final hasEmptyTag = tags.any((tag) => (tag.tag?.trim() ?? '').isEmpty);
     final isValid = uniqueTags.length == tags.length && !hasEmptyTag;
@@ -129,14 +140,14 @@ class AssignTagModelBloc
   }
 
   String? _getValidationError(List<TagModel> tags) {
-    final hasEmptyTag = tags.any((tag) => (tag.tag?.trim() ?? '').isEmpty);
-    if (hasEmptyTag) {
-      return 'Tags cannot be empty.';
-    }
-
     // Check for duplicate tags
-    final duplicateTags = tags
+
+    final nonEmptyTags = tags
         .map((tag) => tag.tag?.trim() ?? '')
+        .where((tag) => tag.isNotEmpty)
+        .toList();
+
+    final duplicateTags = nonEmptyTags
         .fold<Map<String, int>>({}, (map, tag) {
           map[tag] = (map[tag] ?? 0) + 1;
           return map;
@@ -152,4 +163,16 @@ class AssignTagModelBloc
 
     return null;
   }
+
+  List<String> _calculateAvailableTags(
+      List<String> allTags, List<TagModel> tags) {
+    final selectedTags = tags
+        .where((tag) => (tag.tag?.trim().isNotEmpty ?? false))
+        .map((tag) => tag.tag!.trim())
+        .toSet();
+
+    final availableTags =
+        allTags.where((tag) => !selectedTags.contains(tag.trim())).toList();
+    return availableTags;
+  }
 }

lib/pages/spaces_management/assign_tag_models/bloc/assign_tag_model_state.dart

@@ -17,14 +17,17 @@ class AssignTagModelLoaded extends AssignTagModelState {
   final bool isSaveEnabled;
   final String? errorMessage;
 
+  final List<String> updatedTags;
+
   const AssignTagModelLoaded({
     required this.tags,
     required this.isSaveEnabled,
+    required this.updatedTags,
     this.errorMessage,
   });
 
   @override
-  List<Object?> get props => [tags, isSaveEnabled, errorMessage];
+  List<Object?> get props => [tags, updatedTags, isSaveEnabled, errorMessage];
 }
 
 class AssignTagModelError extends AssignTagModelState {

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

@@ -16,6 +16,7 @@ import 'package:syncrow_web/pages/spaces_management/space_model/widgets/dialog/c
 import 'package:syncrow_web/pages/spaces_management/tag_model/views/add_device_type_model_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/pages/spaces_management/helper/tag_helper.dart';
+import 'package:uuid/uuid.dart';
 
 class AssignTagModelsDialog extends StatelessWidget {
   final List<ProductModel>? products;
@@ -56,7 +57,7 @@ class AssignTagModelsDialog extends StatelessWidget {
       ..add('Main Space');
 
     return BlocProvider(
-        create: (_) => AssignTagModelBloc()
+        create: (_) => AssignTagModelBloc(allTags ?? [])
           ..add(InitializeTagModels(
             initialTags: initialTags,
             addedProducts: addedProducts,
@@ -82,6 +83,7 @@ class AssignTagModelsDialog extends StatelessWidget {
                           child: DataTable(
                             headingRowColor: WidgetStateProperty.all(
                                 ColorsManager.dataHeaderGrey),
+                            key: ValueKey(state.tags.length),
                             border: TableBorder.all(
                               color: ColorsManager.dataHeaderGrey,
                               width: 1,
@@ -133,8 +135,6 @@ class AssignTagModelsDialog extends StatelessWidget {
                                 : List.generate(state.tags.length, (index) {
                                     final tag = state.tags[index];
                                     final controller = controllers[index];
-                                    final availableTags = getAvailableTags(
-                                        allTags ?? [], state.tags, tag);
 
                                     return DataRow(
                                       cells: [
@@ -175,6 +175,7 @@ class AssignTagModelsDialog extends StatelessWidget {
                                                         .add(DeleteTagModel(
                                                             tagToDelete: tag,
                                                             tags: state.tags));
+                                                    controllers.removeAt(index);
                                                   },
                                                   tooltip: 'Delete Tag',
                                                   padding: EdgeInsets.zero,
@@ -193,7 +194,9 @@ class AssignTagModelsDialog extends StatelessWidget {
                                               width: double
                                                   .infinity, // Ensure full width for dropdown
                                               child: DialogTextfieldDropdown(
-                                                items: availableTags,
+                                                 key: ValueKey(
+                                                'dropdown_${Uuid().v4()}_${index}'),
+                                                items: state.updatedTags,
                                                 initialValue: tag.tag,
                                                 onSelected: (value) {
                                                   controller.text = value;
@@ -254,11 +257,15 @@ class AssignTagModelsDialog extends StatelessWidget {
                                 final updatedTags =
                                     List<TagModel>.from(state.tags);
                                 final result =
-                                    processTags(updatedTags, subspaces);
+                                    TagHelper.updateSubspaceTagModels(
+                                        updatedTags, subspaces);
 
                                 final processedTags =
                                     result['updatedTags'] as List<TagModel>;
-                                final processedSubspaces = result['subspaces'];
+                                final processedSubspaces =
+                                    List<SubspaceTemplateModel>.from(
+                                        result['subspaces'] as List<dynamic>);
+
                                 if (context.mounted) {
                                   Navigator.of(context).pop();
 
@@ -297,22 +304,25 @@ class AssignTagModelsDialog extends StatelessWidget {
                         Expanded(
                           child: DefaultButton(
                             borderRadius: 10,
-                            backgroundColor: state.isSaveEnabled
+                            backgroundColor: ColorsManager.secondaryColor,
-                                ? ColorsManager.secondaryColor
+                            foregroundColor: state.isSaveEnabled
-                                : ColorsManager.grayColor,
+                                ? ColorsManager.whiteColors
-                            foregroundColor: ColorsManager.whiteColors,
+                                : ColorsManager.whiteColorsWithOpacity,
                             onPressed: state.isSaveEnabled
                                 ? () async {
                                     final updatedTags =
                                         List<TagModel>.from(state.tags);
+
                                     final result =
-                                        processTags(updatedTags, subspaces);
+                                        TagHelper.updateSubspaceTagModels(
+                                            updatedTags, subspaces);
 
                                     final processedTags =
                                         result['updatedTags'] as List<TagModel>;
                                     final processedSubspaces =
-                                        result['subspaces']
+                                        List<SubspaceTemplateModel>.from(
-                                            as List<SubspaceTemplateModel>;
+                                            result['subspaces']
+                                                as List<dynamic>);
 
                                     Navigator.of(context)
                                         .popUntil((route) => route.isFirst);
@@ -356,120 +366,4 @@ class AssignTagModelsDialog extends StatelessWidget {
           ),
         ));
   }
-
-  List<String> getAvailableTags(
-      List<String> allTags, List<TagModel> currentTags, TagModel currentTag) {
-    return allTags
-        .where((tagValue) => !currentTags
-            .where((e) => e != currentTag) // Exclude the current row
-            .map((e) => e.tag)
-            .contains(tagValue))
-        .toList();
-  }
-
-  int? checkTagExistInSubspace(
-      TagModel tag, List<SubspaceTemplateModel>? subspaces) {
-    if (subspaces == null) return null;
-    for (int i = 0; i < subspaces.length; i++) {
-      final subspace = subspaces[i];
-      if (subspace.tags == null) continue;
-      for (var t in subspace.tags!) {
-        if (tag.internalId == t.internalId) {
-          return i;
-        }
-      }
-    }
-    return null;
-  }
-
-  Map<String, dynamic> processTags(
-      List<TagModel> updatedTags, List<SubspaceTemplateModel>? subspaces) {
-    final modifiedTags = List<TagModel>.from(updatedTags);
-    final modifiedSubspaces = List<SubspaceTemplateModel>.from(subspaces ?? []);
-
-    if (subspaces != null) {
-      for (var subspace in subspaces) {
-        subspace.tags?.removeWhere(
-          (tag) => !modifiedTags
-              .any((updatedTag) => updatedTag.internalId == tag.internalId),
-        );
-      }
-    }
-
-    for (var tag in modifiedTags.toList()) {
-      if (modifiedSubspaces.isEmpty) continue;
-
-      final prevIndice = checkTagExistInSubspace(tag, modifiedSubspaces);
-
-      if ((tag.location == 'Main Space' || tag.location == null) &&
-          (prevIndice == null ||
-              modifiedSubspaces[prevIndice].subspaceName == 'Main Space')) {
-        continue;
-      }
-
-      if ((tag.location == 'Main Space' || tag.location == null) &&
-          prevIndice != null) {
-        modifiedSubspaces[prevIndice]
-            .tags
-            ?.removeWhere((t) => t.internalId == tag.internalId);
-        continue;
-      }
-
-      if ((tag.location != 'Main Space' && tag.location != null) &&
-          prevIndice == null) {
-        final newIndex = modifiedSubspaces
-            .indexWhere((subspace) => subspace.subspaceName == tag.location);
-        if (newIndex != -1) {
-          if (modifiedSubspaces[newIndex]
-                  .tags
-                  ?.any((t) => t.internalId == tag.internalId) !=
-              true) {
-            tag.location = modifiedSubspaces[newIndex].subspaceName;
-            modifiedSubspaces[newIndex].tags?.add(tag);
-          }
-        }
-        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
-        continue;
-      }
-
-      if ((tag.location != 'Main Space' && tag.location != null) &&
-          tag.location != modifiedSubspaces[prevIndice!].subspaceName) {
-        modifiedSubspaces[prevIndice]
-            .tags
-            ?.removeWhere((t) => t.internalId == tag.internalId);
-        final newIndex = modifiedSubspaces
-            .indexWhere((subspace) => subspace.subspaceName == tag.location);
-        if (newIndex != -1) {
-          if (modifiedSubspaces[newIndex]
-                  .tags
-                  ?.any((t) => t.internalId == tag.internalId) !=
-              true) {
-            tag.location = modifiedSubspaces[newIndex].subspaceName;
-            modifiedSubspaces[newIndex].tags?.add(tag);
-          }
-        }
-
-        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
-        continue;
-      }
-
-      if ((tag.location != 'Main Space' && tag.location != null) &&
-          tag.location == modifiedSubspaces[prevIndice!].subspaceName) {
-        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
-        continue;
-      }
-
-      if ((tag.location == 'Main Space' || tag.location == null) &&
-          prevIndice != null) {
-        modifiedSubspaces[prevIndice]
-            .tags
-            ?.removeWhere((t) => t.internalId == tag.internalId);
-      }
-    }
-
-    return {
-      'updatedTags': modifiedTags,
-      'subspaces': modifiedSubspaces,
-    };
-  }
 }

lib/pages/spaces_management/helper/connection_helper.dart

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

lib/pages/spaces_management/helper/space_helper.dart

@@ -0,0 +1,94 @@
+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 SpaceHelper {
+  static SpaceModel? findSpaceByUuid(
+      String? uuid, List<CommunityModel> communities) {
+    for (var community in communities) {
+      for (var space in community.spaces) {
+        if (space.uuid == uuid) return space;
+      }
+    }
+    return null;
+  }
+
+  static SpaceModel? findSpaceByInternalId(
+      String? internalId, List<SpaceModel> spaces) {
+    if (internalId != null) {
+      for (var space in spaces) {
+        if (space.internalId == internalId) return space;
+      }
+    }
+
+    return null;
+  }
+
+  static String generateUniqueSpaceName(
+      String originalName, List<SpaceModel> spaces) {
+    final baseName = originalName.replaceAll(RegExp(r'\(\d+\)$'), '').trim();
+    int maxNumber = 0;
+
+    for (var space in spaces) {
+      final match = RegExp(r'^(.*?)\((\d+)\)$').firstMatch(space.name);
+      if (match != null && match.group(1)?.trim() == baseName) {
+        int existingNumber = int.parse(match.group(2)!);
+        if (existingNumber > maxNumber) {
+          maxNumber = existingNumber;
+        }
+      }
+    }
+
+    return "$baseName(${maxNumber + 1})";
+  }
+
+  static bool isSave(List<SpaceModel> spaces) {
+    return spaces.isNotEmpty &&
+        spaces.any((space) =>
+            space.status == SpaceStatus.newSpace ||
+            space.status == SpaceStatus.modified ||
+            space.status == SpaceStatus.deleted);
+  }
+
+  static bool isHighlightedSpace(SpaceModel space, SpaceModel? selectedSpace) {
+    if (selectedSpace == null) return true;
+
+    return space == selectedSpace ||
+        selectedSpace.parent?.internalId == space.internalId ||
+        selectedSpace.children
+                ?.any((child) => child.internalId == space.internalId) ==
+            true;
+  }
+
+  static bool isNameConflict(
+      String value, SpaceModel? parentSpace, SpaceModel? editSpace) {
+    final siblings = parentSpace?.children
+            .where((child) => child.internalId != editSpace?.internalId)
+            .toList() ??
+        [];
+
+    final editSiblings = editSpace?.parent?.children
+            .where((child) => child.internalId != editSpace.internalId)
+            .toList() ??
+        [];
+
+    final editSiblingConflict =
+        editSiblings.any((child) => child.name == value);
+
+    final siblingConflict = siblings.any((child) => child.name == value);
+
+    final parentConflict = parentSpace?.name == value &&
+        parentSpace?.internalId != editSpace?.internalId;
+
+    final parentOfEditSpaceConflict = editSpace?.parent?.name == value &&
+        editSpace?.parent?.internalId != editSpace?.internalId;
+
+    final childConflict =
+        editSpace?.children.any((child) => child.name == value) ?? false;
+
+    return siblingConflict ||
+        parentConflict ||
+        editSiblingConflict ||
+        parentOfEditSpaceConflict ||
+        childConflict;
+  }
+}

lib/pages/spaces_management/helper/tag_helper.dart

@@ -1,12 +1,147 @@
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/base_tag.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/subspace_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
+import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 
 class TagHelper {
+  static Map<String, dynamic> updateTags<T>({
+    required List<T> updatedTags,
+    required List<dynamic>? subspaces,
+    required String Function(T) getInternalId,
+    required String? Function(T) getLocation,
+    required void Function(T, String) setLocation,
+    required String Function(dynamic) getSubspaceName,
+    required List<T>? Function(dynamic) getSubspaceTags,
+    required void Function(dynamic, List<T>?) setSubspaceTags,
+    required int? Function(T, List<dynamic>) checkTagExistInSubspace,
+  }) {
+    final modifiedTags = List<T>.from(updatedTags);
+    final modifiedSubspaces = List<dynamic>.from(subspaces ?? []);
+
+    if (subspaces != null) {
+      for (var subspace in subspaces) {
+        getSubspaceTags(subspace)?.removeWhere(
+          (tag) => !modifiedTags.any(
+              (updatedTag) => getInternalId(updatedTag) == getInternalId(tag)),
+        );
+      }
+    }
+
+    for (var tag in modifiedTags.toList()) {
+      if (modifiedSubspaces.isEmpty) continue;
+
+      final prevIndice = checkTagExistInSubspace(tag, modifiedSubspaces);
+      final tagLocation = getLocation(tag);
+
+      if ((tagLocation == 'Main Space' || tagLocation == null) &&
+          (prevIndice == null ||
+              getSubspaceName(modifiedSubspaces[prevIndice]) == 'Main Space')) {
+        continue;
+      }
+
+      if ((tagLocation == 'Main Space' || tagLocation == null) &&
+          prevIndice != null) {
+        getSubspaceTags(modifiedSubspaces[prevIndice])
+            ?.removeWhere((t) => getInternalId(t) == getInternalId(tag));
+        continue;
+      }
+
+      if ((tagLocation != 'Main Space' && tagLocation != null) &&
+          prevIndice == null) {
+        final newIndex = modifiedSubspaces
+            .indexWhere((subspace) => getSubspaceName(subspace) == tagLocation);
+
+        if (newIndex != -1) {
+          if (getSubspaceTags(modifiedSubspaces[newIndex])
+                  ?.any((t) => getInternalId(t) == getInternalId(tag)) !=
+              true) {
+            setLocation(tag, getSubspaceName(modifiedSubspaces[newIndex]));
+            final subspaceTags =
+                getSubspaceTags(modifiedSubspaces[newIndex]) ?? [];
+            subspaceTags.add(tag);
+            setSubspaceTags(modifiedSubspaces[newIndex], subspaceTags);
+          }
+        }
+
+        modifiedTags.removeWhere((t) => getInternalId(t) == getInternalId(tag));
+        continue;
+      }
+
+      if ((tagLocation != 'Main Space' && tagLocation != null) &&
+          tagLocation != getSubspaceName(modifiedSubspaces[prevIndice!])) {
+        getSubspaceTags(modifiedSubspaces[prevIndice])
+            ?.removeWhere((t) => getInternalId(t) == getInternalId(tag));
+
+        final newIndex = modifiedSubspaces
+            .indexWhere((subspace) => getSubspaceName(subspace) == tagLocation);
+
+        if (newIndex != -1) {
+          if (getSubspaceTags(modifiedSubspaces[newIndex])
+                  ?.any((t) => getInternalId(t) == getInternalId(tag)) !=
+              true) {
+            setLocation(tag, getSubspaceName(modifiedSubspaces[newIndex]));
+            final subspaceTags =
+                getSubspaceTags(modifiedSubspaces[newIndex]) ?? [];
+            subspaceTags.add(tag);
+            setSubspaceTags(modifiedSubspaces[newIndex], subspaceTags);
+          }
+        }
+
+        modifiedTags.removeWhere((t) => getInternalId(t) == getInternalId(tag));
+        continue;
+      }
+
+      if ((tagLocation != 'Main Space' && tagLocation != null) &&
+          tagLocation == getSubspaceName(modifiedSubspaces[prevIndice!])) {
+        modifiedTags.removeWhere((t) => getInternalId(t) == getInternalId(tag));
+        continue;
+      }
+
+      if ((tagLocation == 'Main Space' || tagLocation == null) &&
+          prevIndice != null) {
+        getSubspaceTags(modifiedSubspaces[prevIndice])
+            ?.removeWhere((t) => getInternalId(t) == getInternalId(tag));
+      }
+    }
+
+    return {
+      'updatedTags': modifiedTags,
+      'subspaces': modifiedSubspaces,
+    };
+  }
+
+  static List<String> getAvailableTags<T>({
+    required List<String> allTags,
+    required List<T> currentTags,
+    required T currentTag,
+    required String? Function(T) getTag, // Allow nullable return type
+  }) {
+    return allTags
+        .where((tagValue) => !currentTags
+            .where((e) => e != currentTag) // Exclude the current row
+            .map((e) => getTag(e) ?? '') // Handle null values gracefully
+            .contains(tagValue))
+        .toList();
+  }
+
+  static List<String> getAvailableTagModels(
+      List<String> allTags, List<TagModel> currentTags, TagModel currentTag) {
+    List<String> availableTagsForTagModel =
+        TagHelper.getAvailableTags<TagModel>(
+      allTags: allTags,
+      currentTags: currentTags,
+      currentTag: currentTag,
+      getTag: (tag) => tag.tag ?? '',
+    );
+    return availableTagsForTagModel;
+  }
+
   static List<TagModel> generateInitialTags({
     List<TagModel>? spaceTagModels,
     List<SubspaceTemplateModel>? subspaces,
@@ -36,7 +171,7 @@ class TagHelper {
     return initialTags;
   }
 
- static List<Tag> generateInitialForTags({
+  static List<Tag> generateInitialForTags({
     List<Tag>? spaceTags,
     List<SubspaceModel>? subspaces,
   }) {
@@ -145,4 +280,140 @@ class TagHelper {
             ))
         .toList();
   }
+
+  static int? checkTagExistInSubspaceModels(
+      TagModel tag, List<dynamic>? subspaces) {
+    if (subspaces == null) return null;
+
+    for (int i = 0; i < subspaces.length; i++) {
+      final subspace = subspaces[i] as SubspaceTemplateModel; // Explicit cast
+      if (subspace.tags == null) continue;
+      for (var t in subspace.tags!) {
+        if (tag.internalId == t.internalId) {
+          return i;
+        }
+      }
+    }
+    return null;
+  }
+
+  static Map<String, dynamic> updateSubspaceTagModels(
+      List<TagModel> updatedTags, List<SubspaceTemplateModel>? subspaces) {
+    final result = TagHelper.updateTags<TagModel>(
+      updatedTags: updatedTags,
+      subspaces: subspaces,
+      getInternalId: (tag) => tag.internalId,
+      getLocation: (tag) => tag.location,
+      setLocation: (tag, location) => tag.location = location,
+      getSubspaceName: (subspace) => subspace.subspaceName,
+      getSubspaceTags: (subspace) => subspace.tags,
+      setSubspaceTags: (subspace, tags) => subspace.tags = tags,
+      checkTagExistInSubspace: checkTagExistInSubspaceModels,
+    );
+
+    final processedTags = result['updatedTags'] as List<TagModel>;
+    final processedSubspaces =
+        List<SubspaceTemplateModel>.from(result['subspaces'] as List<dynamic>);
+
+    for (var subspace in processedSubspaces) {
+      final subspaceTags = subspace.tags;
+
+      if (subspaceTags != null) {
+        for (int i = 0; i < subspaceTags.length; i++) {
+          final tag = subspaceTags[i];
+
+          // Find the updated tag inside processedTags
+          final changedTag = updatedTags.firstWhere(
+            (t) => t.internalId == tag.internalId,
+            orElse: () => tag,
+          );
+
+          if (changedTag.tag != tag.tag) {
+            subspaceTags[i] = changedTag.copyWith(tag: changedTag.tag);
+          }
+        }
+      }
+
+      subspace.tags = subspaceTags;
+    }
+
+    return {'updatedTags': processedTags, 'subspaces': processedSubspaces};
+  }
+
+  static int? checkTagExistInSubspace(Tag tag, List<dynamic>? subspaces) {
+    if (subspaces == null) return null;
+    for (int i = 0; i < subspaces.length; i++) {
+      final subspace = subspaces[i];
+      if (subspace.tags == null) continue;
+      for (var t in subspace.tags!) {
+        if (tag.internalId == t.internalId) {
+          return i;
+        }
+      }
+    }
+    return null;
+  }
+
+  static Map<String, dynamic> processTags(
+      List<Tag> updatedTags, List<SubspaceModel>? subspaces) {
+    final result = TagHelper.updateTags<Tag>(
+      updatedTags: updatedTags,
+      subspaces: subspaces,
+      getInternalId: (tag) => tag.internalId,
+      getLocation: (tag) => tag.location,
+      setLocation: (tag, location) => tag.location = location,
+      getSubspaceName: (subspace) => subspace.subspaceName,
+      getSubspaceTags: (subspace) => subspace.tags,
+      setSubspaceTags: (subspace, tags) => subspace.tags = tags,
+      checkTagExistInSubspace: checkTagExistInSubspace,
+    );
+
+    final processedTags = result['updatedTags'] as List<Tag>;
+    final processedSubspaces =
+        List<SubspaceModel>.from(result['subspaces'] as List<dynamic>);
+
+    for (var subspace in processedSubspaces) {
+      final subspaceTags = subspace.tags;
+
+      if (subspaceTags != null) {
+        for (int i = 0; i < subspaceTags.length; i++) {
+          final tag = subspaceTags[i];
+
+          final changedTag = updatedTags.firstWhere(
+            (t) => t.internalId == tag.internalId,
+            orElse: () => tag,
+          );
+
+          if (changedTag.tag != tag.tag) {
+            subspaceTags[i] = changedTag.copyWith(tag: changedTag.tag);
+          }
+        }
+      }
+
+      subspace.tags = subspaceTags;
+    }
+
+    return {'updatedTags': processedTags, 'subspaces': processedSubspaces};
+  }
+
+  static List<String> getAllTagValues(
+      List<CommunityModel> communities, List<SpaceTemplateModel>? spaceModels) {
+    final Set<String> allTags = {};
+
+    if (spaceModels != null) {
+      for (var model in spaceModels) {
+        allTags.addAll(model.listAllTagValues());
+      }
+    }
+
+    for (final community in communities) {
+      for (final space in community.spaces) {
+        if (space.tags != null) {
+          allTags.addAll(space.listAllTagValues());
+        }
+      }
+    }
+
+    return allTags.toList();
+  }
 }

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

@@ -1,4 +1,5 @@
 import 'package:flutter_bloc/flutter_bloc.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';
@@ -8,6 +9,9 @@ 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> {
@@ -18,6 +22,8 @@ class CreateSpaceModelBloc
   CreateSpaceModelBloc(this._api) : super(CreateSpaceModelInitial()) {
     on<CreateSpaceTemplate>((event, emit) async {
       try {
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
         late SpaceTemplateModel spaceTemplate = event.spaceTemplate;
 
         final tagBodyModels =
@@ -40,7 +46,8 @@ class CreateSpaceModelBloc
             tags: tagBodyModels,
             subspaceModels: subspaceTemplateBodyModels);
 
-        final newSpaceTemplate = await _api.createSpaceModel(spaceModelBody);
+        final newSpaceTemplate =
+            await _api.createSpaceModel(spaceModelBody, projectUuid);
         spaceTemplate.uuid = newSpaceTemplate?.uuid ?? '';
 
         if (newSpaceTemplate != null) {
@@ -201,9 +208,11 @@ class CreateSpaceModelBloc
 
     on<ModifySpaceTemplate>((event, emit) async {
       try {
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
         if (event.spaceTemplate.uuid != null) {
-          final prevSpaceModel =
+          final prevSpaceModel = await _api.getSpaceModel(
-              await _api.getSpaceModel(event.spaceTemplate.uuid ?? '');
+              event.spaceTemplate.uuid ?? '', projectUuid);
 
           final newSpaceModel = event.updatedSpaceTemplate;
           String? spaceModelName;
@@ -287,7 +296,7 @@ class CreateSpaceModelBloc
               subspaceModels: subspaceUpdates);
 
           final res = await _api.updateSpaceModel(
-              spaceModelBody, prevSpaceModel?.uuid ?? '');
+              spaceModelBody, prevSpaceModel?.uuid ?? '', projectUuid);
 
           if (res != null) {
             emit(CreateSpaceModelLoaded(newSpaceModel));

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

@@ -1,8 +1,12 @@
 import 'package:flutter_bloc/flutter_bloc.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;
@@ -18,10 +22,13 @@ class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
   Future<void> _onCreateSpaceModel(
       CreateSpaceModel event, Emitter<SpaceModelState> emit) async {
     final currentState = state;
+
     if (currentState is SpaceModelLoaded) {
       try {
-        final newSpaceModel =
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-            await api.getSpaceModel(event.newSpaceModel.uuid ?? '');
+
+        final newSpaceModel = await api.getSpaceModel(
+            event.newSpaceModel.uuid ?? '', projectUuid);
 
         if (newSpaceModel != null) {
           final updatedSpaceModels =
@@ -40,8 +47,10 @@ class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
     final currentState = state;
     if (currentState is SpaceModelLoaded) {
       try {
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
         final newSpaceModel =
-            await api.getSpaceModel(event.spaceModelUuid ?? '');
+            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/models/space_template_model.dart

@@ -1,5 +1,4 @@
 import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_update_model.dart';

lib/pages/spaces_management/space_model/view/space_model_page.dart

@@ -11,8 +11,10 @@ import 'package:syncrow_web/utils/color_manager.dart';
 
 class SpaceModelPage extends StatelessWidget {
   final List<ProductModel>? products;
+  final Function(List<SpaceTemplateModel>)? onSpaceModelsUpdated;
 
-  const SpaceModelPage({Key? key, this.products}) : super(key: key);
+  const SpaceModelPage({Key? key, this.products, this.onSpaceModelsUpdated})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -25,6 +27,10 @@ class SpaceModelPage extends StatelessWidget {
           final allTagValues = _getAllTagValues(spaceModels);
           final allSpaceModelNames = _getAllSpaceModelName(spaceModels);
 
+          if (onSpaceModelsUpdated != null) {
+            onSpaceModelsUpdated!(spaceModels);
+          }
+
           return Scaffold(
             backgroundColor: ColorsManager.whiteColors,
             body: Padding(

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

@@ -6,55 +6,64 @@ class ButtonContentWidget extends StatelessWidget {
   final IconData? icon;
   final String label;
   final String? svgAssets;
+  final bool disabled;
 
-  const ButtonContentWidget(
+  const ButtonContentWidget({
-      {Key? key, this.icon, required this.label, this.svgAssets})
+    Key? key,
-      : super(key: key);
+    this.icon,
+    required this.label,
+    this.svgAssets,
+    this.disabled = false,
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     final screenWidth = MediaQuery.of(context).size.width;
 
-    return SizedBox(
+    return Opacity(
-      width: screenWidth * 0.25,
+      opacity: disabled ? 0.5 : 1.0,
-      child: Container(
+      child: SizedBox(
-        decoration: BoxDecoration(
+        width: screenWidth * 0.25,
-          color: ColorsManager.textFieldGreyColor,
+        child: Container(
-          border: Border.all(
+          decoration: BoxDecoration(
-            color: ColorsManager.neutralGray,
+            color: ColorsManager.textFieldGreyColor,
-            width: 3.0,
+            border: Border.all(
+              color: ColorsManager.neutralGray,
+              width: 3.0,
+            ),
+            borderRadius: BorderRadius.circular(20),
           ),
-          borderRadius: BorderRadius.circular(20),
+          child: Padding(
-        ),
+            padding:
-        child: Padding(
+                const EdgeInsets.symmetric(vertical: 10.0, horizontal: 16.0),
-          padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 16.0),
+            child: Row(
-          child: Row(
+              children: [
-            children: [
+                if (icon != null)
-              if (icon != null)
+                  Icon(
-                Icon(
+                    icon,
-                  icon,
+                    color: ColorsManager.spaceColor,
-                  color: ColorsManager.spaceColor,
+                  ),
-                ),
+                if (svgAssets != null)
-              if (svgAssets != null)
+                  Padding(
-                Padding(
+                    padding: const EdgeInsets.only(left: 6.0),
-                  padding: const EdgeInsets.only(left: 6.0),
+                    child: SvgPicture.asset(
-                  child: SvgPicture.asset(
+                      svgAssets!,
-                    svgAssets!,
+                      width: screenWidth * 0.015, // Adjust icon size
-                    width: screenWidth * 0.015, // Adjust icon size
+                      height: screenWidth * 0.015,
-                    height: screenWidth * 0.015,
+                    ),
+                  ),
+                const SizedBox(width: 10),
+                Expanded(
+                  child: Text(
+                    label,
+                    style: const TextStyle(
+                      color: ColorsManager.blackColor,
+                      fontSize: 16,
+                    ),
                   ),
                 ),
-              const SizedBox(width: 10),
+              ],
-              Expanded(
+            ),
-                child: Text(
-                  label,
-                  style: const TextStyle(
-                    color: ColorsManager.blackColor,
-                    fontSize: 16,
-                  ),
-                ),
-              ),
-            ],
           ),
         ),
       ),

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

@@ -50,7 +50,9 @@ class CreateSpaceModelDialog extends StatelessWidget {
         width: screenWidth * 0.3,
         child: BlocProvider(
           create: (_) {
-            final bloc = CreateSpaceModelBloc(_spaceModelApi);
+            final bloc = CreateSpaceModelBloc(
+              _spaceModelApi,
+            );
             if (spaceModel != null) {
               bloc.add(UpdateSpaceTemplate(spaceModel!, otherSpaceModels));
             } else {
@@ -129,10 +131,16 @@ class CreateSpaceModelDialog extends StatelessWidget {
                     const SizedBox(height: 16),
                     SubspaceModelCreate(
                       subspaces: state.space.subspaceModels ?? [],
-                      onSpaceModelUpdate: (updatedSubspaces) {
+                      tags: state.space.tags ?? [],
+                      onSpaceModelUpdate: (updatedSubspaces, updatedTags) {
                         context
                             .read<CreateSpaceModelBloc>()
                             .add(AddSubspacesToSpaceTemplate(updatedSubspaces));
+                        if (updatedTags != null) {
+                          context
+                              .read<CreateSpaceModelBloc>()
+                              .add(AddTagsToSpaceTemplate(updatedTags));
+                        }
                       },
                     ),
                     const SizedBox(height: 10),

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

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/common/edit_chip.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
+import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/widgets/button_content_widget.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace_model/views/create_subspace_model_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/widgets/subspace_name_label_widget.dart';
@@ -8,13 +9,16 @@ import 'package:syncrow_web/utils/color_manager.dart';
 
 class SubspaceModelCreate extends StatefulWidget {
   final List<SubspaceTemplateModel> subspaces;
-  final void Function(List<SubspaceTemplateModel> newSubspaces)?
+  final void Function(
+          List<SubspaceTemplateModel> newSubspaces, List<TagModel>? tags)?
       onSpaceModelUpdate;
+  final List<TagModel> tags;
 
   const SubspaceModelCreate({
     Key? key,
     required this.subspaces,
     this.onSpaceModelUpdate,
+    required this.tags,
   }) : super(key: key);
 
   @override
@@ -24,11 +28,13 @@ class SubspaceModelCreate extends StatefulWidget {
 class _SubspaceModelCreateState extends State<SubspaceModelCreate> {
   late List<SubspaceTemplateModel> _subspaces;
   String? errorSubspaceId;
+  late List<TagModel> _tags;
 
   @override
   void initState() {
     super.initState();
     _subspaces = List.from(widget.subspaces);
+    _tags = List.from(widget.tags);
   }
 
   @override
@@ -105,14 +111,26 @@ class _SubspaceModelCreateState extends State<SubspaceModelCreate> {
           isEdit: true,
           dialogTitle: dialogTitle,
           existingSubSpaces: _subspaces,
-          
           onUpdate: (subspaceModels) {
+            final updatedIds = subspaceModels.map((s) => s.internalId).toSet();
+            final deletedSubspaces = _subspaces
+                .where((s) => !updatedIds.contains(s.internalId))
+                .toList();
+
+            final List<TagModel> tagsToAppendToSpace = [];
+
+            for (var s in deletedSubspaces) {
+              if (s.tags != null) {
+                tagsToAppendToSpace.addAll(s.tags!);
+              }
+            }
+
             setState(() {
               _subspaces = subspaceModels;
-              errorSubspaceId = null;
+              _tags.addAll(tagsToAppendToSpace);
             });
             if (widget.onSpaceModelUpdate != null) {
-              widget.onSpaceModelUpdate!(subspaceModels);
+              widget.onSpaceModelUpdate!(subspaceModels, _tags);
             }
           },
         );

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

@@ -52,6 +52,13 @@ class _SubspaceNameDisplayWidgetState extends State<SubspaceNameDisplayWidget> {
 
   void _handleValidationAndSave() {
     final updatedName = _controller.text;
+
+    if (updatedName.isEmpty) {
+      setState(() {
+        errorText = 'Subspace name cannot be empty.';
+      });
+      return;
+    }
     if (widget.validateName(updatedName)) {
       setState(() {
         errorText = null;

lib/pages/visitor_password/bloc/visitor_password_bloc.dart

@@ -3,6 +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_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';
@@ -13,9 +14,14 @@ 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> {
+class VisitorPasswordBloc
+    extends Bloc<VisitorPasswordEvent, VisitorPasswordState> {
+
   VisitorPasswordBloc() : super(VisitorPasswordInitial()) {
     on<SelectUsageFrequency>(selectUsageFrequency);
     on<FetchDevice>(_onFetchDevice);
@@ -38,7 +44,8 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
   final TextEditingController deviceNameController = TextEditingController();
   final TextEditingController deviceIdController = TextEditingController();
   final TextEditingController unitNameController = TextEditingController();
-  final TextEditingController virtualAddressController = TextEditingController();
+  final TextEditingController virtualAddressController =
+      TextEditingController();
   List<String> selectedDevices = [];
 
   List<DeviceModel> data = [];
@@ -64,12 +71,14 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
   String startTimeAccess = 'Start Time';
   String endTimeAccess = 'End Time';
   PasswordStatus? passwordStatus;
-  selectAccessType(SelectPasswordType event, Emitter<VisitorPasswordState> emit) {
+  selectAccessType(
+      SelectPasswordType event, Emitter<VisitorPasswordState> emit) {
     accessTypeSelected = event.type;
     emit(PasswordTypeSelected(event.type));
   }
 
-  selectUsageFrequency(SelectUsageFrequency event, Emitter<VisitorPasswordState> emit) {
+  selectUsageFrequency(
+      SelectUsageFrequency event, Emitter<VisitorPasswordState> emit) {
     usageFrequencySelected = event.usageType;
     emit(UsageFrequencySelected(event.usageType));
   }
@@ -116,10 +125,12 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
           timePicked.minute,
         );
 
-        final selectedTimestamp = selectedDateTime.millisecondsSinceEpoch ~/ 1000;
+        final selectedTimestamp =
+            selectedDateTime.millisecondsSinceEpoch ~/ 1000;
 
         if (event.isStart) {
-          if (expirationTimeTimeStamp != null && selectedTimestamp > expirationTimeTimeStamp!) {
+          if (expirationTimeTimeStamp != null &&
+              selectedTimestamp > expirationTimeTimeStamp!) {
             CustomSnackBar.displaySnackBar(
               'Effective Time cannot be later than Expiration Time.',
             );
@@ -128,7 +139,8 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
           effectiveTimeTimeStamp = selectedTimestamp;
           startTimeAccess = selectedDateTime.toString().split('.').first;
         } else {
-          if (effectiveTimeTimeStamp != null && selectedTimestamp < effectiveTimeTimeStamp!) {
+          if (effectiveTimeTimeStamp != null &&
+              selectedTimestamp < effectiveTimeTimeStamp!) {
             CustomSnackBar.displaySnackBar(
               'Expiration Time cannot be earlier than Effective Time.',
             );
@@ -143,7 +155,8 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
     }
   }
 
-  bool toggleRepeat(ToggleRepeatEvent event, Emitter<VisitorPasswordState> emit) {
+  bool toggleRepeat(
+      ToggleRepeatEvent event, Emitter<VisitorPasswordState> emit) {
     emit(LoadingInitialState());
     repeat = !repeat;
     emit(IsRepeatState(repeat: repeat));
@@ -175,10 +188,13 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
     emit(ChangeTimeState());
   }
 
-  Future<void> _onFetchDevice(FetchDevice event, Emitter<VisitorPasswordState> emit) async {
+  Future<void> _onFetchDevice(
+      FetchDevice event, Emitter<VisitorPasswordState> emit) async {
     try {
       emit(DeviceLoaded());
-      data = await AccessMangApi().fetchDevices();
+         final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+      data = await AccessMangApi().fetchDevices(projectUuid);
       emit(TableLoaded(data));
     } catch (e) {
       emit(FailedState(e.toString()));
@@ -186,8 +202,8 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
   }
 
   //online password
-  Future<void> postOnlineOneTimePassword(
+  Future<void> postOnlineOneTimePassword(OnlineOneTimePasswordEvent event,
-      OnlineOneTimePasswordEvent event, Emitter<VisitorPasswordState> emit) async {
+      Emitter<VisitorPasswordState> emit) async {
     try {
       emit(LoadingInitialState());
       generate7DigitNumber();
@@ -211,7 +227,8 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
   }
 
   Future<void> postOnlineMultipleTimePassword(
-      OnlineMultipleTimePasswordEvent event, Emitter<VisitorPasswordState> emit) async {
+      OnlineMultipleTimePasswordEvent event,
+      Emitter<VisitorPasswordState> emit) async {
     try {
       emit(LoadingInitialState());
 
@@ -221,7 +238,8 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
             if (repeat)
               Schedule(
                 effectiveTime: getTimeFromDateTimeString(effectiveTime),
-                invalidTime: getTimeFromDateTimeString(expirationTime).toString(),
+                invalidTime:
+                    getTimeFromDateTimeString(expirationTime).toString(),
                 workingDay: selectedDays,
               ),
           ],
@@ -244,13 +262,15 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
   }
 
   //offline password
-  Future<void> postOfflineOneTimePassword(
+  Future<void> postOfflineOneTimePassword(OfflineOneTimePasswordEvent event,
-      OfflineOneTimePasswordEvent event, Emitter<VisitorPasswordState> emit) async {
+      Emitter<VisitorPasswordState> emit) async {
     try {
       emit(LoadingInitialState());
       await generate7DigitNumber();
       var res = await AccessMangApi().postOffLineOneTime(
-          email: event.email, devicesUuid: selectedDevices, passwordName: event.passwordName);
+          email: event.email,
+          devicesUuid: selectedDevices,
+          passwordName: event.passwordName);
       if (res['statusCode'] == 201) {
         passwordStatus = PasswordStatus.fromJson(res['data']);
         emit(SuccessState());
@@ -264,7 +284,8 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
   }
 
   Future<void> postOfflineMultipleTimePassword(
-      OfflineMultipleTimePasswordEvent event, Emitter<VisitorPasswordState> emit) async {
+      OfflineMultipleTimePasswordEvent event,
+      Emitter<VisitorPasswordState> emit) async {
     try {
       emit(LoadingInitialState());
       await generate7DigitNumber();
@@ -287,7 +308,8 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
     }
   }
 
-  void selectDevice(SelectDeviceEvent event, Emitter<VisitorPasswordState> emit) {
+  void selectDevice(
+      SelectDeviceEvent event, Emitter<VisitorPasswordState> emit) {
     if (selectedDeviceIds.contains(event.deviceId)) {
       selectedDeviceIds.remove(event.deviceId);
     } else {
@@ -329,7 +351,8 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
     add(UpdateFilteredDevicesEvent(filteredData));
   }
 
-  Stream<VisitorPasswordState> mapEventToState(VisitorPasswordEvent event) async* {
+  Stream<VisitorPasswordState> mapEventToState(
+      VisitorPasswordEvent event) async* {
     if (event is FetchDevice) {
     } else if (event is UpdateFilteredDevicesEvent) {
       yield TableLoaded(event.filteredData);
@@ -378,16 +401,20 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
             ).millisecondsSinceEpoch ~/
             1000; // Divide by 1000 to remove milliseconds
         if (event.isEffective) {
-          if (expirationTimeTimeStamp != null && selectedTimestamp > expirationTimeTimeStamp!) {
+          if (expirationTimeTimeStamp != null &&
-            accessPeriodValidate = "Effective Time cannot be later than Expiration Time.";
+              selectedTimestamp > expirationTimeTimeStamp!) {
+            accessPeriodValidate =
+                "Effective Time cannot be later than Expiration Time.";
           } else {
             accessPeriodValidate = '';
             effectiveTime = selectedDateTime.toString().split('.').first;
             effectiveTimeTimeStamp = selectedTimestamp;
           }
         } else {
-          if (effectiveTimeTimeStamp != null && selectedTimestamp < effectiveTimeTimeStamp!) {
+          if (effectiveTimeTimeStamp != null &&
-            accessPeriodValidate = 'Expiration Time cannot be earlier than Effective Time.';
+              selectedTimestamp < effectiveTimeTimeStamp!) {
+            accessPeriodValidate =
+                'Expiration Time cannot be earlier than Effective Time.';
           } else {
             accessPeriodValidate = '';
             expirationTime = selectedDateTime.toString().split('.').first;

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,6 +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_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';
@@ -19,7 +20,8 @@ class AddDeviceDialog extends StatelessWidget {
   Widget build(BuildContext context) {
     Size size = MediaQuery.of(context).size;
     return BlocProvider(
-      create: (context) => VisitorPasswordBloc()..add(FetchDevice()),
+      create: (context) =>
+          VisitorPasswordBloc()..add(FetchDevice()),
       child: BlocBuilder<VisitorPasswordBloc, VisitorPasswordState>(
         builder: (BuildContext context, VisitorPasswordState state) {
           final visitorBloc = BlocProvider.of<VisitorPasswordBloc>(context);
@@ -35,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,
@@ -68,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),
                             ),
                           ],
                         )),
@@ -152,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
                               },
                             ),
                           ),
@@ -172,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) {
@@ -193,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,6 +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_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';

lib/services/access_mang_api.dart

@@ -6,10 +6,10 @@ import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';
 
 class AccessMangApi {
-  Future<List<PasswordModel>> fetchVisitorPassword() async {
+  Future<List<PasswordModel>> fetchVisitorPassword(String projectId) async {
     try {
       final response = await HTTPService().get(
-        path: ApiEndpoints.visitorPassword,
+        path: ApiEndpoints.visitorPassword.replaceAll('{projectId}', projectId),
         showServerMessage: true,
         expectedResponseModel: (json) {
           List<dynamic> jsonData = json;
@@ -25,10 +25,10 @@ class AccessMangApi {
     }
   }
 
-  Future fetchDevices() async {
+  Future fetchDevices(String projectId) async {
     try {
       final response = await HTTPService().get(
-        path: ApiEndpoints.getDevices,
+        path: ApiEndpoints.getDevices.replaceAll('{projectId}', projectId),
         showServerMessage: true,
         expectedResponseModel: (json) {
           List<dynamic> jsonData = json;
@@ -86,7 +86,8 @@ class AccessMangApi {
       "invalidTime": invalidTime,
     };
     if (scheduleList != null) {
-      body["scheduleList"] = scheduleList.map((schedule) => schedule.toJson()).toList();
+      body["scheduleList"] =
+          scheduleList.map((schedule) => schedule.toJson()).toList();
     }
     final response = await HTTPService().post(
       path: ApiEndpoints.sendOnlineMultipleTime,
@@ -105,7 +106,11 @@ class AccessMangApi {
       {String? email, String? passwordName, List<String>? devicesUuid}) async {
     final response = await HTTPService().post(
       path: ApiEndpoints.sendOffLineOneTime,
-      body: jsonEncode({"email": email, "passwordName": passwordName, "devicesUuid": devicesUuid}),
+      body: jsonEncode({
+        "email": email,
+        "passwordName": passwordName,
+        "devicesUuid": devicesUuid
+      }),
       showServerMessage: true,
       expectedResponseModel: (json) {
         return json;

lib/services/devices_mang_api.dart

@@ -12,15 +12,15 @@ import 'package:syncrow_web/utils/constants/api_const.dart';
 import 'package:syncrow_web/utils/constants/temp_const.dart';
 
 class DevicesManagementApi {
-  Future<List<AllDevicesModel>> fetchDevices(String communityId, String spaceId) async {
+  Future<List<AllDevicesModel>> fetchDevices(String communityId, String spaceId, String projectId) async {
     try {
       final response = await HTTPService().get(
         path: communityId.isNotEmpty && spaceId.isNotEmpty
             ? ApiEndpoints.getSpaceDevices
                 .replaceAll('{spaceUuid}', spaceId)
                 .replaceAll('{communityUuid}', communityId)
-                .replaceAll('{projectId}', TempConst.projectId)
+                .replaceAll('{projectId}', projectId)
-            : ApiEndpoints.getAllDevices,
+            : ApiEndpoints.getAllDevices.replaceAll('{projectId}', projectId),
         showServerMessage: true,
         expectedResponseModel: (json) {
           List<dynamic> jsonData =

lib/services/routines_api.dart

@@ -12,7 +12,8 @@ class SceneApi {
   static final HTTPService _httpService = HTTPService();
 
 // //create scene
-  static Future<Map<String, dynamic>> createScene(CreateSceneModel createSceneModel) async {
+  static Future<Map<String, dynamic>> createScene(
+      CreateSceneModel createSceneModel) async {
     try {
       debugPrint('create scene model: ${createSceneModel.toMap()}');
       final response = await _httpService.post(
@@ -69,14 +70,15 @@ class SceneApi {
 
   //get scenes by community id and space id
 
-  static Future<List<ScenesModel>> getScenes(String spaceId, String communityId,
+  static Future<List<ScenesModel>> getScenes(
+      String spaceId, String communityId, String projectId,
       {showInDevice = false}) async {
     try {
       final response = await _httpService.get(
         path: ApiEndpoints.getUnitScenes
             .replaceAll('{spaceUuid}', spaceId)
             .replaceAll('{communityUuid}', communityId)
-            .replaceAll('{projectId}', TempConst.projectId),
+            .replaceAll('{projectId}', projectId),
         queryParameters: {'showInHomePage': showInDevice},
         showServerMessage: false,
         expectedResponseModel: (json) {
@@ -100,7 +102,8 @@ class SceneApi {
   static Future<List<ScenesModel>> getAutomation(String spaceId) async {
     try {
       final response = await _httpService.get(
-        path: ApiEndpoints.getSpaceAutomation.replaceAll('{spaceUuid}', spaceId),
+        path:
+            ApiEndpoints.getSpaceAutomation.replaceAll('{spaceUuid}', spaceId),
         showServerMessage: false,
         expectedResponseModel: (json) {
           List<ScenesModel> scenes = [];
@@ -130,10 +133,12 @@ class SceneApi {
   // }
 
 //automation details
-  static Future<RoutineDetailsModel> getAutomationDetails(String automationId) async {
+  static Future<RoutineDetailsModel> getAutomationDetails(
+      String automationId) async {
     try {
       final response = await _httpService.get(
-        path: ApiEndpoints.getAutomationDetails.replaceAll('{automationId}', automationId),
+        path: ApiEndpoints.getAutomationDetails
+            .replaceAll('{automationId}', automationId),
         showServerMessage: false,
         expectedResponseModel: (json) => RoutineDetailsModel.fromMap(json),
       );
@@ -148,7 +153,8 @@ class SceneApi {
     try {
       final response = await _httpService.put(
         path: ApiEndpoints.updateScene.replaceAll('{sceneId}', sceneId),
-        body: createSceneModel.toJson(sceneId.isNotEmpty == true ? sceneId : null),
+        body: createSceneModel
+            .toJson(sceneId.isNotEmpty == true ? sceneId : null),
         expectedResponseModel: (json) {
           return json;
         },
@@ -160,11 +166,14 @@ class SceneApi {
   }
 
   //update automation
-  static updateAutomation(CreateAutomationModel createAutomationModel, String automationId) async {
+  static updateAutomation(
+      CreateAutomationModel createAutomationModel, String automationId) async {
     try {
       final response = await _httpService.put(
-        path: ApiEndpoints.updateAutomation.replaceAll('{automationId}', automationId),
+        path: ApiEndpoints.updateAutomation
-        body: createAutomationModel.toJson(automationId.isNotEmpty == true ? automationId : null),
+            .replaceAll('{automationId}', automationId),
+        body: createAutomationModel
+            .toJson(automationId.isNotEmpty == true ? automationId : null),
         expectedResponseModel: (json) {
           return json;
         },
@@ -181,7 +190,8 @@ class SceneApi {
       final response = await _httpService.get(
         path: ApiEndpoints.getScene.replaceAll('{sceneId}', sceneId),
         showServerMessage: false,
-        expectedResponseModel: (json) => RoutineDetailsModel.fromMap(json['data']),
+        expectedResponseModel: (json) =>
+            RoutineDetailsModel.fromMap(json['data']),
       );
       return response;
     } catch (e) {
@@ -190,7 +200,8 @@ class SceneApi {
   }
 
   //delete Scene
-  static Future<bool> deleteScene({required String unitUuid, required String sceneId}) async {
+  static Future<bool> deleteScene(
+      {required String unitUuid, required String sceneId}) async {
     try {
       final response = await _httpService.delete(
         path: ApiEndpoints.deleteScene

lib/services/space_mana_api.dart

@@ -13,7 +13,8 @@ import 'package:syncrow_web/utils/constants/temp_const.dart';
 
 class CommunitySpaceManagementApi {
   // Community Management APIs
-  Future<List<CommunityModel>> fetchCommunities({int page = 1}) async {
+  Future<List<CommunityModel>> fetchCommunities(String projectId,
+      {int page = 1}) async {
     try {
       List<CommunityModel> allCommunities = [];
       bool hasNext = true;
@@ -21,7 +22,7 @@ class CommunitySpaceManagementApi {
       while (hasNext) {
         await HTTPService().get(
           path: ApiEndpoints.getCommunityList
-              .replaceAll('{projectId}', TempConst.projectId),
+              .replaceAll('{projectId}', projectId),
           queryParameters: {'page': page},
           expectedResponseModel: (json) {
             try {
@@ -65,11 +66,10 @@ class CommunitySpaceManagementApi {
   }
 
   Future<CommunityModel?> createCommunity(
-      String name, String description) async {
+      String name, String description, String projectId) async {
     try {
       final response = await HTTPService().post(
-        path: ApiEndpoints.createCommunity
+        path: ApiEndpoints.createCommunity.replaceAll('{projectId}', projectId),
-            .replaceAll('{projectId}', TempConst.projectId),
         body: {
           'name': name,
           'description': description,
@@ -85,12 +85,13 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<bool> updateCommunity(String communityId, String name) async {
+  Future<bool> updateCommunity(
+      String communityId, String name, String projectId) async {
     try {
       final response = await HTTPService().put(
         path: ApiEndpoints.updateCommunity
             .replaceAll('{communityId}', communityId)
-            .replaceAll('{projectId}', TempConst.projectId),
+            .replaceAll('{projectId}', projectId),
         body: {
           'name': name,
         },
@@ -105,12 +106,12 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<bool> deleteCommunity(String communityId) async {
+  Future<bool> deleteCommunity(String communityId, String projectId) async {
     try {
       final response = await HTTPService().delete(
         path: ApiEndpoints.deleteCommunity
             .replaceAll('{communityId}', communityId)
-            .replaceAll('{projectId}', TempConst.projectId),
+            .replaceAll('{projectId}', projectId),
         expectedResponseModel: (json) {
           return json['success'] ?? false;
         },
@@ -122,12 +123,13 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<SpacesResponse> fetchSpaces(String communityId) async {
+  Future<SpacesResponse> fetchSpaces(
+      String communityId, String projectId) async {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.listSpaces
             .replaceAll('{communityId}', communityId)
-            .replaceAll('{projectId}', TempConst.projectId),
+            .replaceAll('{projectId}', projectId),
         expectedResponseModel: (json) {
           return SpacesResponse.fromJson(json);
         },
@@ -148,13 +150,14 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<SpaceModel?> getSpace(String communityId, String spaceId) async {
+  Future<SpaceModel?> getSpace(
+      String communityId, String spaceId, String projectId) async {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.getSpace
             .replaceAll('{communityId}', communityId)
             .replaceAll('{spaceId}', spaceId)
-            .replaceAll('{projectId}', TempConst.projectId),
+            .replaceAll('{projectId}', projectId),
         expectedResponseModel: (json) {
           return SpaceModel.fromJson(json['data']);
         },
@@ -176,7 +179,8 @@ class CommunitySpaceManagementApi {
       String? spaceModelUuid,
       String? icon,
       List<CreateTagBodyModel>? tags,
-      List<CreateSubspaceModel>? subspaces}) async {
+      List<CreateSubspaceModel>? subspaces,
+      required String projectId}) async {
     try {
       final body = {
         'spaceName': name,
@@ -199,7 +203,7 @@ class CommunitySpaceManagementApi {
       final response = await HTTPService().post(
         path: ApiEndpoints.createSpace
             .replaceAll('{communityId}', communityId)
-            .replaceAll('{projectId}', TempConst.projectId),
+            .replaceAll('{projectId}', projectId),
         body: body,
         expectedResponseModel: (json) {
           return SpaceModel.fromJson(json['data']);
@@ -212,18 +216,18 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<bool> updateSpace({
+  Future<bool> updateSpace(
-    required String communityId,
+      {required String communityId,
-    required spaceId,
+      required spaceId,
-    required String name,
+      required String name,
-    String? parentId,
+      String? parentId,
-    String? icon,
+      String? icon,
-    String? direction,
+      String? direction,
-    bool isPrivate = false,
+      bool isPrivate = false,
-    required Offset position,
+      required Offset position,
-    List<TagModelUpdate>? tags,
+      List<TagModelUpdate>? tags,
-    List<UpdateSubspaceTemplateModel>? subspaces,
+      List<UpdateSubspaceTemplateModel>? subspaces,
-  }) async {
+      required String projectId}) async {
     try {
       final body = {
         'spaceName': name,
@@ -243,7 +247,7 @@ class CommunitySpaceManagementApi {
         path: ApiEndpoints.updateSpace
             .replaceAll('{communityId}', communityId)
             .replaceAll('{spaceId}', spaceId)
-            .replaceAll('{projectId}', TempConst.projectId),
+            .replaceAll('{projectId}', projectId),
         body: body,
         expectedResponseModel: (json) {
           return json['success'] ?? false;
@@ -256,13 +260,14 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<bool> deleteSpace(String communityId, String spaceId) async {
+  Future<bool> deleteSpace(
+      String communityId, String spaceId, String projectId) async {
     try {
       final response = await HTTPService().delete(
         path: ApiEndpoints.deleteSpace
             .replaceAll('{communityId}', communityId)
             .replaceAll('{spaceId}', spaceId)
-            .replaceAll('{projectId}', TempConst.projectId),
+            .replaceAll('{projectId}', projectId),
         expectedResponseModel: (json) {
           return json['success'] ?? false;
         },
@@ -274,12 +279,13 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<List<SpaceModel>> getSpaceHierarchy(String communityId) async {
+  Future<List<SpaceModel>> getSpaceHierarchy(
+      String communityId, String projectId) async {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.getSpaceHierarchy
             .replaceAll('{communityId}', communityId)
-            .replaceAll('{projectId}', TempConst.projectId),
+            .replaceAll('{projectId}', projectId),
         expectedResponseModel: (json) {
           final spaceModels = (json['data'] as List)
               .map((spaceJson) => SpaceModel.fromJson(spaceJson))

lib/services/space_model_mang_api.dart

@@ -5,10 +5,10 @@ import 'package:syncrow_web/utils/constants/api_const.dart';
 import 'package:syncrow_web/utils/constants/temp_const.dart';
 
 class SpaceModelManagementApi {
-  Future<List<SpaceTemplateModel>> listSpaceModels({int page = 1}) async {
+  Future<List<SpaceTemplateModel>> listSpaceModels(
+      {required String projectId, int page = 1}) async {
     final response = await HTTPService().get(
-      path: ApiEndpoints.listSpaceModels
+      path: ApiEndpoints.listSpaceModels.replaceAll('{projectId}', projectId),
-          .replaceAll('{projectId}', TempConst.projectId),
       queryParameters: {'page': page},
       expectedResponseModel: (json) {
         List<dynamic> jsonData = json['data'];
@@ -21,10 +21,9 @@ class SpaceModelManagementApi {
   }
 
   Future<SpaceTemplateModel?> createSpaceModel(
-      CreateSpaceTemplateBodyModel spaceModel) async {
+      CreateSpaceTemplateBodyModel spaceModel, String projectId) async {
     final response = await HTTPService().post(
-      path: ApiEndpoints.createSpaceModel
+      path: ApiEndpoints.createSpaceModel.replaceAll('{projectId}', projectId),
-          .replaceAll('{projectId}', TempConst.projectId),
       showServerMessage: true,
       body: spaceModel.toJson(),
       expectedResponseModel: (json) {
@@ -34,12 +33,12 @@ class SpaceModelManagementApi {
     return response;
   }
 
-
+  Future<String?> updateSpaceModel(CreateSpaceTemplateBodyModel spaceModel,
-  Future<String?> updateSpaceModel(
+      String spaceModelUuid, String projectId) async {
-      CreateSpaceTemplateBodyModel spaceModel, String spaceModelUuid) async {
     final response = await HTTPService().put(
       path: ApiEndpoints.updateSpaceModel
-          .replaceAll('{projectId}', TempConst.projectId).replaceAll('{spaceModelUuid}', spaceModelUuid),
+          .replaceAll('{projectId}', projectId)
+          .replaceAll('{spaceModelUuid}', spaceModelUuid),
       body: spaceModel.toJson(),
       expectedResponseModel: (json) {
         return json['message'];
@@ -48,10 +47,11 @@ class SpaceModelManagementApi {
     return response;
   }
 
-  Future<SpaceTemplateModel?> getSpaceModel(String spaceModelUuid) async {
+  Future<SpaceTemplateModel?> getSpaceModel(
+      String spaceModelUuid, String projectId) async {
     final response = await HTTPService().get(
       path: ApiEndpoints.getSpaceModel
-          .replaceAll('{projectId}', TempConst.projectId)
+          .replaceAll('{projectId}', projectId)
           .replaceAll('{spaceModelUuid}', spaceModelUuid),
       showServerMessage: true,
       expectedResponseModel: (json) {

lib/services/user_permission.dart

@@ -11,15 +11,14 @@ import 'package:syncrow_web/utils/constants/api_const.dart';
 class UserPermissionApi {
   static final HTTPService _httpService = HTTPService();
 
-  Future<List<RolesUserModel>> fetchUsers() async {
+  Future<List<RolesUserModel>> fetchUsers(String projectId) async {
     try {
       final response = await _httpService.get(
-        path: ApiEndpoints.getUsers,
+        path: ApiEndpoints.getUsers.replaceAll('{projectId}', projectId),
         showServerMessage: true,
         expectedResponseModel: (json) {
           debugPrint('fetchUsers Response: $json');
-          final List<dynamic> data =
+          final List<dynamic> data = json['data'] ?? [];
-              json['data'] ?? []; // Default to an empty list if no data
           return data.map((item) => RolesUserModel.fromJson(item)).toList();
         },
       );
@@ -65,6 +64,7 @@ class UserPermissionApi {
     String? phoneNumber,
     String? roleUuid,
     List<String>? spaceUuids,
+    required String projectUuid,
   }) async {
     try {
       final body = <String, dynamic>{
@@ -74,7 +74,7 @@ class UserPermissionApi {
         "jobTitle": jobTitle != '' ? jobTitle : null,
         "phoneNumber": phoneNumber != '' ? phoneNumber : null,
         "roleUuid": roleUuid,
-        "projectUuid": "0e62577c-06fa-41b9-8a92-99a21fbaf51c",
+        "projectUuid": projectUuid,
         "spaceUuids": spaceUuids,
       };
       final response = await _httpService.post(
@@ -89,7 +89,6 @@ class UserPermissionApi {
           }
         },
       );
-      print('sendInviteUser=$body');
 
       return response ?? [];
     } on DioException catch (e) {
@@ -119,16 +118,18 @@ class UserPermissionApi {
       );
       return response ?? 'Unknown error occurred';
     } on DioException catch (e) {
-      final errorMessage = e.response?.data['error'];
+      final errorMessage = e.response?.data['error']['message'];
       return errorMessage;
     } catch (e) {
       return e.toString();
     }
   }
 
-  Future<EditUserModel?> fetchUserById(userUuid) async {
+  Future<EditUserModel?> fetchUserById(userUuid, String projectId) async {
     final response = await _httpService.get(
-      path: ApiEndpoints.getUserById.replaceAll("{userUuid}", userUuid),
+      path: ApiEndpoints.getUserById
+          .replaceAll("{userUuid}", userUuid)
+          .replaceAll("{projectId}", projectId),
       showServerMessage: true,
       expectedResponseModel: (json) {
         EditUserModel res = EditUserModel.fromJson(json['data']);
@@ -146,6 +147,7 @@ class UserPermissionApi {
     String? phoneNumber,
     String? roleUuid,
     List<String>? spaceUuids,
+    required String projectUuid,
   }) async {
     try {
       final body = <String, dynamic>{
@@ -154,7 +156,7 @@ class UserPermissionApi {
         "jobTitle": jobTitle != '' ? jobTitle : " ",
         "phoneNumber": phoneNumber != '' ? phoneNumber : " ",
         "roleUuid": roleUuid,
-        "projectUuid": "0e62577c-06fa-41b9-8a92-99a21fbaf51c",
+        "projectUuid": projectUuid,
         "spaceUuids": spaceUuids,
       };
       final response = await _httpService.put(
@@ -191,21 +193,18 @@ class UserPermissionApi {
     }
   }
 
-  Future<bool> changeUserStatusById(userUuid, status) async {
+  Future<bool> changeUserStatusById(userUuid, status, String projectUuid) async {
     try {
       Map<String, dynamic> bodya = {
         "disable": status,
-        "projectUuid": "0e62577c-06fa-41b9-8a92-99a21fbaf51c"
+        "projectUuid": projectUuid
       };
-      print('changeUserStatusById==$bodya');
-      print('changeUserStatusById==$userUuid');
 
       final response = await _httpService.put(
         path: ApiEndpoints.changeUserStatus
             .replaceAll("{invitedUserUuid}", userUuid),
         body: bodya,
         expectedResponseModel: (json) {
-          print('changeUserStatusById==${json['success']}');
           return json['success'];
         },
       );
@@ -213,7 +212,6 @@ class UserPermissionApi {
       return response;
     } catch (e) {
       return false;
-      print(e);
     }
   }
 }

lib/utils/constants/api_const.dart

@@ -9,8 +9,8 @@ abstract class ApiEndpoints {
   static const String sendOtp = '/authentication/user/send-otp';
   static const String verifyOtp = '/authentication/user/verify-otp';
   static const String getRegion = '/region';
-  static const String visitorPassword = '/visitor-password';
+  static const String visitorPassword = '/projects/{projectId}/visitor-password';
-  static const String getDevices = '/visitor-password/devices';
+  static const String getDevices = '/projects/{projectId}/visitor-password/devices';
 
   static const String sendOnlineOneTime = '/visitor-password/temporary-password/online/one-time';
   static const String sendOnlineMultipleTime =
@@ -25,7 +25,7 @@ abstract class ApiEndpoints {
 
   ////// Devices Management ////////////////
 
-  static const String getAllDevices = '/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

@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 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_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';
@@ -218,7 +220,7 @@ class _UserDropdownMenuState extends State<UserDropdownMenu> {
                       ),
                       GestureDetector(
                         onTap: () {
-                          AuthBloc.logout();
+                          AuthBloc.logout(context);
                           context.go(RoutesConst.auth);
                         },
                         child: SizedBox(