removed print

lib/pages/device_managment/all_devices/models/device_subspace.model.dart

@@ -0,0 +1,47 @@
+class DeviceSubspace {
+  final String uuid;
+  final DateTime? createdAt;
+  final DateTime? updatedAt;
+  final String subspaceName;
+  final bool disabled;
+
+  DeviceSubspace({
+    required this.uuid,
+    this.createdAt,
+    this.updatedAt,
+    required this.subspaceName,
+    required this.disabled,
+  });
+
+  factory DeviceSubspace.fromJson(Map<String, dynamic> json) {
+    return DeviceSubspace(
+      uuid: json['uuid'] as String,
+      createdAt: json['createdAt'] != null
+          ? DateTime.tryParse(json['createdAt'].toString())
+          : null,
+      updatedAt: json['updatedAt'] != null
+          ? DateTime.tryParse(json['updatedAt'].toString())
+          : null,
+      subspaceName: json['subspaceName'] as String,
+      disabled: json['disabled'] as bool,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'uuid': uuid,
+      'createdAt': createdAt?.toIso8601String(),
+      'updatedAt': updatedAt?.toIso8601String(),
+      'subspaceName': subspaceName,
+      'disabled': disabled,
+    };
+  }
+
+  static List<DeviceSubspace> listFromJson(List<dynamic> jsonList) {
+    return jsonList.map((json) => DeviceSubspace.fromJson(json)).toList();
+  }
+
+  static List<Map<String, dynamic>> listToJson(List<DeviceSubspace> subspaces) {
+    return subspaces.map((subspace) => subspace.toJson()).toList();
+  }
+}

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

@@ -1,5 +1,6 @@
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_community.model.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_space_model.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/device_subspace.model.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/room.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/unit.dart';
 import 'package:syncrow_web/pages/routiens/models/ac/ac_function.dart';
@@ -47,6 +48,7 @@ class AllDevicesModel {
 */
 
   DevicesModelRoom? room;
+  DeviceSubspace? subspace;
   DevicesModelUnit? unit;
   DeviceCommunityModel? community;
   String? productUuid;
@@ -77,6 +79,7 @@ class AllDevicesModel {
 
   AllDevicesModel({
     this.room,
+    this.subspace,
     this.unit,
     this.community,
     this.productUuid,
@@ -110,6 +113,9 @@ class AllDevicesModel {
     room = (json['room'] != null && (json['room'] is Map))
         ? DevicesModelRoom.fromJson(json['room'])
         : null;
+    subspace = (json['subspace'] != null && (json['subspace'] is Map))
+        ? DeviceSubspace.fromJson(json['subspace'])
+        : null;
     unit = (json['unit'] != null && (json['unit'] is Map))
         ? DevicesModelUnit.fromJson(json['unit'])
         : null;
@@ -288,6 +294,9 @@ SOS
     if (room != null) {
       data['room'] = room!.toJson();
     }
+    if (subspace != null) {
+      data['subspace'] = subspace!.toJson();
+    }
     if (unit != null) {
       data['unit'] = unit!.toJson();
     }
@@ -330,6 +339,7 @@ SOS
 
     return other is AllDevicesModel &&
         other.room == room &&
+        other.subspace == subspace &&
         other.unit == unit &&
         other.productUuid == productUuid &&
         other.productType == productType &&
@@ -360,6 +370,7 @@ SOS
   @override
   int get hashCode {
     return room.hashCode ^
+        subspace.hashCode ^
         unit.hashCode ^
         productUuid.hashCode ^
         productType.hashCode ^

lib/pages/device_managment/shared/device_control_dialog.dart

@@ -95,8 +95,9 @@ class DeviceControlDialog extends StatelessWidget with RouteControlsBasedCode {
           ]),
           TableRow(
             children: [
-              _buildInfoRow('Space Name:', device.unit?.name ?? 'N/A'),
-              _buildInfoRow('Room:', device.room?.name ?? 'N/A'),
+              _buildInfoRow('Space Name:',
+                  device.spaces?.firstOrNull?.spaceName ?? 'N/A'),
+              _buildInfoRow('Room:', device.subspace?.subspaceName ?? 'N/A'),
             ],
           ),
           TableRow(
@@ -111,9 +112,13 @@ class DeviceControlDialog extends StatelessWidget with RouteControlsBasedCode {
               ),
               _buildInfoRow(
                 'Battery Level:',
-                device.batteryLevel != null ? '${device.batteryLevel ?? 0}%' : "-",
+                device.batteryLevel != null
+                    ? '${device.batteryLevel ?? 0}%'
+                    : "-",
                 statusColor: device.batteryLevel != null
-                    ? (device.batteryLevel! < 20 ? ColorsManager.red : ColorsManager.green)
+                    ? (device.batteryLevel! < 20
+                        ? ColorsManager.red
+                        : ColorsManager.green)
                     : null,
               ),
             ],

lib/pages/spaces_management/add_device_type/views/add_device_type_widget.dart

@@ -12,7 +12,6 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_mod
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/assign_tag/views/assign_tag_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/helper/tag_helper.dart';
-import 'package:syncrow_web/pages/spaces_management/tag_model/widgets/action_button_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class AddDeviceTypeWidget extends StatelessWidget {
@@ -23,10 +22,12 @@ class AddDeviceTypeWidget extends StatelessWidget {
   final List<Tag>? spaceTags;
   final List<String>? allTags;
   final String spaceName;
+  final bool isCreate;
   final Function(List<Tag>, List<SubspaceModel>?)? onSave;
 
   const AddDeviceTypeWidget(
       {super.key,
+      required this.isCreate,
       this.products,
       this.initialSelectedProducts,
       this.onProductsSelected,
@@ -74,7 +75,9 @@ class AddDeviceTypeWidget extends StatelessWidget {
                             padding:
                                 const EdgeInsets.symmetric(horizontal: 20.0),
                             child: ScrollableGridViewWidget(
+                                initialProductCounts: state.selectedProducts,
                                 products: products,
+                                isCreate: isCreate,
                                 crossAxisCount: crossAxisCount),
                           ),
                         ),
@@ -124,17 +127,14 @@ class AddDeviceTypeWidget extends StatelessWidget {
                                   barrierDismissible: false,
                                   context: context,
                                   builder: (context) => AssignTagDialog(
-                                    products: products,
-                                    subspaces: subspaces,
-                                    addedProducts: state.selectedProducts,
-                                    allTags: allTags,
-                                    spaceName: spaceName,
-                                    initialTags: initialTags,
-                                    title: dialogTitle,
-                                    onSave: (tags, subspaces) {
-                                      onSave!(tags, subspaces);
-                                    },
-                                  ),
+                                      products: products,
+                                      subspaces: subspaces,
+                                      addedProducts: state.selectedProducts,
+                                      allTags: allTags,
+                                      spaceName: spaceName,
+                                      initialTags: initialTags,
+                                      title: dialogTitle,
+                                      onSave: onSave),
                                 );
                               }
                             },
@@ -148,29 +148,4 @@ class AddDeviceTypeWidget extends StatelessWidget {
           ),
         ));
   }
-
-  List<Tag> generateInitialTags({
-    List<Tag>? spaceTags,
-    List<SubspaceModel>? subspaces,
-  }) {
-    final List<Tag> initialTags = [];
-
-    if (spaceTags != null) {
-      initialTags.addAll(spaceTags);
-    }
-
-    if (subspaces != null) {
-      for (var subspace in subspaces) {
-        if (subspace.tags != null) {
-          initialTags.addAll(
-            subspace.tags!.map(
-              (tag) => tag.copyWith(location: subspace.subspaceName),
-            ),
-          );
-        }
-      }
-    }
-
-    return initialTags;
-  }
 }

lib/pages/spaces_management/add_device_type/widgets/device_type_tile_widget.dart

@@ -13,12 +13,13 @@ import 'package:syncrow_web/utils/constants/assets.dart';
 class DeviceTypeTileWidget extends StatelessWidget {
   final ProductModel product;
   final List<SelectedProduct> productCounts;
+  final bool isCreate;
 
-  const DeviceTypeTileWidget({
-    super.key,
-    required this.product,
-    required this.productCounts,
-  });
+  const DeviceTypeTileWidget(
+      {super.key,
+      required this.product,
+      required this.productCounts,
+      required this.isCreate});
 
   @override
   Widget build(BuildContext context) {
@@ -48,7 +49,7 @@ class DeviceTypeTileWidget extends StatelessWidget {
             DeviceNameWidget(name: product.name),
             const SizedBox(height: 4),
             CounterWidget(
-              isCreate: false,
+              isCreate: isCreate,
               initialCount: selectedProduct.count,
               onCountChanged: (newCount) {
                 context.read<AddDeviceTypeBloc>().add(

lib/pages/spaces_management/add_device_type/widgets/scrollable_grid_view_widget.dart

@@ -10,13 +10,14 @@ class ScrollableGridViewWidget extends StatelessWidget {
   final List<ProductModel>? products;
   final int crossAxisCount;
   final List<SelectedProduct>? initialProductCounts;
+  final bool isCreate;
 
-  const ScrollableGridViewWidget({
-    super.key,
-    required this.products,
-    required this.crossAxisCount,
-    this.initialProductCounts,
-  });
+  const ScrollableGridViewWidget(
+      {super.key,
+      required this.products,
+      required this.crossAxisCount,
+      this.initialProductCounts,
+      required this.isCreate});
 
   @override
   Widget build(BuildContext context) {
@@ -46,6 +47,7 @@ class ScrollableGridViewWidget extends StatelessWidget {
 
               return DeviceTypeTileWidget(
                 product: product,
+                isCreate: isCreate,
                 productCounts: initialProductCount != null
                     ? [...productCounts, initialProductCount]
                     : productCounts,

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

@@ -5,12 +5,15 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_mod
 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/pages/spaces_management/all_spaces/model/subspace_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_body_model.dart';
+import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_update_model.dart';
 import 'package:syncrow_web/services/product_api.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
 import 'package:syncrow_web/services/space_model_mang_api.dart';
+import 'package:syncrow_web/utils/constants/action_enum.dart';
 
 class SpaceManagementBloc
     extends Bloc<SpaceManagementEvent, SpaceManagementState> {
@@ -176,6 +179,7 @@ class SpaceManagementBloc
       final updatedCommunities =
           await Future.wait(communities.map((community) async {
         final spaces = await _fetchSpacesForCommunity(community.uuid);
+
         return CommunityModel(
           uuid: community.uuid,
           createdAt: community.createdAt,
@@ -310,6 +314,7 @@ class SpaceManagementBloc
     SelectSpaceEvent event,
     Emitter<SpaceManagementState> emit,
   ) {
+    
     _handleCommunitySpaceStateUpdate(
       emit: emit,
       selectedCommunity: event.selectedCommunity,
@@ -341,7 +346,7 @@ class SpaceManagementBloc
             products: _cachedProducts ?? [],
             selectedCommunity: selectedCommunity,
             selectedSpace: selectedSpace,
-            spaceModels: spaceModels ?? []));
+            spaceModels: spaceModels));
       }
     } catch (e) {
       emit(SpaceManagementError('Error updating state: $e'));
@@ -428,6 +433,76 @@ class SpaceManagementBloc
     for (var space in orderedSpaces) {
       try {
         if (space.uuid != null && space.uuid!.isNotEmpty) {
+          List<TagModelUpdate> tagUpdates = [];
+
+          final prevSpace = await _api.getSpace(communityUuid, space.uuid!);
+          final List<UpdateSubspaceTemplateModel> subspaceUpdates = [];
+          final List<SubspaceModel>? prevSubspaces = prevSpace?.subspaces;
+          final List<SubspaceModel>? newSubspaces = space.subspaces;
+
+          tagUpdates = processTagUpdates(prevSpace?.tags, space.tags);
+
+          if (prevSubspaces != null || newSubspaces != null) {
+            if (prevSubspaces != null && newSubspaces != null) {
+              for (var prevSubspace in prevSubspaces) {
+                final existsInNew = newSubspaces
+                    .any((subspace) => subspace.uuid == prevSubspace.uuid);
+                if (!existsInNew) {
+                  subspaceUpdates.add(UpdateSubspaceTemplateModel(
+                      action: Action.delete, uuid: prevSubspace.uuid));
+                }
+              }
+            } else if (prevSubspaces != null && newSubspaces == null) {
+              for (var prevSubspace in prevSubspaces) {
+                subspaceUpdates.add(UpdateSubspaceTemplateModel(
+                    action: Action.delete, uuid: prevSubspace.uuid));
+              }
+            }
+
+            if (newSubspaces != null) {
+              for (var newSubspace in newSubspaces) {
+                // Tag without UUID
+                if ((newSubspace.uuid == null || newSubspace.uuid!.isEmpty)) {
+                  final List<TagModelUpdate> tagUpdates = [];
+
+                  if (newSubspace.tags != null) {
+                    for (var tag in newSubspace.tags!) {
+                      tagUpdates.add(TagModelUpdate(
+                          action: Action.add,
+                          uuid: tag.uuid == '' ? null : tag.uuid,
+                          tag: tag.tag,
+                          productUuid: tag.product?.uuid));
+                    }
+                  }
+                  subspaceUpdates.add(UpdateSubspaceTemplateModel(
+                      action: Action.add,
+                      subspaceName: newSubspace.subspaceName,
+                      tags: tagUpdates));
+                }
+              }
+            }
+
+            if (prevSubspaces != null && newSubspaces != null) {
+              final newSubspaceMap = {
+                for (var subspace in newSubspaces) subspace.uuid: subspace
+              };
+
+              for (var prevSubspace in prevSubspaces) {
+                final newSubspace = newSubspaceMap[prevSubspace.uuid];
+
+                if (newSubspace != null) {
+                  final List<TagModelUpdate> tagSubspaceUpdates =
+                      processTagUpdates(prevSubspace.tags, newSubspace.tags);
+                  subspaceUpdates.add(UpdateSubspaceTemplateModel(
+                      action: Action.update,
+                      uuid: newSubspace.uuid,
+                      subspaceName: newSubspace.subspaceName,
+                      tags: tagSubspaceUpdates));
+                }
+              }
+            }
+          }
+
           final response = await _api.updateSpace(
             communityId: communityUuid,
             spaceId: space.uuid!,
@@ -436,6 +511,8 @@ class SpaceManagementBloc
             isPrivate: space.isPrivate,
             position: space.position,
             icon: space.icon,
+            subspaces: subspaceUpdates,
+            tags: tagUpdates,
             direction: space.incomingConnection?.direction,
           );
         } else {
@@ -535,4 +612,79 @@ class SpaceManagementBloc
       emit(SpaceManagementError('Error loading communities and spaces: $e'));
     }
   }
+
+  List<TagModelUpdate> processTagUpdates(
+    List<Tag>? prevTags,
+    List<Tag>? newTags,
+  ) {
+    final List<TagModelUpdate> tagUpdates = [];
+    final processedTags = <String?>{};
+
+    if (prevTags == null && newTags != null) {
+      for (var newTag in newTags) {
+        tagUpdates.add(TagModelUpdate(
+          action: Action.add,
+          tag: newTag.tag,
+          uuid: newTag.uuid,
+          productUuid: newTag.product?.uuid,
+        ));
+      }
+      return tagUpdates;
+    }
+
+    if (newTags != null || prevTags != null) {
+      // Case 1: Tags deleted
+      if (prevTags != null && newTags != null) {
+        for (var prevTag in prevTags) {
+          final existsInNew =
+              newTags.any((newTag) => newTag.uuid == prevTag.uuid);
+          if (!existsInNew) {
+            tagUpdates
+                .add(TagModelUpdate(action: Action.delete, uuid: prevTag.uuid));
+          }
+        }
+      } else if (prevTags != null && newTags == null) {
+        for (var prevTag in prevTags) {
+          tagUpdates
+              .add(TagModelUpdate(action: Action.delete, uuid: prevTag.uuid));
+        }
+      }
+
+      // Case 2: Tags added
+      if (newTags != null) {
+        final prevTagUuids = prevTags?.map((t) => t.uuid).toSet() ?? {};
+
+        for (var newTag in newTags) {
+          // Tag without UUID
+          if ((newTag.uuid == null || !prevTagUuids.contains(newTag.uuid)) &&
+              !processedTags.contains(newTag.tag)) {
+            tagUpdates.add(TagModelUpdate(
+                action: Action.add,
+                tag: newTag.tag,
+                uuid: newTag.uuid == '' ? null : newTag.uuid,
+                productUuid: newTag.product?.uuid));
+            processedTags.add(newTag.tag);
+          }
+        }
+      }
+
+      // Case 3: Tags updated
+      if (prevTags != null && newTags != null) {
+        final newTagMap = {for (var tag in newTags) tag.uuid: tag};
+
+        for (var prevTag in prevTags) {
+          final newTag = newTagMap[prevTag.uuid];
+          if (newTag != null) {
+            tagUpdates.add(TagModelUpdate(
+              action: Action.update,
+              uuid: newTag.uuid,
+              tag: newTag.tag,
+            ));
+          } else {}
+        }
+      }
+    }
+
+    return tagUpdates;
+  }
 }

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

@@ -66,7 +66,6 @@ class SpaceModel {
     final instance = SpaceModel(
       internalId: internalId,
       uuid: json['uuid'] ?? '',
-      spaceTuyaUuid: json['spaceTuyaUuid'],
       name: json['spaceName'],
       isPrivate: json['isPrivate'] ?? false,
       invitationCode: json['invitationCode'],
@@ -96,6 +95,9 @@ class SpaceModel {
       icon: json['icon'] ?? Assets.location,
       position: Offset(json['x'] ?? 0, json['y'] ?? 0),
       isHovered: false,
+      spaceModel: json['spaceModel'] != null
+          ? SpaceTemplateModel.fromJson(json['spaceModel'])
+          : null,
       tags: (json['tags'] as List<dynamic>?)
               ?.where((item) => item is Map<String, dynamic>) // Validate type
               .map((item) => Tag.fromJson(item as Map<String, dynamic>))

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

@@ -1,5 +1,6 @@
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/utils/constants/action_enum.dart';
+import 'package:uuid/uuid.dart';
 
 import 'tag.dart';
 
@@ -8,19 +9,24 @@ class SubspaceModel {
   String subspaceName;
   final bool disabled;
   List<Tag>? tags;
+  String internalId;
 
   SubspaceModel({
     this.uuid,
     required this.subspaceName,
     required this.disabled,
     this.tags,
-  });
+    String? internalId,
+  }) : internalId = internalId ?? const Uuid().v4();
 
   factory SubspaceModel.fromJson(Map<String, dynamic> json) {
+    final String internalId = json['internalId'] ?? const Uuid().v4();
+
     return SubspaceModel(
       uuid: json['uuid'] ?? '',
       subspaceName: json['subspaceName'] ?? '',
       disabled: json['disabled'] ?? false,
+      internalId: internalId,
       tags: (json['tags'] as List<dynamic>?)
               ?.map((item) => Tag.fromJson(item))
               .toList() ??
@@ -43,7 +49,7 @@ class UpdateSubspaceModel {
   final Action action;
   final String? subspaceName;
   final List<UpdateTag>? tags;
- UpdateSubspaceModel({
+  UpdateSubspaceModel({
     required this.action,
     required this.uuid,
     this.subspaceName,
@@ -107,4 +113,4 @@ class UpdateTag {
       'product': product?.toMap(),
     };
   }
-}
+}

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

@@ -22,6 +22,7 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/curved_li
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/duplicate_process_dialog.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/pages/spaces_management/helper/space_helper.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
@@ -294,6 +295,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         return CreateSpaceDialog(
           products: widget.products,
           spaceModels: widget.spaceModels,
+          allTags: _getAllTagValues(spaces),
           parentSpace: parentIndex != null ? spaces[parentIndex] : null,
           onCreateSpace: (String name,
               String icon,
@@ -349,8 +351,14 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
             spaceModels: widget.spaceModels,
             name: widget.selectedSpace!.name,
             icon: widget.selectedSpace!.icon,
+            parentSpace: SpaceHelper.findSpaceByInternalId(
+                widget.selectedSpace?.parent?.internalId, spaces),
             editSpace: widget.selectedSpace,
+            currentSpaceModel: widget.selectedSpace?.spaceModel,
+            tags: widget.selectedSpace?.tags,
+            subspaces: widget.selectedSpace?.subspaces,
             isEdit: true,
+            allTags: _getAllTagValues(spaces),
             onCreateSpace: (String name,
                 String icon,
                 List<SelectedProduct> selectedProducts,
@@ -369,6 +377,15 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
                   widget.selectedSpace!.status =
                       SpaceStatus.modified; // Mark as modified
                 }
+
+                for (var space in spaces) {
+                  if (space.internalId == widget.selectedSpace?.internalId) {
+                    space.status = SpaceStatus.modified;
+                    space.subspaces = subspaces;
+                    space.tags = tags;
+                    space.name = name;
+                  }
+                }
               });
             },
             key: Key(widget.selectedSpace!.name),
@@ -447,7 +464,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     }).toList();
 
     if (spacesToSave.isEmpty) {
-      debugPrint("No new or modified spaces to save.");
       return;
     }
 
@@ -638,12 +654,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
 
     final Map<String, int> nameCounters = {};
 
-    String _generateCopyName(String originalName) {
-      final baseName = originalName.replaceAll(RegExp(r'\(\d+\)$'), '').trim();
-      nameCounters[baseName] = (nameCounters[baseName] ?? 0) + 1;
-      return "$baseName(${nameCounters[baseName]})";
-    }
-
     SpaceModel duplicateRecursive(SpaceModel original, Offset parentPosition,
         SpaceModel? duplicatedParent) {
       Offset newPosition = parentPosition + Offset(horizontalGap, 0);
@@ -654,7 +664,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         newPosition += Offset(horizontalGap, 0);
       }
 
-      final duplicatedName = _generateCopyName(original.name);
+      final duplicatedName =
+          SpaceHelper.generateUniqueSpaceName(original.name, spaces);
 
       final duplicated = SpaceModel(
         name: duplicatedName,
@@ -742,4 +753,14 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
       duplicateRecursive(space, space.position, duplicatedParent);
     }
   }
+
+  List<String> _getAllTagValues(List<SpaceModel> spaces) {
+    final List<String> allTags = [];
+    for (final space in spaces) {
+      if (space.tags != null) {
+        allTags.addAll(space.listAllTagValues());
+      }
+    }
+    return allTags;
+  }
 }

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

@@ -39,6 +39,8 @@ class CreateSpaceDialog extends StatefulWidget {
   final List<SpaceTemplateModel>? spaceModels;
   final List<SubspaceModel>? subspaces;
   final List<Tag>? tags;
+  final List<String>? allTags;
+  final SpaceTemplateModel? currentSpaceModel;
 
   const CreateSpaceDialog(
       {super.key,
@@ -49,10 +51,12 @@ class CreateSpaceDialog extends StatefulWidget {
       this.icon,
       this.isEdit = false,
       this.editSpace,
+      this.allTags,
       this.selectedProducts = const [],
       this.spaceModels,
       this.subspaces,
-      this.tags});
+      this.tags,
+      this.currentSpaceModel});
 
   @override
   CreateSpaceDialogState createState() => CreateSpaceDialogState();
@@ -79,6 +83,9 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
         widget.selectedProducts.isNotEmpty ? widget.selectedProducts : [];
     isOkButtonEnabled =
         enteredName.isNotEmpty || nameController.text.isNotEmpty;
+    tags = widget.tags ?? [];
+    subspaces = widget.subspaces ?? [];
+    selectedSpaceModel = widget.currentSpaceModel;
   }
 
   @override
@@ -171,14 +178,13 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                             }
                           });
                         },
-                        style: const TextStyle(color: Colors.black),
+                        style: Theme.of(context).textTheme.bodyMedium,
                         decoration: InputDecoration(
                           hintText: 'Please enter the name',
-                          hintStyle: const TextStyle(
-                            fontSize: 14,
-                            color: ColorsManager.lightGrayColor,
-                            fontWeight: FontWeight.w400,
-                          ),
+                          hintStyle: Theme.of(context)
+                              .textTheme
+                              .bodyMedium!
+                              .copyWith(color: ColorsManager.lightGrayColor),
                           filled: true,
                           fillColor: ColorsManager.boxColor,
                           enabledBorder: OutlineInputBorder(
@@ -237,7 +243,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                             ),
                           )
                         : Container(
-                            width: screenWidth * 0.35,
+                            width: screenWidth * 0.25,
                             padding: const EdgeInsets.symmetric(
                                 vertical: 10.0, horizontal: 16.0),
                             decoration: BoxDecoration(
@@ -251,8 +257,11 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                 Chip(
                                     label: Text(
                                       selectedSpaceModel?.modelName ?? '',
-                                      style: const TextStyle(
-                                          color: ColorsManager.spaceColor),
+                                      style: Theme.of(context)
+                                          .textTheme
+                                          .bodyMedium!
+                                          .copyWith(
+                                              color: ColorsManager.spaceColor),
                                     ),
                                     backgroundColor: ColorsManager.whiteColors,
                                     shape: RoundedRectangleBorder(
@@ -285,25 +294,25 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                             ),
                           ),
                     const SizedBox(height: 25),
-                    const Row(
+                    Row(
                       children: [
-                        Expanded(
+                        const Expanded(
                           child: Divider(
                             color: ColorsManager.neutralGray,
                             thickness: 1.0,
                           ),
                         ),
                         Padding(
-                          padding: EdgeInsets.symmetric(horizontal: 6.0),
+                          padding: const EdgeInsets.symmetric(horizontal: 6.0),
                           child: Text(
                             'OR',
-                            style: TextStyle(
-                              color: Colors.black,
-                              fontWeight: FontWeight.bold,
-                            ),
+                            style: Theme.of(context)
+                                .textTheme
+                                .bodyMedium
+                                ?.copyWith(fontWeight: FontWeight.bold),
                           ),
                         ),
-                        Expanded(
+                        const Expanded(
                           child: Divider(
                             color: ColorsManager.neutralGray,
                             thickness: 1.0,
@@ -312,7 +321,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                       ],
                     ),
                     const SizedBox(height: 25),
-                    subspaces == null
+                    subspaces == null || subspaces!.isEmpty
                         ? TextButton(
                             style: TextButton.styleFrom(
                               padding: EdgeInsets.zero,
@@ -344,21 +353,40 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                 runSpacing: 8.0,
                                 children: [
                                   if (subspaces != null)
-                                    ...subspaces!.map((subspace) =>
-                                        SubspaceNameDisplayWidget(
-                                          validateName: (updatedName) {
-                                            return !subspaces!.any((s) =>
-                                                s != subspace &&
-                                                s.subspaceName == updatedName);
-                                          },
-                                          text: subspace.subspaceName,
-                                          onNameChanged: (updatedName) {
-                                            setState(() {
-                                              subspace.subspaceName =
-                                                  updatedName;
-                                            });
-                                          },
-                                        )),
+                                    ...subspaces!.map((subspace) {
+                                      return Column(
+                                        crossAxisAlignment:
+                                            CrossAxisAlignment.start,
+                                        children: [
+                                          SubspaceNameDisplayWidget(
+                                            text: subspace.subspaceName,
+                                            validateName: (updatedName) {
+                                              bool nameExists =
+                                                  subspaces!.any((s) {
+                                                bool isSameId = s.internalId ==
+                                                    subspace.internalId;
+                                                bool isSameName = s.subspaceName
+                                                        .trim()
+                                                        .toLowerCase() ==
+                                                    updatedName
+                                                        .trim()
+                                                        .toLowerCase();
+
+                                                return !isSameId && isSameName;
+                                              });
+
+                                              return !nameExists;
+                                            },
+                                            onNameChanged: (updatedName) {
+                                              setState(() {
+                                                subspace.subspaceName =
+                                                    updatedName;
+                                              });
+                                            },
+                                          ),
+                                        ],
+                                      );
+                                    }),
                                   EditChip(
                                     onTap: () async {
                                       _showSubSpaceDialog(context, enteredName,
@@ -408,9 +436,12 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                           ),
                                           label: Text(
                                             'x${entry.value}', // Show count
-                                            style: const TextStyle(
-                                              color: ColorsManager.spaceColor,
-                                            ),
+                                            style: Theme.of(context)
+                                                .textTheme
+                                                .bodySmall
+                                                ?.copyWith(
+                                                    color: ColorsManager
+                                                        .spaceColor),
                                           ),
                                           backgroundColor:
                                               ColorsManager.whiteColors,
@@ -425,14 +456,29 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                       ),
 
                                   EditChip(onTap: () async {
-                                    _showTagCreateDialog(
-                                      context,
-                                      enteredName,
-                                      widget.isEdit,
-                                      widget.products,
-                                      subspaces,
+                                    final result = await showDialog(
+                                      context: context,
+                                      builder: (context) => AssignTagDialog(
+                                        products: widget.products,
+                                        subspaces: subspaces,
+                                        addedProducts: TagHelper
+                                            .createInitialSelectedProductsForTags(
+                                                tags ?? [], subspaces),
+                                        title: 'Edit Device',
+                                        initialTags:
+                                            TagHelper.generateInitialForTags(
+                                                spaceTags: tags,
+                                                subspaces: subspaces),
+                                        spaceName: widget.name ?? '',
+                                        onSave:
+                                            (updatedTags, updatedSubspaces) {
+                                          setState(() {
+                                            tags = updatedTags;
+                                            subspaces = updatedSubspaces;
+                                          });
+                                        },
+                                      ),
                                     );
-                                    // Edit action
                                   })
                                 ],
                               ),
@@ -445,7 +491,6 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                 enteredName,
                                 widget.isEdit,
                                 widget.products,
-                                subspaces,
                               );
                             },
                             style: TextButton.styleFrom(
@@ -528,12 +573,23 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
   }
 
   bool _isNameConflict(String value) {
-    return (widget.parentSpace?.children.any((child) => child.name == value) ??
-            false) ||
-        (widget.parentSpace?.name == value) ||
-        (widget.editSpace?.parent?.name == value) ||
-        (widget.editSpace?.children.any((child) => child.name == value) ??
-            false);
+    final parentSpace = widget.parentSpace;
+    final editSpace = widget.editSpace;
+    final siblings = parentSpace?.children
+            .where((child) => child.uuid != editSpace?.uuid)
+            .toList() ??
+        [];
+    final siblingConflict = siblings.any((child) => child.name == value);
+    final parentConflict =
+        parentSpace?.name == value && parentSpace?.uuid != editSpace?.uuid;
+    final parentOfEditSpaceConflict = editSpace?.parent?.name == value &&
+        editSpace?.parent?.uuid != editSpace?.uuid;
+    final childConflict =
+        editSpace?.children.any((child) => child.name == value) ?? false;
+    return siblingConflict ||
+        parentConflict ||
+        parentOfEditSpaceConflict ||
+        childConflict;
   }
 
   void _showLinkSpaceModelDialog(BuildContext context) {
@@ -547,6 +603,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
               setState(() {
                 selectedSpaceModel = selectedModel;
                 subspaces = null;
+                tags = null;
               });
             }
           },
@@ -573,9 +630,26 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
             products: products,
             existingSubSpaces: existingSubSpaces,
             onSave: (slectedSubspaces) {
+              final List<Tag> tagsToAppendToSpace = [];
+
+              if (slectedSubspaces != null) {
+                final updatedIds =
+                    slectedSubspaces.map((s) => s.internalId).toSet();
+                if (existingSubSpaces != null) {
+                  final deletedSubspaces = existingSubSpaces
+                      .where((s) => !updatedIds.contains(s.internalId))
+                      .toList();
+                  for (var s in deletedSubspaces) {
+                    if (s.tags != null) {
+                      tagsToAppendToSpace.addAll(s.tags!);
+                    }
+                  }
+                }
+              }
               if (slectedSubspaces != null) {
                 setState(() {
                   subspaces = slectedSubspaces;
+                  tags?.addAll(tagsToAppendToSpace);
                   selectedSpaceModel = null;
                 });
               }
@@ -585,7 +659,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
   }
 
   void _showTagCreateDialog(BuildContext context, String name, bool isEdit,
-      List<ProductModel>? products, List<SubspaceModel>? subspaces) {
+      List<ProductModel>? products) {
     isEdit
         ? showDialog(
             context: context,
@@ -597,8 +671,26 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                 spaceName: name,
                 products: products,
                 subspaces: subspaces,
-                allTags: [],
-                onSave: (selectedSpaceTags, selectedSubspaces) {},
+                allTags: widget.allTags,
+                onSave: (selectedSpaceTags, selectedSubspaces) {
+                  setState(() {
+                    tags = selectedSpaceTags;
+                    selectedSpaceModel = null;
+
+                    if (selectedSubspaces != null) {
+                      if (subspaces != null) {
+                        for (final subspace in subspaces!) {
+                          for (final selectedSubspace in selectedSubspaces) {
+                            if (subspace.subspaceName ==
+                                selectedSubspace.subspaceName) {
+                              subspace.tags = selectedSubspace.tags;
+                            }
+                          }
+                        }
+                      }
+                    }
+                  });
+                },
               );
             },
           )
@@ -610,7 +702,8 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                 products: products,
                 subspaces: subspaces,
                 spaceTags: tags,
-                allTags: [],
+                isCreate: true,
+                allTags: widget.allTags,
                 initialSelectedProducts:
                     TagHelper.createInitialSelectedProductsForTags(
                         tags, subspaces),

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

@@ -11,7 +11,7 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/space_tem
 import 'package:syncrow_web/pages/spaces_management/space_model/view/space_model_page.dart';
 import 'package:syncrow_web/services/space_model_mang_api.dart';
 
-class LoadedSpaceView extends StatelessWidget {
+class LoadedSpaceView extends StatefulWidget {
   final List<CommunityModel> communities;
   final CommunityModel? selectedCommunity;
   final SpaceModel? selectedSpace;
@@ -26,41 +26,73 @@ class LoadedSpaceView extends StatelessWidget {
     this.selectedSpace,
     this.products,
     this.spaceModels,
-    required this.shouldNavigateToSpaceModelPage
+    required this.shouldNavigateToSpaceModelPage,
   });
 
   @override
-  Widget build(BuildContext context) {
+  _LoadedSpaceViewState createState() => _LoadedSpaceViewState();
+}
 
+class _LoadedSpaceViewState extends State<LoadedSpaceView> {
+  late List<SpaceTemplateModel> _spaceModels;
+
+  @override
+  void initState() {
+    super.initState();
+    _spaceModels = List.from(widget.spaceModels ?? []);
+  }
+
+  @override
+  void didUpdateWidget(covariant LoadedSpaceView oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.spaceModels != oldWidget.spaceModels) {
+      setState(() {
+        _spaceModels = List.from(widget.spaceModels ?? []);
+      });
+    }
+  }
+
+  void _onSpaceModelsUpdated(List<SpaceTemplateModel> updatedModels) {
+    if (mounted && updatedModels != _spaceModels) {
+      setState(() {
+        _spaceModels = updatedModels;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
     return Stack(
       clipBehavior: Clip.none,
       children: [
         Row(
           children: [
             SidebarWidget(
-              communities: communities,
-              selectedSpaceUuid:
-                  selectedSpace?.uuid ?? selectedCommunity?.uuid ?? '',
+              communities: widget.communities,
+              selectedSpaceUuid: widget.selectedSpace?.uuid ??
+                  widget.selectedCommunity?.uuid ??
+                  '',
             ),
-            shouldNavigateToSpaceModelPage
+            widget.shouldNavigateToSpaceModelPage
                 ? Expanded(
                     child: BlocProvider(
                       create: (context) => SpaceModelBloc(
                         api: SpaceModelManagementApi(),
-                        initialSpaceModels: spaceModels ?? [],
+                        initialSpaceModels: _spaceModels,
                       ),
                       child: SpaceModelPage(
-                        products: products,
+                        products: widget.products,
+                        onSpaceModelsUpdated: _onSpaceModelsUpdated,
                       ),
                     ),
                   )
                 : CommunityStructureArea(
-                    selectedCommunity: selectedCommunity,
-                    selectedSpace: selectedSpace,
-                    spaces: selectedCommunity?.spaces ?? [],
-                    products: products,
-                    communities: communities,
-                    spaceModels: spaceModels,
+                    selectedCommunity: widget.selectedCommunity,
+                    selectedSpace: widget.selectedSpace,
+                    spaces: widget.selectedCommunity?.spaces ?? [],
+                    products: widget.products,
+                    communities: widget.communities,
+                    spaceModels: _spaceModels,
                   ),
           ],
         ),
@@ -68,13 +100,4 @@ class LoadedSpaceView extends StatelessWidget {
       ],
     );
   }
-
-  SpaceModel? findSpaceByUuid(String? uuid, List<CommunityModel> communities) {
-    for (var community in communities) {
-      for (var space in community.spaces) {
-        if (space.uuid == uuid) return space;
-      }
-    }
-    return null;
-  }
 }

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

@@ -20,8 +20,7 @@ class SpaceWidget extends StatelessWidget {
       top: position.dy,
       child: GestureDetector(
         onTap: onTap,
-        child: 
-        Container(
+        child: Container(
           padding: const EdgeInsets.all(8.0),
           decoration: BoxDecoration(
             color: ColorsManager.whiteColors,
@@ -39,11 +38,10 @@ class SpaceWidget extends StatelessWidget {
             children: [
               const Icon(Icons.location_on, color: ColorsManager.spaceColor),
               const SizedBox(width: 8),
-              Text(name, style: const TextStyle(fontSize: 16)),
+              Text(name, style: Theme.of(context).textTheme.bodyMedium),
             ],
           ),
         ),
-    
       ),
     );
   }

lib/pages/spaces_management/assign_tag/views/assign_tag_dialog.dart

@@ -12,6 +12,7 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/assign_tag/bloc/assign_tag_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/assign_tag/bloc/assign_tag_event.dart';
 import 'package:syncrow_web/pages/spaces_management/assign_tag/bloc/assign_tag_state.dart';
+import 'package:syncrow_web/pages/spaces_management/helper/tag_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class AssignTagDialog extends StatelessWidget {
@@ -40,8 +41,11 @@ class AssignTagDialog extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final List<String> locations =
-        (subspaces ?? []).map((subspace) => subspace.subspaceName).toList();
+    final List<String> locations = (subspaces ?? [])
+        .map((subspace) => subspace.subspaceName)
+        .toList()
+      ..add('Main Space');
+
     return BlocProvider(
       create: (_) => AssignTagBloc()
         ..add(InitializeTags(
@@ -93,21 +97,22 @@ class AssignTagDialog extends StatelessWidget {
                         ],
                         rows: state.tags.isEmpty
                             ? [
-                                const DataRow(cells: [
+                                DataRow(cells: [
                                   DataCell(
                                     Center(
-                                      child: Text(
-                                        'No Data Available',
-                                        style: TextStyle(
-                                          fontSize: 14,
-                                          color: ColorsManager.lightGrayColor,
-                                        ),
-                                      ),
+                                      child: Text('No Data Available',
+                                          style: Theme.of(context)
+                                              .textTheme
+                                              .bodyMedium
+                                              ?.copyWith(
+                                                color: ColorsManager
+                                                    .lightGrayColor,
+                                              )),
                                     ),
                                   ),
-                                  DataCell(SizedBox()),
-                                  DataCell(SizedBox()),
-                                  DataCell(SizedBox()),
+                                  const DataCell(SizedBox()),
+                                  const DataCell(SizedBox()),
+                                  const DataCell(SizedBox()),
                                 ])
                               ]
                             : List.generate(state.tags.length, (index) {
@@ -209,10 +214,11 @@ class AssignTagDialog extends StatelessWidget {
                       ),
                     ),
                     if (state.errorMessage != null)
-                      Text(
-                        state.errorMessage!,
-                        style: const TextStyle(color: ColorsManager.warningRed),
-                      ),
+                      Text(state.errorMessage!,
+                          style: Theme.of(context)
+                              .textTheme
+                              .bodySmall
+                              ?.copyWith(color: ColorsManager.warningRed)),
                   ],
                 ),
               ),
@@ -227,24 +233,28 @@ class AssignTagDialog extends StatelessWidget {
                           label: 'Add New Device',
                           onPressed: () async {
                             final updatedTags = List<Tag>.from(state.tags);
-                            final result = processTags(updatedTags, subspaces);
+                            final result =
+                                TagHelper.processTags(updatedTags, subspaces);
 
                             final processedTags =
                                 result['updatedTags'] as List<Tag>;
-                            final processedSubspaces = result['subspaces'];
+                            final processedSubspaces = List<SubspaceModel>.from(
+                                result['subspaces'] as List<dynamic>);
 
                             Navigator.of(context).pop();
 
-                            await showDialog<bool>(
-                              barrierDismissible: false,
+                            await showDialog(
                               context: context,
-                              builder: (dialogContext) => AddDeviceTypeWidget(
+                              builder: (context) => AddDeviceTypeWidget(
                                 products: products,
                                 subspaces: processedSubspaces,
-                                initialSelectedProducts: addedProducts,
-                                allTags: allTags,
+                                initialSelectedProducts: TagHelper
+                                    .createInitialSelectedProductsForTags(
+                                        processedTags, processedSubspaces),
                                 spaceName: spaceName,
                                 spaceTags: processedTags,
+                                isCreate: false,
+                                onSave: onSave,
                               ),
                             );
                           },
@@ -261,17 +271,17 @@ class AssignTagDialog extends StatelessWidget {
                         foregroundColor: ColorsManager.whiteColors,
                         onPressed: state.isSaveEnabled
                             ? () async {
-                                Navigator.of(context).pop();
                                 final updatedTags = List<Tag>.from(state.tags);
-                                final result =
-                                    processTags(updatedTags, subspaces);
+                                final result = TagHelper.processTags(
+                                    updatedTags, subspaces);
 
                                 final processedTags =
                                     result['updatedTags'] as List<Tag>;
                                 final processedSubspaces =
-                                    result['subspaces'] as List<SubspaceModel>;
-
-                                onSave!(processedTags, processedSubspaces);
+                                    List<SubspaceModel>.from(
+                                        result['subspaces'] as List<dynamic>);
+                                onSave?.call(processedTags, processedSubspaces);
+                                Navigator.of(context).pop();
                               }
                             : null,
                         child: const Text('Save'),
@@ -294,107 +304,12 @@ class AssignTagDialog extends StatelessWidget {
 
   List<String> getAvailableTags(
       List<String> allTags, List<Tag> currentTags, Tag currentTag) {
-    return allTags
-        .where((tagValue) => !currentTags
-            .where((e) => e != currentTag) // Exclude the current row
-            .map((e) => e.tag)
-            .contains(tagValue))
-        .toList();
-  }
-
-  Map<String, dynamic> processTags(
-      List<Tag> updatedTags, List<SubspaceModel>? subspaces) {
-    final modifiedTags = List<Tag>.from(updatedTags);
-    final modifiedSubspaces = List<SubspaceModel>.from(subspaces ?? []);
-
-    for (var tag in modifiedTags.toList()) {
-      if (modifiedSubspaces.isEmpty) continue;
-
-      final prevIndice = checkTagExistInSubspace(tag, modifiedSubspaces);
-
-      if ((tag.location == 'Main Space' || tag.location == null) &&
-          (prevIndice == null ||
-              modifiedSubspaces[prevIndice].subspaceName == 'Main Space')) {
-        continue;
-      }
-
-      if ((tag.location == 'Main Space' || tag.location == null) &&
-          prevIndice != null) {
-        modifiedSubspaces[prevIndice]
-            .tags
-            ?.removeWhere((t) => t.internalId == tag.internalId);
-        continue;
-      }
-
-      if ((tag.location != 'Main Space' && tag.location != null) &&
-          prevIndice == null) {
-        final newIndex = modifiedSubspaces
-            .indexWhere((subspace) => subspace.subspaceName == tag.location);
-        if (newIndex != -1) {
-          if (modifiedSubspaces[newIndex]
-                  .tags
-                  ?.any((t) => t.internalId == tag.internalId) !=
-              true) {
-            tag.location = modifiedSubspaces[newIndex].subspaceName;
-            modifiedSubspaces[newIndex].tags?.add(tag);
-          }
-        }
-        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
-        continue;
-      }
-
-      if ((tag.location != 'Main Space' && tag.location != null) &&
-          tag.location != modifiedSubspaces[prevIndice!].subspaceName) {
-        modifiedSubspaces[prevIndice]
-            .tags
-            ?.removeWhere((t) => t.internalId == tag.internalId);
-        final newIndex = modifiedSubspaces
-            .indexWhere((subspace) => subspace.subspaceName == tag.location);
-        if (newIndex != -1) {
-          if (modifiedSubspaces[newIndex]
-                  .tags
-                  ?.any((t) => t.internalId == tag.internalId) !=
-              true) {
-            tag.location = modifiedSubspaces[newIndex].subspaceName;
-            modifiedSubspaces[newIndex].tags?.add(tag);
-          }
-        }
-
-        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
-        continue;
-      }
-
-      if ((tag.location != 'Main Space' && tag.location != null) &&
-          tag.location == modifiedSubspaces[prevIndice!].subspaceName) {
-        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
-        continue;
-      }
-
-      if ((tag.location == 'Main Space' || tag.location == null) &&
-          prevIndice != null) {
-        modifiedSubspaces[prevIndice]
-            .tags
-            ?.removeWhere((t) => t.internalId == tag.internalId);
-      }
-    }
-
-    return {
-      'updatedTags': modifiedTags,
-      'subspaces': modifiedSubspaces,
-    };
-  }
-
-  int? checkTagExistInSubspace(Tag tag, List<SubspaceModel>? subspaces) {
-    if (subspaces == null) return null;
-    for (int i = 0; i < subspaces.length; i++) {
-      final subspace = subspaces[i];
-      if (subspace.tags == null) continue;
-      for (var t in subspace.tags!) {
-        if (tag.internalId == t.internalId) {
-          return i;
-        }
-      }
-    }
-    return null;
+    List<String> availableTagsForTagModel = TagHelper.getAvailableTags<Tag>(
+      allTags: allTags,
+      currentTags: currentTags,
+      currentTag: currentTag,
+      getTag: (tag) => tag.tag ?? '',
+    );
+    return availableTagsForTagModel;
   }
 }

lib/pages/spaces_management/assign_tag_models/views/assign_tag_models_dialog.dart

@@ -112,29 +112,30 @@ class AssignTagModelsDialog extends StatelessWidget {
                             ],
                             rows: state.tags.isEmpty
                                 ? [
-                                    const DataRow(cells: [
+                                    DataRow(cells: [
                                       DataCell(
                                         Center(
-                                          child: Text(
-                                            'No Data Available',
-                                            style: TextStyle(
-                                              fontSize: 14,
-                                              color:
-                                                  ColorsManager.lightGrayColor,
-                                            ),
-                                          ),
+                                          child: Text('No Devices Available',
+                                              style: Theme.of(context)
+                                                  .textTheme
+                                                  .bodyMedium
+                                                  ?.copyWith(
+                                                    color: ColorsManager
+                                                        .lightGrayColor,
+                                                  )),
                                         ),
                                       ),
-                                      DataCell(SizedBox()),
-                                      DataCell(SizedBox()),
-                                      DataCell(SizedBox()),
+                                      const DataCell(SizedBox()),
+                                      const DataCell(SizedBox()),
+                                      const DataCell(SizedBox()),
                                     ])
                                   ]
                                 : List.generate(state.tags.length, (index) {
                                     final tag = state.tags[index];
                                     final controller = controllers[index];
-                                    final availableTags = getAvailableTags(
-                                        allTags ?? [], state.tags, tag);
+                                    final availableTags =
+                                        TagHelper.getAvailableTagModels(
+                                            allTags ?? [], state.tags, tag);
 
                                     return DataRow(
                                       cells: [
@@ -233,11 +234,11 @@ class AssignTagModelsDialog extends StatelessWidget {
                           ),
                         ),
                         if (state.errorMessage != null)
-                          Text(
-                            state.errorMessage!,
-                            style: const TextStyle(
-                                color: ColorsManager.warningRed),
-                          ),
+                          Text(state.errorMessage!,
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .bodySmall
+                                  ?.copyWith(color: ColorsManager.warningRed)),
                       ],
                     ),
                   ),
@@ -254,11 +255,15 @@ class AssignTagModelsDialog extends StatelessWidget {
                                 final updatedTags =
                                     List<TagModel>.from(state.tags);
                                 final result =
-                                    processTags(updatedTags, subspaces);
+                                    TagHelper.updateSubspaceTagModels(
+                                        updatedTags, subspaces);
 
                                 final processedTags =
                                     result['updatedTags'] as List<TagModel>;
-                                final processedSubspaces = result['subspaces'];
+                                final processedSubspaces =
+                                    List<SubspaceTemplateModel>.from(
+                                        result['subspaces'] as List<dynamic>);
+
                                 if (context.mounted) {
                                   Navigator.of(context).pop();
 
@@ -268,7 +273,7 @@ class AssignTagModelsDialog extends StatelessWidget {
                                     builder: (dialogContext) =>
                                         AddDeviceTypeModelWidget(
                                             products: products,
-                                            subspaces: subspaces,
+                                            subspaces: processedSubspaces,
                                             isCreate: false,
                                             initialSelectedProducts: TagHelper
                                                 .createInitialSelectedProducts(
@@ -305,14 +310,17 @@ class AssignTagModelsDialog extends StatelessWidget {
                                 ? () async {
                                     final updatedTags =
                                         List<TagModel>.from(state.tags);
+
                                     final result =
-                                        processTags(updatedTags, subspaces);
+                                        TagHelper.updateSubspaceTagModels(
+                                            updatedTags, subspaces);
 
                                     final processedTags =
                                         result['updatedTags'] as List<TagModel>;
                                     final processedSubspaces =
-                                        result['subspaces']
-                                            as List<SubspaceTemplateModel>;
+                                        List<SubspaceTemplateModel>.from(
+                                            result['subspaces']
+                                                as List<dynamic>);
 
                                     Navigator.of(context)
                                         .popUntil((route) => route.isFirst);
@@ -356,120 +364,4 @@ class AssignTagModelsDialog extends StatelessWidget {
           ),
         ));
   }
-
-  List<String> getAvailableTags(
-      List<String> allTags, List<TagModel> currentTags, TagModel currentTag) {
-    return allTags
-        .where((tagValue) => !currentTags
-            .where((e) => e != currentTag) // Exclude the current row
-            .map((e) => e.tag)
-            .contains(tagValue))
-        .toList();
-  }
-
-  int? checkTagExistInSubspace(
-      TagModel tag, List<SubspaceTemplateModel>? subspaces) {
-    if (subspaces == null) return null;
-    for (int i = 0; i < subspaces.length; i++) {
-      final subspace = subspaces[i];
-      if (subspace.tags == null) continue;
-      for (var t in subspace.tags!) {
-        if (tag.internalId == t.internalId) {
-          return i;
-        }
-      }
-    }
-    return null;
-  }
-
-  Map<String, dynamic> processTags(
-      List<TagModel> updatedTags, List<SubspaceTemplateModel>? subspaces) {
-    final modifiedTags = List<TagModel>.from(updatedTags);
-    final modifiedSubspaces = List<SubspaceTemplateModel>.from(subspaces ?? []);
-
-    if (subspaces != null) {
-      for (var subspace in subspaces) {
-        subspace.tags?.removeWhere(
-          (tag) => !modifiedTags
-              .any((updatedTag) => updatedTag.internalId == tag.internalId),
-        );
-      }
-    }
-
-    for (var tag in modifiedTags.toList()) {
-      if (modifiedSubspaces.isEmpty) continue;
-
-      final prevIndice = checkTagExistInSubspace(tag, modifiedSubspaces);
-
-      if ((tag.location == 'Main Space' || tag.location == null) &&
-          (prevIndice == null ||
-              modifiedSubspaces[prevIndice].subspaceName == 'Main Space')) {
-        continue;
-      }
-
-      if ((tag.location == 'Main Space' || tag.location == null) &&
-          prevIndice != null) {
-        modifiedSubspaces[prevIndice]
-            .tags
-            ?.removeWhere((t) => t.internalId == tag.internalId);
-        continue;
-      }
-
-      if ((tag.location != 'Main Space' && tag.location != null) &&
-          prevIndice == null) {
-        final newIndex = modifiedSubspaces
-            .indexWhere((subspace) => subspace.subspaceName == tag.location);
-        if (newIndex != -1) {
-          if (modifiedSubspaces[newIndex]
-                  .tags
-                  ?.any((t) => t.internalId == tag.internalId) !=
-              true) {
-            tag.location = modifiedSubspaces[newIndex].subspaceName;
-            modifiedSubspaces[newIndex].tags?.add(tag);
-          }
-        }
-        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
-        continue;
-      }
-
-      if ((tag.location != 'Main Space' && tag.location != null) &&
-          tag.location != modifiedSubspaces[prevIndice!].subspaceName) {
-        modifiedSubspaces[prevIndice]
-            .tags
-            ?.removeWhere((t) => t.internalId == tag.internalId);
-        final newIndex = modifiedSubspaces
-            .indexWhere((subspace) => subspace.subspaceName == tag.location);
-        if (newIndex != -1) {
-          if (modifiedSubspaces[newIndex]
-                  .tags
-                  ?.any((t) => t.internalId == tag.internalId) !=
-              true) {
-            tag.location = modifiedSubspaces[newIndex].subspaceName;
-            modifiedSubspaces[newIndex].tags?.add(tag);
-          }
-        }
-
-        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
-        continue;
-      }
-
-      if ((tag.location != 'Main Space' && tag.location != null) &&
-          tag.location == modifiedSubspaces[prevIndice!].subspaceName) {
-        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
-        continue;
-      }
-
-      if ((tag.location == 'Main Space' || tag.location == null) &&
-          prevIndice != null) {
-        modifiedSubspaces[prevIndice]
-            .tags
-            ?.removeWhere((t) => t.internalId == tag.internalId);
-      }
-    }
-
-    return {
-      'updatedTags': modifiedTags,
-      'subspaces': modifiedSubspaces,
-    };
-  }
 }

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

@@ -77,9 +77,7 @@ class CreateCommunityDialog extends StatelessWidget {
                                 .read<CommunityDialogBloc>()
                                 .add(ValidateCommunityNameEvent(value));
                           },
-                          style: const TextStyle(
-                            color: ColorsManager.blackColor,
-                          ),
+                          style: Theme.of(context).textTheme.bodyMedium,
                           decoration: InputDecoration(
                             hintText: 'Please enter the community name',
                             filled: true,

lib/pages/spaces_management/create_subspace/bloc/subspace_bloc.dart

@@ -82,7 +82,6 @@ class SubSpaceBloc extends Bloc<SubSpaceEvent, SubSpaceState> {
       ));
     });
 
-
     on<UpdateSubSpace>((event, emit) {
       final updatedSubSpaces = state.subSpaces.map((subSpace) {
         if (subSpace.uuid == event.updatedSubSpace.uuid) {

lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart

@@ -102,12 +102,13 @@ class CreateSubSpaceDialog extends StatelessWidget {
                                           duplicateIndices.indexOf(index) != 0;
 
                                   return Chip(
-                                    label: Text(
-                                      subSpace.subspaceName,
-                                      style: const TextStyle(
-                                        color: ColorsManager.spaceColor,
-                                      ),
-                                    ),
+                                    label: Text(subSpace.subspaceName,
+                                        style: Theme.of(context)
+                                            .textTheme
+                                            .bodyMedium
+                                            ?.copyWith(
+                                                color:
+                                                    ColorsManager.spaceColor)),
                                     backgroundColor: ColorsManager.whiteColors,
                                     shape: RoundedRectangleBorder(
                                       borderRadius: BorderRadius.circular(10),
@@ -143,27 +144,29 @@ class CreateSubSpaceDialog extends StatelessWidget {
                               SizedBox(
                                 width: 200,
                                 child: TextField(
-                                  controller: textController,
-                                  decoration: InputDecoration(
-                                    border: InputBorder.none,
-                                    hintText: state.subSpaces.isEmpty
-                                        ? 'Please enter the name'
-                                        : null,
-                                    hintStyle: const TextStyle(
-                                        color: ColorsManager.lightGrayColor),
-                                  ),
-                                  onSubmitted: (value) {
-                                    if (value.trim().isNotEmpty) {
-                                      context.read<SubSpaceBloc>().add(
-                                          AddSubSpace(SubspaceModel(
-                                              subspaceName: value.trim(),
-                                              disabled: false)));
-                                      textController.clear();
-                                    }
-                                  },
-                                  style: const TextStyle(
-                                      color: ColorsManager.blackColor),
-                                ),
+                                    controller: textController,
+                                    decoration: InputDecoration(
+                                        border: InputBorder.none,
+                                        hintText: state.subSpaces.isEmpty
+                                            ? 'Please enter the name'
+                                            : null,
+                                        hintStyle: Theme.of(context)
+                                            .textTheme
+                                            .bodySmall
+                                            ?.copyWith(
+                                                color: ColorsManager
+                                                    .lightGrayColor)),
+                                    onSubmitted: (value) {
+                                      if (value.trim().isNotEmpty) {
+                                        context.read<SubSpaceBloc>().add(
+                                            AddSubSpace(SubspaceModel(
+                                                subspaceName: value.trim(),
+                                                disabled: false)));
+                                        textController.clear();
+                                      }
+                                    },
+                                    style:
+                                        Theme.of(context).textTheme.bodyMedium),
                               ),
                             ],
                           ),
@@ -171,13 +174,13 @@ class CreateSubSpaceDialog extends StatelessWidget {
                         if (state.errorMessage.isNotEmpty)
                           Padding(
                             padding: const EdgeInsets.only(top: 8.0),
-                            child: Text(
-                              state.errorMessage,
-                              style: const TextStyle(
-                                color: ColorsManager.warningRed,
-                                fontSize: 12,
-                              ),
-                            ),
+                            child: Text(state.errorMessage,
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .bodySmall
+                                    ?.copyWith(
+                                      color: ColorsManager.warningRed,
+                                    )),
                           ),
                         const SizedBox(height: 16),
                         Row(
@@ -193,17 +196,21 @@ class CreateSubSpaceDialog extends StatelessWidget {
                             const SizedBox(width: 10),
                             Expanded(
                               child: DefaultButton(
-                                onPressed: () async {
-                                  final subSpaces = context
-                                      .read<SubSpaceBloc>()
-                                      .state
-                                      .subSpaces;
-                                  onSave!(subSpaces);
-                                  Navigator.of(context).pop();
-                                },
+                                onPressed: (state.errorMessage.isNotEmpty)
+                                    ? null
+                                    : () async {
+                                        final subSpaces = context
+                                            .read<SubSpaceBloc>()
+                                            .state
+                                            .subSpaces;
+                                        onSave!(subSpaces);
+                                        Navigator.of(context).pop();
+                                      },
                                 backgroundColor: ColorsManager.secondaryColor,
                                 borderRadius: 10,
-                                foregroundColor: ColorsManager.whiteColors,
+                                foregroundColor: state.errorMessage.isNotEmpty
+                                    ? ColorsManager.whiteColorsWithOpacity
+                                    : ColorsManager.whiteColors,
                                 child: const Text('OK'),
                               ),
                             ),

lib/pages/spaces_management/create_subspace_model/views/create_subspace_model_dialog.dart

@@ -94,12 +94,13 @@ class CreateSubSpaceModelDialog extends StatelessWidget {
                                           duplicateIndices.indexOf(index) != 0;
 
                                   return Chip(
-                                    label: Text(
-                                      subSpace.subspaceName,
-                                      style: const TextStyle(
-                                        color: ColorsManager.spaceColor,
-                                      ),
-                                    ),
+                                    label: Text(subSpace.subspaceName,
+                                        style: Theme.of(context)
+                                            .textTheme
+                                            .bodySmall
+                                            ?.copyWith(
+                                              color: ColorsManager.spaceColor,
+                                            )),
                                     backgroundColor: ColorsManager.whiteColors,
                                     shape: RoundedRectangleBorder(
                                       borderRadius: BorderRadius.circular(10),
@@ -135,28 +136,33 @@ class CreateSubSpaceModelDialog extends StatelessWidget {
                               SizedBox(
                                 width: 200,
                                 child: TextField(
-                                  controller: textController,
-                                  decoration: InputDecoration(
-                                    border: InputBorder.none,
-                                    hintText: state.subSpaces.isEmpty
-                                        ? 'Please enter the name'
-                                        : null,
-                                    hintStyle: const TextStyle(
-                                        color: ColorsManager.lightGrayColor),
-                                  ),
-                                  onSubmitted: (value) {
-                                    if (value.trim().isNotEmpty) {
-                                      context.read<SubSpaceModelBloc>().add(
-                                          AddSubSpaceModel(
-                                              SubspaceTemplateModel(
-                                                  subspaceName: value.trim(),
-                                                  disabled: false)));
-                                      textController.clear();
-                                    }
-                                  },
-                                  style: const TextStyle(
-                                      color: ColorsManager.blackColor),
-                                ),
+                                    controller: textController,
+                                    decoration: InputDecoration(
+                                        border: InputBorder.none,
+                                        hintText: state.subSpaces.isEmpty
+                                            ? 'Please enter the name'
+                                            : null,
+                                        hintStyle: Theme.of(context)
+                                            .textTheme
+                                            .bodySmall!
+                                            .copyWith(
+                                                color: ColorsManager
+                                                    .lightGrayColor)),
+                                    onSubmitted: (value) {
+                                      if (value.trim().isNotEmpty) {
+                                        context.read<SubSpaceModelBloc>().add(
+                                            AddSubSpaceModel(
+                                                SubspaceTemplateModel(
+                                                    subspaceName: value.trim(),
+                                                    disabled: false)));
+                                        textController.clear();
+                                      }
+                                    },
+                                    style: Theme.of(context)
+                                        .textTheme
+                                        .bodyMedium
+                                        ?.copyWith(
+                                            color: ColorsManager.blackColor)),
                               ),
                             ],
                           ),
@@ -164,13 +170,13 @@ class CreateSubSpaceModelDialog extends StatelessWidget {
                         if (state.errorMessage.isNotEmpty)
                           Padding(
                             padding: const EdgeInsets.only(bottom: 16.0),
-                            child: Text(
-                              state.errorMessage,
-                              style: const TextStyle(
-                                color: ColorsManager.red,
-                                fontSize: 12,
-                              ),
-                            ),
+                            child: Text(state.errorMessage,
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .bodySmall
+                                    ?.copyWith(
+                                      color: ColorsManager.red,
+                                    )),
                           ),
                         const SizedBox(height: 16),
                         Row(

lib/pages/spaces_management/helper/space_helper.dart

@@ -0,0 +1,43 @@
+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';
+
+class SpaceHelper {
+  static SpaceModel? findSpaceByUuid(
+      String? uuid, List<CommunityModel> communities) {
+    for (var community in communities) {
+      for (var space in community.spaces) {
+        if (space.uuid == uuid) return space;
+      }
+    }
+    return null;
+  }
+
+  static SpaceModel? findSpaceByInternalId(
+      String? internalId, List<SpaceModel> spaces) {
+    if (internalId != null) {
+      for (var space in spaces) {
+        if (space.internalId == internalId) return space;
+      }
+    }
+
+    return null;
+  }
+
+  static String generateUniqueSpaceName(
+      String originalName, List<SpaceModel> spaces) {
+    final baseName = originalName.replaceAll(RegExp(r'\(\d+\)$'), '').trim();
+    int maxNumber = 0;
+
+    for (var space in spaces) {
+      final match = RegExp(r'^(.*?)\((\d+)\)$').firstMatch(space.name);
+      if (match != null && match.group(1)?.trim() == baseName) {
+        int existingNumber = int.parse(match.group(2)!);
+        if (existingNumber > maxNumber) {
+          maxNumber = existingNumber;
+        }
+      }
+    }
+
+    return "$baseName(${maxNumber + 1})";
+  }
+}

lib/pages/spaces_management/helper/tag_helper.dart

@@ -7,6 +7,138 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 
 class TagHelper {
+  static Map<String, dynamic> updateTags<T>({
+    required List<T> updatedTags,
+    required List<dynamic>? subspaces,
+    required String Function(T) getInternalId,
+    required String? Function(T) getLocation,
+    required void Function(T, String) setLocation,
+    required String Function(dynamic) getSubspaceName,
+    required List<T>? Function(dynamic) getSubspaceTags,
+    required void Function(dynamic, List<T>?) setSubspaceTags,
+    required int? Function(T, List<dynamic>) checkTagExistInSubspace,
+  }) {
+    final modifiedTags = List<T>.from(updatedTags);
+    final modifiedSubspaces = List<dynamic>.from(subspaces ?? []);
+
+    if (subspaces != null) {
+      for (var subspace in subspaces) {
+        getSubspaceTags(subspace)?.removeWhere(
+          (tag) => !modifiedTags.any(
+              (updatedTag) => getInternalId(updatedTag) == getInternalId(tag)),
+        );
+      }
+    }
+
+    for (var tag in modifiedTags.toList()) {
+      if (modifiedSubspaces.isEmpty) continue;
+
+      final prevIndice = checkTagExistInSubspace(tag, modifiedSubspaces);
+      final tagLocation = getLocation(tag);
+
+      if ((tagLocation == 'Main Space' || tagLocation == null) &&
+          (prevIndice == null ||
+              getSubspaceName(modifiedSubspaces[prevIndice]) == 'Main Space')) {
+        continue;
+      }
+
+      if ((tagLocation == 'Main Space' || tagLocation == null) &&
+          prevIndice != null) {
+        getSubspaceTags(modifiedSubspaces[prevIndice])
+            ?.removeWhere((t) => getInternalId(t) == getInternalId(tag));
+        continue;
+      }
+
+      if ((tagLocation != 'Main Space' && tagLocation != null) &&
+          prevIndice == null) {
+        final newIndex = modifiedSubspaces
+            .indexWhere((subspace) => getSubspaceName(subspace) == tagLocation);
+
+        if (newIndex != -1) {
+          if (getSubspaceTags(modifiedSubspaces[newIndex])
+                  ?.any((t) => getInternalId(t) == getInternalId(tag)) !=
+              true) {
+            setLocation(tag, getSubspaceName(modifiedSubspaces[newIndex]));
+            final subspaceTags =
+                getSubspaceTags(modifiedSubspaces[newIndex]) ?? [];
+            subspaceTags.add(tag);
+            setSubspaceTags(modifiedSubspaces[newIndex], subspaceTags);
+          }
+        }
+
+        modifiedTags.removeWhere((t) => getInternalId(t) == getInternalId(tag));
+        continue;
+      }
+
+      if ((tagLocation != 'Main Space' && tagLocation != null) &&
+          tagLocation != getSubspaceName(modifiedSubspaces[prevIndice!])) {
+        getSubspaceTags(modifiedSubspaces[prevIndice])
+            ?.removeWhere((t) => getInternalId(t) == getInternalId(tag));
+
+        final newIndex = modifiedSubspaces
+            .indexWhere((subspace) => getSubspaceName(subspace) == tagLocation);
+
+        if (newIndex != -1) {
+          if (getSubspaceTags(modifiedSubspaces[newIndex])
+                  ?.any((t) => getInternalId(t) == getInternalId(tag)) !=
+              true) {
+            setLocation(tag, getSubspaceName(modifiedSubspaces[newIndex]));
+            final subspaceTags =
+                getSubspaceTags(modifiedSubspaces[newIndex]) ?? [];
+            subspaceTags.add(tag);
+            setSubspaceTags(modifiedSubspaces[newIndex], subspaceTags);
+          }
+        }
+
+        modifiedTags.removeWhere((t) => getInternalId(t) == getInternalId(tag));
+        continue;
+      }
+
+      if ((tagLocation != 'Main Space' && tagLocation != null) &&
+          tagLocation == getSubspaceName(modifiedSubspaces[prevIndice!])) {
+        modifiedTags.removeWhere((t) => getInternalId(t) == getInternalId(tag));
+        continue;
+      }
+
+      if ((tagLocation == 'Main Space' || tagLocation == null) &&
+          prevIndice != null) {
+        getSubspaceTags(modifiedSubspaces[prevIndice])
+            ?.removeWhere((t) => getInternalId(t) == getInternalId(tag));
+      }
+    }
+
+    return {
+      'updatedTags': modifiedTags,
+      'subspaces': modifiedSubspaces,
+    };
+  }
+
+  static List<String> getAvailableTags<T>({
+    required List<String> allTags,
+    required List<T> currentTags,
+    required T currentTag,
+    required String? Function(T) getTag, // Allow nullable return type
+  }) {
+    return allTags
+        .where((tagValue) => !currentTags
+            .where((e) => e != currentTag) // Exclude the current row
+            .map((e) => getTag(e) ?? '') // Handle null values gracefully
+            .contains(tagValue))
+        .toList();
+  }
+
+  static List<String> getAvailableTagModels(
+      List<String> allTags, List<TagModel> currentTags, TagModel currentTag) {
+    List<String> availableTagsForTagModel =
+        TagHelper.getAvailableTags<TagModel>(
+      allTags: allTags,
+      currentTags: currentTags,
+      currentTag: currentTag,
+      getTag: (tag) => tag.tag ?? '',
+    );
+    return availableTagsForTagModel;
+  }
+
   static List<TagModel> generateInitialTags({
     List<TagModel>? spaceTagModels,
     List<SubspaceTemplateModel>? subspaces,
@@ -36,7 +168,7 @@ class TagHelper {
     return initialTags;
   }
 
- static List<Tag> generateInitialForTags({
+  static List<Tag> generateInitialForTags({
     List<Tag>? spaceTags,
     List<SubspaceModel>? subspaces,
   }) {
@@ -145,4 +277,64 @@ class TagHelper {
             ))
         .toList();
   }
+
+  static int? checkTagExistInSubspaceModels(
+      TagModel tag, List<dynamic>? subspaces) {
+    if (subspaces == null) return null;
+
+    for (int i = 0; i < subspaces.length; i++) {
+      final subspace = subspaces[i] as SubspaceTemplateModel; // Explicit cast
+      if (subspace.tags == null) continue;
+      for (var t in subspace.tags!) {
+        if (tag.internalId == t.internalId) {
+          return i;
+        }
+      }
+    }
+    return null;
+  }
+
+  static Map<String, dynamic> updateSubspaceTagModels(
+      List<TagModel> updatedTags, List<SubspaceTemplateModel>? subspaces) {
+    return TagHelper.updateTags<TagModel>(
+      updatedTags: updatedTags,
+      subspaces: subspaces,
+      getInternalId: (tag) => tag.internalId,
+      getLocation: (tag) => tag.location,
+      setLocation: (tag, location) => tag.location = location,
+      getSubspaceName: (subspace) => subspace.subspaceName,
+      getSubspaceTags: (subspace) => subspace.tags,
+      setSubspaceTags: (subspace, tags) => subspace.tags = tags,
+      checkTagExistInSubspace: checkTagExistInSubspaceModels,
+    );
+  }
+
+  static int? checkTagExistInSubspace(Tag tag, List<dynamic>? subspaces) {
+    if (subspaces == null) return null;
+    for (int i = 0; i < subspaces.length; i++) {
+      final subspace = subspaces[i];
+      if (subspace.tags == null) continue;
+      for (var t in subspace.tags!) {
+        if (tag.internalId == t.internalId) {
+          return i;
+        }
+      }
+    }
+    return null;
+  }
+
+  static Map<String, dynamic> processTags(
+      List<Tag> updatedTags, List<SubspaceModel>? subspaces) {
+    return TagHelper.updateTags<Tag>(
+      updatedTags: updatedTags,
+      subspaces: subspaces,
+      getInternalId: (tag) => tag.internalId,
+      getLocation: (tag) => tag.location,
+      setLocation: (tag, location) => tag.location = location,
+      getSubspaceName: (subspace) => subspace.subspaceName,
+      getSubspaceTags: (subspace) => subspace.tags,
+      setSubspaceTags: (subspace, tags) => subspace.tags = tags,
+      checkTagExistInSubspace: checkTagExistInSubspace,
+    );
+  }
 }

lib/pages/spaces_management/space_model/models/space_template_model.dart

@@ -1,5 +1,4 @@
 import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_update_model.dart';

lib/pages/spaces_management/space_model/view/space_model_page.dart

@@ -11,8 +11,10 @@ import 'package:syncrow_web/utils/color_manager.dart';
 
 class SpaceModelPage extends StatelessWidget {
   final List<ProductModel>? products;
+  final Function(List<SpaceTemplateModel>)? onSpaceModelsUpdated;
 
-  const SpaceModelPage({Key? key, this.products}) : super(key: key);
+  const SpaceModelPage({Key? key, this.products, this.onSpaceModelsUpdated})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -25,6 +27,10 @@ class SpaceModelPage extends StatelessWidget {
           final allTagValues = _getAllTagValues(spaceModels);
           final allSpaceModelNames = _getAllSpaceModelName(spaceModels);
 
+          if (onSpaceModelsUpdated != null) {
+            onSpaceModelsUpdated!(spaceModels);
+          }
+
           return Scaffold(
             backgroundColor: ColorsManager.whiteColors,
             body: Padding(
@@ -97,7 +103,10 @@ class SpaceModelPage extends StatelessWidget {
           return Center(
             child: Text(
               'Error: ${state.message}',
-              style: const TextStyle(color: ColorsManager.warningRed),
+              style: Theme.of(context)
+                  .textTheme
+                  .bodySmall
+                  ?.copyWith(color: ColorsManager.warningRed),
             ),
           );
         }
@@ -109,14 +118,14 @@ class SpaceModelPage extends StatelessWidget {
   double _calculateChildAspectRatio(BuildContext context) {
     double screenWidth = MediaQuery.of(context).size.width;
     if (screenWidth > 1600) {
-      return 2;
+      return 1.5; // Decrease to make cards taller
     }
     if (screenWidth > 1200) {
-      return 3;
+      return 2.0;
     } else if (screenWidth > 800) {
-      return 3.5;
+      return 2.5;
     } else {
-      return 4.0;
+      return 3.0;
     }
   }
 

lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart

@@ -129,10 +129,16 @@ class CreateSpaceModelDialog extends StatelessWidget {
                     const SizedBox(height: 16),
                     SubspaceModelCreate(
                       subspaces: state.space.subspaceModels ?? [],
-                      onSpaceModelUpdate: (updatedSubspaces) {
+                      tags: state.space.tags ?? [],
+                      onSpaceModelUpdate: (updatedSubspaces,updatedTags) {
                         context
                             .read<CreateSpaceModelBloc>()
                             .add(AddSubspacesToSpaceTemplate(updatedSubspaces));
+                        if(updatedTags!=null){
+                          context
+                            .read<CreateSpaceModelBloc>()
+                            .add(AddTagsToSpaceTemplate(updatedTags));
+                        }
                       },
                     ),
                     const SizedBox(height: 10),
@@ -167,7 +173,8 @@ class CreateSpaceModelDialog extends StatelessWidget {
                               onPressed: ((state.errorMessage != null &&
                                           state.errorMessage != '') ||
                                       !isNameValid)
-                                  ? () {
+                                  ? null
+                                  : () {
                                       final updatedSpaceTemplate =
                                           updatedSpaceModel.copyWith(
                                         modelName:
@@ -240,8 +247,7 @@ class CreateSpaceModelDialog extends StatelessWidget {
                                           }
                                         }
                                       }
-                                    }
-                                  : null,
+                                    },
                               backgroundColor: ColorsManager.secondaryColor,
                               borderRadius: 10,
                               foregroundColor: ((state.errorMessage != null &&

lib/pages/spaces_management/space_model/widgets/dynamic_room_widget.dart

@@ -29,7 +29,7 @@ class DynamicRoomWidget extends StatelessWidget {
       final TextPainter textPainter = TextPainter(
         text: TextSpan(
           text: subspace.subspaceName,
-          style: const TextStyle(fontSize: 16),
+          style: Theme.of(context).textTheme.bodyMedium
         ),
         textDirection: TextDirection.ltr,
       )..layout();

lib/pages/spaces_management/space_model/widgets/space_model_card_widget.dart

@@ -31,82 +31,90 @@ class SpaceModelCardWidget extends StatelessWidget {
       }
     }
 
-    return Container(
-      padding: const EdgeInsets.all(16.0),
-      decoration: BoxDecoration(
-        color: Colors.white,
-        borderRadius: BorderRadius.circular(10),
-        boxShadow: [
-          BoxShadow(
-            color: Colors.grey.withOpacity(0.5),
-            spreadRadius: 2,
-            blurRadius: 5,
-            offset: const Offset(0, 3),
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        bool showOnlyName = constraints.maxWidth < 250;
+       return Container(
+          padding: const EdgeInsets.all(16.0),
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: BorderRadius.circular(10),
+            boxShadow: [
+              BoxShadow(
+                color: Colors.grey.withOpacity(0.5),
+                spreadRadius: 2,
+                blurRadius: 5,
+                offset: const Offset(0, 3),
+              ),
+            ],
           ),
-        ],
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(
-            model.modelName,
-            style: Theme.of(context).textTheme.headlineMedium?.copyWith(
-                  color: Colors.black,
-                  fontWeight: FontWeight.bold,
-                ),
-            maxLines: 1,
-            overflow: TextOverflow.ellipsis,
-          ),
-          const SizedBox(height: 10),
-          Expanded(
-            child: Row(
-              children: [
-                // Left Container
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                model.modelName,
+                style: Theme.of(context).textTheme.headlineMedium?.copyWith(
+                      color: Colors.black,
+                      fontWeight: FontWeight.bold,
+                    ),
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+              ),
+              if (!showOnlyName) ...[
+                const SizedBox(height: 10),
                 Expanded(
-                  flex: 1, // Distribute space proportionally
-                  child: Container(
-                    padding: const EdgeInsets.all(8.0),
-                    child: LayoutBuilder(
-                      builder: (context, constraints) {
-                        return Align(
-                          alignment: Alignment.topLeft,
-                          child: DynamicRoomWidget(
-                            subspaceModels: model.subspaceModels,
-                            maxWidth: constraints.maxWidth,
-                            maxHeight: constraints.maxHeight,
+                  child: Row(
+                    children: [
+                      // Left Container
+                      Expanded(
+                        flex: 1, // Distribute space proportionally
+                        child: Container(
+                          padding: const EdgeInsets.all(8.0),
+                          child: LayoutBuilder(
+                            builder: (context, constraints) {
+                              return Align(
+                                alignment: Alignment.topLeft,
+                                child: DynamicRoomWidget(
+                                  subspaceModels: model.subspaceModels,
+                                  maxWidth: constraints.maxWidth,
+                                  maxHeight: constraints.maxHeight,
+                                ),
+                              );
+                            },
                           ),
-                        );
-                      },
-                    ),
+                        ),
+                      ),
+                      if (productTagCount.isNotEmpty &&
+                          model.subspaceModels != null)
+                        Container(
+                          width: 1.0,
+                          color: ColorsManager.softGray,
+                          margin: const EdgeInsets.symmetric(vertical: 6.0),
+                        ),
+                      Expanded(
+                        flex: 1, // Distribute space proportionally
+                        child: Container(
+                          padding: const EdgeInsets.all(8.0),
+                          child: LayoutBuilder(
+                            builder: (context, constraints) {
+                              return Align(
+                                  alignment: Alignment.topLeft,
+                                  child: DynamicProductWidget(
+                                      productTagCount: productTagCount,
+                                      maxWidth: constraints.maxWidth,
+                                      maxHeight: constraints.maxHeight));
+                            },
+                          ),
+                        ),
+                      ),
+                    ],
                   ),
                 ),
-                if (productTagCount.isNotEmpty && model.subspaceModels != null)
-                  Container(
-                    width: 1.0,
-                    color: ColorsManager.softGray,
-                    margin: const EdgeInsets.symmetric(vertical: 6.0),
-                  ),
-                Expanded(
-                  flex: 1, // Distribute space proportionally
-                  child: Container(
-                    padding: const EdgeInsets.all(8.0),
-                    child: LayoutBuilder(
-                      builder: (context, constraints) {
-                        return Align(
-                            alignment: Alignment.topLeft,
-                            child: DynamicProductWidget(
-                                productTagCount: productTagCount,
-                                maxWidth: constraints.maxWidth,
-                                maxHeight: constraints.maxHeight));
-                      },
-                    ),
-                  ),
-                ),
-              ],
-            ),
+              ]
+            ],
           ),
-        ],
-      ),
+        );
+      },
     );
   }
 }

lib/pages/spaces_management/space_model/widgets/subspace_model_create_widget.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/common/edit_chip.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
+import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/widgets/button_content_widget.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace_model/views/create_subspace_model_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/widgets/subspace_name_label_widget.dart';
@@ -8,13 +9,16 @@ import 'package:syncrow_web/utils/color_manager.dart';
 
 class SubspaceModelCreate extends StatefulWidget {
   final List<SubspaceTemplateModel> subspaces;
-  final void Function(List<SubspaceTemplateModel> newSubspaces)?
+  final void Function(
+          List<SubspaceTemplateModel> newSubspaces, List<TagModel>? tags)?
       onSpaceModelUpdate;
+  final List<TagModel> tags;
 
   const SubspaceModelCreate({
     Key? key,
     required this.subspaces,
     this.onSpaceModelUpdate,
+    required this.tags,
   }) : super(key: key);
 
   @override
@@ -24,11 +28,13 @@ class SubspaceModelCreate extends StatefulWidget {
 class _SubspaceModelCreateState extends State<SubspaceModelCreate> {
   late List<SubspaceTemplateModel> _subspaces;
   String? errorSubspaceId;
+  late List<TagModel> _tags;
 
   @override
   void initState() {
     super.initState();
     _subspaces = List.from(widget.subspaces);
+    _tags = List.from(widget.tags);
   }
 
   @override
@@ -106,12 +112,25 @@ class _SubspaceModelCreateState extends State<SubspaceModelCreate> {
           dialogTitle: dialogTitle,
           existingSubSpaces: _subspaces,
           onUpdate: (subspaceModels) {
+            final updatedIds = subspaceModels.map((s) => s.internalId).toSet();
+            final deletedSubspaces = _subspaces
+                .where((s) => !updatedIds.contains(s.internalId))
+                .toList();
+
+            final List<TagModel> tagsToAppendToSpace = [];
+
+            for (var s in deletedSubspaces) {
+              if (s.tags != null) {
+                tagsToAppendToSpace.addAll(s.tags!);
+              }
+            }
+
             setState(() {
               _subspaces = subspaceModels;
-              errorSubspaceId = null;
+              _tags.addAll(tagsToAppendToSpace);
             });
             if (widget.onSpaceModelUpdate != null) {
-              widget.onSpaceModelUpdate!(subspaceModels);
+              widget.onSpaceModelUpdate!(subspaceModels, _tags);
             }
           },
         );

lib/pages/spaces_management/space_model/widgets/subspace_name_label_widget.dart

@@ -52,6 +52,13 @@ class _SubspaceNameDisplayWidgetState extends State<SubspaceNameDisplayWidget> {
 
   void _handleValidationAndSave() {
     final updatedName = _controller.text;
+
+    if (updatedName.isEmpty) {
+      setState(() {
+        errorText = 'Subspace name cannot be empty.';
+      });
+      return;
+    }
     if (widget.validateName(updatedName)) {
       setState(() {
         errorText = null;

lib/services/space_mana_api.dart

@@ -4,7 +4,9 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/create_subs
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_response_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/create_space_template_body_model.dart';
+import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_body_model.dart';
+import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_update_model.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';
 import 'package:syncrow_web/utils/constants/temp_const.dart';
@@ -154,7 +156,7 @@ class CommunitySpaceManagementApi {
             .replaceAll('{spaceId}', spaceId)
             .replaceAll('{projectId}', TempConst.projectId),
         expectedResponseModel: (json) {
-          return SpaceModel.fromJson(json);
+          return SpaceModel.fromJson(json['data']);
         },
       );
       return response;
@@ -210,7 +212,7 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<SpaceModel?> updateSpace({
+  Future<bool> updateSpace({
     required String communityId,
     required spaceId,
     required String name,
@@ -219,6 +221,8 @@ class CommunitySpaceManagementApi {
     String? direction,
     bool isPrivate = false,
     required Offset position,
+    List<TagModelUpdate>? tags,
+    List<UpdateSubspaceTemplateModel>? subspaces,
   }) async {
     try {
       final body = {
@@ -228,6 +232,8 @@ class CommunitySpaceManagementApi {
         'y': position.dy,
         'direction': direction,
         'icon': icon,
+        'subspace': subspaces,
+        'tags': tags,
       };
       if (parentId != null) {
         body['parentUuid'] = parentId;
@@ -240,13 +246,13 @@ class CommunitySpaceManagementApi {
             .replaceAll('{projectId}', TempConst.projectId),
         body: body,
         expectedResponseModel: (json) {
-          return SpaceModel.fromJson(json['data']);
+          return json['success'] ?? false;
         },
       );
       return response;
     } catch (e) {
-      debugPrint('Error creating space: $e');
-      return null;
+      debugPrint('Error updating space: $e');
+      return false;
     }
   }