reduced debounce duration.

lib/pages/device_managment/all_devices/helper/route_controls_based_code.dart

@@ -9,6 +9,7 @@ import 'package:syncrow_web/pages/device_managment/curtain/view/curtain_batch_st
 import 'package:syncrow_web/pages/device_managment/curtain/view/curtain_status_view.dart';
 import 'package:syncrow_web/pages/device_managment/door_lock/view/door_lock_batch_control_view.dart';
 import 'package:syncrow_web/pages/device_managment/door_lock/view/door_lock_control_view.dart';
+import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart';
 import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/view/garage_door_batch_control_view.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/view/garage_door_control_view.dart';
@@ -198,6 +199,10 @@ mixin RouteControlsBasedCode {
         return SOSBatchControlView(
           deviceIds: devices.where((e) => (e.productType == 'SOS')).map((e) => e.uuid!).toList(),
         );
+      case 'NCPS':
+        return FlushMountedPresenceSensorBatchControlView(
+          devicesIds: devices.where((e) => (e.productType == 'NCPS')).map((e) => e.uuid!).toList(),
+        );
       default:
         return const SizedBox();
     }

lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart

@@ -49,6 +49,9 @@ class FlushMountedPresenceSensorBloc
     on<FlushMountedPresenceSensorFactoryResetEvent>(
       _onFlushMountedPresenceSensorFactoryResetEvent,
     );
+    on<FlushMountedPresenceSensorStatusUpdatedEvent>(
+      _onFlushMountedPresenceSensorStatusUpdatedEvent,
+    );
   }
 
   void _onFlushMountedPresenceSensorFetchStatusEvent(
@@ -60,7 +63,7 @@ class FlushMountedPresenceSensorBloc
       final response = await DevicesManagementApi().getDeviceStatus(deviceId);
       deviceStatus = FlushMountedPresenceSensorModel.fromJson(response.status);
       emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
-      _listenToChanges(emit, deviceId);
+      _listenToChanges(deviceId);
     } catch (e) {
       emit(FlushMountedPresenceSensorFailedState(error: e.toString()));
       return;
@@ -81,31 +84,33 @@ class FlushMountedPresenceSensorBloc
     }
   }
 
-  Future<void> _listenToChanges(
+  void _listenToChanges(String deviceId) {
-    Emitter<FlushMountedPresenceSensorState> emit,
+    try {
-    String deviceId,
+      final ref = FirebaseDatabase.instance.ref(
-  ) async {
+        'device-status/$deviceId',
-    final ref = FirebaseDatabase.instance.ref(
+      );
-      'device-status/$deviceId',
+
-    );
+      ref.onValue.listen((event) {
+        final eventsMap = event.snapshot.value as Map<dynamic, dynamic>;
 
-    await ref.onValue.listen(
-      (DatabaseEvent event) async {
-        Map<dynamic, dynamic> usersMap =
-            event.snapshot.value as Map<dynamic, dynamic>;
         List<Status> statusList = [];
-    
+        eventsMap['status'].forEach((element) {
-        (usersMap['status'] as List<dynamic>?)?.forEach((element) {
+          statusList.add(
-          statusList.add(Status(code: element['code'], value: element['value']));
+            Status(code: element['code'], value: element['value']),
+          );
         });
 
         deviceStatus = FlushMountedPresenceSensorModel.fromJson(statusList);
-        if (!emit.isDone) {
+        if (!isClosed) {
-          emit(FlushMountedPresenceSensorLoadingNewSate(model: deviceStatus));
+          add(FlushMountedPresenceSensorStatusUpdatedEvent(deviceStatus));
         }
-      },
+      });
-      onError: (error) => log(error.toString(), name: 'FirebaseDatabaseError'),
+    } catch (_) {
-    ).asFuture();
+      log(
+        'Error listening to changes',
+        name: 'FlushMountedPresenceSensorBloc._listenToChanges',
+      );
+    }
   }
 
   void _onFlushMountedPresenceSensorChangeValueEvent(
@@ -234,4 +239,12 @@ class FlushMountedPresenceSensorBloc
       emit(FlushMountedPresenceSensorFailedState(error: e.toString()));
     }
   }
+
+  void _onFlushMountedPresenceSensorStatusUpdatedEvent(
+    FlushMountedPresenceSensorStatusUpdatedEvent event,
+    Emitter<FlushMountedPresenceSensorState> emit,
+  ) {
+    deviceStatus = event.model;
+    emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
+  }
 }

lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_event.dart

@@ -10,6 +10,16 @@ sealed class FlushMountedPresenceSensorEvent extends Equatable {
 class FlushMountedPresenceSensorFetchStatusEvent
     extends FlushMountedPresenceSensorEvent {}
 
+class FlushMountedPresenceSensorStatusUpdatedEvent
+    extends FlushMountedPresenceSensorEvent {
+  const FlushMountedPresenceSensorStatusUpdatedEvent(this.model);
+
+  final FlushMountedPresenceSensorModel model;
+
+  @override
+  List<Object> get props => [model];
+}
+
 class FlushMountedPresenceSensorChangeValueEvent
     extends FlushMountedPresenceSensorEvent {
   final int value;

lib/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart

@@ -16,6 +16,6 @@ abstract final class FlushMountedPresenceSensorBlocFactory {
       batchControlDevicesService: DebouncedBatchControlDevicesService(
         decoratee: RemoteBatchControlDevicesService(),
       ),
-    )..add(FlushMountedPresenceSensorFetchStatusEvent());
+    );
   }
 }

lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart

@@ -22,7 +22,7 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
     return BlocProvider(
       create: (context) => FlushMountedPresenceSensorBlocFactory.create(
         deviceId: devicesIds.first,
-      ),
+      )..add(FlushMountedPresenceSensorFetchBatchStatusEvent(devicesIds)),
       child: BlocBuilder<FlushMountedPresenceSensorBloc,
           FlushMountedPresenceSensorState>(
         builder: (context, state) {
@@ -67,7 +67,8 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
           maxValue: 9,
           steps: 1,
           action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
+                FlushMountedPresenceSensorBatchControlEvent(
+                  deviceIds: devicesIds,
                   code: FlushMountedPresenceSensorModel.codeSensitivity,
                   value: value,
                 ),
@@ -83,7 +84,8 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
           valuesPercision: 1,
           action: (double value) =>
               context.read<FlushMountedPresenceSensorBloc>().add(
-                    FlushMountedPresenceSensorChangeValueEvent(
+                    FlushMountedPresenceSensorBatchControlEvent(
+                      deviceIds: devicesIds,
                       code: FlushMountedPresenceSensorModel.codeNearDetection,
                       value: (value * 100).toInt(),
                     ),
@@ -99,7 +101,8 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
           valuesPercision: 1,
           action: (double value) =>
               context.read<FlushMountedPresenceSensorBloc>().add(
-                    FlushMountedPresenceSensorChangeValueEvent(
+                    FlushMountedPresenceSensorBatchControlEvent(
+                      deviceIds: devicesIds,
                       code: FlushMountedPresenceSensorModel.codeFarDetection,
                       value: (value * 100).toInt(),
                     ),
@@ -112,20 +115,22 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
           maxValue: 3,
           steps: 1,
           action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
+                FlushMountedPresenceSensorBatchControlEvent(
+                  deviceIds: devicesIds,
                   code: FlushMountedPresenceSensorModel.codePresenceDelay,
                   value: value,
                 ),
               ),
         ),
         PresenceUpdateData(
-          value: (model.occurDistReduce.toDouble()),
+          value: model.occurDistReduce.toDouble(),
           title: 'Indent Level:',
           minValue: 0,
           maxValue: 3,
           steps: 1,
           action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
+                FlushMountedPresenceSensorBatchControlEvent(
+                  deviceIds: devicesIds,
                   code: FlushMountedPresenceSensorModel.codeOccurDistReduce,
                   value: value,
                 ),
@@ -139,7 +144,8 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
           maxValue: 3,
           steps: 1,
           action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
+                FlushMountedPresenceSensorBatchControlEvent(
+                  deviceIds: devicesIds,
                   code: FlushMountedPresenceSensorModel.codeSensiReduce,
                   value: value,
                 ),
@@ -154,7 +160,8 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
           steps: 1,
           action: (double value) =>
               context.read<FlushMountedPresenceSensorBloc>().add(
-                    FlushMountedPresenceSensorChangeValueEvent(
+                    FlushMountedPresenceSensorBatchControlEvent(
+                      deviceIds: devicesIds,
                       code: FlushMountedPresenceSensorModel.codeNoneDelay,
                       value: (value * 10).round(),
                     ),

lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart

@@ -24,7 +24,7 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
     return BlocProvider(
       create: (context) => FlushMountedPresenceSensorBlocFactory.create(
         deviceId: device.uuid ?? '-1',
-      ),
+      )..add(FlushMountedPresenceSensorFetchStatusEvent()),
       child: BlocBuilder<FlushMountedPresenceSensorBloc,
           FlushMountedPresenceSensorState>(
         builder: (context, state) {

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

@@ -3,7 +3,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/common/widgets/empty_search_result_widget.dart';
 import 'package:syncrow_web/common/widgets/search_bar.dart';
 import 'package:syncrow_web/common/widgets/sidebar_communities_list.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
@@ -16,8 +15,6 @@ import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/cent
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_event.dart';
 import 'package:syncrow_web/utils/style.dart';
 
-import '../../../space_tree/bloc/space_tree_event.dart';
-
 class SidebarWidget extends StatefulWidget {
   final List<CommunityModel> communities;
   final String? selectedSpaceUuid;
@@ -43,31 +40,13 @@ class _SidebarWidgetState extends State<SidebarWidget> {
 
   @override
   void initState() {
-    _scrollController = ScrollController();
-    _scrollController.addListener(_onScroll);
     _selectedId = widget.selectedSpaceUuid;
+    _scrollController = ScrollController();
     super.initState();
   }
 
-  void _onScroll() {
-    if (_scrollController.position.pixels >= _scrollController.position.maxScrollExtent - 100) {
-      // Trigger pagination event
-      final bloc = context.read<SpaceTreeBloc>();
-      if (!bloc.state.paginationIsLoading && bloc.state.paginationModel?.hasNext == true) {
-        bloc.add(
-          PaginationEvent(
-            bloc.state.paginationModel!,
-            bloc.state.communityList,
-          ),
-        );
-      }
-    }
-  }
-
   @override
   void dispose() {
-    _scrollController.removeListener(_onScroll);
-
     _scrollController.dispose();
     super.dispose();
   }
@@ -80,6 +59,38 @@ class _SidebarWidgetState extends State<SidebarWidget> {
     super.didUpdateWidget(oldWidget);
   }
 
+  List<CommunityModel> _filteredCommunities() {
+    if (_searchQuery.isEmpty) {
+      _selectedSpaceUuid = null;
+      return widget.communities;
+    }
+
+    return widget.communities.where((community) {
+      final containsQueryInCommunity =
+          community.name.toLowerCase().contains(_searchQuery.toLowerCase());
+      final containsQueryInSpaces = community.spaces.any((space) =>
+          _containsQuery(space: space, query: _searchQuery.toLowerCase()));
+
+      return containsQueryInCommunity || containsQueryInSpaces;
+    }).toList();
+  }
+
+  bool _containsQuery({
+    required SpaceModel space,
+    required String query,
+  }) {
+    final matchesSpace = space.name.toLowerCase().contains(query);
+    final matchesChildren = space.children.any(
+      (child) => _containsQuery(space: child, query: query),
+    );
+
+    if (matchesSpace || matchesChildren) {
+      _selectedSpaceUuid = space.uuid;
+    }
+
+    return matchesSpace || matchesChildren;
+  }
+
   bool _isSpaceOrChildSelected(SpaceModel space) {
     final isSpaceSelected = _selectedSpaceUuid == space.uuid;
     final anySubSpaceIsSelected = space.children.any(_isSpaceOrChildSelected);
@@ -90,10 +101,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
 
   @override
   Widget build(BuildContext context) {
-    final spaceTreeState = context.watch<SpaceTreeBloc>().state;
+    final filteredCommunities = _filteredCommunities();
-    final filteredCommunities = spaceTreeState.isSearching
-        ? spaceTreeState.filteredCommunity
-        : spaceTreeState.communityList;
 
     return Container(
       width: _width,
@@ -104,13 +112,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
         children: [
           SidebarHeader(onAddCommunity: _onAddCommunity),
           CustomSearchBar(
-            onSearchChanged: (query) {
+            onSearchChanged: (query) => setState(() => _searchQuery = query),
-              setState(() {
-                _searchQuery = query;
-              });
-
-              context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
-            },
           ),
           const SizedBox(height: 16),
           Expanded(
@@ -118,18 +120,14 @@ class _SidebarWidgetState extends State<SidebarWidget> {
               visible: filteredCommunities.isNotEmpty,
               replacement: const EmptySearchResultWidget(),
               child: SidebarCommunitiesList(
-                  scrollController: _scrollController,
+                scrollController: _scrollController,
-                  onScrollToEnd: () {},
+                onScrollToEnd: () {},
-                  communities: filteredCommunities,
+                communities: filteredCommunities,
-                  itemBuilder: (context, index) {
+                itemBuilder: (context, index) => _buildCommunityTile(
-                    if (index == filteredCommunities.length) {
+                  context,
-                      return const Padding(
+                  filteredCommunities[index],
-                        padding: EdgeInsets.all(8.0),
+                ),
-                        child: Center(child: CircularProgressIndicator()),
+              ),
-                      );
-                    }
-                    return _buildCommunityTile(context, filteredCommunities[index]);
-                  }),
             ),
           ),
         ],
@@ -207,8 +205,9 @@ class _SidebarWidgetState extends State<SidebarWidget> {
     );
   }
 
-  void _onAddCommunity() =>
+  void _onAddCommunity() => _selectedId?.isNotEmpty ?? true
-      _selectedId?.isNotEmpty ?? true ? _clearSelection() : _showCreateCommunityDialog();
+      ? _clearSelection()
+      : _showCreateCommunityDialog();
 
   void _clearSelection() {
     setState(() => _selectedId = '');

lib/services/batch_control_devices_service.dart

@@ -51,7 +51,7 @@ final class DebouncedBatchControlDevicesService
 
   DebouncedBatchControlDevicesService({
     required this.decoratee,
-    this.debounceDuration = const Duration(milliseconds: 1500),
+    this.debounceDuration = const Duration(milliseconds: 800),
   });
 
   @override

lib/services/control_device_service.dart

@@ -40,7 +40,7 @@ final class DebouncedControlDeviceService implements ControlDeviceService {
 
   DebouncedControlDeviceService({
     required this.decoratee,
-    this.debounceDuration = const Duration(milliseconds: 1500),
+    this.debounceDuration = const Duration(milliseconds: 800),
   });
 
   final _pendingRequests = <(String deviceUuid, Status status)>[];