fixed the save issue

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

@@ -108,7 +108,7 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                 return DeviceManagementBody(
                     devices: deviceState.filteredDevices);
               } else {
-                return const Center(child: Text('Error fetching Devices'));
+                return const DeviceManagementBody(devices: []);
               }
             },
           );

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

@@ -4,6 +4,7 @@ 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_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_state.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/create_subspace_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
@@ -246,7 +247,9 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
       final previousState = state;
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
       var spaceBloc = event.context.read<SpaceTreeBloc>();
-      List<CommunityModel> communities = await _waitForCommunityList(spaceBloc);
+      var spaceTreeState = event.context.read<SpaceTreeBloc>().state;
+
+      List<CommunityModel> communities = await _waitForCommunityList(spaceBloc, spaceTreeState);
       await fetchSpaceModels();
       await fetchTags();
 
@@ -277,11 +280,13 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
     LoadCommunityAndSpacesEvent event,
     Emitter<SpaceManagementState> emit,
   ) async {
+    var spaceTreeState = event.context.read<SpaceTreeBloc>().state;
     var spaceBloc = event.context.read<SpaceTreeBloc>();
+
     _onloadProducts();
     await fetchTags();
     // Wait until `communityList` is loaded
-    List<CommunityModel> communities = await _waitForCommunityList(spaceBloc);
+    List<CommunityModel> communities = await _waitForCommunityList(spaceBloc, spaceTreeState);
 
     // Fetch space models after communities are available
     final prevSpaceModels = await fetchSpaceModels();
@@ -292,23 +297,38 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
         allTags: _cachedTags ?? []));
   }
 
-  Future<List<CommunityModel>> _waitForCommunityList(SpaceTreeBloc spaceBloc) async {
+  Future<List<CommunityModel>> _waitForCommunityList(
+      SpaceTreeBloc spaceBloc, SpaceTreeState spaceTreeState) async {
     // Check if communityList is already populated
-    if (spaceBloc.state.communityList.isNotEmpty) {
+    final filteredCommunities = spaceTreeState.searchQuery.isNotEmpty
-      return spaceBloc.state.communityList;
+        ? spaceTreeState.filteredCommunity
+        : spaceTreeState.communityList;
+    if (filteredCommunities.isNotEmpty) {
+      return filteredCommunities;
     }
 
     final completer = Completer<List<CommunityModel>>();
     final subscription = spaceBloc.stream.listen((state) {
-      if (state.communityList.isNotEmpty) {
+      if (!completer.isCompleted && state.communityList.isNotEmpty) {
-        completer.complete(state.communityList);
+        completer
+            .complete(state.searchQuery.isNotEmpty ? state.filteredCommunity : state.communityList);
       }
     });
+    try {
+      final communities = await completer.future.timeout(
+        const Duration(seconds: 10),
+        onTimeout: () {
+          if (!completer.isCompleted) {
+            completer.complete([]);
+          }
+          return [];
+        },
+      );
 
-    // Return the list once available, then cancel the listener
+      return communities;
-    final communities = await completer.future;
+    } finally {
-    await subscription.cancel();
+      await subscription.cancel();
-    return communities;
+    }
   }
 
   void _onCommunityDelete(
@@ -491,12 +511,21 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
   Future<List<SpaceModel>> saveSpacesHierarchically(
       BuildContext context, List<SpaceModel> spaces, String communityUuid) async {
     final orderedSpaces = flattenHierarchy(spaces);
+
     final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-    var spaceBloc = context.read<SpaceTreeBloc>();
+    CommunityModel? selectedCommunity;
-    List<CommunityModel> communities = spaceBloc.state.communityList;
+    try {
-    CommunityModel? selectedCommunity = communities.firstWhere(
+      final spaceTreeState = context.read<SpaceTreeBloc>().state;
-      (community) => community.uuid == communityUuid,
+      final filteredCommunities = spaceTreeState.searchQuery.isNotEmpty
-    );
+          ? spaceTreeState.filteredCommunity
+          : spaceTreeState.communityList;
+
+      selectedCommunity = filteredCommunities.firstWhere(
+        (community) => community.uuid == communityUuid,
+      );
+    } catch (e) {
+      return [];
+    }
 
     final parentsToDelete = orderedSpaces.where((space) =>
         space.status == SpaceStatus.deleted &&
@@ -669,9 +698,12 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
 
     try {
       await fetchTags();
-      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      final spaceTreeState = event.context.read<SpaceTreeBloc>().state;
-      var spaceBloc = event.context.read<SpaceTreeBloc>();
+      final filteredCommunities = spaceTreeState.searchQuery.isNotEmpty
-      List<CommunityModel> communities = spaceBloc.state.communityList;
+          ? spaceTreeState.filteredCommunity
+          : spaceTreeState.communityList;
+
+      List<CommunityModel> communities = filteredCommunities;
 
       var prevSpaceModels = await fetchSpaceModels();
 

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

@@ -467,7 +467,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     }
 
     String communityUuid = widget.selectedCommunity!.uuid;
-
     context.read<SpaceManagementBloc>().add(SaveSpacesEvent(
           context,
           spaces: spacesToSave,

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

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/common/widgets/empty_search_result_widget.dart';
@@ -36,6 +38,7 @@ class SidebarWidget extends StatefulWidget {
 
 class _SidebarWidgetState extends State<SidebarWidget> {
   late final ScrollController _scrollController;
+  Timer? _debounce;
 
   String _searchQuery = '';
   String? _selectedSpaceUuid;
@@ -43,10 +46,10 @@ class _SidebarWidgetState extends State<SidebarWidget> {
 
   @override
   void initState() {
+    super.initState();
     _scrollController = ScrollController();
     _scrollController.addListener(_onScroll);
     _selectedId = widget.selectedSpaceUuid;
-    super.initState();
   }
 
   void _onScroll() {
@@ -67,11 +70,22 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   @override
   void dispose() {
     _scrollController.removeListener(_onScroll);
-
     _scrollController.dispose();
+    _debounce?.cancel();
     super.dispose();
   }
 
+  void _onSearchChanged(String query) {
+    if (_debounce?.isActive ?? false) _debounce?.cancel();
+
+    _debounce = Timer(const Duration(milliseconds: 500), () {
+      setState(() {
+        _searchQuery = query;
+      });
+      context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
+    });
+  }
+
   @override
   void didUpdateWidget(covariant SidebarWidget oldWidget) {
     if (widget.selectedSpaceUuid != oldWidget.selectedSpaceUuid) {
@@ -91,7 +105,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   @override
   Widget build(BuildContext context) {
     final spaceTreeState = context.watch<SpaceTreeBloc>().state;
-    final filteredCommunities = spaceTreeState.isSearching
+    final filteredCommunities = spaceTreeState.searchQuery.isNotEmpty
         ? spaceTreeState.filteredCommunity
         : spaceTreeState.communityList;
 
@@ -104,13 +118,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
         children: [
           SidebarHeader(onAddCommunity: _onAddCommunity),
           CustomSearchBar(
-            onSearchChanged: (query) {
+            onSearchChanged: _onSearchChanged,
-              setState(() {
-                _searchQuery = query;
-              });
-
-              context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
-            },
           ),
           const SizedBox(height: 16),
           Expanded(
@@ -123,10 +131,15 @@ class _SidebarWidgetState extends State<SidebarWidget> {
                   communities: filteredCommunities,
                   itemBuilder: (context, index) {
                     if (index == filteredCommunities.length) {
-                      return const Padding(
+                      final spaceTreeState = context.read<SpaceTreeBloc>().state;
-                        padding: EdgeInsets.all(8.0),
+                      if (spaceTreeState.paginationIsLoading) {
-                        child: Center(child: CircularProgressIndicator()),
+                        return const Padding(
-                      );
+                          padding: EdgeInsets.all(8.0),
+                          child: Center(child: CircularProgressIndicator()),
+                        );
+                      } else {
+                        return const SizedBox.shrink();
+                      }
                     }
                     return _buildCommunityTile(context, filteredCommunities[index]);
                   }),

lib/services/space_mana_api.dart

@@ -281,6 +281,7 @@ class CommunitySpaceManagementApi {
           return json['success'] ?? false;
         },
       );
+
       return response;
     } catch (e) {
       debugPrint('Error updating space: $e');