Merge branch 'dev' of https://github.com/SyncrowIOT/web into SP-1246

Refactor routine creation UI for improved code organization

lib/pages/device_managment/all_devices/models/factory_reset_model.dart

@@ -2,14 +2,17 @@ import 'package:flutter/foundation.dart';
 
 class FactoryResetModel {
   final List<String> devicesUuid;
+  final String operationType;
 
   FactoryResetModel({
     required this.devicesUuid,
+    this.operationType = "RESET",
   });
 
   factory FactoryResetModel.fromJson(Map<String, dynamic> json) {
     return FactoryResetModel(
       devicesUuid: List<String>.from(json['devicesUuid']),
+      operationType: "RESET",
     );
   }
 

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

@@ -12,77 +12,95 @@ class DeviceSearchFilters extends StatefulWidget {
   State<DeviceSearchFilters> createState() => _DeviceSearchFiltersState();
 }
 
-class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperResponsiveLayout {
-  final TextEditingController communityController = TextEditingController();
-  final TextEditingController unitNameController = TextEditingController();
-  final TextEditingController productNameController = TextEditingController();
+class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
+    with HelperResponsiveLayout {
+  late final TextEditingController _unitNameController;
+  late final TextEditingController _productNameController;
 
   @override
-  Widget build(BuildContext context) {
-    return isExtraLargeScreenSize(context)
-        ? Row(
-            children: [
-              _buildSearchField("Community", communityController, 200),
-              const SizedBox(width: 20),
-              _buildSearchField("Space Name", unitNameController, 200),
-              const SizedBox(width: 20),
-              _buildSearchField("Device Name / Product Name", productNameController, 300),
-              const SizedBox(width: 20),
-              _buildSearchResetButtons(),
-            ],
-          )
-        : Wrap(
-            spacing: 20,
-            runSpacing: 10,
-            children: [
+  void initState() {
+    _unitNameController = TextEditingController();
+    _productNameController = TextEditingController();
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _unitNameController.dispose();
+    _productNameController.dispose();
+    super.dispose();
+  }
+
+  List<Widget> get _widgets => [
         _buildSearchField(
-                "Community",
-                communityController,
+          "Space Name",
+          _unitNameController,
           200,
         ),
-              _buildSearchField("Space Name", unitNameController, 200),
         _buildSearchField(
           "Device Name / Product Name",
-                productNameController,
+          _productNameController,
           300,
         ),
         _buildSearchResetButtons(),
-            ],
+      ];
+
+  @override
+  Widget build(BuildContext context) {
+    if (isExtraLargeScreenSize(context)) {
+      return Row(
+        children: _widgets.map(
+          (e) {
+            return Padding(
+              padding: const EdgeInsets.symmetric(vertical: 10),
+              child: e,
+            );
+          },
+        ).toList(),
       );
     }
 
-  Widget _buildSearchField(String title, TextEditingController controller, double width) {
-    return Container(
-      child: StatefulTextField(
+    return Wrap(
+      spacing: 20,
+      runSpacing: 10,
+      children: _widgets,
+    );
+  }
+
+  Widget _buildSearchField(
+    String title,
+    TextEditingController controller,
+    double width,
+  ) {
+    return StatefulTextField(
       title: title,
       width: width,
       elevation: 2,
       controller: controller,
       onSubmitted: () {
-          context.read<DeviceManagementBloc>().add(SearchDevices(
-              productName: productNameController.text,
-              unitName: unitNameController.text,
-              community: communityController.text,
-              searchField: true));
+        final searchDevicesEvent = SearchDevices(
+          productName: _productNameController.text,
+          unitName: _unitNameController.text,
+          searchField: true,
+        );
+        context.read<DeviceManagementBloc>().add(searchDevicesEvent);
       },
       onChanged: (p0) {},
-      ),
     );
   }
 
   Widget _buildSearchResetButtons() {
     return SearchResetButtons(
-      onSearch: () {
-        context.read<DeviceManagementBloc>().add(SearchDevices(
-            community: communityController.text,
-            unitName: unitNameController.text,
-            productName: productNameController.text,
-            searchField: true));
-      },
+      onSearch: () => context.read<DeviceManagementBloc>().add(
+            SearchDevices(
+              unitName: _unitNameController.text,
+              productName: _productNameController.text,
+              searchField: true,
+            ),
+          ),
       onReset: () {
-        communityController.clear();
-        unitNameController.clear();
-        productNameController.clear();
+        _unitNameController.clear();
+        _productNameController.clear();
         context.read<DeviceManagementBloc>()
           ..add(ResetFilters())
           ..add(FetchDevices(context));

lib/pages/routines/create_new_routines/commu_dropdown.dart

@@ -1,16 +1,16 @@
+import 'package:dropdown_button2/dropdown_button2.dart';
 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_state.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/style.dart';
 
 class CommunityDropdown extends StatelessWidget {
   final String? selectedValue;
   final Function(String?) onChanged;
+  final TextEditingController _searchController = TextEditingController();
 
-  const CommunityDropdown({
+  CommunityDropdown({
     Key? key,
     required this.selectedValue,
     required this.onChanged,
@@ -34,23 +34,26 @@ class CommunityDropdown extends StatelessWidget {
           const SizedBox(height: 8),
           BlocBuilder<SpaceTreeBloc, SpaceTreeState>(
             builder: (context, state) {
-              List<CommunityModel> communities = state.isSearching
-                  ? state.filteredCommunity
-                  : state.communityList;
-
               return SizedBox(
-                child: DropdownButtonFormField<String>(
-                  dropdownColor: ColorsManager.whiteColors,
+                  child: Container(
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(10),
+                ),
+                child: DropdownButton2<String>(
+                  underline: SizedBox(),
                   value: selectedValue,
-                  items: communities.map((community) {
+                  items: state.communityList.map((community) {
                     return DropdownMenuItem<String>(
                       value: community.uuid,
-                      child: Text('   ${community.name}'),
+                      child: Text(
+                        '  ${community.name}',
+                        overflow: TextOverflow.ellipsis,
+                        maxLines: 1,
+                      ),
                     );
                   }).toList(),
                   onChanged: onChanged,
-                  icon: const SizedBox.shrink(),
-                  borderRadius: const BorderRadius.all(Radius.circular(10)),
+                  style: TextStyle(color: Colors.black),
                   hint: Padding(
                     padding: EdgeInsets.only(left: 10),
                     child: Text(
@@ -60,33 +63,96 @@ class CommunityDropdown extends StatelessWidget {
                           ),
                     ),
                   ),
-                  decoration: inputTextFormDeco().copyWith(
-                    contentPadding: EdgeInsets.zero,
-                    suffixIcon: Container(
-                      padding: EdgeInsets.zero,
-                      width: 70,
+                  customButton: Container(
                     height: 45,
+                    decoration: BoxDecoration(
+                      border:
+                          Border.all(color: ColorsManager.textGray, width: 1.0),
+                      borderRadius: BorderRadius.circular(10),
+                    ),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Expanded(
+                          flex: 5,
+                          child: Text(
+                            selectedValue != null
+                                ? "  ${state.communityList.firstWhere((element) => element.uuid == selectedValue).name}"
+                                : '  Please Select',
+                            style:
+                                Theme.of(context).textTheme.bodySmall!.copyWith(
+                                      color: selectedValue != null
+                                          ? Colors.black
+                                          : ColorsManager.textGray,
+                                    ),
+                            overflow: TextOverflow.ellipsis,
+                          ),
+                        ),
+                        Expanded(
+                          child: Container(
                             decoration: BoxDecoration(
                               color: Colors.grey[100],
                               borderRadius: const BorderRadius.only(
-                          bottomRight: Radius.circular(10),
                                 topRight: Radius.circular(10),
-                        ),
-                        border: Border.all(
-                          color: ColorsManager.textGray,
-                          width: 1.0,
+                                bottomRight: Radius.circular(10),
                               ),
                             ),
-                      child: const Center(
-                        child: Icon(
+                            height: 45,
+                            child: const Icon(
                               Icons.keyboard_arrow_down,
                               color: ColorsManager.textGray,
                             ),
                           ),
                         ),
+                      ],
                     ),
                   ),
-              );
+                  dropdownStyleData: DropdownStyleData(
+                    maxHeight: MediaQuery.of(context).size.height * 0.4,
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(10),
+                    ),
+                  ),
+                  dropdownSearchData: DropdownSearchData(
+                    searchController: _searchController,
+                    searchInnerWidgetHeight: 50,
+                    searchInnerWidget: Container(
+                      height: 50,
+                      padding: const EdgeInsets.symmetric(
+                          horizontal: 8, vertical: 4),
+                      child: TextFormField(
+                        style: const TextStyle(color: Colors.black),
+                        controller: _searchController,
+                        decoration: InputDecoration(
+                          isDense: true,
+                          contentPadding: const EdgeInsets.symmetric(
+                            horizontal: 10,
+                            vertical: 12,
+                          ),
+                          hintText: 'Search for community...',
+                          border: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(8),
+                          ),
+                        ),
+                      ),
+                    ),
+                    searchMatchFn: (item, searchValue) {
+                      final communityName =
+                          (item.child as Text).data?.toLowerCase() ?? '';
+                      return communityName
+                          .contains(searchValue.toLowerCase().trim());
+                    },
+                  ),
+                  onMenuStateChange: (isOpen) {
+                    if (!isOpen) {
+                      _searchController.clear();
+                    }
+                  },
+                  menuItemStyleData: const MenuItemStyleData(
+                    height: 40,
+                  ),
+                ),
+              ));
             },
           ),
         ],

lib/pages/routines/create_new_routines/create_new_routines.dart

@@ -62,7 +62,9 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
             mainAxisSize: MainAxisSize.min,
             children: [
               const Divider(),
-              CommunityDropdown(
+              Padding(
+                padding: const EdgeInsets.only(left: 15, right: 15),
+                child: CommunityDropdown(
                   selectedValue: _selectedCommunity,
                   onChanged: (String? newValue) {
                     setState(() {
@@ -74,8 +76,11 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
                     }
                   },
                 ),
-              const SizedBox(height: 16),
-              SpaceDropdown(
+              ),
+              const SizedBox(height: 5),
+              Padding(
+                padding: const EdgeInsets.only(left: 15, right: 15),
+                child: SpaceDropdown(
                   hintMessage: spaceHint,
                   spaces: spaces,
                   selectedValue: _selectedSpace,
@@ -85,6 +90,7 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
                     });
                   },
                 ),
+              ),
               const Divider(),
               Row(
                 mainAxisAlignment: MainAxisAlignment.spaceAround,
@@ -96,7 +102,6 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
                     ),
                     child: TextButton(
                       onPressed: () {
-                      
                         Navigator.of(context).pop();
                       },
                       child: Text(
@@ -139,6 +144,7 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
                   ),
                 ],
               ),
+              SizedBox(height: 10),
             ],
           ),
         );

lib/pages/routines/create_new_routines/space_dropdown.dart

@@ -1,7 +1,8 @@
+import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/style.dart';
+
 
 class SpaceDropdown extends StatelessWidget {
   final List<SpaceModel> spaces;
@@ -33,7 +34,13 @@ class SpaceDropdown extends StatelessWidget {
                 ),
           ),
           const SizedBox(height: 8),
-          DropdownButtonFormField<String>(
+          SizedBox(
+            child: Container(
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(10),
+              ),
+              child: DropdownButton2<String>(
+                underline: const SizedBox(),
                 value: selectedValue,
                 items: spaces.map((space) {
                   return DropdownMenuItem<String>(
@@ -44,23 +51,25 @@ class SpaceDropdown extends StatelessWidget {
                       children: [
                         Text(
                           '   ${space.name}',
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                          style:
+                              Theme.of(context).textTheme.bodyMedium!.copyWith(
                                     fontSize: 12,
                                     color: ColorsManager.blackColor,
                                   ),
                         ),
                         Text(
                           '   ${space.lastThreeParents}',
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                          style:
+                              Theme.of(context).textTheme.bodyMedium!.copyWith(
                                     fontSize: 12,
                                   ),
                         ),
                       ],
-                  ));
+                    ),
+                  );
                 }).toList(),
                 onChanged: onChanged,
-            icon: const SizedBox.shrink(),
-            borderRadius: const BorderRadius.all(Radius.circular(10)),
+                style: TextStyle(color: Colors.black),
                 hint: Padding(
                   padding: const EdgeInsets.only(left: 10),
                   child: Text(
@@ -70,28 +79,66 @@ class SpaceDropdown extends StatelessWidget {
                         ),
                   ),
                 ),
-            decoration: inputTextFormDeco().copyWith(
-              contentPadding: EdgeInsets.zero,
-              suffixIcon: Container(
-                width: 70,
+                customButton: Container(
                   height: 45,
+                  decoration: BoxDecoration(
+                    border:
+                        Border.all(color: ColorsManager.textGray, width: 1.0),
+                    borderRadius: BorderRadius.circular(10),
+                  ),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Expanded(
+                        flex: 5,
+                        child: Padding(
+                          padding: const EdgeInsets.only(left: 10),
+                          child: Text(
+                            selectedValue != null
+                                ? spaces
+                                    .firstWhere((e) => e.uuid == selectedValue)
+                                    .name
+                                : hintMessage,
+                            style:
+                                Theme.of(context).textTheme.bodySmall!.copyWith(
+                                      color: selectedValue != null
+                                          ? Colors.black
+                                          : ColorsManager.textGray,
+                                    ),
+                            overflow: TextOverflow.ellipsis,
+                          ),
+                        ),
+                      ),
+                      Expanded(
+                        child: Container(
                           decoration: BoxDecoration(
                             color: Colors.grey[200],
                             borderRadius: const BorderRadius.only(
-                    bottomRight: Radius.circular(10),
                               topRight: Radius.circular(10),
-                  ),
-                  border: Border.all(
-                    color: ColorsManager.textGray,
-                    width: 1.0,
+                              bottomRight: Radius.circular(10),
                             ),
                           ),
+                          height: 45,
                           child: const Icon(
                             Icons.keyboard_arrow_down,
                             color: ColorsManager.textGray,
                           ),
                         ),
                       ),
+                    ],
+                  ),
+                ),
+                dropdownStyleData: DropdownStyleData(
+                  maxHeight: MediaQuery.of(context).size.height * 0.4,
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(10),
+                  ),
+                ),
+                menuItemStyleData: const MenuItemStyleData(
+                  height: 60,
+                ),
+              ),
+            ),
           ),
         ],
       ),

lib/pages/routines/view/routines_view.dart

@@ -33,8 +33,6 @@ class _RoutinesViewState extends State<RoutinesView> {
         communityID: communityId, spaceID: spaceId));
     await Future.delayed(const Duration(seconds: 1));
     routineBloc.add(const CreateNewRoutineViewEvent(createRoutineView: true));
-    await Future.delayed(const Duration(milliseconds:500));
-    _bloc.add(const ResetSelectedEvent());
   }
 
   @override

lib/pages/space_tree/bloc/space_tree_bloc.dart

@@ -28,11 +28,10 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
     try {
       final updatedCommunity = event.updatedCommunity;
-      final updatedCommunities =
-          List<CommunityModel>.from(state.communityList);
+      final updatedCommunities = List<CommunityModel>.from(state.communityList);
 
-      final index = updatedCommunities
-          .indexWhere((community) => community.uuid == updatedCommunity.uuid);
+      final index =
+          updatedCommunities.indexWhere((community) => community.uuid == updatedCommunity.uuid);
 
       if (index != -1) {
         updatedCommunities[index] = updatedCommunity;
@@ -51,47 +50,41 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       List<CommunityModel> communities =
-          await CommunitySpaceManagementApi().fetchCommunities(projectUuid);
+          await CommunitySpaceManagementApi().fetchCommunities(projectUuid, includeSpaces: true);
 
-      List<CommunityModel> updatedCommunities = await Future.wait(
-        communities.map((community) async {
-          List<SpaceModel> spaces = await CommunitySpaceManagementApi()
-              .getSpaceHierarchy(community.uuid, projectUuid);
+      // List<CommunityModel> updatedCommunities = await Future.wait(
+      //   communities.map((community) async {
+      // List<SpaceModel> spaces =
+      //     await CommunitySpaceManagementApi().getSpaceHierarchy(community.uuid, projectUuid);
 
-          return CommunityModel(
-            uuid: community.uuid,
-            createdAt: community.createdAt,
-            updatedAt: community.updatedAt,
-            name: community.name,
-            description: community.description,
-            spaces: spaces,
-            region: community.region,
-          );
-        }).toList(),
-      );
+      //     return CommunityModel(
+      //       uuid: community.uuid,
+      //       createdAt: community.createdAt,
+      //       updatedAt: community.updatedAt,
+      //       name: community.name,
+      //       description: community.description,
+      //       spaces: spaces,
+      //       region: community.region,
+      //     );
+      //   }).toList(),
+      // );
 
-      emit(state.copyWith(
-          communitiesList: updatedCommunities,
-          expandedCommunity: [],
-          expandedSpaces: []));
+      emit(state.copyWith(communitiesList: communities, expandedCommunity: [], expandedSpaces: []));
     } catch (e) {
       emit(SpaceTreeErrorState('Error loading communities and spaces: $e'));
     }
   }
 
-  void _onCommunityAdded(
-      OnCommunityAdded event, Emitter<SpaceTreeState> emit) async {
+  void _onCommunityAdded(OnCommunityAdded event, Emitter<SpaceTreeState> emit) async {
     final updatedCommunities = List<CommunityModel>.from(state.communityList);
     updatedCommunities.add(event.newCommunity);
 
     emit(state.copyWith(communitiesList: updatedCommunities));
   }
 
-  _onCommunityExpanded(
-      OnCommunityExpanded event, Emitter<SpaceTreeState> emit) async {
+  _onCommunityExpanded(OnCommunityExpanded event, Emitter<SpaceTreeState> emit) async {
     try {
-      List<String> updatedExpandedCommunityList =
-          List.from(state.expandedCommunities);
+      List<String> updatedExpandedCommunityList = List.from(state.expandedCommunities);
 
       if (updatedExpandedCommunityList.contains(event.communityId)) {
         updatedExpandedCommunityList.remove(event.communityId);
@@ -123,19 +116,14 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     }
   }
 
-  _onCommunitySelected(
-      OnCommunitySelected event, Emitter<SpaceTreeState> emit) async {
+  _onCommunitySelected(OnCommunitySelected event, Emitter<SpaceTreeState> emit) async {
     try {
       List<String> updatedSelectedCommunities =
           List.from(state.selectedCommunities.toSet().toList());
-      List<String> updatedSelectedSpaces =
-          List.from(state.selectedSpaces.toSet().toList());
-      List<String> updatedSoldChecks =
-          List.from(state.soldCheck.toSet().toList());
-      Map<String, List<String>> communityAndSpaces =
-          Map.from(state.selectedCommunityAndSpaces);
-      List<String> selectedSpacesInCommunity =
-          communityAndSpaces[event.communityId] ?? [];
+      List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
+      List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
+      Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);
+      List<String> selectedSpacesInCommunity = communityAndSpaces[event.communityId] ?? [];
 
       List<String> childrenIds = _getAllChildIds(event.children);
 
@@ -168,15 +156,11 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     try {
       List<String> updatedSelectedCommunities =
           List.from(state.selectedCommunities.toSet().toList());
-      List<String> updatedSelectedSpaces =
-          List.from(state.selectedSpaces.toSet().toList());
-      List<String> updatedSoldChecks =
-          List.from(state.soldCheck.toSet().toList());
-      Map<String, List<String>> communityAndSpaces =
-          Map.from(state.selectedCommunityAndSpaces);
+      List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
+      List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
+      Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);
 
-      List<String> selectedSpacesInCommunity =
-          communityAndSpaces[event.communityModel.uuid] ?? [];
+      List<String> selectedSpacesInCommunity = communityAndSpaces[event.communityModel.uuid] ?? [];
 
       List<String> childrenIds = _getAllChildIds(event.children);
       bool isChildSelected = false;
@@ -199,11 +183,9 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
           selectedSpacesInCommunity.addAll(childrenIds);
         }
 
-        List<String> spaces =
-            _getThePathToChild(event.communityModel.uuid, event.spaceId);
+        List<String> spaces = _getThePathToChild(event.communityModel.uuid, event.spaceId);
         for (String space in spaces) {
-          if (!updatedSelectedSpaces.contains(space) &&
-              !updatedSoldChecks.contains(space)) {
+          if (!updatedSelectedSpaces.contains(space) && !updatedSoldChecks.contains(space)) {
             updatedSoldChecks.add(space);
           }
         }
@@ -226,9 +208,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
         updatedSoldChecks.remove(event.spaceId);
 
         List<String> parents =
-            _getThePathToChild(event.communityModel.uuid, event.spaceId)
-                .toSet()
-                .toList();
+            _getThePathToChild(event.communityModel.uuid, event.spaceId).toSet().toList();
 
         if (updatedSelectedSpaces.isEmpty) {
           updatedSoldChecks.removeWhere(parents.contains);
@@ -236,8 +216,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
         } else {
           // Check if any parent has selected children
           for (String space in parents) {
-            if (!_noChildrenSelected(
-                event.communityModel, space, updatedSelectedSpaces, parents)) {
+            if (!_noChildrenSelected(event.communityModel, space, updatedSelectedSpaces, parents)) {
               updatedSoldChecks.remove(space);
             }
           }
@@ -262,8 +241,8 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     }
   }
 
-  _noChildrenSelected(CommunityModel community, String spaceId,
-      List<String> selectedSpaces, List<String> parents) {
+  _noChildrenSelected(
+      CommunityModel community, String spaceId, List<String> selectedSpaces, List<String> parents) {
     if (selectedSpaces.contains(spaceId)) {
       return true;
     }
@@ -290,11 +269,10 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
       // Filter communities and expand only those that match the query
       filteredCommunity = communities.where((community) {
-        final containsQueryInCommunity = community.name
-            .toLowerCase()
-            .contains(event.searchQuery.toLowerCase());
-        final containsQueryInSpaces = community.spaces.any(
-            (space) => _containsQuery(space, event.searchQuery.toLowerCase()));
+        final containsQueryInCommunity =
+            community.name.toLowerCase().contains(event.searchQuery.toLowerCase());
+        final containsQueryInSpaces =
+            community.spaces.any((space) => _containsQuery(space, event.searchQuery.toLowerCase()));
 
         return containsQueryInCommunity || containsQueryInSpaces;
       }).toList();
@@ -347,8 +325,8 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
   // Helper function to determine if any space or its children match the search query
   bool _containsQuery(SpaceModel space, String query) {
     final matchesSpace = space.name.toLowerCase().contains(query);
-    final matchesChildren = space.children.any((child) =>
-        _containsQuery(child, query)); // Recursive check for children
+    final matchesChildren =
+        space.children.any((child) => _containsQuery(child, query)); // Recursive check for children
 
     return matchesSpace || matchesChildren;
   }
@@ -371,8 +349,8 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     return children;
   }
 
-  bool _anySpacesSelectedInCommunity(CommunityModel community,
-      List<String> selectedSpaces, List<String> partialCheckedList) {
+  bool _anySpacesSelectedInCommunity(
+      CommunityModel community, List<String> selectedSpaces, List<String> partialCheckedList) {
     bool result = false;
     List<String> ids = _getAllChildIds(community.spaces);
     for (var id in ids) {
@@ -401,8 +379,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     return ids;
   }
 
-  List<String> _getAllParentsIds(
-      SpaceModel child, String spaceId, List<String> listIds) {
+  List<String> _getAllParentsIds(SpaceModel child, String spaceId, List<String> listIds) {
     List<String> ids = listIds;
 
     ids.add(child.uuid ?? '');

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

@@ -262,27 +262,6 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
         return;
       }
 
-      if (communities.isEmpty) {
-        communities = await _api.fetchCommunities(projectUuid);
-
-        List<CommunityModel> updatedCommunities = await Future.wait(
-          communities.map((community) async {
-            List<SpaceModel> spaces = await _fetchSpacesForCommunity(community.uuid);
-            return CommunityModel(
-              uuid: community.uuid,
-              createdAt: community.createdAt,
-              updatedAt: community.updatedAt,
-              name: community.name,
-              description: community.description,
-              spaces: spaces,
-              region: community.region,
-            );
-          }).toList(),
-        );
-
-        communities = updatedCommunities;
-      }
-
       emit(BlankState(
         spaceModels: prevSpaceModels,
         communities: communities,
@@ -540,7 +519,7 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
           List<TagModelUpdate> tagUpdates = [];
 
           List<SpaceModel> matchedSpaces =
-              selectedCommunity.spaces.where((space) => space.uuid == space.uuid).toList();
+              findMatchingSpaces(selectedCommunity.spaces, space.uuid!);
 
           if (matchedSpaces.isEmpty) continue;
 
@@ -696,27 +675,6 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
 
       var prevSpaceModels = await fetchSpaceModels();
 
-      if (communities.isEmpty) {
-        communities = await _api.fetchCommunities(projectUuid);
-
-        List<CommunityModel> updatedCommunities = await Future.wait(
-          communities.map((community) async {
-            List<SpaceModel> spaces = await _fetchSpacesForCommunity(community.uuid);
-            return CommunityModel(
-              uuid: community.uuid,
-              createdAt: community.createdAt,
-              updatedAt: community.updatedAt,
-              name: community.name,
-              description: community.description,
-              spaces: spaces,
-              region: community.region,
-            );
-          }).toList(),
-        );
-
-        communities = updatedCommunities;
-      }
-
       emit(SpaceModelLoaded(
           communities: communities,
           products: _cachedProducts ?? [],
@@ -799,4 +757,18 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
 
     return tagUpdates;
   }
+
+  List<SpaceModel> findMatchingSpaces(List<SpaceModel> spaces, String targetUuid) {
+    List<SpaceModel> matched = [];
+
+    for (var space in spaces) {
+      if (space.uuid == targetUuid) {
+        matched.add(space);
+      }
+      matched
+          .addAll(findMatchingSpaces(space.children, targetUuid)); // Recursively search in children
+    }
+
+    return matched;
+  }
 }

lib/pages/visitor_password/bloc/visitor_password_bloc.dart

@@ -194,9 +194,10 @@ class VisitorPasswordBloc
       emit(DeviceLoaded());
          final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
-      data = await AccessMangApi().fetchDevices(projectUuid);
+      data = await AccessMangApi().fetchDoorLockDeviceList(projectUuid);
       emit(TableLoaded(data));
     } catch (e) {
+      print("error: $e");
       emit(FailedState(e.toString()));
     }
   }

lib/services/access_mang_api.dart

@@ -6,13 +6,23 @@ import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';
 
 class AccessMangApi {
+  AccessMangApi() {
+    _validateEndpoints();
+  }
+
+  void _validateEndpoints() {
+    if (!ApiEndpoints.getDevices.contains('{projectId}')) {
+      throw Exception("Endpoint 'getDevices' must contain '{projectId}' placeholder.");
+    }
+  }
+
   Future<List<PasswordModel>> fetchVisitorPassword(String projectId) async {
     try {
       final response = await HTTPService().get(
-        path: ApiEndpoints.visitorPassword.replaceAll('{projectId}', projectId),
+        path: ApiEndpoints.visitorPassword,
         showServerMessage: true,
         expectedResponseModel: (json) {
-          List<dynamic> jsonData = json;
+          List<dynamic> jsonData = json['data'] ?? [];
           List<PasswordModel> passwordList = jsonData.map((jsonItem) {
             return PasswordModel.fromJson(jsonItem);
           }).toList();
@@ -25,17 +35,22 @@ class AccessMangApi {
     }
   }
 
-  Future fetchDevices(String projectId) async {
+  Future fetchDoorLockDeviceList(String projectId) async {
     try {
+      // The endpoint structure is already validated during initialization.
+
       final response = await HTTPService().get(
         path: ApiEndpoints.getDevices.replaceAll('{projectId}', projectId),
+        queryParameters: {
+          'deviceType': 'DOOR_LOCK',
+        },
         showServerMessage: true,
         expectedResponseModel: (json) {
-          List<dynamic> jsonData = json;
-          List<DeviceModel> passwordList = jsonData.map((jsonItem) {
+          List<dynamic> jsonData = json['data'] ?? [];
+          List<DeviceModel> deviceList = jsonData.map((jsonItem) {
             return DeviceModel.fromJson(jsonItem);
           }).toList();
-          return passwordList;
+          return deviceList;
         },
       );
       return response;
@@ -52,14 +67,15 @@ class AccessMangApi {
       String? invalidTime,
       List<String>? devicesUuid}) async {
     final response = await HTTPService().post(
-      path: ApiEndpoints.sendOnlineOneTime,
+      path: ApiEndpoints.visitorPassword,
       body: jsonEncode({
         "email": email,
         "passwordName": passwordName,
         "password": password,
         "devicesUuid": devicesUuid,
         "effectiveTime": effectiveTime,
-        "invalidTime": invalidTime
+        "invalidTime": invalidTime,
+        "operationType": "ONLINE_ONE_TIME",
       }),
       showServerMessage: true,
       expectedResponseModel: (json) {
@@ -84,13 +100,13 @@ class AccessMangApi {
       "password": password,
       "effectiveTime": effectiveTime,
       "invalidTime": invalidTime,
+      "operationType": "ONLINE_MULTIPLE_TIME",
     };
     if (scheduleList != null) {
-      body["scheduleList"] =
-          scheduleList.map((schedule) => schedule.toJson()).toList();
+      body["scheduleList"] = scheduleList.map((schedule) => schedule.toJson()).toList();
     }
     final response = await HTTPService().post(
-      path: ApiEndpoints.sendOnlineMultipleTime,
+      path: ApiEndpoints.visitorPassword,
       body: jsonEncode(body),
       showServerMessage: true,
       expectedResponseModel: (json) {
@@ -105,8 +121,9 @@ class AccessMangApi {
   Future postOffLineOneTime(
       {String? email, String? passwordName, List<String>? devicesUuid}) async {
     final response = await HTTPService().post(
-      path: ApiEndpoints.sendOffLineOneTime,
+      path: ApiEndpoints.visitorPassword,
       body: jsonEncode({
+        "operationType": "OFFLINE_ONE_TIME",
         "email": email,
         "passwordName": passwordName,
         "devicesUuid": devicesUuid
@@ -126,13 +143,14 @@ class AccessMangApi {
       String? invalidTime,
       List<String>? devicesUuid}) async {
     final response = await HTTPService().post(
-      path: ApiEndpoints.sendOffLineMultipleTime,
+      path: ApiEndpoints.visitorPassword,
       body: jsonEncode({
         "email": email,
         "devicesUuid": devicesUuid,
         "passwordName": passwordName,
         "effectiveTime": effectiveTime,
         "invalidTime": invalidTime,
+        "operationType": "OFFLINE_MULTIPLE_TIME",
       }),
       showServerMessage: true,
       expectedResponseModel: (json) {

lib/services/devices_mang_api.dart

@@ -23,9 +23,8 @@ class DevicesManagementApi {
             : ApiEndpoints.getAllDevices.replaceAll('{projectId}', projectId),
         showServerMessage: true,
         expectedResponseModel: (json) {
-          List<dynamic> jsonData = communityId.isNotEmpty && spaceId.isNotEmpty
-              ? json['data']
-              : json;
+          List<dynamic> jsonData =
+              communityId.isNotEmpty && spaceId.isNotEmpty ? json['data'] : json['data'];
           List<AllDevicesModel> devicesList = jsonData.map((jsonItem) {
             return AllDevicesModel.fromJson(jsonItem);
           }).toList();
@@ -34,7 +33,7 @@ class DevicesManagementApi {
       );
       return response;
     } catch (e) {
-      debugPrint('fetchDevices Error fetching  $e');
+      debugPrint('Error fetching device $e');
       return [];
     }
   }
@@ -45,7 +44,7 @@ class DevicesManagementApi {
         path: ApiEndpoints.getDeviceStatus.replaceAll('{uuid}', uuid),
         showServerMessage: true,
         expectedResponseModel: (json) {
-          return DeviceStatus.fromJson(json);
+          return DeviceStatus.fromJson(json['data']);
         },
       );
       return response;
@@ -62,7 +61,7 @@ class DevicesManagementApi {
   Future getPowerClampInfo(String deviceId) async {
     try {
       final response = await HTTPService().get(
-        path: ApiEndpoints.powerClamp.replaceAll('{powerClampUuid}', deviceId),
+        path: ApiEndpoints.getDeviceStatus.replaceAll('{uuid}', deviceId),
         showServerMessage: true,
         expectedResponseModel: (json) {
           return json;
@@ -100,6 +99,7 @@ class DevicesManagementApi {
         'devicesUuid': uuids,
         'code': code,
         'value': value,
+        'operationType': 'COMMAND',
       };
 
       final response = await HTTPService().post(
@@ -107,7 +107,7 @@ class DevicesManagementApi {
         body: body,
         showServerMessage: true,
         expectedResponseModel: (json) {
-          return (json['successResults'] as List).isNotEmpty;
+           return json['success'] ?? false;
         },
       );
 
@@ -128,7 +128,7 @@ class DevicesManagementApi {
         if (json == null || json.isEmpty || json == []) {
           return devices;
         }
-        for (var device in json['devices']) {
+        for (var device in json['data']['devices']) {
           devices.add(DeviceModel.fromJson(device));
         }
         return devices;
@@ -158,7 +158,7 @@ class DevicesManagementApi {
           .replaceAll('{code}', code),
       showServerMessage: false,
       expectedResponseModel: (json) {
-        return DeviceReport.fromJson(json);
+        return DeviceReport.fromJson(json['data']);
       },
     );
     return response;
@@ -174,7 +174,7 @@ class DevicesManagementApi {
           .replaceAll('{endTime}', to ?? ''),
       showServerMessage: false,
       expectedResponseModel: (json) {
-        return DeviceReport.fromJson(json);
+        return DeviceReport.fromJson(json['data']);
       },
     );
     return response;
@@ -190,7 +190,7 @@ class DevicesManagementApi {
         queryParameters: queryParameters,
         showServerMessage: true,
         expectedResponseModel: (json) {
-          return DeviceStatus.fromJson(json['status']);
+          return DeviceStatus.fromJson(json['data']['status']);
         },
       );
       return response;

lib/services/space_mana_api.dart

@@ -3,27 +3,24 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_m
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/create_subspace_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_response_model.dart';
-import 'package:syncrow_web/pages/spaces_management/space_model/models/create_space_template_body_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_body_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_update_model.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';
-import 'package:syncrow_web/utils/constants/temp_const.dart';
 
 class CommunitySpaceManagementApi {
   // Community Management APIs
   Future<List<CommunityModel>> fetchCommunities(String projectId,
-      {int page = 1}) async {
+      {int page = 1, bool includeSpaces = false}) async {
     try {
       List<CommunityModel> allCommunities = [];
       bool hasNext = true;
 
       while (hasNext) {
         await HTTPService().get(
-          path: ApiEndpoints.getCommunityList
-              .replaceAll('{projectId}', projectId),
-          queryParameters: {'page': page},
+          path: ApiEndpoints.getCommunityList.replaceAll('{projectId}', projectId),
+          queryParameters: {'page': page, 'includeSpaces': includeSpaces},
           expectedResponseModel: (json) {
             try {
               List<dynamic> jsonData = json['data'] ?? [];
@@ -52,8 +49,7 @@ class CommunitySpaceManagementApi {
   Future<CommunityModel?> getCommunityById(String communityId) async {
     try {
       final response = await HTTPService().get(
-        path: ApiEndpoints.getCommunityById
-            .replaceAll('{communityId}', communityId),
+        path: ApiEndpoints.getCommunityById.replaceAll('{communityId}', communityId),
         expectedResponseModel: (json) {
           return CommunityModel.fromJson(json['data']);
         },
@@ -65,8 +61,7 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<CommunityModel?> createCommunity(
-      String name, String description, String projectId) async {
+  Future<CommunityModel?> createCommunity(String name, String description, String projectId) async {
     try {
       final response = await HTTPService().post(
         path: ApiEndpoints.createCommunity.replaceAll('{projectId}', projectId),
@@ -85,8 +80,7 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<bool> updateCommunity(
-      String communityId, String name, String projectId) async {
+  Future<bool> updateCommunity(String communityId, String name, String projectId) async {
     try {
       final response = await HTTPService().put(
         path: ApiEndpoints.updateCommunity
@@ -123,8 +117,7 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<SpacesResponse> fetchSpaces(
-      String communityId, String projectId) async {
+  Future<SpacesResponse> fetchSpaces(String communityId, String projectId) async {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.listSpaces
@@ -150,8 +143,7 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<SpaceModel?> getSpace(
-      String communityId, String spaceId, String projectId) async {
+  Future<SpaceModel?> getSpace(String communityId, String spaceId, String projectId) async {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.getSpace
@@ -262,8 +254,7 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<bool> deleteSpace(
-      String communityId, String spaceId, String projectId) async {
+  Future<bool> deleteSpace(String communityId, String spaceId, String projectId) async {
     try {
       final response = await HTTPService().delete(
         path: ApiEndpoints.deleteSpace
@@ -281,17 +272,15 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<List<SpaceModel>> getSpaceHierarchy(
-      String communityId, String projectId) async {
+  Future<List<SpaceModel>> getSpaceHierarchy(String communityId, String projectId) async {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.getSpaceHierarchy
             .replaceAll('{communityId}', communityId)
             .replaceAll('{projectId}', projectId),
         expectedResponseModel: (json) {
-          final spaceModels = (json['data'] as List)
-              .map((spaceJson) => SpaceModel.fromJson(spaceJson))
-              .toList();
+          final spaceModels =
+              (json['data'] as List).map((spaceJson) => SpaceModel.fromJson(spaceJson)).toList();
 
           return spaceModels;
         },
@@ -302,17 +291,16 @@ class CommunitySpaceManagementApi {
       return [];
     }
   }
-    Future<List<SpaceModel>> getSpaceOnlyWithDevices(
-      {String? communityId, String? projectId}) async {
+
+  Future<List<SpaceModel>> getSpaceOnlyWithDevices({String? communityId, String? projectId}) async {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.spaceOnlyWithDevices
             .replaceAll('{communityId}', communityId!)
             .replaceAll('{projectId}', projectId!),
         expectedResponseModel: (json) {
-          final spaceModels = (json['data'] as List)
-              .map((spaceJson) => SpaceModel.fromJson(spaceJson))
-              .toList();
+          final spaceModels =
+              (json['data'] as List).map((spaceJson) => SpaceModel.fromJson(spaceJson)).toList();
           return spaceModels;
         },
       );

lib/utils/constants/api_const.dart

@@ -9,21 +9,8 @@ abstract class ApiEndpoints {
   static const String sendOtp = '/authentication/user/send-otp';
   static const String verifyOtp = '/authentication/user/verify-otp';
   static const String getRegion = '/region';
-  static const String visitorPassword =
-      '/projects/{projectId}/visitor-password';
-  static const String getDevices =
-      '/projects/{projectId}/visitor-password/devices';
-
-  static const String sendOnlineOneTime =
-      '/visitor-password/temporary-password/online/one-time';
-  static const String sendOnlineMultipleTime =
-      '/visitor-password/temporary-password/online/multiple-time';
-
-//offline Password
-  static const String sendOffLineOneTime =
-      '/visitor-password/temporary-password/offline/one-time';
-  static const String sendOffLineMultipleTime =
-      '/visitor-password/temporary-password/offline/multiple-time';
+  static const String visitorPassword = '/visitor-passwords';
+  static const String getDevices = '/projects/{projectId}/devices';
 
   static const String getUser = '/user/{userUuid}';
 
@@ -32,15 +19,15 @@ abstract class ApiEndpoints {
   static const String getAllDevices = '/projects/{projectId}/devices';
   static const String getSpaceDevices =
       '/projects/{projectId}/communities/{communityUuid}/spaces/{spaceUuid}/devices';
-  static const String getDeviceStatus = '/device/{uuid}/functions/status';
-  static const String getBatchStatus = '/device/status/batch';
+  static const String getDeviceStatus = '/devices/{uuid}/functions/status';
+  static const String getBatchStatus = '/devices/batch';
 
-  static const String deviceControl = '/device/{uuid}/control';
-  static const String deviceBatchControl = '/device/control/batch';
-  static const String gatewayApi = '/device/gateway/{gatewayUuid}/devices';
+  static const String deviceControl = '/devices/{uuid}/command';
+  static const String deviceBatchControl = '/devices/batch';
+  static const String gatewayApi = '/devices/gateway/{gatewayUuid}/devices';
   static const String openDoorLock = '/door-lock/open/{doorLockUuid}';
 
-  static const String getDeviceLogs = '/device/report-logs/{uuid}?code={code}';
+  static const String getDeviceLogs = '/devices/{uuid}/report-logs?code={code}';
 
 // Space Module
   static const String createSpace =
@@ -70,18 +57,13 @@ abstract class ApiEndpoints {
   static const String createUserCommunity =
       '/projects/{projectId}/communities/user';
   static const String getDeviceLogsByDate =
-      '/device/report-logs/{uuid}?code={code}&startTime={startTime}&endTime={endTime}';
+      '/devices/{uuid}/report-logs?code={code}&startTime={startTime}&endTime={endTime}';
 
   static const String scheduleByDeviceId = '/schedule/{deviceUuid}';
-  static const String getScheduleByDeviceId =
-      '/schedule/{deviceUuid}?category={category}';
-  static const String deleteScheduleByDeviceId =
-      '/schedule/{deviceUuid}/{scheduleUuid}';
-  static const String updateScheduleByDeviceId =
-      '/schedule/enable/{deviceUuid}';
-  static const String factoryReset = '/device/factory/reset/{deviceUuid}';
-  static const String powerClamp =
-      '/device/{powerClampUuid}/power-clamp/status';
+  static const String getScheduleByDeviceId = '/schedule/{deviceUuid}?category={category}';
+  static const String deleteScheduleByDeviceId = '/schedule/{deviceUuid}/{scheduleUuid}';
+  static const String updateScheduleByDeviceId = '/schedule/enable/{deviceUuid}';
+  static const String factoryReset = '/devices/batch';
 
   //product
   static const String listProducts = '/products';