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

fix model and SpaceModelCardWidget and LinkSpaceModelSpacesDialog

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();
+
+    bool hasNext = true;
+    int page = 1;
+
+    while (hasNext) {
+      final spaceModels = await _spaceModelApi.listSpaceModels(page: page, projectId: projectUuid);
+      if (spaceModels.isNotEmpty) {
+        allSpaceModels.addAll(spaceModels);
+        page++;
       } else {
-      _cachedSpaceModels = await fetchSpaceModels();
+        hasNext = false;
+      }
     }
 
+    _cachedSpaceModels = allSpaceModels;
     await fetchTags();
 
     emit(SpaceModelLoaded(

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

@@ -81,7 +81,6 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
       clipBehavior: Clip.none,
       children: [
         widget.shouldNavigateToSpaceModelPage
-            ? _spaceModels.isNotEmpty
             ? Row(
                 children: [
                   SizedBox(width: 300, child: SpaceTreeView(onSelect: () {})),
@@ -90,7 +89,7 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
                       create: (context) => SpaceModelBloc(
                         BlocProvider.of<SpaceTreeBloc>(context),
                         api: SpaceModelManagementApi(),
-                            initialSpaceModels: _spaceModels,
+                        initialSpaceModels: widget.spaceModels ?? [],
                       ),
                       child: SpaceModelPage(
                         products: widget.products,
@@ -101,13 +100,13 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
                   ),
                 ],
               )
-                : const Center(child: CircularProgressIndicator())
             : 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/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/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,6 +85,7 @@ class SpaceModelCardWidget extends StatelessWidget {
                     maxLines: 1,
                     overflow: TextOverflow.ellipsis,
                   ),
+                  if (!topActionsDisabled)
                     Row(
                       children: [
                         InkWell(
@@ -96,6 +97,9 @@ class SpaceModelCardWidget extends StatelessWidget {
                                   create: (_) => LinkSpaceToModelBloc(),
                                   child: BlocListener<LinkSpaceToModelBloc,
                                       LinkSpaceToModelState>(
+                                    listenWhen: (previous, current) {
+                                      return previous != current;
+                                    },
                                     listener: (context, state) {
                                       final _bloc =
                                           BlocProvider.of<LinkSpaceToModelBloc>(
@@ -108,7 +112,8 @@ class SpaceModelCardWidget extends StatelessWidget {
                                             return Dialog(
                                               shape: RoundedRectangleBorder(
                                                   borderRadius:
-                                                    BorderRadius.circular(20)),
+                                                      BorderRadius.circular(
+                                                          20)),
                                               elevation: 10,
                                               backgroundColor: Colors.white,
                                               child: Padding(
@@ -117,19 +122,10 @@ class SpaceModelCardWidget extends StatelessWidget {
                                                         vertical: 30,
                                                         horizontal: 50),
                                                 child: Column(
-                                                mainAxisSize: MainAxisSize.min,
+                                                  mainAxisSize:
+                                                      MainAxisSize.min,
                                                   children: [
                                                     CustomLoadingIndicator(),
-                                                  const SizedBox(height: 20),
-                                                  const Text(
-                                                    "Linking in progress",
-                                                    style: TextStyle(
-                                                      fontSize: 16,
-                                                      fontWeight:
-                                                          FontWeight.w500,
-                                                      color: Colors.black87,
-                                                    ),
-                                                  ),
                                                   ],
                                                 ),
                                               ),
@@ -147,8 +143,8 @@ class SpaceModelCardWidget extends StatelessWidget {
                                             isOverWrite: false,
                                             selectedSpaceMode: model.uuid));
 
-                                      Future.delayed(const Duration(seconds: 1),
+                                        Future.delayed(
-                                          () {
+                                            const Duration(seconds: 1), () {
                                           Navigator.of(dialogContext).pop();
                                           Navigator.of(dialogContext).pop();
                                           Navigator.of(dialogContext).pop();
@@ -156,7 +152,8 @@ class SpaceModelCardWidget extends StatelessWidget {
 
                                         showDialog(
                                           context: context,
-                                        builder: (BuildContext dialogContext) {
+                                          builder:
+                                              (BuildContext dialogContext) {
                                             return const LinkingSuccessful();
                                           },
                                         ).then((v) {
@@ -165,12 +162,21 @@ class SpaceModelCardWidget extends StatelessWidget {
                                             Navigator.of(dialogContext).pop();
                                           });
                                         });
-                                    } else if (state is SpaceModelLinkSuccess) {
+                                      } else if (state
+                                          is SpaceModelLinkSuccess) {
                                         Navigator.of(dialogContext).pop();
                                         Navigator.of(dialogContext).pop();
                                         showDialog(
                                           context: context,
-                                        builder: (BuildContext dialogContext) {
+                                          barrierDismissible: false,
+                                          builder: (BuildContext
+                                              successDialogContext) {
+                                            Future.delayed(
+                                                const Duration(seconds: 2), () {
+                                              Navigator.of(successDialogContext)
+                                                  .pop();
+                                            });
+
                                             return const LinkingSuccessful();
                                           },
                                         );
@@ -189,7 +195,6 @@ class SpaceModelCardWidget extends StatelessWidget {
                             fit: BoxFit.contain,
                           ),
                         ),
-                      if (!topActionsDisabled)
                         InkWell(
                           onTap: () {
                             _showDeleteDialog(context);
@@ -201,47 +206,6 @@ class SpaceModelCardWidget extends StatelessWidget {
                         ),
                       ],
                     ),
-                  // 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) ...[