Merge branch 'dev' of https://github.com/SyncrowIOT/web into bugfix/empty-space-model

fix model and SpaceModelCardWidget and LinkSpaceModelSpacesDialog

lib/common/widgets/custom_expansion_tile.dart

@@ -101,7 +101,7 @@ class CustomExpansionTileState extends State<CustomExpansionTile> {
             widget.children != null &&
             widget.children!.isNotEmpty)
           Padding(
-            padding: const EdgeInsets.only(left: 48.0), // Indented children
+            padding: const EdgeInsets.only(left: 24.0), // Indented children
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: widget.children!,

lib/pages/space_tree/view/custom_expansion.dart

@@ -83,7 +83,7 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
         ),
         if (isExpanded && children != null && children!.isNotEmpty)
           Padding(
-            padding: const EdgeInsets.only(left: 48.0),
+            padding: const EdgeInsets.only(left: 24.0),
             child: Column(
               children: children ?? [],
             ),

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

@@ -52,14 +52,24 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
 
   Future<void> _updateSpaceModelCache(
       UpdateSpaceModelCache event, Emitter<SpaceManagementState> emit) async {
-    if (_cachedSpaceModels != null) {
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-      _cachedSpaceModels = _cachedSpaceModels!.map((model) {
+
-        return model.uuid == event.updatedModel.uuid ? event.updatedModel : model;
+    List<SpaceTemplateModel> allSpaceModels = [];
-      }).toList();
+
-    } else {
+    bool hasNext = true;
-      _cachedSpaceModels = await fetchSpaceModels();
+    int page = 1;
+
+    while (hasNext) {
+      final spaceModels = await _spaceModelApi.listSpaceModels(page: page, projectId: projectUuid);
+      if (spaceModels.isNotEmpty) {
+        allSpaceModels.addAll(spaceModels);
+        page++;
+      } else {
+        hasNext = false;
+      }
     }
 
+    _cachedSpaceModels = allSpaceModels;
     await fetchTags();
 
     emit(SpaceModelLoaded(

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

@@ -22,7 +22,7 @@ class CommunityTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Padding(
-        padding: const EdgeInsets.only(left: 16.0),
+        padding: const EdgeInsets.all(8.0),
         child: CustomExpansionTile(
           title: title,
           initiallyExpanded: isExpanded,

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

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
@@ -80,32 +81,32 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
       clipBehavior: Clip.none,
       children: [
         widget.shouldNavigateToSpaceModelPage
-            ? _spaceModels.isNotEmpty
+            ? Row(
-                ? Row(
+                children: [
-                    children: [
+                  SizedBox(width: 300, child: SpaceTreeView(onSelect: () {})),
-                      SizedBox(width: 300, child: SpaceTreeView(onSelect: () {})),
+                  Expanded(
-                      Expanded(
+                    child: BlocProvider(
-                        child: BlocProvider(
+                      create: (context) => SpaceModelBloc(
-                          create: (context) => SpaceModelBloc(
+                        BlocProvider.of<SpaceTreeBloc>(context),
-                            api: SpaceModelManagementApi(),
+                        api: SpaceModelManagementApi(),
-                            initialSpaceModels: _spaceModels,
+                        initialSpaceModels: widget.spaceModels ?? [],
-                          ),
-                          child: SpaceModelPage(
-                            products: widget.products,
-                            onSpaceModelsUpdated: _onSpaceModelsUpdated,
-                            projectTags: widget.projectTags,
-                          ),
-                        ),
                       ),
-                    ],
+                      child: SpaceModelPage(
-                  )
+                        products: widget.products,
-                : const Center(child: CircularProgressIndicator())
+                        onSpaceModelsUpdated: _onSpaceModelsUpdated,
+                        projectTags: widget.projectTags,
+                      ),
+                    ),
+                  ),
+                ],
+              )
             : Row(
                 children: [
                   SidebarWidget(
                     communities: widget.communities,
-                    selectedSpaceUuid:
+                    selectedSpaceUuid: widget.selectedSpace?.uuid ??
-                        widget.selectedSpace?.uuid ?? widget.selectedCommunity?.uuid ?? '',
+                        widget.selectedCommunity?.uuid ??
+                        '',
                   ),
                   CommunityStructureArea(
                     selectedCommunity: widget.selectedCommunity,

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

@@ -205,30 +205,32 @@ class _SidebarWidgetState extends State<SidebarWidget> {
     );
   }
 
-  Widget _buildSpaceTile(SpaceModel space, CommunityModel community) {
+  Widget _buildSpaceTile(SpaceModel space, CommunityModel community, {int depth = 1}) {
     bool isExpandedSpace = _isSpaceOrChildSelected(space);
-    return SpaceTile(
+    return Padding(
-      title: space.name,
+        padding: EdgeInsets.only(left: depth * 16.0),
-      key: ValueKey(space.uuid),
+        child: SpaceTile(
-      isSelected: _selectedId == space.uuid,
+          title: space.name,
-      initiallyExpanded: isExpandedSpace,
+          key: ValueKey(space.uuid),
-      onExpansionChanged: (bool expanded) {
+          isSelected: _selectedId == space.uuid,
-        _handleExpansionChange(space.uuid ?? '', expanded);
+          initiallyExpanded: isExpandedSpace,
-      },
+          onExpansionChanged: (bool expanded) {
-      onItemSelected: () {
+            _handleExpansionChange(space.uuid ?? '', expanded);
-        setState(() {
+          },
-          _selectedId = space.uuid;
+          onItemSelected: () {
-          _selectedSpaceUuid = space.uuid;
+            setState(() {
-        });
+              _selectedId = space.uuid;
+              _selectedSpaceUuid = space.uuid;
+            });
 
-        context.read<SpaceManagementBloc>().add(
+            context.read<SpaceManagementBloc>().add(
-              SelectSpaceEvent(selectedCommunity: community, selectedSpace: space),
+                  SelectSpaceEvent(selectedCommunity: community, selectedSpace: space),
-            );
+                );
-      },
+          },
-      children: space.children.isNotEmpty
+          children: space.children.isNotEmpty
-          ? space.children.map((childSpace) => _buildSpaceTile(childSpace, community)).toList()
+              ? space.children.map((childSpace) => _buildSpaceTile(childSpace, community)).toList()
-          : [], // Recursively render child spaces if available
+              : [], // Recursively render child spaces if available
-    );
+        ));
   }
 
   void _handleExpansionChange(String uuid, bool expanded) {}

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

@@ -35,18 +35,20 @@ class _SpaceTileState extends State<SpaceTile> {
 
   @override
   Widget build(BuildContext context) {
-    return CustomExpansionTile(
+    return Padding(
-      isSelected: widget.isSelected,
+        padding: const EdgeInsets.only(left: 8.0, right: 8.0, top: 8.0),
-      title: widget.title,
+        child: CustomExpansionTile(
-      initiallyExpanded: _isExpanded,
+          isSelected: widget.isSelected,
-      onItemSelected: widget.onItemSelected,
+          title: widget.title,
-      onExpansionChanged: (bool expanded) {
+          initiallyExpanded: _isExpanded,
-        setState(() {
+          onItemSelected: widget.onItemSelected,
-          _isExpanded = expanded;
+          onExpansionChanged: (bool expanded) {
-        });
+            setState(() {
-        widget.onExpansionChanged(expanded);
+              _isExpanded = expanded;
-      },
+            });
-      children: widget.children ?? [],
+            widget.onExpansionChanged(expanded);
-    );
+          },
+          children: widget.children ?? [],
+        ));
   }
 }

lib/pages/spaces_management/link_space_model/bloc/link_space_to_model_state.dart

@@ -5,6 +5,8 @@ abstract class LinkSpaceToModelState {
 class SpaceModelInitial extends LinkSpaceToModelState {}
 
 class SpaceModelLoading extends LinkSpaceToModelState {}
+class LinkSpaceModelLoading extends LinkSpaceToModelState {}
+
 
 class SpaceModelSelectedState extends LinkSpaceToModelState {
   final int selectedIndex;

lib/pages/spaces_management/space_model/bloc/space_model_bloc.dart

@@ -1,7 +1,7 @@
-import 'dart:developer';
-
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/space_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/space_model_state.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
@@ -9,8 +9,10 @@ import 'package:syncrow_web/services/space_model_mang_api.dart';
 
 class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
   final SpaceModelManagementApi api;
+  final SpaceTreeBloc _spaceTreeBloc;
 
-  SpaceModelBloc({
+  SpaceModelBloc(
+    this._spaceTreeBloc, {
     required this.api,
     required List<SpaceTemplateModel> initialSpaceModels,
   }) : super(SpaceModelLoaded(spaceModels: initialSpaceModels)) {
@@ -50,6 +52,7 @@ class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
           final updatedSpaceModels = currentState.spaceModels.map((model) {
             return model.uuid == event.spaceModelUuid ? newSpaceModel : model;
           }).toList();
+          _spaceTreeBloc.add(InitialEvent());
           emit(SpaceModelLoaded(spaceModels: updatedSpaceModels));
         }
       } catch (e) {
@@ -71,7 +74,7 @@ class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
           final updatedSpaceModels = currentState.spaceModels
               .where((model) => model.uuid != event.spaceModelUuid)
               .toList();
-
+          _spaceTreeBloc.add(InitialEvent());
           emit(SpaceModelLoaded(spaceModels: updatedSpaceModels));
         }
       } catch (e) {

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

@@ -11,7 +11,7 @@ class SpaceTemplateModel extends Equatable {
   List<SubspaceTemplateModel>? subspaceModels;
   final List<Tag>? tags;
   String internalId;
-  String? createdAt;
+  DateTime? createdAt;
 
   @override
   List<Object?> get props => [modelName, subspaceModels, tags];
@@ -24,17 +24,18 @@ class SpaceTemplateModel extends Equatable {
     this.tags,
     this.createdAt,
   }) : internalId = internalId ?? const Uuid().v4();
-
   factory SpaceTemplateModel.fromJson(Map<String, dynamic> json) {
     final String internalId = json['internalId'] ?? const Uuid().v4();
 
     return SpaceTemplateModel(
       uuid: json['uuid'] ?? '',
-      createdAt: json['createdAt'] ?? '',
+      createdAt: json['createdAt'] != null
+          ? DateTime.tryParse(json['createdAt']) 
+          : null,
       internalId: internalId,
       modelName: json['modelName'] ?? '',
       subspaceModels: (json['subspaceModels'] as List<dynamic>?)
-              ?.where((e) => e is Map<String, dynamic>) // Validate type
+              ?.where((e) => e is Map<String, dynamic>)
               .map((e) =>
                   SubspaceTemplateModel.fromJson(e as Map<String, dynamic>))
               .toList() ??

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

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:intl/intl.dart';
 import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
 import 'package:syncrow_web/pages/spaces_management/link_space_model/bloc/link_space_to_model_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/link_space_model/bloc/link_space_to_model_event.dart';
@@ -45,6 +46,12 @@ class _LinkSpaceModelSpacesDialogState
   }
 
   Widget _buildDialogContent() {
+    widget.spaceModel.createdAt.toString();
+    String formattedDate =
+        DateFormat('yyyy-MM-dd').format(widget.spaceModel.createdAt!);
+    String formattedTime =
+        DateFormat('HH:mm:ss').format(widget.spaceModel.createdAt!);
+
     return Expanded(
       child: Padding(
         padding: const EdgeInsets.all(15.0),
@@ -75,8 +82,31 @@ class _LinkSpaceModelSpacesDialogState
                       const SizedBox(height: 16),
                       _buildDetailRow(
                           "Space model name:", widget.spaceModel.modelName),
-                      _buildDetailRow("Creation date and time:",
+                      Padding(
-                          widget.spaceModel.createdAt.toString()),
+                        padding: const EdgeInsets.symmetric(vertical: 4),
+                        child: Row(
+                          children: [
+                            const Expanded(
+                              child: Text(
+                                "Creation date and time:",
+                                style: const TextStyle(
+                                    fontWeight: FontWeight.bold),
+                              ),
+                            ),
+                            const SizedBox(width: 8),
+                            Expanded(
+                              child: Text(
+                                "$formattedDate  $formattedTime",
+                                style: const TextStyle(
+                                    fontWeight: FontWeight.bold,
+                                    color: Colors.black),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                      // _buildDetailRow("Creation date and time:",
+                      //     widget.spaceModel.createdAt.toString()),
                       _buildDetailRow("Created by:", "Admin"),
                       const SizedBox(height: 12),
                       const Text(

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

@@ -85,111 +85,116 @@ class SpaceModelCardWidget extends StatelessWidget {
                     maxLines: 1,
                     overflow: TextOverflow.ellipsis,
                   ),
-                  Row(
+                  if (!topActionsDisabled)
-                    children: [
+                    Row(
-                      InkWell(
+                      children: [
-                        onTap: () {
+                        InkWell(
-                          showDialog(
+                          onTap: () {
-                            context: context,
+                            showDialog(
-                            builder: (BuildContext dialogContext) {
+                              context: context,
-                              return BlocProvider<LinkSpaceToModelBloc>(
+                              builder: (BuildContext dialogContext) {
-                                create: (_) => LinkSpaceToModelBloc(),
+                                return BlocProvider<LinkSpaceToModelBloc>(
-                                child: BlocListener<LinkSpaceToModelBloc,
+                                  create: (_) => LinkSpaceToModelBloc(),
-                                    LinkSpaceToModelState>(
+                                  child: BlocListener<LinkSpaceToModelBloc,
-                                  listener: (context, state) {
+                                      LinkSpaceToModelState>(
-                                    final _bloc =
+                                    listenWhen: (previous, current) {
-                                        BlocProvider.of<LinkSpaceToModelBloc>(
+                                      return previous != current;
-                                            context);
+                                    },
-                                    if (state is SpaceModelLoading) {
+                                    listener: (context, state) {
-                                      showDialog(
+                                      final _bloc =
-                                        context: context,
+                                          BlocProvider.of<LinkSpaceToModelBloc>(
-                                        barrierDismissible: false,
+                                              context);
-                                        builder: (BuildContext context) {
+                                      if (state is SpaceModelLoading) {
-                                          return Dialog(
+                                        showDialog(
-                                            shape: RoundedRectangleBorder(
+                                          context: context,
-                                                borderRadius:
+                                          barrierDismissible: false,
-                                                    BorderRadius.circular(20)),
+                                          builder: (BuildContext context) {
-                                            elevation: 10,
+                                            return Dialog(
-                                            backgroundColor: Colors.white,
+                                              shape: RoundedRectangleBorder(
-                                            child: Padding(
+                                                  borderRadius:
-                                              padding:
+                                                      BorderRadius.circular(
-                                                  const EdgeInsets.symmetric(
+                                                          20)),
-                                                      vertical: 30,
+                                              elevation: 10,
-                                                      horizontal: 50),
+                                              backgroundColor: Colors.white,
-                                              child: Column(
+                                              child: Padding(
-                                                mainAxisSize: MainAxisSize.min,
+                                                padding:
-                                                children: [
+                                                    const EdgeInsets.symmetric(
-                                                  CustomLoadingIndicator(),
+                                                        vertical: 30,
-                                                  const SizedBox(height: 20),
+                                                        horizontal: 50),
-                                                  const Text(
+                                                child: Column(
-                                                    "Linking in progress",
+                                                  mainAxisSize:
-                                                    style: TextStyle(
+                                                      MainAxisSize.min,
-                                                      fontSize: 16,
+                                                  children: [
-                                                      fontWeight:
+                                                    CustomLoadingIndicator(),
-                                                          FontWeight.w500,
+                                                  ],
-                                                      color: Colors.black87,
+                                                ),
-                                                    ),
-                                                  ),
-                                                ],
                                               ),
-                                            ),
+                                            );
-                                          );
+                                          },
-                                        },
+                                        );
-                                      );
+                                      } else if (state
-                                    } else if (state
+                                          is AlreadyHaveLinkedState) {
-                                        is AlreadyHaveLinkedState) {
+                                        Navigator.of(dialogContext).pop();
-                                      Navigator.of(dialogContext).pop();
+                                        showOverwriteDialog(
-                                      showOverwriteDialog(
+                                            context, _bloc, model);
-                                          context, _bloc, model);
+                                      } else if (state
-                                    } else if (state
+                                          is SpaceValidationSuccess) {
-                                        is SpaceValidationSuccess) {
+                                        _bloc.add(LinkSpaceModelEvent(
-                                      _bloc.add(LinkSpaceModelEvent(
+                                            isOverWrite: false,
-                                          isOverWrite: false,
+                                            selectedSpaceMode: model.uuid));
-                                          selectedSpaceMode: model.uuid));
 
-                                      Future.delayed(const Duration(seconds: 1),
-                                          () {
-                                        Navigator.of(dialogContext).pop();
-                                        Navigator.of(dialogContext).pop();
-                                        Navigator.of(dialogContext).pop();
-                                      });
-
-                                      showDialog(
-                                        context: context,
-                                        builder: (BuildContext dialogContext) {
-                                          return const LinkingSuccessful();
-                                        },
-                                      ).then((v) {
                                         Future.delayed(
-                                            const Duration(seconds: 2), () {
+                                            const Duration(seconds: 1), () {
+                                          Navigator.of(dialogContext).pop();
+                                          Navigator.of(dialogContext).pop();
                                           Navigator.of(dialogContext).pop();
                                         });
-                                      });
+
-                                    } else if (state is SpaceModelLinkSuccess) {
+                                        showDialog(
-                                      Navigator.of(dialogContext).pop();
+                                          context: context,
-                                      Navigator.of(dialogContext).pop();
+                                          builder:
-                                      showDialog(
+                                              (BuildContext dialogContext) {
-                                        context: context,
+                                            return const LinkingSuccessful();
-                                        builder: (BuildContext dialogContext) {
+                                          },
-                                          return const LinkingSuccessful();
+                                        ).then((v) {
-                                        },
+                                          Future.delayed(
-                                      );
+                                              const Duration(seconds: 2), () {
-                                    }
+                                            Navigator.of(dialogContext).pop();
-                                  },
+                                          });
-                                  child: LinkSpaceModelSpacesDialog(
+                                        });
-                                    spaceModel: model,
+                                      } else if (state
+                                          is SpaceModelLinkSuccess) {
+                                        Navigator.of(dialogContext).pop();
+                                        Navigator.of(dialogContext).pop();
+                                        showDialog(
+                                          context: context,
+                                          barrierDismissible: false,
+                                          builder: (BuildContext
+                                              successDialogContext) {
+                                            Future.delayed(
+                                                const Duration(seconds: 2), () {
+                                              Navigator.of(successDialogContext)
+                                                  .pop();
+                                            });
+
+                                            return const LinkingSuccessful();
+                                          },
+                                        );
+                                      }
+                                    },
+                                    child: LinkSpaceModelSpacesDialog(
+                                      spaceModel: model,
+                                    ),
                                   ),
-                                ),
+                                );
-                              );
+                              },
-                            },
+                            );
-                          );
+                          },
-                        },
+                          child: SvgPicture.asset(
-                        child: SvgPicture.asset(
+                            Assets.spaceLinkIcon,
-                          Assets.spaceLinkIcon,
+                            fit: BoxFit.contain,
-                          fit: BoxFit.contain,
+                          ),
                         ),
-                      ),
-                      if (!topActionsDisabled)
                         InkWell(
                           onTap: () {
                             _showDeleteDialog(context);
@@ -199,49 +204,8 @@ class SpaceModelCardWidget extends StatelessWidget {
                             fit: BoxFit.contain,
                           ),
                         ),
-                    ],
+                      ],
-                  ),
+                    ),
-                  // Expanded(
-                  //   child: Text(
-                  //     model.modelName,
-                  //     style:
-                  //         Theme.of(context).textTheme.headlineMedium?.copyWith(
-                  //               color: Colors.black,
-                  //               fontWeight: FontWeight.bold,
-                  //             ),
-                  //     maxLines: 1,
-                  //     overflow: TextOverflow.ellipsis,
-                  //   ),
-                  // ),
-                  // if (!topActionsDisabled)
-                  //   GestureDetector(
-                  //     onTap: () => _showDeleteDialog(context),
-                  //     child: Container(
-                  //       width: 36, // Adjust size as needed
-                  //       height: 36,
-                  //       decoration: BoxDecoration(
-                  //         shape: BoxShape.circle,
-                  //         color: Colors.white,
-                  //         boxShadow: [
-                  //           BoxShadow(
-                  //             color: Colors.black.withOpacity(0.1),
-                  //             spreadRadius: 2,
-                  //             blurRadius: 5,
-                  //             offset: const Offset(0, 2),
-                  //           ),
-                  //         ],
-                  //       ),
-                  //       child: Center(
-                  //         child: SvgPicture.asset(
-                  //           Assets.deleteSpaceModel, // Your actual SVG path
-                  //           width: 20,
-                  //           height: 20,
-                  //           colorFilter: const ColorFilter.mode(
-                  //               Colors.grey, BlendMode.srcIn),
-                  //         ),
-                  //       ),
-                  //     ),
-                  //   ),
                 ],
               ),
               if (!showOnlyName) ...[

lib/utils/color_manager.dart

@@ -52,7 +52,7 @@ abstract class ColorsManager {
   static const Color semiTransparentBlackColor = Color(0x3F000000);
   static const Color transparentColor = Color(0x00000000);
   static const Color spaceColor = Color(0xB2023DFE);
-  static const Color counterBackgroundColor = Color.fromARGB(204, 105, 2, 2);
+  static const Color counterBackgroundColor = Color(0xCCF4F4F4);
   static const Color neutralGray = Color(0xFFE5E5E5);
   static const Color warningRed = Color(0xFFFF6465);
   static const Color borderColor = Color(0xFFE5E5E5);