SP-1723-FE-Integrate-Charts-with-API-s-for-AQI-sensor.

<!--
  Thanks for contributing!

Provide a description of your changes below and a general summary in the
title

Please look at the following checklist to ensure that your PR can be
accepted quickly:
-->

## Jira Ticket

[SP-1673](https://syncrow.atlassian.net/browse/SP-1673?atlOrigin=eyJpIjoiZmU3YTRmMjQ3MDk4NDM0Y2I0MTVmOTA0Yjc1ZWE2NTEiLCJwIjoiamlyYS1zbGFjay1pbnQifQ)

## Description
fix the bug when validator activated textfield height get confused

## Type of Change

<!--- Put an `x` in all the boxes that apply: -->

- [ ] ✨ New feature (non-breaking change which adds functionality)
- [x] 🛠️ Bug fix (non-breaking change which fixes an issue)
- [ ] ❌ Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] 🧹 Code refactor
- [ ] ✅ Build configuration change
- [ ] 📝 Documentation
- [ ] 🗑️ Chore 


[SP-1673]:
https://syncrow.atlassian.net/browse/SP-1673?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ

analysis_options.yaml

@@ -25,3 +25,8 @@ linter:
     prefer_int_literals: false
     sort_constructors_first: false
     avoid_redundant_argument_values: false
+    always_put_required_named_parameters_first: false
+    unnecessary_breaks: false
+    avoid_catches_without_on_clauses: false
+    cascade_invocations: false
+    overridden_fields: false

lib/pages/analytics/models/air_quality_data_model.dart

@@ -15,7 +15,9 @@ class AirQualityDataModel extends Equatable {
     return AirQualityDataModel(
       date: DateTime.parse(json['date'] as String),
       data: (json['data'] as List<dynamic>)
-          .map((e) => AirQualityPercentageData.fromJson(e as Map<String, dynamic>))
+          .map(
+            (e) => AirQualityPercentageData.fromJson(e as Map<String, dynamic>),
+          )
           .toList(),
     );
   }
@@ -23,9 +25,9 @@ class AirQualityDataModel extends Equatable {
   static final Map<String, Color> metricColors = {
     'good': ColorsManager.goodGreen.withValues(alpha: 0.7),
     'moderate': ColorsManager.moderateYellow.withValues(alpha: 0.7),
-    'poor': ColorsManager.poorOrange.withValues(alpha: 0.7),
+    'unhealthy_sensitive': ColorsManager.poorOrange.withValues(alpha: 0.7),
     'unhealthy': ColorsManager.unhealthyRed.withValues(alpha: 0.7),
-    'severe': ColorsManager.severePink.withValues(alpha: 0.7),
+    'very_unhealthy': ColorsManager.severePink.withValues(alpha: 0.7),
     'hazardous': ColorsManager.hazardousPurple.withValues(alpha: 0.7),
   };
 
@@ -36,22 +38,19 @@ class AirQualityDataModel extends Equatable {
 class AirQualityPercentageData extends Equatable {
   const AirQualityPercentageData({
     required this.type,
-    required this.name,
     required this.percentage,
   });
 
   final String type;
-  final String name;
   final double percentage;
 
   factory AirQualityPercentageData.fromJson(Map<String, dynamic> json) {
     return AirQualityPercentageData(
-      type: json['type'] as String? ?? '',   
-      name: json['name'] as String? ?? '',
+      type: json['type'] as String? ?? '',
       percentage: (json['percentage'] as num?)?.toDouble() ?? 0,
     );
   }
 
   @override
-  List<Object?> get props => [type, name, percentage];
+  List<Object?> get props => [type, percentage];
 }

lib/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_bloc.dart

@@ -33,7 +33,6 @@ class AirQualityDistributionBloc
         state.copyWith(
           status: AirQualityDistributionStatus.success,
           chartData: result,
-          filteredChartData: _arrangeChartDataByType(result, state.selectedAqiType),
         ),
       );
     } catch (e) {
@@ -58,24 +57,6 @@ class AirQualityDistributionBloc
     UpdateAqiTypeEvent event,
     Emitter<AirQualityDistributionState> emit,
   ) {
-    emit(
-      state.copyWith(
-        selectedAqiType: event.aqiType,
-        filteredChartData: _arrangeChartDataByType(state.chartData, event.aqiType),
-      ),
-    );
-  }
-
-  List<AirQualityDataModel> _arrangeChartDataByType(
-    List<AirQualityDataModel> data,
-    AqiType aqiType,
-  ) {
-    final filteredData = data.map(
-      (data) => AirQualityDataModel(
-        date: data.date,
-        data: data.data.where((value) => value.type == aqiType.code).toList(),
-      ),
-    );
-    return filteredData.toList();
+    emit(state.copyWith(selectedAqiType: event.aqiType));
   }
 }

lib/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_state.dart

@@ -11,28 +11,24 @@ class AirQualityDistributionState extends Equatable {
   const AirQualityDistributionState({
     this.status = AirQualityDistributionStatus.initial,
     this.chartData = const [],
-    this.filteredChartData = const [],
     this.errorMessage,
     this.selectedAqiType = AqiType.aqi,
   });
 
   final AirQualityDistributionStatus status;
   final List<AirQualityDataModel> chartData;
-  final List<AirQualityDataModel> filteredChartData;
   final String? errorMessage;
   final AqiType selectedAqiType;
 
   AirQualityDistributionState copyWith({
     AirQualityDistributionStatus? status,
     List<AirQualityDataModel>? chartData,
-    List<AirQualityDataModel>? filteredChartData,
     String? errorMessage,
     AqiType? selectedAqiType,
   }) {
     return AirQualityDistributionState(
       status: status ?? this.status,
       chartData: chartData ?? this.chartData,
-      filteredChartData: filteredChartData ?? this.filteredChartData,
       errorMessage: errorMessage ?? this.errorMessage,
       selectedAqiType: selectedAqiType ?? this.selectedAqiType,
     );

lib/pages/analytics/modules/air_quality/helpers/fetch_air_quality_data_helper.dart

@@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/device_location/device_location_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_devices/analytics_devices_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/realtime_device_changes/realtime_device_changes_bloc.dart';
@@ -22,6 +23,7 @@ abstract final class FetchAirQualityDataHelper {
     bool shouldFetchAnalyticsDevices = true,
   }) {
     final date = context.read<AnalyticsDatePickerBloc>().state.monthlyDate;
+    final aqiType = context.read<AirQualityDistributionBloc>().state.selectedAqiType;
     loadAnalyticsDevices(
       context,
       communityUuid: communityUuid,
@@ -36,6 +38,7 @@ abstract final class FetchAirQualityDataHelper {
       context,
       spaceUuid: spaceUuid,
       date: date,
+      aqiType: aqiType,
     );
   }
 
@@ -104,10 +107,15 @@ abstract final class FetchAirQualityDataHelper {
     BuildContext context, {
     required String spaceUuid,
     required DateTime date,
+    required AqiType aqiType,
   }) {
     context.read<AirQualityDistributionBloc>().add(
           LoadAirQualityDistribution(
-            GetAirQualityDistributionParam(spaceUuid: spaceUuid, date: date),
+            GetAirQualityDistributionParam(
+              spaceUuid: spaceUuid,
+              date: date,
+              aqiType: aqiType,
+            ),
           ),
         );
   }

lib/pages/analytics/modules/air_quality/widgets/aqi_distribution_chart.dart

@@ -16,11 +16,6 @@ class AqiDistributionChart extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final sortedData = List<AirQualityDataModel>.from(chartData)
-      ..sort(
-        (a, b) => a.date.compareTo(b.date),
-      );
-
     return BarChart(
       BarChartData(
         maxY: 100.1,
@@ -30,29 +25,25 @@ class AqiDistributionChart extends StatelessWidget {
         borderData: EnergyManagementChartsHelper.borderData(),
         barTouchData: _barTouchData(context),
         titlesData: _titlesData(context),
-        barGroups: _buildBarGroups(sortedData),
+        barGroups: _buildBarGroups(),
       ),
       duration: Duration.zero,
     );
   }
 
-  List<BarChartGroupData> _buildBarGroups(List<AirQualityDataModel> sortedData) {
-    return List.generate(sortedData.length, (index) {
-      final data = sortedData[index];
+  List<BarChartGroupData> _buildBarGroups() {
+    return List.generate(chartData.length, (index) {
+      final data = chartData[index];
       final stackItems = <BarChartRodData>[];
       double currentY = 0;
-      bool isFirstElement = true;
+      var isFirstElement = true;
 
-      // Sort data by type to ensure consistent order
-      final sortedPercentageData = List<AirQualityPercentageData>.from(data.data)
-        ..sort((a, b) => a.type.compareTo(b.type));
-
-      for (final percentageData in sortedPercentageData) {
+      for (final percentageData in data.data) {
         stackItems.add(
           BarChartRodData(
             fromY: currentY,
-            toY: currentY + percentageData.percentage ,
-            color: AirQualityDataModel.metricColors[percentageData.name]!,
+            toY: currentY + percentageData.percentage,
+            color: AirQualityDataModel.metricColors[percentageData.type],
             borderRadius: isFirstElement
                 ? const BorderRadius.only(
                     topLeft: Radius.circular(22),
@@ -84,23 +75,21 @@ class AqiDistributionChart extends StatelessWidget {
         tooltipRoundedRadius: 16,
         tooltipPadding: const EdgeInsets.all(8),
         getTooltipItem: (group, groupIndex, rod, rodIndex) {
-          final data = chartData[group.x.toInt()];
+          final data = chartData[group.x];
 
-          final List<TextSpan> children = [];
+          final children = <TextSpan>[];
 
           final textStyle = context.textTheme.bodySmall?.copyWith(
             color: ColorsManager.blackColor,
-            fontSize: 12,
+            fontSize: 8,
           );
 
-          // Sort data by type to ensure consistent order
-          final sortedPercentageData = List<AirQualityPercentageData>.from(data.data)
-            ..sort((a, b) => a.type.compareTo(b.type));
-
-          for (final percentageData in sortedPercentageData) {
+          for (final percentageData in data.data) {
+            final percentage = percentageData.percentage.toStringAsFixed(1);
+            final type = percentageData.type[0].toUpperCase() +
+                percentageData.type.substring(1).replaceAll('_', ' ');
             children.add(TextSpan(
-              text:
-                  '\n${percentageData.type.toUpperCase()}: ${percentageData.percentage.toStringAsFixed(1)}%',
+              text: '\n$type: $percentage%',
               style: textStyle,
             ));
           }
@@ -109,9 +98,10 @@ class AqiDistributionChart extends StatelessWidget {
             DateFormat('dd/MM/yyyy').format(data.date),
             context.textTheme.bodyMedium!.copyWith(
               color: ColorsManager.blackColor,
-              fontSize: 16,
+              fontSize: 9,
               fontWeight: FontWeight.w600,
             ),
+            textAlign: TextAlign.start,
             children: children,
           );
         },

lib/pages/analytics/modules/air_quality/widgets/aqi_distribution_chart_box.dart

@@ -33,7 +33,7 @@ class AqiDistributionChartBox extends StatelessWidget {
               const Divider(),
               const SizedBox(height: 20),
               Expanded(
-                child: AqiDistributionChart(chartData: state.filteredChartData),
+                child: AqiDistributionChart(chartData: state.chartData),
               ),
             ],
           ),

lib/pages/analytics/modules/air_quality/widgets/aqi_distribution_chart_title.dart

@@ -2,8 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/chart_title.dart';
+import 'package:syncrow_web/pages/analytics/params/get_air_quality_distribution_param.dart';
 import 'package:syncrow_web/pages/analytics/widgets/charts_loading_widget.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 
 class AqiDistributionChartTitle extends StatelessWidget {
   const AqiDistributionChartTitle({required this.isLoading, super.key});
@@ -31,9 +34,15 @@ class AqiDistributionChartTitle extends StatelessWidget {
           child: AqiTypeDropdown(
             onChanged: (value) {
               if (value != null) {
-                context
-                    .read<AirQualityDistributionBloc>()
-                    .add(UpdateAqiTypeEvent(value));
+                final bloc = context.read<AirQualityDistributionBloc>();
+                try {
+                  final param = _makeLoadAqiDistributionParam(context, value);
+                  bloc.add(LoadAirQualityDistribution(param));
+                } catch (_) {
+                  return;
+                } finally {
+                  bloc.add(UpdateAqiTypeEvent(value));
+                }
               }
             },
           ),
@@ -41,4 +50,19 @@ class AqiDistributionChartTitle extends StatelessWidget {
       ],
     );
   }
+
+  GetAirQualityDistributionParam _makeLoadAqiDistributionParam(
+    BuildContext context,
+    AqiType aqiType,
+  ) {
+    final date = context.read<AnalyticsDatePickerBloc>().state.monthlyDate;
+    final spaceUuid =
+        context.read<SpaceTreeBloc>().state.selectedSpaces.firstOrNull ?? '';
+    if (spaceUuid.isEmpty) throw Exception('Space UUID is empty');
+    return GetAirQualityDistributionParam(
+      date: date,
+      spaceUuid: spaceUuid,
+      aqiType: aqiType,
+    );
+  }
 }

lib/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart

@@ -6,8 +6,8 @@ enum AqiType {
   aqi('AQI', '', 'aqi'),
   pm25('PM2.5', 'µg/m³', 'pm25'),
   pm10('PM10', 'µg/m³', 'pm10'),
-  hcho('HCHO', 'mg/m³', 'hcho'),
-  tvoc('TVOC', 'µg/m³', 'tvoc'),
+  hcho('HCHO', 'mg/m³', 'cho2'),
+  tvoc('TVOC', 'µg/m³', 'voc'),
   co2('CO2', 'ppm', 'co2');
 
   const AqiType(this.value, this.unit, this.code);

lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart.dart

@@ -63,7 +63,7 @@ class RangeOfAqiChart extends StatelessWidget {
             gradient: LinearGradient(
               begin: Alignment.bottomCenter,
               end: Alignment.topCenter,
-              stops: [0.0, 0.2, 0.4, 0.6, 0.8, 1.0],
+              stops: const [0.0, 0.2, 0.4, 0.6, 0.8, 1.0],
               colors: RangeOfAqiChartsHelper.gradientData.map((e) {
                 final (color, _) = e;
                 return color.withValues(alpha: 0.6);

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

@@ -16,7 +16,7 @@ import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/real
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/total_energy_consumption/total_energy_consumption_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/occupancy/blocs/occupancy/occupancy_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/occupancy/blocs/occupancy_heat_map/occupancy_heat_map_bloc.dart';
-import 'package:syncrow_web/pages/analytics/services/air_quality_distribution/fake_air_quality_distribution_service.dart';
+import 'package:syncrow_web/pages/analytics/services/air_quality_distribution/remote_air_quality_distribution_service.dart';
 import 'package:syncrow_web/pages/analytics/services/analytics_devices/analytics_devices_service_delagate.dart';
 import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_energy_management_analytics_devices_service.dart';
 import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_occupancy_analytics_devices_service.dart';
@@ -27,7 +27,7 @@ import 'package:syncrow_web/pages/analytics/services/energy_consumption_per_devi
 import 'package:syncrow_web/pages/analytics/services/occupacy/remote_occupancy_service.dart';
 import 'package:syncrow_web/pages/analytics/services/occupancy_heat_map/remote_occupancy_heat_map_service.dart';
 import 'package:syncrow_web/pages/analytics/services/power_clamp_info/remote_power_clamp_info_service.dart';
-import 'package:syncrow_web/pages/analytics/services/range_of_aqi/fake_range_of_aqi_service.dart';
+import 'package:syncrow_web/pages/analytics/services/range_of_aqi/remote_range_of_aqi_service.dart';
 import 'package:syncrow_web/pages/analytics/services/realtime_device_service/firebase_realtime_device_service.dart';
 import 'package:syncrow_web/pages/analytics/services/total_energy_consumption/remote_total_energy_consumption_service.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
@@ -104,12 +104,12 @@ class _AnalyticsPageState extends State<AnalyticsPage> {
         ),
         BlocProvider(
           create: (context) => RangeOfAqiBloc(
-            FakeRangeOfAqiService(),
+            RemoteRangeOfAqiService(_httpService),
           ),
         ),
         BlocProvider(
           create: (context) => AirQualityDistributionBloc(
-            FakeAirQualityDistributionService(),
+            RemoteAirQualityDistributionService(_httpService),
           ),
         ),
         BlocProvider(

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

@@ -20,7 +20,7 @@ class AnalyticsDateFilterButton extends StatefulWidget {
   final void Function(DateTime)? onDateSelected;
   final DatePickerType datePickerType;
 
-  static final _color = ColorsManager.blackColor.withValues(alpha: 0.8);
+  static final Color _color = ColorsManager.blackColor.withValues(alpha: 0.8);
 
   @override
   State<AnalyticsDateFilterButton> createState() =>
@@ -60,23 +60,21 @@ class _AnalyticsDateFilterButtonState extends State<AnalyticsDateFilterButton> {
         ),
       ),
       onPressed: () {
-        showDialog(
+        showDialog<void>(
           context: context,
-          builder: (_) {
-            return switch (widget.datePickerType) {
-              DatePickerType.month => MonthPickerWidget(
-                  selectedDate: widget.selectedDate,
-                  onDateSelected: (value) {
-                    widget.onDateSelected?.call(value);
-                  },
-                ),
-              DatePickerType.year => YearPickerWidget(
-                  selectedDate: widget.selectedDate,
-                  onDateSelected: (value) {
-                    widget.onDateSelected?.call(value);
-                  },
-                ),
-            };
+          builder: (_) => switch (widget.datePickerType) {
+            DatePickerType.month => MonthPickerWidget(
+                selectedDate: widget.selectedDate,
+                onDateSelected: (value) {
+                  widget.onDateSelected?.call(value);
+                },
+              ),
+            DatePickerType.year => YearPickerWidget(
+                selectedDate: widget.selectedDate,
+                onDateSelected: (value) {
+                  widget.onDateSelected?.call(value);
+                },
+              ),
           },
         );
       },

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

@@ -118,7 +118,7 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
             communityUuid: communities.firstOrNull ?? '',
             spaceUuid: spaces.firstOrNull ?? '',
           );
-          break;
+          return;
         case AnalyticsPageTab.airQuality:
           _onAirQualityDateChanged(
             context,
@@ -126,8 +126,9 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
             communityUuid: communities.firstOrNull ?? '',
             spaceUuid: spaces.firstOrNull ?? '',
           );
+          return;
         default:
-          break;
+          return;
       }
     }
   }
@@ -157,6 +158,7 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
     required String communityUuid,
     required String spaceUuid,
   }) {
+    if (spaceUuid.isEmpty) return;
     FetchAirQualityDataHelper.loadAirQualityData(
       context,
       date: date,

lib/pages/analytics/params/get_air_quality_distribution_param.dart

@@ -1,9 +1,14 @@
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
+
 class GetAirQualityDistributionParam {
   final DateTime date;
   final String spaceUuid;
+  final AqiType aqiType;
 
-  const GetAirQualityDistributionParam({
+  const GetAirQualityDistributionParam(
+ {
     required this.date,
     required this.spaceUuid,
+    required this.aqiType,
   });
 }

lib/pages/analytics/services/air_quality_distribution/fake_air_quality_distribution_service.dart

@@ -1,95 +0,0 @@
-import 'dart:math';
-
-import 'package:syncrow_web/pages/analytics/models/air_quality_data_model.dart';
-import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
-import 'package:syncrow_web/pages/analytics/params/get_air_quality_distribution_param.dart';
-import 'package:syncrow_web/pages/analytics/services/air_quality_distribution/air_quality_distribution_service.dart';
-
-class FakeAirQualityDistributionService implements AirQualityDistributionService {
-  final _random = Random();
-
-  @override
-  Future<List<AirQualityDataModel>> getAirQualityDistribution(
-    GetAirQualityDistributionParam param,
-  ) async {
-    return Future.delayed(
-      const Duration(milliseconds: 400),
-      () => List.generate(30, (index) {
-        final date = DateTime(2025, 5, 1).add(Duration(days: index));
-
-        final values = _generateRandomPercentages();
-        final nullMask = List.generate(6, (_) => _shouldBeNull());
-
-        if (nullMask.every((isNull) => isNull)) {
-          nullMask[_random.nextInt(6)] = false;
-        }
-
-        final nonNullValues = _redistributePercentages(values, nullMask);
-
-        return AirQualityDataModel(
-          date: date,
-          data: [
-            AirQualityPercentageData(
-              type: AqiType.aqi.code,
-              percentage: nonNullValues[0],
-              name: 'good',
-            ),
-            AirQualityPercentageData(
-              name: 'moderate',
-              type: AqiType.co2.code,
-              percentage: nonNullValues[1],
-            ),
-            AirQualityPercentageData(
-              name: 'poor',
-              percentage: nonNullValues[2],
-              type: AqiType.hcho.code,
-
-            ),
-            AirQualityPercentageData(
-              name: 'unhealthy',
-              percentage: nonNullValues[3],
-              type: AqiType.pm10.code,
-            ),
-            AirQualityPercentageData(
-              name: 'severe',
-              type: AqiType.pm25.code,
-              percentage: nonNullValues[4],
-            ),
-            AirQualityPercentageData(
-              name: 'hazardous',
-              percentage: nonNullValues[5],
-              type: AqiType.co2.code,
-            ),
-          ],
-        );
-      }),
-    );
-  }
-
-  List<double> _redistributePercentages(
-    List<double> originalValues,
-    List<bool> nullMask,
-  ) {
-    double nonNullSum = 0;
-    for (int i = 0; i < originalValues.length; i++) {
-      if (!nullMask[i]) {
-        nonNullSum += originalValues[i];
-      }
-    }
-
-    return List.generate(originalValues.length, (i) {
-      if (nullMask[i]) return 0;
-      return (originalValues[i] / nonNullSum * 100).roundToDouble();
-    });
-  }
-
-  bool _shouldBeNull() => _random.nextDouble() < 0.6;
-
-  List<double> _generateRandomPercentages() {
-    final values = List.generate(6, (_) => _random.nextDouble());
-
-    final sum = values.reduce((a, b) => a + b);
-
-    return values.map((value) => (value / sum * 100).roundToDouble()).toList();
-  }
-}

lib/pages/analytics/services/air_quality_distribution/remote_air_quality_distribution_service.dart

@@ -3,7 +3,8 @@ import 'package:syncrow_web/pages/analytics/params/get_air_quality_distribution_
 import 'package:syncrow_web/pages/analytics/services/air_quality_distribution/air_quality_distribution_service.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 
-class RemoteAirQualityDistributionService implements AirQualityDistributionService {
+final class RemoteAirQualityDistributionService
+    implements AirQualityDistributionService {
   RemoteAirQualityDistributionService(this._httpService);
 
   final HTTPService _httpService;
@@ -14,10 +15,10 @@ class RemoteAirQualityDistributionService implements AirQualityDistributionServi
   ) async {
     try {
       final response = await _httpService.get(
-        path: 'endpoint',
+        path: '/aqi/distribution/space/${param.spaceUuid}',
         queryParameters: {
-          'spaceUuid': param.spaceUuid,
-          'date': param.date.toIso8601String(),
+          'monthDate': _formatDate(param.date),
+          'pollutantType': param.aqiType.code,
         },
         expectedResponseModel: (data) {
           final json = data as Map<String, dynamic>? ?? {};
@@ -33,4 +34,8 @@ class RemoteAirQualityDistributionService implements AirQualityDistributionServi
       throw Exception('Failed to load energy consumption per phase: $e');
     }
   }
+
+  static String _formatDate(DateTime date) {
+    return '${date.year}-${date.month.toString().padLeft(2, '0')}';
+  }
 }

lib/pages/analytics/services/device_location/device_location_details_service_decorator.dart

@@ -26,15 +26,15 @@ class DeviceLocationDetailsServiceDecorator implements DeviceLocationService {
       if (data != null) {
         final addressData = data['address'] as Map<String, dynamic>;
         return deviceLocationInfo.copyWith(
-          city: addressData['city'],
-          country: addressData['country_code'].toString().toUpperCase(),
-          address: addressData['state'],
+          city: addressData['city'] as String?,
+          country: addressData['country_code']?.toString().toUpperCase(),
+          address: addressData['state'] as String?,
         );
       }
 
       return deviceLocationInfo;
     } catch (e) {
-      throw Exception('Failed to load device location info: ${e.toString()}');
+      throw Exception('Failed to load device location info: $e');
     }
   }
 }

lib/pages/analytics/services/range_of_aqi/fake_range_of_aqi_service.dart

@@ -1,36 +0,0 @@
-import 'package:syncrow_web/pages/analytics/models/range_of_aqi.dart';
-import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
-import 'package:syncrow_web/pages/analytics/params/get_range_of_aqi_param.dart';
-import 'package:syncrow_web/pages/analytics/services/range_of_aqi/range_of_aqi_service.dart';
-
-class FakeRangeOfAqiService implements RangeOfAqiService {
-  @override
-  Future<List<RangeOfAqi>> load(GetRangeOfAqiParam param) async {
-    return await Future.delayed(const Duration(milliseconds: 800), () {
-      final random = DateTime.now().millisecondsSinceEpoch;
-
-      return List.generate(30, (index) {
-        final date = DateTime(2025, 5, 1).add(Duration(days: index));
-
-        final min = ((random + index * 17) % 200).toDouble();
-        final avgDelta = ((random + index * 23) % 50).toDouble() + 20;
-        final maxDelta = ((random + index * 31) % 50).toDouble() + 30;
-
-        final avg = (min + avgDelta).clamp(0.0, 301.0);
-        final max = (avg + maxDelta).clamp(0.0, 301.0);
-
-        return RangeOfAqi(  
-          data: [
-            RangeOfAqiValue(type: AqiType.aqi.code, min: min, average: avg, max: max),
-            RangeOfAqiValue(type: AqiType.pm25.code, min: min, average: avg, max: max),
-            RangeOfAqiValue(type: AqiType.pm10.code, min: min, average: avg, max: max),
-            RangeOfAqiValue(type: AqiType.hcho.code, min: min, average: avg, max: max),
-            RangeOfAqiValue(type: AqiType.tvoc.code, min: min, average: avg, max: max),
-            RangeOfAqiValue(type: AqiType.co2.code, min: min, average: avg, max: max),
-          ],
-          date: date,
-        );
-      });
-    });
-  }
-}

lib/pages/analytics/services/range_of_aqi/remote_range_of_aqi_service.dart

@@ -12,11 +12,8 @@ final class RemoteRangeOfAqiService implements RangeOfAqiService {
   Future<List<RangeOfAqi>> load(GetRangeOfAqiParam param) async {
     try {
       final response = await _httpService.get(
-        path: 'endpoint',
-        queryParameters: {
-          'spaceUuid': param.spaceUuid,
-          'date': param.date.toIso8601String(),
-        },
+        path: '/aqi/range/space/${param.spaceUuid}',
+        queryParameters: {'monthDate': _formatDate(param.date)},
         expectedResponseModel: (data) {
           final json = data as Map<String, dynamic>? ?? {};
           final mappedData = json['data'] as List<dynamic>? ?? [];
@@ -28,7 +25,11 @@ final class RemoteRangeOfAqiService implements RangeOfAqiService {
       );
       return response;
     } catch (e) {
-      throw Exception('Failed to load energy consumption per phase: $e');
+      throw Exception('Failed to load range of aqi: $e');
     }
   }
+
+  static String _formatDate(DateTime date) {
+    return '${date.year}-${date.month.toString().padLeft(2, '0')}';
+  }
 }

lib/pages/common/text_field/custom_web_textfield.dart

@@ -78,7 +78,7 @@ class CustomWebTextField extends StatelessWidget {
             controller: controller,
             style: const TextStyle(color: Colors.black),
             decoration: textBoxDecoration()!.copyWith(
-                errorStyle: const TextStyle(height: 0),
+                errorStyle: const TextStyle(height: 0.01),
                 hintStyle: context.textTheme.titleSmall!
                     .copyWith(color: Colors.grey, fontSize: 12),
                 hintText: hintText ?? 'Please enter'),

lib/pages/home/view/home_card.dart

@@ -40,7 +40,7 @@ class HomeCard extends StatelessWidget {
                       child: Text(
                         name,
                         style: const TextStyle(
-                          fontSize: 20,
+                          fontSize: 30,
                           color: Colors.white,
                           fontWeight: FontWeight.bold,
                         ),

lib/pages/home/view/home_page_web.dart

@@ -97,7 +97,7 @@ class _HomeWebPageState extends State<HomeWebPage> {
                             itemCount: homeBloc.homeItems.length,
                             gridDelegate:
                                 const SliverGridDelegateWithFixedCrossAxisCount(
-                              crossAxisCount: 3, // Adjust as needed.
+                              crossAxisCount: 4, // Adjust as needed.
                               crossAxisSpacing: 20.0,
                               mainAxisSpacing: 20.0,
                               childAspectRatio: 1.5,

lib/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart

@@ -11,7 +11,6 @@ class CreateRoutineBloc extends Bloc<CreateRoutineEvent, CreateRoutineState> {
     on<SpaceOnlyWithDevicesEvent>(_fetchSpaceOnlyWithDevices);
     on<SaveCommunityIdAndSpaceIdEvent>(saveSpaceIdCommunityId);
     on<ResetSelectedEvent>(resetSelected);
-    on<FetchCommunityEvent>(_fetchCommunity);
   }
 
   String selectedSpaceId = '';
@@ -50,18 +49,4 @@ class CreateRoutineBloc extends Bloc<CreateRoutineEvent, CreateRoutineState> {
     selectedCommunityId = '';
     emit(const ResetSelectedState());
   }
-
-  Future<void> _fetchCommunity(
-      FetchCommunityEvent event, Emitter<CreateRoutineState> emit) async {
-    emit(const CommunitiesLoadingState());
-
-    try {
-      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-      communities =
-          await CommunitySpaceManagementApi().fetchCommunities(projectUuid);
-      emit(const CommunityLoadedState());
-    } catch (e) {
-      emit(SpaceTreeErrorState('Error loading communities $e'));
-    }
-  }
 }

lib/pages/routines/bloc/create_routine_bloc/create_routine_event.dart

@@ -43,9 +43,3 @@ class ResetSelectedEvent extends CreateRoutineEvent {
 }
 
 
-class FetchCommunityEvent extends CreateRoutineEvent {
-  const FetchCommunityEvent();
-
-  @override
-  List<Object> get props => [];
-}

lib/pages/routines/create_new_routines/commu_dropdown.dart

@@ -1,13 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/routines/create_new_routines/dropdown_menu_content.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.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/utils/color_manager.dart';
 import 'space_tree_dropdown_bloc.dart';
 
-class SpaceTreeDropdown extends StatefulWidget {
+class SpaceTreeDropdown extends StatelessWidget {
   final String? selectedSpaceId;
   final Function(String?)? onChanged;
 
@@ -18,23 +16,33 @@ class SpaceTreeDropdown extends StatefulWidget {
   });
 
   @override
-  State<SpaceTreeDropdown> createState() => _SpaceTreeDropdownState();
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (context) {
+        final bloc = SpaceTreeDropdownBloc(selectedSpaceId);
+        bloc.add(FetchSpacesEvent());
+        return bloc;
+      },
+      child: _DropdownContent(onChanged: onChanged),
+    );
+  }
 }
 
-class _SpaceTreeDropdownState extends State<SpaceTreeDropdown> {
-  late SpaceTreeDropdownBloc _dropdownBloc;
+class _DropdownContent extends StatefulWidget {
+  final Function(String?)? onChanged;
+
+  const _DropdownContent({this.onChanged});
+
+  @override
+  State<_DropdownContent> createState() => _DropdownContentState();
+}
+
+class _DropdownContentState extends State<_DropdownContent> {
   final LayerLink _layerLink = LayerLink();
   OverlayEntry? _overlayEntry;
 
-  @override
-  void initState() {
-    super.initState();
-    _dropdownBloc = SpaceTreeDropdownBloc(widget.selectedSpaceId);
-  }
-
   @override
   void dispose() {
-    _dropdownBloc.close();
     _removeOverlay();
     super.dispose();
   }
@@ -46,100 +54,120 @@ class _SpaceTreeDropdownState extends State<SpaceTreeDropdown> {
 
   @override
   Widget build(BuildContext context) {
-    return BlocProvider.value(
-      value: _dropdownBloc,
-      child: BlocBuilder<SpaceTreeBloc, SpaceTreeState>(
-        builder: (context, spaceTreeState) {
-          final communities = spaceTreeState.searchQuery.isNotEmpty
-              ? spaceTreeState.filteredCommunity
-              : spaceTreeState.communityList;
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 10),
+          child: Text(
+            "Community",
+            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                  fontWeight: FontWeight.w400,
+                  fontSize: 13,
+                  color: ColorsManager.blackColor,
+                ),
+          ),
+        ),
+        CompositedTransformTarget(
+          link: _layerLink,
+          child: GestureDetector(
+            onTap: () => _toggleDropdown(context),
+            child: BlocBuilder<SpaceTreeDropdownBloc, SpaceTreeDropdownState>(
+              builder: (context, state) {
+                return _buildDropdownTrigger(state);
+              },
+            ),
+          ),
+        ),
+      ],
+    );
+  }
 
-          return BlocBuilder<SpaceTreeDropdownBloc, SpaceTreeDropdownState>(
-            builder: (context, dropdownState) {
-              final selectedCommunity = _findCommunity(
-                communities,
-                dropdownState.selectedSpaceId,
-              );
+  Widget _buildDropdownTrigger(SpaceTreeDropdownState state) {
+    if (state.status == SpaceTreeDropdownStatus.loading) {
+      return Container(
+        height: 46,
+        decoration: BoxDecoration(
+          border: Border.all(color: Colors.grey.shade300),
+          borderRadius: BorderRadius.circular(12),
+        ),
+        margin: const EdgeInsets.symmetric(horizontal: 10),
+        child: const Center(child: CircularProgressIndicator()),
+      );
+    }
 
-              return Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                mainAxisAlignment: MainAxisAlignment.start,
-                children: [
-                  Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 10),
-                    child: Text(
-                      "Community",
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontWeight: FontWeight.w400,
-                            fontSize: 13,
-                            color: ColorsManager.blackColor,
-                          ),
-                    ),
-                  ),
-                  CompositedTransformTarget(
-                    link: _layerLink,
-                    child: GestureDetector(
-                      onTap: () => _toggleDropdown(context, communities),
-                      child: Container(
-                        height: 46,
-                        decoration: BoxDecoration(
-                          border: Border.all(color: Colors.grey.shade300),
-                          borderRadius: BorderRadius.circular(12),
-                        ),
-                        margin: const EdgeInsets.symmetric(horizontal: 10),
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                          children: [
-                            Padding(
-                              padding:
-                                  const EdgeInsets.symmetric(horizontal: 10),
-                              child: Text(
-                                selectedCommunity?.name ?? 'Please Select',
-                                style: TextStyle(
-                                  color: selectedCommunity != null
-                                      ? ColorsManager.blackColor
-                                      : ColorsManager.textGray,
-                                  overflow: TextOverflow.ellipsis,
-                                  fontWeight: FontWeight.w400,
-                                  fontSize: 13,
-                                ),
-                              ),
-                            ),
-                            Container(
-                              decoration: BoxDecoration(
-                                color: Colors.grey[200],
-                                borderRadius: const BorderRadius.only(
-                                  topRight: Radius.circular(10),
-                                  bottomRight: Radius.circular(10),
-                                ),
-                              ),
-                              height: 45,
-                              width: 33,
-                              child: const Icon(
-                                Icons.keyboard_arrow_down,
-                                color: ColorsManager.textGray,
-                              ),
-                            ),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
-              );
-            },
-          );
-        },
+    if (state.status == SpaceTreeDropdownStatus.failure) {
+      return Container(
+        height: 46,
+        decoration: BoxDecoration(
+          border: Border.all(color: Colors.grey.shade300),
+          borderRadius: BorderRadius.circular(12),
+        ),
+        margin: const EdgeInsets.symmetric(horizontal: 10),
+        child: Center(
+          child: Text(
+            'Error: ${state.errorMessage}',
+            style: const TextStyle(color: Colors.red),
+          ),
+        ),
+      );
+    }
+
+    final selectedCommunity = _findCommunity(state, state.selectedSpaceId);
+
+    return Container(
+      height: 46,
+      decoration: BoxDecoration(
+        border: Border.all(color: Colors.grey.shade300),
+        borderRadius: BorderRadius.circular(12),
+      ),
+      margin: const EdgeInsets.symmetric(horizontal: 10),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 10),
+            child: Text(
+              selectedCommunity?.name ?? 'Please Select',
+              style: TextStyle(
+                color: selectedCommunity != null
+                    ? ColorsManager.blackColor
+                    : ColorsManager.textGray,
+                overflow: TextOverflow.ellipsis,
+                fontWeight: FontWeight.w400,
+                fontSize: 13,
+              ),
+            ),
+          ),
+          Container(
+            decoration: BoxDecoration(
+              color: Colors.grey[200],
+              borderRadius: const BorderRadius.only(
+                topRight: Radius.circular(10),
+                bottomRight: Radius.circular(10),
+              ),
+            ),
+            height: 45,
+            width: 33,
+            child: const Icon(
+              Icons.keyboard_arrow_down,
+              color: ColorsManager.textGray,
+            ),
+          ),
+        ],
       ),
     );
   }
 
-  void _toggleDropdown(BuildContext context, List<CommunityModel> communities) {
+  void _toggleDropdown(BuildContext context) {
     if (_overlayEntry != null) {
       _removeOverlay();
       return;
     }
 
+    final bloc = context.read<SpaceTreeDropdownBloc>();
+
     _overlayEntry = OverlayEntry(
       builder: (context) => Positioned(
         width: 300,
@@ -148,18 +176,22 @@ class _SpaceTreeDropdownState extends State<SpaceTreeDropdown> {
           showWhenUnlinked: false,
           offset: const Offset(0, 48),
           child: Material(
+            color: ColorsManager.whiteColors,
             elevation: 8,
             borderRadius: BorderRadius.circular(12),
-            child: DropdownMenuContent(
-              selectedSpaceId: _dropdownBloc.state.selectedSpaceId,
-              onChanged: (id) {
-                if (id != null && mounted) {
-                  _dropdownBloc.add(SpaceTreeDropdownSelectEvent(id));
-                  widget.onChanged?.call(id);
-                  _removeOverlay();
-                }
-              },
-              onClose: _removeOverlay,
+            child: BlocProvider.value(
+              value: bloc,
+              child: DropdownMenuContent(
+                selectedSpaceId: bloc.state.selectedSpaceId,
+                onChanged: (id) {
+                  if (id != null && mounted) {
+                    bloc.add(SpaceTreeDropdownSelectEvent(id));
+                    widget.onChanged?.call(id);
+                    _removeOverlay();
+                  }
+                },
+                onClose: _removeOverlay,
+              ),
             ),
           ),
         ),
@@ -170,10 +202,13 @@ class _SpaceTreeDropdownState extends State<SpaceTreeDropdown> {
   }
 
   CommunityModel? _findCommunity(
-      List<CommunityModel> communities, String? communityId) {
+      SpaceTreeDropdownState state, String? communityId) {
     if (communityId == null) return null;
     try {
-      return communities.firstWhere((c) => c.uuid == communityId);
+      return state.filteredCommunities.firstWhere((c) => c.uuid == communityId);
+    } catch (_) {}
+    try {
+      return state.communities.firstWhere((c) => c.uuid == communityId);
     } catch (e) {
       return null;
     }

lib/pages/routines/create_new_routines/create_new_routines.dart

@@ -23,8 +23,7 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-        create: (BuildContext context) =>
-            CreateRoutineBloc()..add(const FetchCommunityEvent()),
+        create: (BuildContext context) => CreateRoutineBloc(),
         child: BlocBuilder<CreateRoutineBloc, CreateRoutineState>(
           builder: (context, state) {
             final _bloc = BlocProvider.of<CreateRoutineBloc>(context);

lib/pages/routines/create_new_routines/dropdown_menu_content.dart

@@ -1,12 +1,7 @@
-
-
-
-
+import 'dart:async';
 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/bloc/space_tree_state.dart';
+import 'space_tree_dropdown_bloc.dart';
 
 class DropdownMenuContent extends StatefulWidget {
   final String? selectedSpaceId;
@@ -14,6 +9,7 @@ class DropdownMenuContent extends StatefulWidget {
   final VoidCallback onClose;
 
   const DropdownMenuContent({
+    super.key,
     required this.selectedSpaceId,
     required this.onChanged,
     required this.onClose,
@@ -26,6 +22,7 @@ class DropdownMenuContent extends StatefulWidget {
 class _DropdownMenuContentState extends State<DropdownMenuContent> {
   final ScrollController _scrollController = ScrollController();
   final TextEditingController _searchController = TextEditingController();
+  Timer? _debounceTimer;
 
   @override
   void initState() {
@@ -35,43 +32,49 @@ class _DropdownMenuContentState extends State<DropdownMenuContent> {
 
   @override
   void dispose() {
+    _debounceTimer?.cancel();
     _scrollController.dispose();
     _searchController.dispose();
     super.dispose();
   }
 
   void _onScroll() {
-    final bloc = context.read<SpaceTreeBloc>();
+    final bloc = context.read<SpaceTreeDropdownBloc>();
     final state = bloc.state;
     if (_scrollController.position.pixels >=
         _scrollController.position.maxScrollExtent - 30) {
-      if (state is SpaceTreeState && !state.paginationIsLoading) {
-        bloc.add(PaginationEvent(state.paginationModel, state.communityList));
+      if (state.paginationModel?.hasNext == true &&
+          !state.paginationIsLoading) {
+        bloc.add(PaginationEvent());
       }
     }
   }
 
+  void _handleSearch(String query) {
+    _debounceTimer?.cancel();
+    _debounceTimer = Timer(const Duration(milliseconds: 500), () {
+      context.read<SpaceTreeDropdownBloc>().add(SearchQueryEvent(query));
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return ConstrainedBox(
       constraints: const BoxConstraints(maxHeight: 300),
-      child: BlocBuilder<SpaceTreeBloc, SpaceTreeState>(
+      child: BlocBuilder<SpaceTreeDropdownBloc, SpaceTreeDropdownState>(
         builder: (context, state) {
           final communities = state.searchQuery.isNotEmpty
-              ? state.filteredCommunity
-              : state.communityList;
+              ? state.filteredCommunities
+              : state.communities;
 
           return Column(
             mainAxisSize: MainAxisSize.min,
             children: [
-              // Search bar
               Padding(
                 padding: const EdgeInsets.all(8.0),
                 child: TextFormField(
                   controller: _searchController,
-                  onChanged: (query) {
-                    context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
-                  },
+                  onChanged: _handleSearch,
                   style: const TextStyle(fontSize: 14, color: Colors.black),
                   decoration: InputDecoration(
                     hintText: 'Search for space...',
@@ -85,7 +88,6 @@ class _DropdownMenuContentState extends State<DropdownMenuContent> {
                   ),
                 ),
               ),
-              // Community list
               Expanded(
                 child: ListView.builder(
                   controller: _scrollController,
@@ -121,19 +123,12 @@ class _DropdownMenuContentState extends State<DropdownMenuContent> {
                         ),
                       ),
                       onTap: () {
-                        setState(() {
-                          _searchController.clear();
-                          _searchController.text.isEmpty
-                              ? context
-                                  .read<SpaceTreeBloc>()
-                                  .add(SearchQueryEvent(''))
-                              : context.read<SpaceTreeBloc>().add(
-                                  SearchQueryEvent(_searchController.text));
-                        });
-                        // Future.delayed(const Duration(seconds: 1), () {
+                        context
+                            .read<SpaceTreeDropdownBloc>()
+                            .add(SearchQueryEvent(''));
+
                         widget.onChanged(community.uuid);
                         widget.onClose();
-                        // });
                       },
                     );
                   },

lib/pages/routines/create_new_routines/space_tree_dropdown_bloc.dart

@@ -1,5 +1,9 @@
+import 'dart:async';
 import 'package:flutter_bloc/flutter_bloc.dart';
-
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
+import 'package:syncrow_web/pages/space_tree/model/pagination_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/services/space_mana_api.dart';
 part 'space_tree_dropdown_event.dart';
 part 'space_tree_dropdown_state.dart';
 
@@ -9,19 +13,158 @@ class SpaceTreeDropdownBloc
       : super(SpaceTreeDropdownState(selectedSpaceId: initialId)) {
     on<SpaceTreeDropdownSelectEvent>(_onSelect);
     on<SpaceTreeDropdownResetEvent>(_onReset);
+    on<FetchSpacesEvent>(_fetchSpaces);
+    on<SearchQueryEvent>(_onSearch);
+    on<PaginationEvent>(_onPagination);
+    on<DebouncedSearchEvent>(_onDebouncedSearch);
   }
+  Timer? _debounceTimer;
 
   void _onSelect(
     SpaceTreeDropdownSelectEvent event,
     Emitter<SpaceTreeDropdownState> emit,
   ) {
-    emit(SpaceTreeDropdownState(selectedSpaceId: event.spaceId));
+    final exists = state.communities.any((c) => c.uuid == event.spaceId);
+
+    if (!exists) {
+      final community = state.filteredCommunities.firstWhere(
+        (c) => c.uuid == event.spaceId,
+        orElse: () => CommunityModel(
+            uuid: event.spaceId!,
+            name: 'Loading...',
+            createdAt: DateTime.now(),
+            updatedAt: DateTime.now(),
+            spaces: [],
+            description: ''),
+      );
+
+      emit(state.copyWith(
+        selectedSpaceId: event.spaceId,
+        communities: [...state.communities, community],
+      ));
+    } else {
+      emit(state.copyWith(selectedSpaceId: event.spaceId));
+    }
   }
 
   void _onReset(
     SpaceTreeDropdownResetEvent event,
     Emitter<SpaceTreeDropdownState> emit,
   ) {
-    emit(SpaceTreeDropdownState(selectedSpaceId: event.initialId));
+    emit(state.copyWith(selectedSpaceId: event.initialId));
   }
-}
+
+  Future<void> _fetchSpaces(
+    FetchSpacesEvent event,
+    Emitter<SpaceTreeDropdownState> emit,
+  ) async {
+    if (state.status != SpaceTreeDropdownStatus.initial) return;
+    emit(state.copyWith(status: SpaceTreeDropdownStatus.loading));
+    try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      final paginationModel = await CommunitySpaceManagementApi()
+          .fetchCommunitiesAndSpaces(projectId: projectUuid, page: 1);
+
+      emit(state.copyWith(
+        status: SpaceTreeDropdownStatus.success,
+        communities: paginationModel.communities,
+        filteredCommunities: paginationModel.communities,
+        paginationModel: paginationModel,
+      ));
+    } catch (e) {
+      emit(state.copyWith(
+        status: SpaceTreeDropdownStatus.failure,
+        errorMessage: 'Error loading communities: $e',
+      ));
+    }
+  }
+
+  void _onSearch(
+    SearchQueryEvent event,
+    Emitter<SpaceTreeDropdownState> emit,
+  ) {
+    _debounceTimer?.cancel();
+    _debounceTimer = Timer(const Duration(seconds: 1), () {
+      add(DebouncedSearchEvent(event.searchQuery));
+    });
+  }
+
+  Future<void> _onDebouncedSearch(
+    DebouncedSearchEvent event,
+    Emitter<SpaceTreeDropdownState> emit,
+  ) async {
+    emit(state.copyWith(isSearching: true));
+
+    try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      final paginationModel =
+          await CommunitySpaceManagementApi().fetchCommunitiesAndSpaces(
+        projectId: projectUuid,
+        page: 1,
+        search: event.searchQuery,
+      );
+
+      emit(state.copyWith(
+        filteredCommunities: paginationModel.communities,
+        isSearching: false,
+        searchQuery: event.searchQuery,
+        paginationModel: paginationModel,
+      ));
+    } catch (e) {
+      emit(state.copyWith(
+        isSearching: false,
+        errorMessage: 'Error searching communities: $e',
+      ));
+    }
+  }
+
+  @override
+  Future<void> close() {
+    _debounceTimer?.cancel();
+    return super.close();
+  }
+
+  Future<void> _onPagination(
+    PaginationEvent event,
+    Emitter<SpaceTreeDropdownState> emit,
+  ) async {
+    if (state.paginationIsLoading || state.paginationModel?.hasNext != true) {
+      return;
+    }
+
+    emit(state.copyWith(paginationIsLoading: true));
+
+    try {
+      final nextPage = state.paginationModel!.pageNum;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      final newPagination = await CommunitySpaceManagementApi()
+          .fetchCommunitiesAndSpaces(projectId: projectUuid, page: nextPage);
+
+      final combinedCommunities = [
+        ...state.communities,
+        ...newPagination.communities
+      ];
+      List<CommunityModel> filteredCommunities;
+      if (state.searchQuery.isNotEmpty) {
+        final query = state.searchQuery.toLowerCase();
+        filteredCommunities = combinedCommunities.where((community) {
+          return community.name.toLowerCase().contains(query);
+        }).toList();
+      } else {
+        filteredCommunities = combinedCommunities;
+      }
+
+      emit(state.copyWith(
+        communities: combinedCommunities,
+        filteredCommunities: filteredCommunities,
+        paginationModel: newPagination,
+        paginationIsLoading: false,
+      ));
+    } catch (e) {
+      emit(state.copyWith(
+        paginationIsLoading: false,
+        errorMessage: 'Error loading more communities: $e',
+      ));
+    }
+  }
+}

lib/pages/routines/create_new_routines/space_tree_dropdown_event.dart

@@ -12,4 +12,20 @@ class SpaceTreeDropdownResetEvent extends SpaceTreeDropdownEvent {
   final String? initialId;
 
   SpaceTreeDropdownResetEvent(this.initialId);
-}
+}
+
+class FetchSpacesEvent extends SpaceTreeDropdownEvent {}
+
+class SearchQueryEvent extends SpaceTreeDropdownEvent {
+  final String searchQuery;
+
+  SearchQueryEvent(this.searchQuery);
+}
+
+class DebouncedSearchEvent extends SpaceTreeDropdownEvent {
+  final String searchQuery;
+
+  DebouncedSearchEvent(this.searchQuery);
+}
+
+class PaginationEvent extends SpaceTreeDropdownEvent {}

lib/pages/routines/create_new_routines/space_tree_dropdown_state.dart

@@ -1,7 +1,51 @@
 part of 'space_tree_dropdown_bloc.dart';
 
+enum SpaceTreeDropdownStatus { initial, loading, success, failure }
+
 class SpaceTreeDropdownState {
   final String? selectedSpaceId;
+  final List<CommunityModel> communities;
+  final List<CommunityModel> filteredCommunities;
+  final SpaceTreeDropdownStatus status;
+  final String? errorMessage;
+  final String searchQuery;
+  final bool paginationIsLoading;
+  final PaginationModel? paginationModel;
+  final bool isSearching;
 
-  SpaceTreeDropdownState({this.selectedSpaceId});
+  SpaceTreeDropdownState({
+    this.selectedSpaceId,
+    this.communities = const [],
+    this.filteredCommunities = const [],
+    this.status = SpaceTreeDropdownStatus.initial,
+    this.errorMessage,
+    this.searchQuery = '',
+    this.paginationIsLoading = false,
+    this.paginationModel,
+    this.isSearching = false,
+  });
+
+  SpaceTreeDropdownState copyWith({
+    String? selectedSpaceId,
+    List<CommunityModel>? communities,
+    List<CommunityModel>? filteredCommunities,
+    SpaceTreeDropdownStatus? status,
+    String? errorMessage,
+    String? searchQuery,
+    bool? paginationIsLoading,
+    PaginationModel? paginationModel,
+    bool? isSearching,
+  }) {
+    return SpaceTreeDropdownState(
+      selectedSpaceId: selectedSpaceId ?? this.selectedSpaceId,
+      communities: communities ?? this.communities,
+      filteredCommunities: filteredCommunities ?? this.filteredCommunities,
+      status: status ?? this.status,
+      errorMessage: errorMessage ?? this.errorMessage,
+      searchQuery: searchQuery ?? this.searchQuery,
+      paginationIsLoading: paginationIsLoading ?? this.paginationIsLoading,
+      paginationModel: paginationModel ?? this.paginationModel,
+      isSearching: isSearching ?? this.isSearching,
+    );
+  }
 }

lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart

@@ -118,6 +118,7 @@ class DeviceDialogHelper {
           uniqueCustomId: data['uniqueCustomId'],
           deviceSelectedFunctions: deviceSelectedFunctions,
           device: data['device'],
+          dialogType: dialogType,
         );
       case 'NCPS':
         return FlushPresenceSensor.showFlushFunctionsDialog(

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

@@ -65,7 +65,9 @@ class ACHelper {
                   child: Column(
                     mainAxisSize: MainAxisSize.min,
                     children: [
-                      const DialogHeader('AC Functions'),
+                      DialogHeader(dialogType == 'THEN'
+                          ? 'AC Functions'
+                          : 'AC Conditions'),
                       Expanded(
                         child: Row(
                           crossAxisAlignment: CrossAxisAlignment.stretch,

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

@@ -96,7 +96,9 @@ class _WallPresenceSensorState extends State<FlushPresenceSensor> {
             child: Column(
               mainAxisSize: MainAxisSize.min,
               children: [
-                const DialogHeader('Presence Sensor Condition'),
+                DialogHeader(widget.dialogType == 'THEN'
+                    ? 'Presence Sensor Functions'
+                    : 'Presence Sensor Condition'),
                 Expanded(child: _buildMainContent(context, state)),
                 _buildDialogFooter(context, state),
               ],

lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart

@@ -16,9 +16,10 @@ class GatewayDialog extends StatefulWidget {
     required this.functions,
     required this.deviceSelectedFunctions,
     required this.device,
+    required this.dialogType,
     super.key,
   });
-
+  final String dialogType;
   final String? uniqueCustomId;
   final List<DeviceFunction> functions;
   final List<DeviceFunctionData> deviceSelectedFunctions;
@@ -55,7 +56,9 @@ class _GatewayDialogState extends State<GatewayDialog> {
             child: Column(
               mainAxisSize: MainAxisSize.min,
               children: [
-                const DialogHeader('Gateway Conditions'),
+                DialogHeader(widget.dialogType == 'THEN'
+                    ? 'Gateway Functions'
+                    : 'Gateway Conditions'),
                 Expanded(child: _buildMainContent(context, state)),
                 _buildDialogFooter(context, state),
               ],

lib/pages/routines/widgets/routine_dialogs/gateway/gateway_helper.dart

@@ -14,6 +14,7 @@ abstract final class GatewayHelper {
     required String? uniqueCustomId,
     required List<DeviceFunctionData> deviceSelectedFunctions,
     required AllDevicesModel? device,
+    required String dialogType,
   }) async {
     return showDialog(
       context: context,
@@ -27,6 +28,7 @@ abstract final class GatewayHelper {
           functions: functions,
           deviceSelectedFunctions: deviceSelectedFunctions,
           device: device,
+          dialogType:dialogType,
         ),
       ),
     );

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

@@ -59,7 +59,9 @@ class OneGangSwitchHelper {
                     child: Column(
                       mainAxisSize: MainAxisSize.min,
                       children: [
-                        const DialogHeader('1 Gang Light Switch Condition'),
+                        DialogHeader(dialogType == 'THEN'
+                            ? '1 Gang Light Switch Functions'
+                            : '1 Gang Light Switch Condition'),
                         Expanded(
                           child: Row(
                             children: [
@@ -246,9 +248,9 @@ class OneGangSwitchHelper {
       withSpecialChar: false,
       currentCondition: selectedFunctionData?.condition,
       dialogType: dialogType,
-      sliderRange: (0, 43200), 
+      sliderRange: (0, 43200),
       displayedValue: (initialValue ?? 0).toString(),
-      initialValue: (initialValue ?? 0).toString(), 
+      initialValue: (initialValue ?? 0).toString(),
       onConditionChanged: (condition) {
         context.read<FunctionBloc>().add(
               AddFunction(

lib/pages/routines/widgets/routine_dialogs/power_clamp_enargy/energy_clamp_dialog.dart

@@ -98,7 +98,9 @@ class _EnergyClampDialogState extends State<EnergyClampDialog> {
             child: Column(
               mainAxisSize: MainAxisSize.min,
               children: [
-                const DialogHeader('Energy Clamp Conditions'),
+                DialogHeader(widget.dialogType == 'THEN'
+                    ? 'Energy Clamp Functions'
+                    : 'Energy Clamp Conditions'),
                 Expanded(
                     child: Visibility(
                   visible: _functions.isNotEmpty,

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

@@ -58,7 +58,9 @@ class ThreeGangSwitchHelper {
                     child: Column(
                       mainAxisSize: MainAxisSize.min,
                       children: [
-                        const DialogHeader('3 Gangs Light Switch Condition'),
+                        DialogHeader(dialogType == 'THEN'
+                            ? '3 Gangs Light Switch Functions'
+                            : '3 Gangs Light Switch Condition'),
                         Expanded(
                           child: Row(
                             children: [

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

@@ -59,7 +59,9 @@ class TwoGangSwitchHelper {
                     child: Column(
                       mainAxisSize: MainAxisSize.min,
                       children: [
-                        const DialogHeader('2 Gangs Light Switch Condition'),
+                        DialogHeader(dialogType == 'THEN'
+                            ? '2 Gangs Light Switch Functions'
+                            : '2 Gangs Light Switch Condition'),
                         Expanded(
                           child: Row(
                             children: [

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

@@ -63,7 +63,8 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
   @override
   void initState() {
     super.initState();
-    _wpsFunctions = widget.functions.whereType<WpsFunctions>().where((function) {
+    _wpsFunctions =
+        widget.functions.whereType<WpsFunctions>().where((function) {
       if (widget.dialogType == 'THEN') {
         return function.type == 'THEN' || function.type == 'BOTH';
       }
@@ -97,7 +98,9 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
             child: Column(
               mainAxisSize: MainAxisSize.min,
               children: [
-                const DialogHeader('Presence Sensor Condition'),
+                DialogHeader(widget.dialogType == 'THEN'
+                    ? 'Presence Sensor Functions'
+                    : 'Presence Sensor Condition'),
                 Expanded(child: _buildMainContent(context, state)),
                 _buildDialogFooter(context, state),
               ],

lib/pages/routines/widgets/routine_dialogs/water_heater/water_heater_presence_sensor.dart

@@ -93,7 +93,9 @@ class _WaterHeaterDialogRoutinesState extends State<WaterHeaterDialogRoutines> {
             child: Column(
               mainAxisSize: MainAxisSize.min,
               children: [
-                const DialogHeader('Water Heater Condition'),
+                DialogHeader(widget.dialogType == 'THEN'
+                    ? 'Water Heater Funtions'
+                    : 'Water Heater Condition'),
                 Expanded(child: _buildMainContent(context, state)),
                 _buildDialogFooter(context, state),
               ],

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -1,26 +0,0 @@
-//
-//  Generated file. Do not edit.
-//
-
-import FlutterMacOS
-import Foundation
-
-import firebase_analytics
-import firebase_core
-import firebase_crashlytics
-import firebase_database
-import flutter_secure_storage_macos
-import path_provider_foundation
-import shared_preferences_foundation
-import url_launcher_macos
-
-func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  FirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FirebaseAnalyticsPlugin"))
-  FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
-  FLTFirebaseCrashlyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCrashlyticsPlugin"))
-  FLTFirebaseDatabasePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseDatabasePlugin"))
-  FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
-  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
-  SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
-  UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
-}