save presence state and edit selected value

SP-1271-rework

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

@@ -291,25 +291,25 @@ SOS
         return [
           //IF Functions
           PresenceStateFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
           CurrentDistanceFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
           IlluminanceValueFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
           PresenceTimeFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
 
           //THEN Functions
           FarDetectionFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
           MotionSensitivityFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
           MotionLessSensitivityFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
           IndicatorFunction(
               deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
           NoOneTimeFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
 
           // FarDetectionSliderFunction(
           //     deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN')

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,68 @@ 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 {
+  final _unitNameController = TextEditingController();
+  final _productNameController = TextEditingController();
+
+  List<Widget> get _widgets => [
+        _buildSearchField("Space Name", _unitNameController, 200),
+        _buildSearchField("Device Name / Product Name", _productNameController, 300),
+        _buildSearchResetButtons(),
+      ];
 
   @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: [
-              _buildSearchField(
-                "Community",
-                communityController,
-                200,
-              ),
-              _buildSearchField("Space Name", unitNameController, 200),
-              _buildSearchField(
-                "Device Name / Product Name",
-                productNameController,
-                300,
-              ),
-              _buildSearchResetButtons(),
-            ],
-          );
+    if (isExtraLargeScreenSize(context)) {
+      return Row(
+        children: _widgets
+            .map((e) => Padding(padding: const EdgeInsets.all(10), child: e))
+            .toList(),
+      );
+    }
+
+    return Wrap(
+      spacing: 20,
+      runSpacing: 10,
+      children: _widgets,
+    );
   }
 
-  Widget _buildSearchField(String title, TextEditingController controller, double width) {
-    return Container(
-      child: 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));
-        },
-        onChanged: (p0) {},
-      ),
+  Widget _buildSearchField(
+    String title,
+    TextEditingController controller,
+    double width,
+  ) {
+    return StatefulTextField(
+      title: title,
+      width: width,
+      elevation: 2,
+      controller: controller,
+      onSubmitted: () {
+        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,59 +34,119 @@ 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(
-                      "Please Select",
+                      "  Please Select",
                       style: Theme.of(context).textTheme.bodySmall!.copyWith(
                             color: ColorsManager.textGray,
                           ),
                     ),
                   ),
-                  decoration: inputTextFormDeco().copyWith(
-                    contentPadding: EdgeInsets.zero,
-                    suffixIcon: Container(
-                      padding: EdgeInsets.zero,
-                      width: 70,
-                      height: 45,
-                      decoration: BoxDecoration(
-                        color: Colors.grey[100],
-                        borderRadius: const BorderRadius.only(
-                          bottomRight: Radius.circular(10),
-                          topRight: Radius.circular(10),
+                  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,
+                          ),
                         ),
-                        border: Border.all(
-                          color: ColorsManager.textGray,
-                          width: 1.0,
+                        Expanded(
+                          child: Container(
+                            decoration: BoxDecoration(
+                              color: Colors.grey[100],
+                              borderRadius: const BorderRadius.only(
+                                topRight: Radius.circular(10),
+                                bottomRight: Radius.circular(10),
+                              ),
+                            ),
+                            height: 45,
+                            child: const Icon(
+                              Icons.keyboard_arrow_down,
+                              color: ColorsManager.textGray,
+                            ),
+                          ),
                         ),
-                      ),
-                      child: const Center(
-                        child: 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,28 +62,34 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
             mainAxisSize: MainAxisSize.min,
             children: [
               const Divider(),
-              CommunityDropdown(
-                selectedValue: _selectedCommunity,
-                onChanged: (String? newValue) {
-                  setState(() {
-                    _selectedCommunity = newValue;
-                    _selectedSpace = null;
-                  });
-                  if (newValue != null) {
-                    _fetchSpaces(newValue);
-                  }
-                },
+              Padding(
+                padding: const EdgeInsets.only(left: 15, right: 15),
+                child: CommunityDropdown(
+                  selectedValue: _selectedCommunity,
+                  onChanged: (String? newValue) {
+                    setState(() {
+                      _selectedCommunity = newValue;
+                      _selectedSpace = null;
+                    });
+                    if (newValue != null) {
+                      _fetchSpaces(newValue);
+                    }
+                  },
+                ),
               ),
-              const SizedBox(height: 16),
-              SpaceDropdown(
-                hintMessage: spaceHint,
-                spaces: spaces,
-                selectedValue: _selectedSpace,
-                onChanged: (String? newValue) {
-                  setState(() {
-                    _selectedSpace = newValue;
-                  });
-                },
+              const SizedBox(height: 5),
+              Padding(
+                padding: const EdgeInsets.only(left: 15, right: 15),
+                child: SpaceDropdown(
+                  hintMessage: spaceHint,
+                  spaces: spaces,
+                  selectedValue: _selectedSpace,
+                  onChanged: (String? newValue) {
+                    setState(() {
+                      _selectedSpace = newValue;
+                    });
+                  },
+                ),
               ),
               const Divider(),
               Row(
@@ -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,62 +34,108 @@ class SpaceDropdown extends StatelessWidget {
                 ),
           ),
           const SizedBox(height: 8),
-          DropdownButtonFormField<String>(
-            value: selectedValue,
-            items: spaces.map((space) {
-              return DropdownMenuItem<String>(
-                  value: space.uuid,
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    children: [
-                      Text(
-                        '   ${space.name}',
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              fontSize: 12,
-                              color: ColorsManager.blackColor,
-                            ),
-                      ),
-                      Text(
-                        '   ${space.lastThreeParents}',
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              fontSize: 12,
-                            ),
-                      ),
-                    ],
-                  ));
-            }).toList(),
-            onChanged: onChanged,
-            icon: const SizedBox.shrink(),
-            borderRadius: const BorderRadius.all(Radius.circular(10)),
-            hint: Padding(
-              padding: const EdgeInsets.only(left: 10),
-              child: Text(
-                hintMessage,
-                style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                      color: ColorsManager.textGray,
-                    ),
+          SizedBox(
+            child: Container(
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(10),
               ),
-            ),
-            decoration: inputTextFormDeco().copyWith(
-              contentPadding: EdgeInsets.zero,
-              suffixIcon: Container(
-                width: 70,
-                height: 45,
-                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,
+              child: DropdownButton2<String>(
+                underline: const SizedBox(),
+                value: selectedValue,
+                items: spaces.map((space) {
+                  return DropdownMenuItem<String>(
+                    value: space.uuid,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      children: [
+                        Text(
+                          '   ${space.name}',
+                          style:
+                              Theme.of(context).textTheme.bodyMedium!.copyWith(
+                                    fontSize: 12,
+                                    color: ColorsManager.blackColor,
+                                  ),
+                        ),
+                        Text(
+                          '   ${space.lastThreeParents}',
+                          style:
+                              Theme.of(context).textTheme.bodyMedium!.copyWith(
+                                    fontSize: 12,
+                                  ),
+                        ),
+                      ],
+                    ),
+                  );
+                }).toList(),
+                onChanged: onChanged,
+                style: TextStyle(color: Colors.black),
+                hint: Padding(
+                  padding: const EdgeInsets.only(left: 10),
+                  child: Text(
+                    hintMessage,
+                    style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                          color: ColorsManager.textGray,
+                        ),
                   ),
                 ),
-                child: const Icon(
-                  Icons.keyboard_arrow_down,
-                  color: ColorsManager.textGray,
+                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(
+                              topRight: Radius.circular(10),
+                              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/models/wps/wps_functions.dart

@@ -1,5 +1,3 @@
-
-
 import 'package:syncrow_web/pages/device_managment/wall_sensor/model/wall_sensor_model.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/wps/wps_operational_value.dart';
@@ -195,7 +193,7 @@ class NoOneTimeFunction extends WpsFunctions {
       WpsOperationalValue(
         icon: icon,
         description: 'Custom $unit',
-        value: null, 
+        value: null,
       )
     ];
   }
@@ -216,12 +214,12 @@ class PresenceStateFunction extends WpsFunctions {
         WpsOperationalValue(
           icon: Assets.assetsAcPower,
           description: "None",
-          value: true,
+          value: 'none',
         ),
         WpsOperationalValue(
           icon: Assets.presenceStateIcon,
           description: "Presence",
-          value: false,
+          value: 'presence',
         ),
       ];
 }
@@ -238,7 +236,7 @@ class CurrentDistanceFunction extends WpsFunctions {
         step = 1,
         super(
           type: type,
-          code: 'current_distance',
+          code: 'dis_current',
           operationName: 'Current Distance',
           icon: Assets.currentDistanceIcon,
         );

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/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart

@@ -252,7 +252,7 @@ class _ValueSelector extends StatelessWidget {
   }
 
   bool _isSliderFunction(String function) => [
-        'current_distance',
+        'dis_current',
         'presence_time',
         'illuminance_value'
       ].contains(function);
@@ -382,7 +382,7 @@ class _ValueDisplay extends StatelessWidget {
     switch (functionCode) {
       case 'presence_time':
         return '$intValue Min';
-      case 'current_distance':
+      case 'dis_current':
         return '$intValue CM';
       case 'illuminance_value':
         return '$intValue Lux';
@@ -421,7 +421,7 @@ class _FunctionSlider extends StatelessWidget {
     switch (functionCode) {
       case 'presence_time':
         return (0, 65535);
-      case 'current_distance':
+      case 'dis_current':
         return (1, 600);
       case 'illuminance_value':
         return (0, 10000);

lib/pages/space_tree/bloc/space_tree_bloc.dart

@@ -1,7 +1,10 @@
+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/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_state.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/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
@@ -18,7 +21,10 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     on<ClearCachedData>(_clearCachedData);
     on<OnCommunityAdded>(_onCommunityAdded);
     on<OnCommunityUpdated>(_onCommunityUpdate);
+    on<PaginationEvent>(_fetchPaginationSpaces);
+    on<DebouncedSearchEvent>(_onDebouncedSearch);
   }
+  Timer _timer = Timer(const Duration(microseconds: 0), () {});
 
   void _onCommunityUpdate(
     OnCommunityUpdated event,
@@ -28,17 +34,16 @@ 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;
         emit(state.copyWith(communitiesList: updatedCommunities));
       } else {
-        emit(SpaceTreeErrorState('Community not found in the list.'));
+        emit(const SpaceTreeErrorState('Community not found in the list.'));
       }
     } catch (e) {
       emit(SpaceTreeErrorState('Error updating community: $e'));
@@ -50,48 +55,68 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     try {
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
-      List<CommunityModel> communities =
-          await CommunitySpaceManagementApi().fetchCommunities(projectUuid);
+      PaginationModel paginationModel = await CommunitySpaceManagementApi()
+          .fetchCommunitiesAndSpaces(projectId: projectUuid, page: 1);
 
-      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,
+          communitiesList: paginationModel.communities,
           expandedCommunity: [],
-          expandedSpaces: []));
+          expandedSpaces: [],
+          paginationModel: paginationModel));
     } catch (e) {
       emit(SpaceTreeErrorState('Error loading communities and spaces: $e'));
     }
   }
 
-  void _onCommunityAdded(
-      OnCommunityAdded event, Emitter<SpaceTreeState> emit) async {
+  _fetchPaginationSpaces(PaginationEvent event, Emitter<SpaceTreeState> emit) async {
+    emit(state.copyWith(paginationIsLoading: true));
+    PaginationModel paginationModel = event.paginationModel;
+    List<CommunityModel> communities = List<CommunityModel>.from(event.communities);
+    try {
+      if (paginationModel.hasNext && state.searchQuery.isEmpty) {
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+        paginationModel = await CommunitySpaceManagementApi().fetchCommunitiesAndSpaces(
+            projectId: projectUuid, page: paginationModel.pageNum, search: state.searchQuery);
+
+        communities.addAll(paginationModel.communities);
+      }
+    } catch (e) {
+      emit(SpaceTreeErrorState('Error loading communities and spaces: $e'));
+    }
+    emit(state.copyWith(
+        communitiesList: communities,
+        paginationModel: paginationModel,
+        paginationIsLoading: false));
+  }
+
+  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 +148,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 +188,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 +215,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 +240,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 +248,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 +273,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;
     }
@@ -285,29 +296,52 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
   _onSearch(SearchQueryEvent event, Emitter<SpaceTreeState> emit) async {
     try {
-      List<CommunityModel> communities = List.from(state.communityList);
-      List<CommunityModel> filteredCommunity = [];
+      const duration = Duration(seconds: 1);
+      if (_timer.isActive) {
+        _timer.cancel(); // clear timer
+      }
+      _timer = Timer(duration, () async => add(DebouncedSearchEvent(event.searchQuery)));
+
+      // List<CommunityModel> communities = List.from(state.communityList);
+      // List<CommunityModel> filteredCommunity = [];
 
       // 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()));
+      // filteredCommunity = communities.where((community) {
+      //   final containsQueryInCommunity =
+      //       community.name.toLowerCase().contains(event.searchQuery.toLowerCase());
+      //   final containsQueryInSpaces =
+      //       community.spaces.any((space) => _containsQuery(space, event.searchQuery.toLowerCase()));
 
-        return containsQueryInCommunity || containsQueryInSpaces;
-      }).toList();
+      //   return containsQueryInCommunity || containsQueryInSpaces;
+      // }).toList();
 
-      emit(state.copyWith(
-          filteredCommunity: filteredCommunity,
-          isSearching: event.searchQuery.isNotEmpty,
-          searchQuery: event.searchQuery));
+      // emit(state.copyWith(
+      //     filteredCommunity: filteredCommunity,
+      //     isSearching: event.searchQuery.isNotEmpty,
+      //     searchQuery: event.searchQuery));
     } catch (e) {
       emit(const SpaceTreeErrorState('Something went wrong'));
     }
   }
 
+  _onDebouncedSearch(DebouncedSearchEvent event, Emitter<SpaceTreeState> emit) async {
+    emit(state.copyWith(
+      isSearching: true,
+    ));
+    PaginationModel paginationModel = const PaginationModel.emptyConstructor();
+    try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+      paginationModel = await CommunitySpaceManagementApi()
+          .fetchCommunitiesAndSpaces(projectId: projectUuid, page: 1, search: event.searchQuery);
+    } catch (_) {}
+
+    emit(state.copyWith(
+        filteredCommunity: paginationModel.communities,
+        isSearching: false,
+        searchQuery: event.searchQuery));
+  }
+
   _clearAllData(ClearAllData event, Emitter<SpaceTreeState> emit) async {
     try {
       emit(state.copyWith(
@@ -345,13 +379,13 @@ 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
+  // 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
 
-    return matchesSpace || matchesChildren;
-  }
+  //   return matchesSpace || matchesChildren;
+  // }
 
   List<String> _getAllChildIds(List<SpaceModel> spaces) {
     List<String> ids = [];
@@ -371,8 +405,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 +435,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 ?? '');
@@ -426,6 +459,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
   @override
   Future<void> close() async {
+    _timer.cancel();
     super.close();
   }
 }

lib/pages/space_tree/bloc/space_tree_event.dart

@@ -1,4 +1,5 @@
 import 'package:equatable/equatable.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/pages/spaces_management/all_spaces/model/space_model.dart';
 
@@ -11,6 +12,16 @@ class SpaceTreeEvent extends Equatable {
 
 class InitialEvent extends SpaceTreeEvent {}
 
+class PaginationEvent extends SpaceTreeEvent {
+  final PaginationModel paginationModel;
+  final List<CommunityModel> communities;
+
+  const PaginationEvent(this.paginationModel, this.communities);
+
+  @override
+  List<Object> get props => [paginationModel, communities];
+}
+
 class SearchForSpace extends SpaceTreeEvent {
   final String searchQuery;
 
@@ -69,6 +80,15 @@ class SearchQueryEvent extends SpaceTreeEvent {
   List<Object> get props => [searchQuery];
 }
 
+class DebouncedSearchEvent extends SpaceTreeEvent {
+  final String searchQuery;
+
+  const DebouncedSearchEvent(this.searchQuery);
+
+  @override
+  List<Object> get props => [searchQuery];
+}
+
 class OnCommunityAdded extends SpaceTreeEvent {
   final CommunityModel newCommunity;
   const OnCommunityAdded(this.newCommunity);
@@ -85,7 +105,6 @@ class OnCommunityUpdated extends SpaceTreeEvent {
   List<Object> get props => [updatedCommunity];
 }
 
-
 class ClearAllData extends SpaceTreeEvent {}
 
 class ClearCachedData extends SpaceTreeEvent {}

lib/pages/space_tree/bloc/space_tree_state.dart

@@ -1,4 +1,5 @@
 import 'package:equatable/equatable.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';
 
 class SpaceTreeState extends Equatable {
@@ -12,6 +13,8 @@ class SpaceTreeState extends Equatable {
   final List<String> soldCheck;
   final bool isSearching;
   final String searchQuery;
+  final PaginationModel paginationModel;
+  final bool paginationIsLoading;
 
   const SpaceTreeState(
       {this.communityList = const [],
@@ -23,7 +26,9 @@ class SpaceTreeState extends Equatable {
       this.soldCheck = const [],
       this.isSearching = false,
       this.selectedCommunityAndSpaces = const {},
-      this.searchQuery = ''});
+      this.searchQuery = '',
+      this.paginationModel = const PaginationModel.emptyConstructor(),
+      this.paginationIsLoading = false});
 
   SpaceTreeState copyWith(
       {List<CommunityModel>? communitiesList,
@@ -35,7 +40,9 @@ class SpaceTreeState extends Equatable {
       List<String>? soldCheck,
       bool? isSearching,
       Map<String, List<String>>? selectedCommunityAndSpaces,
-      String? searchQuery}) {
+      String? searchQuery,
+      PaginationModel? paginationModel,
+      bool? paginationIsLoading}) {
     return SpaceTreeState(
         communityList: communitiesList ?? this.communityList,
         filteredCommunity: filteredCommunity ?? this.filteredCommunity,
@@ -46,7 +53,9 @@ class SpaceTreeState extends Equatable {
         soldCheck: soldCheck ?? this.soldCheck,
         isSearching: isSearching ?? this.isSearching,
         selectedCommunityAndSpaces: selectedCommunityAndSpaces ?? this.selectedCommunityAndSpaces,
-        searchQuery: searchQuery ?? this.searchQuery);
+        searchQuery: searchQuery ?? this.searchQuery,
+        paginationModel: paginationModel ?? this.paginationModel,
+        paginationIsLoading: paginationIsLoading ?? this.paginationIsLoading);
   }
 
   @override
@@ -60,7 +69,9 @@ class SpaceTreeState extends Equatable {
         soldCheck,
         isSearching,
         selectedCommunityAndSpaces,
-        searchQuery
+        searchQuery,
+        paginationModel,
+        paginationIsLoading
       ];
 }
 

lib/pages/space_tree/model/pagination_model.dart

@@ -0,0 +1,20 @@
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+
+class PaginationModel {
+  final int pageNum;
+  final bool hasNext;
+  final int size;
+  final List<CommunityModel> communities;
+
+  const PaginationModel(
+      {required this.pageNum,
+      required this.hasNext,
+      required this.size,
+      required this.communities});
+
+  const PaginationModel.emptyConstructor()
+      : pageNum = 1,
+        hasNext = true,
+        size = 10,
+        communities = const [];
+}

lib/pages/space_tree/view/space_tree_view.dart

@@ -34,7 +34,8 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<SpaceTreeBloc, SpaceTreeState>(builder: (context, state) {
-      List<CommunityModel> list = state.isSearching ? state.filteredCommunity : state.communityList;
+      List<CommunityModel> list =
+          state.searchQuery.isNotEmpty ? state.filteredCommunity : state.communityList;
       return Container(
         height: MediaQuery.sizeOf(context).height,
         decoration: widget.isSide == true
@@ -61,7 +62,8 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                         borderRadius: const BorderRadius.all(Radius.circular(20)),
                                         border: Border.all(color: ColorsManager.grayBorder)),
                                     child: TextFormField(
-                                      style: const TextStyle(color: Colors.black),
+                                      style: context.textTheme.bodyMedium
+                                          ?.copyWith(color: ColorsManager.blackColor),
                                       onChanged: (value) {
                                         context.read<SpaceTreeBloc>().add(SearchQueryEvent(value));
                                       },
@@ -94,88 +96,101 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                         ),
                   const SizedBox(height: 16),
                   Expanded(
-                    child: ListView(
-                      shrinkWrap: true,
-                      scrollDirection: Axis.horizontal,
-                      children: [
-                        Container(
-                          width: MediaQuery.sizeOf(context).width * 0.5,
-                          padding: const EdgeInsets.all(8.0),
-                          child: list.isEmpty
-                              ? Center(
-                                  child: Text(
-                                    'No results found',
-                                    style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                          color: ColorsManager.lightGrayColor,
-                                          fontWeight: FontWeight.w400,
+                    child: state.isSearching
+                        ? const Center(child: CircularProgressIndicator())
+                        : ListView(
+                            shrinkWrap: true,
+                            scrollDirection: Axis.horizontal,
+                            children: [
+                              Container(
+                                width: MediaQuery.sizeOf(context).width * 0.5,
+                                padding: const EdgeInsets.all(8.0),
+                                child: list.isEmpty
+                                    ? Center(
+                                        child: Text(
+                                          'No results found',
+                                          style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                                                color: ColorsManager.lightGrayColor,
+                                                fontWeight: FontWeight.w400,
+                                              ),
                                         ),
-                                  ),
-                                )
-                              : Scrollbar(
-                                  scrollbarOrientation: ScrollbarOrientation.left,
-                                  thumbVisibility: true,
-                                  controller: _scrollController,
-                                  child: Padding(
-                                    padding: const EdgeInsets.only(left: 16),
-                                    child: ListView(
-                                      controller: _scrollController,
-                                      shrinkWrap: true,
-                                      children: list
-                                          .map(
-                                            (community) => CustomExpansionTileSpaceTree(
-                                              title: community.name,
-                                              isSelected: state.selectedCommunities
-                                                  .contains(community.uuid),
-                                              isSoldCheck: state.selectedCommunities
-                                                  .contains(community.uuid),
-                                              onExpansionChanged: () {
-                                                context
-                                                    .read<SpaceTreeBloc>()
-                                                    .add(OnCommunityExpanded(community.uuid));
-                                              },
-                                              isExpanded: state.expandedCommunities
-                                                  .contains(community.uuid),
-                                              onItemSelected: () {
-                                                context.read<SpaceTreeBloc>().add(
-                                                    OnCommunitySelected(
-                                                        community.uuid, community.spaces));
-                                                widget.onSelect();
-                                              },
-                                              children: community.spaces.map((space) {
-                                                return CustomExpansionTileSpaceTree(
-                                                  title: space.name,
-                                                  isExpanded:
-                                                      state.expandedSpaces.contains(space.uuid),
-                                                  onItemSelected: () {
-                                                    context.read<SpaceTreeBloc>().add(
-                                                        OnSpaceSelected(community, space.uuid ?? '',
-                                                            space.children));
-                                                    widget.onSelect();
-                                                  },
-                                                  onExpansionChanged: () {
-                                                    context.read<SpaceTreeBloc>().add(
-                                                        OnSpaceExpanded(
-                                                            community.uuid, space.uuid ?? ''));
-                                                  },
-                                                  isSelected:
-                                                      state.selectedSpaces.contains(space.uuid) ||
-                                                          state.soldCheck.contains(space.uuid),
-                                                  isSoldCheck: state.soldCheck.contains(space.uuid),
-                                                  children: _buildNestedSpaces(
-                                                      context, state, space, community),
-                                                );
-                                              }).toList(),
-                                            ),
-                                          )
-                                          .toList(),
-                                    ),
-                                  ),
-                                ),
-                        ),
-                      ],
-                    ),
+                                      )
+                                    : Scrollbar(
+                                        scrollbarOrientation: ScrollbarOrientation.left,
+                                        thumbVisibility: true,
+                                        controller: _scrollController,
+                                        child: NotificationListener(
+                                          onNotification: (notification) {
+                                            if (notification is ScrollEndNotification &&
+                                                notification.metrics.extentAfter == 0) {
+                                              // If the user has reached the end of the list Load more data
+                                              context.read<SpaceTreeBloc>().add(PaginationEvent(
+                                                  state.paginationModel, state.communityList));
+                                            }
+                                            return false;
+                                          },
+                                          child: Padding(
+                                            padding: const EdgeInsets.only(left: 16),
+                                            child: ListView.builder(
+                                                shrinkWrap: true,
+                                                itemCount: list.length,
+                                                controller: _scrollController,
+                                                itemBuilder: (context, index) {
+                                                  return CustomExpansionTileSpaceTree(
+                                                    title: list[index].name,
+                                                    isSelected: state.selectedCommunities
+                                                        .contains(list[index].uuid),
+                                                    isSoldCheck: state.selectedCommunities
+                                                        .contains(list[index].uuid),
+                                                    onExpansionChanged: () {
+                                                      context.read<SpaceTreeBloc>().add(
+                                                          OnCommunityExpanded(list[index].uuid));
+                                                    },
+                                                    isExpanded: state.expandedCommunities
+                                                        .contains(list[index].uuid),
+                                                    onItemSelected: () {
+                                                      context.read<SpaceTreeBloc>().add(
+                                                          OnCommunitySelected(list[index].uuid,
+                                                              list[index].spaces));
+                                                      widget.onSelect();
+                                                    },
+                                                    children: list[index].spaces.map((space) {
+                                                      return CustomExpansionTileSpaceTree(
+                                                        title: space.name,
+                                                        isExpanded: state.expandedSpaces
+                                                            .contains(space.uuid),
+                                                        onItemSelected: () {
+                                                          context.read<SpaceTreeBloc>().add(
+                                                              OnSpaceSelected(
+                                                                  list[index],
+                                                                  space.uuid ?? '',
+                                                                  space.children));
+                                                          widget.onSelect();
+                                                        },
+                                                        onExpansionChanged: () {
+                                                          context.read<SpaceTreeBloc>().add(
+                                                              OnSpaceExpanded(list[index].uuid,
+                                                                  space.uuid ?? ''));
+                                                        },
+                                                        isSelected: state.selectedSpaces
+                                                                .contains(space.uuid) ||
+                                                            state.soldCheck.contains(space.uuid),
+                                                        isSoldCheck:
+                                                            state.soldCheck.contains(space.uuid),
+                                                        children: _buildNestedSpaces(
+                                                            context, state, space, list[index]),
+                                                      );
+                                                    }).toList(),
+                                                  );
+                                                }),
+                                          ),
+                                        ),
+                                      ),
+                              ),
+                            ],
+                          ),
                   ),
-
+                  if (state.paginationIsLoading) const CircularProgressIndicator(),
                   // Expanded(
                   //   child: Padding(
                   //     padding: const EdgeInsets.all(8.0),

lib/pages/spaces_management/all_spaces/model/community_model.dart

@@ -22,11 +22,11 @@ class CommunityModel {
 
   factory CommunityModel.fromJson(Map<String, dynamic> json) {
     return CommunityModel(
-      uuid: json['uuid'],
-      createdAt: DateTime.parse(json['createdAt']),
-      updatedAt: DateTime.parse(json['updatedAt']),
-      name: json['name'],
-      description: json['description'],
+      uuid: json['uuid'] ?? '',
+      createdAt: DateTime.parse(json['createdAt'] ?? ''),
+      updatedAt: DateTime.parse(json['updatedAt'] ?? ''),
+      name: json['name'] ?? '',
+      description: json['description'] ?? '',
       region: json['region'] != null ? RegionModel.fromJson(json['region']) : null,
       spaces: json['spaces'] != null
           ? (json['spaces'] as List).map((space) => SpaceModel.fromJson(space)).toList()

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

@@ -301,11 +301,18 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
               SpaceTemplateModel? spaceModel, List<SubspaceModel>? subspaces, List<Tag>? tags) {
             setState(() {
               // Set the first space in the center or use passed position
-              Offset centerPosition = position ?? ConnectionHelper.getCenterPosition(screenSize);
+              Offset newPosition;
+              if (parentIndex != null) {
+                newPosition =
+                    getBalancedChildPosition(spaces[parentIndex]); // Ensure balanced position
+              } else {
+                newPosition = position ?? ConnectionHelper.getCenterPosition(screenSize);
+              }
+
               SpaceModel newSpace = SpaceModel(
                   name: name,
                   icon: icon,
-                  position: centerPosition,
+                  position: newPosition,
                   isPrivate: false,
                   children: [],
                   status: SpaceStatus.newSpace,
@@ -425,7 +432,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
           Connection(
             startSpace: parent,
             endSpace: child,
-            direction: child.incomingConnection?.direction ?? "down",
+            direction: "down",
           ),
         );
 
@@ -522,6 +529,38 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         );
   }
 
+  Offset getBalancedChildPosition(SpaceModel parent) {
+    int totalSiblings = parent.children.length + 1;
+    double totalWidth = (totalSiblings - 1) * 250; // Horizontal spacing
+    double startX = parent.position.dx - (totalWidth / 2);
+
+    Offset position = Offset(startX + (parent.children.length * 250), parent.position.dy + 180);
+
+    // Check for overlaps & adjust
+    while (spaces.any((s) => (s.position - position).distance < 250)) {
+      position = Offset(position.dx + 250, position.dy);
+    }
+
+    return position;
+  }
+
+  void realignTree() {
+    void updatePositions(SpaceModel node, double x, double y) {
+      node.position = Offset(x, y);
+
+      int numChildren = node.children.length;
+      double childStartX = x - ((numChildren - 1) * 250) / 2;
+
+      for (int i = 0; i < numChildren; i++) {
+        updatePositions(node.children[i], childStartX + (i * 250), y + 180);
+      }
+    }
+
+    if (spaces.isNotEmpty) {
+      updatePositions(spaces.first, spaces.first.position.dx, spaces.first.position.dy);
+    }
+  }
+
   void _onDuplicate(BuildContext parentContext) {
     final screenWidth = MediaQuery.of(context).size.width;
 
@@ -604,29 +643,57 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
 
   void _duplicateSpace(SpaceModel space) {
     final Map<SpaceModel, SpaceModel> originalToDuplicate = {};
-    const double horizontalGap = 200.0;
-    const double verticalGap = 100.0;
+    double horizontalGap = 250.0; // Increased spacing
+    double verticalGap = 180.0; // Adjusted for better visualization
 
-    SpaceModel duplicateRecursive(
-        SpaceModel original, Offset parentPosition, SpaceModel? duplicatedParent) {
-      Offset newPosition = Offset(parentPosition.dx + horizontalGap, original.position.dy);
+    print("🟢 Duplicating: ${space.name}");
 
-      while (spaces.any((s) =>
-          (s.position - newPosition).distance < horizontalGap && s.status != SpaceStatus.deleted)) {
-        newPosition += Offset(horizontalGap, 0);
+    /// **Find a new position ensuring no overlap**
+    Offset getBalancedChildPosition(SpaceModel parent) {
+      int totalSiblings = parent.children.length + 1;
+      double totalWidth = (totalSiblings - 1) * horizontalGap;
+      double startX = parent.position.dx - (totalWidth / 2);
+      Offset position = Offset(
+          startX + (parent.children.length * horizontalGap), parent.position.dy + verticalGap);
+
+      // **Check for overlaps & adjust**
+      while (spaces.any((s) => (s.position - position).distance < horizontalGap)) {
+        position = Offset(position.dx + horizontalGap, position.dy);
       }
 
+      print("🔹 New position for ${parent.name}: (${position.dx}, ${position.dy})");
+      return position;
+    }
+
+    /// **Realign the entire tree after duplication**
+    void realignTree() {
+      void updatePositions(SpaceModel node, double x, double y) {
+        node.position = Offset(x, y);
+        print("✅ Adjusted ${node.name} to (${x}, ${y})");
+
+        int numChildren = node.children.length;
+        double childStartX = x - ((numChildren - 1) * horizontalGap) / 2;
+
+        for (int i = 0; i < numChildren; i++) {
+          updatePositions(node.children[i], childStartX + (i * horizontalGap), y + verticalGap);
+        }
+      }
+
+      if (spaces.isNotEmpty) {
+        print("🔄 Realigning tree...");
+        updatePositions(spaces.first, spaces.first.position.dx, spaces.first.position.dy);
+      }
+    }
+
+    /// **Recursive duplication logic**
+    SpaceModel duplicateRecursive(SpaceModel original, SpaceModel? duplicatedParent) {
+      Offset newPosition = duplicatedParent == null
+          ? Offset(original.position.dx + horizontalGap, original.position.dy)
+          : getBalancedChildPosition(duplicatedParent);
+
       final duplicatedName = SpaceHelper.generateUniqueSpaceName(original.name, spaces);
-
-      final List<SubspaceModel>? duplicatedSubspaces;
-      final List<Tag>? duplicatedTags;
-      if (original.spaceModel != null) {
-        duplicatedTags = [];
-        duplicatedSubspaces = [];
-      } else {
-        duplicatedTags = original.tags;
-        duplicatedSubspaces = original.subspaces;
-      }
+      print(
+          "🟡 Duplicating ${original.name} → ${duplicatedName} at (${newPosition.dx}, ${newPosition.dy})");
 
       final duplicated = SpaceModel(
         name: duplicatedName,
@@ -637,12 +704,10 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         status: SpaceStatus.newSpace,
         parent: duplicatedParent,
         spaceModel: original.spaceModel,
-        subspaces: duplicatedSubspaces,
-        tags: duplicatedTags,
+        subspaces: original.subspaces,
+        tags: original.tags,
       );
 
-      originalToDuplicate[original] = duplicated;
-
       setState(() {
         spaces.add(duplicated);
         _updateNodePosition(duplicated, duplicated.position);
@@ -651,60 +716,42 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
           final newConnection = Connection(
             startSpace: duplicatedParent,
             endSpace: duplicated,
-            direction: original.incomingConnection?.direction ?? 'down',
+            direction: "down",
           );
           connections.add(newConnection);
           duplicated.incomingConnection = newConnection;
           duplicatedParent.addOutgoingConnection(newConnection);
+          duplicatedParent.children.add(duplicated);
+          print("🔗 Created connection: ${duplicatedParent.name} → ${duplicated.name}");
         }
 
-        if (original.parent != null && duplicatedParent == null) {
-          final originalParent = original.parent!;
-          final duplicatedParent = originalToDuplicate[originalParent] ?? originalParent;
-
-          final parentConnection = Connection(
-            startSpace: duplicatedParent,
-            endSpace: duplicated,
-            direction: original.incomingConnection?.direction ?? "down",
-          );
-
-          connections.add(parentConnection);
-          duplicated.incomingConnection = parentConnection;
-          duplicatedParent.addOutgoingConnection(parentConnection);
-        }
+        // **Recalculate the whole tree to avoid overlaps**
+        realignTree();
       });
 
-      final childrenWithDownDirection = original.children
-          .where((child) =>
-              child.incomingConnection?.direction == "down" && child.status != SpaceStatus.deleted)
-          .toList();
-
-      Offset childStartPosition = childrenWithDownDirection.length == 1
-          ? duplicated.position
-          : newPosition + Offset(0, verticalGap);
-
-      for (final child in original.children) {
-        final isDownDirection = child.incomingConnection?.direction == "down" ?? false;
-
-        if (isDownDirection && childrenWithDownDirection.length == 1) {
-          childStartPosition = duplicated.position + Offset(0, verticalGap);
-        } else if (!isDownDirection) {
-          childStartPosition = duplicated.position + Offset(horizontalGap, 0);
-        }
-
-        final duplicatedChild = duplicateRecursive(child, childStartPosition, duplicated);
-        duplicated.children.add(duplicatedChild);
-        childStartPosition += Offset(0, verticalGap);
+      // Recursively duplicate children
+      for (var child in original.children) {
+        duplicateRecursive(child, duplicated);
       }
 
       return duplicated;
     }
 
+    /// **Handle root duplication**
     if (space.parent == null) {
-      duplicateRecursive(space, space.position, null);
+      print("🟠 Duplicating root node: ${space.name}");
+      SpaceModel duplicatedRoot = duplicateRecursive(space, null);
+
+      setState(() {
+        spaces.add(duplicatedRoot);
+        realignTree();
+      });
+
+      print("✅ Root duplication successful: ${duplicatedRoot.name}");
     } else {
-      final duplicatedParent = originalToDuplicate[space.parent!] ?? space.parent!;
-      duplicateRecursive(space, space.position, duplicatedParent);
+      duplicateRecursive(space, space.parent);
     }
+
+    print("🟢 Finished duplication process for: ${space.name}");
   }
 }

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

@@ -47,18 +47,6 @@ class SpaceCardWidget extends StatelessWidget {
           children: [
             buildSpaceContainer(index), // Build the space container
             if (isHovered) ...[
-              PlusButtonWidget(
-                index: index,
-                direction: 'left',
-                offset: const Offset(-21, 20),
-                onButtonTap: onButtonTap,
-              ),
-              PlusButtonWidget(
-                index: index,
-                direction: 'right',
-                offset: const Offset(140, 20),
-                onButtonTap: onButtonTap,
-              ),
               PlusButtonWidget(
                 index: index,
                 direction: 'down',

lib/pages/spaces_management/helper/space_helper.dart

@@ -2,8 +2,7 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_m
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 
 class SpaceHelper {
-  static SpaceModel? findSpaceByUuid(
-      String? uuid, List<CommunityModel> communities) {
+  static SpaceModel? findSpaceByUuid(String? uuid, List<CommunityModel> communities) {
     for (var community in communities) {
       for (var space in community.spaces) {
         if (space.uuid == uuid) return space;
@@ -12,8 +11,7 @@ class SpaceHelper {
     return null;
   }
 
-  static SpaceModel? findSpaceByInternalId(
-      String? internalId, List<SpaceModel> spaces) {
+  static SpaceModel? findSpaceByInternalId(String? internalId, List<SpaceModel> spaces) {
     if (internalId != null) {
       for (var space in spaces) {
         if (space.internalId == internalId) return space;
@@ -23,8 +21,7 @@ class SpaceHelper {
     return null;
   }
 
-  static String generateUniqueSpaceName(
-      String originalName, List<SpaceModel> spaces) {
+  static String generateUniqueSpaceName(String originalName, List<SpaceModel> spaces) {
     final baseName = originalName.replaceAll(RegExp(r'\(\d+\)$'), '').trim();
     int maxNumber = 0;
 
@@ -54,13 +51,10 @@ class SpaceHelper {
 
     return space == selectedSpace ||
         selectedSpace.parent?.internalId == space.internalId ||
-        selectedSpace.children
-                ?.any((child) => child.internalId == space.internalId) ==
-            true;
+        selectedSpace.children?.any((child) => child.internalId == space.internalId) == true;
   }
 
-  static bool isNameConflict(
-      String value, SpaceModel? parentSpace, SpaceModel? editSpace) {
+  static bool isNameConflict(String value, SpaceModel? parentSpace, SpaceModel? editSpace) {
     final siblings = parentSpace?.children
             .where((child) => child.internalId != editSpace?.internalId)
             .toList() ??
@@ -71,19 +65,17 @@ class SpaceHelper {
             .toList() ??
         [];
 
-    final editSiblingConflict =
-        editSiblings.any((child) => child.name == value);
+    final editSiblingConflict = editSiblings.any((child) => child.name == value);
 
     final siblingConflict = siblings.any((child) => child.name == value);
 
-    final parentConflict = parentSpace?.name == value &&
-        parentSpace?.internalId != editSpace?.internalId;
+    final parentConflict =
+        parentSpace?.name == value && parentSpace?.internalId != editSpace?.internalId;
 
-    final parentOfEditSpaceConflict = editSpace?.parent?.name == value &&
-        editSpace?.parent?.internalId != editSpace?.internalId;
+    final parentOfEditSpaceConflict =
+        editSpace?.parent?.name == value && editSpace?.parent?.internalId != editSpace?.internalId;
 
-    final childConflict =
-        editSpace?.children.any((child) => child.name == value) ?? false;
+    final childConflict = editSpace?.children.any((child) => child.name == value) ?? false;
 
     return siblingConflict ||
         parentConflict ||

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,7 @@ class DevicesManagementApi {
             : ApiEndpoints.getAllDevices.replaceAll('{projectId}', projectId),
         showServerMessage: true,
         expectedResponseModel: (json) {
-          List<dynamic> jsonData = communityId.isNotEmpty && spaceId.isNotEmpty
-              ? json['data']
-              : json;
+          List<dynamic> jsonData = json['data'];
           List<AllDevicesModel> devicesList = jsonData.map((jsonItem) {
             return AllDevicesModel.fromJson(jsonItem);
           }).toList();
@@ -34,7 +32,7 @@ class DevicesManagementApi {
       );
       return response;
     } catch (e) {
-      debugPrint('fetchDevices Error fetching  $e');
+      debugPrint('Error fetching device $e');
       return [];
     }
   }
@@ -45,7 +43,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 +60,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;
@@ -93,13 +91,13 @@ class DevicesManagementApi {
     }
   }
 
-  Future<bool> deviceBatchControl(
-      List<String> uuids, String code, dynamic value) async {
+  Future<bool> deviceBatchControl(List<String> uuids, String code, dynamic value) async {
     try {
       final body = {
         'devicesUuid': uuids,
         'code': code,
         'value': value,
+        'operationType': 'COMMAND',
       };
 
       final response = await HTTPService().post(
@@ -107,7 +105,7 @@ class DevicesManagementApi {
         body: body,
         showServerMessage: true,
         expectedResponseModel: (json) {
-          return (json['successResults'] as List).isNotEmpty;
+          return json['success'] ?? false;
         },
       );
 
@@ -118,8 +116,7 @@ class DevicesManagementApi {
     }
   }
 
-  static Future<List<DeviceModel>> getDevicesByGatewayId(
-      String gatewayId) async {
+  static Future<List<DeviceModel>> getDevicesByGatewayId(String gatewayId) async {
     final response = await HTTPService().get(
       path: ApiEndpoints.gatewayApi.replaceAll('{gatewayUuid}', gatewayId),
       showServerMessage: false,
@@ -128,7 +125,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;
@@ -153,12 +150,10 @@ class DevicesManagementApi {
     String code,
   ) async {
     final response = await HTTPService().get(
-      path: ApiEndpoints.getDeviceLogs
-          .replaceAll('{uuid}', uuid)
-          .replaceAll('{code}', code),
+      path: ApiEndpoints.getDeviceLogs.replaceAll('{uuid}', uuid).replaceAll('{code}', code),
       showServerMessage: false,
       expectedResponseModel: (json) {
-        return DeviceReport.fromJson(json);
+        return DeviceReport.fromJson(json['data']);
       },
     );
     return response;
@@ -174,7 +169,7 @@ class DevicesManagementApi {
           .replaceAll('{endTime}', to ?? ''),
       showServerMessage: false,
       expectedResponseModel: (json) {
-        return DeviceReport.fromJson(json);
+        return DeviceReport.fromJson(json['data']);
       },
     );
     return response;
@@ -190,7 +185,7 @@ class DevicesManagementApi {
         queryParameters: queryParameters,
         showServerMessage: true,
         expectedResponseModel: (json) {
-          return DeviceStatus.fromJson(json['status']);
+          return DeviceStatus.fromJson(json['data']['status']);
         },
       );
       return response;
@@ -228,8 +223,7 @@ class DevicesManagementApi {
     }
   }
 
-  Future<bool> addScheduleRecord(
-      ScheduleEntry sendSchedule, String uuid) async {
+  Future<bool> addScheduleRecord(ScheduleEntry sendSchedule, String uuid) async {
     try {
       final response = await HTTPService().post(
         path: ApiEndpoints.scheduleByDeviceId.replaceAll('{deviceUuid}', uuid),
@@ -246,8 +240,7 @@ class DevicesManagementApi {
     }
   }
 
-  Future<List<ScheduleModel>> getDeviceSchedules(
-      String uuid, String category) async {
+  Future<List<ScheduleModel>> getDeviceSchedules(String uuid, String category) async {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.getScheduleByDeviceId
@@ -270,9 +263,7 @@ class DevicesManagementApi {
   }
 
   Future<bool> updateScheduleRecord(
-      {required bool enable,
-      required String uuid,
-      required String scheduleId}) async {
+      {required bool enable, required String uuid, required String scheduleId}) async {
     try {
       final response = await HTTPService().put(
         path: ApiEndpoints.updateScheduleByDeviceId
@@ -293,8 +284,7 @@ class DevicesManagementApi {
     }
   }
 
-  Future<bool> editScheduleRecord(
-      String uuid, ScheduleEntry newSchedule) async {
+  Future<bool> editScheduleRecord(String uuid, ScheduleEntry newSchedule) async {
     try {
       final response = await HTTPService().put(
         path: ApiEndpoints.scheduleByDeviceId.replaceAll('{deviceUuid}', uuid),

lib/services/space_mana_api.dart

@@ -1,29 +1,28 @@
 import 'package:flutter/material.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/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 {
+  Future<List<CommunityModel>> fetchCommunities(String projectId, {int page = 1}) 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,
+          },
           expectedResponseModel: (json) {
             try {
               List<dynamic> jsonData = json['data'] ?? [];
@@ -49,11 +48,42 @@ class CommunitySpaceManagementApi {
     }
   }
 
+  Future<PaginationModel> fetchCommunitiesAndSpaces(
+      {required String projectId, int page = 1, String search = ''}) async {
+    PaginationModel paginationModel = const PaginationModel.emptyConstructor();
+
+    try {
+      bool hasNext = false;
+      await HTTPService().get(
+        path: ApiEndpoints.getCommunityList.replaceAll('{projectId}', projectId),
+        queryParameters: {'page': page, 'includeSpaces': true, 'size': 25, 'search': search},
+        expectedResponseModel: (json) {
+          try {
+            List<dynamic> jsonData = json['data'] ?? [];
+            hasNext = json['hasNext'] ?? false;
+            int currentPage = json['page'] ?? 1;
+            List<CommunityModel> communityList = jsonData.map((jsonItem) {
+              return CommunityModel.fromJson(jsonItem);
+            }).toList();
+
+            page = currentPage + 1;
+            paginationModel = PaginationModel(
+                pageNum: page, hasNext: hasNext, size: 25, communities: communityList);
+            return paginationModel;
+          } catch (_) {
+            hasNext = false;
+            return [];
+          }
+        },
+      );
+    } catch (_) {}
+    return paginationModel;
+  }
+
   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 +95,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 +114,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 +151,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 +177,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 +288,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 +306,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 +325,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';