Merge branch 'dev' of https://github.com/SyncrowIOT/web into bugfix/pagination-scroll

fixed save issue

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

@@ -457,16 +457,17 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
     emit(SpaceManagementLoading());
 
     try {
+      final spaceTreeState = event.context.read<SpaceTreeBloc>().state;
+
       final updatedSpaces =
           await saveSpacesHierarchically(event.context, event.spaces, event.communityUuid);
-
       final allSpaces = await _fetchSpacesForCommunity(event.communityUuid);
 
       emit(SpaceCreationSuccess(spaces: updatedSpaces));
 
       if (previousState is SpaceManagementLoaded) {
         await _updateLoadedState(
-          event.context,
+          spaceTreeState,
           previousState,
           allSpaces,
           event.communityUuid,
@@ -483,35 +484,39 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
   }
 
   Future<void> _updateLoadedState(
-    BuildContext context,
+    SpaceTreeState spaceTreeState,
     SpaceManagementLoaded previousState,
     List<SpaceModel> allSpaces,
     String communityUuid,
     Emitter<SpaceManagementState> emit,
   ) async {
-    var prevSpaceModels = await fetchSpaceModels();
-    await fetchTags();
-    final spaceTreeState = context.read<SpaceTreeBloc>().state;
-    final communities = spaceTreeState.searchQuery.isNotEmpty
-        ? spaceTreeState.filteredCommunity
-        : spaceTreeState.communityList;
+    try {
+      var prevSpaceModels = await fetchSpaceModels();
 
-    for (var community in communities) {
-      if (community.uuid == communityUuid) {
-        community.spaces = allSpaces;
-        _spaceTreeBloc.add(InitialEvent());
+      await fetchTags();
 
-        emit(SpaceManagementLoaded(
+      final communities = spaceTreeState.searchQuery.isNotEmpty
+          ? spaceTreeState.filteredCommunity
+          : spaceTreeState.communityList;
+
+      for (var community in communities) {
+        if (community.uuid == communityUuid) {
+          community.spaces = allSpaces;
+          _spaceTreeBloc.add(InitialEvent());
+
+          emit(SpaceManagementLoaded(
             communities: communities,
             products: _cachedProducts ?? [],
             selectedCommunity: community,
             selectedSpace: null,
             spaceModels: prevSpaceModels,
-            allTags: _cachedTags ?? []));
-        return;
-      } else {
-        print("Community not found");
+            allTags: _cachedTags ?? [],
+          ));
+          return;
+        }
       }
+    } catch (e, stackTrace) {
+      rethrow;
     }
   }
 

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

@@ -526,6 +526,8 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                       isNameFieldInvalid = true;
                     });
                     return;
+                  } else if (isNameFieldExist) {
+                    return;
                   } else {
                     String newName = enteredName.isNotEmpty ? enteredName : (widget.name ?? '');
                     if (newName.isNotEmpty) {

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

@@ -124,10 +124,9 @@ class _SidebarWidgetState extends State<SidebarWidget> {
           ),
           const SizedBox(height: 16),
           Expanded(
-            child: Visibility(
-              visible: filteredCommunities.isNotEmpty,
-              replacement: const EmptySearchResultWidget(),
-              child: SidebarCommunitiesList(
+            child: Builder(
+              builder: (_) {
+                return SidebarCommunitiesList(
                   scrollController: _scrollController,
                   onScrollToEnd: () {},
                   communities: filteredCommunities,
@@ -144,9 +143,15 @@ class _SidebarWidgetState extends State<SidebarWidget> {
                       }
                     }
                     return _buildCommunityTile(context, filteredCommunities[index]);
-                  }),
+                  },
+                );
+              },
             ),
           ),
+          if (spaceTreeState.paginationIsLoading)
+            Center(
+              child: CircularProgressIndicator(),
+            )
         ],
       ),
     );