Enhanced the side tree design

lib/pages/auth/bloc/auth_bloc.dart

@@ -31,8 +31,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
 
   ////////////////////////////// forget password //////////////////////////////////
   final TextEditingController forgetEmailController = TextEditingController();
-  final TextEditingController forgetPasswordController =
+  final TextEditingController forgetPasswordController = TextEditingController();
-      TextEditingController();
   final TextEditingController forgetOtp = TextEditingController();
   final forgetFormKey = GlobalKey<FormState>();
   final forgetEmailKey = GlobalKey<FormState>();
@@ -49,8 +48,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       return;
     }
     _remainingTime = 1;
-    add(UpdateTimerEvent(
+    add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
-        remainingTime: _remainingTime, isButtonEnabled: false));
     try {
       forgetEmailValidate = '';
       _remainingTime = (await AuthenticationAPI.sendOtp(
@@ -87,8 +85,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         _timer?.cancel();
         add(const UpdateTimerEvent(remainingTime: 0, isButtonEnabled: true));
       } else {
-        add(UpdateTimerEvent(
+        add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
-            remainingTime: _remainingTime, isButtonEnabled: false));
       }
     });
   }
@@ -98,8 +95,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     emit(const TimerState(isButtonEnabled: true, remainingTime: 0));
   }
 
-  Future<void> changePassword(
+  Future<void> changePassword(ChangePasswordEvent event, Emitter<AuthState> emit) async {
-      ChangePasswordEvent event, Emitter<AuthState> emit) async {
     emit(LoadingForgetState());
     try {
       var response = await AuthenticationAPI.verifyOtp(
@@ -115,8 +111,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       }
     } on DioException catch (e) {
       final errorData = e.response!.data;
-      String errorMessage =
+      String errorMessage = errorData['error']['message'] ?? 'something went wrong';
-          errorData['error']['message'] ?? 'something went wrong';
       validate = errorMessage;
       emit(AuthInitialState());
     }
@@ -130,9 +125,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   }
 
   void _onUpdateTimer(UpdateTimerEvent event, Emitter<AuthState> emit) {
-    emit(TimerState(
+    emit(TimerState(isButtonEnabled: event.isButtonEnabled, remainingTime: event.remainingTime));
-        isButtonEnabled: event.isButtonEnabled,
-        remainingTime: event.remainingTime));
   }
 
   /////////////////////////////////////  login  /////////////////////////////////////
@@ -168,23 +161,15 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
             password: event.password,
           ),
         );
-      } on DioException catch (e) {
+      } catch (failure) {
-        final errorData = e.response!.data;
+        validate = 'Invalid Credentials!';
-        String errorMessage = errorData['error']['message'];
-        if (errorMessage == "Access denied for web platform") {
-          validate = errorMessage;
-        } else {
-          validate = 'Invalid Credentials!';
-        }
         emit(LoginInitial());
         return;
       }
 
-
       if (token.accessTokenIsNotEmpty) {
         FlutterSecureStorage storage = const FlutterSecureStorage();
-        await storage.write(
+        await storage.write(key: Token.loginAccessTokenKey, value: token.accessToken);
-            key: Token.loginAccessTokenKey, value: token.accessToken);
         const FlutterSecureStorage().write(
             key: UserModel.userUuidKey,
             value: Token.decodeToken(token.accessToken)['uuid'].toString());
@@ -342,14 +327,12 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   static Future<String> getTokenAndValidate() async {
     try {
       const storage = FlutterSecureStorage();
-      final firstLaunch = await SharedPreferencesHelper.readBoolFromSP(
+      final firstLaunch =
-              StringsManager.firstLaunch) ??
+          await SharedPreferencesHelper.readBoolFromSP(StringsManager.firstLaunch) ?? true;
-          true;
       if (firstLaunch) {
         storage.deleteAll();
       }
-      await SharedPreferencesHelper.saveBoolToSP(
+      await SharedPreferencesHelper.saveBoolToSP(StringsManager.firstLaunch, false);
-          StringsManager.firstLaunch, false);
       final value = await storage.read(key: Token.loginAccessTokenKey) ?? '';
       if (value.isEmpty) {
         return 'Token not found';
@@ -402,9 +385,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     final String formattedTime = [
       if (days > 0) '${days}d', // Append 'd' for days
       if (days > 0 || hours > 0)
-        hours
+        hours.toString().padLeft(2, '0'), // Show hours if there are days or hours
-            .toString()
-            .padLeft(2, '0'), // Show hours if there are days or hours
       minutes.toString().padLeft(2, '0'),
       seconds.toString().padLeft(2, '0'),
     ].join(':');

lib/pages/auth/model/login_with_email_model.dart

@@ -21,9 +21,7 @@ class LoginWithEmailModel {
     return {
       'email': email,
       'password': password,
-      "platform": "web"
       // 'regionUuid': regionUuid,
     };
   }
 }
-//tst@tst.com

lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart

@@ -1,6 +1,8 @@
 import 'package:equatable/equatable.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 
 part 'device_managment_event.dart';
@@ -32,7 +34,20 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
   Future<void> _onFetchDevices(FetchDevices event, Emitter<DeviceManagementState> emit) async {
     emit(DeviceManagementLoading());
     try {
-      final devices = await DevicesManagementApi().fetchDevices(event.communityId, event.spaceId);
+      List<AllDevicesModel> devices = [];
+      _devices.clear();
+      var spaceBloc = event.context.read<SpaceTreeBloc>();
+      if (spaceBloc.state.selectedCommunities.isEmpty) {
+        devices = await DevicesManagementApi().fetchDevices('', '');
+      } else {
+        for (var community in spaceBloc.state.selectedCommunities) {
+          List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[community] ?? [];
+          for (var space in spacesList) {
+            devices.addAll(await DevicesManagementApi().fetchDevices(community, space));
+          }
+        }
+      }
+
       _selectedDevices.clear();
       _devices = devices;
       _filteredDevices = devices;

lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_event.dart

@@ -8,12 +8,13 @@ abstract class DeviceManagementEvent extends Equatable {
 }
 
 class FetchDevices extends DeviceManagementEvent {
-  final String communityId;
+  // final Map<String, List<String>> selectedCommunitiesSpaces;
-  final String spaceId;
+  // final String spaceId;
+  final BuildContext context;
 
-  const FetchDevices(this.communityId, this.spaceId);
+  const FetchDevices(this.context);
   @override
-  List<Object?> get props => [communityId, spaceId];
+  List<Object?> get props => [context];
 }
 
 class FilterDevices extends DeviceManagementEvent {

lib/pages/device_managment/all_devices/view/device_managment_page.dart

@@ -19,7 +19,7 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
     return MultiBlocProvider(
       providers: [
         BlocProvider(
-          create: (context) => DeviceManagementBloc()..add(const FetchDevices('', '')),
+          create: (context) => DeviceManagementBloc()..add(FetchDevices(context)),
         ),
       ],
       child: WebScaffold(

lib/pages/device_managment/all_devices/widgets/device_managment_body.dart

@@ -8,6 +8,7 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 import 'package:syncrow_web/pages/device_managment/all_devices/widgets/device_search_filters.dart';
 import 'package:syncrow_web/pages/device_managment/shared/device_batch_control_dialog.dart';
 import 'package:syncrow_web/pages/device_managment/shared/device_control_dialog.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/utils/format_date_time.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
@@ -62,14 +63,13 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
 
         return Row(
           children: [
-            const Expanded(
+            Expanded(child: SpaceTreeView(
-                child: SpaceTreeView(
+              onSelect: () {
-                    // onSelectAction: (String communityId, String spaceId) {
+                context.read<DeviceManagementBloc>().add(FetchDevices(context));
-                    //   context.read<DeviceManagementBloc>().add(FetchDevices(communityId, spaceId));
+              },
-                    // },
+            )),
-                    )),
             Expanded(
-              flex: 3,
+              flex: 4,
               child: state is DeviceManagementLoading
                   ? const Center(child: CircularProgressIndicator())
                   : Column(

lib/pages/device_managment/all_devices/widgets/device_search_filters.dart

@@ -85,7 +85,7 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperRe
         productNameController.clear();
         context.read<DeviceManagementBloc>()
           ..add(ResetFilters())
-          ..add(const FetchDevices('', ''));
+          ..add(FetchDevices(context));
       },
     );
   }

lib/pages/home/bloc/home_bloc.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:go_router/go_router.dart';
@@ -52,8 +51,6 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
           await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       user = await HomeApi().fetchUserInfo(uuid);
       add(FetchTermEvent());
-      add(FetchPolicyEvent());
-
       emit(HomeInitial());
     } catch (e) {
       return;
@@ -64,9 +61,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     try {
       emit(LoadingHome());
       terms = await HomeApi().fetchTerms();
-      emit(HomeInitial());
+      add(FetchPolicyEvent());
-
-      // emit(PolicyAgreement());
     } catch (e) {
       return;
     }
@@ -76,11 +71,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     try {
       emit(LoadingHome());
       policy = await HomeApi().fetchPolicy();
-      debugPrint("Fetched policy: $policy");
-      // Emit a state to trigger the UI update
-      emit(HomeInitial());
     } catch (e) {
-      debugPrint("Error fetching policy: $e");
       return;
     }
   }

lib/pages/home/view/agreement_and_privacy_dialog.dart

@@ -38,7 +38,7 @@ class _AgreementAndPrivacyDialogState extends State<AgreementAndPrivacyDialog> {
     final scrollPosition = _scrollController.position;
     if (scrollPosition.maxScrollExtent <= 0) {
       setState(() {
-        _isAtEnd = true;
+        _isAtEnd = true; 
       });
     }
   }
@@ -63,11 +63,9 @@ class _AgreementAndPrivacyDialogState extends State<AgreementAndPrivacyDialog> {
   }
 
   String get _dialogTitle =>
-      _currentPage == 1 ? 'User Agreement' : 'Privacy Policy';
+      _currentPage == 2 ? 'User Agreement' : 'Privacy Policy';
 
-  String get _dialogContent => _currentPage == 1 ? widget.terms : widget.policy;
+  String get _dialogContent => _currentPage == 2 ? widget.terms : widget.policy;
-  final String staticText =
-      '<h5 style="color: #FF5722;">If you cancel you will be logged out.</h5>';
 
   Widget _buildScrollableContent() {
     return Container(
@@ -87,7 +85,7 @@ class _AgreementAndPrivacyDialogState extends State<AgreementAndPrivacyDialog> {
           controller: _scrollController,
           padding: const EdgeInsets.all(25),
           child: Html(
-            data: "$_dialogContent $staticText",
+            data: _dialogContent,
             onLinkTap: (url, attributes, element) async {
               if (url != null) {
                 final uri = Uri.parse(url);

lib/pages/home/view/home_page_web.dart

@@ -9,126 +9,103 @@ 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';
 
-class HomeWebPage extends StatefulWidget {
+class HomeWebPage extends StatelessWidget {
   const HomeWebPage({super.key});
 
-  @override
-  State<HomeWebPage> createState() => _HomeWebPageState();
-}
-
-class _HomeWebPageState extends State<HomeWebPage> {
-  // Flag to track whether the dialog is already shown.
-  bool _dialogShown = false;
-
-  @override
-  void initState() {
-    super.initState();
-    final homeBloc = BlocProvider.of<HomeBloc>(context);
-    homeBloc.add(FetchUserInfo());
-  }
-
   @override
   Widget build(BuildContext context) {
     Size size = MediaQuery.of(context).size;
     final homeBloc = BlocProvider.of<HomeBloc>(context);
 
     return PopScope(
-      canPop: false,
+        canPop: false,
-      onPopInvoked: (didPop) => false,
+        onPopInvoked: (didPop) => false,
-      child: BlocConsumer<HomeBloc, HomeState>(
+        child: BlocConsumer<HomeBloc, HomeState>(
-        listener: (BuildContext context, state) {
+          listener: (BuildContext context, state) {
-          print('state=$state');
+            if (state is HomeInitial) {
-          if (state is HomeInitial) {
+              if (homeBloc.user!.hasAcceptedWebAgreement == false) {
-            if (homeBloc.user!.hasAcceptedWebAgreement == false &&
+                Future.delayed(const Duration(seconds: 1), () {
-                !_dialogShown) {
+                  showDialog(
-              _dialogShown =
+                    context: context,
-                  true; // Set the flag to true to indicate the dialog is showing.
+                    barrierDismissible: false,
-              Future.delayed(const Duration(seconds: 1), () {
+                    builder: (BuildContext context) {
-                showDialog(
+                      return AgreementAndPrivacyDialog(
-                  context: context,
+                        terms: homeBloc.terms,
-                  barrierDismissible: false,
+                        policy: homeBloc.policy,
-                  builder: (BuildContext context) {
+                      );
-                    return AgreementAndPrivacyDialog(
+                    },
-                      terms: homeBloc.terms,
+                  ).then((v) {
-                      policy: homeBloc.policy,
+                    if (v != null) {
-                    );
+                      homeBloc.add(ConfirmUserAgreementEvent());
-                  },
+                      homeBloc.add(const FetchUserInfo());
-                ).then((v) {
+                    }
-                  _dialogShown = false;
+                  });
-                  if (v != null) {
-                    homeBloc.add(ConfirmUserAgreementEvent());
-                    homeBloc.add(const FetchUserInfo());
-                  }
                 });
-              });
+              }
             }
-          }
+          },
-        },
+          builder: (context, state) {
-        builder: (context, state) {
+            return WebScaffold(
-          return WebScaffold(
+              enableMenuSidebar: false,
-            enableMenuSidebar: false,
+              appBarTitle: Row(
-            appBarTitle: Row(
-              children: [
-                SvgPicture.asset(
-                  Assets.loginLogo,
-                  width: 150,
-                ),
-              ],
-            ),
-            scaffoldBody: SizedBox(
-              height: size.height,
-              width: size.width,
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  Column(
+                  SvgPicture.asset(
-                    mainAxisAlignment: MainAxisAlignment.center,
+                    Assets.loginLogo,
-                    crossAxisAlignment: CrossAxisAlignment.center,
+                    width: 150,
-                    children: [
-                      SizedBox(height: size.height * 0.1),
-                      Text(
-                        'ACCESS YOUR APPS',
-                        style: Theme.of(context)
-                            .textTheme
-                            .headlineLarge!
-                            .copyWith(color: Colors.black, fontSize: 40),
-                      ),
-                      const SizedBox(height: 30),
-                      Expanded(
-                        flex: 4,
-                        child: SizedBox(
-                          height: size.height * 0.6,
-                          width: size.width * 0.68,
-                          child: GridView.builder(
-                            itemCount: 3, // Change this count if needed.
-                            gridDelegate:
-                                const SliverGridDelegateWithFixedCrossAxisCount(
-                              crossAxisCount: 3, // Adjust as needed.
-                              crossAxisSpacing: 20.0,
-                              mainAxisSpacing: 20.0,
-                              childAspectRatio: 1.5,
-                            ),
-                            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),
-                              );
-                            },
-                          ),
-                        ),
-                      ),
-                    ],
                   ),
                 ],
               ),
-            ),
+              scaffoldBody: SizedBox(
-          );
+                height: size.height,
-        },
+                width: size.width,
-      ),
+                child: Row(
-    );
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Column(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      children: [
+                        SizedBox(height: size.height * 0.1),
+                        Text(
+                          'ACCESS YOUR APPS',
+                          style: Theme.of(context)
+                              .textTheme
+                              .headlineLarge!
+                              .copyWith(color: Colors.black, fontSize: 40),
+                        ),
+                        const SizedBox(height: 30),
+                        Expanded(
+                          flex: 4,
+                          child: SizedBox(
+                            height: size.height * 0.6,
+                            width: size.width * 0.68,
+                            child: GridView.builder(
+                              itemCount: 3, //8
+                              gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                                crossAxisCount: 3, //4
+                                crossAxisSpacing: 20.0,
+                                mainAxisSpacing: 20.0,
+                                childAspectRatio: 1.5,
+                              ),
+                              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),
+                                );
+                              },
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+            );
+          },
+        ));
   }
 }

lib/pages/roles_and_permission/model/roles_user_model.dart

@@ -42,9 +42,7 @@ class RolesUserModel {
       invitedBy:
           json['invitedBy'].toString().toLowerCase().replaceAll("_", " "),
       phoneNumber: json['phoneNumber'],
-      jobTitle: json['jobTitle'] == null || json['jobTitle'] == " "
+      jobTitle: json['jobTitle'] ?? "-",
-          ? "_"
-          : json['jobTitle'],
       createdDate: json['createdDate'],
       createdTime: json['createdTime'],
     );

lib/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart

@@ -79,14 +79,13 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
 
   List<TreeNode> updatedCommunities = [];
   List<TreeNode> spacesNodes = [];
-  List<String> communityIds = [];
+
   _onLoadCommunityAndSpaces(
       LoadCommunityAndSpacesEvent event, Emitter<UsersState> emit) async {
     try {
       emit(UsersLoadingState());
       List<CommunityModel> communities =
           await CommunitySpaceManagementApi().fetchCommunities();
-      communityIds = communities.map((community) => community.uuid).toList();
       updatedCommunities = await Future.wait(
         communities.map((community) async {
           List<SpaceModel> spaces =
@@ -102,19 +101,13 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           );
         }).toList(),
       );
-      originalCommunities = updatedCommunities;
       emit(const SpacesLoadedState());
+      return updatedCommunities;
     } catch (e) {
       emit(ErrorState('Error loading communities and spaces: $e'));
     }
   }
 
-// This variable holds the full original list.
-  List<TreeNode> originalCommunities = [];
-
-// This variable holds the working list that may be filtered.
-
-// Build tree nodes from your data model.
   List<TreeNode> _buildTreeNodes(List<SpaceModel> spaces) {
     return spaces.map((space) {
       List<TreeNode> childNodes =
@@ -130,39 +123,12 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     }).toList();
   }
 
-// Optional helper method to deep clone a TreeNode.
-  TreeNode _cloneNode(TreeNode node) {
-    return TreeNode(
-      uuid: node.uuid,
-      title: node.title,
-      isChecked: node.isChecked,
-      isHighlighted: node.isHighlighted,
-      isExpanded: node.isExpanded,
-      children: node.children.map(_cloneNode).toList(),
-    );
-  }
-
-// Clone an entire list of tree nodes.
-  List<TreeNode> _cloneNodes(List<TreeNode> nodes) {
-    return nodes.map(_cloneNode).toList();
-  }
-
-// Your search event handler.
   void searchTreeNode(SearchAnode event, Emitter<UsersState> emit) {
     emit(UsersLoadingState());
-
-    // If the search term is empty, restore the original list.
     if (event.searchTerm!.isEmpty) {
-      // Clear any highlights on the restored copy.
-      updatedCommunities = _cloneNodes(originalCommunities);
       _clearHighlights(updatedCommunities);
     } else {
-      // Start with a fresh clone of the original tree.
+      _searchAndHighlightNodes(updatedCommunities, event.searchTerm!);
-      List<TreeNode> freshClone = _cloneNodes(originalCommunities);
-
-      _searchAndHighlightNodes(freshClone, event.searchTerm!);
-
-      updatedCommunities = _filterNodes(freshClone, event.searchTerm!);
     }
     emit(ChangeStatusSteps());
   }
@@ -189,91 +155,6 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     return anyMatch;
   }
 
-  List<TreeNode> _filterNodes(List<TreeNode> nodes, String searchTerm) {
-    List<TreeNode> filteredNodes = [];
-    for (var node in nodes) {
-      bool isMatch =
-          node.title.toLowerCase().contains(searchTerm.toLowerCase());
-      List<TreeNode> filteredChildren = _filterNodes(node.children, searchTerm);
-      if (isMatch || filteredChildren.isNotEmpty) {
-        node.isHighlighted = isMatch;
-        node.children = filteredChildren;
-        filteredNodes.add(node);
-      }
-    }
-    return filteredNodes;
-  }
-
-  // List<TreeNode> _buildTreeNodes(List<SpaceModel> spaces) {
-  //   return spaces.map((space) {
-  //     List<TreeNode> childNodes =
-  //         space.children.isNotEmpty ? _buildTreeNodes(space.children) : [];
-  //     return TreeNode(
-  //       uuid: space.uuid!,
-  //       title: space.name,
-  //       isChecked: false,
-  //       isHighlighted: false,
-  //       isExpanded: childNodes.isNotEmpty,
-  //       children: childNodes,
-  //     );
-  //   }).toList();
-  // }
-
-  // void searchTreeNode(SearchAnode event, Emitter<UsersState> emit) {
-  //   emit(UsersLoadingState());
-  //   if (event.searchTerm!.isEmpty) {
-  //     _clearHighlights(updatedCommunities);
-  //   } else {
-  //     _searchAndHighlightNodes(updatedCommunities, event.searchTerm!);
-  //     updatedCommunities = _filterNodes(updatedCommunities, event.searchTerm!);
-  //   }
-  //   emit(ChangeStatusSteps());
-  // }
-
-  // void _clearHighlights(List<TreeNode> nodes) {
-  //   for (var node in nodes) {
-  //     node.isHighlighted = false;
-  //     if (node.children.isNotEmpty) {
-  //       _clearHighlights(node.children);
-  //     }
-  //   }
-  // }
-
-  // bool _searchAndHighlightNodes(List<TreeNode> nodes, String searchTerm) {
-  //   bool anyMatch = false;
-  //   for (var node in nodes) {
-  //     bool isMatch =
-  //         node.title.toLowerCase().contains(searchTerm.toLowerCase());
-  //     bool childMatch = _searchAndHighlightNodes(node.children, searchTerm);
-  //     node.isHighlighted = isMatch || childMatch;
-
-  //     anyMatch = anyMatch || node.isHighlighted;
-  //   }
-  //   return anyMatch;
-  // }
-
-  // List<TreeNode> _filterNodes(List<TreeNode> nodes, String searchTerm) {
-  //   List<TreeNode> filteredNodes = [];
-  //   for (var node in nodes) {
-  //     // Check if the current node's title contains the search term.
-  //     bool isMatch =
-  //         node.title.toLowerCase().contains(searchTerm.toLowerCase());
-
-  //     // Recursively filter the children.
-  //     List<TreeNode> filteredChildren = _filterNodes(node.children, searchTerm);
-
-  //     // If the current node is a match or any of its children are, include it.
-  //     if (isMatch || filteredChildren.isNotEmpty) {
-  //       // Optionally, update any properties (like isHighlighted) if you still need them.
-  //       node.isHighlighted = isMatch;
-  //       // Replace the children with the filtered ones.
-  //       node.children = filteredChildren;
-  //       filteredNodes.add(node);
-  //     }
-  //   }
-  //   return filteredNodes;
-  // }
-
   List<String> selectedIds = [];
 
   List<String> getSelectedIds(List<TreeNode> nodes) {
@@ -296,6 +177,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     try {
       emit(UsersLoadingState());
       roles = await UserPermissionApi().fetchRoles();
+      //  add(PermissionEvent(roleUuid: roles.first.uuid));
       emit(RolePermissionInitial());
     } catch (e) {
       emit(ErrorState('Error loading communities and spaces: $e'));
@@ -326,13 +208,10 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     return anyMatch;
   }
 
-  void _sendInvitUser(SendInviteUsers event, Emitter<UsersState> emit) async {
+  _sendInvitUser(SendInviteUsers event, Emitter<UsersState> emit) async {
     try {
       emit(UsersLoadingState());
-      List<String> selectedIds = getSelectedIds(updatedCommunities)
+      List<String> selectedIds = getSelectedIds(updatedCommunities);
-          .where((id) => !communityIds.contains(id))
-          .toList();
-
       bool res = await UserPermissionApi().sendInviteUser(
         email: emailController.text,
         firstName: firstNameController.text,
@@ -342,8 +221,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
         roleUuid: roleSelected,
         spaceUuids: selectedIds,
       );
-
+      if (res == true) {
-      if (res) {
         showCustomDialog(
           barrierDismissible: false,
           context: event.context,
@@ -373,10 +251,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
   _editInviteUser(EditInviteUsers event, Emitter<UsersState> emit) async {
     try {
       emit(UsersLoadingState());
-      List<String> selectedIds = getSelectedIds(updatedCommunities)
+      List<String> selectedIds = getSelectedIds(updatedCommunities);
-          .where((id) => !communityIds.contains(id))
-          .toList();
-
       bool res = await UserPermissionApi().editInviteUser(
         userId: event.userId,
         firstName: firstNameController.text,

lib/pages/roles_and_permission/users_page/add_user_dialog/view/add_user_dialog.dart

@@ -26,126 +26,126 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
         create: (BuildContext context) => UsersBloc()
           ..add(const LoadCommunityAndSpacesEvent())
           ..add(const RoleEvent()),
-        child: BlocConsumer<UsersBloc, UsersState>(listener: (context, state) {
+        child: BlocConsumer<UsersBloc, UsersState>(
-          //          print('88888==${state}');
+            listener: (context, state) {},
-          // if (state is SpacesLoadedState) {
+            builder: (context, state) {
-          //   print('object');
+              final _blocRole = BlocProvider.of<UsersBloc>(context);
-          //   _blocRole.add(const CheckRoleStepStatus());
-          // }
-        }, builder: (context, state) {
-          final _blocRole = BlocProvider.of<UsersBloc>(context);
 
-          return Dialog(
+              return Dialog(
-              child: Container(
+                  child: Container(
-            decoration: const BoxDecoration(
+                decoration: const BoxDecoration(
-                color: Colors.white,
+                    color: Colors.white,
-                borderRadius: BorderRadius.all(Radius.circular(20))),
+                    borderRadius: BorderRadius.all(Radius.circular(20))),
-            width: 900,
+                width: 900,
-            child: Column(
+                child: Column(
-              children: [
+                  children: [
-                // Title
+                    // Title
-                const Padding(
+                    const Padding(
-                  padding: EdgeInsets.all(8.0),
+                      padding: EdgeInsets.all(8.0),
-                  child: SizedBox(
+                      child: SizedBox(
-                    child: Text(
-                      "Add New User",
-                      style: TextStyle(
-                          fontSize: 20,
-                          fontWeight: FontWeight.w700,
-                          color: ColorsManager.secondaryColor),
-                    ),
-                  ),
-                ),
-                const Divider(),
-                Expanded(
-                  child: Row(
-                    children: [
-                      Expanded(
-                        child: Container(
-                          padding: const EdgeInsets.all(20),
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              _buildStep1Indicator(1, "Basics", _blocRole),
-                              _buildStep2Indicator(2, "Spaces", _blocRole),
-                              _buildStep3Indicator(
-                                  3, "Role & Permissions", _blocRole),
-                            ],
-                          ),
-                        ),
-                      ),
-                      Container(
-                        width: 1,
-                        color: ColorsManager.grayBorder,
-                      ),
-                      Expanded(
-                        flex: 2,
-                        child: Padding(
-                          padding: const EdgeInsets.all(20.0),
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              const SizedBox(height: 10),
-                              Expanded(
-                                child: _getFormContent(),
-                              ),
-                              const SizedBox(height: 20),
-                            ],
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-                const Divider(),
-                Padding(
-                  padding: const EdgeInsets.all(8.0),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceAround,
-                    children: [
-                      InkWell(
-                        onTap: () {
-                          Navigator.of(context).pop();
-                        },
-                        child: const Text("Cancel"),
-                      ),
-                      InkWell(
-                        onTap: () {
-                          _blocRole.add(const CheckEmailEvent());
-
-                          setState(() {
-                            if (currentStep < 3) {
-                              currentStep++;
-                              if (currentStep == 2) {
-                                _blocRole.add(
-                                    const CheckStepStatus(isEditUser: false));
-                              } else if (currentStep == 3) {
-                                _blocRole.add(const CheckSpacesStepStatus());
-                              }
-                            } else {
-                              _blocRole.add(SendInviteUsers(context: context));
-                            }
-                          });
-                        },
                         child: Text(
-                          currentStep < 3 ? "Next" : "Save",
+                          "Add New User",
                           style: TextStyle(
-                              color: (_blocRole.isCompleteSpaces == false ||
+                              fontSize: 20,
-                                          _blocRole.isCompleteBasics == false ||
+                              fontWeight: FontWeight.w700,
-                                          _blocRole.isCompleteRolePermissions ==
+                              color: ColorsManager.secondaryColor),
-                                              false) &&
-                                      currentStep == 3
-                                  ? ColorsManager.grayColor
-                                  : ColorsManager.secondaryColor),
                         ),
                       ),
-                    ],
+                    ),
-                  ),
+                    const Divider(),
+                    Expanded(
+                      child: Row(
+                        children: [
+                          Expanded(
+                            child: Container(
+                              padding: const EdgeInsets.all(20),
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  _buildStep1Indicator(1, "Basics", _blocRole),
+                                  _buildStep2Indicator(2, "Spaces", _blocRole),
+                                  _buildStep3Indicator(
+                                      3, "Role & Permissions", _blocRole),
+                                ],
+                              ),
+                            ),
+                          ),
+                          Container(
+                            width: 1,
+                            color: ColorsManager.grayBorder,
+                          ),
+                          Expanded(
+                            flex: 2,
+                            child: Padding(
+                              padding: const EdgeInsets.all(20.0),
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  const SizedBox(height: 10),
+                                  Expanded(
+                                    child: _getFormContent(),
+                                  ),
+                                  const SizedBox(height: 20),
+                                ],
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    const Divider(),
+                    Padding(
+                      padding: const EdgeInsets.all(8.0),
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceAround,
+                        children: [
+                          InkWell(
+                            onTap: () {
+                              Navigator.of(context).pop();
+                            },
+                            child: const Text("Cancel"),
+                          ),
+                          InkWell(
+                            onTap: () {
+                              _blocRole.add(const CheckEmailEvent());
+
+                              setState(() {
+                                if (currentStep < 3) {
+                                  currentStep++;
+                                  if (currentStep == 2) {
+                                    _blocRole.add(
+                                        const CheckStepStatus(isEditUser: false));
+                                  } else if (currentStep == 3) {
+                                    _blocRole
+                                        .add(const CheckSpacesStepStatus());
+                                  }
+                                } else {
+                                  _blocRole
+                                      .add(SendInviteUsers(context: context));
+                                }
+                              });
+                            },
+                            child: Text(
+                              currentStep < 3 ? "Next" : "Save",
+                              style: TextStyle(
+                                  color: (_blocRole.isCompleteSpaces == false ||
+                                              _blocRole.isCompleteBasics ==
+                                                  false ||
+                                              _blocRole
+                                                      .isCompleteRolePermissions ==
+                                                  false) &&
+                                          currentStep == 3
+                                      ? ColorsManager.grayColor
+                                      : ColorsManager.secondaryColor),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ],
                 ),
-              ],
+              ));
-            ),
+            }));
-          ));
-        }));
   }
 
   Widget _getFormContent() {
@@ -236,16 +236,12 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
     return GestureDetector(
       onTap: () {
         setState(() {
-          bloc.add(const CheckStepStatus(isEditUser: false));
           currentStep = step;
-          Future.delayed(const Duration(milliseconds: 500), () {
+          bloc.add(const CheckStepStatus(isEditUser: false));
-            bloc.add(const CheckStepStatus(isEditUser: false));
-          });
           if (step3 == 3) {
-            Future.delayed(const Duration(seconds: 1), () {
+            bloc.add(const CheckRoleStepStatus());
-              bloc.add(const CheckRoleStepStatus());
-            });
           }
+          
         });
       },
       child: Column(

lib/pages/roles_and_permission/users_page/add_user_dialog/view/basics_view.dart

@@ -46,120 +46,117 @@ class BasicsView extends StatelessWidget {
             ),
             Row(
               children: [
-                Flexible(
+                SizedBox(
-                  child: SizedBox(
+                  width: MediaQuery.of(context).size.width * 0.18,
-                    // width: MediaQuery.of(context).size.width * 0.18,
+                  height: MediaQuery.of(context).size.width * 0.08,
-                    height: MediaQuery.of(context).size.width * 0.08,
+                  child: Column(
-                    child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
-                      crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
-                      children: [
+                      SizedBox(
-                        SizedBox(
+                          child: Row(
-                            child: Row(
+                        children: [
-                          children: [
+                          const Text(
-                            const Text(
+                            " * ",
-                              " * ",
+                            style: TextStyle(
-                              style: TextStyle(
+                              color: ColorsManager.red,
-                                color: ColorsManager.red,
+                              fontWeight: FontWeight.w900,
-                                fontWeight: FontWeight.w900,
+                              fontSize: 15,
-                                fontSize: 15,
-                              ),
                             ),
-                            Text(
-                              'First Name',
-                              style: context.textTheme.bodyMedium?.copyWith(
-                                fontWeight: FontWeight.w400,
-                                fontSize: 13,
-                              ),
-                            ),
-                          ],
-                        )),
-                        Padding(
-                          padding: const EdgeInsets.all(8.0),
-                          child: TextFormField(
-                            style: const TextStyle(
-                                color: ColorsManager.blackColor),
-                            // onChanged: (value) {
-                            //   Future.delayed(const Duration(milliseconds: 200),
-                            //       () {
-                            //     _blocRole.add(const ValidateBasicsStep());
-                            //   });
-                            // },
-                            controller: _blocRole.firstNameController,
-                            decoration: inputTextFormDeco(
-                              hintText: "Enter first name",
-                            ).copyWith(
-                              hintStyle: context.textTheme.bodyMedium?.copyWith(
-                                  fontWeight: FontWeight.w400,
-                                  fontSize: 12,
-                                  color: ColorsManager.textGray),
-                            ),
-                            validator: (value) {
-                              if (value == null || value.isEmpty) {
-                                return 'Enter first name';
-                              }
-                              return null;
-                            },
                           ),
+                          Text(
+                            'First Name',
+                            style: context.textTheme.bodyMedium?.copyWith(
+                              fontWeight: FontWeight.w400,
+                              fontSize: 13,
+                            ),
+                          ),
+                        ],
+                      )),
+                      Padding(
+                        padding: const EdgeInsets.all(8.0),
+                        child: TextFormField(
+                          style:
+                              const TextStyle(color: ColorsManager.blackColor),
+                          // onChanged: (value) {
+                          //   Future.delayed(const Duration(milliseconds: 200),
+                          //       () {
+                          //     _blocRole.add(const ValidateBasicsStep());
+                          //   });
+                          // },
+                          controller: _blocRole.firstNameController,
+                          decoration: inputTextFormDeco(
+                            hintText: "Enter first name",
+                          ).copyWith(
+                            hintStyle: context.textTheme.bodyMedium?.copyWith(
+                                fontWeight: FontWeight.w400,
+                                fontSize: 12,
+                                color: ColorsManager.textGray),
+                          ),
+                          validator: (value) {
+                            if (value == null || value.isEmpty) {
+                              return 'Enter first name';
+                            }
+                            return null;
+                          },
                         ),
-                      ],
+                      ),
-                    ),
+                    ],
                   ),
                 ),
                 const SizedBox(width: 10),
-                Flexible(
+                SizedBox(
-                  child: SizedBox(
+                  width: MediaQuery.of(context).size.width * 0.18,
-                    // width: MediaQuery.of(context).size.width * 0.18,
+                  height: MediaQuery.of(context).size.width * 0.08,
-                    height: MediaQuery.of(context).size.width * 0.08,
+                  child: Column(
-                    child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
-                      crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
-                      children: [
+                      SizedBox(
-                        SizedBox(
+                          child: Row(
-                            child: Row(
+                        children: [
-                          children: [
+                          const Text(
-                            const Text(
+                            " * ",
-                              " * ",
+                            style: TextStyle(
-                              style: TextStyle(
+                              color: ColorsManager.red,
-                                color: ColorsManager.red,
+                              fontWeight: FontWeight.w900,
-                                fontWeight: FontWeight.w900,
+                              fontSize: 15,
-                                fontSize: 15,
-                              ),
                             ),
-                            Text('Last Name',
-                                style: context.textTheme.bodyMedium?.copyWith(
-                                  fontWeight: FontWeight.w400,
-                                  fontSize: 13,
-                                )),
-                          ],
-                        )),
-                        Padding(
-                          padding: const EdgeInsets.all(8.0),
-                          child: TextFormField(
-                            // onChanged: (value) {
-                            //   Future.delayed(const Duration(milliseconds: 200),
-                            //       () {
-                            //     _blocRole.add(ValidateBasicsStep());
-                            //   });
-                            // },
-                            controller: _blocRole.lastNameController,
-                            style: const TextStyle(color: Colors.black),
-                            decoration:
-                                inputTextFormDeco(hintText: "Enter last name")
-                                    .copyWith(
-                                        hintStyle: context.textTheme.bodyMedium
-                                            ?.copyWith(
-                                                fontWeight: FontWeight.w400,
-                                                fontSize: 12,
-                                                color: ColorsManager.textGray)),
-                            validator: (value) {
-                              if (value == null || value.isEmpty) {
-                                return 'Enter last name';
-                              }
-                              return null;
-                            },
                           ),
+                          Text('Last Name',
+                              style: context.textTheme.bodyMedium?.copyWith(
+                                fontWeight: FontWeight.w400,
+                                fontSize: 13,
+                              )),
+                        ],
+                      )),
+                      Padding(
+                        padding: const EdgeInsets.all(8.0),
+                        child: TextFormField(
+                          // onChanged: (value) {
+                          //   Future.delayed(const Duration(milliseconds: 200),
+                          //       () {
+                          //     _blocRole.add(ValidateBasicsStep());
+                          //   });
+                          // },
+                          controller: _blocRole.lastNameController,
+                          style: const TextStyle(color: Colors.black),
+                          decoration:
+                              inputTextFormDeco(hintText: "Enter last name")
+                                  .copyWith(
+                                      hintStyle: context
+                                          .textTheme.bodyMedium
+                                          ?.copyWith(
+                                              fontWeight: FontWeight.w400,
+                                              fontSize: 12,
+                                              color: ColorsManager.textGray)),
+                          validator: (value) {
+                            if (value == null || value.isEmpty) {
+                              return 'Enter last name';
+                            }
+                            return null;
+                          },
                         ),
-                      ],
+                      ),
-                    ),
+                    ],
                   ),
                 ),
               ],
@@ -221,7 +218,7 @@ class BasicsView extends StatelessWidget {
                       if (_blocRole.checkEmailValid != "Valid email") {
                         return _blocRole.checkEmailValid;
                       }
-                      // return null;
+                      return null;
                     },
                   ),
                 ),

lib/pages/roles_and_permission/users_page/add_user_dialog/view/popup_menu_filter.dart

@@ -81,7 +81,7 @@ Future<void> showPopUpFilterMenu({
                 ),
                 const Divider(),
                 const Text(
-                  "Filter by ",
+                  "Filter by Status",
                   style: TextStyle(fontWeight: FontWeight.bold),
                 ),
                 Container(

lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_bloc.dart

@@ -27,16 +27,7 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   int currentPage = 1;
   List<RolesUserModel> users = [];
   List<RolesUserModel> initialUsers = [];
-
-  List<RolesUserModel> totalUsersCount = [];
   String currentSortOrder = '';
-
-  String currentSortJopTitle = '';
-  String currentSortRole = '';
-  String currentSortCreatedDate = '';
-  String currentSortStatus = '';
-  String currentSortCreatedBy = '';
-
   String currentSortOrderDate = '';
   List<String> roleTypes = [];
   List<String> jobTitle = [];
@@ -49,7 +40,9 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
       roleTypes.clear();
       jobTitle.clear();
       createdBy.clear();
+      // deActivate.clear();
       users = await UserPermissionApi().fetchUsers();
+
       users.sort((a, b) {
         final dateA = _parseDateTime(a.createdDate);
         final dateB = _parseDateTime(b.createdDate);
@@ -64,13 +57,15 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
       for (var user in users) {
         createdBy.add(user.invitedBy.toString());
       }
+      // for (var user in users) {
+      //   deActivate.add(user.status.toString());
+      // }
       initialUsers = List.from(users);
       roleTypes = roleTypes.toSet().toList();
       jobTitle = jobTitle.toSet().toList();
       createdBy = createdBy.toSet().toList();
+      // deActivate = deActivate.toSet().toList();
       _handlePageChange(ChangePage(1), emit);
-      totalUsersCount = initialUsers;
-      add(ChangePage(currentPage));
       emit(UsersLoadedState(users: users));
     } catch (e) {
       emit(ErrorState(e.toString()));
@@ -101,6 +96,26 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
           event.userId, event.newStatus == "disabled" ? false : true);
       if (res == true) {
         add(const GetUsers());
+        // users = users.map((user) {
+        //   if (user.uuid == event.userId) {
+        //     return RolesUserModel(
+        //       uuid: user.uuid,
+        //       createdAt: user.createdAt,
+        //       email: user.email,
+        //       firstName: user.firstName,
+        //       lastName: user.lastName,
+        //       roleType: user.roleType,
+        //       status: event.newStatus,
+        //       isEnabled: event.newStatus == "disabled" ? false : true,
+        //       invitedBy: user.invitedBy,
+        //       phoneNumber: user.phoneNumber,
+        //       jobTitle: user.jobTitle,
+        //       createdDate: user.createdDate,
+        //       createdTime: user.createdTime,
+        //     );
+        //   }
+        //   return user;
+        // }).toList();
       }
       emit(UsersLoadedState(users: users));
     } catch (e) {
@@ -110,14 +125,11 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
 
   void _toggleSortUsersByNameAsc(
       SortUsersByNameAsc event, Emitter<UserTableState> emit) {
-    selectedRoles.clear();
-    selectedJobTitles.clear();
-    selectedCreatedBy.clear();
-    selectedStatuses.clear();
     if (currentSortOrder == "Asc") {
       emit(UsersLoadingState());
       currentSortOrder = "";
       users = List.from(users);
+      emit(UsersLoadedState(users: users));
     } else {
       emit(UsersLoadingState());
       currentSortOrder = "Asc";
@@ -125,42 +137,28 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
           .toString()
           .toLowerCase()
           .compareTo(b.firstName.toString().toLowerCase()));
+      emit(UsersLoadedState(users: users));
     }
-    currentSortJopTitle = '';
-    currentSortCreatedDate = '';
-    currentSortStatus = '';
-    currentSortCreatedBy = '';
-    emit(UsersLoadedState(users: users));
   }
 
   void _toggleSortUsersByNameDesc(
       SortUsersByNameDesc event, Emitter<UserTableState> emit) {
-    selectedRoles.clear();
-    selectedJobTitles.clear();
-    selectedCreatedBy.clear();
-    selectedStatuses.clear();
     if (currentSortOrder == "Desc") {
       emit(UsersLoadingState());
       currentSortOrder = "";
-      users = List.from(initialUsers);
+      users = List.from(initialUsers); // Reset to saved initial state
+      emit(UsersLoadedState(users: users));
     } else {
+      // Sort descending
       emit(UsersLoadingState());
       currentSortOrder = "Desc";
       users.sort((a, b) => b.firstName!.compareTo(a.firstName!));
+      emit(UsersLoadedState(users: users));
     }
-    currentSortJopTitle = '';
-    currentSortCreatedDate = '';
-    currentSortStatus = '';
-    currentSortCreatedBy = '';
-    emit(UsersLoadedState(users: users));
   }
 
   void _toggleSortUsersByDateNewestToOldest(
       DateNewestToOldestEvent event, Emitter<UserTableState> emit) {
-    selectedRoles.clear();
-    selectedJobTitles.clear();
-    selectedCreatedBy.clear();
-    selectedStatuses.clear();
     if (currentSortOrderDate == "NewestToOldest") {
       emit(UsersLoadingState());
       currentSortOrder = "";
@@ -181,10 +179,6 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
 
   void _toggleSortUsersByDateOldestToNewest(
       DateOldestToNewestEvent event, Emitter<UserTableState> emit) {
-    selectedRoles.clear();
-    selectedJobTitles.clear();
-    selectedCreatedBy.clear();
-    selectedStatuses.clear();
     if (currentSortOrderDate == "OldestToNewest") {
       emit(UsersLoadingState());
       currentSortOrder = "";
@@ -218,7 +212,6 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   Future<void> _searchUsers(
       SearchUsers event, Emitter<UserTableState> emit) async {
     try {
-      emit(TableSearch());
       final query = event.query.toLowerCase();
       final filteredUsers = initialUsers.where((user) {
         final fullName = "${user.firstName} ${user.lastName}".toLowerCase();
@@ -247,8 +240,7 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   }
 
   void _handlePageChange(ChangePage event, Emitter<UserTableState> emit) {
-    currentPage = event.pageNumber;
+    const itemsPerPage = 10;
-    const itemsPerPage = 20;
     final startIndex = (event.pageNumber - 1) * itemsPerPage;
     final endIndex = startIndex + itemsPerPage;
     if (startIndex >= users.length) {
@@ -285,15 +277,9 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {}
+    } else {
-    currentSortOrder = "";
+      currentSortOrder = "";
-    currentSortCreatedDate = '';
+    }
-    currentSortStatus = '';
-    currentSortCreatedBy = '';
-    currentSortJopTitle = '';
-    currentSortOrderDate = "";
-
-    totalUsersCount = filteredUsers;
 
     emit(UsersLoadedState(users: filteredUsers));
   }
@@ -315,16 +301,9 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {}
+    } else {
-    currentSortOrder = "";
+      currentSortOrder = "";
-    currentSortCreatedDate = '';
+    }
-    currentSortStatus = '';
-    currentSortCreatedBy = '';
-    currentSortRole = '';
-    currentSortOrderDate = "";
-
-    totalUsersCount = filteredUsers;
-
     emit(UsersLoadedState(users: filteredUsers));
   }
 
@@ -346,15 +325,9 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {}
+    } else {
-    currentSortOrder = '';
+      currentSortOrder = "";
-    currentSortRole = '';
+    }
-    currentSortCreatedDate = '';
-    currentSortStatus = '';
-    currentSortOrderDate = "";
-
-    totalUsersCount = filteredUsers;
-
     emit(UsersLoadedState(users: filteredUsers));
   }
 
@@ -364,20 +337,7 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
 
     final filteredUsers = initialUsers.where((user) {
       if (selectedStatuses.isEmpty) return true;
-
+      return selectedStatuses.contains(user.status);
-      return selectedStatuses.any((status) {
-        final userStatus = user.status?.toLowerCase() ?? '';
-        switch (status.toLowerCase()) {
-          case 'active':
-            return user.isEnabled == true && userStatus != 'invited';
-          case 'disabled':
-            return user.isEnabled == false;
-          case 'invited':
-            return userStatus == 'invited';
-          default:
-            return false;
-        }
-      });
     }).toList();
     if (event.sortOrder == "Asc") {
       currentSortOrder = "Asc";
@@ -388,14 +348,9 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-      totalUsersCount = filteredUsers;
+    } else {
-    } else {}
+      currentSortOrder = "";
-    currentSortOrder = '';
+    }
-    currentSortRole = '';
-    currentSortCreatedDate = '';
-    currentSortCreatedBy = '';
-    currentSortOrderDate = "";
-
     emit(UsersLoadedState(users: filteredUsers));
   }
 

lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_state.dart

@@ -9,10 +9,7 @@ final class TableInitial extends UserTableState {
   @override
   List<Object> get props => [];
 }
-final class TableSearch extends UserTableState {
+
-  @override
-  List<Object> get props => [];
-}
 final class RolesLoadingState extends UserTableState {
   @override
   List<Object> get props => [];

lib/pages/roles_and_permission/users_page/users_table/view/creation_date_filter.dart

@@ -12,7 +12,7 @@ Future<void> showDateFilterMenu({
       Overlay.of(context).context.findRenderObject() as RenderBox;
   final RelativeRect position = RelativeRect.fromRect(
     Rect.fromLTRB(
-      overlay.size.width / 3,
+      overlay.size.width / 2,
       240,
       0,
       overlay.size.height,
@@ -40,6 +40,7 @@ Future<void> showDateFilterMenu({
           ),
           title: Text(
             "Sort from newest to oldest",
+            // style: context.textTheme.bodyMedium,
             style: TextStyle(
                 color: isSelected == "NewestToOldest"
                     ? Colors.black
@@ -64,5 +65,9 @@ Future<void> showDateFilterMenu({
         ),
       ),
     ],
-  ).then((value) {});
+  ).then((value) {
+    // setState(() {
+    //   _isDropdownOpen = false;
+    // });
+  });
 }

lib/pages/roles_and_permission/users_page/users_table/view/de_activate_filter.dart

@@ -40,6 +40,7 @@ Future<void> showDeActivateFilterMenu({
           ),
           title: Text(
             "Sort A to Z",
+            // style: context.textTheme.bodyMedium,
             style: TextStyle(
                 color: isSelected == "NewestToOldest"
                     ? Colors.black
@@ -64,5 +65,9 @@ Future<void> showDeActivateFilterMenu({
         ),
       ),
     ],
-  ).then((value) {});
+  ).then((value) {
+    // setState(() {
+    //   _isDropdownOpen = false;
+    // });
+  });
 }

lib/pages/roles_and_permission/users_page/users_table/view/name_filter.dart

@@ -12,7 +12,7 @@ Future<void> showNameMenu({
       Overlay.of(context).context.findRenderObject() as RenderBox;
   final RelativeRect position = RelativeRect.fromRect(
     Rect.fromLTRB(
-      overlay.size.width / 35,
+      overlay.size.width / 25,
       240,
       0,
       overlay.size.height,
@@ -40,6 +40,7 @@ Future<void> showNameMenu({
           ),
           title: Text(
             "Sort A to Z",
+            // style: context.textTheme.bodyMedium,
             style: TextStyle(
                 color: isSelected == "Asc" ? Colors.black : Colors.blueGrey),
           ),
@@ -60,5 +61,9 @@ Future<void> showNameMenu({
         ),
       ),
     ],
-  ).then((value) {});
+  ).then((value) {
+    // setState(() {
+    //   _isDropdownOpen = false;
+    // });
+  });
 }

lib/pages/roles_and_permission/users_page/users_table/view/user_table.dart

@@ -1,264 +1,260 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/style.dart';
 
-class _HeaderColumn extends StatelessWidget {
-  final String title;
-  final double width;
-  final bool showFilter;
-  final VoidCallback? onFilter;
-  final Function(double) onResize;
-
-  const _HeaderColumn({
-    required this.title,
-    required this.width,
-    required this.showFilter,
-    required this.onResize,
-    this.onFilter,
-    Key? key,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return MouseRegion(
-      cursor: SystemMouseCursors.resizeColumn,
-      child: GestureDetector(
-        onHorizontalDragUpdate: (details) => onResize(details.delta.dx),
-        child: Container(
-          width: width,
-          padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
-          decoration: const BoxDecoration(
-            border: Border(right: BorderSide(color: ColorsManager.boxDivider)),
-          ),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Expanded(
-                child: Text(
-                  title,
-                  maxLines: 2,
-                  overflow: TextOverflow.ellipsis,
-                  style: const TextStyle(
-                    fontWeight: FontWeight.w400,
-                    fontSize: 13,
-                    color: ColorsManager.grayColor,
-                  ),
-                ),
-              ),
-              if (showFilter)
-                IconButton(
-                  icon: SvgPicture.asset(Assets.filterTableIcon),
-                  onPressed: onFilter,
-                  padding: EdgeInsets.zero,
-                  constraints: const BoxConstraints(),
-                ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class _TableRow extends StatelessWidget {
-  final List<Widget> cells;
-  final List<double> columnWidths;
-  final bool isLast;
-
-  const _TableRow({
-    required this.cells,
-    required this.columnWidths,
-    required this.isLast,
-    Key? key,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Row(
-          children: [
-            for (int i = 0; i < cells.length; i++)
-              Container(
-                width: columnWidths[i],
-                padding:
-                    const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
-                // decoration: BoxDecoration(
-                //   border: Border(
-                //     right: BorderSide(color: ColorsManager.boxDivider),
-                //   ),
-                // ),
-                child: cells[i],
-              ),
-          ],
-        ),
-        if (!isLast)
-          Divider(
-            height: 1,
-            thickness: 1,
-            color: ColorsManager.boxDivider,
-          ),
-      ],
-    );
-  }
-}
-//===========================================================================
-
 class DynamicTableScreen extends StatefulWidget {
   final List<String> titles;
   final List<List<Widget>> rows;
   final void Function(int columnIndex)? onFilter;
 
-  const DynamicTableScreen({
+  DynamicTableScreen(
-    required this.titles,
+      {required this.titles, required this.rows, required this.onFilter});
-    required this.rows,
-    required this.onFilter,
-    Key? key,
-  }) : super(key: key);
 
   @override
   _DynamicTableScreenState createState() => _DynamicTableScreenState();
 }
 
-class _DynamicTableScreenState extends State<DynamicTableScreen> {
+class _DynamicTableScreenState extends State<DynamicTableScreen>
+    with WidgetsBindingObserver {
   late List<double> columnWidths;
-  final double _minColumnWidth = 100.0;
+  late double totalWidth;
-  final double _maxColumnWidth = 300.0;
-  final double _dividerWidth = 1.0;
-  double _lastAvailableWidth = 0;
 
   @override
   void initState() {
     super.initState();
-    columnWidths = List.filled(widget.titles.length, _minColumnWidth);
+    columnWidths = List<double>.filled(widget.titles.length, 150.0);
+    totalWidth = columnWidths.reduce((a, b) => a + b);
+    WidgetsBinding.instance.addObserver(this);
   }
 
-  void _handleColumnResize(int index, double delta) {
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    super.dispose();
+  }
+
+  @override
+  void didChangeMetrics() {
+    super.didChangeMetrics();
+    final newScreenWidth = MediaQuery.of(context).size.width;
     setState(() {
-      double newWidth = columnWidths[index] + delta;
+      columnWidths = List<double>.generate(widget.titles.length, (index) {
-      newWidth = newWidth.clamp(_minColumnWidth, _maxColumnWidth);
+        if (index == 1) {
-      double actualDelta = newWidth - columnWidths[index];
+          return newScreenWidth *
-      if (actualDelta == 0) return;
+              0.12; // 20% of screen width for the second column
-
+        } else if (index == 9) {
-      int nextIndex = (index + 1) % columnWidths.length;
+          return newScreenWidth *
-      columnWidths[index] = newWidth;
+              0.1; // 25% of screen width for the tenth column
-      columnWidths[nextIndex] = (columnWidths[nextIndex] - actualDelta)
+        }
-          .clamp(_minColumnWidth, _maxColumnWidth);
+        return newScreenWidth *
+            0.09; // Default to 10% of screen width for other columns
+      });
     });
   }
 
-  Widget _buildHeader() {
-    return Container(
-      decoration: containerDecoration.copyWith(
-        color: ColorsManager.circleRolesBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(15),
-          topRight: Radius.circular(15),
-        ),
-      ),
-      child: Row(
-        children: [
-          for (int i = 0; i < widget.titles.length; i++)
-            _HeaderColumn(
-              title: widget.titles[i],
-              width: columnWidths[i],
-              showFilter: i != 1 && i != 9 && i != 8 && i != 5,
-              onFilter: () => widget.onFilter?.call(i),
-              onResize: (delta) => _handleColumnResize(i, delta),
-            ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildBody() {
-    if (widget.rows.isEmpty) {
-      return SizedBox(
-        height: 300,
-        child: Center(
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              SvgPicture.asset(Assets.emptyTable),
-              const SizedBox(height: 15),
-              const Text(
-                'No Users',
-                style: TextStyle(
-                  color: ColorsManager.lightGrayColor,
-                  fontSize: 16,
-                  fontWeight: FontWeight.w700,
-                ),
-              ),
-            ],
-          ),
-        ),
-      );
-    }
-
-    return Container(
-      decoration: containerDecoration.copyWith(
-        color: ColorsManager.whiteColors,
-        borderRadius: const BorderRadius.only(
-          bottomLeft: Radius.circular(15),
-          bottomRight: Radius.circular(15),
-        ),
-      ),
-      child: Column(
-        children: [
-          for (int rowIndex = 0; rowIndex < widget.rows.length; rowIndex++)
-            _TableRow(
-              cells: widget.rows[rowIndex],
-              columnWidths: columnWidths,
-              isLast: rowIndex == widget.rows.length - 1,
-            ),
-        ],
-      ),
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
-    return LayoutBuilder(
+    final screenWidth = MediaQuery.of(context).size.width;
-      builder: (context, constraints) {
+    if (columnWidths.every((width) => width == screenWidth * 7)) {
-        final availableWidth = constraints.maxWidth;
+      columnWidths = List<double>.generate(widget.titles.length, (index) {
-        final totalDividersWidth = (widget.titles.length - 1) * _dividerWidth;
+        if (index == 1) {
-
+          return screenWidth * 0.11;
-        if (_lastAvailableWidth != availableWidth) {
+        } else if (index == 9) {
-          final equalWidth =
+          return screenWidth * 0.1;
-              (availableWidth - totalDividersWidth) / widget.titles.length;
-          final clampedWidth =
-              equalWidth.clamp(_minColumnWidth, _maxColumnWidth);
-
-          WidgetsBinding.instance.addPostFrameCallback((_) {
-            setState(() {
-              columnWidths = List.filled(widget.titles.length, clampedWidth);
-              _lastAvailableWidth = availableWidth;
-            });
-          });
         }
-
+        return screenWidth * 0.09;
-        final totalTableWidth =
+      });
-            columnWidths.fold(0.0, (sum, w) => sum + w) + totalDividersWidth;
+      setState(() {});
-        return SingleChildScrollView(
+    }
-          scrollDirection: Axis.horizontal,
+    return SingleChildScrollView(
-          child: Container(
+      clipBehavior: Clip.none,
-            width: totalTableWidth,
+      scrollDirection: Axis.horizontal,
-            decoration: containerDecoration.copyWith(
+      child: Container(
-              color: ColorsManager.whiteColors,
+        decoration: containerDecoration.copyWith(
-              borderRadius: const BorderRadius.all(Radius.circular(20)),
+            color: ColorsManager.whiteColors,
-            ),
+            borderRadius: const BorderRadius.all(Radius.circular(20))),
-            child: Column(
+        child: FittedBox(
-              crossAxisAlignment: CrossAxisAlignment.start,
+          child: Column(
-              children: [
+            children: [
-                _buildHeader(),
+              Container(
-                _buildBody(),
+                width: totalWidth,
-              ],
+                decoration: containerDecoration.copyWith(
-            ),
+                    color: ColorsManager.circleRolesBackground,
+                    borderRadius: const BorderRadius.only(
+                        topLeft: Radius.circular(15),
+                        topRight: Radius.circular(15))),
+                child: Row(
+                  children: List.generate(widget.titles.length, (index) {
+                    return Row(
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      children: [
+                        FittedBox(
+                          child: Container(
+                            padding: const EdgeInsets.only(left: 5, right: 5),
+                            width: columnWidths[index],
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              children: [
+                                SizedBox(
+                                  child: Text(
+                                    widget.titles[index],
+                                    maxLines: 2,
+                                    style: const TextStyle(
+                                      overflow: TextOverflow.ellipsis,
+                                      fontWeight: FontWeight.w400,
+                                      fontSize: 13,
+                                      color: ColorsManager.grayColor,
+                                    ),
+                                  ),
+                                ),
+                                if (index != 1 &&
+                                    index != 9 &&
+                                    index != 8 &&
+                                    index != 5)
+                                  FittedBox(
+                                    child: IconButton(
+                                      icon: SvgPicture.asset(
+                                        Assets.filterTableIcon,
+                                        fit: BoxFit.none,
+                                      ),
+                                      onPressed: () {
+                                        if (widget.onFilter != null) {
+                                          widget.onFilter!(index);
+                                        }
+                                      },
+                                    ),
+                                  )
+                              ],
+                            ),
+                          ),
+                        ),
+                        GestureDetector(
+                          onHorizontalDragUpdate: (details) {
+                            setState(() {
+                              columnWidths[index] =
+                                  (columnWidths[index] + details.delta.dx)
+                                      .clamp(150.0, 300.0);
+                              totalWidth = columnWidths.reduce((a, b) => a + b);
+                            });
+                          },
+                          child: MouseRegion(
+                            cursor: SystemMouseCursors.resizeColumn,
+                            child: Container(
+                              color: Colors.green,
+                              child: Container(
+                                color: ColorsManager.boxDivider,
+                                width: 1,
+                                height: 50,
+                              ),
+                            ),
+                          ),
+                        ),
+                      ],
+                    );
+                  }),
+                ),
+              ),
+              widget.rows.isEmpty
+                  ? SizedBox(
+                      height: MediaQuery.of(context).size.height / 2,
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          Column(
+                            children: [
+                              SvgPicture.asset(Assets.emptyTable),
+                              const SizedBox(
+                                height: 15,
+                              ),
+                              const Text(
+                                'No Users',
+                                style: TextStyle(
+                                    color: ColorsManager.lightGrayColor,
+                                    fontSize: 16,
+                                    fontWeight: FontWeight.w700),
+                              )
+                            ],
+                          ),
+                        ],
+                      ),
+                    )
+                  : Center(
+                      child: Container(
+                        width: totalWidth,
+                        decoration: containerDecoration.copyWith(
+                            color: ColorsManager.whiteColors,
+                            borderRadius: const BorderRadius.only(
+                                bottomLeft: Radius.circular(15),
+                                bottomRight: Radius.circular(15))),
+                        child: ListView.builder(
+                          physics: const NeverScrollableScrollPhysics(),
+                          shrinkWrap: true,
+                          itemCount: widget.rows.length,
+                          itemBuilder: (context, rowIndex) {
+                            if (columnWidths.every((width) => width == 120.0)) {
+                              columnWidths = List<double>.generate(
+                                  widget.titles.length, (index) {
+                                if (index == 1) {
+                                  return screenWidth * 0.11;
+                                } else if (index == 9) {
+                                  return screenWidth * 0.2;
+                                }
+                                return screenWidth * 0.11;
+                              });
+                              setState(() {});
+                            }
+                            final row = widget.rows[rowIndex];
+                            return Column(
+                              children: [
+                                Container(
+                                  child: Padding(
+                                    padding: const EdgeInsets.only(
+                                        left: 5, top: 10, right: 5, bottom: 10),
+                                    child: Row(
+                                      children:
+                                          List.generate(row.length, (index) {
+                                        return SizedBox(
+                                          width: columnWidths[index],
+                                          child: SizedBox(
+                                            child: Padding(
+                                              padding: const EdgeInsets.only(
+                                                  left: 15, right: 10),
+                                              child: row[index],
+                                            ),
+                                          ),
+                                        );
+                                      }),
+                                    ),
+                                  ),
+                                ),
+                                if (rowIndex < widget.rows.length - 1)
+                                  Row(
+                                    children: List.generate(
+                                        widget.titles.length, (index) {
+                                      return SizedBox(
+                                        width: columnWidths[index],
+                                        child: const Divider(
+                                          color: ColorsManager.boxDivider,
+                                          thickness: 1,
+                                          height: 1,
+                                        ),
+                                      );
+                                    }),
+                                  ),
+                              ],
+                            );
+                          },
+                        ),
+                      ),
+                    ),
+            ],
           ),
-        );
+        ),
-      },
+      ),
     );
   }
 }

lib/pages/roles_and_permission/users_page/users_table/view/users_page.dart

@@ -108,6 +108,7 @@ class UsersPage extends StatelessWidget {
         final screenSize = MediaQuery.of(context).size;
         final _blocRole = BlocProvider.of<UserTableBloc>(context);
         if (state is UsersLoadingState) {
+          _blocRole.add(ChangePage(_blocRole.currentPage));
           return const Center(child: CircularProgressIndicator());
         } else if (state is UsersLoadedState) {
           return Padding(
@@ -129,12 +130,9 @@ class UsersPage extends StatelessWidget {
                         child: TextFormField(
                           controller: searchController,
                           onChanged: (value) {
-                            final bloc = context.read<UserTableBloc>();
+                            context
-                            bloc.add(FilterClearEvent());
+                                .read<UserTableBloc>()
-                            bloc.add(SearchUsers(value));
+                                .add(SearchUsers(value));
-                            if (value == '') {
-                              bloc.add(ChangePage(1));
-                            }
                           },
                           style: const TextStyle(color: Colors.black),
                           decoration: textBoxDecoration(radios: 15)!.copyWith(
@@ -217,7 +215,7 @@ class UsersPage extends StatelessWidget {
 
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
-                            overlay.size.width / 5.3,
+                            overlay.size.width / 4,
                             240,
                             overlay.size.width / 4,
                             0,
@@ -225,9 +223,8 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.jobTitle,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortJopTitle,
+                          isSelected: _blocRole.currentSortOrder,
                           onOkPressed: () {
-                            searchController.clear();
                             _blocRole.add(FilterClearEvent());
                             final selectedItems = checkboxStates.entries
                                 .where((entry) => entry.value)
@@ -236,14 +233,14 @@ class UsersPage extends StatelessWidget {
                             Navigator.of(context).pop();
                             _blocRole.add(FilterUsersByJobEvent(
                               selectedJob: selectedItems,
-                              sortOrder: _blocRole.currentSortJopTitle,
+                              sortOrder: _blocRole.currentSortOrder,
                             ));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortJopTitle = v;
+                            _blocRole.currentSortOrder = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortJopTitle = v;
+                            _blocRole.currentSortOrder = v;
                           },
                         );
                       }
@@ -266,9 +263,8 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.roleTypes,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortRole,
+                          isSelected: _blocRole.currentSortOrder,
                           onOkPressed: () {
-                            searchController.clear();
                             _blocRole.add(FilterClearEvent());
                             final selectedItems = checkboxStates.entries
                                 .where((entry) => entry.value)
@@ -278,13 +274,13 @@ class UsersPage extends StatelessWidget {
                             context.read<UserTableBloc>().add(
                                 FilterUsersByRoleEvent(
                                     selectedRoles: selectedItems,
-                                    sortOrder: _blocRole.currentSortRole));
+                                    sortOrder: _blocRole.currentSortOrder));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortRole = v;
+                            _blocRole.currentSortOrder = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortRole = v;
+                            _blocRole.currentSortOrder = v;
                           },
                         );
                       }
@@ -322,9 +318,8 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.createdBy,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortCreatedBy,
+                          isSelected: _blocRole.currentSortOrder,
                           onOkPressed: () {
-                            searchController.clear();
                             _blocRole.add(FilterClearEvent());
                             final selectedItems = checkboxStates.entries
                                 .where((entry) => entry.value)
@@ -333,13 +328,13 @@ class UsersPage extends StatelessWidget {
                             Navigator.of(context).pop();
                             _blocRole.add(FilterUsersByCreatedEvent(
                                 selectedCreatedBy: selectedItems,
-                                sortOrder: _blocRole.currentSortCreatedBy));
+                                sortOrder: _blocRole.currentSortOrder));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortCreatedBy = v;
+                            _blocRole.currentSortOrder = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortCreatedBy = v;
+                            _blocRole.currentSortOrder = v;
                           },
                         );
                       }
@@ -348,7 +343,6 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.status)
                             item: _blocRole.selectedStatuses.contains(item),
                         };
-
                         final RenderBox overlay = Overlay.of(context)
                             .context
                             .findRenderObject() as RenderBox;
@@ -356,16 +350,16 @@ class UsersPage extends StatelessWidget {
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 0,
                             240,
-                            overlay.size.width / 5,
+                            overlay.size.width / 4,
                             0,
                           ),
                           list: _blocRole.status,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortStatus,
+                          isSelected: _blocRole.currentSortOrder,
                           onOkPressed: () {
-                            searchController.clear();
                             _blocRole.add(FilterClearEvent());
+
                             final selectedItems = checkboxStates.entries
                                 .where((entry) => entry.value)
                                 .map((entry) => entry.key)
@@ -373,13 +367,13 @@ class UsersPage extends StatelessWidget {
                             Navigator.of(context).pop();
                             _blocRole.add(FilterUsersByDeActevateEvent(
                                 selectedActivate: selectedItems,
-                                sortOrder: _blocRole.currentSortStatus));
+                                sortOrder: _blocRole.currentSortOrder));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortStatus = v;
+                            _blocRole.currentSortOrder = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortStatus = v;
+                            _blocRole.currentSortOrder = v;
                           },
                         );
                       }
@@ -416,7 +410,7 @@ class UsersPage extends StatelessWidget {
                       return [
                         Text('${user.firstName} ${user.lastName}'),
                         Text(user.email),
-                        Text(user.jobTitle),
+                        Text(user.jobTitle ?? '-'),
                         Text(user.roleType ?? ''),
                         Text(user.createdDate ?? ''),
                         Text(user.createdTime ?? ''),
@@ -433,6 +427,11 @@ class UsersPage extends StatelessWidget {
                           userId: user.uuid,
                           onTap: user.status != "invited"
                               ? () {
+                                  // final newStatus = user.status == 'active'
+                                  //     ? 'disabled'
+                                  //     : user.status == 'disabled'
+                                  //         ? 'invited'
+                                  //         : 'active';
                                   context.read<UserTableBloc>().add(
                                       ChangeUserStatus(
                                           userId: user.uuid,
@@ -444,6 +443,10 @@ class UsersPage extends StatelessWidget {
                         ),
                         Row(
                           children: [
+                            // actionButton(
+                            //   title: "Activity Log",
+                            //   onTap: () {},
+                            // ),
                             actionButton(
                               title: "Edit",
                               onTap: () {
@@ -484,7 +487,9 @@ class UsersPage extends StatelessWidget {
                                   },
                                 ).then((v) {
                                   if (v != null) {
-                                    _blocRole.add(const GetUsers());
+                                    if (v != null) {
+                                      _blocRole.add(const GetUsers());
+                                    }
                                   }
                                 });
                               },
@@ -511,11 +516,12 @@ class UsersPage extends StatelessWidget {
                                 const Icon(Icons.keyboard_double_arrow_right),
                             firstPageIcon:
                                 const Icon(Icons.keyboard_double_arrow_left),
-                            totalPages: (_blocRole.totalUsersCount.length /
+                            totalPages: (_blocRole.users.length /
                                     _blocRole.itemsPerPage)
                                 .ceil(),
                             currentPage: _blocRole.currentPage,
                             onPageChanged: (int pageNumber) {
+                              _blocRole.currentPage = pageNumber;
                               context
                                   .read<UserTableBloc>()
                                   .add(ChangePage(pageNumber));

lib/pages/routines/bloc/routine_bloc/routine_bloc.dart

@@ -816,7 +816,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   FutureOr<void> _fetchDevices(FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true));
     try {
-      final devices = await DevicesManagementApi().fetchDevices(communityId, spaceId);
+      final devices = await DevicesManagementApi().fetchDevices('', '');
 
       emit(state.copyWith(isLoading: false, devices: devices));
     } catch (e) {

lib/pages/routines/view/routines_view.dart

@@ -32,63 +32,56 @@ class _RoutinesViewState extends State<RoutinesView> {
         }
         return Row(
           children: [
-            const Expanded(
-                child:
-                    // SideSpacesView(
-                    //   onSelectAction: (String communityId, String spaceId) {
-                    //     // context.read<RoutineBloc>()
-                    //     //   ..add(LoadScenes(spaceId, communityId))
-                    //     //   ..add(LoadAutomation(spaceId));
-                    //   },
-                    // )
-                    SpaceTreeView()),
             Expanded(
-              flex: 3,
+                child: SpaceTreeView(
-              child: Padding(
+              onSelect: () {},
-                padding: const EdgeInsets.all(16),
+            )),
-                child: Row(
+            Expanded(
-                  children: [
+              flex: 4,
-                    Column(
+              child: ListView(children: [
-                      mainAxisSize: MainAxisSize.min,
+                Container(
-                      crossAxisAlignment: CrossAxisAlignment.start,
+                  padding: const EdgeInsets.all(16),
-                      mainAxisAlignment: MainAxisAlignment.start,
+                  height: MediaQuery.sizeOf(context).height,
-                      children: [
+                  child: Column(
-                        Text(
+                    mainAxisSize: MainAxisSize.min,
-                          "Create New Routines",
+                    crossAxisAlignment: CrossAxisAlignment.start,
-                          style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                    mainAxisAlignment: MainAxisAlignment.start,
-                                color: ColorsManager.grayColor,
+                    children: [
-                                fontWeight: FontWeight.bold,
+                      Text(
-                              ),
+                        "Create New Routines",
-                        ),
+                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                        const SizedBox(
+                              color: ColorsManager.grayColor,
-                          height: 10,
+                              fontWeight: FontWeight.bold,
-                        ),
+                            ),
-                        RoutineViewCard(
+                      ),
-                          onTap: () {
+                      const SizedBox(
-                            if (context.read<SpaceTreeBloc>().selectedCommunityId.isNotEmpty &&
+                        height: 10,
-                                context.read<SpaceTreeBloc>().selectedSpaceId.isNotEmpty) {
+                      ),
-                              context.read<RoutineBloc>().add(
+                      RoutineViewCard(
-                                    (ResetRoutineState()),
+                        onTap: () {
-                                  );
+                          if (context.read<SpaceTreeBloc>().selectedCommunityId.isNotEmpty &&
-                              BlocProvider.of<RoutineBloc>(context).add(
+                              context.read<SpaceTreeBloc>().selectedSpaceId.isNotEmpty) {
-                                const CreateNewRoutineViewEvent(createRoutineView: true),
+                            context.read<RoutineBloc>().add(
-                              );
+                                  (ResetRoutineState()),
-                            } else {
+                                );
-                              CustomSnackBar.redSnackBar('Please select a space');
+                            BlocProvider.of<RoutineBloc>(context).add(
-                            }
+                              const CreateNewRoutineViewEvent(createRoutineView: true),
-                          },
+                            );
-                          icon: Icons.add,
+                          } else {
-                          textString: '',
+                            CustomSnackBar.redSnackBar('Please select a space');
-                        ),
+                          }
-                        const SizedBox(
+                        },
-                          height: 15,
+                        icon: Icons.add,
-                        ),
+                        textString: '',
-                        const Expanded(child: FetchRoutineScenesAutomation()),
+                      ),
-                      ],
+                      const SizedBox(
-                    ),
+                        height: 15,
-                  ],
+                      ),
+                      const Expanded(child: FetchRoutineScenesAutomation()),
+                    ],
+                  ),
                 ),
-              ),
+              ]),
             ),
           ],
         );

lib/pages/space_tree/bloc/space_tree_bloc.dart

@@ -6,8 +6,8 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model
 import 'package:syncrow_web/services/space_mana_api.dart';
 
 class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
-  String selectedCommunityId = '';
+  String selectedCommunityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
-  String selectedSpaceId = '';
+  String selectedSpaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
 
   SpaceTreeBloc() : super(const SpaceTreeState()) {
     on<InitialEvent>(_fetchSpaces);
@@ -87,6 +87,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
           List.from(state.selectedCommunities.toSet().toList());
       List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
       List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
+      Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);
 
       List<String> childrenIds = _getAllChildIds(event.children);
 
@@ -101,10 +102,13 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
         updatedSoldChecks.removeWhere(childrenIds.contains);
       }
 
+      communityAndSpaces[event.communityId] = updatedSelectedSpaces;
+
       emit(state.copyWith(
           selectedCommunities: updatedSelectedCommunities,
           selectedSpaces: updatedSelectedSpaces,
-          soldCheck: updatedSoldChecks));
+          soldCheck: updatedSoldChecks,
+          selectedCommunityAndSpaces: communityAndSpaces));
     } catch (e) {
       emit(const SpaceTreeErrorState('Something went wrong'));
     }
@@ -116,6 +120,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
           List.from(state.selectedCommunities.toSet().toList());
       List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
       List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
+      Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);
 
       List<String> childrenIds = _getAllChildIds(event.children);
       bool isChildSelected = false;
@@ -166,10 +171,13 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
         }
       }
 
+      communityAndSpaces[event.communityId] = updatedSelectedSpaces;
+
       emit(state.copyWith(
           selectedCommunities: updatedSelectedCommunities,
           selectedSpaces: updatedSelectedSpaces,
-          soldCheck: updatedSoldChecks));
+          soldCheck: updatedSoldChecks,
+          selectedCommunityAndSpaces: communityAndSpaces));
       emit(state.copyWith(selectedSpaces: updatedSelectedSpaces));
     } catch (e) {
       emit(const SpaceTreeErrorState('Something went wrong'));

lib/pages/space_tree/bloc/space_tree_state.dart

@@ -2,6 +2,7 @@ import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 
 class SpaceTreeState extends Equatable {
+  final Map<String, List<String>> selectedCommunityAndSpaces;
   final List<CommunityModel> communityList;
   final List<CommunityModel> filteredCommunity;
   final List<String> expandedCommunities;
@@ -19,7 +20,8 @@ class SpaceTreeState extends Equatable {
       this.selectedCommunities = const [],
       this.selectedSpaces = const [],
       this.soldCheck = const [],
-      this.isSearching = false});
+      this.isSearching = false,
+      this.selectedCommunityAndSpaces = const {}});
 
   SpaceTreeState copyWith(
       {List<CommunityModel>? communitiesList,
@@ -29,7 +31,8 @@ class SpaceTreeState extends Equatable {
       List<String>? selectedCommunities,
       List<String>? selectedSpaces,
       List<String>? soldCheck,
-      bool? isSearching}) {
+      bool? isSearching,
+      Map<String, List<String>>? selectedCommunityAndSpaces}) {
     return SpaceTreeState(
         communityList: communitiesList ?? this.communityList,
         filteredCommunity: filteredCommunity ?? this.filteredCommunity,
@@ -38,7 +41,8 @@ class SpaceTreeState extends Equatable {
         selectedCommunities: selectedCommunities ?? this.selectedCommunities,
         selectedSpaces: selectedSpaces ?? this.selectedSpaces,
         soldCheck: soldCheck ?? this.soldCheck,
-        isSearching: isSearching ?? this.isSearching);
+        isSearching: isSearching ?? this.isSearching,
+        selectedCommunityAndSpaces: selectedCommunityAndSpaces ?? this.selectedCommunityAndSpaces);
   }
 
   @override
@@ -50,7 +54,8 @@ class SpaceTreeState extends Equatable {
         selectedCommunities,
         selectedSpaces,
         soldCheck,
-        isSearching
+        isSearching,
+        selectedCommunityAndSpaces
       ];
 }
 

lib/pages/space_tree/view/space_tree_view.dart

@@ -10,8 +10,22 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/style.dart';
 
-class SpaceTreeView extends StatelessWidget {
+class SpaceTreeView extends StatefulWidget {
-  const SpaceTreeView({super.key});
+  final Function onSelect;
+  const SpaceTreeView({required this.onSelect, super.key});
+
+  @override
+  State<SpaceTreeView> createState() => _SpaceTreeViewState();
+}
+
+class _SpaceTreeViewState extends State<SpaceTreeView> {
+  final ScrollController _scrollController = ScrollController();
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -20,7 +34,6 @@ class SpaceTreeView extends StatelessWidget {
       return Container(
         height: MediaQuery.sizeOf(context).height,
         decoration: subSectionContainerDecoration,
-        // padding: const EdgeInsets.all(16.0),
         child: state is SpaceTreeLoadingState
             ? const Center(child: CircularProgressIndicator())
             : Column(
@@ -32,64 +45,150 @@ class SpaceTreeView extends StatelessWidget {
                   ),
                   const SizedBox(height: 16),
                   Expanded(
-                    child: Padding(
+                    child: ListView(
-                      padding: const EdgeInsets.all(8.0),
+                      shrinkWrap: true,
-                      child: list.isEmpty
+                      scrollDirection: Axis.horizontal,
-                          ? Center(
+                      children: [
-                              child: Text(
+                        Container(
-                                'No results found',
+                          width: MediaQuery.sizeOf(context).width * 0.5,
-                                style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                          padding: const EdgeInsets.all(8.0),
-                                      color: ColorsManager.lightGrayColor, // Gray when not selected
+                          child: list.isEmpty
-                                      fontWeight: FontWeight.w400,
+                              ? Center(
+                                  child: Text(
+                                    'No results found',
+                                    style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                                          color: ColorsManager.lightGrayColor,
+                                          fontWeight: FontWeight.w400,
+                                        ),
+                                  ),
+                                )
+                              : Scrollbar(
+                                  scrollbarOrientation: ScrollbarOrientation.left,
+                                  thumbVisibility: true,
+                                  controller: _scrollController,
+                                  child: Padding(
+                                    padding: const EdgeInsets.only(left: 16),
+                                    child: ListView(
+                                      controller: _scrollController,
+                                      shrinkWrap: true,
+                                      children: list
+                                          .map(
+                                            (community) => CustomExpansionTileSpaceTree(
+                                              title: community.name,
+                                              isSelected: state.selectedCommunities
+                                                  .contains(community.uuid),
+                                              isSoldCheck: state.selectedCommunities
+                                                  .contains(community.uuid),
+                                              onExpansionChanged: () {
+                                                context
+                                                    .read<SpaceTreeBloc>()
+                                                    .add(OnCommunityExpanded(community.uuid));
+                                              },
+                                              isExpanded: state.expandedCommunities
+                                                  .contains(community.uuid),
+                                              onItemSelected: () {
+                                                context.read<SpaceTreeBloc>().add(
+                                                    OnCommunitySelected(
+                                                        community.uuid, community.spaces));
+                                                widget.onSelect();
+                                              },
+                                              children: community.spaces.map((space) {
+                                                return CustomExpansionTileSpaceTree(
+                                                  title: space.name,
+                                                  isExpanded:
+                                                      state.expandedSpaces.contains(space.uuid),
+                                                  onItemSelected: () {
+                                                    context.read<SpaceTreeBloc>().add(
+                                                        OnSpaceSelected(community.uuid,
+                                                            space.uuid ?? '', space.children));
+                                                    widget.onSelect();
+                                                  },
+                                                  onExpansionChanged: () {
+                                                    context.read<SpaceTreeBloc>().add(
+                                                        OnSpaceExpanded(
+                                                            community.uuid, space.uuid ?? ''));
+                                                  },
+                                                  isSelected:
+                                                      state.selectedSpaces.contains(space.uuid) ||
+                                                          state.soldCheck.contains(space.uuid),
+                                                  isSoldCheck: state.soldCheck.contains(space.uuid),
+                                                  children: _buildNestedSpaces(
+                                                      context, state, space, community.uuid),
+                                                );
+                                              }).toList(),
+                                            ),
+                                          )
+                                          .toList(),
                                     ),
-                              ),
+                                  ),
-                            )
+                                ),
-                          : ListView(
+                        ),
-                              shrinkWrap: true,
+                      ],
-                              children: list
-                                  .map(
-                                    (community) => CustomExpansionTileSpaceTree(
-                                      title: community.name,
-                                      isSelected:
-                                          state.selectedCommunities.contains(community.uuid),
-                                      isSoldCheck:
-                                          state.selectedCommunities.contains(community.uuid),
-                                      onExpansionChanged: () {
-                                        context
-                                            .read<SpaceTreeBloc>()
-                                            .add(OnCommunityExpanded(community.uuid));
-                                      },
-                                      isExpanded:
-                                          state.expandedCommunities.contains(community.uuid),
-                                      onItemSelected: () {
-                                        context.read<SpaceTreeBloc>().add(
-                                            OnCommunitySelected(community.uuid, community.spaces));
-                                      },
-                                      children: community.spaces.map((space) {
-                                        return CustomExpansionTileSpaceTree(
-                                          title: space.name,
-                                          isExpanded: state.expandedSpaces.contains(space.uuid),
-                                          onItemSelected: () {
-                                            context.read<SpaceTreeBloc>().add(OnSpaceSelected(
-                                                community.uuid, space.uuid ?? '', space.children));
-                                          },
-                                          onExpansionChanged: () {
-                                            context.read<SpaceTreeBloc>().add(
-                                                OnSpaceExpanded(community.uuid, space.uuid ?? ''));
-                                          },
-                                          isSelected: state.selectedSpaces.contains(space.uuid) ||
-                                              state.soldCheck.contains(space.uuid),
-                                          isSoldCheck: state.soldCheck.contains(space.uuid),
-                                          children: _buildNestedSpaces(
-                                              context, state, space, community.uuid),
-                                        );
-                                      }).toList(),
-                                    ),
-                                  )
-                                  .toList(),
-                            ),
                     ),
                   ),
+
+                  // Expanded(
+                  //   child: Padding(
+                  //     padding: const EdgeInsets.all(8.0),
+                  //     child: list.isEmpty
+                  //         ? Center(
+                  //             child: Text(
+                  //               'No results found',
+                  //               style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                  //                     color: ColorsManager.lightGrayColor, // Gray when not selected
+                  //                     fontWeight: FontWeight.w400,
+                  //                   ),
+                  //             ),
+                  //           )
+                  //         : ListView(
+                  //             shrinkWrap: true,
+                  //             children: list
+                  //                 .map(
+                  //                   (community) => CustomExpansionTileSpaceTree(
+                  //                     title: community.name,
+                  //                     isSelected:
+                  //                         state.selectedCommunities.contains(community.uuid),
+                  //                     isSoldCheck:
+                  //                         state.selectedCommunities.contains(community.uuid),
+                  //                     onExpansionChanged: () {
+                  //                       context
+                  //                           .read<SpaceTreeBloc>()
+                  //                           .add(OnCommunityExpanded(community.uuid));
+                  //                     },
+                  //                     isExpanded:
+                  //                         state.expandedCommunities.contains(community.uuid),
+                  //                     onItemSelected: () {
+                  //                       context.read<SpaceTreeBloc>().add(
+                  //                           OnCommunitySelected(community.uuid, community.spaces));
+
+                  //                       onSelect();
+                  //                     },
+                  //                     children: community.spaces.map((space) {
+                  //                       return CustomExpansionTileSpaceTree(
+                  //                         title: space.name,
+                  //                         isExpanded: state.expandedSpaces.contains(space.uuid),
+                  //                         onItemSelected: () {
+                  //                           context.read<SpaceTreeBloc>().add(OnSpaceSelected(
+                  //                               community.uuid, space.uuid ?? '', space.children));
+                  //                           onSelect();
+                  //                         },
+                  //                         onExpansionChanged: () {
+                  //                           context.read<SpaceTreeBloc>().add(
+                  //                               OnSpaceExpanded(community.uuid, space.uuid ?? ''));
+                  //                         },
+                  //                         isSelected: state.selectedSpaces.contains(space.uuid) ||
+                  //                             state.soldCheck.contains(space.uuid),
+                  //                         isSoldCheck: state.soldCheck.contains(space.uuid),
+                  //                         children: _buildNestedSpaces(
+                  //                             context, state, space, community.uuid),
+                  //                       );
+                  //                     }).toList(),
+                  //                   ),
+                  //                 )
+                  //                 .toList(),
+                  //           ),
+                  //   ),
+                  // ),
                 ],
               ),
       );
@@ -109,6 +208,7 @@ class SpaceTreeView extends StatelessWidget {
           context
               .read<SpaceTreeBloc>()
               .add(OnSpaceSelected(communityId, child.uuid ?? '', child.children));
+          widget.onSelect();
         },
         onExpansionChanged: () {
           context.read<SpaceTreeBloc>().add(OnSpaceExpanded(communityId, child.uuid ?? ''));

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

@@ -179,7 +179,6 @@ class SpaceManagementBloc
       final updatedCommunities =
           await Future.wait(communities.map((community) async {
         final spaces = await _fetchSpacesForCommunity(community.uuid);
-
         return CommunityModel(
           uuid: community.uuid,
           createdAt: community.createdAt,
@@ -314,7 +313,6 @@ class SpaceManagementBloc
     SelectSpaceEvent event,
     Emitter<SpaceManagementState> emit,
   ) {
-    
     _handleCommunitySpaceStateUpdate(
       emit: emit,
       selectedCommunity: event.selectedCommunity,

lib/pages/spaces_management/all_spaces/model/space_model.dart

@@ -95,9 +95,6 @@ class SpaceModel {
       icon: json['icon'] ?? Assets.location,
       position: Offset(json['x'] ?? 0, json['y'] ?? 0),
       isHovered: false,
-      spaceModel: json['spaceModel'] != null
-          ? SpaceTemplateModel.fromJson(json['spaceModel'])
-          : null,
       tags: (json['tags'] as List<dynamic>?)
               ?.where((item) => item is Map<String, dynamic>) // Validate type
               .map((item) => Tag.fromJson(item as Map<String, dynamic>))

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

@@ -22,7 +22,6 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/curved_li
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/duplicate_process_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_card_widget.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_container_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/helper/space_helper.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
@@ -196,6 +195,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
                                     screenSize,
                                     position:
                                         spaces[index].position + newPosition,
+                                    
                                     parentIndex: index,
                                     direction: direction,
                                   );
@@ -351,14 +351,11 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
             spaceModels: widget.spaceModels,
             name: widget.selectedSpace!.name,
             icon: widget.selectedSpace!.icon,
-            parentSpace: SpaceHelper.findSpaceByInternalId(
-                widget.selectedSpace?.parent?.internalId, spaces),
             editSpace: widget.selectedSpace,
-            currentSpaceModel: widget.selectedSpace?.spaceModel,
             tags: widget.selectedSpace?.tags,
             subspaces: widget.selectedSpace?.subspaces,
             isEdit: true,
-            allTags: _getAllTagValues(spaces),
+          allTags: _getAllTagValues(spaces),
             onCreateSpace: (String name,
                 String icon,
                 List<SelectedProduct> selectedProducts,
@@ -377,15 +374,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
                   widget.selectedSpace!.status =
                       SpaceStatus.modified; // Mark as modified
                 }
-
-                for (var space in spaces) {
-                  if (space.internalId == widget.selectedSpace?.internalId) {
-                    space.status = SpaceStatus.modified;
-                    space.subspaces = subspaces;
-                    space.tags = tags;
-                    space.name = name;
-                  }
-                }
               });
             },
             key: Key(widget.selectedSpace!.name),
@@ -464,6 +452,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     }).toList();
 
     if (spacesToSave.isEmpty) {
+      debugPrint("No new or modified spaces to save.");
       return;
     }
 
@@ -654,6 +643,12 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
 
     final Map<String, int> nameCounters = {};
 
+    String _generateCopyName(String originalName) {
+      final baseName = originalName.replaceAll(RegExp(r'\(\d+\)$'), '').trim();
+      nameCounters[baseName] = (nameCounters[baseName] ?? 0) + 1;
+      return "$baseName(${nameCounters[baseName]})";
+    }
+
     SpaceModel duplicateRecursive(SpaceModel original, Offset parentPosition,
         SpaceModel? duplicatedParent) {
       Offset newPosition = parentPosition + Offset(horizontalGap, 0);
@@ -664,8 +659,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         newPosition += Offset(horizontalGap, 0);
       }
 
-      final duplicatedName =
+      final duplicatedName = _generateCopyName(original.name);
-          SpaceHelper.generateUniqueSpaceName(original.name, spaces);
 
       final duplicated = SpaceModel(
         name: duplicatedName,
@@ -754,7 +748,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     }
   }
 
-  List<String> _getAllTagValues(List<SpaceModel> spaces) {
+    List<String> _getAllTagValues(List<SpaceModel> spaces) {
     final List<String> allTags = [];
     for (final space in spaces) {
       if (space.tags != null) {

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

@@ -40,7 +40,6 @@ class CreateSpaceDialog extends StatefulWidget {
   final List<SubspaceModel>? subspaces;
   final List<Tag>? tags;
   final List<String>? allTags;
-  final SpaceTemplateModel? currentSpaceModel;
 
   const CreateSpaceDialog(
       {super.key,
@@ -55,8 +54,7 @@ class CreateSpaceDialog extends StatefulWidget {
       this.selectedProducts = const [],
       this.spaceModels,
       this.subspaces,
-      this.tags,
+      this.tags});
-      this.currentSpaceModel});
 
   @override
   CreateSpaceDialogState createState() => CreateSpaceDialogState();
@@ -85,7 +83,6 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
         enteredName.isNotEmpty || nameController.text.isNotEmpty;
     tags = widget.tags ?? [];
     subspaces = widget.subspaces ?? [];
-    selectedSpaceModel = widget.currentSpaceModel;
   }
 
   @override
@@ -460,7 +457,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                       context: context,
                                       builder: (context) => AssignTagDialog(
                                         products: widget.products,
-                                        subspaces: subspaces,
+                                        subspaces: widget.subspaces,
                                         addedProducts: TagHelper
                                             .createInitialSelectedProductsForTags(
                                                 tags ?? [], subspaces),
@@ -491,6 +488,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                 enteredName,
                                 widget.isEdit,
                                 widget.products,
+                                subspaces,
                               );
                             },
                             style: TextButton.styleFrom(
@@ -573,23 +571,12 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
   }
 
   bool _isNameConflict(String value) {
-    final parentSpace = widget.parentSpace;
+    return (widget.parentSpace?.children.any((child) => child.name == value) ??
-    final editSpace = widget.editSpace;
+            false) ||
-    final siblings = parentSpace?.children
+        (widget.parentSpace?.name == value) ||
-            .where((child) => child.uuid != editSpace?.uuid)
+        (widget.editSpace?.parent?.name == value) ||
-            .toList() ??
+        (widget.editSpace?.children.any((child) => child.name == value) ??
-        [];
+            false);
-    final siblingConflict = siblings.any((child) => child.name == value);
-    final parentConflict =
-        parentSpace?.name == value && parentSpace?.uuid != editSpace?.uuid;
-    final parentOfEditSpaceConflict = editSpace?.parent?.name == value &&
-        editSpace?.parent?.uuid != editSpace?.uuid;
-    final childConflict =
-        editSpace?.children.any((child) => child.name == value) ?? false;
-    return siblingConflict ||
-        parentConflict ||
-        parentOfEditSpaceConflict ||
-        childConflict;
   }
 
   void _showLinkSpaceModelDialog(BuildContext context) {
@@ -630,26 +617,9 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
             products: products,
             existingSubSpaces: existingSubSpaces,
             onSave: (slectedSubspaces) {
-              final List<Tag> tagsToAppendToSpace = [];
-
-              if (slectedSubspaces != null) {
-                final updatedIds =
-                    slectedSubspaces.map((s) => s.internalId).toSet();
-                if (existingSubSpaces != null) {
-                  final deletedSubspaces = existingSubSpaces
-                      .where((s) => !updatedIds.contains(s.internalId))
-                      .toList();
-                  for (var s in deletedSubspaces) {
-                    if (s.tags != null) {
-                      tagsToAppendToSpace.addAll(s.tags!);
-                    }
-                  }
-                }
-              }
               if (slectedSubspaces != null) {
                 setState(() {
                   subspaces = slectedSubspaces;
-                  tags?.addAll(tagsToAppendToSpace);
                   selectedSpaceModel = null;
                 });
               }
@@ -659,7 +629,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
   }
 
   void _showTagCreateDialog(BuildContext context, String name, bool isEdit,
-      List<ProductModel>? products) {
+      List<ProductModel>? products, List<SubspaceModel>? subspaces) {
     isEdit
         ? showDialog(
             context: context,

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

@@ -11,7 +11,7 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/space_tem
 import 'package:syncrow_web/pages/spaces_management/space_model/view/space_model_page.dart';
 import 'package:syncrow_web/services/space_model_mang_api.dart';
 
-class LoadedSpaceView extends StatefulWidget {
+class LoadedSpaceView extends StatelessWidget {
   final List<CommunityModel> communities;
   final CommunityModel? selectedCommunity;
   final SpaceModel? selectedSpace;
@@ -26,73 +26,41 @@ class LoadedSpaceView extends StatefulWidget {
     this.selectedSpace,
     this.products,
     this.spaceModels,
-    required this.shouldNavigateToSpaceModelPage,
+    required this.shouldNavigateToSpaceModelPage
   });
 
-  @override
-  _LoadedSpaceViewState createState() => _LoadedSpaceViewState();
-}
-
-class _LoadedSpaceViewState extends State<LoadedSpaceView> {
-  late List<SpaceTemplateModel> _spaceModels;
-
-  @override
-  void initState() {
-    super.initState();
-    _spaceModels = List.from(widget.spaceModels ?? []);
-  }
-
-  @override
-  void didUpdateWidget(covariant LoadedSpaceView oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (widget.spaceModels != oldWidget.spaceModels) {
-      setState(() {
-        _spaceModels = List.from(widget.spaceModels ?? []);
-      });
-    }
-  }
-
-  void _onSpaceModelsUpdated(List<SpaceTemplateModel> updatedModels) {
-    if (mounted && updatedModels != _spaceModels) {
-      setState(() {
-        _spaceModels = updatedModels;
-      });
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
+
     return Stack(
       clipBehavior: Clip.none,
       children: [
         Row(
           children: [
             SidebarWidget(
-              communities: widget.communities,
+              communities: communities,
-              selectedSpaceUuid: widget.selectedSpace?.uuid ??
+              selectedSpaceUuid:
-                  widget.selectedCommunity?.uuid ??
+                  selectedSpace?.uuid ?? selectedCommunity?.uuid ?? '',
-                  '',
             ),
-            widget.shouldNavigateToSpaceModelPage
+            shouldNavigateToSpaceModelPage
                 ? Expanded(
                     child: BlocProvider(
                       create: (context) => SpaceModelBloc(
                         api: SpaceModelManagementApi(),
-                        initialSpaceModels: _spaceModels,
+                        initialSpaceModels: spaceModels ?? [],
                       ),
                       child: SpaceModelPage(
-                        products: widget.products,
+                        products: products,
-                        onSpaceModelsUpdated: _onSpaceModelsUpdated,
                       ),
                     ),
                   )
                 : CommunityStructureArea(
-                    selectedCommunity: widget.selectedCommunity,
+                    selectedCommunity: selectedCommunity,
-                    selectedSpace: widget.selectedSpace,
+                    selectedSpace: selectedSpace,
-                    spaces: widget.selectedCommunity?.spaces ?? [],
+                    spaces: selectedCommunity?.spaces ?? [],
-                    products: widget.products,
+                    products: products,
-                    communities: widget.communities,
+                    communities: communities,
-                    spaceModels: _spaceModels,
+                    spaceModels: spaceModels,
                   ),
           ],
         ),
@@ -100,4 +68,13 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
       ],
     );
   }
+
+  SpaceModel? findSpaceByUuid(String? uuid, List<CommunityModel> communities) {
+    for (var community in communities) {
+      for (var space in community.spaces) {
+        if (space.uuid == uuid) return space;
+      }
+    }
+    return null;
+  }
 }

lib/pages/spaces_management/assign_tag/views/assign_tag_dialog.dart

@@ -233,13 +233,11 @@ class AssignTagDialog extends StatelessWidget {
                           label: 'Add New Device',
                           onPressed: () async {
                             final updatedTags = List<Tag>.from(state.tags);
-                            final result =
+                            final result = processTags(updatedTags, subspaces);
-                                TagHelper.processTags(updatedTags, subspaces);
 
                             final processedTags =
                                 result['updatedTags'] as List<Tag>;
-                            final processedSubspaces = List<SubspaceModel>.from(
+                            final processedSubspaces = result['subspaces'];
-                                result['subspaces'] as List<dynamic>);
 
                             Navigator.of(context).pop();
 
@@ -272,14 +270,13 @@ class AssignTagDialog extends StatelessWidget {
                         onPressed: state.isSaveEnabled
                             ? () async {
                                 final updatedTags = List<Tag>.from(state.tags);
-                                final result = TagHelper.processTags(
+                                final result =
-                                    updatedTags, subspaces);
+                                    processTags(updatedTags, subspaces);
 
                                 final processedTags =
                                     result['updatedTags'] as List<Tag>;
                                 final processedSubspaces =
-                                    List<SubspaceModel>.from(
+                                    result['subspaces'] as List<SubspaceModel>;
-                                        result['subspaces'] as List<dynamic>);
                                 onSave?.call(processedTags, processedSubspaces);
                                 Navigator.of(context).pop();
                               }
@@ -304,12 +301,115 @@ class AssignTagDialog extends StatelessWidget {
 
   List<String> getAvailableTags(
       List<String> allTags, List<Tag> currentTags, Tag currentTag) {
-    List<String> availableTagsForTagModel = TagHelper.getAvailableTags<Tag>(
+    return allTags
-      allTags: allTags,
+        .where((tagValue) => !currentTags
-      currentTags: currentTags,
+            .where((e) => e != currentTag) // Exclude the current row
-      currentTag: currentTag,
+            .map((e) => e.tag)
-      getTag: (tag) => tag.tag ?? '',
+            .contains(tagValue))
-    );
+        .toList();
-    return availableTagsForTagModel;
+  }
+
+  Map<String, dynamic> processTags(
+      List<Tag> updatedTags, List<SubspaceModel>? subspaces) {
+    final modifiedTags = List<Tag>.from(updatedTags);
+    final modifiedSubspaces = List<SubspaceModel>.from(subspaces ?? []);
+
+    if (subspaces != null) {
+      for (var subspace in subspaces) {
+        subspace.tags?.removeWhere(
+          (tag) => !modifiedTags
+              .any((updatedTag) => updatedTag.internalId == tag.internalId),
+        );
+      }
+    }
+    for (var tag in modifiedTags.toList()) {
+      if (modifiedSubspaces.isEmpty) continue;
+
+      final prevIndice = checkTagExistInSubspace(tag, modifiedSubspaces);
+
+      if ((tag.location == 'Main Space' || tag.location == null) &&
+          (prevIndice == null ||
+              modifiedSubspaces[prevIndice].subspaceName == 'Main Space')) {
+        continue;
+      }
+
+      if ((tag.location == 'Main Space' || tag.location == null) &&
+          prevIndice != null) {
+        modifiedSubspaces[prevIndice]
+            .tags
+            ?.removeWhere((t) => t.internalId == tag.internalId);
+        continue;
+      }
+
+      if ((tag.location != 'Main Space' && tag.location != null) &&
+          prevIndice == null) {
+        final newIndex = modifiedSubspaces
+            .indexWhere((subspace) => subspace.subspaceName == tag.location);
+        if (newIndex != -1) {
+          if (modifiedSubspaces[newIndex]
+                  .tags
+                  ?.any((t) => t.internalId == tag.internalId) !=
+              true) {
+            tag.location = modifiedSubspaces[newIndex].subspaceName;
+            modifiedSubspaces[newIndex].tags?.add(tag);
+          }
+        }
+        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
+        continue;
+      }
+
+      if ((tag.location != 'Main Space' && tag.location != null) &&
+          tag.location != modifiedSubspaces[prevIndice!].subspaceName) {
+        modifiedSubspaces[prevIndice]
+            .tags
+            ?.removeWhere((t) => t.internalId == tag.internalId);
+        final newIndex = modifiedSubspaces
+            .indexWhere((subspace) => subspace.subspaceName == tag.location);
+        if (newIndex != -1) {
+          if (modifiedSubspaces[newIndex]
+                  .tags
+                  ?.any((t) => t.internalId == tag.internalId) !=
+              true) {
+            tag.location = modifiedSubspaces[newIndex].subspaceName;
+            modifiedSubspaces[newIndex].tags?.add(tag);
+          }
+        }
+
+        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
+        continue;
+      }
+
+      if ((tag.location != 'Main Space' && tag.location != null) &&
+          tag.location == modifiedSubspaces[prevIndice!].subspaceName) {
+        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
+        continue;
+      }
+
+      if ((tag.location == 'Main Space' || tag.location == null) &&
+          prevIndice != null) {
+        modifiedSubspaces[prevIndice]
+            .tags
+            ?.removeWhere((t) => t.internalId == tag.internalId);
+      }
+    }
+
+    return {
+      'updatedTags': modifiedTags,
+      'subspaces': modifiedSubspaces,
+    };
+  }
+
+  int? checkTagExistInSubspace(Tag tag, List<SubspaceModel>? subspaces) {
+    if (subspaces == null) return null;
+    for (int i = 0; i < subspaces.length; i++) {
+      final subspace = subspaces[i];
+      if (subspace.tags == null) continue;
+      for (var t in subspace.tags!) {
+        if (tag.internalId == t.internalId) {
+          return i;
+        }
+      }
+    }
+    return null;
   }
 }

lib/pages/spaces_management/assign_tag_models/views/assign_tag_models_dialog.dart

@@ -133,9 +133,8 @@ class AssignTagModelsDialog extends StatelessWidget {
                                 : List.generate(state.tags.length, (index) {
                                     final tag = state.tags[index];
                                     final controller = controllers[index];
-                                    final availableTags =
+                                    final availableTags = getAvailableTags(
-                                        TagHelper.getAvailableTagModels(
+                                        allTags ?? [], state.tags, tag);
-                                            allTags ?? [], state.tags, tag);
 
                                     return DataRow(
                                       cells: [
@@ -255,15 +254,11 @@ class AssignTagModelsDialog extends StatelessWidget {
                                 final updatedTags =
                                     List<TagModel>.from(state.tags);
                                 final result =
-                                    TagHelper.updateSubspaceTagModels(
+                                    processTags(updatedTags, subspaces);
-                                        updatedTags, subspaces);
 
                                 final processedTags =
                                     result['updatedTags'] as List<TagModel>;
-                                final processedSubspaces =
+                                final processedSubspaces = result['subspaces'];
-                                    List<SubspaceTemplateModel>.from(
-                                        result['subspaces'] as List<dynamic>);
-
                                 if (context.mounted) {
                                   Navigator.of(context).pop();
 
@@ -310,17 +305,14 @@ class AssignTagModelsDialog extends StatelessWidget {
                                 ? () async {
                                     final updatedTags =
                                         List<TagModel>.from(state.tags);
-
                                     final result =
-                                        TagHelper.updateSubspaceTagModels(
+                                        processTags(updatedTags, subspaces);
-                                            updatedTags, subspaces);
 
                                     final processedTags =
                                         result['updatedTags'] as List<TagModel>;
                                     final processedSubspaces =
-                                        List<SubspaceTemplateModel>.from(
+                                        result['subspaces']
-                                            result['subspaces']
+                                            as List<SubspaceTemplateModel>;
-                                                as List<dynamic>);
 
                                     Navigator.of(context)
                                         .popUntil((route) => route.isFirst);
@@ -364,4 +356,120 @@ class AssignTagModelsDialog extends StatelessWidget {
           ),
         ));
   }
+
+  List<String> getAvailableTags(
+      List<String> allTags, List<TagModel> currentTags, TagModel currentTag) {
+    return allTags
+        .where((tagValue) => !currentTags
+            .where((e) => e != currentTag) // Exclude the current row
+            .map((e) => e.tag)
+            .contains(tagValue))
+        .toList();
+  }
+
+  int? checkTagExistInSubspace(
+      TagModel tag, List<SubspaceTemplateModel>? subspaces) {
+    if (subspaces == null) return null;
+    for (int i = 0; i < subspaces.length; i++) {
+      final subspace = subspaces[i];
+      if (subspace.tags == null) continue;
+      for (var t in subspace.tags!) {
+        if (tag.internalId == t.internalId) {
+          return i;
+        }
+      }
+    }
+    return null;
+  }
+
+  Map<String, dynamic> processTags(
+      List<TagModel> updatedTags, List<SubspaceTemplateModel>? subspaces) {
+    final modifiedTags = List<TagModel>.from(updatedTags);
+    final modifiedSubspaces = List<SubspaceTemplateModel>.from(subspaces ?? []);
+
+    if (subspaces != null) {
+      for (var subspace in subspaces) {
+        subspace.tags?.removeWhere(
+          (tag) => !modifiedTags
+              .any((updatedTag) => updatedTag.internalId == tag.internalId),
+        );
+      }
+    }
+
+    for (var tag in modifiedTags.toList()) {
+      if (modifiedSubspaces.isEmpty) continue;
+
+      final prevIndice = checkTagExistInSubspace(tag, modifiedSubspaces);
+
+      if ((tag.location == 'Main Space' || tag.location == null) &&
+          (prevIndice == null ||
+              modifiedSubspaces[prevIndice].subspaceName == 'Main Space')) {
+        continue;
+      }
+
+      if ((tag.location == 'Main Space' || tag.location == null) &&
+          prevIndice != null) {
+        modifiedSubspaces[prevIndice]
+            .tags
+            ?.removeWhere((t) => t.internalId == tag.internalId);
+        continue;
+      }
+
+      if ((tag.location != 'Main Space' && tag.location != null) &&
+          prevIndice == null) {
+        final newIndex = modifiedSubspaces
+            .indexWhere((subspace) => subspace.subspaceName == tag.location);
+        if (newIndex != -1) {
+          if (modifiedSubspaces[newIndex]
+                  .tags
+                  ?.any((t) => t.internalId == tag.internalId) !=
+              true) {
+            tag.location = modifiedSubspaces[newIndex].subspaceName;
+            modifiedSubspaces[newIndex].tags?.add(tag);
+          }
+        }
+        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
+        continue;
+      }
+
+      if ((tag.location != 'Main Space' && tag.location != null) &&
+          tag.location != modifiedSubspaces[prevIndice!].subspaceName) {
+        modifiedSubspaces[prevIndice]
+            .tags
+            ?.removeWhere((t) => t.internalId == tag.internalId);
+        final newIndex = modifiedSubspaces
+            .indexWhere((subspace) => subspace.subspaceName == tag.location);
+        if (newIndex != -1) {
+          if (modifiedSubspaces[newIndex]
+                  .tags
+                  ?.any((t) => t.internalId == tag.internalId) !=
+              true) {
+            tag.location = modifiedSubspaces[newIndex].subspaceName;
+            modifiedSubspaces[newIndex].tags?.add(tag);
+          }
+        }
+
+        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
+        continue;
+      }
+
+      if ((tag.location != 'Main Space' && tag.location != null) &&
+          tag.location == modifiedSubspaces[prevIndice!].subspaceName) {
+        modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
+        continue;
+      }
+
+      if ((tag.location == 'Main Space' || tag.location == null) &&
+          prevIndice != null) {
+        modifiedSubspaces[prevIndice]
+            .tags
+            ?.removeWhere((t) => t.internalId == tag.internalId);
+      }
+    }
+
+    return {
+      'updatedTags': modifiedTags,
+      'subspaces': modifiedSubspaces,
+    };
+  }
 }

lib/pages/spaces_management/helper/space_helper.dart

@@ -1,43 +0,0 @@
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
-
-class SpaceHelper {
-  static SpaceModel? findSpaceByUuid(
-      String? uuid, List<CommunityModel> communities) {
-    for (var community in communities) {
-      for (var space in community.spaces) {
-        if (space.uuid == uuid) return space;
-      }
-    }
-    return null;
-  }
-
-  static SpaceModel? findSpaceByInternalId(
-      String? internalId, List<SpaceModel> spaces) {
-    if (internalId != null) {
-      for (var space in spaces) {
-        if (space.internalId == internalId) return space;
-      }
-    }
-
-    return null;
-  }
-
-  static String generateUniqueSpaceName(
-      String originalName, List<SpaceModel> spaces) {
-    final baseName = originalName.replaceAll(RegExp(r'\(\d+\)$'), '').trim();
-    int maxNumber = 0;
-
-    for (var space in spaces) {
-      final match = RegExp(r'^(.*?)\((\d+)\)$').firstMatch(space.name);
-      if (match != null && match.group(1)?.trim() == baseName) {
-        int existingNumber = int.parse(match.group(2)!);
-        if (existingNumber > maxNumber) {
-          maxNumber = existingNumber;
-        }
-      }
-    }
-
-    return "$baseName(${maxNumber + 1})";
-  }
-}

lib/pages/spaces_management/helper/tag_helper.dart

@@ -7,138 +7,6 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 
 class TagHelper {
-  static Map<String, dynamic> updateTags<T>({
-    required List<T> updatedTags,
-    required List<dynamic>? subspaces,
-    required String Function(T) getInternalId,
-    required String? Function(T) getLocation,
-    required void Function(T, String) setLocation,
-    required String Function(dynamic) getSubspaceName,
-    required List<T>? Function(dynamic) getSubspaceTags,
-    required void Function(dynamic, List<T>?) setSubspaceTags,
-    required int? Function(T, List<dynamic>) checkTagExistInSubspace,
-  }) {
-    final modifiedTags = List<T>.from(updatedTags);
-    final modifiedSubspaces = List<dynamic>.from(subspaces ?? []);
-
-    if (subspaces != null) {
-      for (var subspace in subspaces) {
-        getSubspaceTags(subspace)?.removeWhere(
-          (tag) => !modifiedTags.any(
-              (updatedTag) => getInternalId(updatedTag) == getInternalId(tag)),
-        );
-      }
-    }
-
-    for (var tag in modifiedTags.toList()) {
-      if (modifiedSubspaces.isEmpty) continue;
-
-      final prevIndice = checkTagExistInSubspace(tag, modifiedSubspaces);
-      final tagLocation = getLocation(tag);
-
-      if ((tagLocation == 'Main Space' || tagLocation == null) &&
-          (prevIndice == null ||
-              getSubspaceName(modifiedSubspaces[prevIndice]) == 'Main Space')) {
-        continue;
-      }
-
-      if ((tagLocation == 'Main Space' || tagLocation == null) &&
-          prevIndice != null) {
-        getSubspaceTags(modifiedSubspaces[prevIndice])
-            ?.removeWhere((t) => getInternalId(t) == getInternalId(tag));
-        continue;
-      }
-
-      if ((tagLocation != 'Main Space' && tagLocation != null) &&
-          prevIndice == null) {
-        final newIndex = modifiedSubspaces
-            .indexWhere((subspace) => getSubspaceName(subspace) == tagLocation);
-
-        if (newIndex != -1) {
-          if (getSubspaceTags(modifiedSubspaces[newIndex])
-                  ?.any((t) => getInternalId(t) == getInternalId(tag)) !=
-              true) {
-            setLocation(tag, getSubspaceName(modifiedSubspaces[newIndex]));
-            final subspaceTags =
-                getSubspaceTags(modifiedSubspaces[newIndex]) ?? [];
-            subspaceTags.add(tag);
-            setSubspaceTags(modifiedSubspaces[newIndex], subspaceTags);
-          }
-        }
-
-        modifiedTags.removeWhere((t) => getInternalId(t) == getInternalId(tag));
-        continue;
-      }
-
-      if ((tagLocation != 'Main Space' && tagLocation != null) &&
-          tagLocation != getSubspaceName(modifiedSubspaces[prevIndice!])) {
-        getSubspaceTags(modifiedSubspaces[prevIndice])
-            ?.removeWhere((t) => getInternalId(t) == getInternalId(tag));
-
-        final newIndex = modifiedSubspaces
-            .indexWhere((subspace) => getSubspaceName(subspace) == tagLocation);
-
-        if (newIndex != -1) {
-          if (getSubspaceTags(modifiedSubspaces[newIndex])
-                  ?.any((t) => getInternalId(t) == getInternalId(tag)) !=
-              true) {
-            setLocation(tag, getSubspaceName(modifiedSubspaces[newIndex]));
-            final subspaceTags =
-                getSubspaceTags(modifiedSubspaces[newIndex]) ?? [];
-            subspaceTags.add(tag);
-            setSubspaceTags(modifiedSubspaces[newIndex], subspaceTags);
-          }
-        }
-
-        modifiedTags.removeWhere((t) => getInternalId(t) == getInternalId(tag));
-        continue;
-      }
-
-      if ((tagLocation != 'Main Space' && tagLocation != null) &&
-          tagLocation == getSubspaceName(modifiedSubspaces[prevIndice!])) {
-        modifiedTags.removeWhere((t) => getInternalId(t) == getInternalId(tag));
-        continue;
-      }
-
-      if ((tagLocation == 'Main Space' || tagLocation == null) &&
-          prevIndice != null) {
-        getSubspaceTags(modifiedSubspaces[prevIndice])
-            ?.removeWhere((t) => getInternalId(t) == getInternalId(tag));
-      }
-    }
-
-    return {
-      'updatedTags': modifiedTags,
-      'subspaces': modifiedSubspaces,
-    };
-  }
-
-  static List<String> getAvailableTags<T>({
-    required List<String> allTags,
-    required List<T> currentTags,
-    required T currentTag,
-    required String? Function(T) getTag, // Allow nullable return type
-  }) {
-    return allTags
-        .where((tagValue) => !currentTags
-            .where((e) => e != currentTag) // Exclude the current row
-            .map((e) => getTag(e) ?? '') // Handle null values gracefully
-            .contains(tagValue))
-        .toList();
-  }
-
-  static List<String> getAvailableTagModels(
-      List<String> allTags, List<TagModel> currentTags, TagModel currentTag) {
-    List<String> availableTagsForTagModel =
-        TagHelper.getAvailableTags<TagModel>(
-      allTags: allTags,
-      currentTags: currentTags,
-      currentTag: currentTag,
-      getTag: (tag) => tag.tag ?? '',
-    );
-    return availableTagsForTagModel;
-  }
-
   static List<TagModel> generateInitialTags({
     List<TagModel>? spaceTagModels,
     List<SubspaceTemplateModel>? subspaces,
@@ -168,7 +36,7 @@ class TagHelper {
     return initialTags;
   }
 
-  static List<Tag> generateInitialForTags({
+ static List<Tag> generateInitialForTags({
     List<Tag>? spaceTags,
     List<SubspaceModel>? subspaces,
   }) {
@@ -277,64 +145,4 @@ class TagHelper {
             ))
         .toList();
   }
-
-  static int? checkTagExistInSubspaceModels(
-      TagModel tag, List<dynamic>? subspaces) {
-    if (subspaces == null) return null;
-
-    for (int i = 0; i < subspaces.length; i++) {
-      final subspace = subspaces[i] as SubspaceTemplateModel; // Explicit cast
-      if (subspace.tags == null) continue;
-      for (var t in subspace.tags!) {
-        if (tag.internalId == t.internalId) {
-          return i;
-        }
-      }
-    }
-    return null;
-  }
-
-  static Map<String, dynamic> updateSubspaceTagModels(
-      List<TagModel> updatedTags, List<SubspaceTemplateModel>? subspaces) {
-    return TagHelper.updateTags<TagModel>(
-      updatedTags: updatedTags,
-      subspaces: subspaces,
-      getInternalId: (tag) => tag.internalId,
-      getLocation: (tag) => tag.location,
-      setLocation: (tag, location) => tag.location = location,
-      getSubspaceName: (subspace) => subspace.subspaceName,
-      getSubspaceTags: (subspace) => subspace.tags,
-      setSubspaceTags: (subspace, tags) => subspace.tags = tags,
-      checkTagExistInSubspace: checkTagExistInSubspaceModels,
-    );
-  }
-
-  static int? checkTagExistInSubspace(Tag tag, List<dynamic>? subspaces) {
-    if (subspaces == null) return null;
-    for (int i = 0; i < subspaces.length; i++) {
-      final subspace = subspaces[i];
-      if (subspace.tags == null) continue;
-      for (var t in subspace.tags!) {
-        if (tag.internalId == t.internalId) {
-          return i;
-        }
-      }
-    }
-    return null;
-  }
-
-  static Map<String, dynamic> processTags(
-      List<Tag> updatedTags, List<SubspaceModel>? subspaces) {
-    return TagHelper.updateTags<Tag>(
-      updatedTags: updatedTags,
-      subspaces: subspaces,
-      getInternalId: (tag) => tag.internalId,
-      getLocation: (tag) => tag.location,
-      setLocation: (tag, location) => tag.location = location,
-      getSubspaceName: (subspace) => subspace.subspaceName,
-      getSubspaceTags: (subspace) => subspace.tags,
-      setSubspaceTags: (subspace, tags) => subspace.tags = tags,
-      checkTagExistInSubspace: checkTagExistInSubspace,
-    );
-  }
 }

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

@@ -1,4 +1,5 @@
 import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_update_model.dart';

lib/pages/spaces_management/space_model/view/space_model_page.dart

@@ -11,10 +11,8 @@ import 'package:syncrow_web/utils/color_manager.dart';
 
 class SpaceModelPage extends StatelessWidget {
   final List<ProductModel>? products;
-  final Function(List<SpaceTemplateModel>)? onSpaceModelsUpdated;
 
-  const SpaceModelPage({Key? key, this.products, this.onSpaceModelsUpdated})
+  const SpaceModelPage({Key? key, this.products}) : super(key: key);
-      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -27,10 +25,6 @@ class SpaceModelPage extends StatelessWidget {
           final allTagValues = _getAllTagValues(spaceModels);
           final allSpaceModelNames = _getAllSpaceModelName(spaceModels);
 
-          if (onSpaceModelsUpdated != null) {
-            onSpaceModelsUpdated!(spaceModels);
-          }
-
           return Scaffold(
             backgroundColor: ColorsManager.whiteColors,
             body: Padding(

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

@@ -129,16 +129,10 @@ class CreateSpaceModelDialog extends StatelessWidget {
                     const SizedBox(height: 16),
                     SubspaceModelCreate(
                       subspaces: state.space.subspaceModels ?? [],
-                      tags: state.space.tags ?? [],
+                      onSpaceModelUpdate: (updatedSubspaces) {
-                      onSpaceModelUpdate: (updatedSubspaces,updatedTags) {
                         context
                             .read<CreateSpaceModelBloc>()
                             .add(AddSubspacesToSpaceTemplate(updatedSubspaces));
-                        if(updatedTags!=null){
-                          context
-                            .read<CreateSpaceModelBloc>()
-                            .add(AddTagsToSpaceTemplate(updatedTags));
-                        }
                       },
                     ),
                     const SizedBox(height: 10),

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

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/common/edit_chip.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
-import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/widgets/button_content_widget.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace_model/views/create_subspace_model_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/widgets/subspace_name_label_widget.dart';
@@ -9,16 +8,13 @@ import 'package:syncrow_web/utils/color_manager.dart';
 
 class SubspaceModelCreate extends StatefulWidget {
   final List<SubspaceTemplateModel> subspaces;
-  final void Function(
+  final void Function(List<SubspaceTemplateModel> newSubspaces)?
-          List<SubspaceTemplateModel> newSubspaces, List<TagModel>? tags)?
       onSpaceModelUpdate;
-  final List<TagModel> tags;
 
   const SubspaceModelCreate({
     Key? key,
     required this.subspaces,
     this.onSpaceModelUpdate,
-    required this.tags,
   }) : super(key: key);
 
   @override
@@ -28,13 +24,11 @@ class SubspaceModelCreate extends StatefulWidget {
 class _SubspaceModelCreateState extends State<SubspaceModelCreate> {
   late List<SubspaceTemplateModel> _subspaces;
   String? errorSubspaceId;
-  late List<TagModel> _tags;
 
   @override
   void initState() {
     super.initState();
     _subspaces = List.from(widget.subspaces);
-    _tags = List.from(widget.tags);
   }
 
   @override
@@ -111,26 +105,14 @@ class _SubspaceModelCreateState extends State<SubspaceModelCreate> {
           isEdit: true,
           dialogTitle: dialogTitle,
           existingSubSpaces: _subspaces,
+          
           onUpdate: (subspaceModels) {
-            final updatedIds = subspaceModels.map((s) => s.internalId).toSet();
-            final deletedSubspaces = _subspaces
-                .where((s) => !updatedIds.contains(s.internalId))
-                .toList();
-
-            final List<TagModel> tagsToAppendToSpace = [];
-
-            for (var s in deletedSubspaces) {
-              if (s.tags != null) {
-                tagsToAppendToSpace.addAll(s.tags!);
-              }
-            }
-
             setState(() {
               _subspaces = subspaceModels;
-              _tags.addAll(tagsToAppendToSpace);
+              errorSubspaceId = null;
             });
             if (widget.onSpaceModelUpdate != null) {
-              widget.onSpaceModelUpdate!(subspaceModels, _tags);
+              widget.onSpaceModelUpdate!(subspaceModels);
             }
           },
         );

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

@@ -52,13 +52,6 @@ class _SubspaceNameDisplayWidgetState extends State<SubspaceNameDisplayWidget> {
 
   void _handleValidationAndSave() {
     final updatedName = _controller.text;
-
-    if (updatedName.isEmpty) {
-      setState(() {
-        errorText = 'Subspace name cannot be empty.';
-      });
-      return;
-    }
     if (widget.validateName(updatedName)) {
       setState(() {
         errorText = null;

lib/services/devices_mang_api.dart

@@ -23,7 +23,8 @@ class DevicesManagementApi {
             : ApiEndpoints.getAllDevices,
         showServerMessage: true,
         expectedResponseModel: (json) {
-          List<dynamic> jsonData = json;
+          List<dynamic> jsonData =
+              communityId.isNotEmpty && spaceId.isNotEmpty ? json['data'] : json;
           List<AllDevicesModel> devicesList = jsonData.map((jsonItem) {
             return AllDevicesModel.fromJson(jsonItem);
           }).toList();

lib/services/user_permission.dart

@@ -18,7 +18,8 @@ class UserPermissionApi {
         showServerMessage: true,
         expectedResponseModel: (json) {
           debugPrint('fetchUsers Response: $json');
-          final List<dynamic> data = json['data'] ?? [];
+          final List<dynamic> data =
+              json['data'] ?? []; // Default to an empty list if no data
           return data.map((item) => RolesUserModel.fromJson(item)).toList();
         },
       );
@@ -118,7 +119,7 @@ class UserPermissionApi {
       );
       return response ?? 'Unknown error occurred';
     } on DioException catch (e) {
-      final errorMessage = e.response?.data['error']['message'];
+      final errorMessage = e.response?.data['error'];
       return errorMessage;
     } catch (e) {
       return e.toString();
@@ -204,6 +205,7 @@ class UserPermissionApi {
             .replaceAll("{invitedUserUuid}", userUuid),
         body: bodya,
         expectedResponseModel: (json) {
+          print('changeUserStatusById==${json['success']}');
           return json['success'];
         },
       );
@@ -211,6 +213,7 @@ class UserPermissionApi {
       return response;
     } catch (e) {
       return false;
+      print(e);
     }
   }
 }