change endpoint

Bugfix/change-project-cubit

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(
-          controller: controller,
+        child: TextFormField(
+          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.timestampToDate(item.invalidTime),
+                                    accessBloc
+                                        .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(),
-                  selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                  emailAuthorizer:
+                      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(),
-                  selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                  emailAuthorizer:
+                      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(),
-                    selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                    emailAuthorizer:
+                        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';
@@ -180,7 +181,6 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         return;
       }
 
-
       if (token.accessTokenIsNotEmpty) {
         FlutterSecureStorage storage = const FlutterSecureStorage();
         await storage.write(
@@ -442,8 +442,9 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     emit(LoginInitial());
   }
 
-  static logout() {
-    const storage = FlutterSecureStorage();
+  static Future<void> logout(BuildContext context) async {
+    final storage = FlutterSecureStorage();
+    ProjectManager.clearProjectUUID();
     storage.deleteAll();
   }
 }

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 =
-        _devices.where((device) => device.batteryLevel != null && device.batteryLevel! < 20).length;
+    _lowBatteryCount = _devices
+        .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/device_managment/all_devices/widgets/device_managment_body.dart

@@ -69,7 +69,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
               },
             )),
             Expanded(
-              flex: 3,
+              flex: 4,
               child: state is DeviceManagementLoading
                   ? const Center(child: CircularProgressIndicator())
                   : Column(

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,8 +72,9 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     try {
       emit(LoadingHome());
       terms = await HomeApi().fetchTerms();
-      add(FetchPolicyEvent());
-      emit(PolicyAgreement());
+      emit(HomeInitial());
+
+      // emit(PolicyAgreement());
     } catch (e) {
       return;
     }
@@ -72,8 +84,11 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     try {
       emit(LoadingHome());
       policy = await HomeApi().fetchPolicy();
-      emit(PolicyAgreement());
+      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';
@@ -162,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,9 +9,24 @@ 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;
@@ -23,8 +38,9 @@ class HomeWebPage extends StatelessWidget {
       child: BlocConsumer<HomeBloc, HomeState>(
         listener: (BuildContext context, state) {
           if (state is HomeInitial) {
-              if (homeBloc.user!.hasAcceptedWebAgreement == false) {
-                Future.delayed(const Duration(seconds: 2), () {
+            if (homeBloc.user!.hasAcceptedWebAgreement == false && !_dialogShown) {
+              _dialogShown = true; // Set the flag to true to indicate the dialog is showing.
+              Future.delayed(const Duration(seconds: 1), () {
                 showDialog(
                   context: context,
                   barrierDismissible: false,
@@ -35,6 +51,7 @@ class HomeWebPage extends StatelessWidget {
                     );
                   },
                 ).then((v) {
+                  _dialogShown = false;
                   if (v != null) {
                     homeBloc.add(ConfirmUserAgreementEvent());
                     homeBloc.add(const FetchUserInfo());
@@ -80,9 +97,9 @@ class HomeWebPage extends StatelessWidget {
                           height: size.height * 0.6,
                           width: size.width * 0.68,
                           child: GridView.builder(
-                              itemCount: 3, //8
+                            itemCount: 3, // Change this count if needed.
                             gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                                crossAxisCount: 3, //4
+                              crossAxisCount: 3, // Adjust as needed.
                               crossAxisSpacing: 20.0,
                               mainAxisSpacing: 20.0,
                               childAspectRatio: 1.5,
@@ -106,6 +123,7 @@ class HomeWebPage extends StatelessWidget {
             ),
           );
         },
-        ));
+      ),
+    );
   }
 }

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,7 +78,10 @@ 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 = [];
@@ -84,8 +91,10 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
       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 {
@@ -102,12 +111,19 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           );
         }).toList(),
       );
+      originalCommunities = updatedCommunities;
       emit(const SpacesLoadedState());
     } catch (e) {
       emit(ErrorState('Error loading communities and spaces: $e'));
     }
   }
 
+// This variable holds the full original list.
+  List<TreeNode> originalCommunities = [];
+
+// This variable holds the working list that may be filtered.
+
+// Build tree nodes from your data model.
   List<TreeNode> _buildTreeNodes(List<SpaceModel> spaces) {
     return spaces.map((space) {
       List<TreeNode> childNodes =
@@ -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) {
@@ -209,6 +337,8 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
 
   void _sendInvitUser(SendInviteUsers event, Emitter<UsersState> emit) async {
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       emit(UsersLoadingState());
       List<String> selectedIds = getSelectedIds(updatedCommunities)
           .where((id) => !communityIds.contains(id))
@@ -222,7 +352,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           phoneNumber: phoneController.text,
           roleUuid: roleSelected,
           spaceUuids: selectedIds,
-      );
+          projectUuid: projectUuid);
 
       if (res) {
         showCustomDialog(
@@ -251,13 +381,13 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     }
   }
 
-
   _editInviteUser(EditInviteUsers event, Emitter<UsersState> emit) async {
     try {
       emit(UsersLoadingState());
       List<String> selectedIds = getSelectedIds(updatedCommunities)
           .where((id) => !communityIds.contains(id))
           .toList();
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       bool res = await UserPermissionApi().editInviteUser(
           userId: event.userId,
@@ -267,7 +397,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           phoneNumber: phoneController.text,
           roleUuid: roleSelected,
           spaceUuids: selectedIds,
-      );
+          projectUuid: projectUuid);
       if (res == true) {
         showCustomDialog(
           barrierDismissible: false,
@@ -372,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,
-                    borderRadius: BorderRadius.all(Radius.circular(20))),
+                    color: Colors.white, 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(
-                                      3, "Role & Permissions", _blocRole),
+                                  _buildStep3Indicator(3, "Role & Permissions", _blocRole),
                                 ],
                               ),
                             ),
@@ -113,15 +112,12 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                                 if (currentStep < 3) {
                                   currentStep++;
                                   if (currentStep == 2) {
-                                    _blocRole.add(
-                                        const CheckStepStatus(isEditUser: false));
+                                    _blocRole.add(const CheckStepStatus(isEditUser: false));
                                   } else if (currentStep == 3) {
-                                    _blocRole
-                                        .add(const CheckSpacesStepStatus());
+                                    _blocRole.add(const CheckSpacesStepStatus());
                                   }
                                 } else {
-                                  _blocRole
-                                      .add(SendInviteUsers(context: context));
+                                  _blocRole.add(SendInviteUsers(context: context));
                                 }
                               });
                             },
@@ -129,11 +125,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                               currentStep < 3 ? "Next" : "Save",
                               style: TextStyle(
                                   color: (_blocRole.isCompleteSpaces == false ||
-                                              _blocRole.isCompleteBasics ==
-                                                  false ||
-                                              _blocRole
-                                                      .isCompleteRolePermissions ==
-                                                  false) &&
+                                              _blocRole.isCompleteBasics == 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
-                        ? ColorsManager.blackColor
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
+                    color: currentStep == step ? ColorsManager.blackColor : 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) {
+            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
-                        ? ColorsManager.blackColor
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
+                    color: currentStep == step ? ColorsManager.blackColor : 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
-                        ? ColorsManager.blackColor
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
                   ),
                 ),
               ],

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

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

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/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,10 +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();
-      users = await UserPermissionApi().fetchUsers();
+      users = await UserPermissionApi().fetchUsers(projectUuid);
       users.sort((a, b) {
         final dateA = _parseDateTime(a.createdDate);
         final dateB = _parseDateTime(b.createdDate);
@@ -60,6 +74,7 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
       jobTitle = jobTitle.toSet().toList();
       createdBy = createdBy.toSet().toList();
       _handlePageChange(ChangePage(1), emit);
+      totalUsersCount = initialUsers;
       add(ChangePage(currentPage));
       emit(UsersLoadedState(users: users));
     } catch (e) {
@@ -86,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(
-          event.userId, event.newStatus == "disabled" ? false : true);
+      bool res = await UserPermissionApi().changeUserStatusById(event.userId,
+          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) {
@@ -128,7 +125,6 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
       emit(UsersLoadingState());
       currentSortOrder = "";
       users = List.from(users);
-      emit(UsersLoadedState(users: users));
     } else {
       emit(UsersLoadingState());
       currentSortOrder = "Asc";
@@ -136,8 +132,12 @@ 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(
@@ -150,13 +150,16 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
       emit(UsersLoadingState());
       currentSortOrder = "";
       users = List.from(initialUsers);
-      emit(UsersLoadedState(users: users));
     } else {
       emit(UsersLoadingState());
       currentSortOrder = "Desc";
       users.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-      emit(UsersLoadedState(users: users));
     }
+    currentSortJopTitle = '';
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortCreatedBy = '';
+    emit(UsersLoadedState(users: users));
   }
 
   void _toggleSortUsersByDateNewestToOldest(
@@ -222,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();
@@ -250,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) {
@@ -287,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 = "";
-    }
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortCreatedBy = '';
+    currentSortJopTitle = '';
+    currentSortOrderDate = "";
+
+    totalUsersCount = filteredUsers;
 
     emit(UsersLoadedState(users: filteredUsers));
   }
@@ -311,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 = "";
-    }
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortCreatedBy = '';
+    currentSortRole = '';
+    currentSortOrderDate = "";
+
+    totalUsersCount = filteredUsers;
+
     emit(UsersLoadedState(users: filteredUsers));
   }
 
@@ -335,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 {
-      currentSortOrder = "";
-    }
+    } else {}
+    currentSortOrder = '';
+    currentSortRole = '';
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortOrderDate = "";
+
+    totalUsersCount = filteredUsers;
+
     emit(UsersLoadedState(users: filteredUsers));
   }
 
@@ -371,14 +395,17 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {
-      currentSortOrder = "";
-    }
+      totalUsersCount = filteredUsers;
+    } else {}
+    currentSortOrder = '';
+    currentSortRole = '';
+    currentSortCreatedDate = '';
+    currentSortCreatedBy = '';
+    currentSortOrderDate = "";
 
     emit(UsersLoadedState(users: filteredUsers));
   }
 
-
   void _resetAllFilters(Emitter<UserTableState> emit) {
     selectedRoles.clear();
     selectedJobTitles.clear();

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

@@ -9,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/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,7 +34,9 @@ class UsersPage extends StatelessWidget {
           child: Text(
             title,
             style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                  color: title == "Delete"
+                  color: isActive == false && title != "Delete"
+                      ? Colors.grey
+                      : title == "Delete"
                           ? ColorsManager.red
                           : ColorsManager.spaceColor,
                   fontWeight: FontWeight.w400,
@@ -129,9 +132,12 @@ class UsersPage extends StatelessWidget {
                         child: TextFormField(
                           controller: searchController,
                           onChanged: (value) {
-                            context
-                                .read<UserTableBloc>()
-                                .add(SearchUsers(value));
+                            final bloc = context.read<UserTableBloc>();
+                            bloc.add(FilterClearEvent());
+                            bloc.add(SearchUsers(value));
+                            if (value == '') {
+                              bloc.add(ChangePage(1));
+                            }
                           },
                           style: const TextStyle(color: Colors.black),
                           decoration: textBoxDecoration(radios: 15)!.copyWith(
@@ -222,7 +228,7 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.jobTitle,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortOrder,
+                          isSelected: _blocRole.currentSortJopTitle,
                           onOkPressed: () {
                             searchController.clear();
                             _blocRole.add(FilterClearEvent());
@@ -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,7 +269,7 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.roleTypes,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortOrder,
+                          isSelected: _blocRole.currentSortRole,
                           onOkPressed: () {
                             searchController.clear();
                             _blocRole.add(FilterClearEvent());
@@ -275,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;
                           },
                         );
                       }
@@ -319,7 +325,7 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.createdBy,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortOrder,
+                          isSelected: _blocRole.currentSortCreatedBy,
                           onOkPressed: () {
                             searchController.clear();
                             _blocRole.add(FilterClearEvent());
@@ -330,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;
                           },
                         );
                       }
@@ -359,7 +365,7 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.status,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortOrder,
+                          isSelected: _blocRole.currentSortStatus,
                           onOkPressed: () {
                             searchController.clear();
                             _blocRole.add(FilterClearEvent());
@@ -370,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;
                           },
                         );
                       }
@@ -441,14 +447,17 @@ class UsersPage extends StatelessWidget {
                         ),
                         Row(
                           children: [
-                            actionButton(
+                            user.isEnabled != false
+                                ? actionButton(
+                                    isActive: true,
                                     title: "Edit",
                                     onTap: () {
                                       showDialog(
                                         context: context,
                                         barrierDismissible: false,
                                         builder: (BuildContext context) {
-                                    return EditUserDialog(userId: user.uuid);
+                                          return EditUserDialog(
+                                              userId: user.uuid);
                                         },
                                       ).then((v) {
                                         if (v != null) {
@@ -458,6 +467,9 @@ class UsersPage extends StatelessWidget {
                                         }
                                       });
                                     },
+                                  )
+                                : actionButton(
+                                    title: "Edit",
                                   ),
                             actionButton(
                               title: "Delete",
@@ -508,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 communityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
+// String spaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
+// 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(LoadAutomation(spaceId));
+      add(const LoadScenes());
+      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 =
-        updatedIfItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+    int index = updatedIfItems.indexWhere(
+        (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 =
-        currentItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+    int index = currentItems.indexWhere(
+        (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)
-          ..addAll(selectedFunction);
+        currentSelectedFunctions[event.uniqueCustomId] =
+            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));
-
-    try {
-      spaceId = event.spaceId;
-      communityId = event.communityId;
-
     List<ScenesModel> scenes = [];
+    try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
-      if (communityId.isNotEmpty && spaceId.isNotEmpty) {
-        scenes = await SceneApi.getScenes(event.spaceId, event.communityId);
+      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) {
+          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;
-      List<ScenesModel> automations = [];
-      if (spaceId.isNotEmpty) {
-        automations = await SceneApi.getAutomation(event.spaceId);
+      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) {
+          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(LoadAutomation(spaceId));
+        add(const LoadScenes());
+        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(LoadScenes(spaceId, communityId));
+        add(const LoadAutomation());
+        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,
-        'title': action.actionExecutor == 'delay' ? 'Delay' : (matchingDevice.name ?? 'Device'),
+        'deviceId':
+            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,8 +699,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         if (!deviceCards.containsKey(deviceId)) {
           deviceCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-            'uniqueCustomId': action.type == 'automation' || action.actionExecutor == 'delay'
+            'deviceId':
+                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'uniqueCustomId':
+                action.type == 'automation' || action.actionExecutor == 'delay'
                     ? const Uuid().v4()
                     : action.entityId,
             'title': action.actionExecutor == 'delay'
@@ -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(LoadAutomation(spaceId));
+      add(const LoadScenes());
+      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(LoadAutomation(spaceId));
+        add(const LoadScenes());
+        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 =
-          await SceneApi.updateAutomation(createAutomationModel, state.automationId ?? '');
+      final result = await SceneApi.updateAutomation(
+          createAutomationModel, state.automationId ?? '');
 
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadAutomation(spaceId));
-        add(LoadScenes(spaceId, communityId));
+        add(LoadAutomation());
+        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 =
-            action.actionExecutor == 'delay' ? '${action.entityId}_delay' : action.entityId;
+        final deviceId = action.actionExecutor == 'delay'
+            ? '${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 communityId;
+  // final String spaceId;
+  // 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,25 +32,20 @@ class _RoutinesViewState extends State<RoutinesView> {
         }
         return Row(
           children: [
-            Expanded(
-                child:
-                    // SideSpacesView(
-                    //   onSelectAction: (String communityId, String spaceId) {
-                    //     // context.read<RoutineBloc>()
-                    //     //   ..add(LoadScenes(spaceId, communityId))
-                    //     //   ..add(LoadAutomation(spaceId));
-                    //   },
-                    // )
-                    SpaceTreeView(
-              onSelect: () {},
+            Expanded(child: SpaceTreeView(
+              onSelect: () {
+                context.read<RoutineBloc>()
+                  ..add(const LoadScenes())
+                  ..add(const LoadAutomation());
+              },
             )),
             Expanded(
-              flex: 3,
-              child: Padding(
+              flex: 4,
+              child: ListView(children: [
+                Container(
                   padding: const EdgeInsets.all(16),
-                child: Row(
-                  children: [
-                    Column(
+                  height: MediaQuery.sizeOf(context).height,
+                  child: Column(
                     mainAxisSize: MainAxisSize.min,
                     crossAxisAlignment: CrossAxisAlignment.start,
                     mainAxisAlignment: MainAxisAlignment.start,
@@ -67,8 +62,8 @@ class _RoutinesViewState extends State<RoutinesView> {
                       ),
                       RoutineViewCard(
                         onTap: () {
-                            if (context.read<SpaceTreeBloc>().selectedCommunityId.isNotEmpty &&
-                                context.read<SpaceTreeBloc>().selectedSpaceId.isNotEmpty) {
+                          if (context.read<SpaceTreeBloc>().state.selectedCommunities.length == 1 &&
+                              context.read<SpaceTreeBloc>().state.selectedSpaces.length == 1) {
                             context.read<RoutineBloc>().add(
                                   (ResetRoutineState()),
                                 );
@@ -76,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,
@@ -88,9 +94,8 @@ class _RoutinesViewState extends State<RoutinesView> {
                       const Expanded(child: FetchRoutineScenesAutomation()),
                     ],
                   ),
-                  ],
-                ),
                 ),
+              ]),
             ),
           ],
         );

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,
-          context.read<SpaceTreeBloc>().selectedCommunityId))
-      ..add(LoadAutomation(context.read<SpaceTreeBloc>().selectedSpaceId));
+      ..add(const LoadScenes())
+      ..add(const LoadAutomation());
   }
 
   @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);
-        if (!_parentSelected(parents, updatedSelectedSpaces)) {
+        List<String> parents =
+            _getThePathToChild(event.communityModel.uuid, event.spaceId).toSet().toList();
+
+        if (updatedSelectedSpaces.isEmpty) {
           updatedSoldChecks.removeWhere(parents.contains);
-        }
-        if (!_anySpacesSelectedInCommunity(
-            event.communityId, updatedSelectedSpaces, updatedSoldChecks)) {
-          updatedSelectedCommunities.remove(event.communityId);
+          updatedSelectedCommunities.remove(event.communityModel.uuid);
+        } else {
+          // Check if any parent has selected children
+          for (String space in parents) {
+            if (!_noChildrenSelected(event.communityModel, space, updatedSelectedSpaces, parents)) {
+              updatedSoldChecks.remove(space);
             }
           }
 
-      communityAndSpaces[event.communityId] = updatedSelectedSpaces;
+          if (!_anySpacesSelectedInCommunity(
+              event.communityModel, updatedSelectedSpaces, updatedSoldChecks)) {
+            updatedSelectedCommunities.remove(event.communityModel.uuid);
+          }
+        }
+      }
+
+      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) {
-    for (String space in parents) {
-      if (selectedSpaces.contains(space)) {
+  _noChildrenSelected(
+      CommunityModel community, String spaceId, List<String> selectedSpaces, List<String> parents) {
+    if (selectedSpaces.contains(spaceId)) {
+      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,14 +256,21 @@ 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) {
-      if (community.uuid == communityId) {
     List<String> ids = _getAllChildIds(community.spaces);
     for (var id in ids) {
       result = selectedSpaces.contains(id) || partialCheckedList.contains(id);
@@ -245,8 +278,6 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
         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

@@ -10,10 +10,23 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/style.dart';
 
-class SpaceTreeView extends StatelessWidget {
+class SpaceTreeView extends StatefulWidget {
   final Function onSelect;
   const SpaceTreeView({required this.onSelect, super.key});
 
+  @override
+  State<SpaceTreeView> createState() => _SpaceTreeViewState();
+}
+
+class _SpaceTreeViewState extends State<SpaceTreeView> {
+  final ScrollController _scrollController = ScrollController();
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<SpaceTreeBloc, SpaceTreeState>(builder: (context, state) {
@@ -21,71 +34,87 @@ class SpaceTreeView extends StatelessWidget {
       return Container(
         height: MediaQuery.sizeOf(context).height,
         decoration: subSectionContainerDecoration,
-        // padding: const EdgeInsets.all(16.0),
         child: state is SpaceTreeLoadingState
             ? const Center(child: CircularProgressIndicator())
             : Column(
                 children: [
                   CustomSearchBar(
+                    searchQuery: state.searchQuery,
                     onSearchChanged: (query) {
                       context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
                     },
                   ),
                   const SizedBox(height: 16),
                   Expanded(
-                    child: Padding(
+                    child: ListView(
+                      shrinkWrap: true,
+                      scrollDirection: Axis.horizontal,
+                      children: [
+                        Container(
+                          width: MediaQuery.sizeOf(context).width * 0.5,
                           padding: const EdgeInsets.all(8.0),
                           child: list.isEmpty
                               ? Center(
                                   child: Text(
                                     'No results found',
                                     style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                      color: ColorsManager.lightGrayColor, // Gray when not selected
+                                          color: ColorsManager.lightGrayColor,
                                           fontWeight: FontWeight.w400,
                                         ),
                                   ),
                                 )
-                          : ListView(
+                              : Scrollbar(
+                                  scrollbarOrientation: ScrollbarOrientation.left,
+                                  thumbVisibility: true,
+                                  controller: _scrollController,
+                                  child: Padding(
+                                    padding: const EdgeInsets.only(left: 16),
+                                    child: ListView(
+                                      controller: _scrollController,
                                       shrinkWrap: true,
                                       children: list
                                           .map(
                                             (community) => CustomExpansionTileSpaceTree(
                                               title: community.name,
-                                      isSelected:
-                                          state.selectedCommunities.contains(community.uuid),
-                                      isSoldCheck:
-                                          state.selectedCommunities.contains(community.uuid),
+                                              isSelected: state.selectedCommunities
+                                                  .contains(community.uuid),
+                                              isSoldCheck: state.selectedCommunities
+                                                  .contains(community.uuid),
                                               onExpansionChanged: () {
                                                 context
                                                     .read<SpaceTreeBloc>()
                                                     .add(OnCommunityExpanded(community.uuid));
                                               },
-                                      isExpanded:
-                                          state.expandedCommunities.contains(community.uuid),
+                                              isExpanded: state.expandedCommunities
+                                                  .contains(community.uuid),
                                               onItemSelected: () {
                                                 context.read<SpaceTreeBloc>().add(
-                                            OnCommunitySelected(community.uuid, community.spaces));
-
-                                        onSelect();
+                                                    OnCommunitySelected(
+                                                        community.uuid, community.spaces));
+                                                widget.onSelect();
                                               },
                                               children: community.spaces.map((space) {
                                                 return CustomExpansionTileSpaceTree(
                                                   title: space.name,
-                                          isExpanded: state.expandedSpaces.contains(space.uuid),
+                                                  isExpanded:
+                                                      state.expandedSpaces.contains(space.uuid),
                                                   onItemSelected: () {
-                                            context.read<SpaceTreeBloc>().add(OnSpaceSelected(
-                                                community.uuid, space.uuid ?? '', space.children));
-                                            onSelect();
+                                                    context.read<SpaceTreeBloc>().add(
+                                                        OnSpaceSelected(community, space.uuid ?? '',
+                                                            space.children));
+                                                    widget.onSelect();
                                                   },
                                                   onExpansionChanged: () {
                                                     context.read<SpaceTreeBloc>().add(
-                                                OnSpaceExpanded(community.uuid, space.uuid ?? ''));
+                                                        OnSpaceExpanded(
+                                                            community.uuid, space.uuid ?? ''));
                                                   },
-                                          isSelected: state.selectedSpaces.contains(space.uuid) ||
+                                                  isSelected:
+                                                      state.selectedSpaces.contains(space.uuid) ||
                                                           state.soldCheck.contains(space.uuid),
                                                   isSoldCheck: state.soldCheck.contains(space.uuid),
                                                   children: _buildNestedSpaces(
-                                              context, state, space, community.uuid),
+                                                      context, state, space, community),
                                                 );
                                               }).toList(),
                                             ),
@@ -94,6 +123,73 @@ class SpaceTreeView extends StatelessWidget {
                                     ),
                                   ),
                                 ),
+                        ),
+                      ],
+                    ),
+                  ),
+
+                  // Expanded(
+                  //   child: Padding(
+                  //     padding: const EdgeInsets.all(8.0),
+                  //     child: list.isEmpty
+                  //         ? Center(
+                  //             child: Text(
+                  //               'No results found',
+                  //               style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                  //                     color: ColorsManager.lightGrayColor, // Gray when not selected
+                  //                     fontWeight: FontWeight.w400,
+                  //                   ),
+                  //             ),
+                  //           )
+                  //         : ListView(
+                  //             shrinkWrap: true,
+                  //             children: list
+                  //                 .map(
+                  //                   (community) => CustomExpansionTileSpaceTree(
+                  //                     title: community.name,
+                  //                     isSelected:
+                  //                         state.selectedCommunities.contains(community.uuid),
+                  //                     isSoldCheck:
+                  //                         state.selectedCommunities.contains(community.uuid),
+                  //                     onExpansionChanged: () {
+                  //                       context
+                  //                           .read<SpaceTreeBloc>()
+                  //                           .add(OnCommunityExpanded(community.uuid));
+                  //                     },
+                  //                     isExpanded:
+                  //                         state.expandedCommunities.contains(community.uuid),
+                  //                     onItemSelected: () {
+                  //                       context.read<SpaceTreeBloc>().add(
+                  //                           OnCommunitySelected(community.uuid, community.spaces));
+
+                  //                       onSelect();
+                  //                     },
+                  //                     children: community.spaces.map((space) {
+                  //                       return CustomExpansionTileSpaceTree(
+                  //                         title: space.name,
+                  //                         isExpanded: state.expandedSpaces.contains(space.uuid),
+                  //                         onItemSelected: () {
+                  //                           context.read<SpaceTreeBloc>().add(OnSpaceSelected(
+                  //                               community.uuid, space.uuid ?? '', space.children));
+                  //                           onSelect();
+                  //                         },
+                  //                         onExpansionChanged: () {
+                  //                           context.read<SpaceTreeBloc>().add(
+                  //                               OnSpaceExpanded(community.uuid, space.uuid ?? ''));
+                  //                         },
+                  //                         isSelected: state.selectedSpaces.contains(space.uuid) ||
+                  //                             state.soldCheck.contains(space.uuid),
+                  //                         isSoldCheck: state.soldCheck.contains(space.uuid),
+                  //                         children: _buildNestedSpaces(
+                  //                             context, state, space, community.uuid),
+                  //                       );
+                  //                     }).toList(),
+                  //                   ),
+                  //                 )
+                  //                 .toList(),
+                  //           ),
+                  //   ),
+                  // ),
                 ],
               ),
       );
@@ -101,7 +197,7 @@ class SpaceTreeView extends StatelessWidget {
   }
 
   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:
@@ -112,13 +208,13 @@ class SpaceTreeView extends StatelessWidget {
         onItemSelected: () {
           context
               .read<SpaceTreeBloc>()
-              .add(OnSpaceSelected(communityId, child.uuid ?? '', child.children));
-          onSelect();
+              .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 =
-          await _api.updateCommunity(event.communityUuid, event.name);
+      final success = await _api.updateCommunity(
+          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 = [];
 
@@ -95,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++;
@@ -103,7 +121,8 @@ class SpaceManagementBloc
             hasNext = false;
           }
         }
-        prevSpaceModels = await _spaceModelApi.listSpaceModels(page: 1);
+        prevSpaceModels = await _spaceModelApi.listSpaceModels(
+            page: 1, projectId: projectUuid);
       }
 
       return allSpaces;
@@ -132,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(
@@ -163,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 ||
@@ -176,7 +199,7 @@ 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);
@@ -206,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 {
@@ -244,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 {
@@ -270,8 +300,10 @@ class SpaceManagementBloc
     emit(SpaceManagementLoading());
 
     try {
-      CommunityModel? newCommunity =
-          await _api.createCommunity(event.name, event.description);
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+      CommunityModel? newCommunity = await _api.createCommunity(
+          event.name, event.description, projectUuid);
       var prevSpaceModels = await fetchSpaceModels(previousState);
 
       if (newCommunity != null) {
@@ -414,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 &&
@@ -422,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;
@@ -435,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;
@@ -514,7 +548,7 @@ class SpaceManagementBloc
               subspaces: subspaceUpdates,
               tags: tagUpdates,
               direction: space.incomingConnection?.direction,
-          );
+              projectId: projectUuid);
         } else {
           // Call create if the space does not have a UUID
           final List<CreateTagBodyModel> tagBodyModels = space.tags != null
@@ -543,7 +577,7 @@ class SpaceManagementBloc
               spaceModelUuid: space.spaceModel?.uuid,
               tags: tagBodyModels,
               subspaces: createSubspaceBodyModels,
-          );
+              projectId: projectUuid);
           space.uuid = response?.uuid;
         }
       } catch (e) {
@@ -583,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/view/spaces_management_page.dart

@@ -28,8 +28,11 @@ class SpaceManagementPageState extends State<SpaceManagementPage> {
     return MultiBlocProvider(
       providers: [
         BlocProvider(
-          create: (_) => SpaceManagementBloc(_api, _productApi, _spaceModelApi)
-            ..add(LoadCommunityAndSpacesEvent()),
+          create: (_) => SpaceManagementBloc(
+            _api,
+            _productApi,
+            _spaceModelApi,
+          )..add(LoadCommunityAndSpacesEvent()),
         ),
         BlocProvider(
           create: (_) => CenterBodyBloc(),

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';
@@ -42,22 +43,31 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
     _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
@@ -65,16 +75,11 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
     return Stack(
       clipBehavior: Clip.none,
       children: [
-        Row(
-          children: [
-            SidebarWidget(
-              communities: widget.communities,
-              selectedSpaceUuid: widget.selectedSpace?.uuid ??
-                  widget.selectedCommunity?.uuid ??
-                  '',
-            ),
         widget.shouldNavigateToSpaceModelPage
-                ? Expanded(
+            ? Row(
+                children: [
+                  SizedBox(width: 300, child: SpaceTreeView(onSelect: () {})),
+                  Expanded(
                     child: BlocProvider(
                       create: (context) => SpaceModelBloc(
                         api: SpaceModelManagementApi(),
@@ -85,8 +90,17 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
                         onSpaceModelsUpdated: _onSpaceModelsUpdated,
                       ),
                     ),
+                  ),
+                ],
               )
-                : CommunityStructureArea(
+            : Row(
+                children: [
+                  SidebarWidget(
+                    communities: widget.communities,
+                    selectedSpaceUuid:
+                        widget.selectedSpace?.uuid ?? widget.selectedCommunity?.uuid ?? '',
+                  ),
+                  CommunityStructureArea(
                     selectedCommunity: widget.selectedCommunity,
                     selectedSpace: widget.selectedSpace,
                     spaces: widget.selectedCommunity?.spaces ?? [],

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,
-          isSaveEnabled: _validateTags(allTags),
-          errorMessage: ''));
+        tags: tags,
+        updatedTags: updatedTags, 
+        isSaveEnabled: _validateTags(tags),
+        errorMessage: '',
+      ));
     });
 
     on<UpdateTagEvent>((event, emit) {
@@ -56,10 +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),
         ));
@@ -72,12 +81,15 @@ 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),
         ));
@@ -92,6 +104,7 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
 
         emit(AssignTagLoaded(
           tags: tags,
+          updatedTags: _calculateAvailableTags(allTags, tags),
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
@@ -102,38 +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,
-          isSaveEnabled: _validateTags(updatedTags),
-          errorMessage: _getValidationError(updatedTags),
+          tags: tags,
+          updatedTags: updatedTags,
+          isSaveEnabled: _validateTags(tags),
+          errorMessage: _getValidationError(tags),
         ));
-      } else {
-        emit(const AssignTagLoaded(
-            tags: [],
-            isSaveEnabled: false,
-            errorMessage: 'Failed to delete tag'));
       }
     });
   }
 
+  // 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 isValid;
+    return uniqueTags.length == tags.length && !hasEmptyTag;
   }
 
+  // Get validation error for duplicate tags
   String? _getValidationError(List<Tag> tags) {
-    final hasEmptyTag = tags.any((tag) => (tag.tag?.trim() ?? '').isEmpty);
-    if (hasEmptyTag) {
-      return 'Tags cannot be empty.';
-    }
-
-    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;
@@ -149,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;
 
   const AssignTagLoaded({
     required this.tags,
     required this.isSaveEnabled,
+    required this.updatedTags,
     required this.errorMessage,
   });
 
   @override
-  List<Object> get props => [tags, isSaveEnabled, errorMessage ?? ''];
+  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,
@@ -119,8 +120,6 @@ 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: [
@@ -180,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;
@@ -306,15 +307,4 @@ class AssignTagDialog extends StatelessWidget {
       ),
     );
   }
-
-  List<String> getAvailableTags(
-      List<String> allTags, List<Tag> currentTags, Tag currentTag) {
-    List<String> availableTagsForTagModel = TagHelper.getAvailableTags<Tag>(
-      allTags: allTags,
-      currentTags: currentTags,
-      currentTag: currentTag,
-      getTag: (tag) => tag.tag ?? '',
-    );
-    return availableTagsForTagModel;
-  }
 }

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,
-          isSaveEnabled: _validateTags(allTags),
+          tags: tags,
+          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,
-          isSaveEnabled: _validateTags(updatedTags),
-        ));
-      } else {
-        emit(const AssignTagModelLoaded(
-          tags: [],
-          isSaveEnabled: false,
+          tags: tags,
+          updatedTags: updatedTags,
+          isSaveEnabled: _validateTags(tags),
+          errorMessage: _getValidationError(tags),
         ));
       } 
     });
   }
 
   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,
@@ -134,9 +135,6 @@ class AssignTagModelsDialog extends StatelessWidget {
                                 : List.generate(state.tags.length, (index) {
                                     final tag = state.tags[index];
                                     final controller = controllers[index];
-                                    final availableTags =
-                                        TagHelper.getAvailableTagModels(
-                                            allTags ?? [], state.tags, tag);
 
                                     return DataRow(
                                       cells: [
@@ -196,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;

lib/pages/spaces_management/helper/tag_helper.dart

@@ -299,7 +299,7 @@ class TagHelper {
 
   static Map<String, dynamic> updateSubspaceTagModels(
       List<TagModel> updatedTags, List<SubspaceTemplateModel>? subspaces) {
-    return TagHelper.updateTags<TagModel>(
+    final result = TagHelper.updateTags<TagModel>(
       updatedTags: updatedTags,
       subspaces: subspaces,
       getInternalId: (tag) => tag.internalId,
@@ -310,6 +310,34 @@ class TagHelper {
       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) {
@@ -328,7 +356,7 @@ class TagHelper {
 
   static Map<String, dynamic> processTags(
       List<Tag> updatedTags, List<SubspaceModel>? subspaces) {
-    return TagHelper.updateTags<Tag>(
+    final result = TagHelper.updateTags<Tag>(
       updatedTags: updatedTags,
       subspaces: subspaces,
       getInternalId: (tag) => tag.internalId,
@@ -339,6 +367,33 @@ class TagHelper {
       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(

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 =
-              await _api.getSpaceModel(event.spaceTemplate.uuid ?? '');
+          final prevSpaceModel = await _api.getSpaceModel(
+              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 =
-            await api.getSpaceModel(event.newSpaceModel.uuid ?? '');
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+        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/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 {

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(
-      OnlineOneTimePasswordEvent event, Emitter<VisitorPasswordState> emit) async {
+  Future<void> postOnlineOneTimePassword(OnlineOneTimePasswordEvent event,
+      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(
-      OfflineOneTimePasswordEvent event, Emitter<VisitorPasswordState> emit) async {
+  Future<void> postOfflineOneTimePassword(OfflineOneTimePasswordEvent event,
+      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!) {
-            accessPeriodValidate = "Effective Time cannot be later than Expiration Time.";
+          if (expirationTimeTimeStamp != null &&
+              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!) {
-            accessPeriodValidate = 'Expiration Time cannot be earlier than Effective Time.';
+          if (effectiveTimeTimeStamp != null &&
+              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)
-                  .textTheme
-                  .headlineLarge!
-                  .copyWith(fontWeight: FontWeight.w400, fontSize: 24, color: Colors.black),
+              style: Theme.of(context).textTheme.headlineLarge!.copyWith(
+                  fontWeight: FontWeight.w400,
+                  fontSize: 24,
+                  color: Colors.black),
             ),
             content: SizedBox(
               height: MediaQuery.of(context).size.height / 1.7,
@@ -68,7 +70,10 @@ class AddDeviceDialog extends StatelessWidget {
                             ),
                             Text(
                               'Only online accessible devices can be added',
-                              style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .bodySmall!
+                                  .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)
-            : ApiEndpoints.getAllDevices,
+                .replaceAll('{projectId}', projectId)
+            : 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),
-        body: createAutomationModel.toJson(automationId.isNotEmpty == true ? automationId : null),
+        path: ApiEndpoints.updateAutomation
+            .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
-            .replaceAll('{projectId}', TempConst.projectId),
+        path: ApiEndpoints.createCommunity.replaceAll('{projectId}', 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,8 +216,8 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<bool> updateSpace({
-    required String communityId,
+  Future<bool> updateSpace(
+      {required String communityId,
       required spaceId,
       required String name,
       String? parentId,
@@ -223,7 +227,7 @@ class CommunitySpaceManagementApi {
       required Offset position,
       List<TagModelUpdate>? tags,
       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
-          .replaceAll('{projectId}', TempConst.projectId),
+      path: ApiEndpoints.listSpaceModels.replaceAll('{projectId}', 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
-          .replaceAll('{projectId}', TempConst.projectId),
+      path: ApiEndpoints.createSpaceModel.replaceAll('{projectId}', projectId),
       showServerMessage: true,
       body: spaceModel.toJson(),
       expectedResponseModel: (json) {
@@ -34,12 +33,12 @@ class SpaceModelManagementApi {
     return response;
   }
 
-
-  Future<String?> updateSpaceModel(
-      CreateSpaceTemplateBodyModel spaceModel, String spaceModelUuid) async {
+  Future<String?> updateSpaceModel(CreateSpaceTemplateBodyModel spaceModel,
+      String spaceModelUuid, String projectId) 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,10 +11,10 @@ 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');
@@ -64,6 +64,7 @@ class UserPermissionApi {
     String? phoneNumber,
     String? roleUuid,
     List<String>? spaceUuids,
+    required String projectUuid,
   }) async {
     try {
       final body = <String, dynamic>{
@@ -73,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(
@@ -88,7 +89,6 @@ class UserPermissionApi {
           }
         },
       );
-      print('sendInviteUser=$body');
 
       return response ?? [];
     } on DioException catch (e) {
@@ -125,9 +125,11 @@ class UserPermissionApi {
     }
   }
 
-  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']);
@@ -145,6 +147,7 @@ class UserPermissionApi {
     String? phoneNumber,
     String? roleUuid,
     List<String>? spaceUuids,
+    required String projectUuid,
   }) async {
     try {
       final body = <String, dynamic>{
@@ -153,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(
@@ -190,14 +193,12 @@ 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

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 getDevices = '/visitor-password/devices';
+  static const String visitorPassword = '/projects/{projectId}/visitor-password';
+  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}/device';
   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 getUserById = '/projects/${projectUuid}/user/{userUuid}';
+  static const String getUsers = '/projects/{projectId}/user';
+  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(