changed endpoint for communtiies and spaces, hardcoded p[roject value for now

Bugfix/sp 852

.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml

@@ -0,0 +1,60 @@
+name: Azure Static Web Apps CI/CD
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+    branches:
+      - main
+
+jobs:
+  build_and_deploy_job:
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    runs-on: ubuntu-latest
+    name: Build and Deploy Job
+    steps:
+      
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          lfs: false
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.22.2' # Specify the Flutter version you want to use
+
+      - name: Install dependencies
+        run: flutter pub get
+
+      - name: Build Flutter Web App
+        run: flutter build web --release --dart-define=FLAVOR=production
+
+      - name: Build And Deploy
+        id: builddeploy
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_MANGO_BUSH_01E607F10 }}
+          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+          action: "upload"
+          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
+          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
+          app_location: "/build/web" # App source code path
+          api_location: "" # Api source code path - optional
+          output_location: "/build/web" # Built app content directory - optional
+          ###### End of Repository/Build Configurations ######
+
+  close_pull_request_job:
+    if: github.event_name == 'pull_request' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    name: Close Pull Request Job
+    steps:
+      - name: Close Pull Request
+        id: closepullrequest
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_MANGO_BUSH_01E607F10 }}
+          action: "close"

lib/pages/routiens/bloc/routine_bloc/routine_bloc.dart

@@ -54,8 +54,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(spaceId, communityId));
@@ -81,8 +80,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;
@@ -91,21 +90,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;
@@ -116,26 +112,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);
@@ -145,15 +137,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));
@@ -162,13 +152,11 @@ 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));
 
     try {
-      final scenes =
-          await SceneApi.getScenesByUnitId(event.unitId, event.communityId);
+      final scenes = await SceneApi.getScenesByUnitId(event.unitId, event.communityId);
       emit(state.copyWith(
         scenes: scenes,
         isLoading: false,
@@ -183,8 +171,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));
 
     try {
@@ -212,16 +199,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));
   }
 
@@ -235,8 +220,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)) {
@@ -249,8 +233,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;
@@ -323,8 +306,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(
@@ -345,23 +327,19 @@ 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');
         return;
       }
       emit(state.copyWith(isLoading: true, errorMessage: null));
-
+      int i = 0;
       final conditions = state.ifItems.expand((item) {
         final functions = state.selectedFunctions[item['uniqueCustomId']] ?? [];
         return functions.map((function) {
           return Condition(
-            code: state.selectedFunctions[item['uniqueCustomId']]!.indexOf(
-                  function,
-                ) +
-                1,
+            code: i++,
             entityId: function.entityId,
             entityType: 'device_report',
             expr: ConditionExpr(
@@ -459,21 +437,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);
@@ -484,8 +458,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));
       }
     }
   }
@@ -497,23 +470,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,
@@ -546,8 +514,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;
@@ -583,11 +550,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),
       };
@@ -630,8 +594,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,
@@ -679,12 +642,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'
@@ -719,8 +680,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] = [];
           }
@@ -792,20 +752,21 @@ 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: [],
         selectedFunctions: {},
         scenes: [],
+        sceneId: '',
+        automationId: '',
         automations: [],
         isLoading: false,
         errorMessage: '',
         loadScenesErrorMessage: null,
         loadAutomationErrorMessage: null,
         searchText: '',
-        selectedIcon: null,
+        selectedIcon: '',
         isTabToRun: false,
         isAutomation: false,
         selectedAutomationOperator: 'or',
@@ -821,8 +782,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       if (state.isTabToRun) {
         SceneApi.deleteScene(unitUuid: spaceId, sceneId: state.sceneId ?? '');
       } else {
-        SceneApi.deleteAutomation(
-            unitUuid: spaceId, automationId: state.automationId ?? '');
+        SceneApi.deleteAutomation(unitUuid: spaceId, automationId: state.automationId ?? '');
       }
 
       add(const LoadScenes(spaceId, communityId));
@@ -851,8 +811,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 devices = await DevicesManagementApi().fetchDevices();
@@ -863,8 +822,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)) {
@@ -878,8 +836,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;
@@ -932,8 +889,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(spaceId, communityId));
@@ -952,8 +908,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(
@@ -977,15 +932,12 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         return;
       }
       emit(state.copyWith(isLoading: true, errorMessage: null));
-
+      int i = 0;
       final conditions = state.ifItems.expand((item) {
         final functions = state.selectedFunctions[item['uniqueCustomId']] ?? [];
         return functions.map((function) {
           return Condition(
-            code: state.selectedFunctions[item['uniqueCustomId']]!.indexOf(
-                  function,
-                ) +
-                1,
+            code: i++,
             entityId: function.entityId,
             entityType: 'device_report',
             expr: ConditionExpr(
@@ -1064,8 +1016,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());
@@ -1098,10 +1050,11 @@ 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 = {};
 
-      final Map<String, Map<String, dynamic>> deviceCards = {};
       final Map<String, List<DeviceFunctionData>> updatedFunctions =
           Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
@@ -1117,8 +1070,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
         final deviceId = condition.entityId;
 
-        if (!deviceCards.containsKey(deviceId)) {
-          deviceCards[deviceId] = {
+        if (!deviceIfCards.containsKey(deviceId)) {
+          deviceIfCards[deviceId] = {
             'entityId': condition.entityId,
             'deviceId': condition.entityId,
             'uniqueCustomId': const Uuid().v4(),
@@ -1131,7 +1084,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           };
         }
 
-        final cardData = deviceCards[deviceId]!;
+        final cardData = deviceIfCards[deviceId]!;
         final uniqueCustomId = cardData['uniqueCustomId'].toString();
 
         if (!updatedFunctions.containsKey(uniqueCustomId)) {
@@ -1165,15 +1118,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 (!deviceCards.containsKey(deviceId)) {
-          deviceCards[deviceId] = {
+        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'
@@ -1193,18 +1144,18 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
                 : action.type == 'automation'
                     ? 'automation'
                     : 'action',
+            'icon': action.icon ?? ''
           };
         }
 
-        final cardData = deviceCards[deviceId]!;
+        final cardData = deviceThenCards[deviceId]!;
         final uniqueCustomId = cardData['uniqueCustomId'].toString();
 
         if (!updatedFunctions.containsKey(uniqueCustomId)) {
           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) {
@@ -1246,14 +1197,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
       }
 
-      final ifItems = deviceCards.values
-          .where((card) => card['type'] == 'condition')
-          .toList();
-      final thenItems = deviceCards.values
+      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/routiens/helper/save_routine_helper.dart

@@ -101,7 +101,7 @@ class SaveRoutineHelper {
                                   final functions =
                                       state.selectedFunctions[item['uniqueCustomId']] ?? [];
                                   return ListTile(
-                                    leading: item['type'] == 'tap_to_run'
+                                    leading: item['type'] == 'tap_to_run' || item['type'] == 'scene'
                                         ? Image.memory(
                                             base64Decode(item['icon']),
                                             width: 22,
@@ -150,13 +150,13 @@ class SaveRoutineHelper {
                       onCancel: () => Navigator.pop(context),
                       onConfirm: () async {
                         if (state.isAutomation) {
-                          if (state.automationId != null) {
+                          if (state.isUpdate ?? false) {
                             context.read<RoutineBloc>().add(const UpdateAutomation());
                           } else {
                             context.read<RoutineBloc>().add(const CreateAutomationEvent());
                           }
                         } else {
-                          if (state.sceneId != null) {
+                          if (state.isUpdate ?? false) {
                             context.read<RoutineBloc>().add(const UpdateScene());
                           } else {
                             context.read<RoutineBloc>().add(const CreateSceneEvent());

lib/pages/routiens/models/routine_details_model.dart

@@ -48,8 +48,7 @@ class RoutineDetailsModel {
       spaceUuid: spaceUuid,
       automationName: name,
       decisionExpr: decisionExpr,
-      effectiveTime:
-          effectiveTime ?? EffectiveTime(start: '', end: '', loops: ''),
+      effectiveTime: effectiveTime ?? EffectiveTime(start: '', end: '', loops: ''),
       conditions: conditions?.map((c) => c.toCondition()).toList() ?? [],
       actions: actions.map((a) => a.toAutomationAction()).toList(),
     );
@@ -64,8 +63,7 @@ class RoutineDetailsModel {
       if (iconId != null) 'iconUuid': iconId,
       if (showInDevice != null) 'showInDevice': showInDevice,
       if (effectiveTime != null) 'effectiveTime': effectiveTime!.toMap(),
-      if (conditions != null)
-        'conditions': conditions!.map((x) => x.toMap()).toList(),
+      if (conditions != null) 'conditions': conditions!.map((x) => x.toMap()).toList(),
       if (type != null) 'type': type,
       if (sceneId != null) 'sceneId': sceneId,
       if (automationId != null) 'automationId': automationId,
@@ -82,12 +80,10 @@ class RoutineDetailsModel {
       ),
       iconId: map['iconUuid'],
       showInDevice: map['showInDevice'],
-      effectiveTime: map['effectiveTime'] != null
-          ? EffectiveTime.fromMap(map['effectiveTime'])
-          : null,
+      effectiveTime:
+          map['effectiveTime'] != null ? EffectiveTime.fromMap(map['effectiveTime']) : null,
       conditions: map['conditions'] != null
-          ? List<RoutineCondition>.from(
-              map['conditions'].map((x) => RoutineCondition.fromMap(x)))
+          ? List<RoutineCondition>.from(map['conditions'].map((x) => RoutineCondition.fromMap(x)))
           : null,
       type: map['type'],
       sceneId: map['sceneId'],
@@ -108,15 +104,16 @@ class RoutineAction {
   final RoutineExecutorProperty? executorProperty;
   final String productType;
   final String? type;
+  final String? icon;
 
-  RoutineAction({
-    required this.entityId,
-    required this.actionExecutor,
-    required this.productType,
-    this.executorProperty,
-    this.name,
-    this.type,
-  });
+  RoutineAction(
+      {required this.entityId,
+      required this.actionExecutor,
+      required this.productType,
+      this.executorProperty,
+      this.name,
+      this.type,
+      this.icon});
 
   CreateSceneAction toCreateSceneAction() {
     return CreateSceneAction(
@@ -140,22 +137,21 @@ class RoutineAction {
       'actionExecutor': actionExecutor,
       if (type != null) 'type': type,
       if (name != null) 'name': name,
-      if (executorProperty != null)
-        'executorProperty': executorProperty!.toMap(),
+      if (executorProperty != null) 'executorProperty': executorProperty!.toMap(),
     };
   }
 
   factory RoutineAction.fromMap(Map<String, dynamic> map) {
     return RoutineAction(
-      entityId: map['entityId'] ?? '',
-      actionExecutor: map['actionExecutor'] ?? '',
-      productType: map['productType'] ?? '',
-      name: map['name'] ?? '',
-      type: map['type'] ?? '',
-      executorProperty: map['executorProperty'] != null
-          ? RoutineExecutorProperty.fromMap(map['executorProperty'])
-          : null,
-    );
+        entityId: map['entityId'] ?? '',
+        actionExecutor: map['actionExecutor'] ?? '',
+        productType: map['productType'] ?? '',
+        name: map['name'] ?? '',
+        type: map['type'] ?? '',
+        executorProperty: map['executorProperty'] != null
+            ? RoutineExecutorProperty.fromMap(map['executorProperty'])
+            : null,
+        icon: map['icon']);
   }
 }
 

lib/pages/routiens/widgets/dragable_card.dart

@@ -32,18 +32,17 @@ class DraggableCard extends StatelessWidget {
   Widget build(BuildContext context) {
     return BlocBuilder<RoutineBloc, RoutineState>(
       builder: (context, state) {
-        final deviceFunctions =
-            state.selectedFunctions[deviceData['uniqueCustomId']] ?? [];
+        final deviceFunctions = state.selectedFunctions[deviceData['uniqueCustomId']] ?? [];
 
-        int index = state.thenItems.indexWhere(
-            (item) => item['uniqueCustomId'] == deviceData['uniqueCustomId']);
+        int index = state.thenItems
+            .indexWhere((item) => item['uniqueCustomId'] == deviceData['uniqueCustomId']);
 
         if (index != -1) {
           return _buildCardContent(context, deviceFunctions, padding: padding);
         }
 
-        int ifIndex = state.ifItems.indexWhere(
-            (item) => item['uniqueCustomId'] == deviceData['uniqueCustomId']);
+        int ifIndex = state.ifItems
+            .indexWhere((item) => item['uniqueCustomId'] == deviceData['uniqueCustomId']);
 
         if (ifIndex != -1) {
           return _buildCardContent(context, deviceFunctions, padding: padding);
@@ -53,8 +52,7 @@ class DraggableCard extends StatelessWidget {
           data: deviceData,
           feedback: Transform.rotate(
             angle: -0.1,
-            child:
-                _buildCardContent(context, deviceFunctions, padding: padding),
+            child: _buildCardContent(context, deviceFunctions, padding: padding),
           ),
           childWhenDragging: _buildGreyContainer(),
           child: _buildCardContent(context, deviceFunctions, padding: padding),
@@ -63,8 +61,7 @@ class DraggableCard extends StatelessWidget {
     );
   }
 
-  Widget _buildCardContent(
-      BuildContext context, List<DeviceFunctionData> deviceFunctions,
+  Widget _buildCardContent(BuildContext context, List<DeviceFunctionData> deviceFunctions,
       {EdgeInsetsGeometry? padding}) {
     return Stack(
       children: [
@@ -93,7 +90,7 @@ class DraggableCard extends StatelessWidget {
                         ),
                       ),
                       padding: const EdgeInsets.all(8),
-                      child: deviceData['type'] == 'tap_to_run'
+                      child: deviceData['type'] == 'tap_to_run' || deviceData['type'] == 'scene'
                           ? Image.memory(
                               base64Decode(deviceData['icon']),
                             )
@@ -162,8 +159,7 @@ class DraggableCard extends StatelessWidget {
   }
 
   String _formatFunctionValue(DeviceFunctionData function) {
-    if (function.functionCode == 'temp_set' ||
-        function.functionCode == 'temp_current') {
+    if (function.functionCode == 'temp_set' || function.functionCode == 'temp_current') {
       return '${(function.value / 10).toStringAsFixed(0)}°C';
     } else if (function.functionCode.contains('countdown')) {
       final seconds = function.value.toInt();

lib/pages/routiens/widgets/then_container.dart

@@ -26,9 +26,7 @@ class ThenContainer extends StatelessWidget {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    const Text('THEN',
-                        style: TextStyle(
-                            fontSize: 18, fontWeight: FontWeight.bold)),
+                    const Text('THEN', style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
                     const SizedBox(height: 16),
                     state.isLoading && state.isUpdate == true
                         ? const Center(
@@ -41,17 +39,12 @@ class ThenContainer extends StatelessWidget {
                                 state.thenItems.length,
                                 (index) => GestureDetector(
                                       onTap: () async {
-                                        if (state.thenItems[index]
-                                                ['deviceId'] ==
-                                            'delay') {
-                                          final result = await DelayHelper
-                                              .showDelayPickerDialog(context,
-                                                  state.thenItems[index]);
+                                        if (state.thenItems[index]['deviceId'] == 'delay') {
+                                          final result = await DelayHelper.showDelayPickerDialog(
+                                              context, state.thenItems[index]);
 
                                           if (result != null) {
-                                            context
-                                                .read<RoutineBloc>()
-                                                .add(AddToThenContainer({
+                                            context.read<RoutineBloc>().add(AddToThenContainer({
                                                   ...state.thenItems[index],
                                                   'imagePath': Assets.delay,
                                                   'title': 'Delay',
@@ -60,79 +53,58 @@ class ThenContainer extends StatelessWidget {
                                           return;
                                         }
 
-                                        if (state.thenItems[index]['type'] ==
-                                            'automation') {
+                                        if (state.thenItems[index]['type'] == 'automation') {
                                           final result = await showDialog<bool>(
                                             context: context,
-                                            builder: (BuildContext context) =>
-                                                AutomationDialog(
+                                            builder: (BuildContext context) => AutomationDialog(
                                               automationName:
-                                                  state.thenItems[index]
-                                                          ['name'] ??
-                                                      'Automation',
+                                                  state.thenItems[index]['name'] ?? 'Automation',
                                               automationId:
-                                                  state.thenItems[index]
-                                                          ['deviceId'] ??
-                                                      '',
-                                              uniqueCustomId:
-                                                  state.thenItems[index]
-                                                      ['uniqueCustomId'],
+                                                  state.thenItems[index]['deviceId'] ?? '',
+                                              uniqueCustomId: state.thenItems[index]
+                                                  ['uniqueCustomId'],
                                             ),
                                           );
 
                                           if (result != null) {
-                                            context
-                                                .read<RoutineBloc>()
-                                                .add(AddToThenContainer({
+                                            context.read<RoutineBloc>().add(AddToThenContainer({
                                                   ...state.thenItems[index],
-                                                  'imagePath':
-                                                      Assets.automation,
-                                                  'title':
-                                                      state.thenItems[index]
-                                                              ['name'] ??
-                                                          state.thenItems[index]
-                                                              ['title'],
+                                                  'imagePath': Assets.automation,
+                                                  'title': state.thenItems[index]['name'] ??
+                                                      state.thenItems[index]['title'],
                                                 }));
                                           }
                                           return;
                                         }
 
-                                        final result = await DeviceDialogHelper
-                                            .showDeviceDialog(
-                                                context, state.thenItems[index],
-                                                removeComparetors: true);
+                                        final result = await DeviceDialogHelper.showDeviceDialog(
+                                            context, state.thenItems[index],
+                                            removeComparetors: true);
 
                                         if (result != null) {
-                                          context.read<RoutineBloc>().add(
-                                              AddToThenContainer(
-                                                  state.thenItems[index]));
+                                          context
+                                              .read<RoutineBloc>()
+                                              .add(AddToThenContainer(state.thenItems[index]));
                                         } else if (!['AC', '1G', '2G', '3G']
-                                            .contains(state.thenItems[index]
-                                                ['productType'])) {
-                                          context.read<RoutineBloc>().add(
-                                              AddToThenContainer(
-                                                  state.thenItems[index]));
+                                            .contains(state.thenItems[index]['productType'])) {
+                                          context
+                                              .read<RoutineBloc>()
+                                              .add(AddToThenContainer(state.thenItems[index]));
                                         }
                                       },
                                       child: DraggableCard(
-                                        imagePath: state.thenItems[index]
-                                                ['imagePath'] ??
-                                            '',
-                                        title: state.thenItems[index]
-                                                ['title'] ??
-                                            '',
+                                        imagePath: state.thenItems[index]['imagePath'] ?? '',
+                                        title: state.thenItems[index]['title'] ?? '',
                                         deviceData: state.thenItems[index],
-                                        padding: const EdgeInsets.symmetric(
-                                            horizontal: 4, vertical: 8),
+                                        padding:
+                                            const EdgeInsets.symmetric(horizontal: 4, vertical: 8),
                                         isFromThen: true,
                                         isFromIf: false,
                                         onRemove: () {
-                                          context.read<RoutineBloc>().add(
-                                              RemoveDragCard(
-                                                  index: index,
-                                                  isFromThen: true,
-                                                  key: state.thenItems[index]
-                                                      ['uniqueCustomId']));
+                                          context.read<RoutineBloc>().add(RemoveDragCard(
+                                              index: index,
+                                              isFromThen: true,
+                                              key: state.thenItems[index]['uniqueCustomId']));
                                         },
                                       ),
                                     ))),
@@ -151,9 +123,14 @@ class ThenContainer extends StatelessWidget {
               return;
             }
 
+            if (state.automationId == mutableData['deviceId'] ||
+                state.sceneId == mutableData['deviceId']) {
+              return;
+            }
+
             if (mutableData['type'] == 'automation') {
-              int index = state.thenItems.indexWhere(
-                  (item) => item['deviceId'] == mutableData['deviceId']);
+              int index =
+                  state.thenItems.indexWhere((item) => item['deviceId'] == mutableData['deviceId']);
               if (index != -1) {
                 return;
               }
@@ -178,8 +155,8 @@ class ThenContainer extends StatelessWidget {
             }
 
             if (mutableData['type'] == 'tap_to_run' && state.isAutomation) {
-              int index = state.thenItems.indexWhere(
-                  (item) => item['deviceId'] == mutableData['deviceId']);
+              int index =
+                  state.thenItems.indexWhere((item) => item['deviceId'] == mutableData['deviceId']);
               if (index != -1) {
                 return;
               }
@@ -197,8 +174,7 @@ class ThenContainer extends StatelessWidget {
             }
 
             if (mutableData['deviceId'] == 'delay') {
-              final result =
-                  await DelayHelper.showDelayPickerDialog(context, mutableData);
+              final result = await DelayHelper.showDelayPickerDialog(context, mutableData);
 
               if (result != null) {
                 context.read<RoutineBloc>().add(AddToThenContainer({
@@ -210,13 +186,11 @@ class ThenContainer extends StatelessWidget {
               return;
             }
 
-            final result = await DeviceDialogHelper.showDeviceDialog(
-                context, mutableData,
+            final result = await DeviceDialogHelper.showDeviceDialog(context, mutableData,
                 removeComparetors: true);
             if (result != null) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
-            } else if (!['AC', '1G', '2G', '3G']
-                .contains(mutableData['productType'])) {
+            } else if (!['AC', '1G', '2G', '3G'].contains(mutableData['productType'])) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
             }
           },

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

@@ -1,9 +1,9 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_event.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_state.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';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_state.dart';
 import 'package:syncrow_web/services/product_api.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
 

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

@@ -1,7 +1,7 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart'; // Import for Offset
+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 for Offset
 
 abstract class SpaceManagementEvent extends Equatable {
   const SpaceManagementEvent();

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

@@ -1,7 +1,7 @@
 import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_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/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 
 abstract class SpaceManagementState extends Equatable {
   const SpaceManagementState();

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

@@ -1,5 +1,5 @@
 import 'package:syncrow_web/pages/auth/model/region_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 
 class CommunityModel {
   final String uuid;

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

@@ -1,4 +1,4 @@
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 
 class Connection {
   final SpaceModel startSpace;

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

@@ -1,7 +1,7 @@
 import 'dart:ui';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/connection_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/selected_product_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/connection_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:uuid/uuid.dart';
 

lib/pages/spaces_management/all_spaces/view/spaces_management_page.dart

@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_event.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_state.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/loaded_space_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_state.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';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart';
 import 'package:syncrow_web/services/product_api.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';

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

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/selected_product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/counter_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/counter_widget.dart';
 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';

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

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_event.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/dialogs/create_community_dialog.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/view/create_community_dialog.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class BlankCommunityWidget extends StatefulWidget {
@@ -72,7 +72,8 @@ class _BlankCommunityWidgetState extends State<BlankCommunityWidget> {
     showDialog(
       context: parentContext,
       builder: (context) => CreateCommunityDialog(
-        communities: widget.communities,
+        isEditMode: false,
+        existingCommunityNames:  widget.communities.map((community) => community.name).toList(),
         onCreateCommunity: (String communityName, String description) {
           parentContext.read<SpaceManagementBloc>().add(
                 CreateCommunityEvent(
@@ -84,4 +85,5 @@ class _BlankCommunityWidgetState extends State<BlankCommunityWidget> {
       ),
     );
   }
+
 }

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

@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/view/create_community_dialog.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
-class CommunityStructureHeader extends StatelessWidget {
+class CommunityStructureHeader extends StatefulWidget {
   final String? communityName;
   final bool isEditingName;
   final bool isSave;
@@ -13,19 +15,28 @@ class CommunityStructureHeader extends StatelessWidget {
   final VoidCallback onDelete;
   final VoidCallback onEditName;
   final ValueChanged<String> onNameSubmitted;
+  final List<CommunityModel> communities;
+  final CommunityModel? community;
 
-  const CommunityStructureHeader({
-    Key? key,
-    required this.communityName,
-    required this.isSave,
-    required this.isEditingName,
-    required this.nameController,
-    required this.onSave,
-    required this.onDelete,
-    required this.onEditName,
-    required this.onNameSubmitted,
-  }) : super(key: key);
+  const CommunityStructureHeader(
+      {super.key,
+      required this.communityName,
+      required this.isSave,
+      required this.isEditingName,
+      required this.nameController,
+      required this.onSave,
+      required this.onDelete,
+      required this.onEditName,
+      required this.onNameSubmitted,
+      this.community,
+      required this.communities});
 
+  @override
+  State<CommunityStructureHeader> createState() =>
+      _CommunityStructureHeaderState();
+}
+
+class _CommunityStructureHeaderState extends State<CommunityStructureHeader> {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
@@ -60,47 +71,63 @@ class CommunityStructureHeader extends StatelessWidget {
     );
   }
 
+  void _showCreateCommunityDialog(BuildContext parentContext) {
+    showDialog(
+      context: parentContext,
+      builder: (context) => CreateCommunityDialog(
+        isEditMode: true,
+        existingCommunityNames:
+            widget.communities.map((community) => community.name).toList(),
+        initialName: widget.community?.name ?? '',
+        onCreateCommunity: (String communityName, String description) {
+          widget.onNameSubmitted(communityName);
+        },
+      ),
+    );
+  }
+
   Widget _buildCommunityInfo(ThemeData theme, double screenWidth) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Text(
           'Community Structure',
-          style: theme.textTheme.headlineLarge?.copyWith(color: ColorsManager.blackColor),
+          style: theme.textTheme.headlineLarge
+              ?.copyWith(color: ColorsManager.blackColor),
         ),
-        if (communityName != null)
+        if (widget.communityName != null)
           Row(
             children: [
               Expanded(
                 child: Row(
                   children: [
-                    if (!isEditingName)
+                    if (!widget.isEditingName)
                       Flexible(
                         child: Text(
-                          communityName!,
-                          style:
-                              theme.textTheme.bodyLarge?.copyWith(color: ColorsManager.blackColor),
+                          widget.communityName!,
+                          style: theme.textTheme.bodyLarge
+                              ?.copyWith(color: ColorsManager.blackColor),
                           overflow: TextOverflow.ellipsis,
                           maxLines: 1,
                         ),
                       ),
-                    if (isEditingName)
+                    if (widget.isEditingName)
                       SizedBox(
                         width: screenWidth * 0.1,
                         child: TextField(
-                          controller: nameController,
+                          controller: widget.nameController,
                           decoration: const InputDecoration(
                             border: InputBorder.none,
                             isDense: true,
                           ),
-                          style:
-                              theme.textTheme.bodyLarge?.copyWith(color: ColorsManager.blackColor),
-                          onSubmitted: onNameSubmitted,
+                          style: theme.textTheme.bodyLarge
+                              ?.copyWith(color: ColorsManager.blackColor),
+                          onSubmitted: widget.onNameSubmitted,
                         ),
                       ),
                     const SizedBox(width: 2),
                     GestureDetector(
-                      onTap: onEditName,
+                      onTap: () => _showCreateCommunityDialog(context),
                       child: SvgPicture.asset(
                         Assets.iconEdit,
                         width: 16,
@@ -110,7 +137,7 @@ class CommunityStructureHeader extends StatelessWidget {
                   ],
                 ),
               ),
-              if (isSave) ...[
+              if (widget.isSave) ...[
                 const SizedBox(width: 8),
                 _buildActionButtons(theme),
               ],
@@ -127,8 +154,9 @@ class CommunityStructureHeader extends StatelessWidget {
       children: [
         _buildButton(
             label: "Save",
-            icon: const Icon(Icons.save, size: 18, color: ColorsManager.spaceColor),
-            onPressed: onSave,
+            icon: const Icon(Icons.save,
+                size: 18, color: ColorsManager.spaceColor),
+            onPressed: widget.onSave,
             theme: theme),
       ],
     );
@@ -159,7 +187,8 @@ class CommunityStructureHeader extends StatelessWidget {
             Flexible(
               child: Text(
                 label,
-                style: theme.textTheme.bodySmall?.copyWith(color: ColorsManager.blackColor),
+                style: theme.textTheme.bodySmall
+                    ?.copyWith(color: ColorsManager.blackColor),
                 overflow: TextOverflow.ellipsis,
                 maxLines: 1,
               ),

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

@@ -4,19 +4,19 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 
 // Syncrow project imports
 import 'package:syncrow_web/pages/common/buttons/add_space_button.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_event.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/selected_product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/connection_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/blank_community_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/community_structure_header_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/dialogs/create_space_dialog.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/curved_line_painter.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/space_card_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/space_container_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_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/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/connection_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/blank_community_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/community_structure_header_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/curved_line_painter.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_card_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_container_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class CommunityStructureArea extends StatefulWidget {
@@ -119,7 +119,9 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             CommunityStructureHeader(
+              communities: widget.communities,
               communityName: widget.selectedCommunity?.name,
+              community: widget.selectedCommunity,
               isSave: isSave(spaces),
               isEditingName: isEditingName,
               nameController: _nameController,

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

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/model/connection_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/connection_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class CurvedLinePainter extends CustomPainter {

lib/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart

@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/selected_product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/add_device_type_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/dialogs/icon_selection_dialog.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/hoverable_button.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/add_device_type_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/icon_selection_dialog.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/hoverable_button.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/constants/space_icon_const.dart';

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

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/community_structure_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/gradient_canvas_border_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/sidebar_widget.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';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/gradient_canvas_border_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart';
 
 class LoadedSpaceView extends StatefulWidget {
   final List<CommunityModel> communities;

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

@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/common/search_bar.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_event.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/community_tile.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/space_tile_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.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/pages/spaces_management/all_spaces/widgets/community_tile.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_tile_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/style.dart';

lib/pages/spaces_management/create_community/bloc/community_dialog_bloc.dart

@@ -0,0 +1,21 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'community_dialog_event.dart';
+import 'community_dialog_state.dart';
+
+class CommunityDialogBloc extends Bloc<CommunityDialogEvent, CommunityDialogState> {
+  final List<String> existingCommunityNames;
+
+  CommunityDialogBloc(this.existingCommunityNames)
+      : super(CommunityDialogInitial()) {
+    on<ValidateCommunityNameEvent>((event, emit) {
+      final trimmedName = event.name.trim();
+      final isNameValid = !existingCommunityNames.contains(trimmedName);
+      final isNameEmpty = trimmedName.isEmpty;
+
+      emit(CommunityNameValidationState(
+        isNameValid: isNameValid,
+        isNameEmpty: isNameEmpty,
+      ));
+    });
+  }
+}

lib/pages/spaces_management/create_community/bloc/community_dialog_event.dart

@@ -0,0 +1,15 @@
+import 'package:equatable/equatable.dart';
+
+abstract class CommunityDialogEvent extends Equatable {
+  @override
+  List<Object?> get props => [];
+}
+
+class ValidateCommunityNameEvent extends CommunityDialogEvent {
+  final String name;
+
+  ValidateCommunityNameEvent(this.name);
+
+  @override
+  List<Object?> get props => [name];
+}

lib/pages/spaces_management/create_community/bloc/community_dialog_state.dart

@@ -0,0 +1,21 @@
+import 'package:equatable/equatable.dart';
+
+abstract class CommunityDialogState extends Equatable {
+  @override
+  List<Object?> get props => [];
+}
+
+class CommunityDialogInitial extends CommunityDialogState {}
+
+class CommunityNameValidationState extends CommunityDialogState {
+  final bool isNameValid;
+  final bool isNameEmpty;
+
+  CommunityNameValidationState({
+    required this.isNameValid,
+    required this.isNameEmpty,
+  });
+
+  @override
+  List<Object?> get props => [isNameValid, isNameEmpty];
+}

lib/pages/spaces_management/create_community/view/create_community_dialog.dart

@@ -0,0 +1,170 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/bloc/community_dialog_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/bloc/community_dialog_event.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/bloc/community_dialog_state.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
+import 'package:syncrow_web/pages/common/buttons/default_button.dart';
+
+class CreateCommunityDialog extends StatelessWidget {
+  final Function(String name, String description) onCreateCommunity;
+  final List<String> existingCommunityNames;
+  final bool isEditMode;
+  final String? initialName;
+
+  const CreateCommunityDialog({
+    super.key,
+    required this.onCreateCommunity,
+    required this.existingCommunityNames,
+    required this.isEditMode,
+    this.initialName,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final nameController =
+        TextEditingController(text: isEditMode ? initialName : '');
+
+    return BlocProvider(
+      create: (_) => CommunityDialogBloc(existingCommunityNames),
+      child: Dialog(
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(20),
+        ),
+        backgroundColor: ColorsManager.transparentColor,
+        child: Stack(
+          children: [
+            Container(
+              width: MediaQuery.of(context).size.width * 0.3,
+              padding: const EdgeInsets.all(20),
+              decoration: BoxDecoration(
+                color: ColorsManager.whiteColors,
+                borderRadius: BorderRadius.circular(20),
+                boxShadow: [
+                  BoxShadow(
+                    color: ColorsManager.blackColor.withOpacity(0.25),
+                    blurRadius: 20,
+                    spreadRadius: 5,
+                    offset: const Offset(0, 5),
+                  ),
+                ],
+              ),
+              child: SingleChildScrollView(
+                child: BlocBuilder<CommunityDialogBloc, CommunityDialogState>(
+                  builder: (context, state) {
+                    bool isNameValid = true;
+                    bool isNameEmpty = false;
+
+                    if (state is CommunityNameValidationState) {
+                      isNameValid = state.isNameValid;
+                      isNameEmpty = state.isNameEmpty;
+                    }
+
+                    return Column(
+                      mainAxisSize: MainAxisSize.min,
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          isEditMode ? 'Edit Community Name' : 'Community Name',
+                          style: Theme.of(context).textTheme.headlineMedium,
+                        ),
+                        const SizedBox(height: 18),
+                        TextField(
+                          controller: nameController,
+                          onChanged: (value) {
+                            context
+                                .read<CommunityDialogBloc>()
+                                .add(ValidateCommunityNameEvent(value));
+                          },
+                          style: const TextStyle(
+                            color: ColorsManager.blackColor,
+                          ),
+                          decoration: InputDecoration(
+                            hintText: 'Please enter the community name',
+                            filled: true,
+                            fillColor: ColorsManager.boxColor,
+                            enabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: isNameValid && !isNameEmpty
+                                    ? ColorsManager.boxColor
+                                    : ColorsManager.red,
+                                width: 1,
+                              ),
+                              borderRadius: BorderRadius.circular(10),
+                            ),
+                            focusedBorder: OutlineInputBorder(
+                              borderRadius: BorderRadius.circular(10),
+                              borderSide: const BorderSide(
+                                color: ColorsManager.boxColor,
+                                width: 1.5,
+                              ),
+                            ),
+                          ),
+                        ),
+                        if (!isNameValid)
+                          Padding(
+                            padding: const EdgeInsets.only(top: 8.0),
+                            child: Text(
+                              '*Name already exists.',
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .bodySmall
+                                  ?.copyWith(color: ColorsManager.red),
+                            ),
+                          ),
+                        if (isNameEmpty)
+                          Padding(
+                            padding: const EdgeInsets.only(top: 8.0),
+                            child: Text(
+                              '*Name should not be empty.',
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .bodySmall
+                                  ?.copyWith(color: ColorsManager.red),
+                            ),
+                          ),
+                        const SizedBox(height: 24),
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          children: [
+                            Expanded(
+                              child: CancelButton(
+                                label: 'Cancel',
+                                onPressed: () => Navigator.of(context).pop(),
+                              ),
+                            ),
+                            const SizedBox(width: 16),
+                            Expanded(
+                              child: DefaultButton(
+                                onPressed: () {
+                                  if (isNameValid && !isNameEmpty) {
+                                    onCreateCommunity(
+                                      nameController.text.trim(),
+                                      "",
+                                    );
+                                    Navigator.of(context).pop();
+                                  }
+                                },
+                                backgroundColor: isNameValid && !isNameEmpty
+                                    ? ColorsManager.secondaryColor
+                                    : ColorsManager.lightGrayColor,
+                                borderRadius: 10,
+                                foregroundColor: ColorsManager.whiteColors,
+                                child: const Text('OK'),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ],
+                    );
+                  },
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/pages/spaces_management/widgets/dialogs/create_community_dialog.dart

@@ -1,177 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
-import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class CreateCommunityDialog extends StatefulWidget {
-  final Function(String name, String description) onCreateCommunity;
-  final List<CommunityModel> communities;
-
-  const CreateCommunityDialog(
-      {super.key, required this.onCreateCommunity, required this.communities});
-
-  @override
-  CreateCommunityDialogState createState() => CreateCommunityDialogState();
-}
-
-class CreateCommunityDialogState extends State<CreateCommunityDialog> {
-  String enteredName = '';
-  bool isNameFieldExist = false;
-  bool isNameEmpty = false;
-
-  @override
-  Widget build(BuildContext context) {
-    final screenWidth = MediaQuery.of(context).size.width;
-
-    return Dialog(
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(20),
-      ),
-      backgroundColor:
-          ColorsManager.transparentColor, // Transparent for shadow effect
-      child: Stack(
-        children: [
-          // Background container with shadow and rounded corners
-          Container(
-            width: screenWidth * 0.3,
-            padding: const EdgeInsets.all(20),
-            decoration: BoxDecoration(
-              color: ColorsManager.whiteColors,
-              borderRadius: BorderRadius.circular(20),
-              boxShadow: [
-                BoxShadow(
-                  color: ColorsManager.blackColor.withOpacity(0.25),
-                  blurRadius: 20,
-                  spreadRadius: 5,
-                  offset: const Offset(0, 5),
-                ),
-              ],
-            ),
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                const Text(
-                  'Community Name',
-                  style: TextStyle(
-                    fontSize: 20,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 16),
-                // Input field for the community name
-                TextField(
-                  onChanged: (value) {
-                    setState(() {
-                      enteredName = value.trim();
-                      isNameFieldExist = widget.communities.any(
-                        (community) => community.name == enteredName,
-                      );
-                      if (value.isEmpty) {
-                        isNameEmpty = true;
-                      } else {
-                        isNameEmpty = false;
-                      }
-                    });
-                  },
-                  style: const TextStyle(
-                    color: ColorsManager.blackColor,
-                  ),
-                  decoration: InputDecoration(
-                    hintText: 'Please enter the community name',
-                    filled: true,
-                    fillColor: ColorsManager.boxColor,
-                    hintStyle: const TextStyle(
-                      fontSize: 14,
-                      color: ColorsManager.grayBorder,
-                      fontWeight: FontWeight.w400,
-                    ),
-                    border: OutlineInputBorder(
-                      borderSide: BorderSide(
-                          color: isNameFieldExist || isNameEmpty
-                              ? ColorsManager.red
-                              : ColorsManager.boxColor,
-                          width: 1),
-                      borderRadius: BorderRadius.circular(10),
-                    ),
-                    enabledBorder: OutlineInputBorder(
-                      borderSide: BorderSide(
-                          color: isNameFieldExist || isNameEmpty
-                              ? ColorsManager.red
-                              : ColorsManager.boxColor, width: 1),
-                      borderRadius: BorderRadius.circular(10),
-                    ),
-                    focusedBorder: OutlineInputBorder(
-                      borderRadius: BorderRadius.circular(10),
-                      borderSide: BorderSide(
-                          color: isNameFieldExist || isNameEmpty
-                              ? ColorsManager.red
-                              : ColorsManager.boxColor,
-                          width: 1),
-                    ),
-                  ),
-                ),
-                if (isNameFieldExist)
-                  Padding(
-                    padding: const EdgeInsets.only(top: 8.0),
-                    child: Text(
-                      '*Name already exists.',
-                      style: Theme.of(context)
-                          .textTheme
-                          .bodySmall
-                          ?.copyWith(color: ColorsManager.red),
-                    ),
-                  ),
-                if (isNameEmpty)
-                  Padding(
-                    padding: const EdgeInsets.only(top: 8.0),
-                    child: Text(
-                      '*Name should not be empty.',
-                      style: Theme.of(context)
-                          .textTheme
-                          .bodySmall
-                          ?.copyWith(color: ColorsManager.red),
-                    ),
-                  ),
-                const SizedBox(height: 24),
-                // Action buttons
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Expanded(
-                      child: CancelButton(
-                        label: 'Cancel',
-                        onPressed: () => Navigator.of(context).pop(),
-                      ),
-                    ),
-                    const SizedBox(width: 16),
-                    Expanded(
-                      child: DefaultButton(
-                        onPressed: () {
-                          if (enteredName.isNotEmpty && !isNameFieldExist) {
-                            widget.onCreateCommunity(
-                              enteredName,
-                              "",
-                            );
-                            Navigator.of(context).pop();
-                          }
-                        },
-                        backgroundColor: isNameFieldExist || isNameEmpty
-                            ? ColorsManager.lightGrayColor
-                            : ColorsManager.secondaryColor,
-                        borderRadius: 10,
-                        foregroundColor: ColorsManager.whiteColors,
-                        child: const Text('OK'),
-                      ),
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/services/product_api.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';
 

lib/services/routines_api.dart

@@ -6,6 +6,7 @@ import 'package:syncrow_web/pages/routiens/models/routine_details_model.dart';
 import 'package:syncrow_web/pages/routiens/models/routine_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 SceneApi {
   static final HTTPService _httpService = HTTPService();
@@ -76,7 +77,8 @@ class SceneApi {
       final response = await _httpService.get(
         path: ApiEndpoints.getUnitScenes
             .replaceAll('{spaceUuid}', unitId)
-            .replaceAll('{communityUuid}', communityId),
+            .replaceAll('{communityUuid}', communityId)
+            .replaceAll('{projectId}', TempConst.projectId),
         queryParameters: {'showInHomePage': showInDevice},
         showServerMessage: false,
         expectedResponseModel: (json) {

lib/services/space_mana_api.dart

@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/selected_product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_response_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/selected_product_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/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
@@ -15,7 +16,8 @@ class CommunitySpaceManagementApi {
 
       while (hasNext) {
         await HTTPService().get(
-          path: ApiEndpoints.getCommunityList,
+          path: ApiEndpoints.getCommunityList
+              .replaceAll('{projectId}', TempConst.projectId),
           queryParameters: {'page': page},
           expectedResponseModel: (json) {
             List<dynamic> jsonData = json['data'];
@@ -59,7 +61,8 @@ class CommunitySpaceManagementApi {
       String name, String description) async {
     try {
       final response = await HTTPService().post(
-        path: ApiEndpoints.createCommunity,
+        path: ApiEndpoints.createCommunity
+            .replaceAll('{projectId}', TempConst.projectId),
         body: {
           'name': name,
           'description': description,
@@ -79,7 +82,8 @@ class CommunitySpaceManagementApi {
     try {
       final response = await HTTPService().put(
         path: ApiEndpoints.updateCommunity
-            .replaceAll('{communityId}', communityId),
+            .replaceAll('{communityId}', communityId)
+            .replaceAll('{projectId}', TempConst.projectId),
         body: {
           'name': name,
         },
@@ -98,7 +102,8 @@ class CommunitySpaceManagementApi {
     try {
       final response = await HTTPService().delete(
         path: ApiEndpoints.deleteCommunity
-            .replaceAll('{communityId}', communityId),
+            .replaceAll('{communityId}', communityId)
+            .replaceAll('{projectId}', TempConst.projectId),
         expectedResponseModel: (json) {
           return json['success'] ?? false;
         },
@@ -113,7 +118,9 @@ class CommunitySpaceManagementApi {
   Future<SpacesResponse> fetchSpaces(String communityId) async {
     try {
       final response = await HTTPService().get(
-        path: ApiEndpoints.listSpaces.replaceAll('{communityId}', communityId),
+        path: ApiEndpoints.listSpaces
+            .replaceAll('{communityId}', communityId)
+            .replaceAll('{projectId}', TempConst.projectId),
         expectedResponseModel: (json) {
           return SpacesResponse.fromJson(json);
         },
@@ -139,7 +146,8 @@ class CommunitySpaceManagementApi {
       final response = await HTTPService().get(
         path: ApiEndpoints.getSpace
             .replaceAll('{communityId}', communityId)
-            .replaceAll('{spaceId}', spaceId),
+            .replaceAll('{spaceId}', spaceId)
+            .replaceAll('{projectId}', TempConst.projectId),
         expectedResponseModel: (json) {
           return SpaceModel.fromJson(json);
         },
@@ -175,7 +183,9 @@ class CommunitySpaceManagementApi {
         body['parentUuid'] = parentId;
       }
       final response = await HTTPService().post(
-        path: ApiEndpoints.createSpace.replaceAll('{communityId}', communityId),
+        path: ApiEndpoints.createSpace
+            .replaceAll('{communityId}', communityId)
+            .replaceAll('{projectId}', TempConst.projectId),
         body: body,
         expectedResponseModel: (json) {
           return SpaceModel.fromJson(json['data']);
@@ -216,7 +226,8 @@ class CommunitySpaceManagementApi {
       final response = await HTTPService().put(
         path: ApiEndpoints.updateSpace
             .replaceAll('{communityId}', communityId)
-            .replaceAll('{spaceId}', spaceId),
+            .replaceAll('{spaceId}', spaceId)
+            .replaceAll('{projectId}', TempConst.projectId),
         body: body,
         expectedResponseModel: (json) {
           return SpaceModel.fromJson(json['data']);
@@ -234,7 +245,8 @@ class CommunitySpaceManagementApi {
       final response = await HTTPService().delete(
         path: ApiEndpoints.deleteSpace
             .replaceAll('{communityId}', communityId)
-            .replaceAll('{spaceId}', spaceId),
+            .replaceAll('{spaceId}', spaceId)
+            .replaceAll('{projectId}', TempConst.projectId),
         expectedResponseModel: (json) {
           return json['success'] ?? false;
         },
@@ -250,7 +262,8 @@ class CommunitySpaceManagementApi {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.getSpaceHierarchy
-            .replaceAll('{communityId}', communityId),
+            .replaceAll('{communityId}', communityId)
+            .replaceAll('{projectId}', TempConst.projectId),
         expectedResponseModel: (json) {
           final spaceModels = (json['data'] as List)
               .map((spaceJson) => SpaceModel.fromJson(spaceJson))

lib/utils/app_routes.dart

@@ -3,7 +3,7 @@ import 'package:syncrow_web/pages/access_management/view/access_management.dart'
 import 'package:syncrow_web/pages/auth/view/login_page.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/view/device_managment_page.dart';
 import 'package:syncrow_web/pages/home/view/home_page.dart';
-import 'package:syncrow_web/pages/spaces_management/view/spaces_management_page.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/view/spaces_management_page.dart';
 import 'package:syncrow_web/pages/visitor_password/view/visitor_password_dialog.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
 
@@ -32,7 +32,7 @@ class AppRoutes {
       ),
       GoRoute(
           path: RoutesConst.spacesManagementPage,
-          builder: (context, state) =>  SpaceManagementPage()),
+          builder: (context, state) =>  const SpaceManagementPage()),
     ];
   }
 }

lib/utils/constants/api_const.dart

@@ -36,21 +36,21 @@ abstract class ApiEndpoints {
   static const String getDeviceLogs = '/device/report-logs/{uuid}?code={code}';
 
 // Space Module
-  static const String createSpace = '/communities/{communityId}/spaces';
-  static const String listSpaces = '/communities/{communityId}/spaces';
-  static const String deleteSpace = '/communities/{communityId}/spaces/{spaceId}';
-  static const String updateSpace = '/communities/{communityId}/spaces/{spaceId}';
-  static const String getSpace = '/communities/{communityId}/spaces/{spaceId}';
-  static const String getSpaceHierarchy = '/communities/{communityId}/spaces';
+  static const String createSpace = '/projects/{projectId}/communities/{communityId}/spaces';
+  static const String listSpaces = '/projects/{projectId}/communities/{communityId}/spaces';
+  static const String deleteSpace = '/projects/{projectId}/communities/{communityId}/spaces/{spaceId}';
+  static const String updateSpace = '/projects/{projectId}/communities/{communityId}/spaces/{spaceId}';
+  static const String getSpace = '/projects/{projectId}/communities/{communityId}/spaces/{spaceId}';
+  static const String getSpaceHierarchy = '/projects/{projectId}/communities/{communityId}/spaces';
 
 // Community Module
-  static const String createCommunity = '/communities';
-  static const String getCommunityList = '/communities';
-  static const String getCommunityById = '/communities/{communityId}';
-  static const String updateCommunity = '/communities/{communityId}';
-  static const String deleteCommunity = '/communities/{communityId}';
-  static const String getUserCommunities = '/communities/user/{userUuid}';
-  static const String createUserCommunity = '/communities/user';
+  static const String createCommunity = '/projects/{projectId}/communities';
+  static const String getCommunityList = '/projects/{projectId}/communities';
+  static const String getCommunityById = '/projects/{projectId}/communities/{communityId}';
+  static const String updateCommunity = '/projects/{projectId}/communities/{communityId}';
+  static const String deleteCommunity = '/projects/{projectId}communities/{communityId}';
+  static const String getUserCommunities = '/projects/{projectId}/communities/user/{userUuid}';
+  static const String createUserCommunity = '/projects/{projectId}/communities/user';
   static const String getDeviceLogsByDate =
       '/device/report-logs/{uuid}?code={code}&startTime={startTime}&endTime={endTime}';
 
@@ -68,7 +68,7 @@ abstract class ApiEndpoints {
   static const String getIconScene = '/scene/icon';
   static const String createScene = '/scene/tap-to-run';
   static const String createAutomation = '/automation';
-  static const String getUnitScenes = '/communities/{communityUuid}/spaces/{spaceUuid}/scenes';
+  static const String getUnitScenes = '/projects/{projectId}/communities/{communityUuid}/spaces/{spaceUuid}/scenes';
   static const String getAutomationDetails = '/automation/details/{automationId}';
   static const String getScene = '/scene/tap-to-run/{sceneId}';
   static const String deleteScene = '/scene/tap-to-run/{sceneId}';

lib/utils/constants/temp_const.dart

@@ -0,0 +1,3 @@
+class TempConst {
+  static const projectId = '0e62577c-06fa-41b9-8a92-99a21fbaf51c';
+}