Remove unused parameters from CreateSubSpaceDialog constructor

lib/common/widgets/empty_search_result_widget.dart

@@ -1,26 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class EmptySearchResultWidget extends StatelessWidget {
-  const EmptySearchResultWidget({
-    this.message = 'No results found',
-    super.key,
-  });
-
-  final String message;
-
-  @override
-  Widget build(BuildContext context) {
-    return Center(
-      child: Text(
-        message,
-        textAlign: TextAlign.center,
-        style: context.textTheme.bodySmall?.copyWith(
-          color: ColorsManager.lightGreyColor,
-          fontWeight: FontWeight.w400,
-        ),
-      ),
-    );
-  }
-}

lib/common/widgets/sidebar_communities_list.dart

@@ -1,53 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class SidebarCommunitiesList extends StatelessWidget {
-  const SidebarCommunitiesList({
-    required this.communities,
-    required this.itemBuilder,
-    required this.scrollController,
-    required this.onScrollToEnd,
-    super.key,
-  });
-
-  final List<CommunityModel> communities;
-  final Widget Function(BuildContext context, int index) itemBuilder;
-  final ScrollController scrollController;
-  final void Function() onScrollToEnd;
-
-  bool _onNotification(ScrollEndNotification notification) {
-    final hasReachedEnd = notification.metrics.extentAfter == 0;
-    if (hasReachedEnd) {
-      onScrollToEnd.call();
-      return true;
-    }
-
-    return false;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SingleChildScrollView(
-      scrollDirection: Axis.horizontal,
-      child: SizedBox(
-        width: context.screenWidth * 0.5,
-        child: Scrollbar(
-          scrollbarOrientation: ScrollbarOrientation.left,
-          thumbVisibility: true,
-          controller: scrollController,
-          child: NotificationListener<ScrollEndNotification>(
-            onNotification: _onNotification,
-            child: ListView.builder(
-              shrinkWrap: true,
-              padding: const EdgeInsetsDirectional.only(start: 16),
-              itemCount: communities.length,
-              controller: scrollController,
-              itemBuilder: itemBuilder,
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/pages/auth/view/login_web_page.dart

@@ -55,12 +55,12 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
     final isSmallScreen = isSmallScreenSize(context);
     final isMediumScreen = isMediumScreenSize(context);
     Size size = MediaQuery.of(context).size;
-    late ScrollController scrollController;
+    late ScrollController _scrollController;
-    scrollController = ScrollController();
+    _scrollController = ScrollController();
 
-    void scrollToCenter() {
+    void _scrollToCenter() {
-      final double middlePosition = scrollController.position.maxScrollExtent / 2;
+      final double middlePosition = _scrollController.position.maxScrollExtent / 2;
-      scrollController.animateTo(
+      _scrollController.animateTo(
         middlePosition,
         duration: const Duration(seconds: 1),
         curve: Curves.easeInOut,
@@ -68,7 +68,7 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
     }
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      scrollToCenter();
+      _scrollToCenter();
     });
 
     return Stack(
@@ -76,7 +76,7 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
         FirstLayer(
           second: Center(
             child: ListView(
-              controller: scrollController,
+              controller: _scrollController,
               shrinkWrap: true,
               children: [
                 Container(
@@ -199,7 +199,7 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
           width: size.width * 0.9,
           child: DropdownButtonHideUnderline(
             child: DropdownButton2<String>(
-              style: const TextStyle(color: Colors.black),
+              style: TextStyle(color: Colors.black),
               isExpanded: true,
               hint: Text(
                 'Select your region/country',
@@ -336,16 +336,6 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
             obscureText: loginBloc.obscureText,
             keyboardType: TextInputType.visiblePassword,
             controller: loginBloc.loginPasswordController,
-            onFieldSubmitted: (value) {
-              if (loginBloc.loginFormKey.currentState!.validate()) {
-                loginBloc.add(LoginButtonPressed(    
-                  username: loginBloc.loginEmailController.text,
-                  password: value,
-                ));
-              } else {
-                loginBloc.add(ChangeValidateEvent());
-              }
-            },
             decoration: textBoxDecoration()!.copyWith(
               hintText: 'At least 8 characters',
               hintStyle: Theme.of(context)
@@ -403,7 +393,7 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
         Transform.scale(
           scale: 1.2,
           child: Checkbox(
-            fillColor: WidgetStateProperty.all<Color>(Colors.white),
+            fillColor: MaterialStateProperty.all<Color>(Colors.white),
             activeColor: Colors.white,
             value: loginBloc.isChecked,
             checkColor: Colors.black,

lib/pages/routines/helper/save_routine_helper.dart

@@ -5,6 +5,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
@@ -14,18 +15,13 @@ class SaveRoutineHelper {
   static Future<void> showSaveRoutineDialog(BuildContext context) async {
     return showDialog<void>(
       context: context,
-      builder: (context) {
+      builder: (BuildContext context) {
         return BlocBuilder<RoutineBloc, RoutineState>(
           builder: (context, state) {
-            final selectedConditionLabel = state.selectedAutomationOperator == 'and'
-                ? 'All Conditions are met'
-                : 'Any Condition is met';
-
             return AlertDialog(
               contentPadding: EdgeInsets.zero,
               content: Container(
-                width: context.screenWidth * 0.5,
+                width: MediaQuery.sizeOf(context).width * 0.5,
-                height: 500,
                 decoration: BoxDecoration(
                   color: Colors.white,
                   borderRadius: BorderRadius.circular(20),
@@ -33,42 +29,99 @@ class SaveRoutineHelper {
                 child: Column(
                   mainAxisSize: MainAxisSize.min,
                   children: [
-                    const SizedBox(height: 18),
+                    DialogHeader('Create a scene: ${state.routineName ?? ""}'),
-                    Text(
+                    Padding(
-                      'Create a scene: ${state.routineName ?? ""}',
+                      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-                      textAlign: TextAlign.center,
+                      child: Row(
-                      style: Theme.of(context).textTheme.headlineMedium!.copyWith(
+                        crossAxisAlignment: CrossAxisAlignment.start,
-                            color: ColorsManager.primaryColorWithOpacity,
+                        children: [
-                            fontWeight: FontWeight.bold,
+                          // Left side - IF
-                          ),
+                          Expanded(
-                    ),
+                            child: ListView(
-                    const SizedBox(height: 18),
+                              // crossAxisAlignment: CrossAxisAlignment.start,
-                    _buildDivider(),
+                              shrinkWrap: true,
-                    _buildListsLabelRow(selectedConditionLabel),
+                              children: [
-                    Expanded(
+                                const Text(
-                      child: Padding(
+                                  'IF:',
-                        padding: const EdgeInsetsDirectional.symmetric(
+                                  style: TextStyle(
-                          horizontal: 16,
+                                    fontSize: 16,
-                        ),
+                                  ),
-                        child: Row(
+                                ),
-                          crossAxisAlignment: CrossAxisAlignment.start,
+                                const SizedBox(height: 8),
-                          mainAxisSize: MainAxisSize.min,
+                                if (state.isTabToRun)
-                          spacing: 24,
+                                  ListTile(
-                          children: [
+                                    leading: SvgPicture.asset(
-                            _buildIfConditions(state, context),
+                                      Assets.tabToRun,
-                            Container(
+                                      width: 24,
-                              width: 1,
+                                      height: 24,
-                              color: ColorsManager.greyColor.withValues(alpha: 0.8),
+                                    ),
+                                    title: const Text('Tab to run'),
+                                  ),
+                                if (state.isAutomation)
+                                  ...state.ifItems.map((item) {
+                                    final functions =
+                                        state.selectedFunctions[item['uniqueCustomId']] ?? [];
+                                    return functionRow(item, context, functions);
+                                  }),
+                              ],
                             ),
-                            _buildThenActions(state, context),
+                          ),
-                          ],
+                          const SizedBox(width: 16),
-                        ),
+                          // Right side - THEN items
+
+                          Expanded(
+                            child: ListView(
+                              // crossAxisAlignment: CrossAxisAlignment.start,
+                              shrinkWrap: true,
+                              children: [
+                                const Text(
+                                  'THEN:',
+                                  style: TextStyle(
+                                    fontSize: 16,
+                                  ),
+                                ),
+                                const SizedBox(height: 8),
+                                ...state.thenItems.map((item) {
+                                  final functions =
+                                      state.selectedFunctions[item['uniqueCustomId']] ?? [];
+                                  return functionRow(item, context, functions);
+                                }),
+                              ],
+                            ),
+                          ),
+                        ],
                       ),
                     ),
-                    _buildDivider(),
+                    // if (state.errorMessage != null || state.errorMessage!.isNotEmpty)
-                    const SizedBox(height: 8),
+                    //   Padding(
-                    _buildDialogFooter(context, state),
+                    //     padding: const EdgeInsets.all(8.0),
-                    const SizedBox(height: 8),
+                    //     child: Text(
+                    //       state.errorMessage!,
+                    //       style: const TextStyle(color: Colors.red),
+                    //     ),
+                    //   ),
+                    DialogFooter(
+                      onCancel: () => Navigator.pop(context),
+                      onConfirm: () async {
+                        if (state.isAutomation) {
+                          if (state.isUpdate ?? false) {
+                            context.read<RoutineBloc>().add(const UpdateAutomation());
+                          } else {
+                            context.read<RoutineBloc>().add(const CreateAutomationEvent());
+                          }
+                        } else {
+                          if (state.isUpdate ?? false) {
+                            context.read<RoutineBloc>().add(const UpdateScene());
+                          } else {
+                            context.read<RoutineBloc>().add(const CreateSceneEvent());
+                          }
+                        }
+                        // if (state.errorMessage == null || state.errorMessage!.isEmpty) {
+                        Navigator.pop(context);
+                        // }
+                      },
+                      isConfirmEnabled: true,
+                    ),
                   ],
                 ),
               ),
@@ -79,107 +132,8 @@ class SaveRoutineHelper {
     );
   }
 
-  static Container _buildDivider() {
-    return Container(
-      height: 1,
-      width: double.infinity,
-      color: ColorsManager.greyColor,
-    );
-  }
-
-  static Widget _buildListsLabelRow(String selectedConditionLabel) {
-    const textStyle = TextStyle(
-      fontSize: 16,
-    );
-    return Container(
-      color: ColorsManager.backgroundColor.withValues(alpha: 0.5),
-      padding: const EdgeInsetsDirectional.all(20),
-      child: Row(
-        spacing: 16,
-        children: [
-          Expanded(child: Text('IF: $selectedConditionLabel', style: textStyle)),
-          const Expanded(child: Text('THEN:', style: textStyle)),
-        ],
-      ),
-    );
-  }
-
-  static Widget _buildDialogFooter(BuildContext context, RoutineState state) {
-    return Row(
-      spacing: 16,
-      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-      children: [
-        DialogFooterButton(
-          text: 'Cancel',
-          onTap: () => Navigator.pop(context),
-        ),
-        DialogFooterButton(
-          text: 'Confirm',
-          onTap: () {
-            if (state.isAutomation) {
-              if (state.isUpdate ?? false) {
-                context.read<RoutineBloc>().add(const UpdateAutomation());
-              } else {
-                context.read<RoutineBloc>().add(const CreateAutomationEvent());
-              }
-            } else {
-              if (state.isUpdate ?? false) {
-                context.read<RoutineBloc>().add(const UpdateScene());
-              } else {
-                context.read<RoutineBloc>().add(const CreateSceneEvent());
-              }
-            }
-
-            Navigator.pop(context);
-          },
-          textColor: ColorsManager.primaryColorWithOpacity,
-        ),
-      ],
-    );
-  }
-
-  static Widget _buildThenActions(RoutineState state, BuildContext context) {
-    return Expanded(
-      child: ListView(
-        // shrinkWrap: true,
-        children: state.thenItems.map((item) {
-          final functions = state.selectedFunctions[item['uniqueCustomId']] ?? [];
-          return functionRow(item, context, functions);
-        }).toList(),
-      ),
-    );
-  }
-
-  static Widget _buildIfConditions(RoutineState state, BuildContext context) {
-    return Expanded(
-      child: ListView(
-        // shrinkWrap: true,
-        children: [
-          if (state.isTabToRun)
-            ListTile(
-              leading: SvgPicture.asset(
-                Assets.tabToRun,
-                width: 24,
-                height: 24,
-              ),
-              title: const Text('Tab to run'),
-            ),
-          if (state.isAutomation)
-            ...state.ifItems.map((item) {
-              final functions =
-                  state.selectedFunctions[item['uniqueCustomId']] ?? [];
-              return functionRow(item, context, functions);
-            }),
-        ],
-      ),
-    );
-  }
-
   static Widget functionRow(
-    dynamic item,
+      dynamic item, BuildContext context, List<DeviceFunctionData> functions) {
-    BuildContext context,
-    List<DeviceFunctionData> functions,
-  ) {
     return Padding(
       padding: const EdgeInsets.only(top: 6),
       child: Row(
@@ -188,36 +142,19 @@ class SaveRoutineHelper {
           Expanded(
             child: Row(
               mainAxisAlignment: MainAxisAlignment.start,
-              spacing: 17,
+              spacing: 8,
               children: [
-                Container(
+                item['type'] == 'tap_to_run' || item['type'] == 'scene'
-                  width: 22,
+                    ? Image.memory(
-                  height: 22,
+                        base64Decode(item['icon']),
-                  padding: const EdgeInsetsDirectional.all(4),
+                        width: 22,
-                  decoration: BoxDecoration(
+                        height: 22,
-                    shape: BoxShape.circle,
+                      )
-                    color: ColorsManager.textFieldGreyColor,
+                    : SvgPicture.asset(
-                    border: Border.all(
+                        item['imagePath'],
-                      color: ColorsManager.neutralGray,
+                        width: 22,
-                      width: 1.5,
+                        height: 22,
-                    ),
+                      ),
-                  ),
-                  child: Center(
-                    child: item['type'] == 'tap_to_run' || item['type'] == 'scene'
-                        ? Image.memory(
-                            base64Decode(item['icon']),
-                            width: 12,
-                            height: 22,
-                            fit: BoxFit.scaleDown,
-                          )
-                        : SvgPicture.asset(
-                            item['imagePath'],
-                            width: 12,
-                            height: 12,
-                            fit: BoxFit.scaleDown,
-                          ),
-                  ),
-                ),
                 Flexible(
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.start,
@@ -229,25 +166,19 @@ class SaveRoutineHelper {
                         maxLines: 1,
                         overflow: TextOverflow.ellipsis,
                         style: context.textTheme.bodySmall?.copyWith(
-                          fontSize: 15,
+                          fontSize: 14,
                           color: ColorsManager.textPrimaryColor,
                         ),
                       ),
                       Wrap(
-                        runSpacing: 16,
-                        spacing: 4,
                         children: functions
-                            .map(
+                            .map((f) => Text(
-                              (function) => Text(
+                                  '${f.operationName}: ${f.value}',
-                                '${function.operationName}: ${function.value}',
+                                  style: context.textTheme.bodySmall
-                                style: context.textTheme.bodySmall?.copyWith(
+                                      ?.copyWith(color: ColorsManager.grayColor, fontSize: 8),
-                                  color: ColorsManager.grayColor,
+                                  overflow: TextOverflow.ellipsis,
-                                  fontSize: 8,
+                                  maxLines: 3,
-                                ),
+                                ))
-                                overflow: TextOverflow.ellipsis,
-                                maxLines: 3,
-                              ),
-                            )
                             .toList(),
                       ),
                     ],
@@ -266,13 +197,7 @@ class SaveRoutineHelper {
                 child: Row(
                   spacing: 2,
                   children: [
-                    SizedBox(
+                    SizedBox(width: 8, height: 8, child: SvgPicture.asset(Assets.deviceTagIcon)),
-                      width: 8,
-                      height: 8,
-                      child: SvgPicture.asset(
-                        Assets.deviceTagIcon,
-                      ),
-                    ),
                     Text(
                       item['tag'] ?? '',
                       textAlign: TextAlign.center,
@@ -293,12 +218,7 @@ class SaveRoutineHelper {
                   spacing: 2,
                   children: [
                     SizedBox(
-                      width: 8,
+                        width: 8, height: 8, child: SvgPicture.asset(Assets.spaceLocationIcon)),
-                      height: 8,
-                      child: SvgPicture.asset(
-                        Assets.spaceLocationIcon,
-                      ),
-                    ),
                     Text(
                       item['subSpace'] ?? '',
                       textAlign: TextAlign.center,

lib/pages/routines/widgets/dialog_footer.dart

@@ -28,40 +28,32 @@ class DialogFooter extends StatelessWidget {
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
         children: [
-          DialogFooterButton(
+          _buildFooterButton(
+            context: context,
             text: 'Cancel',
             onTap: onCancel,
           ),
           if (isConfirmEnabled) ...[
             Container(width: 1, height: 50, color: ColorsManager.greyColor),
-            DialogFooterButton(
+            _buildFooterButton(
+              context: context,
               text: 'Confirm',
               onTap: onConfirm,
-              textColor: isConfirmEnabled
+              textColor:
-                  ? ColorsManager.primaryColorWithOpacity
+                  isConfirmEnabled ? ColorsManager.primaryColorWithOpacity : Colors.red,
-                  : Colors.red,
             ),
           ],
         ],
       ),
     );
   }
-}
 
-class DialogFooterButton extends StatelessWidget {
+  Widget _buildFooterButton({
-  const DialogFooterButton({
+    required BuildContext context,
-    required this.text,
+    required String text,
-    required this.onTap,
+    required VoidCallback? onTap,
-    this.textColor,
+    Color? textColor,
-    super.key,
+  }) {
-  });
-
-  final String text;
-  final VoidCallback? onTap;
-  final Color? textColor;
-
-  @override
-  Widget build(BuildContext context) {
     return Expanded(
       child: TextButton(
         style: TextButton.styleFrom(

lib/pages/routines/widgets/dialog_header.dart

@@ -16,7 +16,6 @@ class DialogHeader extends StatelessWidget {
         ),
         Text(
           title,
-          textAlign: TextAlign.center,
           style: Theme.of(context).textTheme.bodyMedium!.copyWith(
                 color: ColorsManager.primaryColorWithOpacity,
                 fontWeight: FontWeight.bold,

lib/pages/space_tree/view/custom_expansion.dart

@@ -8,20 +8,19 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
   final bool isSelected;
   final bool isSoldCheck;
   final bool isExpanded;
-  final void Function()? onExpansionChanged;
+  final Function? onExpansionChanged;
-  final void Function()? onItemSelected;
+  final Function? onItemSelected;
 
-  const CustomExpansionTileSpaceTree({
+  const CustomExpansionTileSpaceTree(
-    required this.isSelected,
+      {super.key,
-    required this.title,
+      this.spaceId,
-    this.spaceId,
+      required this.title,
-    this.children,
+      this.children,
-    this.onExpansionChanged,
+      this.isExpanded = false,
-    this.onItemSelected,
+      this.onExpansionChanged,
-    this.isExpanded = false,
+      this.onItemSelected,
-    this.isSoldCheck = false,
+      required this.isSelected,
-    super.key,
+      this.isSoldCheck = false});
-  });
 
   @override
   Widget build(BuildContext context) {
@@ -31,30 +30,50 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
           children: [
             Checkbox(
               value: isSoldCheck ? null : isSelected,
-              onChanged: (value) => onItemSelected?.call(),
+              onChanged: (bool? value) {
+                if (onItemSelected != null) {
+                  onItemSelected!();
+                }
+              },
               tristate: true,
-              side: WidgetStateBorderSide.resolveWith(
+              side: WidgetStateBorderSide.resolveWith((states) {
-                (states) => const BorderSide(color: ColorsManager.grayBorder),
+                return const BorderSide(color: ColorsManager.grayBorder);
-              ),
+              }),
               fillColor: WidgetStateProperty.resolveWith((states) {
                 if (states.contains(WidgetState.selected)) {
                   return ColorsManager.blue1;
+                } else {
+                  return ColorsManager.checkBoxFillColor;
                 }
-
-                return ColorsManager.checkBoxFillColor;
               }),
               checkColor: ColorsManager.whiteColors,
             ),
-            _buildExpansionIcon(),
+            if (children != null && children!.isNotEmpty)
+              InkWell(
+                onTap: () {
+                  if (onExpansionChanged != null) {
+                    onExpansionChanged!();
+                  }
+                },
+                child: Icon(
+                  isExpanded ? Icons.keyboard_arrow_down : Icons.keyboard_arrow_right,
+                  color: ColorsManager.lightGrayColor,
+                  size: 16.0,
+                ),
+              ),
             Expanded(
               child: GestureDetector(
-                onTap: onItemSelected,
+                onTap: () {
+                  if (onItemSelected != null) {
+                    onItemSelected!();
+                  }
+                },
                 child: Text(
                   _capitalizeFirstLetter(title),
                   style: Theme.of(context).textTheme.bodySmall!.copyWith(
                         color: isSelected
-                            ? ColorsManager.blackColor
+                            ? ColorsManager.blackColor // Change color to black when selected
-                            : ColorsManager.lightGrayColor,
+                            : ColorsManager.lightGrayColor, // Gray when not selected
                         fontWeight: FontWeight.w400,
                       ),
                 ),
@@ -73,20 +92,6 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
     );
   }
 
-  Widget _buildExpansionIcon() {
-    return Visibility(
-      visible: children != null && children!.isNotEmpty,
-      child: InkWell(
-        onTap: onExpansionChanged,
-        child: Icon(
-          isExpanded ? Icons.keyboard_arrow_down : Icons.keyboard_arrow_right,
-          color: ColorsManager.lightGrayColor,
-          size: 16.0,
-        ),
-      ),
-    );
-  }
-
   String _capitalizeFirstLetter(String text) {
     if (text.isEmpty) return text;
     return text[0].toUpperCase() + text.substring(1);

lib/pages/space_tree/view/space_tree_view.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/common/widgets/search_bar.dart';
-import 'package:syncrow_web/common/widgets/sidebar_communities_list.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_state.dart';
@@ -24,13 +23,7 @@ class SpaceTreeView extends StatefulWidget {
 }
 
 class _SpaceTreeViewState extends State<SpaceTreeView> {
-  late final ScrollController _scrollController;
+  final ScrollController _scrollController = ScrollController();
-
-  @override
-  void initState() {
-    _scrollController = ScrollController();
-    super.initState();
-  }
 
   @override
   void dispose() {
@@ -41,161 +34,225 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<SpaceTreeBloc, SpaceTreeState>(builder: (context, state) {
-      final communities = state.searchQuery.isNotEmpty
+      List<CommunityModel> list =
-          ? state.filteredCommunity
+          state.searchQuery.isNotEmpty ? state.filteredCommunity : state.communityList;
-          : state.communityList;
       return Container(
         height: MediaQuery.sizeOf(context).height,
         decoration: widget.isSide == true
-            ? subSectionContainerDecoration.copyWith(
+            ? subSectionContainerDecoration.copyWith(color: ColorsManager.whiteColors)
-                color: ColorsManager.whiteColors)
             : const BoxDecoration(color: ColorsManager.whiteColors),
         child: state is SpaceTreeLoadingState
             ? const Center(child: CircularProgressIndicator())
             : Column(
                 children: [
-                  if (widget.isSide == true)
+                  widget.isSide == true
-                    Container(
+                      ? Container(
-                      decoration: const BoxDecoration(
+                          decoration: const BoxDecoration(
-                        color: ColorsManager.circleRolesBackground,
+                            color: ColorsManager.circleRolesBackground,
-                        borderRadius: BorderRadius.only(
+                            borderRadius: BorderRadius.only(
-                          topRight: Radius.circular(20),
+                                topRight: Radius.circular(20), topLeft: Radius.circular(20)),
-                          topLeft: Radius.circular(20),
+                          ),
-                        ),
+                          child: Padding(
-                      ),
+                            padding: const EdgeInsets.all(8.0),
-                      child: Padding(
+                            child: Row(
-                        padding: const EdgeInsets.all(8.0),
+                              children: [
-                        child: Row(
+                                Expanded(
-                          children: [
+                                  child: Container(
-                            Expanded(
+                                    decoration: BoxDecoration(
-                              child: Container(
+                                        borderRadius: const BorderRadius.all(Radius.circular(20)),
-                                decoration: BoxDecoration(
+                                        border: Border.all(color: ColorsManager.grayBorder)),
-                                  borderRadius: const BorderRadius.all(
+                                    child: TextFormField(
-                                    Radius.circular(20),
+                                      style: context.textTheme.bodyMedium
-                                  ),
+                                          ?.copyWith(color: ColorsManager.blackColor),
-                                  border: Border.all(
+                                      onChanged: (value) {
-                                    color: ColorsManager.grayBorder,
+                                        context.read<SpaceTreeBloc>().add(SearchQueryEvent(value));
-                                  ),
+                                      },
-                                ),
+                                      decoration: textBoxDecoration(radios: 20)!.copyWith(
-                                child: TextFormField(
+                                        fillColor: Colors.white,
-                                  style: context.textTheme.bodyMedium?.copyWith(
+                                        suffixIcon: Padding(
-                                    color: ColorsManager.blackColor,
+                                          padding: const EdgeInsets.only(right: 16),
-                                  ),
+                                          child: SvgPicture.asset(
-                                  onChanged: (value) =>
+                                            Assets.textFieldSearch,
-                                      context.read<SpaceTreeBloc>().add(
+                                            width: 24,
-                                            SearchQueryEvent(value),
+                                            height: 24,
                                           ),
-                                  decoration:
+                                        ),
-                                      textBoxDecoration(radios: 20)?.copyWith(
+                                        hintStyle: context.textTheme.bodyMedium?.copyWith(
-                                    fillColor: Colors.white,
+                                            fontWeight: FontWeight.w400,
-                                    suffixIcon: Padding(
+                                            fontSize: 12,
-                                      padding: const EdgeInsets.only(right: 16),
+                                            color: ColorsManager.textGray),
-                                      child: SvgPicture.asset(
-                                        Assets.textFieldSearch,
-                                        width: 24,
-                                        height: 24,
                                       ),
                                     ),
-                                    hintStyle:
-                                        context.textTheme.bodyMedium?.copyWith(
-                                      fontWeight: FontWeight.w400,
-                                      fontSize: 12,
-                                      color: ColorsManager.textGray,
-                                    ),
                                   ),
                                 ),
-                              ),
+                              ],
                             ),
-                          ],
-                        ),
-                      ),
-                    )
-                  else
-                    CustomSearchBar(
-                      onSearchChanged: (query) => context.read<SpaceTreeBloc>().add(
-                            SearchQueryEvent(query),
                           ),
-                    ),
+                        )
+                      : CustomSearchBar(
+                          onSearchChanged: (query) {
+                            context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
+                          },
+                        ),
                   const SizedBox(height: 16),
                   Expanded(
                     child: state.isSearching
                         ? const Center(child: CircularProgressIndicator())
-                        : SidebarCommunitiesList(
+                        : ListView(
-                            onScrollToEnd: () => context.read<SpaceTreeBloc>().add(
+                            shrinkWrap: true,
-                                  PaginationEvent(
+                            scrollDirection: Axis.horizontal,
-                                    state.paginationModel,
+                            children: [
-                                    state.communityList,
+                              Container(
-                                  ),
+                                width: MediaQuery.sizeOf(context).width * 0.5,
-                                ),
+                                padding: const EdgeInsets.all(8.0),
-                            scrollController: _scrollController,
+                                child: list.isEmpty
-                            communities: communities,
+                                    ? Center(
-                            itemBuilder: (context, index) {
+                                        child: Text(
-                              return CustomExpansionTileSpaceTree(
+                                          'No results found',
-                                title: communities[index].name,
+                                          style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                isSelected: state.selectedCommunities
+                                                color: ColorsManager.lightGrayColor,
-                                    .contains(communities[index].uuid),
+                                                fontWeight: FontWeight.w400,
-                                isSoldCheck: state.selectedCommunities
+                                              ),
-                                    .contains(communities[index].uuid),
+                                        ),
-                                onExpansionChanged: () =>
+                                      )
-                                    context.read<SpaceTreeBloc>().add(
+                                    : Scrollbar(
-                                          OnCommunityExpanded(
+                                        scrollbarOrientation: ScrollbarOrientation.left,
-                                            communities[index].uuid,
+                                        thumbVisibility: true,
+                                        controller: _scrollController,
+                                        child: NotificationListener(
+                                          onNotification: (notification) {
+                                            if (notification is ScrollEndNotification &&
+                                                notification.metrics.extentAfter == 0) {
+                                              // If the user has reached the end of the list Load more data
+                                              context.read<SpaceTreeBloc>().add(PaginationEvent(
+                                                  state.paginationModel, state.communityList));
+                                            }
+                                            return false;
+                                          },
+                                          child: Padding(
+                                            padding: const EdgeInsets.only(left: 16),
+                                            child: ListView.builder(
+                                                shrinkWrap: true,
+                                                itemCount: list.length,
+                                                controller: _scrollController,
+                                                itemBuilder: (context, index) {
+                                                  return CustomExpansionTileSpaceTree(
+                                                    title: list[index].name,
+                                                    isSelected: state.selectedCommunities
+                                                        .contains(list[index].uuid),
+                                                    isSoldCheck: state.selectedCommunities
+                                                        .contains(list[index].uuid),
+                                                    onExpansionChanged: () {
+                                                      context.read<SpaceTreeBloc>().add(
+                                                          OnCommunityExpanded(list[index].uuid));
+                                                    },
+                                                    isExpanded: state.expandedCommunities
+                                                        .contains(list[index].uuid),
+                                                    onItemSelected: () {
+                                                      context.read<SpaceTreeBloc>().add(
+                                                          OnCommunitySelected(list[index].uuid,
+                                                              list[index].spaces));
+                                                      widget.onSelect();
+                                                    },
+                                                    children: list[index].spaces.map((space) {
+                                                      return CustomExpansionTileSpaceTree(
+                                                        title: space.name,
+                                                        isExpanded: state.expandedSpaces
+                                                            .contains(space.uuid),
+                                                        onItemSelected: () {
+                                                          context.read<SpaceTreeBloc>().add(
+                                                              OnSpaceSelected(
+                                                                  list[index],
+                                                                  space.uuid ?? '',
+                                                                  space.children));
+                                                          widget.onSelect();
+                                                        },
+                                                        onExpansionChanged: () {
+                                                          context.read<SpaceTreeBloc>().add(
+                                                              OnSpaceExpanded(list[index].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, list[index]),
+                                                      );
+                                                    }).toList(),
+                                                  );
+                                                }),
                                           ),
                                         ),
-                                isExpanded: state.expandedCommunities.contains(
-                                  communities[index].uuid,
-                                ),
-                                onItemSelected: () {
-                                  context.read<SpaceTreeBloc>().add(
-                                        OnCommunitySelected(
-                                          communities[index].uuid,
-                                          communities[index].spaces,
-                                        ),
-                                      );
-                                  widget.onSelect();
-                                },
-                                children: communities[index].spaces.map(
-                                  (space) {
-                                    return CustomExpansionTileSpaceTree(
-                                      title: space.name,
-                                      isExpanded:
-                                          state.expandedSpaces.contains(space.uuid),
-                                      onItemSelected: () {
-                                        context.read<SpaceTreeBloc>().add(
-                                              OnSpaceSelected(
-                                                communities[index],
-                                                space.uuid ?? '',
-                                                space.children,
-                                              ),
-                                            );
-                                        widget.onSelect();
-                                      },
-                                      onExpansionChanged: () =>
-                                          context.read<SpaceTreeBloc>().add(
-                                                OnSpaceExpanded(
-                                                  communities[index].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,
-                                        communities[index],
                                       ),
-                                    );
+                              ),
-                                  },
+                            ],
-                                ).toList(),
-                              );
-                            },
                           ),
                   ),
                   if (state.paginationIsLoading) const CircularProgressIndicator(),
+                  // 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(),
+                  //           ),
+                  //   ),
+                  // ),
                 ],
               ),
       );
@@ -203,28 +260,22 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   }
 
   List<Widget> _buildNestedSpaces(
-    BuildContext context,
+      BuildContext context, SpaceTreeState state, SpaceModel space, CommunityModel community) {
-    SpaceTreeState state,
-    SpaceModel space,
-    CommunityModel community,
-  ) {
     return space.children.map((child) {
       return CustomExpansionTileSpaceTree(
-        isSelected: state.selectedSpaces.contains(child.uuid) ||
+        isSelected:
-            state.soldCheck.contains(child.uuid),
+            state.selectedSpaces.contains(child.uuid) || state.soldCheck.contains(child.uuid),
         isSoldCheck: state.soldCheck.contains(child.uuid),
         title: child.name,
         isExpanded: state.expandedSpaces.contains(child.uuid),
         onItemSelected: () {
-          context.read<SpaceTreeBloc>().add(
+          context
-                OnSpaceSelected(community, child.uuid ?? '', child.children),
+              .read<SpaceTreeBloc>()
-              );
+              .add(OnSpaceSelected(community, child.uuid ?? '', child.children));
           widget.onSelect();
         },
         onExpansionChanged: () {
-          context.read<SpaceTreeBloc>().add(
+          context.read<SpaceTreeBloc>().add(OnSpaceExpanded(community.uuid, child.uuid ?? ''));
-                OnSpaceExpanded(community.uuid, child.uuid ?? ''),
-              );
         },
         children: _buildNestedSpaces(context, state, child, community),
       );

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

@@ -592,8 +592,6 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
         return CreateSubSpaceDialog(
             spaceName: name,
             dialogTitle: isEdit ? 'Edit Sub-space' : 'Create Sub-space',
-            spaceTags: spaceTags,
-            isEdit: isEdit,
             products: products,
             existingSubSpaces: existingSubSpaces,
             onSave: (slectedSubspaces) {

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

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/common/widgets/empty_search_result_widget.dart';
 import 'package:syncrow_web/common/widgets/search_bar.dart';
-import 'package:syncrow_web/common/widgets/sidebar_communities_list.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
@@ -32,8 +30,6 @@ class SidebarWidget extends StatefulWidget {
 }
 
 class _SidebarWidgetState extends State<SidebarWidget> {
-  late final ScrollController _scrollController;
-
   String _searchQuery = '';
   String? _selectedSpaceUuid;
   String? _selectedId;
@@ -41,16 +37,9 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   @override
   void initState() {
     _selectedId = widget.selectedSpaceUuid;
-    _scrollController = ScrollController();
     super.initState();
   }
 
-  @override
-  void dispose() {
-    _scrollController.dispose();
-    super.dispose();
-  }
-
   @override
   void didUpdateWidget(covariant SidebarWidget oldWidget) {
     if (widget.selectedSpaceUuid != oldWidget.selectedSpaceUuid) {
@@ -97,14 +86,12 @@ class _SidebarWidgetState extends State<SidebarWidget> {
     return isSpaceSelected || anySubSpaceIsSelected;
   }
 
-  static const _width = 300.0;
-
   @override
   Widget build(BuildContext context) {
     final filteredCommunities = _filteredCommunities();
 
     return Container(
-      width: _width,
+      width: 300,
       decoration: subSectionContainerDecoration,
       child: Column(
         mainAxisSize: MainAxisSize.min,
@@ -116,18 +103,10 @@ class _SidebarWidgetState extends State<SidebarWidget> {
           ),
           const SizedBox(height: 16),
           Expanded(
-            child: Visibility(
+            child: ListView(
-              visible: filteredCommunities.isNotEmpty,
+              children: filteredCommunities
-              replacement: const EmptySearchResultWidget(),
+                  .map((community) => _buildCommunityTile(context, community))
-              child: SidebarCommunitiesList(
+                  .toList(),
-                scrollController: _scrollController,
-                onScrollToEnd: () {},
-                communities: filteredCommunities,
-                itemBuilder: (context, index) => _buildCommunityTile(
-                  context,
-                  filteredCommunities[index],
-                ),
-              ),
             ),
           ),
         ],
@@ -155,12 +134,11 @@ class _SidebarWidgetState extends State<SidebarWidget> {
       },
       onExpansionChanged: (title, expanded) {},
       children: community.spaces
-          .where(
+          .where((space) {
-            (space) => {
+            final isDeleted = space.status != SpaceStatus.deleted;
-              SpaceStatus.deleted,
+            final isParentDeleted = space.status != SpaceStatus.parentDeleted;
-              SpaceStatus.parentDeleted,
+            return (isDeleted || isParentDeleted);
-            }.contains(space.status),
+          })
-          )
           .map((space) => _buildSpaceTile(space: space, community: community))
           .toList(),
     );

lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart

@@ -4,222 +4,204 @@ import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/subspace_model.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace/bloc/subspace_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace/bloc/subspace_event.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace/bloc/subspace_state.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart';
+import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
-class CreateSubSpaceDialog extends StatelessWidget {
+class CreateSubSpaceDialog extends StatefulWidget {
-  final bool isEdit;
   final String dialogTitle;
   final List<SubspaceModel>? existingSubSpaces;
   final String? spaceName;
-  final List<Tag>? spaceTags;
   final List<ProductModel>? products;
-  final Function(List<SubspaceModel>?)? onSave;
+  final void Function(List<SubspaceModel>?)? onSave;
 
-  const CreateSubSpaceDialog(
+  const CreateSubSpaceDialog({
-      {Key? key,
+    required this.dialogTitle,
-      required this.isEdit,
+    required this.spaceName,
-      required this.dialogTitle,
+    required this.products,
-      this.existingSubSpaces,
+    required this.onSave,
-      required this.spaceName,
+    this.existingSubSpaces,
-      required this.spaceTags,
+    super.key,
-      required this.products,
+  });
-      required this.onSave})
+
-      : super(key: key);
+  @override
+  State<CreateSubSpaceDialog> createState() => _CreateSubSpaceDialogState();
+}
+
+class _CreateSubSpaceDialogState extends State<CreateSubSpaceDialog> {
+  late final TextEditingController _subspaceNameController;
+
+  @override
+  void initState() {
+    _subspaceNameController = TextEditingController();
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _subspaceNameController.dispose();
+    super.dispose();
+  }
 
   @override
   Widget build(BuildContext context) {
-    final screenWidth = MediaQuery.of(context).size.width;
+    return BlocProvider(
-    final textController = TextEditingController();
+      create: (_) {
-
+        final bloc = SubSpaceBloc();
-    return Dialog(
+        if (widget.existingSubSpaces != null) {
-      shape: RoundedRectangleBorder(
+          for (final subSpace in widget.existingSubSpaces ?? []) {
-        borderRadius: BorderRadius.circular(20),
+            bloc.add(AddSubSpace(subSpace));
-      ),
-      child: BlocProvider(
-        create: (_) {
-          final bloc = SubSpaceBloc();
-          if (existingSubSpaces != null) {
-            for (var subSpace in existingSubSpaces!) {
-              bloc.add(AddSubSpace(subSpace));
-            }
           }
-          return bloc;
+        }
-        },
+        return bloc;
+      },
+      child: Dialog(
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(20),
+        ),
         child: BlocBuilder<SubSpaceBloc, SubSpaceState>(
           builder: (context, state) {
             return Container(
-                color: ColorsManager.whiteColors,
+              width: context.screenWidth * 0.35,
-                child: SizedBox(
+              color: ColorsManager.whiteColors,
-                  width: screenWidth * 0.35,
+              padding: const EdgeInsets.all(16),
-                  child: Padding(
+              child: Column(
-                    padding: const EdgeInsets.all(16.0),
+                crossAxisAlignment: CrossAxisAlignment.start,
-                    child: Column(
+                mainAxisSize: MainAxisSize.min,
-                      crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
-                      mainAxisSize: MainAxisSize.min,
+                  Text(
+                    widget.dialogTitle,
+                    style: context.textTheme.headlineLarge?.copyWith(
+                      color: ColorsManager.blackColor,
+                    ),
+                  ),
+                  const SizedBox(height: 16),
+                  Container(
+                    width: context.screenWidth * 0.35,
+                    padding: const EdgeInsets.symmetric(
+                      vertical: 10,
+                      horizontal: 16,
+                    ),
+                    decoration: BoxDecoration(
+                      color: ColorsManager.boxColor,
+                      borderRadius: BorderRadius.circular(10),
+                    ),
+                    child: Wrap(
+                      spacing: 8,
+                      runSpacing: 8,
+                      alignment: WrapAlignment.start,
+                      crossAxisAlignment: WrapCrossAlignment.center,
                       children: [
-                        Text(
+                        ...state.subSpaces.asMap().entries.map(
-                          dialogTitle,
+                          (entry) {
-                          style: Theme.of(context)
+                            final index = entry.key;
-                              .textTheme
+                            final subSpace = entry.value;
-                              .headlineLarge
+
-                              ?.copyWith(color: ColorsManager.blackColor),
+                            final lowerName = subSpace.subspaceName.toLowerCase();
+
+                            final duplicateIndices = state.subSpaces
+                                .asMap()
+                                .entries
+                                .where((e) =>
+                                    e.value.subspaceName.toLowerCase() == lowerName)
+                                .map((e) => e.key)
+                                .toList();
+                            final isDuplicate = duplicateIndices.length > 1 &&
+                                duplicateIndices.indexOf(index) != 0;
+                            return SubspaceChip(
+                              subSpace: SubspaceTemplateModel(
+                                subspaceName: entry.value.subspaceName,
+                                disabled: entry.value.disabled,
+                              ),
+                              isDuplicate: isDuplicate,
+                              onDeleted: () => context.read<SubSpaceBloc>().add(
+                                    RemoveSubSpace(subSpace),
+                                  ),
+                            );
+                          },
                         ),
-                        const SizedBox(height: 16),
+                        SizedBox(
-                        Container(
+                          width: 200,
-                          width: screenWidth * 0.35,
+                          child: TextField(
-                          padding: const EdgeInsets.symmetric(
+                            controller: _subspaceNameController,
-                              vertical: 10.0, horizontal: 16.0),
+                            decoration: InputDecoration(
-                          decoration: BoxDecoration(
+                              border: InputBorder.none,
-                            color: ColorsManager.boxColor,
+                              hintText: state.subSpaces.isEmpty
-                            borderRadius: BorderRadius.circular(10),
+                                  ? 'Please enter the name'
-                          ),
+                                  : null,
-                          child: Wrap(
+                              hintStyle: context.textTheme.bodySmall?.copyWith(
-                            spacing: 8.0,
+                                color: ColorsManager.lightGrayColor,
-                            runSpacing: 8.0,
+                              ),
-                            children: [
+                            ),
-                              ...state.subSpaces.asMap().entries.map(
+                            onSubmitted: (value) {
-                                (entry) {
+                              final trimmedValue = value.trim();
-                                  final index = entry.key;
+                              if (trimmedValue.isNotEmpty) {
-                                  final subSpace = entry.value;
+                                context.read<SubSpaceBloc>().add(
-
+                                      AddSubSpace(
-                                  final lowerName =
+                                        SubspaceModel(
-                                      subSpace.subspaceName.toLowerCase();
+                                          subspaceName: trimmedValue,
-
+                                          disabled: false,
-                                  final duplicateIndices = state.subSpaces
-                                      .asMap()
-                                      .entries
-                                      .where((e) =>
-                                          e.value.subspaceName.toLowerCase() ==
-                                          lowerName)
-                                      .map((e) => e.key)
-                                      .toList();
-                                  final isDuplicate =
-                                      duplicateIndices.length > 1 &&
-                                          duplicateIndices.indexOf(index) != 0;
-
-                                  return Chip(
-                                    label: Text(subSpace.subspaceName,
-                                        style: Theme.of(context)
-                                            .textTheme
-                                            .bodyMedium
-                                            ?.copyWith(
-                                                color:
-                                                    ColorsManager.spaceColor)),
-                                    backgroundColor: ColorsManager.whiteColors,
-                                    shape: RoundedRectangleBorder(
-                                      borderRadius: BorderRadius.circular(10),
-                                      side: BorderSide(
-                                        color: isDuplicate
-                                            ? ColorsManager.red
-                                            : ColorsManager.transparentColor,
-                                        width: 0,
-                                      ),
-                                    ),
-                                    deleteIcon: Container(
-                                      width: 24,
-                                      height: 24,
-                                      decoration: BoxDecoration(
-                                        shape: BoxShape.circle,
-                                        border: Border.all(
-                                          color: ColorsManager.lightGrayColor,
-                                          width: 1.5,
                                         ),
                                       ),
-                                      child: const Icon(
+                                    );
-                                        Icons.close,
+                                _subspaceNameController.clear();
-                                        size: 16,
+                              }
-                                        color: ColorsManager.lightGrayColor,
+                            },
-                                      ),
+                            style: context.textTheme.bodyMedium,
-                                    ),
-                                    onDeleted: () => context
-                                        .read<SubSpaceBloc>()
-                                        .add(RemoveSubSpace(subSpace)),
-                                  );
-                                },
-                              ),
-                              SizedBox(
-                                width: 200,
-                                child: TextField(
-                                    controller: textController,
-                                    decoration: InputDecoration(
-                                        border: InputBorder.none,
-                                        hintText: state.subSpaces.isEmpty
-                                            ? 'Please enter the name'
-                                            : null,
-                                        hintStyle: Theme.of(context)
-                                            .textTheme
-                                            .bodySmall
-                                            ?.copyWith(
-                                                color: ColorsManager
-                                                    .lightGrayColor)),
-                                    onSubmitted: (value) {
-                                      if (value.trim().isNotEmpty) {
-                                        context.read<SubSpaceBloc>().add(
-                                            AddSubSpace(SubspaceModel(
-                                                subspaceName: value.trim(),
-                                                disabled: false)));
-                                        textController.clear();
-                                      }
-                                    },
-                                    style:
-                                        Theme.of(context).textTheme.bodyMedium),
-                              ),
-                            ],
                           ),
                         ),
-                        if (state.errorMessage.isNotEmpty)
-                          Padding(
-                            padding: const EdgeInsets.only(top: 8.0),
-                            child: Text(state.errorMessage,
-                                style: Theme.of(context)
-                                    .textTheme
-                                    .bodySmall
-                                    ?.copyWith(
-                                      color: ColorsManager.warningRed,
-                                    )),
-                          ),
-                        const SizedBox(height: 16),
-                        Row(
-                          children: [
-                            Expanded(
-                              child: CancelButton(
-                                label: 'Cancel',
-                                onPressed: () async {
-                                  Navigator.of(context).pop();
-                                },
-                              ),
-                            ),
-                            const SizedBox(width: 10),
-                            Expanded(
-                              child: DefaultButton(
-                                onPressed: (state.errorMessage.isNotEmpty)
-                                    ? null
-                                    : () async {
-                                        final subSpaces = context
-                                            .read<SubSpaceBloc>()
-                                            .state
-                                            .subSpaces;
-                                        onSave!(subSpaces);
-                                        Navigator.of(context).pop();
-                                      },
-                                backgroundColor: ColorsManager.secondaryColor,
-                                borderRadius: 10,
-                                foregroundColor: state.errorMessage.isNotEmpty
-                                    ? ColorsManager.whiteColorsWithOpacity
-                                    : ColorsManager.whiteColors,
-                                child: const Text('OK'),
-                              ),
-                            ),
-                          ],
-                        ),
                       ],
                     ),
                   ),
-                ));
+                  if (state.errorMessage.isNotEmpty)
+                    Padding(
+                      padding: const EdgeInsets.only(top: 8.0),
+                      child: Text(
+                        state.errorMessage,
+                        style: context.textTheme.bodySmall?.copyWith(
+                          color: ColorsManager.warningRed,
+                        ),
+                      ),
+                    ),
+                  const SizedBox(height: 16),
+                  Row(
+                    children: [
+                      Expanded(
+                        child: CancelButton(
+                          label: 'Cancel',
+                          onPressed: () async {
+                            Navigator.of(context).pop();
+                          },
+                        ),
+                      ),
+                      const SizedBox(width: 10),
+                      Expanded(
+                        child: DefaultButton(
+                          onPressed: state.errorMessage.isEmpty
+                              ? () {
+                                  final subSpacesBloc = context.read<SubSpaceBloc>();
+                                  final subSpaces = subSpacesBloc.state.subSpaces;
+                                  widget.onSave?.call(subSpaces);
+                                  Navigator.of(context).pop();
+                                }
+                              : null,
+                          backgroundColor: ColorsManager.secondaryColor,
+                          borderRadius: 10,
+                          foregroundColor: state.errorMessage.isNotEmpty
+                              ? ColorsManager.whiteColorsWithOpacity
+                              : ColorsManager.whiteColors,
+                          child: const Text('OK'),
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            );
           },
         ),
       ),

lib/pages/spaces_management/create_subspace_model/widgets/create_subspace_model_chips_box.dart

@@ -1,4 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace_model/widgets/subspaces_textfield.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
@@ -51,6 +54,9 @@ class CreateSubspaceModelChipsBox extends StatelessWidget {
               return SubspaceChip(
                 subSpace: subSpace,
                 isDuplicate: isDuplicate,
+                onDeleted: () => context.read<SubSpaceModelBloc>().add(
+                      RemoveSubSpaceModel(subSpace),
+                    ),
               );
             },
           ),

lib/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart

@@ -1,7 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
@@ -11,10 +8,12 @@ class SubspaceChip extends StatelessWidget {
     required this.subSpace,
     required this.isDuplicate,
     super.key,
+    required this.onDeleted,
   });
 
   final SubspaceTemplateModel subSpace;
   final bool isDuplicate;
+  final void Function() onDeleted;
 
   @override
   Widget build(BuildContext context) {
@@ -50,9 +49,7 @@ class SubspaceChip extends StatelessWidget {
           ),
         ),
       ),
-      onDeleted: () => context.read<SubSpaceModelBloc>().add(
+      onDeleted: onDeleted,
-            RemoveSubSpaceModel(subSpace),
-          ),
     );
   }
 }

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

@@ -145,11 +145,13 @@ class CreateSpaceModelDialog extends StatelessWidget {
                     ),
                     const SizedBox(height: 10),
                     TagChipDisplay(
+                      context,
+                      screenWidth: screenWidth,
                       spaceModel: updatedSpaceModel,
                       products: products,
                       subspaces: subspaces,
                       allTags: allTags,
-                      spaceName: spaceNameController.text,
+                      spaceNameController: spaceNameController,
                       pageContext: pageContext,
                       otherSpaceModels: otherSpaceModels,
                       allSpaceModels: allSpaceModels,

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

@@ -10,152 +10,139 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_
 import 'package:syncrow_web/pages/spaces_management/space_model/widgets/button_content_widget.dart';
 import 'package:syncrow_web/pages/spaces_management/tag_model/views/add_device_type_model_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class TagChipDisplay extends StatelessWidget {
-  const TagChipDisplay({
+  final double screenWidth;
-    required this.spaceModel,
-    required this.products,
-    required this.subspaces,
-    required this.allTags,
-    required this.spaceName,
-    required this.projectTags,
-    this.pageContext,
-    this.otherSpaceModels,
-    this.allSpaceModels,
-    super.key,
-  });
-
   final SpaceTemplateModel? spaceModel;
   final List<ProductModel>? products;
   final List<SubspaceTemplateModel>? subspaces;
   final List<String>? allTags;
-  final String spaceName;
+  final TextEditingController spaceNameController;
   final BuildContext? pageContext;
   final List<String>? otherSpaceModels;
   final List<SpaceTemplateModel>? allSpaceModels;
   final List<Tag> projectTags;
 
-  Map<ProductModel, int> get _groupedTags {
+  const TagChipDisplay(BuildContext context,
-    final spaceTags = spaceModel?.tags ?? <Tag>[];
+      {Key? key,
-
+      required this.screenWidth,
-    final subspaces = spaceModel?.subspaceModels ?? [];
+      required this.spaceModel,
-    final subspaceTags = subspaces.expand((e) => e.tags ?? <Tag>[]).toList();
+      required this.products,
-
+      required this.subspaces,
-    return TagHelper.groupTags([...spaceTags, ...subspaceTags]);
+      required this.allTags,
-  }
+      required this.spaceNameController,
+      this.pageContext,
+      this.otherSpaceModels,
+      this.allSpaceModels,
+      required this.projectTags})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    final hasTags = spaceModel?.tags?.isNotEmpty ?? false;
+    return (spaceModel?.tags?.isNotEmpty == true ||
-    final hasSubspaceTags =
+            spaceModel?.subspaceModels?.any((subspace) => subspace.tags?.isNotEmpty == true) ==
-        spaceModel?.subspaceModels?.any((e) => e.tags?.isNotEmpty ?? false) ?? false;
+                true)
+        ? SizedBox(
+            width: screenWidth * 0.25,
+            child: Container(
+              padding: const EdgeInsets.all(8.0),
+              decoration: BoxDecoration(
+                color: ColorsManager.textFieldGreyColor,
+                borderRadius: BorderRadius.circular(15),
+                border: Border.all(
+                  color: ColorsManager.textFieldGreyColor,
+                  width: 3.0, // Border width
+                ),
+              ),
+              child: Wrap(
+                spacing: 8.0,
+                runSpacing: 8.0,
+                children: [
+                  // Combine tags from spaceModel and subspaces
+                  ...TagHelper.groupTags([
+                    ...?spaceModel?.tags,
+                    ...?spaceModel?.subspaceModels?.expand((subspace) => subspace.tags ?? [])
+                  ]).entries.map(
+                        (entry) => Chip(
+                          avatar: SizedBox(
+                            width: 24,
+                            height: 24,
+                            child: SvgPicture.asset(
+                              entry.key.icon ?? 'assets/icons/gateway.svg',
+                              fit: BoxFit.contain,
+                            ),
+                          ),
+                          label: Text(
+                            'x${entry.value}', // Show count
+                            style: Theme.of(context)
+                                .textTheme
+                                .bodySmall!
+                                .copyWith(color: ColorsManager.spaceColor),
+                          ),
+                          backgroundColor: ColorsManager.whiteColors,
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(16),
+                            side: const BorderSide(
+                              color: ColorsManager.spaceColor,
+                            ),
+                          ),
+                        ),
+                      ),
+                  EditChip(onTap: () async {
+                    // Use the Navigator's context for showDialog
+                    Navigator.of(context).pop();
 
-    if (hasTags || hasSubspaceTags) {
+                    await showDialog<bool>(
-      return Container(
+                        barrierDismissible: false,
-        width: context.screenWidth * 0.25,
+                        context: context,
-        padding: const EdgeInsets.all(8),
+                        builder: (context) => AssignTagModelsDialog(
-        decoration: BoxDecoration(
+                              products: products,
-          color: ColorsManager.textFieldGreyColor,
+                              allSpaceModels: allSpaceModels,
-          borderRadius: BorderRadius.circular(15),
+                              subspaces: subspaces,
-          border: Border.all(
+                              pageContext: pageContext,
-            color: ColorsManager.textFieldGreyColor,
+                              allTags: allTags,
-            width: 3,
+                              spaceModel: spaceModel,
-          ),
+                              otherSpaceModels: otherSpaceModels,
-        ),
+                              initialTags: TagHelper.generateInitialTags(
-        child: Wrap(
+                                  subspaces: subspaces, spaceTagModels: spaceModel?.tags ?? []),
-          spacing: 8,
+                              title: 'Edit Device',
-          runSpacing: 8,
+                              addedProducts: TagHelper.createInitialSelectedProducts(
-          children: [
+                                  spaceModel?.tags ?? [], subspaces),
-            ..._groupedTags.entries.map((entry) => _buildChip(context, entry)),
+                              spaceName: spaceModel?.modelName ?? '',
-            _buildEditChip(context),
+                              projectTags: projectTags,
-          ],
+                            ));
-        ),
+                  })
-      );
+                ],
-    }
+              ),
+            ),
+          )
+        : TextButton(
+            onPressed: () async {
+              Navigator.of(context).pop();
 
-    return _buildAddDevicesButton(context);
+              await showDialog<bool>(
-  }
+                barrierDismissible: false,
-
+                context: context,
-  Widget _buildEditChip(BuildContext context) {
+                builder: (context) => AddDeviceTypeModelWidget(
-    return EditChip(
+                  products: products,
-      onTap: () => showDialog<void>(
+                  subspaces: subspaces,
-        context: context,
+                  allTags: allTags,
-        builder: (context) => AssignTagModelsDialog(
+                  spaceName: spaceNameController.text,
-          products: products,
+                  pageContext: pageContext,
-          allSpaceModels: allSpaceModels,
+                  isCreate: true,
-          subspaces: subspaces,
+                  spaceModel: spaceModel,
-          pageContext: pageContext,
+                  otherSpaceModels: otherSpaceModels,
-          allTags: allTags,
+                  projectTags: projectTags,
-          spaceModel: spaceModel,
+                ),
-          otherSpaceModels: otherSpaceModels,
+              );
-          initialTags: TagHelper.generateInitialTags(
+            },
-            subspaces: subspaces,
+            style: TextButton.styleFrom(
-            spaceTagModels: spaceModel?.tags ?? [],
+              padding: EdgeInsets.zero,
-          ),
+            ),
-          title: 'Edit Device',
+            child: const ButtonContentWidget(
-          addedProducts: TagHelper.createInitialSelectedProducts(
+              icon: Icons.add,
-            spaceModel?.tags ?? [],
+              label: 'Add Devices',
-            subspaces,
+            ),
-          ),
+          );
-          spaceName: spaceModel?.modelName ?? '',
-          projectTags: projectTags,
-        ),
-      ),
-    );
-  }
-
-  Widget _buildChip(
-    BuildContext context,
-    MapEntry<ProductModel, int> entry,
-  ) {
-    return Chip(
-      backgroundColor: ColorsManager.whiteColors,
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(16),
-        side: const BorderSide(
-          color: ColorsManager.spaceColor,
-        ),
-      ),
-      avatar: SvgPicture.asset(
-        entry.key.icon ?? Assets.gateway,
-        fit: BoxFit.contain,
-        height: 24,
-        width: 24,
-      ),
-      label: Text(
-        '${entry.value}',
-        style: context.textTheme.bodySmall!.copyWith(
-          color: ColorsManager.spaceColor,
-        ),
-      ),
-    );
-  }
-
-  Widget _buildAddDevicesButton(BuildContext context) {
-    return TextButton(
-      onPressed: () => showDialog<void>(
-        context: context,
-        builder: (context) => AddDeviceTypeModelWidget(
-          products: products,
-          subspaces: subspaces,
-          allTags: allTags,
-          spaceName: spaceName,
-          pageContext: pageContext,
-          isCreate: true,
-          spaceModel: spaceModel,
-          otherSpaceModels: otherSpaceModels,
-          projectTags: projectTags,
-        ),
-      ),
-      style: TextButton.styleFrom(
-        padding: EdgeInsets.zero,
-      ),
-      child: const ButtonContentWidget(
-        icon: Icons.add,
-        label: 'Add Devices',
-      ),
-    );
   }
 }