Merge branch 'dev' into revert-SP-1589

lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart

@@ -46,15 +46,15 @@ class DeviceManagementBloc
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       if (spaceBloc.state.selectedCommunities.isEmpty) {
-        devices = await DevicesManagementApi().fetchDevices('', '', projectUuid);
+        devices = await DevicesManagementApi().fetchDevices(
+          projectUuid,
+        );
       } else {
-        for (final community in spaceBloc.state.selectedCommunities) {
+        for (var community in spaceBloc.state.selectedCommunities) {
           final spacesList =
               spaceBloc.state.selectedCommunityAndSpaces[community] ?? [];
-          for (final space in spacesList) {
+          devices.addAll(await DevicesManagementApi()
-            devices.addAll(await DevicesManagementApi()
+              .fetchDevices(projectUuid, spacesId: spacesList));
-                .fetchDevices(community, space, projectUuid));
-          }
         }
       }
 

lib/pages/routines/bloc/routine_bloc/routine_bloc.dart

@@ -170,45 +170,45 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-Future<void> _onLoadScenes(
+  Future<void> _onLoadScenes(
-    LoadScenes event, Emitter<RoutineState> emit) async {
+      LoadScenes event, Emitter<RoutineState> emit) async {
-  emit(state.copyWith(isLoading: true, errorMessage: null));
+    emit(state.copyWith(isLoading: true, errorMessage: null));
-  List<ScenesModel> scenes = [];
+    List<ScenesModel> scenes = [];
-  try {
+    try {
-    BuildContext context = NavigationService.navigatorKey.currentContext!;
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
-    var createRoutineBloc = context.read<CreateRoutineBloc>();
+      var createRoutineBloc = context.read<CreateRoutineBloc>();
-    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-    if (createRoutineBloc.selectedSpaceId == '' &&
+      if (createRoutineBloc.selectedSpaceId == '' &&
-        createRoutineBloc.selectedCommunityId == '') {
+          createRoutineBloc.selectedCommunityId == '') {
-      var spaceBloc = context.read<SpaceTreeBloc>();
+        var spaceBloc = context.read<SpaceTreeBloc>();
-      for (var communityId in spaceBloc.state.selectedCommunities) {
+        for (var communityId in spaceBloc.state.selectedCommunities) {
-        List<String> spacesList =
+          List<String> spacesList =
-            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+              spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-        for (var spaceId in spacesList) {
+          for (var spaceId in spacesList) {
-          scenes.addAll(
+            scenes.addAll(
-              await SceneApi.getScenes(spaceId, communityId, projectUuid));
+                await SceneApi.getScenes(spaceId, communityId, projectUuid));
+          }
         }
+      } else {
+        scenes.addAll(await SceneApi.getScenes(
+            createRoutineBloc.selectedSpaceId,
+            createRoutineBloc.selectedCommunityId,
+            projectUuid));
       }
-    } else {
-      scenes.addAll(await SceneApi.getScenes(
-          createRoutineBloc.selectedSpaceId,
-          createRoutineBloc.selectedCommunityId,
-          projectUuid));
-    }
 
-    emit(state.copyWith(
+      emit(state.copyWith(
-      scenes: scenes,
+        scenes: scenes,
-      isLoading: false,
-    ));
-  } catch (e) {
-    emit(state.copyWith(
         isLoading: false,
-        loadScenesErrorMessage: 'Failed to load scenes',
+      ));
-        errorMessage: '',
+    } catch (e) {
-        loadAutomationErrorMessage: '',
+      emit(state.copyWith(
-        scenes: scenes));
+          isLoading: false,
+          loadScenesErrorMessage: 'Failed to load scenes',
+          errorMessage: '',
+          loadAutomationErrorMessage: '',
+          scenes: scenes));
+    }
   }
-} 
 
   Future<void> _onLoadAutomation(
       LoadAutomation event, Emitter<RoutineState> emit) async {
@@ -936,16 +936,15 @@ Future<void> _onLoadScenes(
         for (var communityId in spaceBloc.state.selectedCommunities) {
           List<String> spacesList =
               spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-          for (var spaceId in spacesList) {
+
-            devices.addAll(await DevicesManagementApi()
+          devices.addAll(await DevicesManagementApi()
-                .fetchDevices(communityId, spaceId, projectUuid));
+              .fetchDevices(projectUuid, spacesId: spacesList));
-          }
         }
       } else {
         devices.addAll(await DevicesManagementApi().fetchDevices(
-            createRoutineBloc.selectedCommunityId,
+          projectUuid,
-            createRoutineBloc.selectedSpaceId,
+          spacesId: [createRoutineBloc.selectedSpaceId],
-            projectUuid));
+        ));
       }
 
       emit(state.copyWith(isLoading: false, devices: devices));

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

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

lib/services/devices_mang_api.dart

@@ -12,20 +12,16 @@ import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';
 
 class DevicesManagementApi {
-  Future<List<AllDevicesModel>> fetchDevices(
+  Future<List<AllDevicesModel>> fetchDevices(String projectId,
-      String communityId, String spaceId, String projectId) async {
+      {List<String>? spacesId}) async {
     try {
       final response = await HTTPService().get(
-        path: communityId.isNotEmpty && spaceId.isNotEmpty
+        path: ApiEndpoints.getSpaceDevices.replaceAll('{projectId}', projectId),
-            ? ApiEndpoints.getSpaceDevices
+        queryParameters: {if (spacesId != null) 'spaces': spacesId},
-                .replaceAll('{spaceUuid}', spaceId)
-                .replaceAll('{communityUuid}', communityId)
-                .replaceAll('{projectId}', projectId)
-            : ApiEndpoints.getAllDevices.replaceAll('{projectId}', projectId),
         showServerMessage: true,
         expectedResponseModel: (json) {
-          List<dynamic> jsonData = json['data'];
+          final List<dynamic> jsonData = json['data'] as List<dynamic>;
-          List<AllDevicesModel> devicesList = jsonData.map((jsonItem) {
+          final List<AllDevicesModel> devicesList = jsonData.map((jsonItem) {
             return AllDevicesModel.fromJson(jsonItem);
           }).toList();
           return devicesList;
@@ -416,5 +412,4 @@ class DevicesManagementApi {
     );
     return response;
   }
-
 }

lib/utils/constants/api_const.dart

@@ -17,8 +17,7 @@ abstract class ApiEndpoints {
   ////// Devices Management ////////////////
 
   static const String getAllDevices = '/projects/{projectId}/devices';
-  static const String getSpaceDevices =
+  static const String getSpaceDevices = '/projects/{projectId}/devices';
-      '/projects/{projectId}/communities/{communityUuid}/spaces/{spaceUuid}/devices';
   static const String getDeviceStatus = '/devices/{uuid}/functions/status';
   static const String getBatchStatus = '/devices/batch';