animated tab buttons.

fix real time garage door and add flush sensor to routines

assets/icons/blank_calendar.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.25 2.1875H14.6875V1.875C14.6875 1.62636 14.5887 1.3879 14.4129 1.21209C14.2371 1.03627 13.9986 0.9375 13.75 0.9375C13.5014 0.9375 13.2629 1.03627 13.0871 1.21209C12.9113 1.3879 12.8125 1.62636 12.8125 1.875V2.1875H7.1875V1.875C7.1875 1.62636 7.08873 1.3879 6.91291 1.21209C6.7371 1.03627 6.49864 0.9375 6.25 0.9375C6.00136 0.9375 5.7629 1.03627 5.58709 1.21209C5.41127 1.3879 5.3125 1.62636 5.3125 1.875V2.1875H3.75C3.3356 2.1875 2.93817 2.35212 2.64515 2.64515C2.35212 2.93817 2.1875 3.3356 2.1875 3.75V16.25C2.1875 16.6644 2.35212 17.0618 2.64515 17.3549C2.93817 17.6479 3.3356 17.8125 3.75 17.8125H16.25C16.6644 17.8125 17.0618 17.6479 17.3549 17.3549C17.6479 17.0618 17.8125 16.6644 17.8125 16.25V3.75C17.8125 3.3356 17.6479 2.93817 17.3549 2.64515C17.0618 2.35212 16.6644 2.1875 16.25 2.1875ZM5.3125 4.0625C5.3125 4.31114 5.41127 4.5496 5.58709 4.72541C5.7629 4.90123 6.00136 5 6.25 5C6.49864 5 6.7371 4.90123 6.91291 4.72541C7.08873 4.5496 7.1875 4.31114 7.1875 4.0625H12.8125C12.8125 4.31114 12.9113 4.5496 13.0871 4.72541C13.2629 4.90123 13.5014 5 13.75 5C13.9986 5 14.2371 4.90123 14.4129 4.72541C14.5887 4.5496 14.6875 4.31114 14.6875 4.0625H15.9375V5.9375H4.0625V4.0625H5.3125ZM4.0625 15.9375V7.8125H15.9375V15.9375H4.0625Z" fill="#475569"/>
+</svg>

lib/pages/analytics/modules/analytics/blocs/bloc/analytics_tab_bloc.dart

@@ -0,0 +1,18 @@
+import 'package:bloc/bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/enums/analytics_page_tab.dart';
+
+part 'analytics_tab_event.dart';
+
+class AnalyticsTabBloc extends Bloc<AnalyticsTabEvent, AnalyticsPageTab> {
+  AnalyticsTabBloc() : super(AnalyticsPageTab.energyManagement) {
+    on<UpdateAnalyticsTabEvent>(_onUpdateAnalyticsTabEvent);
+  }
+
+  void _onUpdateAnalyticsTabEvent(
+    UpdateAnalyticsTabEvent event,
+    Emitter<AnalyticsPageTab> emit,
+  ) {
+    emit(event.analyticsTab);
+  }
+}

lib/pages/analytics/modules/analytics/blocs/bloc/analytics_tab_event.dart

@@ -0,0 +1,17 @@
+part of 'analytics_tab_bloc.dart';
+
+sealed class AnalyticsTabEvent extends Equatable {
+  const AnalyticsTabEvent();
+
+  @override
+  List<Object> get props => [];
+}
+
+class UpdateAnalyticsTabEvent extends AnalyticsTabEvent { 
+  const UpdateAnalyticsTabEvent(this.analyticsTab);
+
+  final AnalyticsPageTab analyticsTab;
+
+  @override
+  List<Object> get props => [analyticsTab];
+}

lib/pages/analytics/modules/analytics/enums/analytics_page_tab.dart

@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/analytics/modules/energy_management/views/analytics_energy_management_view.dart';
+import 'package:syncrow_web/pages/analytics/modules/occupancy/views/analytics_occupancy_view.dart';
+import 'package:syncrow_web/pages/analytics/modules/overview/views/analytics_overview_view.dart';
+
+enum AnalyticsPageTab {
+  overview(
+    title: 'Overview',
+    child: AnalyticsOverviewView(),
+  ),
+  energyManagement(
+    title: 'Energy Management',
+    child: AnalyticsEnergyManagementView(),
+  ),
+  occupancy(
+    title: 'Occupancy',
+    child: AnalyticsOccupancyView(),
+  );
+
+  const AnalyticsPageTab({
+    required this.title,
+    required this.child,
+  });
+
+  final Widget child;
+  final String title;
+}

lib/pages/analytics/modules/analytics/views/analytics_page.dart

@@ -0,0 +1,42 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/bloc/analytics_tab_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/analytics_communities_sidebar.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/analytics_page_tabs_and_children.dart';
+import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
+import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
+import 'package:syncrow_web/web_layout/web_scaffold.dart';
+
+class AnalyticsPage extends StatelessWidget {
+  const AnalyticsPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider<AnalyticsTabBloc>(
+      create: (context) => AnalyticsTabBloc(),
+      child: const AnalyticsPageForm(),
+    );
+  }
+}
+
+class AnalyticsPageForm extends StatelessWidget {
+  const AnalyticsPageForm({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return WebScaffold(
+      rightBody: const NavigateHomeGridView(),
+      appBarTitle: Text(
+        'Syncrow Analytics',
+        style: ResponsiveTextTheme.of(context).deviceManagementTitle,
+      ),
+      enableMenuSidebar: false,
+      scaffoldBody: const Row(
+        children: [
+          AnalyticsCommunitiesSidebar(),
+          Expanded(flex: 5, child: AnalyticsPageTabsAndChildren()),
+        ],
+      ),
+    );
+  }
+}

lib/pages/analytics/modules/analytics/widgets/analytics_communities_sidebar.dart

@@ -0,0 +1,18 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
+
+class AnalyticsCommunitiesSidebar extends StatelessWidget {
+  const AnalyticsCommunitiesSidebar({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Expanded(
+      child: SpaceTreeView(
+        title: const Text('Communities'),
+        shouldDisableDeselectingChildrenOfSelectedParent: true,
+        onSelect: () {},
+        isSide: false,
+      ),
+    );
+  }
+}

lib/pages/analytics/modules/analytics/widgets/analytics_date_filter_button.dart

@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:intl/intl.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+
+class AnalyticsDateFilterButton extends StatelessWidget {
+  const AnalyticsDateFilterButton({super.key});
+
+  static final _color = ColorsManager.blackColor.withValues(alpha: 0.8);
+
+  @override
+  Widget build(BuildContext context) {
+    return TextButton.icon(
+      style: TextButton.styleFrom(
+        foregroundColor: _color,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(16),
+          side: const BorderSide(
+            color: ColorsManager.greyColor,
+            width: 1,
+          ),
+        ),
+        backgroundColor: ColorsManager.transparentColor,
+        padding: const EdgeInsets.symmetric(
+          horizontal: 32,
+          vertical: 16,
+        ),
+      ),
+      icon: SvgPicture.asset(
+        Assets.blankCalendar,
+        height: 20,
+        width: 20,
+        colorFilter: ColorFilter.mode(_color, BlendMode.srcIn),
+      ),
+      label: Text(
+        _concatenateDate(DateTime(2024, 1), DateTime(2024, 12)),
+        style: const TextStyle(
+          fontWeight: FontWeight.w700,
+        ),
+      ),
+      onPressed: () {},
+    );
+  }
+
+  String _formatDate(DateTime date) {
+    final formatter = DateFormat('MMM yyyy');
+    final formattedDate = formatter.format(date);
+    return formattedDate;
+  }
+
+  String _concatenateDate(DateTime startDate, DateTime endDate) {
+    final formattedStartDate = _formatDate(startDate);
+    final formattedEndDate = _formatDate(endDate);
+    return '$formattedStartDate - $formattedEndDate';
+  }
+}

lib/pages/analytics/modules/analytics/widgets/analytics_page_tab_button.dart

@@ -0,0 +1,38 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/bloc/analytics_tab_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/enums/analytics_page_tab.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class AnalyticsPageTabButton extends StatelessWidget {
+  const AnalyticsPageTabButton({
+    super.key,
+    required this.tab,
+    required this.isSelected,
+  });
+
+  final AnalyticsPageTab tab;
+  final bool isSelected;
+
+  @override
+  Widget build(BuildContext context) {
+    return TextButton(
+      onPressed: () => context.read<AnalyticsTabBloc>().add(
+            UpdateAnalyticsTabEvent(tab),
+          ),
+      child: Text(
+        tab.title,
+        textAlign: TextAlign.center,
+        maxLines: 1,
+        softWrap: false,
+        overflow: TextOverflow.ellipsis,
+        style: TextStyle(
+          fontWeight: isSelected ? FontWeight.w700 : FontWeight.w400,
+          fontSize: 16,
+          color:
+              isSelected ? ColorsManager.slidingBlueColor : ColorsManager.textGray,
+        ),
+      ),
+    );
+  }
+}

lib/pages/analytics/modules/analytics/widgets/analytics_page_tabs_and_children.dart

@@ -0,0 +1,84 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/bloc/analytics_tab_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/enums/analytics_page_tab.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/analytics_date_filter_button.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/analytics_page_tab_button.dart';
+import 'package:syncrow_web/utils/style.dart';
+
+class AnalyticsPageTabsAndChildren extends StatelessWidget {
+  const AnalyticsPageTabsAndChildren({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<AnalyticsTabBloc, AnalyticsPageTab>(
+      buildWhen: (previous, current) => previous != current,
+      builder: (context, selectedTab) => Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Expanded(
+            child: Container(
+              width: MediaQuery.sizeOf(context).width * 1,
+              decoration: subSectionContainerDecoration,
+              padding: const EdgeInsets.symmetric(horizontal: 32),
+              child: Row(
+                mainAxisSize: MainAxisSize.min,
+                mainAxisAlignment: MainAxisAlignment.start,
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  Expanded(
+                    flex: 4,
+                    child: FittedBox(
+                      alignment: AlignmentDirectional.centerStart,
+                      fit: BoxFit.scaleDown,
+                      child: Row(
+                        spacing: 32,
+                        mainAxisSize: MainAxisSize.min,
+                        mainAxisAlignment: MainAxisAlignment.start,
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          ...AnalyticsPageTab.values.map(
+                            (tab) => AnimatedSwitcher(
+                              switchInCurve: Curves.easeIn,
+                              duration: const Duration(milliseconds: 200),
+                              child: AnalyticsPageTabButton(
+                                key: ValueKey(selectedTab),
+                                tab: tab,
+                                isSelected: tab == selectedTab,
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                  const Spacer(),
+                  const Expanded(
+                    flex: 2,
+                    child: FittedBox(
+                      fit: BoxFit.scaleDown,
+                      alignment: AlignmentDirectional.centerEnd,
+                      child: AnalyticsDateFilterButton(),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          Expanded(
+            flex: 8,
+            child: SizedBox(
+              width: MediaQuery.sizeOf(context).width,
+              child: AnimatedSwitcher(
+                switchInCurve: Curves.easeIn,
+                duration: const Duration(milliseconds: 200),
+                child: selectedTab.child,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/analytics/modules/energy_management/views/analytics_energy_management_view.dart

@@ -0,0 +1,12 @@
+import 'package:flutter/material.dart';
+
+class AnalyticsEnergyManagementView extends StatelessWidget {
+  const AnalyticsEnergyManagementView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const Center(
+      child: Text('EnergyManagementView is Working!'),
+    );
+  }
+}

lib/pages/analytics/modules/occupancy/views/analytics_occupancy_view.dart

@@ -0,0 +1,12 @@
+import 'package:flutter/material.dart';
+
+class AnalyticsOccupancyView extends StatelessWidget {
+  const AnalyticsOccupancyView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const Center(
+      child: Text('AnalyticsOccupancyView is Working!'),
+    );
+  }
+}

lib/pages/analytics/modules/overview/views/analytics_overview_view.dart

@@ -0,0 +1,12 @@
+import 'package:flutter/material.dart';
+
+class AnalyticsOverviewView extends StatelessWidget {
+  const AnalyticsOverviewView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const Center(
+      child: Text('Coming Soon!'),
+    );
+  }
+}

lib/pages/common/buttons/search_reset_buttons.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/style.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
 
 class SearchResetButtons extends StatelessWidget {
   const SearchResetButtons({
@@ -17,8 +17,10 @@ class SearchResetButtons extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Row(
+      mainAxisSize: MainAxisSize.min,
       children: [
         Column(
+          mainAxisSize: MainAxisSize.min,
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
             const SizedBox(height: 25),

lib/pages/device_managment/ac/view/control_list/current_temp.dart

@@ -60,7 +60,15 @@ class _CurrentTempState extends State<CurrentTemp> {
           );
     });
   }
-
+  @override
+  void didUpdateWidget(CurrentTemp oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.tempSet != widget.tempSet) {
+      setState(() {
+        _adjustedValue = _initialAdjustedValue(widget.tempSet);
+      });
+    }
+  }
   @override
   void dispose() {
     _debounce?.cancel();

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/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/device_managment/all_devices/widgets/device_managment_body.dart

@@ -72,6 +72,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
               child: state is DeviceManagementLoading
                   ? const Center(child: CircularProgressIndicator())
                   : Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         Container(
                           padding: isLargeScreenSize(context)

lib/pages/device_managment/all_devices/widgets/device_search_filters.dart

@@ -14,29 +14,29 @@ class DeviceSearchFilters extends StatefulWidget {
 
 class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
     with HelperResponsiveLayout {
-  final _unitNameController = TextEditingController();
+  late final TextEditingController _unitNameController;
-  final _productNameController = TextEditingController();
+  late final TextEditingController _productNameController;
 
-  List<Widget> get _widgets => [
+  @override
-        _buildSearchField("Space Name", _unitNameController, 200),
+  void initState() {
-        _buildSearchField("Device Name / Product Name", _productNameController, 300),
+    _unitNameController = TextEditingController();
-        _buildSearchResetButtons(),
+    _productNameController = TextEditingController();
-      ];
+    super.initState();
+  }
 
   @override
   Widget build(BuildContext context) {
-    if (isExtraLargeScreenSize(context)) {
-      return Row(
-        children: _widgets
-            .map((e) => Padding(padding: const EdgeInsets.all(10), child: e))
-            .toList(),
-      );
-    }
-
     return Wrap(
+      alignment: WrapAlignment.start,
+      runAlignment: WrapAlignment.start,
+      crossAxisAlignment: WrapCrossAlignment.center,
       spacing: 20,
       runSpacing: 10,
-      children: _widgets,
+      children: [
+        _buildSearchField("Space Name", _unitNameController, 200),
+        _buildSearchField("Device Name / Product Name", _productNameController, 300),
+        _buildSearchResetButtons(),
+      ],
     );
   }
 

lib/pages/device_managment/ceiling_sensor/view/ceiling_sensor_controls.dart

@@ -16,7 +16,8 @@ import 'package:syncrow_web/pages/device_managment/shared/table/report_table.dar
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class CeilingSensorControlsView extends StatelessWidget with HelperResponsiveLayout {
+class CeilingSensorControlsView extends StatelessWidget
+    with HelperResponsiveLayout {
   const CeilingSensorControlsView({super.key, required this.device});
 
   final AllDevicesModel device;
@@ -31,29 +32,35 @@ class CeilingSensorControlsView extends StatelessWidget with HelperResponsiveLay
         ..add(CeilingInitialEvent(device.uuid ?? '')),
       child: BlocBuilder<CeilingSensorBloc, CeilingSensorState>(
         builder: (context, state) {
-          if (state is CeilingLoadingInitialState || state is CeilingReportsLoadingState) {
+          if (state is CeilingLoadingInitialState ||
+              state is CeilingReportsLoadingState) {
             return const Center(child: CircularProgressIndicator());
           } else if (state is CeilingUpdateState) {
-            return _buildGridView(
+            return _buildGridView(context, state.ceilingSensorModel,
-                context, state.ceilingSensorModel, isExtraLarge, isLarge, isMedium);
+                isExtraLarge, isLarge, isMedium);
           } else if (state is CeilingReportsState) {
             return ReportsTable(
               report: state.deviceReport,
               onRowTap: (index) {},
               onClose: () {
-                context.read<CeilingSensorBloc>().add(BackToCeilingGridViewEvent());
+                context
+                    .read<CeilingSensorBloc>()
+                    .add(BackToCeilingGridViewEvent());
               },
             );
           } else if (state is ShowCeilingDescriptionState) {
             return DescriptionView(
               description: state.description,
               onClose: () {
-                context.read<CeilingSensorBloc>().add(BackToCeilingGridViewEvent());
+                context
+                    .read<CeilingSensorBloc>()
+                    .add(BackToCeilingGridViewEvent());
               },
             );
           } else if (state is CeilingReportsFailedState) {
             final model = context.read<CeilingSensorBloc>().deviceStatus;
-            return _buildGridView(context, model, isExtraLarge, isLarge, isMedium);
+            return _buildGridView(
+                context, model, isExtraLarge, isLarge, isMedium);
           }
           return const Center(child: Text('Error fetching status'));
         },
@@ -61,8 +68,8 @@ class CeilingSensorControlsView extends StatelessWidget with HelperResponsiveLay
     );
   }
 
-  Widget _buildGridView(BuildContext context, CeilingSensorModel model, bool isExtraLarge,
+  Widget _buildGridView(BuildContext context, CeilingSensorModel model,
-      bool isLarge, bool isMedium) {
+      bool isExtraLarge, bool isLarge, bool isMedium) {
     return GridView(
       padding: const EdgeInsets.symmetric(horizontal: 50),
       shrinkWrap: true,
@@ -143,8 +150,8 @@ class CeilingSensorControlsView extends StatelessWidget with HelperResponsiveLay
         ),
         GestureDetector(
           onTap: () {
-            context.read<CeilingSensorBloc>().add(
+            context.read<CeilingSensorBloc>().add(GetCeilingDeviceReportsEvent(
-                GetCeilingDeviceReportsEvent(code: 'presence_state', deviceUuid: device.uuid!));
+                code: 'presence_state', deviceUuid: device.uuid!));
           },
           child: const PresenceStaticWidget(
             icon: Assets.illuminanceRecordIcon,
@@ -153,9 +160,8 @@ class CeilingSensorControlsView extends StatelessWidget with HelperResponsiveLay
         ),
         GestureDetector(
           onTap: () {
-            context
+            context.read<CeilingSensorBloc>().add(GetCeilingDeviceReportsEvent(
-                .read<CeilingSensorBloc>()
+                code: '', deviceUuid: device.uuid!));
-                .add(GetCeilingDeviceReportsEvent(code: '', deviceUuid: device.uuid!));
           },
           child: const PresenceStaticWidget(
             icon: Assets.helpDescriptionIcon,

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,15 +10,24 @@ 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;
   final String code;
-  final bool isBatchControl;
+
   const FlushMountedPresenceSensorChangeValueEvent({
     required this.value,
     required this.code,
-    this.isBatchControl = false,
   });
 
   @override

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,14 +67,15 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
           maxValue: 9,
           steps: 1,
           action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
+                FlushMountedPresenceSensorBatchControlEvent(
+                  deviceIds: devicesIds,
                   code: FlushMountedPresenceSensorModel.codeSensitivity,
                   value: value,
                 ),
               ),
         ),
         PresenceUpdateData(
-          value: (model.nearDetection / 100).toDouble(),
+          value: (model.nearDetection / 100).clamp(0.0, double.infinity),
           title: 'Nearest Detect Dist:',
           description: 'm',
           minValue: 0.0,
@@ -83,14 +84,15 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
           valuesPercision: 1,
           action: (double value) =>
               context.read<FlushMountedPresenceSensorBloc>().add(
-                    FlushMountedPresenceSensorChangeValueEvent(
+                    FlushMountedPresenceSensorBatchControlEvent(
+                      deviceIds: devicesIds,
                       code: FlushMountedPresenceSensorModel.codeNearDetection,
                       value: (value * 100).toInt(),
                     ),
                   ),
         ),
         PresenceUpdateData(
-          value: (model.farDetection / 100).toDouble(),
+          value: (model.farDetection / 100).clamp(0.0, double.infinity),
           title: 'Max Detect Dist:',
           description: 'm',
           minValue: 0.0,
@@ -99,51 +101,57 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
           valuesPercision: 1,
           action: (double value) =>
               context.read<FlushMountedPresenceSensorBloc>().add(
-                    FlushMountedPresenceSensorChangeValueEvent(
+                    FlushMountedPresenceSensorBatchControlEvent(
+                      deviceIds: devicesIds,
                       code: FlushMountedPresenceSensorModel.codeFarDetection,
                       value: (value * 100).toInt(),
                     ),
                   ),
         ),
         PresenceUpdateData(
-          value: model.presenceDelay.toDouble(),
+          value: model.sensiReduce.toDouble(),
           title: 'Trigger Level:',
           minValue: 0,
           maxValue: 3,
           steps: 1,
           action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
+                FlushMountedPresenceSensorBatchControlEvent(
-                  code: FlushMountedPresenceSensorModel.codePresenceDelay,
+                  deviceIds: devicesIds,
+                  code: FlushMountedPresenceSensorModel.codeSensiReduce,
                   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,
                 ),
               ),
         ),
         PresenceUpdateData(
-          value: (model.sensiReduce.toDouble()),
+          value: (model.presenceDelay / 10).toDouble(),
           title: 'Target Confirm Time:',
           description: 's',
-          minValue: 0,
+          minValue: 0.0,
-          maxValue: 3,
+          maxValue: 0.5,
-          steps: 1,
+          steps: 0.1,
-          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
+          valuesPercision: 1,
-                FlushMountedPresenceSensorChangeValueEvent(
+          action: (double value) =>
-                  code: FlushMountedPresenceSensorModel.codeSensiReduce,
+              context.read<FlushMountedPresenceSensorBloc>().add(
-                  value: value,
+                    FlushMountedPresenceSensorBatchControlEvent(
-                ),
+                      deviceIds: devicesIds,
-              ),
+                      code: FlushMountedPresenceSensorModel.codePresenceDelay,
+                      value: (value * 10).toInt(),
+                    ),
+                  ),
         ),
         PresenceUpdateData(
           value: ((model.noneDelay / 10).toDouble()),
@@ -154,7 +162,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

@@ -15,7 +15,7 @@ import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_la
 
 class FlushMountedPresenceSensorControlView extends StatelessWidget
     with HelperResponsiveLayout {
-  const FlushMountedPresenceSensorControlView({super.key, required this.device});
+  const FlushMountedPresenceSensorControlView({required this.device, super.key});
 
   final AllDevicesModel device;
 
@@ -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) {
@@ -113,7 +113,7 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
               ),
         ),
         PresenceUpdateData(
-          value: (model.nearDetection / 100).toDouble(),
+          value: (model.nearDetection / 100).clamp(0.0, double.infinity),
           title: 'Nearest Detect Dist:',
           description: 'm',
           minValue: 0.0,
@@ -129,7 +129,7 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
                   ),
         ),
         PresenceUpdateData(
-          value: (model.farDetection / 100).toDouble(),
+          value: (model.farDetection / 100).clamp(0.0, double.infinity),
           title: 'Max Detect Dist:',
           description: 'm',
           minValue: 0.0,
@@ -145,20 +145,20 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
                   ),
         ),
         PresenceUpdateData(
-          value: (model.presenceDelay.toDouble()),
+          value: model.sensiReduce.toDouble(),
           title: 'Trigger Level:',
           minValue: 0,
           maxValue: 3,
           steps: 1,
           action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
                 FlushMountedPresenceSensorChangeValueEvent(
-                  code: FlushMountedPresenceSensorModel.codePresenceDelay,
+                  code: FlushMountedPresenceSensorModel.codeSensiReduce,
                   value: value,
                 ),
               ),
         ),
         PresenceUpdateData(
-          value: (model.occurDistReduce.toDouble()),
+          value: model.occurDistReduce.toDouble(),
           title: 'Indent Level:',
           minValue: 0,
           maxValue: 3,
@@ -171,21 +171,23 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
               ),
         ),
         PresenceUpdateData(
-          value: (model.sensiReduce.toDouble()),
+          value: (model.presenceDelay / 10).toDouble(),
+          valuesPercision: 1,
           title: 'Target Confirm Time:',
           description: 's',
-          minValue: 0,
+          minValue: 0.0,
-          maxValue: 3,
+          maxValue: 0.5,
-          steps: 1,
+          steps: 0.1,
-          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
+          action: (double value) =>
-                FlushMountedPresenceSensorChangeValueEvent(
+              context.read<FlushMountedPresenceSensorBloc>().add(
-                  code: FlushMountedPresenceSensorModel.codeSensiReduce,
+                    FlushMountedPresenceSensorChangeValueEvent(
-                  value: value,
+                      code: FlushMountedPresenceSensorModel.codePresenceDelay,
-                ),
+                      value: (value * 10).toInt(),
-              ),
+                    ),
+                  ),
         ),
         PresenceUpdateData(
-          value: ((model.noneDelay / 10).toDouble()),
+          value: (model.noneDelay / 10).toDouble(),
           description: 's',
           title: 'Disappe Delay:',
           minValue: 20,

lib/pages/device_managment/power_clamp/bloc/smart_power_bloc.dart

@@ -217,29 +217,31 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
     try {
       var status =
           await DevicesManagementApi().getPowerClampInfo(event.deviceId);
-      deviceStatus = PowerClampModel.fromJson(status);
+      deviceStatus = PowerClampModel.fromJson(status as Map<String, Object?>? ??{});
-
+      final phaseADataPoints = deviceStatus.status.phaseA.dataPoints;
+      final phaseBDataPoints = deviceStatus.status.phaseB.dataPoints;
+      final phaseCDataPoints = deviceStatus.status.phaseC.dataPoints;
       phaseData = [
         {
           'name': 'Phase A',
-          'voltage': '${deviceStatus.status.phaseA.dataPoints[0].value / 10} V',
+          'voltage': '${(phaseADataPoints.elementAtOrNull(0)?.value as num? ?? 0) / 10} V',
-          'current': '${deviceStatus.status.phaseA.dataPoints[1].value / 10} A',
+          'current': '${(phaseADataPoints.elementAtOrNull(1)?.value as num? ?? 0) / 10} A',
-          'activePower': '${deviceStatus.status.phaseA.dataPoints[2].value} W',
+          'activePower': '${phaseADataPoints.elementAtOrNull(2)?.value??'N/A'} W',
-          'powerFactor': '${deviceStatus.status.phaseA.dataPoints[3].value}',
+          'powerFactor': '${phaseADataPoints.elementAtOrNull(3)?.value??'N/A'}',
         },
         {
           'name': 'Phase B',
-          'voltage': '${deviceStatus.status.phaseB.dataPoints[0].value / 10} V',
+          'voltage': '${(phaseBDataPoints .elementAtOrNull(0)?.value  as num? ?? 0) / 10} V',
-          'current': '${deviceStatus.status.phaseB.dataPoints[1].value / 10} A',
+          'current': '${(phaseBDataPoints .elementAtOrNull(1)?.value as num? ?? 0) / 10} A',
-          'activePower': '${deviceStatus.status.phaseB.dataPoints[2].value} W',
+          'activePower': '${phaseBDataPoints.elementAtOrNull(2)?.value??'N/A'} W',
-          'powerFactor': '${deviceStatus.status.phaseB.dataPoints[3].value}',
+          'powerFactor': '${phaseBDataPoints.elementAtOrNull(3)?.value??'N/A'}',
         },
         {
           'name': 'Phase C',
-          'voltage': '${deviceStatus.status.phaseC.dataPoints[0].value / 10} V',
+          'voltage': '${(phaseCDataPoints.elementAtOrNull(0)?.value as num? ?? 0) / 10} V',
-          'current': '${deviceStatus.status.phaseC.dataPoints[1].value / 10} A',
+          'current': '${(phaseCDataPoints.elementAtOrNull(1)?.value as num? ?? 0) / 10} A',
-          'activePower': '${deviceStatus.status.phaseC.dataPoints[2].value} W',
+          'activePower': '${phaseCDataPoints.elementAtOrNull(2)?.value ?? 'N/A'} W',
-          'powerFactor': '${deviceStatus.status.phaseC.dataPoints[3].value}',
+          'powerFactor': '${phaseCDataPoints.elementAtOrNull(3)?.value ?? 'N/A'}',
         },
       ];
       emit(GetDeviceStatus());
@@ -785,7 +787,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
   void selectDateRange() async {
     DateTime startDate = dateTime!;
     DateTime endDate = DateTime(startDate.year, startDate.month + 1, 1)
-        .subtract(Duration(days: 1));
+        .subtract(const Duration(days: 1));
     String formattedEndDate = DateFormat('dd/MM/yyyy').format(endDate);
     endChartDate = ' - $formattedEndDate';
   }

lib/pages/device_managment/power_clamp/models/power_clamp_model.dart

@@ -12,9 +12,9 @@ class PowerClampModel {
 
   factory PowerClampModel.fromJson(Map<String, dynamic> json) {
     return PowerClampModel(
-      productUuid: json['productUuid'],
+      productUuid: json['productUuid'] as String? ?? '',
-      productType: json['productType'],
+      productType: json['productType'] as String? ?? '',
-      status: PowerStatus.fromJson(json['status']),
+      status: PowerStatus.fromJson(json['status'] as Map<String, dynamic>? ?? {}),
     );
   }
 
@@ -26,7 +26,7 @@ class PowerClampModel {
     return PowerClampModel(
       productUuid: productUuid ?? this.productUuid,
       productType: productType ?? this.productType,
-      status: statusPower ?? this.status,
+      status: statusPower ?? status,
     );
   }
 }
@@ -46,12 +46,10 @@ class PowerStatus {
 
   factory PowerStatus.fromJson(Map<String, dynamic> json) {
     return PowerStatus(
-        phaseA: Phase.fromJson(json['phaseA']),
+        phaseA: Phase.fromJson(json['phaseA']as List<dynamic>? ?? []),
-        phaseB: Phase.fromJson(json['phaseB']),
+        phaseB: Phase.fromJson(json['phaseB']as List<dynamic>? ?? []),
-        phaseC: Phase.fromJson(json['phaseC']),
+        phaseC: Phase.fromJson(json['phaseC']as List<dynamic>? ?? []),
-        general: Phase.fromJson(json['general']
+        general: Phase.fromJson(json['general']as List<dynamic>? ?? []
-            // List<DataPoint>.from(
-            //     json['general'].map((x) => DataPoint.fromJson(x))),
             ));
   }
 }
@@ -69,30 +67,30 @@ class Phase {
 }
 
 class DataPoint {
-  dynamic code;
+  final String? code;
-  dynamic customName;
+  final String? customName;
-  dynamic dpId;
+  final int? dpId;
-  dynamic time;
+  final int? time;
-  dynamic type;
+  final String? type;
-  dynamic value;
+  final dynamic value;
 
   DataPoint({
-    required this.code,
+    this.code,
-    required this.customName,
+    this.customName,
-    required this.dpId,
+    this.dpId,
-    required this.time,
+    this.time,
-    required this.type,
+    this.type,
-    required this.value,
+    this.value,
   });
 
   factory DataPoint.fromJson(Map<String, dynamic> json) {
     return DataPoint(
-      code: json['code'],
+      code: json['code'] as String?,
-      customName: json['customName'],
+      customName: json['customName'] as String?,
-      dpId: json['dpId'],
+      dpId: json['dpId'] as int?,
-      time: json['time'],
+      time: json['time'] as int?,
-      type: json['type'],
+      type: json['type'] as String?,
-      value: json['value'],
+      value: json['value'] as dynamic,
     );
   }
 }

lib/pages/device_managment/power_clamp/view/power_chart.dart

@@ -1,5 +1,5 @@
-import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';
+import 'package:flutter/material.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class EnergyConsumptionPage extends StatefulWidget {
@@ -10,7 +10,8 @@ class EnergyConsumptionPage extends StatefulWidget {
   final Widget widget;
   final Function()? onTap;
 
-  EnergyConsumptionPage({
+  const EnergyConsumptionPage({
+    super.key,
     required this.chartData,
     required this.totalConsumption,
     required this.date,
@@ -91,11 +92,12 @@ class _EnergyConsumptionPageState extends State<EnergyConsumptionPage> {
             ],
           ),
           Column(
+            mainAxisSize: MainAxisSize.min,
             children: [
               Padding(
                 padding: const EdgeInsets.only(top: 10),
                 child: SizedBox(
-                  height: MediaQuery.of(context).size.height * 0.11,
+                  height: MediaQuery.sizeOf(context).height * 0.09,
                   child: LineChart(
                     LineChartData(
                       lineTouchData: LineTouchData(
@@ -151,7 +153,7 @@ class _EnergyConsumptionPageState extends State<EnergyConsumptionPage> {
                                   child: RotatedBox(
                                     quarterTurns: -1,
                                     child: Text(_chartData[index].time,
-                                        style: TextStyle(fontSize: 10)),
+                                        style: const TextStyle(fontSize: 10)),
                                   ),
                                 );
                               }
@@ -190,8 +192,8 @@ class _EnergyConsumptionPageState extends State<EnergyConsumptionPage> {
                           spots: _chartData
                               .asMap()
                               .entries
-                              .map((entry) => FlSpot(entry.key.toDouble(),
+                              .map((entry) => FlSpot(
-                                  entry.value.consumption))
+                                  entry.key.toDouble(), entry.value.consumption))
                               .toList(),
                           isCurved: true,
                           color: ColorsManager.primaryColor.withOpacity(0.6),
@@ -218,7 +220,7 @@ class _EnergyConsumptionPageState extends State<EnergyConsumptionPage> {
                       borderData: FlBorderData(
                         show: false,
                         border: Border.all(
-                          color: Color(0xff023DFE).withOpacity(0.7),
+                          color: const Color(0xff023DFE).withOpacity(0.7),
                           width: 10,
                         ),
                       ),
@@ -253,11 +255,9 @@ class _EnergyConsumptionPageState extends State<EnergyConsumptionPage> {
                         child: InkWell(
                           onTap: widget.onTap,
                           child: Center(
-                            child: SizedBox(
+                            child: Padding(
-                              child: Padding(
+                              padding: const EdgeInsets.all(5),
-                                padding: const EdgeInsets.all(5),
+                              child: Text(widget.date),
-                                child: Text(widget.date),
-                              ),
                             ),
                           ),
                         ),

lib/pages/device_managment/power_clamp/view/smart_power_device_control.dart

@@ -12,8 +12,7 @@ import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
 //Smart Power Clamp
-class SmartPowerDeviceControl extends StatelessWidget
+class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   final String deviceId;
 
   const SmartPowerDeviceControl({super.key, required this.deviceId});
@@ -25,27 +24,27 @@ class SmartPowerDeviceControl extends StatelessWidget
         ..add(SmartPowerFetchDeviceEvent(deviceId)),
       child: BlocBuilder<SmartPowerBloc, SmartPowerState>(
         builder: (context, state) {
-          final _blocProvider = BlocProvider.of<SmartPowerBloc>(context);
+          final blocProvider = BlocProvider.of<SmartPowerBloc>(context);
 
           if (state is SmartPowerLoading) {
             return const Center(child: CircularProgressIndicator());
           } else if (state is FakeState) {
             return _buildStatusControls(
-              currentPage: _blocProvider.currentPage,
+              currentPage: blocProvider.currentPage,
               context: context,
-              blocProvider: _blocProvider,
+              blocProvider: blocProvider,
             );
           } else if (state is GetDeviceStatus) {
             return _buildStatusControls(
-              currentPage: _blocProvider.currentPage,
+              currentPage: blocProvider.currentPage,
               context: context,
-              blocProvider: _blocProvider,
+              blocProvider: blocProvider,
             );
           } else if (state is FilterRecordsState) {
             return _buildStatusControls(
-              currentPage: _blocProvider.currentPage,
+              currentPage: blocProvider.currentPage,
               context: context,
-              blocProvider: _blocProvider,
+              blocProvider: blocProvider,
             );
           }
           return const Center(child: CircularProgressIndicator());
@@ -60,7 +59,7 @@ class SmartPowerDeviceControl extends StatelessWidget
     required SmartPowerBloc blocProvider,
     required int currentPage,
   }) {
-    PageController _pageController = PageController(initialPage: currentPage);
+    PageController pageController = PageController(initialPage: currentPage);
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 50),
       child: DeviceControlsContainer(
@@ -85,25 +84,31 @@ class SmartPowerDeviceControl extends StatelessWidget
                   PowerClampInfoCard(
                     iconPath: Assets.powerActiveIcon,
                     title: 'Active',
-                    value: blocProvider
+                    value: blocProvider.deviceStatus.status.general.dataPoints
-                        .deviceStatus.status.general.dataPoints[2].value
+                            .elementAtOrNull(2)
-                        .toString(),
+                            ?.value
+                            .toString() ??
+                        '',
                     unit: '',
                   ),
                   PowerClampInfoCard(
                     iconPath: Assets.voltMeterIcon,
                     title: 'Current',
-                    value: blocProvider
+                    value: blocProvider.deviceStatus.status.general.dataPoints
-                        .deviceStatus.status.general.dataPoints[1].value
+                            .elementAtOrNull(1)
-                        .toString(),
+                            ?.value
+                            .toString() ??
+                        '',
                     unit: ' A',
                   ),
                   PowerClampInfoCard(
                     iconPath: Assets.frequencyIcon,
                     title: 'Frequency',
-                    value: blocProvider
+                    value: blocProvider.deviceStatus.status.general.dataPoints
-                        .deviceStatus.status.general.dataPoints[4].value
+                            .elementAtOrNull(4)
-                        .toString(),
+                            ?.value
+                            .toString() ??
+                        '',
                     unit: ' Hz',
                   ),
                 ],
@@ -142,7 +147,7 @@ class SmartPowerDeviceControl extends StatelessWidget
                           icon: const Icon(Icons.arrow_left),
                           onPressed: () {
                             blocProvider.add(SmartPowerArrowPressedEvent(-1));
-                            _pageController.previousPage(
+                            pageController.previousPage(
                               duration: const Duration(milliseconds: 300),
                               curve: Curves.easeInOut,
                             );
@@ -162,7 +167,7 @@ class SmartPowerDeviceControl extends StatelessWidget
                           icon: const Icon(Icons.arrow_right),
                           onPressed: () {
                             blocProvider.add(SmartPowerArrowPressedEvent(1));
-                            _pageController.nextPage(
+                            pageController.nextPage(
                               duration: const Duration(milliseconds: 300),
                               curve: Curves.easeInOut,
                             );
@@ -177,7 +182,7 @@ class SmartPowerDeviceControl extends StatelessWidget
                   Expanded(
                     flex: 2,
                     child: PageView(
-                      controller: _pageController,
+                      controller: pageController,
                       onPageChanged: (int page) {
                         blocProvider.add(SmartPowerPageChangedEvent(page));
                       },
@@ -190,8 +195,8 @@ class SmartPowerDeviceControl extends StatelessWidget
                             blocProvider.add(SelectDateEvent(context: context));
                             blocProvider.add(FilterRecordsByDateEvent(
                                 selectedDate: blocProvider.dateTime!,
-                                viewType: blocProvider
+                                viewType:
-                                    .views[blocProvider.currentIndex]));
+                                    blocProvider.views[blocProvider.currentIndex]));
                           },
                           widget: blocProvider.dateSwitcher(),
                           chartData: blocProvider.energyDataList.isNotEmpty

lib/pages/device_managment/shared/sensors_widgets/presense_nobody_time.dart

@@ -84,6 +84,16 @@ class _PresenceUpdateDataState extends State<PresenceNoBodyTime> {
     }
   }
 
+  @override
+  void didUpdateWidget(PresenceNoBodyTime oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.value != widget.value) {
+      setState(() {
+        _currentValue = widget.value;
+      });
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return DeviceControlsContainer(

lib/pages/device_managment/wall_sensor/bloc/wall_bloc.dart

@@ -21,6 +21,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     on<ShowDescriptionEvent>(_showDescription);
     on<BackToGridViewEvent>(_backToGridView);
     on<WallSensorFactoryResetEvent>(_onFactoryReset);
+    on<WallSensorRealtimeUpdateEvent>(_onRealtimeUpdate);
   }
 
   void _fetchWallSensorStatus(
@@ -30,7 +31,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
       var response = await DevicesManagementApi().getDeviceStatus(deviceId);
       deviceStatus = WallSensorModel.fromJson(response.status);
       emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
-      _listenToChanges(emit, deviceId);
+      _listenToChanges(deviceId);
     } catch (e) {
       emit(WallSensorFailedState(error: e.toString()));
       return;
@@ -52,28 +53,27 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     }
   }
 
-  _listenToChanges(Emitter<WallSensorState> emit, deviceId) {
+  void _listenToChanges(String deviceId) {
-    try {
+    DatabaseReference ref =
-      DatabaseReference ref =
+        FirebaseDatabase.instance.ref('device-status/$deviceId');
-          FirebaseDatabase.instance.ref('device-status/$deviceId');
+    ref.onValue.listen((DatabaseEvent event) {
-      Stream<DatabaseEvent> stream = ref.onValue;
+      final data = event.snapshot.value as Map<dynamic, dynamic>?;
+      if (data == null) return;
 
-      stream.listen((DatabaseEvent event) {
+      final statusList = (data['status'] as List?)
-        Map<dynamic, dynamic> usersMap =
+          ?.map((e) => Status(code: e['code'], value: e['value']))
-            event.snapshot.value as Map<dynamic, dynamic>;
+          .toList();
-        List<Status> statusList = [];
 
-        usersMap['status'].forEach((element) {
+      if (statusList != null) {
-          statusList
+        final updatedDeviceStatus = WallSensorModel.fromJson(statusList);
-              .add(Status(code: element['code'], value: element['value']));
+        if (!isClosed) {
-        });
+          add(WallSensorRealtimeUpdateEvent(updatedDeviceStatus));
-
+        }
-        deviceStatus = WallSensorModel.fromJson(statusList);
+      }
-        emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
+    });
-      });
-    } catch (_) {}
   }
 
+
   void _changeValue(
       WallSensorChangeValueEvent event, Emitter<WallSensorState> emit) async {
     emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
@@ -195,4 +195,12 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
       emit(WallSensorFailedState(error: e.toString()));
     }
   }
+
+  void _onRealtimeUpdate(
+    WallSensorRealtimeUpdateEvent event,
+    Emitter<WallSensorState> emit,
+  ) {
+    deviceStatus = event.deviceStatus;
+    emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
+  }
 }

lib/pages/device_managment/wall_sensor/bloc/wall_event.dart

@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/wall_sensor/model/wall_sensor_model.dart';
 
 abstract class WallSensorEvent extends Equatable {
   const WallSensorEvent();
@@ -70,3 +71,8 @@ class WallSensorFactoryResetEvent extends WallSensorEvent {
     required this.factoryReset,
   });
 }
+
+class WallSensorRealtimeUpdateEvent extends WallSensorEvent {
+  final WallSensorModel deviceStatus;
+  const WallSensorRealtimeUpdateEvent(this.deviceStatus);
+}

lib/pages/home/bloc/home_bloc.dart

@@ -142,6 +142,19 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
       },
       color: ColorsManager.primaryColor,
     ),
+
+    HomeItemModel(
+      title: 'Syncrow Analytics',
+      icon: Assets.devicesIcon,
+      active: true,
+      onPress: (context) {
+        context.read<SpaceTreeBloc>().add(ClearCachedData());
+        BlocProvider.of<RoutineBloc>(context)
+            .add(const TriggerSwitchTabsEvent(isRoutineTab: false));
+        context.go(RoutesConst.analytics);
+      },
+      color: ColorsManager.primaryColor,
+    ),
     
     // HomeItemModel(
     //   title: 'Move in',

lib/pages/home/view/home_page_mobile.dart

@@ -50,8 +50,9 @@ class HomeMobilePage extends StatelessWidget {
                         height: size.height * 0.6,
                         width: size.width * 0.68,
                         child: GridView.builder(
-                          itemCount: 3,
+                          itemCount: homeItems.length,
-                          gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                          gridDelegate:
+                              const SliverGridDelegateWithFixedCrossAxisCount(
                             crossAxisCount: 2,
                             crossAxisSpacing: 20.0,
                             mainAxisSpacing: 20.0,
@@ -60,10 +61,11 @@ class HomeMobilePage extends StatelessWidget {
                           itemBuilder: (context, index) {
                             return HomeCard(
                               index: index,
-                              active: homeItems[index]['active'],
+                              active: homeBloc.homeItems[index].active!,
-                              name: homeItems[index]['title'],
+                              name:  homeBloc.homeItems[index].title!,
-                              img: homeItems[index]['icon'],
+                              img:  homeBloc.homeItems[index].icon!,
-                              onTap: () => homeBloc.homeItems[index].onPress(context),
+                              onTap: () =>
+                                  homeBloc.homeItems[index].onPress(context),
                             );
                           },
                         ),
@@ -94,6 +96,11 @@ class HomeMobilePage extends StatelessWidget {
       'icon': Assets.devicesIcon,
       'active': true,
     },
+    {
+      'title': 'Syncrow Analytics',
+      'icon': Assets.iconEdit,
+      'active': true,
+    },
     // {
     //   'title': 'Move in',
     //   'icon': Assets.moveinIcon,

lib/pages/home/view/home_page_web.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/pages/home/bloc/home_event.dart';
-import 'package:syncrow_web/pages/home/view/agreement_and_privacy_dialog.dart';
 import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
+import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/home/bloc/home_state.dart';
+import 'package:syncrow_web/pages/home/view/agreement_and_privacy_dialog.dart';
 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';
@@ -24,7 +24,7 @@ class _HomeWebPageState extends State<HomeWebPage> {
   void initState() {
     super.initState();
     final homeBloc = BlocProvider.of<HomeBloc>(context);
-    homeBloc.add(FetchUserInfo());
+    homeBloc.add(const FetchUserInfo());
   }
 
   @override
@@ -97,7 +97,7 @@ class _HomeWebPageState extends State<HomeWebPage> {
                           height: size.height * 0.6,
                           width: size.width * 0.68,
                           child: GridView.builder(
-                            itemCount: 3, // Change this count if needed.
+                            itemCount: homeBloc.homeItems.length,
                             gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
                               crossAxisCount: 3, // Adjust as needed.
                               crossAxisSpacing: 20.0,

lib/pages/routines/view/routines_view.dart

@@ -30,8 +30,8 @@ class _RoutinesViewState extends State<RoutinesView> {
     final spaceId = result['space'];
     final bloc = BlocProvider.of<CreateRoutineBloc>(context);
     final routineBloc = context.read<RoutineBloc>();
-    bloc.add(
+    bloc.add(SaveCommunityIdAndSpaceIdEvent(
-        SaveCommunityIdAndSpaceIdEvent(communityID: communityId, spaceID: spaceId));
+        communityID: communityId, spaceID: spaceId));
     await Future.delayed(const Duration(seconds: 1));
     routineBloc.add(const CreateNewRoutineViewEvent(createRoutineView: true));
   }
@@ -61,34 +61,38 @@ class _RoutinesViewState extends State<RoutinesView> {
                 width: context.screenWidth,
                 child: SingleChildScrollView(
                   padding: const EdgeInsetsDirectional.all(16),
-                  child: Column(
+                  child: Padding(
-                    crossAxisAlignment: CrossAxisAlignment.start,
+                    padding: const EdgeInsets.only(left: 20),
-                    mainAxisAlignment: MainAxisAlignment.start,
+                    child: Column(
-                    spacing: 16,
+                      crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
+                      mainAxisAlignment: MainAxisAlignment.start,
-                      Text(
+                      spacing: 16,
-                        "Create New Routines",
+                      children: [
-                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                        Text(
-                              color: ColorsManager.grayColor,
+                          "Create New Routines",
-                              fontWeight: FontWeight.bold,
+                          style:
-                            ),
+                              Theme.of(context).textTheme.titleLarge?.copyWith(
-                      ),
+                                    color: ColorsManager.grayColor,
-                      RoutineViewCard(
+                                    fontWeight: FontWeight.bold,
-                        isLoading: false,
+                                  ),
-                        onChanged: (v) {},
+                        ),
-                        status: '',
+                        RoutineViewCard(
-                        spaceId: '',
+                          isLoading: false,
-                        automationId: '',
+                          onChanged: (v) {},
-                        communityId: '',
+                          status: '',
-                        sceneId: '',
+                          spaceId: '',
-                        cardType: '',
+                          automationId: '',
-                        spaceName: '',
+                          communityId: '',
-                        onTap: () => _handleRoutineCreation(context),
+                          sceneId: '',
-                        icon: Icons.add,
+                          cardType: '',
-                        textString: '',
+                          spaceName: '',
-                      ),
+                          onTap: () => _handleRoutineCreation(context),
-                      const FetchRoutineScenesAutomation(),
+                          icon: Icons.add,
-                    ],
+                          textString: '',
+                        ),
+                        const FetchRoutineScenesAutomation(),
+                      ],
+                    ),
                   ),
                 ),
               ),

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

@@ -16,7 +16,8 @@ class FetchRoutineScenesAutomation extends StatelessWidget
   Widget build(BuildContext context) {
     return BlocBuilder<RoutineBloc, RoutineState>(
       builder: (context, state) {
-        if (state.isLoading) return const Center(child: CircularProgressIndicator());
+        if (state.isLoading)
+          return const Center(child: CircularProgressIndicator());
 
         return SingleChildScrollView(
           child: Padding(
@@ -40,7 +41,8 @@ class FetchRoutineScenesAutomation extends StatelessWidget
                 const SizedBox(height: 3),
                 Visibility(
                   visible: state.automations.isNotEmpty,
-                  replacement: _buildEmptyState(context, "No automations found"),
+                  replacement:
+                      _buildEmptyState(context, "No automations found"),
                   child: SizedBox(
                     height: 200,
                     child: _buildAutomations(state),
@@ -59,7 +61,8 @@ class FetchRoutineScenesAutomation extends StatelessWidget
       scrollDirection: Axis.horizontal,
       itemCount: state.automations.length,
       itemBuilder: (context, index) {
-        final isLoading = state.automations.contains(state.automations[index].id);
+        final isLoading =
+            state.automations.contains(state.automations[index].id);
 
         return Column(
           children: [
@@ -179,10 +182,13 @@ class FetchRoutineScenesAutomation extends StatelessWidget
   }
 
   Widget _buildEmptyState(BuildContext context, String title) {
-    return Text(
+    return Padding(
-      title,
+      padding: const EdgeInsets.only(bottom: 100),
-      style: context.textTheme.bodyMedium?.copyWith(
+      child: Text(
-        color: ColorsManager.grayColor,
+        title,
+        style: context.textTheme.bodyMedium?.copyWith(
+          color: ColorsManager.grayColor,
+        ),
       ),
     );
   }

lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart

@@ -9,6 +9,7 @@ import 'package:syncrow_web/pages/routines/models/ac/ac_operational_value.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/helpers/routine_tap_function_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -74,11 +75,26 @@ class ACHelper {
                               child: _buildFunctionsList(
                                 context: context,
                                 acFunctions: acFunctions,
-                                onFunctionSelected: (functionCode, operationName) =>
+                                device: device,
-                                    context.read<FunctionBloc>().add(SelectFunction(
+                                onFunctionSelected: (functionCode, operationName) {
-                                          functionCode: functionCode,
+                                  RoutineTapFunctionHelper.onTapFunction(
-                                          operationName: operationName,
+                                    context,
-                                        )),
+                                    functionCode: functionCode,
+                                    functionOperationName: operationName,
+                                    functionValueDescription:
+                                        selectedFunctionData.valueDescription,
+                                    deviceUuid: device?.uuid,
+                                    codesToAddIntoFunctionsWithDefaultValue: [
+                                      'temp_set',
+                                      'temp_current',
+                                    ],
+                                    defaultValue: functionCode == 'temp_set'
+                                        ? 200
+                                        : functionCode == 'temp_current'
+                                            ? -100
+                                            : 0,
+                                  );
+                                },
                               ),
                             ),
                             // Value selector
@@ -137,6 +153,7 @@ class ACHelper {
     required BuildContext context,
     required List<ACFunction> acFunctions,
     required Function(String, String) onFunctionSelected,
+    required AllDevicesModel? device,
   }) {
     return ListView.separated(
       shrinkWrap: false,

lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart

@@ -131,7 +131,12 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
     return Row(
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
-        CpsFunctionsList(cpsFunctions: _cpsFunctions),
+        CpsFunctionsList(
+          cpsFunctions: _cpsFunctions,
+          device: widget.device,
+          selectedFunctionData: selectedFunctionData,
+          dialogType: widget.dialogType,
+        ),
         if (state.selectedFunction != null)
           Expanded(
             child: isToggleFunction

lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_functions_list.dart

@@ -1,14 +1,24 @@
 import 'package:flutter/material.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/bloc/functions_bloc/functions_bloc_bloc.dart';
 import 'package:syncrow_web/pages/routines/models/ceiling_presence_sensor_functions.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialog_function_list_tile.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/helpers/routine_tap_function_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class CpsFunctionsList extends StatelessWidget {
-  const CpsFunctionsList({required this.cpsFunctions, super.key});
+  const CpsFunctionsList({
+    required this.cpsFunctions,
+    required this.device,
+    required this.selectedFunctionData,
+    required this.dialogType,
+    super.key,
+  });
 
   final List<CpsFunctions> cpsFunctions;
+  final AllDevicesModel? device;
+  final DeviceFunctionData? selectedFunctionData;
+  final String dialogType;
 
   @override
   Widget build(BuildContext context) {
@@ -26,12 +36,27 @@ class CpsFunctionsList extends StatelessWidget {
           return RoutineDialogFunctionListTile(
             iconPath: function.icon,
             operationName: function.operationName,
-            onTap: () => context.read<FunctionBloc>().add(
+            onTap: () => RoutineTapFunctionHelper.onTapFunction(
-                  SelectFunction(
+              context,
-                    functionCode: function.code,
+              functionCode: function.code,
-                    operationName: function.operationName,
+              functionOperationName: function.operationName,
-                  ),
+              functionValueDescription: selectedFunctionData?.valueDescription,
-                ),
+              deviceUuid: device?.uuid,
+              codesToAddIntoFunctionsWithDefaultValue: [
+                'static_max_dis',
+                'presence_reference',
+                'moving_reference',
+                'perceptual_boundary',
+                'moving_boundary',
+                'moving_rigger_time',
+                'moving_static_time',
+                'none_body_time',
+                'moving_max_dis',
+                'moving_range',
+                'presence_range',
+                if (dialogType == "IF") 'sensitivity',
+              ],
+            ),
           );
         },
       ),

lib/pages/routines/widgets/routine_dialogs/helpers/routine_tap_function_helper.dart

@@ -0,0 +1,46 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+
+abstract final class RoutineTapFunctionHelper {
+  const RoutineTapFunctionHelper._();
+
+  static void onTapFunction(
+    BuildContext context, {
+    required String functionCode,
+    required String functionOperationName,
+    required String? functionValueDescription,
+    required String? deviceUuid,
+    required List<String> codesToAddIntoFunctionsWithDefaultValue,
+    int defaultValue = 0,
+  }) {
+    final functionsBloc = context.read<FunctionBloc>();
+    functionsBloc.add(
+      SelectFunction(
+        functionCode: functionCode,
+        operationName: functionOperationName,
+      ),
+    );
+    final addedFunctions = functionsBloc.state.addedFunctions;
+    final isFunctionAlreadyAdded = addedFunctions.any(
+      (e) => e.functionCode == functionCode,
+    );
+    final shouldAddFunction =
+        codesToAddIntoFunctionsWithDefaultValue.contains(functionCode);
+    if (!isFunctionAlreadyAdded && shouldAddFunction) {
+      context.read<FunctionBloc>().add(
+            AddFunction(
+              functionData: DeviceFunctionData(
+                entityId: deviceUuid ?? '',
+                functionCode: functionCode,
+                operationName: functionOperationName,
+                value: defaultValue,
+                condition: '==',
+                valueDescription: functionValueDescription,
+              ),
+            ),
+          );
+    }
+  }
+}

lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart

@@ -11,6 +11,7 @@ import 'package:syncrow_web/pages/routines/models/gang_switches/one_gang_switch/
 import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/helpers/routine_tap_function_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -24,21 +25,23 @@ class OneGangSwitchHelper {
     required String uniqueCustomId,
     required bool removeComparetors,
   }) async {
-    List<BaseSwitchFunction> oneGangFunctions = functions.whereType<BaseSwitchFunction>().toList();
+    List<BaseSwitchFunction> oneGangFunctions =
+        functions.whereType<BaseSwitchFunction>().toList();
 
     return showDialog<Map<String, dynamic>?>(
       context: context,
       builder: (BuildContext context) {
         return BlocProvider(
-            create: (_) => FunctionBloc()..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
+            create: (_) => FunctionBloc()
+              ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
             child: AlertDialog(
               contentPadding: EdgeInsets.zero,
               content: BlocBuilder<FunctionBloc, FunctionBlocState>(
                 builder: (context, state) {
                   final selectedFunction = state.selectedFunction;
                   final selectedOperationName = state.selectedOperationName;
-                  final selectedFunctionData =
+                  final selectedFunctionData = state.addedFunctions
-                      state.addedFunctions.firstWhere((f) => f.functionCode == selectedFunction,
+                      .firstWhere((f) => f.functionCode == selectedFunction,
                           orElse: () => DeviceFunctionData(
                                 entityId: '',
                                 functionCode: selectedFunction ?? '',
@@ -84,12 +87,19 @@ class OneGangSwitchHelper {
                                         size: 16,
                                         color: ColorsManager.textGray,
                                       ),
-                                      onTap: () {
+                                      onTap: () =>
-                                        context.read<FunctionBloc>().add(SelectFunction(
+                                          RoutineTapFunctionHelper.onTapFunction(
-                                              functionCode: function.code,
+                                        context,
-                                              operationName: function.operationName,
+                                        functionCode: function.code,
-                                            ));
+                                        functionOperationName:
-                                      },
+                                            function.operationName,
+                                        functionValueDescription:
+                                            selectedFunctionData.valueDescription,
+                                        deviceUuid: device?.uuid,
+                                        codesToAddIntoFunctionsWithDefaultValue: [
+                                          'countdown_1',
+                                        ],
+                                      ),
                                     );
                                   },
                                 ),
@@ -220,11 +230,11 @@ class OneGangSwitchHelper {
             selectedFunctionData,
           ),
         const SizedBox(height: 20),
-        _buildCountDownDisplay(
+        _buildCountDownDisplay(context, initialValue, device, operationName,
-            context, initialValue, device, operationName, selectedFunctionData, selectCode),
+            selectedFunctionData, selectCode),
         const SizedBox(height: 20),
-        _buildCountDownSlider(
+        _buildCountDownSlider(context, initialValue, device, operationName,
-            context, initialValue, device, operationName, selectedFunctionData, selectCode),
+            selectedFunctionData, selectCode),
       ],
     );
   }
@@ -314,9 +324,10 @@ class OneGangSwitchHelper {
       value: (initialValue ?? 0).toDouble(),
       min: operationalValues.minValue?.toDouble() ?? 0.0,
       max: operationalValues.maxValue?.toDouble() ?? 0.0,
-      divisions: (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
+      divisions:
-              (operationalValues.stepValue ?? 1))
+          (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
-          .round(),
+                  (operationalValues.stepValue ?? 1))
+              .round(),
       onChanged: (value) {
         context.read<FunctionBloc>().add(
               AddFunction(
@@ -368,7 +379,9 @@ class OneGangSwitchHelper {
           trailing: Icon(
             isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
             size: 24,
-            color: isSelected ? ColorsManager.primaryColorWithOpacity : ColorsManager.textGray,
+            color: isSelected
+                ? ColorsManager.primaryColorWithOpacity
+                : ColorsManager.textGray,
           ),
           onTap: () {
             if (!isSelected) {

lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart

@@ -10,6 +10,7 @@ import 'package:syncrow_web/pages/routines/models/gang_switches/base_switch_func
 import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/helpers/routine_tap_function_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -85,15 +86,21 @@ class ThreeGangSwitchHelper {
                                         size: 16,
                                         color: ColorsManager.textGray,
                                       ),
-                                      onTap: () {
+                                      onTap: () =>
-                                        context
+                                          RoutineTapFunctionHelper.onTapFunction(
-                                            .read<FunctionBloc>()
+                                        context,
-                                            .add(SelectFunction(
+                                        functionCode: function.code,
-                                              functionCode: function.code,
+                                        functionOperationName:
-                                              operationName:
+                                            function.operationName,
-                                                  function.operationName,
+                                        functionValueDescription:
-                                            ));
+                                            selectedFunctionData.valueDescription,
-                                      },
+                                        deviceUuid: device?.uuid,
+                                        codesToAddIntoFunctionsWithDefaultValue: [
+                                          'countdown_1',
+                                          'countdown_2',
+                                          'countdown_3',
+                                        ],
+                                      ),
                                     );
                                   },
                                 ),
@@ -183,8 +190,7 @@ class ThreeGangSwitchHelper {
       );
     }
 
-    final selectedFn =
+    final selectedFn = switchFunctions.firstWhere((f) => f.code == selectedFunction);
-        switchFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -266,8 +272,7 @@ class ThreeGangSwitchHelper {
         minHeight: 40.0,
         minWidth: 40.0,
       ),
-      isSelected:
+      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
-          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
       children: conditions.map((c) => Text(c)).toList(),
     );
   }
@@ -316,10 +321,10 @@ class ThreeGangSwitchHelper {
       value: (initialValue ?? 0).toDouble(),
       min: operationalValues.minValue?.toDouble() ?? 0.0,
       max: operationalValues.maxValue?.toDouble() ?? 0.0,
-      divisions: (((operationalValues.maxValue ?? 0) -
+      divisions:
-                  (operationalValues.minValue ?? 0)) /
+          (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
-              (operationalValues.stepValue ?? 1))
+                  (operationalValues.stepValue ?? 1))
-          .round(),
+              .round(),
       onChanged: (value) {
         context.read<FunctionBloc>().add(
               AddFunction(
@@ -369,9 +374,7 @@ class ThreeGangSwitchHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected
+            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
-                ? Icons.radio_button_checked
-                : Icons.radio_button_unchecked,
             size: 24,
             color: isSelected
                 ? ColorsManager.primaryColorWithOpacity
@@ -387,8 +390,7 @@ class ThreeGangSwitchHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription:
+                        valueDescription: selectedFunctionData?.valueDescription,
-                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );

lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart

@@ -10,6 +10,7 @@ import 'package:syncrow_web/pages/routines/models/gang_switches/base_switch_func
 import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/helpers/routine_tap_function_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -85,15 +86,20 @@ class TwoGangSwitchHelper {
                                         size: 16,
                                         color: ColorsManager.textGray,
                                       ),
-                                      onTap: () {
+                                      onTap: () =>
-                                        context
+                                          RoutineTapFunctionHelper.onTapFunction(
-                                            .read<FunctionBloc>()
+                                        context,
-                                            .add(SelectFunction(
+                                        functionCode: function.code,
-                                              functionCode: function.code,
+                                        functionOperationName:
-                                              operationName:
+                                            function.operationName,
-                                                  function.operationName,
+                                        functionValueDescription:
-                                            ));
+                                            selectedFunctionData.valueDescription,
-                                      },
+                                        deviceUuid: device?.uuid,
+                                        codesToAddIntoFunctionsWithDefaultValue: [
+                                          'countdown_1',
+                                          'countdown_2',
+                                        ],
+                                      ),
                                     );
                                   },
                                 ),
@@ -167,8 +173,7 @@ class TwoGangSwitchHelper {
     required String operationName,
     required bool removeComparetors,
   }) {
-    if (selectedFunction == 'countdown_1' ||
+    if (selectedFunction == 'countdown_1' || selectedFunction == 'countdown_2') {
-        selectedFunction == 'countdown_2') {
       final initialValue = selectedFunctionData?.value ?? 0;
       return _buildTemperatureSelector(
         context: context,
@@ -182,8 +187,7 @@ class TwoGangSwitchHelper {
       );
     }
 
-    final selectedFn =
+    final selectedFn = switchFunctions.firstWhere((f) => f.code == selectedFunction);
-        switchFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -265,8 +269,7 @@ class TwoGangSwitchHelper {
         minHeight: 40.0,
         minWidth: 40.0,
       ),
-      isSelected:
+      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
-          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
       children: conditions.map((c) => Text(c)).toList(),
     );
   }
@@ -315,10 +318,10 @@ class TwoGangSwitchHelper {
       value: (initialValue ?? 0).toDouble(),
       min: operationalValues.minValue?.toDouble() ?? 0.0,
       max: operationalValues.maxValue?.toDouble() ?? 0.0,
-      divisions: (((operationalValues.maxValue ?? 0) -
+      divisions:
-                  (operationalValues.minValue ?? 0)) /
+          (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
-              (operationalValues.stepValue ?? 1))
+                  (operationalValues.stepValue ?? 1))
-          .round(),
+              .round(),
       onChanged: (value) {
         context.read<FunctionBloc>().add(
               AddFunction(
@@ -368,9 +371,7 @@ class TwoGangSwitchHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected
+            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
-                ? Icons.radio_button_checked
-                : Icons.radio_button_unchecked,
             size: 24,
             color: isSelected
                 ? ColorsManager.primaryColorWithOpacity
@@ -386,8 +387,7 @@ class TwoGangSwitchHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription:
+                        valueDescription: selectedFunctionData?.valueDescription,
-                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );

lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart

@@ -8,6 +8,7 @@ import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/wps/wps_functions.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/helpers/routine_tap_function_helper.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
@@ -111,13 +112,23 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
     return Row(
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
-        _buildFunctionList(context),
+        _buildFunctionList(context, state),
         if (state.selectedFunction != null) _buildValueSelector(context, state),
       ],
     );
   }
 
-  Widget _buildFunctionList(BuildContext context) {
+  Widget _buildFunctionList(BuildContext context, FunctionBlocState state) {
+    final selectedFunction = state.selectedFunction;
+    final selectedFunctionData = state.addedFunctions.firstWhere(
+      (f) => f.functionCode == selectedFunction,
+      orElse: () => DeviceFunctionData(
+        entityId: '',
+        functionCode: selectedFunction ?? '',
+        operationName: '',
+        value: null,
+      ),
+    );
     return SizedBox(
       width: 360,
       child: ListView.separated(
@@ -149,12 +160,18 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
               size: 16,
               color: ColorsManager.textGray,
             ),
-            onTap: () => context.read<FunctionBloc>().add(
+            onTap: () => RoutineTapFunctionHelper.onTapFunction(
-                  SelectFunction(
+              context,
-                    functionCode: function.code,
+              functionCode: function.code,
-                    operationName: function.operationName,
+              functionOperationName: function.operationName,
-                  ),
+              functionValueDescription: selectedFunctionData.valueDescription,
-                ),
+              deviceUuid: widget.device?.uuid,
+              codesToAddIntoFunctionsWithDefaultValue: [
+                'dis_current',
+                'presence_time',
+                'illuminance_value',
+              ],
+            ),
           );
         },
       ),

lib/pages/space_tree/view/space_tree_view.dart

@@ -17,7 +17,15 @@ import 'package:syncrow_web/utils/style.dart';
 class SpaceTreeView extends StatefulWidget {
   final bool? isSide;
   final Function onSelect;
-  const SpaceTreeView({required this.onSelect, this.isSide, super.key});
+  final bool shouldDisableDeselectingChildrenOfSelectedParent;
+  final Widget? title;
+  const SpaceTreeView({
+    required this.onSelect,
+    this.isSide,
+    super.key,
+    this.shouldDisableDeselectingChildrenOfSelectedParent = false,
+    this.title,
+  });
 
   @override
   State<SpaceTreeView> createState() => _SpaceTreeViewState();
@@ -41,17 +49,31 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<SpaceTreeBloc, SpaceTreeState>(builder: (context, state) {
-      final communities =
+      final communities = state.searchQuery.isNotEmpty
-          state.searchQuery.isNotEmpty ? state.filteredCommunity : state.communityList;
+          ? state.filteredCommunity
+          : state.communityList;
       return Container(
         height: MediaQuery.sizeOf(context).height,
         decoration: widget.isSide == true
-            ? subSectionContainerDecoration.copyWith(color: ColorsManager.whiteColors)
+            ? subSectionContainerDecoration.copyWith(
+                color: ColorsManager.whiteColors)
             : const BoxDecoration(color: ColorsManager.whiteColors),
         child: state is SpaceTreeLoadingState
             ? const Center(child: CircularProgressIndicator())
             : Column(
                 children: [
+                  if (widget.title != null)
+                    Container(
+                      alignment: AlignmentDirectional.centerStart,
+                      padding: const EdgeInsets.all(24),
+                      child: DefaultTextStyle(
+                        style: context.textTheme.titleMedium!.copyWith(
+                          color: ColorsManager.blackColor,
+                          fontSize: 20,
+                        ),
+                        child: widget.title!,
+                      ),
+                    ),
                   if (widget.isSide == true)
                     Container(
                       decoration: const BoxDecoration(
@@ -79,10 +101,12 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                   style: context.textTheme.bodyMedium?.copyWith(
                                     color: ColorsManager.blackColor,
                                   ),
-                                  onChanged: (value) => context.read<SpaceTreeBloc>().add(
+                                  onChanged: (value) =>
-                                        SearchQueryEvent(value),
+                                      context.read<SpaceTreeBloc>().add(
-                                      ),
+                                            SearchQueryEvent(value),
-                                  decoration: textBoxDecoration(radios: 20)?.copyWith(
+                                          ),
+                                  decoration:
+                                      textBoxDecoration(radios: 20)?.copyWith(
                                     fillColor: Colors.white,
                                     suffixIcon: Padding(
                                       padding: const EdgeInsets.only(right: 16),
@@ -92,7 +116,8 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                         height: 24,
                                       ),
                                     ),
-                                    hintStyle: context.textTheme.bodyMedium?.copyWith(
+                                    hintStyle:
+                                        context.textTheme.bodyMedium?.copyWith(
                                       fontWeight: FontWeight.w400,
                                       fontSize: 12,
                                       color: ColorsManager.textGray,
@@ -131,15 +156,16 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                             itemBuilder: (context, index) {
                               return CustomExpansionTileSpaceTree(
                                 title: communities[index].name,
-                                isSelected:
+                                isSelected: state.selectedCommunities
-                                    state.selectedCommunities.contains(communities[index].uuid),
+                                    .contains(communities[index].uuid),
-                                isSoldCheck:
+                                isSoldCheck: state.selectedCommunities
-                                    state.selectedCommunities.contains(communities[index].uuid),
+                                    .contains(communities[index].uuid),
-                                onExpansionChanged: () => context.read<SpaceTreeBloc>().add(
+                                onExpansionChanged: () =>
-                                      OnCommunityExpanded(
+                                    context.read<SpaceTreeBloc>().add(
-                                        communities[index].uuid,
+                                          OnCommunityExpanded(
-                                      ),
+                                            communities[index].uuid,
-                                    ),
+                                          ),
+                                        ),
                                 isExpanded: state.expandedCommunities.contains(
                                   communities[index].uuid,
                                 ),
@@ -156,8 +182,19 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                   (space) {
                                     return CustomExpansionTileSpaceTree(
                                       title: space.name,
-                                      isExpanded: state.expandedSpaces.contains(space.uuid),
+                                      isExpanded:
+                                          state.expandedSpaces.contains(space.uuid),
                                       onItemSelected: () {
+                                        final isParentSelected = _isParentSelected(
+                                          state,
+                                          communities[index],
+                                          space,
+                                        );
+                                        if (widget
+                                                .shouldDisableDeselectingChildrenOfSelectedParent &&
+                                            isParentSelected) {
+                                          return;
+                                        }
                                         context.read<SpaceTreeBloc>().add(
                                               OnSpaceSelected(
                                                 communities[index],
@@ -167,15 +204,18 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                             );
                                         widget.onSelect();
                                       },
-                                      onExpansionChanged: () => context.read<SpaceTreeBloc>().add(
+                                      onExpansionChanged: () =>
-                                            OnSpaceExpanded(
+                                          context.read<SpaceTreeBloc>().add(
-                                              communities[index].uuid,
+                                                OnSpaceExpanded(
-                                              space.uuid ?? '',
+                                                  communities[index].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),
-                                      isSoldCheck: state.soldCheck.contains(space.uuid),
                                       children: _buildNestedSpaces(
                                         context,
                                         state,
@@ -196,6 +236,13 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
     });
   }
 
+  bool _isParentSelected(
+      SpaceTreeState state, CommunityModel community, SpaceModel space) {
+    return state.selectedCommunities.contains(community.uuid) ||
+        (space.spaceModel?.uuid != null &&
+            state.selectedSpaces.contains(space.spaceModel?.uuid));
+  }
+
   List<Widget> _buildNestedSpaces(
     BuildContext context,
     SpaceTreeState state,
@@ -204,8 +251,8 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   ) {
     return space.children.map((child) {
       return CustomExpansionTileSpaceTree(
-        isSelected:
+        isSelected: state.selectedSpaces.contains(child.uuid) ||
-            state.selectedSpaces.contains(child.uuid) || state.soldCheck.contains(child.uuid),
+            state.soldCheck.contains(child.uuid),
         isSoldCheck: state.soldCheck.contains(child.uuid),
         title: child.name,
         isExpanded: state.expandedSpaces.contains(child.uuid),

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(
@@ -446,6 +466,7 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
 
       if (previousState is SpaceManagementLoaded) {
         await _updateLoadedState(
+          event.context,
           previousState,
           allSpaces,
           event.communityUuid,
@@ -462,6 +483,7 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
   }
 
   Future<void> _updateLoadedState(
+    BuildContext context,
     SpaceManagementLoaded previousState,
     List<SpaceModel> allSpaces,
     String communityUuid,
@@ -469,7 +491,10 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
   ) async {
     var prevSpaceModels = await fetchSpaceModels();
     await fetchTags();
-    final communities = List<CommunityModel>.from(previousState.communities);
+    final spaceTreeState = context.read<SpaceTreeBloc>().state;
+    final communities = spaceTreeState.searchQuery.isNotEmpty
+        ? spaceTreeState.filteredCommunity
+        : spaceTreeState.communityList;
 
     for (var community in communities) {
       if (community.uuid == communityUuid) {
@@ -484,6 +509,8 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
             spaceModels: prevSpaceModels,
             allTags: _cachedTags ?? []));
         return;
+      } else {
+        print("Community not found");
       }
     }
   }
@@ -491,12 +518,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 &&
@@ -605,11 +641,11 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
               projectId: projectUuid);
         } else {
           // Call create if the space does not have a UUID
-          final List<CreateTagBodyModel> tagBodyModels = space.tags != null
+          List<CreateTagBodyModel> tagBodyModels = space.tags != null
               ? space.tags!.map((tag) => tag.toCreateTagBodyModel()).toList()
               : [];
 
-          final createSubspaceBodyModels = space.subspaces?.map((subspace) {
+          var createSubspaceBodyModels = space.subspaces?.map((subspace) {
                 final tagBodyModels =
                     subspace.tags?.map((tag) => tag.toCreateTagBodyModel()).toList() ?? [];
                 return CreateSubspaceModel()
@@ -618,6 +654,11 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
               }).toList() ??
               [];
 
+          if (space.spaceModel?.uuid != null) {
+            tagBodyModels = [];
+            createSubspaceBodyModels = [];
+          }
+
           final response = await _api.createSpace(
               communityId: communityUuid,
               name: space.name,
@@ -669,9 +710,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

@@ -1,4 +1,6 @@
 // Flutter imports
+import 'dart:math';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
@@ -70,6 +72,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     _nameController = TextEditingController(
       text: widget.selectedCommunity?.name ?? '',
     );
+    realignTree();
+
     _transformationController = TransformationController();
     if (widget.selectedSpace != null) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -94,6 +98,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         spaces = widget.spaces.isNotEmpty ? flattenSpaces(widget.spaces) : [];
         connections = widget.spaces.isNotEmpty ? createConnections(widget.spaces) : [];
         _adjustCanvasSizeForSpaces();
+        realignTree();
       });
     }
 
@@ -336,6 +341,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
               }
               spaces.add(newSpace);
               _updateNodePosition(newSpace, newSpace.position);
+              realignTree();
             });
           },
         );
@@ -401,12 +407,15 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
 
   List<SpaceModel> flattenSpaces(List<SpaceModel> spaces) {
     List<SpaceModel> result = [];
+    Map<String, SpaceModel> idToSpace = {};
 
     void flatten(SpaceModel space) {
       if (space.status == SpaceStatus.deleted || space.status == SpaceStatus.parentDeleted) {
         return;
       }
       result.add(space);
+      idToSpace[space.internalId] = space;
+
       for (var child in space.children) {
         flatten(child);
       }
@@ -416,6 +425,12 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
       flatten(space);
     }
 
+    for (var space in result) {
+      if (space.parent != null) {
+        space.parent = idToSpace[space.parent!.internalId];
+      }
+    }
+
     return result;
   }
 
@@ -450,7 +465,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
 
   void _saveSpaces() {
     if (widget.selectedCommunity == null) {
-      debugPrint("No community selected for saving spaces.");
       return;
     }
 
@@ -465,7 +479,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     }
 
     String communityUuid = widget.selectedCommunity!.uuid;
-
     context.read<SpaceManagementBloc>().add(SaveSpacesEvent(
           context,
           spaces: spacesToSave,
@@ -530,35 +543,83 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
   }
 
   Offset getBalancedChildPosition(SpaceModel parent) {
-    int totalSiblings = parent.children.length + 1;
+    const double nodeWidth = 200;
-    double totalWidth = (totalSiblings - 1) * 250; // Horizontal spacing
+    const double verticalGap = 180;
-    double startX = parent.position.dx - (totalWidth / 2);
 
-    Offset position = Offset(startX + (parent.children.length * 250), parent.position.dy + 180);
+    if (parent.children.isEmpty) {
+      // First child → exactly center
+      return Offset(parent.position.dx, parent.position.dy + verticalGap);
+    } else {
+      // More children → arrange them spaced horizontally
+      double totalWidth = (parent.children.length) * (nodeWidth + 60);
+      double startX = parent.position.dx - (totalWidth / 2);
 
-    // Check for overlaps & adjust
+      double childX = startX + (parent.children.length * (nodeWidth + 60));
-    while (spaces.any((s) => (s.position - position).distance < 250)) {
+      return Offset(childX, parent.position.dy + verticalGap);
-      position = Offset(position.dx + 250, position.dy);
     }
-
-    return position;
   }
 
   void realignTree() {
-    void updatePositions(SpaceModel node, double x, double y) {
+    const double nodeWidth = 200;
-      node.position = Offset(x, y);
+    const double nodeHeight = 100;
+    const double horizontalGap = 60;
+    const double verticalGap = 180;
+    const double rootGap = 400; // extra space between different roots
 
-      int numChildren = node.children.length;
+    double canvasRightEdge = 1000;
-      double childStartX = x - ((numChildren - 1) * 250) / 2;
+    double canvasBottomEdge = 1000;
 
-      for (int i = 0; i < numChildren; i++) {
+    double calculateSubtreeWidth(SpaceModel node) {
-        updatePositions(node.children[i], childStartX + (i * 250), y + 180);
+      if (node.children.isEmpty) return nodeWidth;
+      double totalWidth = 0;
+      for (var child in node.children) {
+        totalWidth += calculateSubtreeWidth(child) + horizontalGap;
+      }
+      return totalWidth - horizontalGap;
+    }
+
+    void layoutSubtree(SpaceModel node, double startX, double y) {
+      double subtreeWidth = calculateSubtreeWidth(node);
+      double centerX = startX + subtreeWidth / 2 - nodeWidth / 2;
+      node.position = Offset(centerX, y);
+
+      canvasRightEdge = max(canvasRightEdge, centerX + nodeWidth);
+      canvasBottomEdge = max(canvasBottomEdge, y + nodeHeight);
+
+      if (node.children.length == 1) {
+        final child = node.children.first;
+        layoutSubtree(child, centerX, y + verticalGap);
+      } else {
+        double childX = startX;
+        for (var child in node.children) {
+          double childWidth = calculateSubtreeWidth(child);
+          layoutSubtree(child, childX, y + verticalGap);
+          childX += childWidth + horizontalGap;
+        }
       }
     }
 
-    if (spaces.isNotEmpty) {
+    // ⚡ New: layout each root separately
-      updatePositions(spaces.first, spaces.first.position.dx, spaces.first.position.dy);
+    final List<SpaceModel> roots = spaces
+        .where((s) =>
+            s.parent == null &&
+            s.status != SpaceStatus.deleted &&
+            s.status != SpaceStatus.parentDeleted)
+        .toList();
+
+    double currentX = 100; // start some margin from left
+    double currentY = 100; // top margin
+
+    for (var root in roots) {
+      layoutSubtree(root, currentX, currentY);
+      double rootWidth = calculateSubtreeWidth(root);
+      currentX += rootWidth + rootGap;
     }
+
+    setState(() {
+      canvasWidth = canvasRightEdge + 400;
+      canvasHeight = canvasBottomEdge + 400;
+    });
   }
 
   void _onDuplicate(BuildContext parentContext) {
@@ -642,116 +703,72 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
   }
 
   void _duplicateSpace(SpaceModel space) {
-    final Map<SpaceModel, SpaceModel> originalToDuplicate = {};
+    setState(() {
-    double horizontalGap = 250.0; // Increased spacing
+      SpaceModel? parent = space.parent;
-    double verticalGap = 180.0; // Adjusted for better visualization
 
-    print("🟢 Duplicating: ${space.name}");
+      SpaceModel duplicated = _deepCloneSpaceTree(space, parent: parent);
 
-    /// **Find a new position ensuring no overlap**
+      duplicated.position = Offset(space.position.dx + 300, space.position.dy + 100);
-    Offset getBalancedChildPosition(SpaceModel parent) {
+      List<SpaceModel> duplicatedSubtree = [];
-      int totalSiblings = parent.children.length + 1;
+      void collectSubtree(SpaceModel node) {
-      double totalWidth = (totalSiblings - 1) * horizontalGap;
+        duplicatedSubtree.add(node);
-      double startX = parent.position.dx - (totalWidth / 2);
+        for (var child in node.children) {
-      Offset position = Offset(
+          collectSubtree(child);
-          startX + (parent.children.length * horizontalGap), parent.position.dy + verticalGap);
-
-      // **Check for overlaps & adjust**
-      while (spaces.any((s) => (s.position - position).distance < horizontalGap)) {
-        position = Offset(position.dx + horizontalGap, position.dy);
-      }
-
-      print("🔹 New position for ${parent.name}: (${position.dx}, ${position.dy})");
-      return position;
-    }
-
-    /// **Realign the entire tree after duplication**
-    void realignTree() {
-      void updatePositions(SpaceModel node, double x, double y) {
-        node.position = Offset(x, y);
-        print("✅ Adjusted ${node.name} to (${x}, ${y})");
-
-        int numChildren = node.children.length;
-        double childStartX = x - ((numChildren - 1) * horizontalGap) / 2;
-
-        for (int i = 0; i < numChildren; i++) {
-          updatePositions(node.children[i], childStartX + (i * horizontalGap), y + verticalGap);
         }
       }
 
-      if (spaces.isNotEmpty) {
+      collectSubtree(duplicated);
-        print("🔄 Realigning tree...");
+      spaces.addAll(duplicatedSubtree);
-        updatePositions(spaces.first, spaces.first.position.dx, spaces.first.position.dy);
+
+      if (parent != null) {
+        parent.children.add(duplicated);
+
+        final newConnection = Connection(
+          startSpace: parent,
+          endSpace: duplicated,
+          direction: "down",
+        );
+        connections.add(newConnection);
+        duplicated.incomingConnection = newConnection;
+        parent.addOutgoingConnection(newConnection);
       }
-    }
 
-    /// **Recursive duplication logic**
+      realignTree();
-    SpaceModel duplicateRecursive(SpaceModel original, SpaceModel? duplicatedParent) {
+      connections = createConnections(spaces);
-      Offset newPosition = duplicatedParent == null
+    });
-          ? Offset(original.position.dx + horizontalGap, original.position.dy)
+  }
-          : getBalancedChildPosition(duplicatedParent);
 
-      final duplicatedName = SpaceHelper.generateUniqueSpaceName(original.name, spaces);
+  SpaceModel _deepCloneSpaceTree(SpaceModel original, {SpaceModel? parent}) {
-      print(
+    final duplicatedName = SpaceHelper.generateUniqueSpaceName(original.name, spaces);
-          "🟡 Duplicating ${original.name} → ${duplicatedName} at (${newPosition.dx}, ${newPosition.dy})");
 
-      final duplicated = SpaceModel(
+    final newSpace = SpaceModel(
-        name: duplicatedName,
+      name: duplicatedName,
-        icon: original.icon,
+      icon: original.icon,
-        position: newPosition,
+      position: original.position,
-        isPrivate: original.isPrivate,
+      isPrivate: original.isPrivate,
-        children: [],
+      children: [],
-        status: SpaceStatus.newSpace,
+      status: SpaceStatus.newSpace,
-        parent: duplicatedParent,
+      spaceModel: original.spaceModel,
-        spaceModel: original.spaceModel,
+      subspaces: original.subspaces,
-        subspaces: original.subspaces,
+      tags: original.tags,
-        tags: original.tags,
+      parent: parent,
+    );
+
+    for (var child in original.children) {
+      final duplicatedChild = _deepCloneSpaceTree(child, parent: newSpace);
+      newSpace.children.add(duplicatedChild);
+
+      final newConnection = Connection(
+        startSpace: newSpace,
+        endSpace: duplicatedChild,
+        direction: "down",
       );
+      connections.add(newConnection);
 
-      setState(() {
+      duplicatedChild.incomingConnection = newConnection;
-        spaces.add(duplicated);
+      newSpace.addOutgoingConnection(newConnection);
-        _updateNodePosition(duplicated, duplicated.position);
-
-        if (duplicatedParent != null) {
-          final newConnection = Connection(
-            startSpace: duplicatedParent,
-            endSpace: duplicated,
-            direction: "down",
-          );
-          connections.add(newConnection);
-          duplicated.incomingConnection = newConnection;
-          duplicatedParent.addOutgoingConnection(newConnection);
-          duplicatedParent.children.add(duplicated);
-          print("🔗 Created connection: ${duplicatedParent.name} → ${duplicated.name}");
-        }
-
-        // **Recalculate the whole tree to avoid overlaps**
-        realignTree();
-      });
-
-      // Recursively duplicate children
-      for (var child in original.children) {
-        duplicateRecursive(child, duplicated);
-      }
-
-      return duplicated;
     }
 
-    /// **Handle root duplication**
+    return newSpace;
-    if (space.parent == null) {
-      print("🟠 Duplicating root node: ${space.name}");
-      SpaceModel duplicatedRoot = duplicateRecursive(space, null);
-
-      setState(() {
-        spaces.add(duplicatedRoot);
-        realignTree();
-      });
-
-      print("✅ Root duplication successful: ${duplicatedRoot.name}");
-    } else {
-      duplicateRecursive(space, space.parent);
-    }
-
-    print("🟢 Finished duplication process for: ${space.name}");
   }
 }

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

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/space_tree/view/space_tree_view.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';
@@ -45,7 +46,6 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
   @override
   void initState() {
     super.initState();
-
     _spaceModels = List.from(widget.spaceModels ?? []);
   }
 
@@ -106,9 +106,8 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
                 children: [
                   SidebarWidget(
                     communities: widget.communities,
-                    selectedSpaceUuid: widget.selectedSpace?.uuid ??
+                    selectedSpaceUuid:
-                        widget.selectedCommunity?.uuid ??
+                        widget.selectedSpace?.uuid ?? widget.selectedCommunity?.uuid ?? '',
-                        '',
                     onCreateCommunity: (name, description) {
                       context.read<SpaceManagementBloc>().add(
                             CreateCommunityEvent(name, description, context),

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

@@ -1,8 +1,11 @@
+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';
 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';
@@ -15,6 +18,8 @@ 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;
@@ -33,6 +38,7 @@ class SidebarWidget extends StatefulWidget {
 
 class _SidebarWidgetState extends State<SidebarWidget> {
   late final ScrollController _scrollController;
+  Timer? _debounce;
 
   String _searchQuery = '';
   String? _selectedSpaceUuid;
@@ -40,17 +46,48 @@ class _SidebarWidgetState extends State<SidebarWidget> {
 
   @override
   void initState() {
-    _selectedId = widget.selectedSpaceUuid;
-    _scrollController = ScrollController();
     super.initState();
+    _scrollController = ScrollController();
+    _scrollController.addListener(_onScroll);
+    _selectedId = widget.selectedSpaceUuid;
+    _searchQuery = '';
+    context.read<SpaceTreeBloc>().add(ClearCachedData());
+  }
+
+  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();
+    _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) {
@@ -59,38 +96,6 @@ 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);
@@ -101,7 +106,10 @@ class _SidebarWidgetState extends State<SidebarWidget> {
 
   @override
   Widget build(BuildContext context) {
-    final filteredCommunities = _filteredCommunities();
+    final spaceTreeState = context.watch<SpaceTreeBloc>().state;
+    final filteredCommunities = spaceTreeState.searchQuery.isNotEmpty
+        ? spaceTreeState.filteredCommunity
+        : spaceTreeState.communityList;
 
     return Container(
       width: _width,
@@ -112,7 +120,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
         children: [
           SidebarHeader(onAddCommunity: _onAddCommunity),
           CustomSearchBar(
-            onSearchChanged: (query) => setState(() => _searchQuery = query),
+            onSearchChanged: _onSearchChanged,
           ),
           const SizedBox(height: 16),
           Expanded(
@@ -120,14 +128,23 @@ 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) => _buildCommunityTile(
+                  itemBuilder: (context, index) {
-                  context,
+                    if (index == filteredCommunities.length) {
-                  filteredCommunities[index],
+                      final spaceTreeState = context.read<SpaceTreeBloc>().state;
-                ),
+                      if (spaceTreeState.paginationIsLoading) {
-              ),
+                        return const Padding(
+                          padding: EdgeInsets.all(8.0),
+                          child: Center(child: CircularProgressIndicator()),
+                        );
+                      } else {
+                        return const SizedBox.shrink();
+                      }
+                    }
+                    return _buildCommunityTile(context, filteredCommunities[index]);
+                  }),
             ),
           ),
         ],
@@ -205,9 +222,8 @@ class _SidebarWidgetState extends State<SidebarWidget> {
     );
   }
 
-  void _onAddCommunity() => _selectedId?.isNotEmpty ?? true
+  void _onAddCommunity() =>
-      ? _clearSelection()
+      _selectedId?.isNotEmpty ?? true ? _clearSelection() : _showCreateCommunityDialog();
-      : _showCreateCommunityDialog();
 
   void _clearSelection() {
     setState(() => _selectedId = '');

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

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/space_model_bloc.dart';
@@ -27,6 +29,8 @@ class SpaceModelPage extends StatelessWidget {
           return const Center(child: CircularProgressIndicator());
         } else if (state is SpaceModelLoaded) {
           final spaceModels = state.spaceModels;
+          context.read<SpaceTreeBloc>().add(ClearCachedData());
+
           final allTagValues = _getAllTagValues(spaceModels);
           final allSpaceModelNames = _getAllSpaceModelName(spaceModels);
 

lib/services/batch_control_devices_service.dart

@@ -46,14 +46,14 @@ final class DebouncedBatchControlDevicesService
   final BatchControlDevicesService decoratee;
   final Duration debounceDuration;
 
-  final _pendingRequests = <(List<String> uuids, String code, Object value)>[];
-  var _isProcessing = false;
-
   DebouncedBatchControlDevicesService({
     required this.decoratee,
     this.debounceDuration = const Duration(milliseconds: 1500),
   });
 
+  final _pendingRequests = <(List<String> uuids, String code, Object value)>[];
+  var _isProcessing = false;
+
   @override
   Future<bool> batchControlDevices({
     required List<String> uuids,
@@ -68,16 +68,26 @@ final class DebouncedBatchControlDevicesService
 
     await Future.delayed(debounceDuration);
 
-    final lastRequest = _pendingRequests.last;
+    final groupedRequests =
+        <String, (List<String> uuids, String code, Object value)>{};
+    for (final request in _pendingRequests) {
+      final (_, requestCode, requestValue) = request;
+      groupedRequests[requestCode] = request;
+    }
     _pendingRequests.clear();
 
     try {
-      final (lastRequestUuids, lastRequestCode, lastRequestValue) = lastRequest;
+      var allSuccessful = true;
-      return decoratee.batchControlDevices(
+      for (final request in groupedRequests.values) {
-        uuids: lastRequestUuids,
+        final (lastRequestUuids, lastRequestCode, lastRequestValue) = request;
-        code: lastRequestCode,
+        final success = await decoratee.batchControlDevices(
-        value: lastRequestValue,
+          uuids: lastRequestUuids,
-      );
+          code: lastRequestCode,
+          value: lastRequestValue,
+        );
+        if (!success) allSuccessful = false;
+      }
+      return allSuccessful;
     } finally {
       _isProcessing = false;
     }

lib/services/control_device_service.dart

@@ -59,15 +59,24 @@ final class DebouncedControlDeviceService implements ControlDeviceService {
 
     await Future.delayed(debounceDuration);
 
-    final lastRequest = _pendingRequests.last;
+    final groupedRequests = <String, (String deviceUuid, Status status)>{};
+    for (final request in _pendingRequests) {
+      final (_, requestStatus) = request;
+      groupedRequests[requestStatus.code] = request;
+    }
     _pendingRequests.clear();
 
     try {
-      final (lastRequestDeviceUuid, lastRequestStatus) = lastRequest;
+      var allSuccessful = true;
-      return decoratee.controlDevice(
+      for (final request in groupedRequests.values) {
-        deviceUuid: lastRequestDeviceUuid,
+        final (lastRequestDeviceUuid, lastRequestStatus) = request;
-        status: lastRequestStatus,
+        final success = await decoratee.controlDevice(
-      );
+          deviceUuid: lastRequestDeviceUuid,
+          status: lastRequestStatus,
+        );
+        if (!success) allSuccessful = false;
+      }
+      return allSuccessful;
     } finally {
       _isProcessing = false;
     }

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');

lib/utils/app_routes.dart

@@ -1,5 +1,6 @@
 import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/pages/access_management/view/access_management.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/views/analytics_page.dart';
 import 'package:syncrow_web/pages/auth/view/login_page.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/view/device_managment_page.dart';
 import 'package:syncrow_web/pages/home/view/home_page.dart';
@@ -37,6 +38,11 @@ class AppRoutes {
       GoRoute(
           path: RoutesConst.rolesAndPermissions,
           builder: (context, state) => const RolesAndPermissionPage()),
+      GoRoute(
+        path: RoutesConst.analytics,
+        name: 'analytics',
+        builder: (context, state) => const AnalyticsPage(),
+      ),
     ];
   }
 }

lib/utils/constants/assets.dart

@@ -480,4 +480,5 @@ class Assets {
   static const String DisappeDelayIcon = 'assets/icons/disappe_delay_icon.svg';
   static const String indentLevelIcon = 'assets/icons/indent_level_icon.svg';
   static const String triggerLevelIcon = 'assets/icons/trigger_level_icon.svg';
+  static const String blankCalendar = 'assets/icons/blank_calendar.svg';
 }

lib/utils/constants/routes_const.dart

@@ -6,4 +6,5 @@ class RoutesConst {
   static const String deviceManagementPage = '/device-management-page';
   static const String spacesManagementPage = '/spaces_management-page';
   static const String rolesAndPermissions = '/roles_and_Permissions-page';
+  static const String analytics = '/syncrow_analytics';
 }