Merge branch 'dev' of https://github.com/SyncrowIOT/web into bugfix/assign_togs_to_table_overflow

bugfix/assign_tag_to_devices_table_overflow.
[FE] On Uba Gateway device the Icons of the devices inside are not all of them displayed (#359 )
2026-10-26 10:37:57 +00:00 · 2025-07-23 09:38:00 +03:00 · 2025-07-23 09:37:11 +03:00 · 2025-07-23 09:34:10 +03:00 · 2025-07-23 09:33:46 +03:00 · 2025-07-23 09:31:16 +03:00
17 changed files with 423 additions and 174 deletions
@@ -0,0 +1,9 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M38.0142 39.2553L35.3682 40H20.9308H19.9999H19.0691H1.24111C0.555643 40 0 39.4444 0 38.7589V1.24111C0 0.555643 0.555643 0 1.24111 0H19.0682H20.1226H20.9543H35.4255L38.2625 1.24111C38.9479 1.24111 39.5036 1.79675 39.5036 2.48221L39.2553 38.0142C39.2553 38.6997 38.6997 39.2553 38.0142 39.2553Z" fill="#E9E9E9"/>
+<path d="M38.7585 0H35.0352C35.7206 0 36.2763 0.555643 36.2763 1.24111V38.7589C36.2763 39.4444 35.7206 40 35.0352 40H38.7585C39.4439 40 39.9996 39.4444 39.9996 38.7589V1.24111C39.9996 0.555643 39.4439 0 38.7585 0Z" fill="#D1D1D1"/>
+<path opacity="0.6" d="M12.0283 31.8319V33.3212C12.0283 34.0067 11.6086 34.5623 11.0908 34.5623H6.96582C6.44804 34.5623 6.02832 34.0067 6.02832 33.3212V31.8319C6.02832 31.1465 6.44804 30.5908 6.96582 30.5908H11.0908C11.6086 30.5908 12.0283 31.1465 12.0283 31.8319Z" fill="#023DFE" fill-opacity="0.5"/>
+<path opacity="0.6" d="M12.0283 7.24109V8.73042C12.0283 9.41588 11.6086 9.97153 11.0908 9.97153H6.96582C6.44804 9.97153 6.02832 9.41588 6.02832 8.73042V7.24109C6.02832 6.55563 6.44804 5.99998 6.96582 5.99998H11.0908C11.6086 5.99998 12.0283 6.55563 12.0283 7.24109Z" fill="#023DFE" fill-opacity="0.5"/>
+<path opacity="0.6" d="M26.0283 31.8319V33.3212C26.0283 34.0067 26.448 34.5623 26.9658 34.5623H31.0908C31.6086 34.5623 32.0283 34.0067 32.0283 33.3212V31.8319C32.0283 31.1465 31.6086 30.5908 31.0908 30.5908H26.9658C26.448 30.5908 26.0283 31.1465 26.0283 31.8319Z" fill="#023DFE" fill-opacity="0.5"/>
+<path opacity="0.6" d="M26.0283 7.24109V8.73042C26.0283 9.41588 26.448 9.97153 26.9658 9.97153H31.0908C31.6086 9.97153 32.0283 9.41588 32.0283 8.73042V7.24109C32.0283 6.55563 31.6086 5.99998 31.0908 5.99998H26.9658C26.448 5.99998 26.0283 6.55563 26.0283 7.24109Z" fill="#023DFE" fill-opacity="0.5"/>
+<path d="M19.0693 0H20.931V40H19.0693V0Z" fill="#D1D1D1"/>
+</svg>
@@ -0,0 +1,12 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M38.0142 39.2553L35.3682 40H20.9308H19.9999H19.0691H1.24111C0.555643 40 0 39.4444 0 38.7589V1.24111C0 0.555651 0.555643 7.62939e-06 1.24111 7.62939e-06H19.0682H20.1226H20.9543H35.4255L38.2625 1.24111C38.9479 1.24111 39.5036 1.79676 39.5036 2.48222L39.2553 38.0142C39.2553 38.6997 38.6997 39.2553 38.0142 39.2553Z" fill="#E9E9E9"/>
+<path d="M38.7585 0H35.0352C35.7206 0 36.2763 0.555643 36.2763 1.24111V38.7589C36.2763 39.4444 35.7206 40 35.0352 40H38.7585C39.4439 40 39.9996 39.4444 39.9996 38.7589V1.24111C39.9996 0.555643 39.4439 0 38.7585 0Z" fill="#D1D1D1"/>
+<path opacity="0.6" d="M8.64062 31.8319V33.3212C8.64062 34.0067 8.22091 34.5623 7.70312 34.5623H3.57813C3.06034 34.5623 2.64062 34.0067 2.64062 33.3212V31.8319C2.64062 31.1464 3.06034 30.5908 3.57813 30.5908H7.70312C8.22091 30.5908 8.64062 31.1464 8.64062 31.8319Z" fill="#023DFE" fill-opacity="0.5"/>
+<path opacity="0.6" d="M8.64062 7.24109V8.73042C8.64062 9.41588 8.22091 9.97152 7.70312 9.97152H3.57813C3.06034 9.97152 2.64062 9.41588 2.64062 8.73042V7.24109C2.64062 6.55563 3.06034 5.99998 3.57813 5.99998H7.70312C8.22091 5.99998 8.64062 6.55563 8.64062 7.24109Z" fill="#023DFE" fill-opacity="0.5"/>
+<path opacity="0.6" d="M27.6406 31.8319V33.3212C27.6406 34.0067 28.0603 34.5623 28.5781 34.5623H32.7031C33.2209 34.5623 33.6406 34.0067 33.6406 33.3212V31.8319C33.6406 31.1464 33.2209 30.5908 32.7031 30.5908H28.5781C28.0603 30.5908 27.6406 31.1464 27.6406 31.8319Z" fill="#023DFE" fill-opacity="0.5"/>
+<path opacity="0.6" d="M27.6406 7.24109V8.73042C27.6406 9.41588 28.0603 9.97152 28.5781 9.97152H32.7031C33.2209 9.97152 33.6406 9.41588 33.6406 8.73042V7.24109C33.6406 6.55563 33.2209 5.99998 32.7031 5.99998H28.5781C28.0603 5.99998 27.6406 6.55563 27.6406 7.24109Z" fill="#023DFE" fill-opacity="0.5"/>
+<path opacity="0.6" d="M15.0625 31.8319V33.3212C15.0625 34.0067 15.4822 34.5623 16 34.5623H20.125C20.6428 34.5623 21.0625 34.0067 21.0625 33.3212V31.8319C21.0625 31.1464 20.6428 30.5908 20.125 30.5908H16C15.4822 30.5908 15.0625 31.1464 15.0625 31.8319Z" fill="#023DFE" fill-opacity="0.5"/>
+<path opacity="0.6" d="M15.0625 7.24109V8.73042C15.0625 9.41588 15.4822 9.97152 16 9.97152H20.125C20.6428 9.97152 21.0625 9.41588 21.0625 8.73042V7.24109C21.0625 6.55563 20.6428 5.99998 20.125 5.99998H16C15.4822 5.99998 15.0625 6.55563 15.0625 7.24109Z" fill="#023DFE" fill-opacity="0.5"/>
+<path d="M23.125 0H24.9867V40H23.125V0Z" fill="#D1D1D1"/>
+<path d="M11.1719 0H13.0335V40H11.1719V0Z" fill="#D1D1D1"/>
+</svg>
@@ -100,6 +100,7 @@ class _DeviceItem extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    
    return DeviceControlsContainer(
      child: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
@@ -9,6 +9,8 @@ import 'package:syncrow_web/pages/space_management_v2/modules/communities/presen
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/products/data/services/remote_products_service.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/products/presentation/bloc/products_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/data/services/remote_reorder_spaces_service.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/presentation/bloc/reorder_spaces_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/data/services/remote_space_details_service.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/data/services/unique_space_details_spaces_decorator_service.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/bloc/space_details_bloc.dart';
@@ -25,15 +27,16 @@ class SpaceManagementPage extends StatefulWidget {

 class _SpaceManagementPageState extends State<SpaceManagementPage> {
  late final CommunitiesBloc communitiesBloc;
+  late final HTTPService _httpService;

  @override
  void initState() {
+    _httpService = HTTPService();
    communitiesBloc = CommunitiesBloc(
      communitiesService: DebouncedCommunitiesService(
-        RemoteCommunitiesService(HTTPService()),
+        RemoteCommunitiesService(_httpService),
      ),
    )..add(const LoadCommunities(LoadCommunitiesParam()));
-
    super.initState();
  }

@@ -50,13 +53,18 @@ class _SpaceManagementPageState extends State<SpaceManagementPage> {
        BlocProvider(
          create: (context) => SpaceDetailsBloc(
            UniqueSpaceDetailsSpacesDecoratorService(
-              RemoteSpaceDetailsService(httpService: HTTPService()),
+              RemoteSpaceDetailsService(httpService: _httpService),
            ),
          ),
        ),
        BlocProvider(
          create: (context) => ProductsBloc(
-            RemoteProductsService(HTTPService()),
+            RemoteProductsService(_httpService),
+          ),
+        ),
+        BlocProvider(
+          create: (context) => ReorderSpacesBloc(
+            RemoteReorderSpacesService(_httpService),
          ),
        ),
      ],
@@ -11,6 +11,8 @@ import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/domain/params/reorder_spaces_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/presentation/bloc/reorder_spaces_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/helpers/space_details_dialog_helper.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';

@@ -164,6 +166,16 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
    context.read<CommunitiesBloc>().add(
          CommunitiesUpdateCommunity(newCommunity),
        );
+
+    context.read<ReorderSpacesBloc>().add(
+          ReorderSpacesEvent(
+            ReorderSpacesParam(
+              communityUuid: widget.community.uuid,
+              parentSpaceUuid: data.parent?.uuid ?? '',
+              spaces: children,
+            ),
+          ),
+        );
  }

  void _onSpaceTapped(SpaceModel? space) {
@@ -245,6 +257,13 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
    final levelXOffset = <int, double>{};
    _calculateLayout(community.spaces, 0, levelXOffset);

+    const horizontalCanvasPadding = 100.0;
+    final originalPositions = Map.of(_positions);
+    _positions.clear();
+    for (final entry in originalPositions.entries) {
+      _positions[entry.key] = entry.value.translate(horizontalCanvasPadding, 0);
+    }
+
    final selectedSpace = widget.selectedSpace;
    final highlightedUuids = <String>{};
    if (selectedSpace != null) {
@@ -262,7 +281,7 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
      community: widget.community,
    );

-    final createButtonX = levelXOffset[0] ?? 0.0;
+    final createButtonX = (levelXOffset[0] ?? 0.0) + horizontalCanvasPadding;
    const createButtonY = 0.0;

    widgets.add(
@@ -294,10 +313,12 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
    CommunityModel? community,
    SpaceModel? parent,
  }) {
+    const targetWidth = 40.0;
+    final padding = (_horizontalSpacing - targetWidth) / 2;
    if (spaces.isNotEmpty) {
      final firstChildPos = _positions[spaces.first.uuid]!;
      final targetPos = Offset(
-        firstChildPos.dx - (_horizontalSpacing / 4),
+        firstChildPos.dx - padding - targetWidth,
        firstChildPos.dy,
      );
      widgets.add(_buildDropTarget(parent, community, 0, targetPos));
@@ -379,7 +400,7 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
      );

      final targetPos = Offset(
-        position.dx + cardWidth + (_horizontalSpacing / 4) - 20,
+        position.dx + cardWidth + padding,
        position.dy,
      );
      widgets.add(_buildDropTarget(parent, community, i + 1, targetPos));
@@ -414,24 +435,33 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
      child: DragTarget<SpaceReorderDataModel>(
        builder: (context, candidateData, rejectedData) {
          if (_draggedData == null) {
-            return const SizedBox();
+            return const SizedBox.shrink();
          }

-          final isTargetForDragged = (_draggedData?.parent?.uuid == parent?.uuid &&
-                  _draggedData?.community == null) ||
-              (_draggedData?.community?.uuid == community?.uuid &&
-                  _draggedData?.parent == null);
+          final children = parent?.children ?? community?.spaces ?? [];
+          final isSameParent = (_draggedData!.parent?.uuid == parent?.uuid &&
+                  _draggedData!.community == null) ||
+              (_draggedData!.community?.uuid == community?.uuid &&
+                  _draggedData!.parent == null);

-          if (!isTargetForDragged) {
-            return const SizedBox();
+          if (!isSameParent) {
+            return const SizedBox.shrink();
          }

-          return Container(
+          final oldIndex =
+              children.indexWhere((s) => s.uuid == _draggedData!.space.uuid);
+          if (oldIndex != -1 && (oldIndex == index || oldIndex == index - 1)) {
+            return const SizedBox.shrink();
+          }
+
+          return AnimatedContainer(
+            duration: const Duration(milliseconds: 150),
            width: 40,
+            alignment: Alignment.center,
            height: _cardHeight,
            decoration: BoxDecoration(
              color: context.theme.colorScheme.primary.withValues(
-                alpha: candidateData.isNotEmpty ? 0.7 : 0.3,
+                alpha: candidateData.isNotEmpty ? 0.9 : 0.3,
              ),
              borderRadius: BorderRadius.circular(8),
            ),
@@ -454,6 +484,9 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>

          final oldIndex =
              children.indexWhere((s) => s.uuid == data.data.space.uuid);
+          if (oldIndex == -1) {
+            return true;
+          }
          if (oldIndex == index || oldIndex == index - 1) {
            return false;
          }
@@ -481,7 +514,7 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
        child: SizedBox(
          width: context.screenWidth * 5,
          height: context.screenHeight * 5,
-          child: Stack(children: treeWidgets),
+          child: Stack(clipBehavior: Clip.none, children: treeWidgets),
        ),
      ),
    );
@@ -0,0 +1,58 @@
+import 'package:dio/dio.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/domain/params/reorder_spaces_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/domain/services/reorder_spaces_service.dart';
+import 'package:syncrow_web/services/api/api_exception.dart';
+import 'package:syncrow_web/services/api/http_service.dart';
+import 'package:syncrow_web/utils/constants/api_const.dart';
+
+final class RemoteReorderSpacesService implements ReorderSpacesService {
+  RemoteReorderSpacesService(this._httpClient);
+
+  final HTTPService _httpClient;
+
+  @override
+  Future<void> reorderSpaces(ReorderSpacesParam param) async {
+    try {
+      await _httpClient.post(
+        path: await _makeUrl(param),
+        body: param.toJson(),
+        expectedResponseModel: (json) => json,
+      );
+    } on DioException catch (e) {
+      final message = e.response?.data as Map<String, dynamic>?;
+      throw APIException(_getErrorMessageFromBody(message));
+    } catch (e) {
+      throw APIException(e.toString());
+    }
+  }
+
+  String _getErrorMessageFromBody(Map<String, dynamic>? body) {
+    if (body == null) return 'Failed to delete space';
+    final error = body['error'] as Map<String, dynamic>?;
+    final errorMessage = error?['message'] as String? ?? '';
+    return errorMessage;
+  }
+
+  Future<String> _makeUrl(ReorderSpacesParam param) async {
+    final projectUuid = await ProjectManager.getProjectUUID();
+    final communityUuid = param.communityUuid;
+
+    if (projectUuid == null || projectUuid.isEmpty) {
+      throw APIException('Project UUID is not set');
+    }
+
+    if (communityUuid.isEmpty) {
+      throw APIException('Community UUID is not set');
+    }
+
+    if (param.parentSpaceUuid.isEmpty) {
+      throw APIException('Parent Space UUID is not set');
+    }
+
+    return ApiEndpoints.reorderSpaces
+        .replaceAll('{projectUuid}', projectUuid)
+        .replaceAll('{communityUuid}', communityUuid)
+        .replaceAll('{parentSpaceUuid}', param.parentSpaceUuid);
+  }
+}
@@ -0,0 +1,21 @@
+import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
+
+class ReorderSpacesParam extends Equatable {
+  const ReorderSpacesParam({
+    required this.communityUuid,
+    required this.parentSpaceUuid,
+    required this.spaces,
+  });
+
+  final String communityUuid;
+  final String parentSpaceUuid;
+  final List<SpaceModel> spaces;
+
+  @override
+  List<Object?> get props => [spaces, communityUuid, parentSpaceUuid];
+
+  Map<String, dynamic> toJson() => {
+        'spacesUuids': spaces.map((space) => space.uuid).toList(),
+      };
+}
@@ -0,0 +1,5 @@
+import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/domain/params/reorder_spaces_param.dart';
+
+abstract interface class ReorderSpacesService {
+  Future<void> reorderSpaces(ReorderSpacesParam param);
+}
@@ -0,0 +1,35 @@
+import 'package:bloc/bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/domain/params/reorder_spaces_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/reorder_spaces/domain/services/reorder_spaces_service.dart';
+import 'package:syncrow_web/services/api/api_exception.dart';
+
+part 'reorder_spaces_event.dart';
+part 'reorder_spaces_state.dart';
+
+class ReorderSpacesBloc extends Bloc<ReorderSpacesEvent, ReorderSpacesState> {
+  ReorderSpacesBloc(
+    this._reorderSpacesService,
+  ) : super(const ReorderSpacesInitial()) {
+    on<ReorderSpacesEvent>(_onReorderSpacesEvent);
+  }
+
+  final ReorderSpacesService _reorderSpacesService;
+
+  Future<void> _onReorderSpacesEvent(
+    ReorderSpacesEvent event,
+    Emitter<ReorderSpacesState> emit,
+  ) async {
+    emit(const ReorderSpacesLoading());
+    try {
+      await _reorderSpacesService.reorderSpaces(event.param);
+      emit(const ReorderSpacesSuccess());
+    } on APIException catch (e) {
+      emit(ReorderSpacesFailure(e.message));
+    } catch (e) {
+      emit(ReorderSpacesFailure(e.toString()));
+    } finally {
+      emit(const ReorderSpacesInitial());
+    }
+  }
+}
@@ -0,0 +1,10 @@
+part of 'reorder_spaces_bloc.dart';
+
+final class ReorderSpacesEvent extends Equatable {
+  const ReorderSpacesEvent(this.param);
+
+  final ReorderSpacesParam param;
+
+  @override
+  List<Object> get props => [param];
+}
@@ -0,0 +1,29 @@
+part of 'reorder_spaces_bloc.dart';
+
+sealed class ReorderSpacesState extends Equatable {
+  const ReorderSpacesState();
+
+  @override
+  List<Object> get props => [];
+}
+
+final class ReorderSpacesInitial extends ReorderSpacesState {
+  const ReorderSpacesInitial();
+}
+
+final class ReorderSpacesLoading extends ReorderSpacesState {
+  const ReorderSpacesLoading();
+}
+
+final class ReorderSpacesSuccess extends ReorderSpacesState {
+  const ReorderSpacesSuccess();
+}
+
+final class ReorderSpacesFailure extends ReorderSpacesState {
+  const ReorderSpacesFailure(this.errorMessage);
+
+  final String errorMessage;
+
+  @override
+  List<Object> get props => [errorMessage];
+}
@@ -103,7 +103,9 @@ class SpaceDetailsDevicesBox extends StatelessWidget {
    ).then((resultSpace) {
      if (resultSpace != null) {
        if (context.mounted) {
-          context.read<SpaceDetailsModelBloc>().add(UpdateSpaceDetails(resultSpace));
+          context
+              .read<SpaceDetailsModelBloc>()
+              .add(UpdateSpaceDetails(resultSpace));
        }
      }
    });
@@ -133,6 +135,9 @@ class SpaceDetailsDevicesBox extends StatelessWidget {
        DeviceType.ThreeTouch => Assets.gangSwitch,
        DeviceType.NCPS => Assets.sensors,
        DeviceType.PC => Assets.powerClamp,
+        DeviceType.fourSceen => Assets.fourSceenSwitch,
+        DeviceType.sixSceen => Assets.sixSceenSwitch,
+        DeviceType.SOS => Assets.sos,
        DeviceType.Other => Assets.blackLogo,
        null => Assets.blackLogo,
      };
@@ -31,173 +31,178 @@ class AssignTagsTable extends StatelessWidget {

  DataColumn _buildDataColumn(BuildContext context, String label) {
    return DataColumn(
-      label: SelectableText(label, style: context.textTheme.bodyMedium),
+      label: Expanded(
+        child: FittedBox(
+          alignment: AlignmentDirectional.centerStart,
+          fit: BoxFit.scaleDown,
+          child: SelectableText(label, style: context.textTheme.bodyMedium),
+        ),
+      ),
    );
  }

  @override
  Widget build(BuildContext context) {
    return BlocProvider<TagsBloc>(
-      create: (BuildContext context) => TagsBloc(
+      create: (context) => TagsBloc(
        RemoteTagsService(HTTPService()),
      )..add(const LoadTags()),
      child: BlocBuilder<TagsBloc, TagsState>(
-        builder: (context, state) {
-          return switch (state) {
-            TagsLoading() || TagsInitial() => const Center(
-                child: CircularProgressIndicator(),
-              ),
-            TagsFailure(:final message) => Center(
-                child: Text(message),
-              ),
-            TagsLoaded(:final tags) => ClipRRect(
-                borderRadius: BorderRadius.circular(20),
-                child: DataTable(
-                  headingRowColor: WidgetStateProperty.all(
-                    ColorsManager.dataHeaderGrey,
-                  ),
-                  key: ValueKey(productAllocations.length),
-                  border: TableBorder.all(
-                    color: ColorsManager.dataHeaderGrey,
-                    width: 1,
-                    borderRadius: BorderRadius.circular(20),
-                  ),
-                  columns: [
-                    _buildDataColumn(context, '#'),
-                    _buildDataColumn(context, 'Device'),
-                    _buildDataColumn(context, 'Tag'),
-                    _buildDataColumn(context, 'Location'),
-                  ],
-                  rows: productAllocations.isEmpty
-                      ? [
-                          DataRow(
-                            cells: [
-                              DataCell(
-                                Center(
-                                  child: SelectableText(
-                                    'No Devices Available',
-                                    style: context.textTheme.bodyMedium?.copyWith(
-                                      color: ColorsManager.lightGrayColor,
-                                    ),
-                                  ),
-                                ),
-                              ),
-                              DataCell.empty,
-                              DataCell.empty,
-                              DataCell.empty,
-                            ],
-                          ),
-                        ]
-                      : List.generate(productAllocations.length, (index) {
-                          final productAllocation = productAllocations[index];
-                          final allocationUuid = productAllocation.uuid;
-
-                          final availableTags = tags
-                              .where(
-                                (tag) =>
-                                    !productAllocations
-                                        .where((p) =>
-                                            p.product.productType ==
-                                            productAllocation.product.productType)
-                                        .map((p) => p.tag.name.toLowerCase())
-                                        .contains(tag.name.toLowerCase()) ||
-                                    tag.uuid == productAllocation.tag.uuid,
-                              )
-                              .toList();
-
-                          final currentLocationUuid =
-                              productLocations[allocationUuid];
-                          final currentLocationName = currentLocationUuid == null
-                              ? 'Main Space'
-                              : subspaces
-                                  .firstWhere((s) => s.uuid == currentLocationUuid)
-                                  .name;
-
-                          return DataRow(
-                            key: ValueKey(allocationUuid),
-                            cells: [
-                              DataCell(Text((index + 1).toString())),
-                              DataCell(
-                                Row(
-                                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                  children: [
-                                    Expanded(
-                                        child: Text(
-                                      productAllocation.product.name,
-                                      overflow: TextOverflow.ellipsis,
-                                    )),
-                                    const SizedBox(width: 10),
-                                    Container(
-                                      width: 20,
-                                      height: 20,
-                                      decoration: BoxDecoration(
-                                        shape: BoxShape.circle,
-                                        border: Border.all(
-                                          color: ColorsManager.lightGrayColor,
-                                          width: 1,
-                                        ),
-                                      ),
-                                      child: IconButton(
-                                        icon: const Icon(
-                                          Icons.close,
-                                          color: ColorsManager.lightGreyColor,
-                                          size: 16,
-                                        ),
-                                        onPressed: () {
-                                          onProductDeleted(allocationUuid);
-                                        },
-                                        tooltip: 'Delete Tag',
-                                        padding: EdgeInsets.zero,
-                                        constraints: const BoxConstraints(),
-                                      ),
-                                    ),
-                                  ],
-                                ),
-                              ),
-                              DataCell(
-                                Container(
-                                  alignment: Alignment.centerLeft,
-                                  width: double.infinity,
-                                  child: ProductTagField(
-                                    key: ValueKey('dropdown_$allocationUuid'),
-                                    productName: productAllocation.product.uuid,
-                                    initialValue: productAllocation.tag,
-                                    onSelected: (newTag) {
-                                      onTagSelected(allocationUuid, newTag);
-                                    },
-                                    items: availableTags,
-                                  ),
-                                ),
-                              ),
-                              DataCell(
-                                SizedBox(
-                                    width: double.infinity,
-                                    child: DialogDropdown(
-                                      items: [
-                                        'Main Space',
-                                        ...subspaces.map((s) => s.name)
-                                      ],
-                                      selectedValue: currentLocationName,
-                                      onSelected: (newLocationName) {
-                                        final newSubspaceUuid = newLocationName ==
-                                                'Main Space'
-                                            ? null
-                                            : subspaces
-                                                .firstWhere(
-                                                    (s) => s.name == newLocationName)
-                                                .uuid;
-                                        onLocationSelected(
-                                            allocationUuid, newSubspaceUuid);
-                                      },
-                                    )),
-                              ),
-                            ],
-                          );
-                        }),
+        builder: (context, state) => switch (state) {
+          TagsLoading() || TagsInitial() => const Center(
+              child: CircularProgressIndicator(),
+            ),
+          TagsFailure(:final message) => Center(
+              child: Text(message),
+            ),
+          TagsLoaded(:final tags) => ClipRRect(
+              borderRadius: BorderRadius.circular(20),
+              child: DataTable(
+                headingRowColor: WidgetStateProperty.all(
+                  ColorsManager.dataHeaderGrey,
                ),
+                key: ValueKey(productAllocations.length),
+                border: TableBorder.all(
+                  color: ColorsManager.dataHeaderGrey,
+                  width: 1,
+                  borderRadius: BorderRadius.circular(20),
+                ),
+                columns: [
+                  _buildDataColumn(context, '#'),
+                  _buildDataColumn(context, 'Device'),
+                  _buildDataColumn(context, 'Tag'),
+                  _buildDataColumn(context, 'Location'),
+                ],
+                rows: productAllocations.isEmpty
+                    ? [
+                        DataRow(
+                          cells: [
+                            DataCell(
+                              FittedBox(
+                                alignment: AlignmentDirectional.centerStart,
+                                fit: BoxFit.scaleDown,
+                                child: SelectableText(
+                                  'No Devices Available',
+                                  style: context.textTheme.bodyMedium?.copyWith(
+                                    color: ColorsManager.lightGrayColor,
+                                  ),
+                                ),
+                              ),
+                            ),
+                            DataCell.empty,
+                            DataCell.empty,
+                            DataCell.empty,
+                          ],
+                        ),
+                      ]
+                    : List.generate(productAllocations.length, (index) {
+                        final productAllocation = productAllocations[index];
+                        final allocationUuid = productAllocation.uuid;
+
+                        final availableTags = tags
+                            .where(
+                              (tag) =>
+                                  !productAllocations
+                                      .where((p) =>
+                                          p.product.productType ==
+                                          productAllocation.product.productType)
+                                      .map((p) => p.tag.name.toLowerCase())
+                                      .contains(tag.name.toLowerCase()) ||
+                                  tag.uuid == productAllocation.tag.uuid,
+                            )
+                            .toList();
+
+                        final currentLocationUuid = productLocations[allocationUuid];
+                        final currentLocationName = currentLocationUuid == null
+                            ? 'Main Space'
+                            : subspaces
+                                .firstWhere((s) => s.uuid == currentLocationUuid)
+                                .name;
+
+                        return DataRow(
+                          key: ValueKey(allocationUuid),
+                          cells: [
+                            DataCell(Text((index + 1).toString())),
+                            DataCell(
+                              Row(
+                                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                children: [
+                                  Expanded(
+                                      child: Text(
+                                    productAllocation.product.name,
+                                    overflow: TextOverflow.ellipsis,
+                                  )),
+                                  const SizedBox(width: 10),
+                                  Container(
+                                    width: 20,
+                                    height: 20,
+                                    decoration: BoxDecoration(
+                                      shape: BoxShape.circle,
+                                      border: Border.all(
+                                        color: ColorsManager.lightGrayColor,
+                                        width: 1,
+                                      ),
+                                    ),
+                                    child: IconButton(
+                                      icon: const Icon(
+                                        Icons.close,
+                                        color: ColorsManager.lightGreyColor,
+                                        size: 16,
+                                      ),
+                                      onPressed: () {
+                                        onProductDeleted(allocationUuid);
+                                      },
+                                      tooltip: 'Delete Tag',
+                                      padding: EdgeInsets.zero,
+                                      constraints: const BoxConstraints(),
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                            DataCell(
+                              Container(
+                                alignment: Alignment.centerLeft,
+                                width: double.infinity,
+                                child: ProductTagField(
+                                  key: ValueKey('dropdown_$allocationUuid'),
+                                  productName: productAllocation.product.uuid,
+                                  initialValue: productAllocation.tag,
+                                  onSelected: (newTag) {
+                                    onTagSelected(allocationUuid, newTag);
+                                  },
+                                  items: availableTags,
+                                ),
+                              ),
+                            ),
+                            DataCell(
+                              SizedBox(
+                                  width: double.infinity,
+                                  child: DialogDropdown(
+                                    items: [
+                                      'Main Space',
+                                      ...subspaces.map((s) => s.name)
+                                    ],
+                                    selectedValue: currentLocationName,
+                                    onSelected: (newLocationName) {
+                                      final newSubspaceUuid = newLocationName ==
+                                              'Main Space'
+                                          ? null
+                                          : subspaces
+                                              .firstWhere(
+                                                  (s) => s.name == newLocationName)
+                                              .uuid;
+                                      onLocationSelected(
+                                          allocationUuid, newSubspaceUuid);
+                                    },
+                                  )),
+                            ),
+                          ],
+                        );
+                      }),
              ),
-            _ => const SizedBox.shrink(),
-          };
+            ),
+          _ => const SizedBox.shrink(),
        },
      ),
    );
@@ -84,6 +84,14 @@ class DeviceModel {
      tempIcon = Assets.curtainIcon;
    } else if (type == DeviceType.Curtain) {
      tempIcon = Assets.curtainIcon;
+    } else if (type == DeviceType.fourSceen) {
+      tempIcon = Assets.fourSceenSwitch;
+    } else if (type == DeviceType.sixSceen) {
+      tempIcon = Assets.sixSceenSwitch;
+    } else if (type == DeviceType.SOS) {
+      tempIcon = Assets.sos;
+    } else if (type == DeviceType.NCPS) {
+      tempIcon = Assets.presenceSensor;
    } else {
      tempIcon = Assets.blackLogo;
    }
@@ -41,6 +41,8 @@ abstract class ApiEndpoints {
      '/projects/{projectId}/communities/{communityId}/spaces/{spaceId}';
  static const String getSpaceHierarchy =
      '/projects/{projectId}/communities/{communityId}/spaces';
+  static const String reorderSpaces =
+      '/projects/{projectUuid}/communities/{communityUuid}/spaces/{parentSpaceUuid}/spaces/order';

 // Community Module
  static const String createCommunity = '/projects/{projectId}/communities';
@@ -4,6 +4,8 @@ class Assets {
  static const String webBackground = 'assets/images/web_Background.svg';
  static const String webBackgroundPng = 'assets/images/web_Background.png';
  static const String blackLogo = 'assets/images/black-logo.png';
+  static const String fourSceenSwitch = 'assets/images/4_sceen_switch.svg';
+  static const String sixSceenSwitch = 'assets/images/6_sceen_switch.svg';
  static const String logo = 'assets/images/Logo.svg';
  static const String logoHorizontal = 'assets/images/logo_horizontal.png';
  static const String vector = 'assets/images/Vector.png';
@@ -21,6 +21,9 @@ enum DeviceType {
  NCPS,
  DoorSensor,
  PC,
+  fourSceen,
+  sixSceen,
+  SOS,
  Other,
 }
 /*
@@ -63,4 +66,7 @@ Map<String, DeviceType> devicesTypesMap = {
  'WL': DeviceType.WaterLeak,
  'NCPS': DeviceType.NCPS,
  'PC': DeviceType.PC,
+  '4S': DeviceType.fourSceen,
+  '6S': DeviceType.sixSceen,
+  'SOS': DeviceType.SOS,
 };
Author	SHA1	Message	Date
Faris Armoush	7dc103f904	Merge branch 'dev' of https://github.com/SyncrowIOT/web into bugfix/assign_togs_to_table_overflow	2025-07-23 09:38:00 +03:00
Faris Armoush	e4c41bab90	bugfix/assign_tag_to_devices_table_overflow.	2025-07-23 09:37:11 +03:00
Rafeek-khoudare	0de882d43b	[FE] On Uba Gateway device the Icons of the devices inside are not all of them displayed (#359 ) <!-- Thanks for contributing! Provide a description of your changes below and a general summary in the title Please look at the following checklist to ensure that your PR can be accepted quickly: --> ## Jira Ticket [SP-1569](https://syncrow.atlassian.net/browse/SP-1569) ## Description add devices and icons for them ## Type of Change <!--- Put an `x` in all the boxes that apply: --> - [ ] ✨ New feature (non-breaking change which adds functionality) - [x] 🛠️ Bug fix (non-breaking change which fixes an issue) - [ ] ❌ Breaking change (fix or feature that would cause existing functionality to change) - [ ] 🧹 Code refactor - [ ] ✅ Build configuration change - [ ] 📝 Documentation - [ ] 🗑️ Chore [SP-1569]: https://syncrow.atlassian.net/browse/SP-1569?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ	2025-07-23 09:34:10 +03:00
Rafeek-khoudare	6a737e5d43	[FE] Manage Bookable Spaces Tab (#355 ) <!-- Thanks for contributing! Provide a description of your changes below and a general summary in the title Please look at the following checklist to ensure that your PR can be accepted quickly: --> ## Jira Ticket [SP-1693](https://syncrow.atlassian.net/browse/SP-1693) [SP-1694](https://syncrow.atlassian.net/browse/SP-1694) ## Description all about unbookable spaces is Ready ## Type of Change <!--- Put an `x` in all the boxes that apply: --> - [x] ✨ New feature (non-breaking change which adds functionality) - [ ] 🛠️ Bug fix (non-breaking change which fixes an issue) - [ ] ❌ Breaking change (fix or feature that would cause existing functionality to change) - [ ] 🧹 Code refactor - [ ] ✅ Build configuration change - [ ] 📝 Documentation - [ ] 🗑️ Chore [SP-1693]: https://syncrow.atlassian.net/browse/SP-1693?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [SP-1694]: https://syncrow.atlassian.net/browse/SP-1694?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ	2025-07-23 09:33:46 +03:00
Faris Armoush	c323d88790	Feature/reorder spaces api integration (#362 ) <!-- Thanks for contributing! Provide a description of your changes below and a general summary in the title Please look at the following checklist to ensure that your PR can be accepted quickly: --> ## Description Integrated reordering spaces with the API. Fixed drop target bug, where the canvas wouldn't show the first drop target in the tree. ## Type of Change <!--- Put an `x` in all the boxes that apply: --> - [ x ] ✨ New feature (non-breaking change which adds functionality) - [ x ] 🛠️ Bug fix (non-breaking change which fixes an issue) - [ ] ❌ Breaking change (fix or feature that would cause existing functionality to change) - [ ] 🧹 Code refactor - [ ] ✅ Build configuration change - [ ] 📝 Documentation - [ ] 🗑️ Chore	2025-07-23 09:31:16 +03:00
Rafeek-Khoudare	68153e41ed	remove print statement	2025-07-23 09:02:30 +03:00
Faris Armoush	94f9c1beea	Adjust layout in CommunityStructureCanvas by adding horizontal padding to positions and refining target position calculations for improved spacing and alignment. Enhance Stack widget behavior by allowing overflow clipping.	2025-07-22 10:04:38 +03:00
Faris Armoush	dfd8c5fa31	Replace Container with AnimatedContainer in CommunityStructureCanvas to enhance visual feedback during state changes. Adjust alpha value for improved visibility based on candidate data presence.	2025-07-22 09:46:56 +03:00
Faris Armoush	60b8ee8b50	Enhance DragTarget logic in CommunityStructureCanvas by refining conditions for rendering and improving readability. Ensure proper handling of dragged data and its parent/community relationships.	2025-07-22 09:37:31 +03:00
Faris Armoush	9d60f913eb	Refactor CommunityStructureCanvas to simplify DragTarget logic by replacing SizedBox with SizedBox.shrink() for better performance and readability.	2025-07-22 09:32:57 +03:00
Faris Armoush	40251b846b	Integrate ReorderSpaces functionality into CommunityStructureCanvas and enhance RemoteReorderSpacesService with dynamic URL generation. Update ReorderSpacesParam to require parentSpaceUuid and spaces for improved validation and serialization.	2025-07-21 16:43:26 +03:00
Faris Armoush	1323bceca1	Update ReorderSpacesParam to make parentSpaceUuid optional and add toJson method for serialization.	2025-07-21 16:39:31 +03:00
Faris Armoush	35c8a73156	Refactor SpaceManagementPage's initState to ensure HTTPService is initialized before use in CommunitiesBloc.	2025-07-21 16:24:11 +03:00
Faris Armoush	ce65b068ff	Merge branch 'dev' of https://github.com/SyncrowIOT/web into feature/reorder_spaces_api_integration	2025-07-21 16:22:22 +03:00
Faris Armoush	96f107f972	Refactor SpaceManagementPage to utilize a shared HTTPService instance for API calls in `Communities`, `SpaceDetails`, `Products`, and `ReorderSpaces` blocs, and injected `ReorderSpacesBloc` into it.	2025-07-21 16:15:26 +03:00
Faris Armoush	a3a7937021	Implemented `ReorderSpacesBloc`.	2025-07-21 16:14:03 +03:00
Faris Armoush	9bf715501b	Implement ReorderSpacesService.	2025-07-21 15:57:31 +03:00
Faris Armoush	c65f4a7fab	Add ReorderSpacesParam and ReorderSpacesService for managing space reordering functionality.	2025-07-21 15:57:20 +03:00
Faris Armoush	7af8887d4f	Add new API endpoint for reordering spaces in the community module.	2025-07-21 15:57:10 +03:00
Rafeek-Khoudare	0ad562b6ce	add icons and types for devices did not added before	2025-07-20 14:03:50 +03:00