fixed endpoint

added back border of tag list

lib/common/dialog_textfield_dropdown.dart

@@ -20,15 +20,22 @@ class DialogTextfieldDropdown extends StatefulWidget {
 
 class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
   bool _isOpen = false;
-  late OverlayEntry _overlayEntry;
+  OverlayEntry? _overlayEntry;
   final TextEditingController _controller = TextEditingController();
-  late List<String> _filteredItems; // Filtered items list
+  final FocusNode _focusNode = FocusNode();
+  List<String> _filteredItems = [];
 
   @override
   void initState() {
     super.initState();
-    _controller.text = widget.initialValue ?? 'Select Tag';
-    _filteredItems = List.from(widget.items); // Initialize filtered items
+    _controller.text = widget.initialValue ?? '';
+    _filteredItems = List.from(widget.items);
+
+    _focusNode.addListener(() {
+      if (!_focusNode.hasFocus) {
+        _closeDropdown();
+      }
+    });
   }
 
   void _toggleDropdown() {
@@ -41,13 +48,16 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
 
   void _openDropdown() {
     _overlayEntry = _createOverlayEntry();
-    Overlay.of(context).insert(_overlayEntry);
+    Overlay.of(context).insert(_overlayEntry!);
     _isOpen = true;
   }
 
   void _closeDropdown() {
-    _overlayEntry.remove();
-    _isOpen = false;
+    if (_isOpen && _overlayEntry != null) {
+      _overlayEntry!.remove();
+      _overlayEntry = null;
+      _isOpen = false;
+    }
   }
 
   OverlayEntry _createOverlayEntry() {
@@ -58,9 +68,7 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
     return OverlayEntry(
       builder: (context) {
         return GestureDetector(
-          onTap: () {
-            _closeDropdown();
-          },
+          onTap: _closeDropdown,
           behavior: HitTestBehavior.translucent,
           child: Stack(
             children: [
@@ -72,40 +80,44 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
                   elevation: 4.0,
                   child: Container(
                     color: ColorsManager.whiteColors,
-                    constraints: const BoxConstraints(
-                      maxHeight: 200.0,
-                    ),
-                    child: ListView.builder(
-                      shrinkWrap: true,
-                      itemCount: _filteredItems.length,
-                      itemBuilder: (context, index) {
-                        final item = _filteredItems[index];
-                        return Container(
-                          decoration: const BoxDecoration(
-                            border: Border(
-                              bottom: BorderSide(
-                                color: ColorsManager.lightGrayBorderColor,
-                                width: 1.0,
+                    constraints: const BoxConstraints(maxHeight: 200.0),
+                    child: StatefulBuilder(
+                      builder: (context, setStateDropdown) {
+                        return ListView.builder(
+                          shrinkWrap: true,
+                          itemCount: _filteredItems.length,
+                          itemBuilder: (context, index) {
+                            final item = _filteredItems[index];
+
+                            return Container(
+                              decoration: const BoxDecoration(
+                                border: Border(
+                                  bottom: BorderSide(
+                                    color: ColorsManager.lightGrayBorderColor,
+                                    width: 1.0,
+                                  ),
+                                ),
                               ),
-                            ),
-                          ),
-                          child: ListTile(
-                            title: Text(item,
-                                style: Theme.of(context)
-                                    .textTheme
-                                    .bodyMedium
-                                    ?.copyWith(
-                                        color: ColorsManager.textPrimaryColor)),
-                            onTap: () {
-                              _controller.text = item;
-                              widget.onSelected(item);
-                              setState(() {
-                                _filteredItems
-                                    .remove(item); // Remove selected item
-                              });
-                              _closeDropdown();
-                            },
-                          ),
+                              child: ListTile(
+                                title: Text(item,
+                                    style: Theme.of(context)
+                                        .textTheme
+                                        .bodyMedium
+                                        ?.copyWith(
+                                            color: ColorsManager
+                                                .textPrimaryColor)),
+                                onTap: () {
+                                  _controller.text = item;
+                                  widget.onSelected(item);
+                                  setState(() {
+                                    _filteredItems
+                                        .remove(item); // Remove selected item
+                                  });
+                                  _closeDropdown();
+                                },
+                              ),
+                            );
+                          },
                         );
                       },
                     ),
@@ -122,7 +134,8 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: _toggleDropdown,
+      onTap: () => FocusScope.of(context).unfocus(),
+      behavior: HitTestBehavior.opaque,
       child: Container(
         padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
         decoration: BoxDecoration(
@@ -135,23 +148,26 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
             Expanded(
               child: TextFormField(
                 controller: _controller,
-                onChanged: (value) {
-                  setState(() {
-                    _filteredItems = widget.items
-                        .where((item) =>
-                            item.toLowerCase().contains(value.toLowerCase()))
-                        .toList(); // Filter items dynamically
-                  });
+                focusNode: _focusNode,
+                onFieldSubmitted: (value) {
                   widget.onSelected(value);
+                  _closeDropdown();
+                },
+                onTapOutside: (event) {
+                  widget.onSelected(_controller.text);
+                  _closeDropdown();
                 },
                 style: Theme.of(context).textTheme.bodyMedium,
                 decoration: const InputDecoration(
-                  hintText: 'Enter or Select tag',
+                  hintText: 'Enter or Select a tag',
                   border: InputBorder.none,
                 ),
               ),
             ),
-            const Icon(Icons.arrow_drop_down),
+            GestureDetector(
+              onTap: _toggleDropdown,
+              child: const Icon(Icons.arrow_drop_down),
+            ),
           ],
         ),
       ),

lib/pages/roles_and_permission/users_page/users_table/view/users_page.dart

@@ -17,7 +17,6 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/style.dart';
-
 class UsersPage extends StatelessWidget {
   UsersPage({super.key});
 

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

@@ -61,8 +61,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     TriggerSwitchTabsEvent event,
     Emitter<RoutineState> emit,
   ) {
-    emit(state.copyWith(
-        routineTab: event.isRoutineTab, createRoutineView: false));
+    emit(state.copyWith(routineTab: event.isRoutineTab, createRoutineView: false));
     add(ResetRoutineState());
     if (event.isRoutineTab) {
       add(const LoadScenes());
@@ -88,8 +87,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     final updatedIfItems = List<Map<String, dynamic>>.from(state.ifItems);
 
     // Find the index of the item in teh current itemsList
-    int index = updatedIfItems.indexWhere(
-        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+    int index =
+        updatedIfItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       updatedIfItems[index] = event.item;
@@ -98,21 +97,18 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
 
     if (event.isTabToRun) {
-      emit(state.copyWith(
-          ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
+      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
     } else {
-      emit(state.copyWith(
-          ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
+      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
     }
   }
 
-  void _onAddToThenContainer(
-      AddToThenContainer event, Emitter<RoutineState> emit) {
+  void _onAddToThenContainer(AddToThenContainer event, Emitter<RoutineState> emit) {
     final currentItems = List<Map<String, dynamic>>.from(state.thenItems);
 
     // Find the index of the item in teh current itemsList
-    int index = currentItems.indexWhere(
-        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+    int index =
+        currentItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       currentItems[index] = event.item;
@@ -123,26 +119,22 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     emit(state.copyWith(thenItems: currentItems));
   }
 
-  void _onAddFunctionsToRoutine(
-      AddFunctionToRoutine event, Emitter<RoutineState> emit) {
+  void _onAddFunctionsToRoutine(AddFunctionToRoutine event, Emitter<RoutineState> emit) {
     try {
       if (event.functions.isEmpty) return;
 
-      List<DeviceFunctionData> selectedFunction =
-          List<DeviceFunctionData>.from(event.functions);
+      List<DeviceFunctionData> selectedFunction = List<DeviceFunctionData>.from(event.functions);
 
       Map<String, List<DeviceFunctionData>> currentSelectedFunctions =
           Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
       if (currentSelectedFunctions.containsKey(event.uniqueCustomId)) {
         List<DeviceFunctionData> currentFunctions =
-            List<DeviceFunctionData>.from(
-                currentSelectedFunctions[event.uniqueCustomId] ?? []);
+            List<DeviceFunctionData>.from(currentSelectedFunctions[event.uniqueCustomId] ?? []);
 
         List<String> functionCode = [];
         for (int i = 0; i < selectedFunction.length; i++) {
           for (int j = 0; j < currentFunctions.length; j++) {
-            if (selectedFunction[i].functionCode ==
-                currentFunctions[j].functionCode) {
+            if (selectedFunction[i].functionCode == currentFunctions[j].functionCode) {
               currentFunctions[j] = selectedFunction[i];
               if (!functionCode.contains(currentFunctions[j].functionCode)) {
                 functionCode.add(currentFunctions[j].functionCode);
@@ -152,15 +144,13 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
 
         for (int i = 0; i < functionCode.length; i++) {
-          selectedFunction
-              .removeWhere((code) => code.functionCode == functionCode[i]);
+          selectedFunction.removeWhere((code) => code.functionCode == functionCode[i]);
         }
 
-        currentSelectedFunctions[event.uniqueCustomId] =
-            List.from(currentFunctions)..addAll(selectedFunction);
+        currentSelectedFunctions[event.uniqueCustomId] = List.from(currentFunctions)
+          ..addAll(selectedFunction);
       } else {
-        currentSelectedFunctions[event.uniqueCustomId] =
-            List.from(event.functions);
+        currentSelectedFunctions[event.uniqueCustomId] = List.from(event.functions);
       }
 
       emit(state.copyWith(selectedFunctions: currentSelectedFunctions));
@@ -169,8 +159,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadScenes(
-      LoadScenes event, Emitter<RoutineState> emit) async {
+  Future<void> _onLoadScenes(LoadScenes event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     List<ScenesModel> scenes = [];
     try {
@@ -179,11 +168,9 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var spaceBloc = context.read<SpaceTreeBloc>();
       for (var communityId in spaceBloc.state.selectedCommunities) {
-        List<String> spacesList =
-            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
         for (var spaceId in spacesList) {
-          scenes.addAll(
-              await SceneApi.getScenes(spaceId, communityId, projectUuid));
+          scenes.addAll(await SceneApi.getScenes(spaceId, communityId, projectUuid));
         }
       }
 
@@ -201,8 +188,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadAutomation(
-      LoadAutomation event, Emitter<RoutineState> emit) async {
+  Future<void> _onLoadAutomation(LoadAutomation event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     List<ScenesModel> automations = [];
 
@@ -210,8 +196,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var spaceBloc = context.read<SpaceTreeBloc>();
       for (var communityId in spaceBloc.state.selectedCommunities) {
-        List<String> spacesList =
-            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
         for (var spaceId in spacesList) {
           automations.addAll(await SceneApi.getAutomation(spaceId));
         }
@@ -230,16 +215,14 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onSearchRoutines(
-      SearchRoutines event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onSearchRoutines(SearchRoutines event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     await Future.delayed(const Duration(seconds: 1));
     emit(state.copyWith(isLoading: false, errorMessage: null));
     emit(state.copyWith(searchText: event.query));
   }
 
-  FutureOr<void> _onAddSelectedIcon(
-      AddSelectedIcon event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onAddSelectedIcon(AddSelectedIcon event, Emitter<RoutineState> emit) {
     emit(state.copyWith(selectedIcon: event.icon));
   }
 
@@ -253,8 +236,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return actions.last['deviceId'] == 'delay';
   }
 
-  Future<void> _onCreateScene(
-      CreateSceneEvent event, Emitter<RoutineState> emit) async {
+  Future<void> _onCreateScene(CreateSceneEvent event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -267,8 +249,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage:
-              'A delay condition cannot be the only or the last action',
+          errorMessage: 'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -344,8 +325,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onCreateAutomation(
-      CreateAutomationEvent event, Emitter<RoutineState> emit) async {
+  Future<void> _onCreateAutomation(CreateAutomationEvent event, Emitter<RoutineState> emit) async {
     try {
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
@@ -366,8 +346,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage:
-              'A delay condition cannot be the only or the last action',
+          errorMessage: 'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         CustomSnackBar.redSnackBar('Cannot have delay as the last action');
@@ -479,21 +458,17 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onRemoveDragCard(
-      RemoveDragCard event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onRemoveDragCard(RemoveDragCard event, Emitter<RoutineState> emit) {
     if (event.isFromThen) {
       final thenItems = List<Map<String, dynamic>>.from(state.thenItems);
-      final selectedFunctions =
-          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
+      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       thenItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
-      emit(state.copyWith(
-          thenItems: thenItems, selectedFunctions: selectedFunctions));
+      emit(state.copyWith(thenItems: thenItems, selectedFunctions: selectedFunctions));
     } else {
       final ifItems = List<Map<String, dynamic>>.from(state.ifItems);
-      final selectedFunctions =
-          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
+      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       ifItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
@@ -504,8 +479,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             isAutomation: false,
             isTabToRun: false));
       } else {
-        emit(state.copyWith(
-            ifItems: ifItems, selectedFunctions: selectedFunctions));
+        emit(state.copyWith(ifItems: ifItems, selectedFunctions: selectedFunctions));
       }
     }
   }
@@ -517,23 +491,18 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     ));
   }
 
-  FutureOr<void> _onEffectiveTimeEvent(
-      EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onEffectiveTimeEvent(EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
     emit(state.copyWith(effectiveTime: event.effectiveTime));
   }
 
-  FutureOr<void> _onSetRoutineName(
-      SetRoutineName event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onSetRoutineName(SetRoutineName event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
       routineName: event.name,
     ));
   }
 
-  (
-    List<Map<String, dynamic>>,
-    List<Map<String, dynamic>>,
-    Map<String, List<DeviceFunctionData>>
-  ) _createCardData(
+  (List<Map<String, dynamic>>, List<Map<String, dynamic>>, Map<String, List<DeviceFunctionData>>)
+      _createCardData(
     List<RoutineAction> actions,
     List<RoutineCondition>? conditions,
     Map<String, List<DeviceFunctionData>> currentFunctions,
@@ -566,8 +535,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
                 'deviceId': condition.entityId,
                 'title': matchingDevice.name ?? condition.entityId,
                 'productType': condition.entityType,
-                'imagePath':
-                    matchingDevice.getDefaultIcon(condition.entityType),
+                'imagePath': matchingDevice.getDefaultIcon(condition.entityType),
               };
 
               final functions = matchingDevice.functions;
@@ -603,11 +571,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       final cardData = {
         'entityId': action.entityId,
         'uniqueCustomId': const Uuid().v4(),
-        'deviceId':
-            action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-        'title': action.actionExecutor == 'delay'
-            ? 'Delay'
-            : (matchingDevice.name ?? 'Device'),
+        'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+        'title': action.actionExecutor == 'delay' ? 'Delay' : (matchingDevice.name ?? 'Device'),
         'productType': action.productType,
         'imagePath': matchingDevice.getDefaultIcon(action.productType),
       };
@@ -650,8 +615,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return (thenItems, ifItems, currentFunctions);
   }
 
-  Future<void> _onGetSceneDetails(
-      GetSceneDetails event, Emitter<RoutineState> emit) async {
+  Future<void> _onGetSceneDetails(GetSceneDetails event, Emitter<RoutineState> emit) async {
     try {
       emit(state.copyWith(
         isLoading: true,
@@ -699,12 +663,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         if (!deviceCards.containsKey(deviceId)) {
           deviceCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId':
-                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-            'uniqueCustomId':
-                action.type == 'automation' || action.actionExecutor == 'delay'
-                    ? const Uuid().v4()
-                    : action.entityId,
+            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'uniqueCustomId': action.type == 'automation' || action.actionExecutor == 'delay'
+                ? const Uuid().v4()
+                : action.entityId,
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
                 : action.type == 'automation'
@@ -739,8 +701,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             ),
           );
           // emit(state.copyWith(automationActionExecutor: action.actionExecutor));
-        } else if (action.executorProperty != null &&
-            action.actionExecutor != 'delay') {
+        } else if (action.executorProperty != null && action.actionExecutor != 'delay') {
           if (!updatedFunctions.containsKey(uniqueCustomId)) {
             updatedFunctions[uniqueCustomId] = [];
           }
@@ -812,8 +773,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onResetRoutineState(
-      ResetRoutineState event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onResetRoutineState(ResetRoutineState event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
         ifItems: [],
         thenItems: [],
@@ -837,20 +797,17 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         createRoutineView: false));
   }
 
-  FutureOr<void> _deleteScene(
-      DeleteScene event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _deleteScene(DeleteScene event, Emitter<RoutineState> emit) async {
     try {
       emit(state.copyWith(isLoading: true));
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var spaceBloc = context.read<SpaceTreeBloc>();
       if (state.isTabToRun) {
         await SceneApi.deleteScene(
-            unitUuid: spaceBloc.state.selectedSpaces[0],
-            sceneId: state.sceneId ?? '');
+            unitUuid: spaceBloc.state.selectedSpaces[0], sceneId: state.sceneId ?? '');
       } else {
         await SceneApi.deleteAutomation(
-            unitUuid: spaceBloc.state.selectedSpaces[0],
-            automationId: state.automationId ?? '');
+            unitUuid: spaceBloc.state.selectedSpaces[0], automationId: state.automationId ?? '');
       }
 
       add(const LoadScenes());
@@ -879,8 +836,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   //   }
   // }
 
-  FutureOr<void> _fetchDevices(
-      FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _fetchDevices(FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true));
     try {
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
@@ -890,11 +846,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var spaceBloc = context.read<SpaceTreeBloc>();
       for (var communityId in spaceBloc.state.selectedCommunities) {
-        List<String> spacesList =
-            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
         for (var spaceId in spacesList) {
-          devices.addAll(await DevicesManagementApi()
-              .fetchDevices(communityId, spaceId, projectUuid));
+          devices
+              .addAll(await DevicesManagementApi().fetchDevices(communityId, spaceId, projectUuid));
         }
       }
 
@@ -904,8 +859,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateScene(
-      UpdateScene event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onUpdateScene(UpdateScene event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -919,8 +873,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage:
-              'A delay condition cannot be the only or the last action',
+          errorMessage: 'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -973,8 +926,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result =
-          await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
+      final result = await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
       if (result['success']) {
         add(ResetRoutineState());
         add(const LoadScenes());
@@ -993,8 +945,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateAutomation(
-      UpdateAutomation event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onUpdateAutomation(UpdateAutomation event, Emitter<RoutineState> emit) async {
     try {
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
@@ -1105,8 +1056,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result = await SceneApi.updateAutomation(
-          createAutomationModel, state.automationId ?? '');
+      final result =
+          await SceneApi.updateAutomation(createAutomationModel, state.automationId ?? '');
 
       if (result['success']) {
         add(ResetRoutineState());
@@ -1139,8 +1090,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         thenItems: [],
       ));
 
-      final automationDetails =
-          await SceneApi.getAutomationDetails(event.automationId);
+      final automationDetails = await SceneApi.getAutomationDetails(event.automationId);
 
       final Map<String, Map<String, dynamic>> deviceIfCards = {};
       final Map<String, Map<String, dynamic>> deviceThenCards = {};
@@ -1208,15 +1158,13 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           ),
         );
 
-        final deviceId = action.actionExecutor == 'delay'
-            ? '${action.entityId}_delay'
-            : action.entityId;
+        final deviceId =
+            action.actionExecutor == 'delay' ? '${action.entityId}_delay' : action.entityId;
 
         if (!deviceThenCards.containsKey(deviceId)) {
           deviceThenCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId':
-                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
             'uniqueCustomId': const Uuid().v4(),
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
@@ -1247,8 +1195,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           updatedFunctions[uniqueCustomId] = [];
         }
 
-        if (action.executorProperty != null &&
-            action.actionExecutor != 'delay') {
+        if (action.executorProperty != null && action.actionExecutor != 'delay') {
           final functions = matchingDevice.functions;
           final functionCode = action.executorProperty!.functionCode;
           for (var function in functions) {
@@ -1290,14 +1237,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
       }
 
-      final ifItems = deviceIfCards.values
-          .where((card) => card['type'] == 'condition')
-          .toList();
+      final ifItems = deviceIfCards.values.where((card) => card['type'] == 'condition').toList();
       final thenItems = deviceThenCards.values
           .where((card) =>
-              card['type'] == 'action' ||
-              card['type'] == 'automation' ||
-              card['type'] == 'scene')
+              card['type'] == 'action' || card['type'] == 'automation' || card['type'] == 'scene')
           .toList();
 
       emit(state.copyWith(

lib/pages/space_tree/bloc/space_tree_bloc.dart

@@ -37,8 +37,8 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
       List<CommunityModel> updatedCommunities = await Future.wait(
         communities.map((community) async {
-          List<SpaceModel> spaces = await CommunitySpaceManagementApi()
-              .getSpaceHierarchy(community.uuid, projectUuid);
+          List<SpaceModel> spaces =
+              await CommunitySpaceManagementApi().getSpaceHierarchy(community.uuid, projectUuid);
 
           return CommunityModel(
             uuid: community.uuid,
@@ -53,19 +53,15 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       );
 
       emit(state.copyWith(
-          communitiesList: updatedCommunities,
-          expandedCommunity: [],
-          expandedSpaces: []));
+          communitiesList: updatedCommunities, expandedCommunity: [], expandedSpaces: []));
     } catch (e) {
       emit(SpaceTreeErrorState('Error loading communities and spaces: $e'));
     }
   }
 
-  _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);
@@ -97,17 +93,13 @@ 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> 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> childrenIds = _getAllChildIds(event.children);
 
@@ -138,12 +130,9 @@ 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> childrenIds = _getAllChildIds(event.children);
       bool isChildSelected = false;
@@ -163,11 +152,9 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
           updatedSelectedSpaces.addAll(childrenIds);
         }
 
-        List<String> spaces =
-            _getThePathToChild(event.communityId, event.spaceId);
+        List<String> spaces = _getThePathToChild(event.communityId, event.spaceId);
         for (String space in spaces) {
-          if (!updatedSelectedSpaces.contains(space) &&
-              !updatedSoldChecks.contains(space)) {
+          if (!updatedSelectedSpaces.contains(space) && !updatedSoldChecks.contains(space)) {
             updatedSoldChecks.add(space);
           }
         }
@@ -186,8 +173,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
         }
         updatedSoldChecks.remove(event.spaceId);
 
-        List<String> parents =
-            _getThePathToChild(event.communityId, event.spaceId);
+        List<String> parents = _getThePathToChild(event.communityId, event.spaceId);
         if (!_parentSelected(parents, updatedSelectedSpaces)) {
           updatedSoldChecks.removeWhere(parents.contains);
         }
@@ -226,11 +212,10 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
       // Filter communities and expand only those that match the query
       filteredCommunity = communities.where((community) {
-        final containsQueryInCommunity = community.name
-            .toLowerCase()
-            .contains(event.searchQuery.toLowerCase());
-        final containsQueryInSpaces = community.spaces.any(
-            (space) => _containsQuery(space, event.searchQuery.toLowerCase()));
+        final containsQueryInCommunity =
+            community.name.toLowerCase().contains(event.searchQuery.toLowerCase());
+        final containsQueryInSpaces =
+            community.spaces.any((space) => _containsQuery(space, event.searchQuery.toLowerCase()));
 
         return containsQueryInCommunity || containsQueryInSpaces;
       }).toList();
@@ -247,8 +232,8 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
   // Helper function to determine if any space or its children match the search query
   bool _containsQuery(SpaceModel space, String query) {
     final matchesSpace = space.name.toLowerCase().contains(query);
-    final matchesChildren = space.children.any((child) =>
-        _containsQuery(child, query)); // Recursive check for children
+    final matchesChildren =
+        space.children.any((child) => _containsQuery(child, query)); // Recursive check for children
 
     return matchesSpace || matchesChildren;
   }
@@ -262,15 +247,14 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     return ids;
   }
 
-  bool _anySpacesSelectedInCommunity(String communityId,
-      List<String> selectedSpaces, List<String> partialCheckedList) {
+  bool _anySpacesSelectedInCommunity(
+      String communityId, List<String> selectedSpaces, List<String> partialCheckedList) {
     bool result = false;
     for (var community in state.communityList) {
       if (community.uuid == communityId) {
         List<String> ids = _getAllChildIds(community.spaces);
         for (var id in ids) {
-          result =
-              selectedSpaces.contains(id) || partialCheckedList.contains(id);
+          result = selectedSpaces.contains(id) || partialCheckedList.contains(id);
           if (result) {
             return result;
           }
@@ -297,8 +281,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     return ids;
   }
 
-  List<String> _getAllParentsIds(
-      SpaceModel child, String spaceId, List<String> listIds) {
+  List<String> _getAllParentsIds(SpaceModel child, String spaceId, List<String> listIds) {
     List<String> ids = listIds;
 
     ids.add(child.uuid ?? '');

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

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
+import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
@@ -75,16 +75,11 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
     return Stack(
       clipBehavior: Clip.none,
       children: [
-        Row(
-          children: [
-            SidebarWidget(
-              communities: widget.communities,
-              selectedSpaceUuid: widget.selectedSpace?.uuid ??
-                  widget.selectedCommunity?.uuid ??
-                  '',
-            ),
-            widget.shouldNavigateToSpaceModelPage
-                ? Expanded(
+        widget.shouldNavigateToSpaceModelPage
+            ? Row(
+                children: [
+                  SizedBox(width: 300, child: SpaceTreeView(onSelect: () {})),
+                  Expanded(
                     child: BlocProvider(
                       create: (context) => SpaceModelBloc(
                         api: SpaceModelManagementApi(),
@@ -95,8 +90,17 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
                         onSpaceModelsUpdated: _onSpaceModelsUpdated,
                       ),
                     ),
-                  )
-                : CommunityStructureArea(
+                  ),
+                ],
+              )
+            : Row(
+                children: [
+                  SidebarWidget(
+                    communities: widget.communities,
+                    selectedSpaceUuid:
+                        widget.selectedSpace?.uuid ?? widget.selectedCommunity?.uuid ?? '',
+                  ),
+                  CommunityStructureArea(
                     selectedCommunity: widget.selectedCommunity,
                     selectedSpace: widget.selectedSpace,
                     spaces: widget.selectedCommunity?.spaces ?? [],
@@ -104,8 +108,8 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
                     communities: widget.communities,
                     spaceModels: _spaceModels,
                   ),
-          ],
-        ),
+                ],
+              ),
         const GradientCanvasBorderWidget(),
       ],
     );

lib/services/user_permission.dart

@@ -14,7 +14,7 @@ class UserPermissionApi {
   Future<List<RolesUserModel>> fetchUsers(String projectId) async {
     try {
       final response = await _httpService.get(
-        path: ApiEndpoints.getUsers.replaceAll('{projectUuid}', projectId),
+        path: ApiEndpoints.getUsers.replaceAll('{projectId}', projectId),
         showServerMessage: true,
         expectedResponseModel: (json) {
           debugPrint('fetchUsers Response: $json');
@@ -34,9 +34,8 @@ class UserPermissionApi {
       path: ApiEndpoints.roleTypes,
       showServerMessage: true,
       expectedResponseModel: (json) {
-        final List<RoleTypeModel> fetchedRoles = (json['data'] as List)
-            .map((item) => RoleTypeModel.fromJson(item))
-            .toList();
+        final List<RoleTypeModel> fetchedRoles =
+            (json['data'] as List).map((item) => RoleTypeModel.fromJson(item)).toList();
         return fetchedRoles;
       },
     );
@@ -48,9 +47,7 @@ class UserPermissionApi {
       path: ApiEndpoints.permission.replaceAll("roleUuid", roleUuid),
       showServerMessage: true,
       expectedResponseModel: (json) {
-        return (json as List)
-            .map((data) => PermissionOption.fromJson(data))
-            .toList();
+        return (json as List).map((data) => PermissionOption.fromJson(data)).toList();
       },
     );
     return response ?? [];
@@ -195,14 +192,10 @@ class UserPermissionApi {
 
   Future<bool> changeUserStatusById(userUuid, status, String projectUuid) async {
     try {
-      Map<String, dynamic> bodya = {
-        "disable": status,
-        "projectUuid": projectUuid
-      };
+      Map<String, dynamic> bodya = {"disable": status, "projectUuid": projectUuid};
 
       final response = await _httpService.put(
-        path: ApiEndpoints.changeUserStatus
-            .replaceAll("{invitedUserUuid}", userUuid),
+        path: ApiEndpoints.changeUserStatus.replaceAll("{invitedUserUuid}", userUuid),
         body: bodya,
         expectedResponseModel: (json) {
           return json['success'];

lib/utils/constants/api_const.dart

@@ -1,7 +1,7 @@
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 
 abstract class ApiEndpoints {
-  static const String projectUuid = "0e62577c-06fa-41b9-8a92-99a21fbaf51c";
+  static const String projectUuid = "bcda711e-9fc2-4168-a05e-171b4026d1ff";
   static String baseUrl = dotenv.env['BASE_URL'] ?? '';
   static const String signUp = '/authentication/user/signup';
   static const String login = '/authentication/user/login';
@@ -25,7 +25,7 @@ abstract class ApiEndpoints {
 
   ////// Devices Management ////////////////
 
-  static const String getAllDevices = '/projects/{projectId}/device';
+  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';
@@ -95,8 +95,8 @@ abstract class ApiEndpoints {
   static const String inviteUser = '/invite-user';
 
   static const String checkEmail = '/invite-user/check-email';
-  static const String getUsers = '/projects/{projectUuid}/user';
-  static const String getUserById = '/projects/{projectUuid}/user/{userUuid}';
+  static const String getUsers = '/projects/{projectId}/user';
+  static const String getUserById = '/projects/{projectId}/user/{userUuid}';
   static const String editUser = '/invite-user/{inviteUserUuid}';
   static const String deleteUser = '/invite-user/{inviteUserUuid}';
   static const String changeUserStatus = '/invite-user/{invitedUserUuid}/disable';

lib/utils/constants/temp_const.dart

@@ -1,3 +1,3 @@
 class TempConst {
-  static const projectId = '0e62577c-06fa-41b9-8a92-99a21fbaf51c';
+  static const projectId = 'bcda711e-9fc2-4168-a05e-171b4026d1ff';
 }