Merge branch 'dev' of https://github.com/SyncrowIOT/web into bugfix/fix-issue-in-save

lib/pages/analytics/modules/analytics/views/analytics_page.dart

@@ -1,20 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
-import 'package:syncrow_web/web_layout/web_scaffold.dart';
-
-class AnalyticsPage extends StatelessWidget {
-  const AnalyticsPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return WebScaffold(
-      appBarTitle: Text(
-        'Syncrow Analytics',
-        style: ResponsiveTextTheme.of(context).deviceManagementTitle,
-      ),
-      scaffoldBody: const Center(
-        child: Text('AnalyticsPage is Working!'),
-      ),
-    );
-  }
-}

lib/pages/home/bloc/home_bloc.dart

@@ -142,19 +142,6 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
       },
       color: ColorsManager.primaryColor,
     ),
-
-    HomeItemModel(
-      title: 'Syncrow Analytics',
-      icon: Assets.devicesIcon,
-      active: true,
-      onPress: (context) {
-        context.read<SpaceTreeBloc>().add(ClearCachedData());
-        BlocProvider.of<RoutineBloc>(context)
-            .add(const TriggerSwitchTabsEvent(isRoutineTab: false));
-        context.go(RoutesConst.analytics);
-      },
-      color: ColorsManager.primaryColor,
-    ),
     
     // HomeItemModel(
     //   title: 'Move in',

lib/pages/home/view/home_page_mobile.dart

@@ -50,9 +50,8 @@ class HomeMobilePage extends StatelessWidget {
                         height: size.height * 0.6,
                         width: size.width * 0.68,
                         child: GridView.builder(
-                          itemCount: homeItems.length,
-                          gridDelegate:
-                              const SliverGridDelegateWithFixedCrossAxisCount(
+                          itemCount: 3,
+                          gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
                             crossAxisCount: 2,
                             crossAxisSpacing: 20.0,
                             mainAxisSpacing: 20.0,
@@ -61,11 +60,10 @@ class HomeMobilePage extends StatelessWidget {
                           itemBuilder: (context, index) {
                             return HomeCard(
                               index: index,
-                              active: homeBloc.homeItems[index].active!,
-                              name:  homeBloc.homeItems[index].title!,
-                              img:  homeBloc.homeItems[index].icon!,
-                              onTap: () =>
-                                  homeBloc.homeItems[index].onPress(context),
+                              active: homeItems[index]['active'],
+                              name: homeItems[index]['title'],
+                              img: homeItems[index]['icon'],
+                              onTap: () => homeBloc.homeItems[index].onPress(context),
                             );
                           },
                         ),
@@ -96,11 +94,6 @@ class HomeMobilePage extends StatelessWidget {
       'icon': Assets.devicesIcon,
       'active': true,
     },
-    {
-      'title': 'Syncrow Analytics',
-      'icon': Assets.iconEdit,
-      'active': true,
-    },
     // {
     //   'title': 'Move in',
     //   'icon': Assets.moveinIcon,

lib/pages/home/view/home_page_web.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
-import 'package:syncrow_web/pages/home/bloc/home_state.dart';
 import 'package:syncrow_web/pages/home/view/agreement_and_privacy_dialog.dart';
+import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
+import 'package:syncrow_web/pages/home/bloc/home_state.dart';
 import 'package:syncrow_web/pages/home/view/home_card.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
@@ -24,7 +24,7 @@ class _HomeWebPageState extends State<HomeWebPage> {
   void initState() {
     super.initState();
     final homeBloc = BlocProvider.of<HomeBloc>(context);
-    homeBloc.add(const FetchUserInfo());
+    homeBloc.add(FetchUserInfo());
   }
 
   @override
@@ -97,7 +97,7 @@ class _HomeWebPageState extends State<HomeWebPage> {
                           height: size.height * 0.6,
                           width: size.width * 0.68,
                           child: GridView.builder(
-                            itemCount: homeBloc.homeItems.length,
+                            itemCount: 3, // Change this count if needed.
                             gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
                               crossAxisCount: 3, // Adjust as needed.
                               crossAxisSpacing: 20.0,

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/utils/app_routes.dart

@@ -1,6 +1,5 @@
 import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/pages/access_management/view/access_management.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/views/analytics_page.dart';
 import 'package:syncrow_web/pages/auth/view/login_page.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/view/device_managment_page.dart';
 import 'package:syncrow_web/pages/home/view/home_page.dart';
@@ -38,11 +37,6 @@ class AppRoutes {
       GoRoute(
           path: RoutesConst.rolesAndPermissions,
           builder: (context, state) => const RolesAndPermissionPage()),
-      GoRoute(
-        path: RoutesConst.analytics,
-        name: 'analytics',
-        builder: (context, state) => const AnalyticsPage(),
-      ),
     ];
   }
 }

lib/utils/constants/routes_const.dart

@@ -6,5 +6,4 @@ class RoutesConst {
   static const String deviceManagementPage = '/device-management-page';
   static const String spacesManagementPage = '/spaces_management-page';
   static const String rolesAndPermissions = '/roles_and_Permissions-page';
-  static const String analytics = '/syncrow_analytics';
 }