use DataCellWidget

lib/pages/access_management/booking_system/presentation/view/widgets/icon_text_button.dart

@@ -4,8 +4,7 @@ import 'package:syncrow_web/utils/color_manager.dart';
 
 class SvgTextButton extends StatelessWidget {
   final String svgAsset;
-  final double? horizontalPadding;
-  final double? verticalPadding;
+  final EdgeInsets? padding;
   final String label;
   final VoidCallback onPressed;
   final Color backgroundColor;
@@ -27,8 +26,7 @@ class SvgTextButton extends StatelessWidget {
     this.svgColor = const Color(0xFF496EFF),
     this.labelColor = Colors.black,
     this.borderRadius = 10.0,
-    this.horizontalPadding,
-    this.verticalPadding,
+    this.padding,
     this.boxShadow = const [
       BoxShadow(
         color: ColorsManager.lightGrayColor,
@@ -47,9 +45,8 @@ class SvgTextButton extends StatelessWidget {
         borderRadius: BorderRadius.circular(borderRadius),
         onTap: onPressed,
         child: Container(
-          padding: EdgeInsets.symmetric(
-              horizontal: horizontalPadding ?? 24,
-              vertical: verticalPadding ?? 12),
+          padding: padding ??
+              const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
           decoration: BoxDecoration(
             color: backgroundColor,
             borderRadius: BorderRadius.circular(borderRadius),

lib/pages/access_management/manage_bookable_spaces/data/remote_bookable_spaces_service.dart

@@ -13,7 +13,7 @@ class RemoteBookableSpacesService implements BookableSpacesService {
   static const _defaultErrorMessage = 'Failed to load Bookable Spaces';
   @override
   Future<PaginatedDataModel<BookableSpacemodel>> load(
-      BookableSpacesParams param) async {
+      BookableSpacesParam param) async {
     try {
       final response = await _httpService.get(
         path: ApiEndpoints.bookableSpaces,

lib/pages/access_management/manage_bookable_spaces/domain/params/bookable_spaces_params.dart

@@ -1,6 +1,6 @@
-class BookableSpacesParams {
+class BookableSpacesParam {
   final int currentPage;
-  BookableSpacesParams({
+  BookableSpacesParam({
     required this.currentPage,
   });
 

lib/pages/access_management/manage_bookable_spaces/domain/service/bookable_spaces_service.dart

@@ -4,5 +4,5 @@ import 'package:syncrow_web/pages/space_management_v2/main_module/shared/models/
 
 abstract class BookableSpacesService {
   Future<PaginatedDataModel<BookableSpacemodel>> load(
-      BookableSpacesParams param);
+      BookableSpacesParam param);
 }

lib/pages/access_management/manage_bookable_spaces/presentation/blocs/bookable_spaces_bloc/bookable_spaces_bloc.dart

@@ -40,22 +40,25 @@ class BookableSpacesBloc
 
     if (event.bookableSpace.spaceConfig!.configUuid ==
         event.updatedBookableSpaceConfig.configUuid) {
-      final editedBookableSpace = event.bookableSpaces.data.firstWhere(
-        (element) => element.spaceUuid == event.bookableSpace.spaceUuid,
-      );
-      final config = editedBookableSpace.spaceConfig!.copyWith(
-        availability: event.updatedBookableSpaceConfig.availability,
-        bookableDays: event.updatedBookableSpaceConfig.bookableDays,
-        bookingEndTime: event.updatedBookableSpaceConfig.bookingEndTime,
-        bookingStartTime: event.updatedBookableSpaceConfig.bookingStartTime,
-        cost: event.updatedBookableSpaceConfig.cost,
-      );
-      editedBookableSpace.copyWith(spaceConfig: config);
       final index = event.bookableSpaces.data.indexWhere(
         (element) => element.spaceUuid == event.bookableSpace.spaceUuid,
       );
-      event.bookableSpaces.data.removeAt(index);
-      event.bookableSpaces.data.insert(index, editedBookableSpace);
+
+      if (index != -1) {
+        final original = event.bookableSpaces.data[index];
+
+        final updatedConfig = original.spaceConfig!.copyWith(
+          availability: event.updatedBookableSpaceConfig.availability,
+          bookableDays: event.updatedBookableSpaceConfig.bookableDays,
+          bookingEndTime: event.updatedBookableSpaceConfig.bookingEndTime,
+          bookingStartTime: event.updatedBookableSpaceConfig.bookingStartTime,
+          cost: event.updatedBookableSpaceConfig.cost,
+        );
+
+        final updatedSpace = original.copyWith(spaceConfig: updatedConfig);
+
+        event.bookableSpaces.data[index] = updatedSpace;
+      }
     }
 
     emit(BookableSpacesLoaded(bookableSpacesList: event.bookableSpaces));

lib/pages/access_management/manage_bookable_spaces/presentation/blocs/bookable_spaces_bloc/bookable_spaces_event.dart

@@ -8,7 +8,7 @@ sealed class BookableSpacesEvent extends Equatable {
 }
 
 class LoadBookableSpacesEvent extends BookableSpacesEvent {
-  final BookableSpacesParams param;
+  final BookableSpacesParam param;
   const LoadBookableSpacesEvent(this.param);
 }
 

lib/pages/access_management/manage_bookable_spaces/presentation/blocs/steps_cubit/cubit/steps_cubit.dart

@@ -4,7 +4,7 @@ import 'package:equatable/equatable.dart';
 part 'steps_state.dart';
 
 class StepsCubit extends Cubit<StepsState> {
-  StepsCubit() : super(StepsInitial());
+  StepsCubit() : super(StepOneState());
 
   void initDialogValue() {
     emit(StepOneState());

lib/pages/access_management/manage_bookable_spaces/presentation/blocs/steps_cubit/cubit/steps_state.dart

@@ -7,9 +7,6 @@ sealed class StepsState extends Equatable {
   List<Object> get props => [];
 }
 
-final class StepsInitial extends StepsState {}
-
 final class StepOneState extends StepsState {}
 
 final class StepTwoState extends StepsState {}
-

lib/pages/access_management/manage_bookable_spaces/presentation/blocs/toggle_cubit/toggle_points_switch_cubit.dart

@@ -4,7 +4,7 @@ import 'package:equatable/equatable.dart';
 part 'toggle_points_switch_state.dart';
 
 class TogglePointsSwitchCubit extends Cubit<TogglePointsSwitchState> {
-  TogglePointsSwitchCubit() : super(TogglePointsSwitchInitial());
+  TogglePointsSwitchCubit() : super(UnActivatePointsSwitch());
 
   void activateSwitch() {
     emit(ActivatePointsSwitch());

lib/pages/access_management/manage_bookable_spaces/presentation/blocs/toggle_cubit/toggle_points_switch_state.dart

@@ -7,7 +7,6 @@ sealed class TogglePointsSwitchState extends Equatable {
   List<Object> get props => [];
 }
 
-final class TogglePointsSwitchInitial extends TogglePointsSwitchState {}
 
 class ActivatePointsSwitch extends TogglePointsSwitchState {}
 

lib/pages/access_management/manage_bookable_spaces/presentation/blocs/update_bookable_spaces/update_bookable_spaces_bloc.dart

@@ -18,10 +18,10 @@ class UpdateBookableSpacesBloc
 
   Future<void> _onUpdateBookableSpace(UpdateBookableSpace event,
       Emitter<UpdateBookableSpacesState> emit) async {
-    emit(UpdateBookableSpaceLoading(event.updatedParams.spaceUuid));
+    emit(UpdateBookableSpaceLoading(event.updatedParam.spaceUuid));
     try {
       final updatedSpace =
-          await updateBookableSpaceService.update(event.updatedParams);
+          await updateBookableSpaceService.update(event.updatedParam);
 
       emit(UpdateBookableSpaceSuccess(bookableSpaceConfig: updatedSpace));
       event.onSuccess?.call();

lib/pages/access_management/manage_bookable_spaces/presentation/blocs/update_bookable_spaces/update_bookable_spaces_event.dart

@@ -9,9 +9,9 @@ sealed class UpdateBookableSpaceEvent extends Equatable {
 
 class UpdateBookableSpace extends UpdateBookableSpaceEvent {
   final void Function()? onSuccess;
-  final UpdateBookableSpaceParam updatedParams;
+  final UpdateBookableSpaceParam updatedParam;
   const UpdateBookableSpace({
-    required this.updatedParams,
+    required this.updatedParam,
     this.onSuccess,
   });
 }

lib/pages/access_management/manage_bookable_spaces/presentation/screens/manage_bookable_spaces_screen.dart

@@ -33,7 +33,7 @@ class _ManageBookableSpacesPageState extends State<ManageBookableSpacesPage> {
             RemoteBookableSpacesService(HTTPService()),
           )..add(
               LoadBookableSpacesEvent(
-                BookableSpacesParams(currentPage: 1),
+                BookableSpacesParam(currentPage: 1),
               ),
             ),
         ),

lib/pages/access_management/manage_bookable_spaces/presentation/widgets/bookable_space_switch_activation_widget.dart

@@ -56,7 +56,7 @@ class BookableSpaceSwitchActivationWidget extends StatelessWidget {
               onChanged: (value) {
                 context.read<UpdateBookableSpacesBloc>().add(
                       UpdateBookableSpace(
-                          updatedParams: UpdateBookableSpaceParam(
+                          updatedParam: UpdateBookableSpaceParam(
                         spaceUuid: space.spaceUuid,
                         availability: value,
                       )),

lib/pages/access_management/manage_bookable_spaces/presentation/widgets/booking_period_widget.dart

@@ -65,10 +65,21 @@ class BookingPeriodWidget extends StatelessWidget {
                     ));
                     throw Exception();
                   } else {
-                    setupBookableSpacesBloc.selectedBookableSpaces.forEach(
-                      (e) =>
-                          e.spaceConfig!.copyWith(bookingStartTime: timePicked),
-                    );
+                    for (int i = 0;
+                        i <
+                            setupBookableSpacesBloc
+                                .selectedBookableSpaces.length;
+                        i++) {
+                      final space =
+                          setupBookableSpacesBloc.selectedBookableSpaces[i];
+                      final updatedConfig = space.spaceConfig
+                          ?.copyWith(bookingStartTime: timePicked);
+                      final updatedSpace =
+                          space.copyWith(spaceConfig: updatedConfig);
+
+                      setupBookableSpacesBloc.selectedBookableSpaces[i] =
+                          updatedSpace;
+                    }
                   }
                 },
               ),
@@ -99,10 +110,21 @@ class BookingPeriodWidget extends StatelessWidget {
                     ));
                     throw Exception();
                   } else {
-                    setupBookableSpacesBloc.selectedBookableSpaces.forEach(
-                      (e) =>
-                          e.spaceConfig!.copyWith(bookingEndTime: timePicked),
-                    );
+                    for (int i = 0;
+                        i <
+                            setupBookableSpacesBloc
+                                .selectedBookableSpaces.length;
+                        i++) {
+                      final space =
+                          setupBookableSpacesBloc.selectedBookableSpaces[i];
+                      final updatedConfig = space.spaceConfig
+                          ?.copyWith(bookingEndTime: timePicked);
+                      final updatedSpace =
+                          space.copyWith(spaceConfig: updatedConfig);
+
+                      setupBookableSpacesBloc.selectedBookableSpaces[i] =
+                          updatedSpace;
+                    }
                   }
                 },
               ),

lib/pages/access_management/manage_bookable_spaces/presentation/widgets/buttons_divider_bottom_dialog_widget.dart

@@ -71,7 +71,7 @@ class ButtonsDividerBottomDialogWidget extends StatelessWidget {
                     );
                     context.read<BookableSpacesBloc>().add(
                           LoadBookableSpacesEvent(
-                            BookableSpacesParams(currentPage: 1),
+                            BookableSpacesParam(currentPage: 1),
                           ),
                         );
                   } else if (nonBookableState is NonBookableSpacesError) {
@@ -79,8 +79,7 @@ class ButtonsDividerBottomDialogWidget extends StatelessWidget {
                       SnackBar(
                         content: Text(
                           nonBookableState.error,
-                          style:
-                              const TextStyle(color: ColorsManager.red),
+                          style: const TextStyle(color: ColorsManager.red),
                         ),
                         duration: const Duration(seconds: 2),
                         behavior: SnackBarBehavior.floating,

lib/pages/access_management/manage_bookable_spaces/presentation/widgets/details_steps_widget.dart

@@ -25,7 +25,6 @@ class DetailsStepsWidget extends StatelessWidget {
               pointsController: pointsController,
               editingBookableSpace: editingBookableSpace,
             ),
-          StepsInitial() => const SizedBox(),
         };
       }),
     );

lib/pages/access_management/manage_bookable_spaces/presentation/widgets/main_manage_bookable_widgets/bottom_pagination_part_widget.dart

@@ -17,7 +17,6 @@ class PaginationButtonsWidget extends StatelessWidget {
 
           List<Widget> paginationItems = [];
 
-          // « Two pages back
           if (currentPage > 2) {
             paginationItems.add(
               _buildArrowButton(
@@ -25,7 +24,7 @@ class PaginationButtonsWidget extends StatelessWidget {
                 onTap: () {
                   context.read<BookableSpacesBloc>().add(
                         LoadBookableSpacesEvent(
-                          BookableSpacesParams(currentPage: currentPage - 2),
+                          BookableSpacesParam(currentPage: currentPage - 2),
                         ),
                       );
                 },
@@ -33,7 +32,6 @@ class PaginationButtonsWidget extends StatelessWidget {
             );
           }
 
-          // < One page back
           if (currentPage > 1) {
             paginationItems.add(
               _buildArrowButton(
@@ -41,7 +39,7 @@ class PaginationButtonsWidget extends StatelessWidget {
                 onTap: () {
                   context.read<BookableSpacesBloc>().add(
                         LoadBookableSpacesEvent(
-                          BookableSpacesParams(currentPage: currentPage - 1),
+                          BookableSpacesParam(currentPage: currentPage - 1),
                         ),
                       );
                 },
@@ -49,7 +47,6 @@ class PaginationButtonsWidget extends StatelessWidget {
             );
           }
 
-          // Page numbers
           for (int i = 1; i <= totalPages; i++) {
             paginationItems.add(
               Padding(
@@ -59,7 +56,7 @@ class PaginationButtonsWidget extends StatelessWidget {
                     if (i != currentPage) {
                       context.read<BookableSpacesBloc>().add(
                             LoadBookableSpacesEvent(
-                              BookableSpacesParams(currentPage: i),
+                              BookableSpacesParam(currentPage: i),
                             ),
                           );
                     }
@@ -89,7 +86,6 @@ class PaginationButtonsWidget extends StatelessWidget {
             );
           }
 
-          // > One page forward
           if (currentPage < totalPages) {
             paginationItems.add(
               _buildArrowButton(
@@ -97,7 +93,7 @@ class PaginationButtonsWidget extends StatelessWidget {
                 onTap: () {
                   context.read<BookableSpacesBloc>().add(
                         LoadBookableSpacesEvent(
-                          BookableSpacesParams(currentPage: currentPage + 1),
+                          BookableSpacesParam(currentPage: currentPage + 1),
                         ),
                       );
                 },
@@ -105,7 +101,6 @@ class PaginationButtonsWidget extends StatelessWidget {
             );
           }
 
-          // » Two pages forward
           if (currentPage + 1 < totalPages) {
             paginationItems.add(
               _buildArrowButton(
@@ -113,7 +108,7 @@ class PaginationButtonsWidget extends StatelessWidget {
                 onTap: () {
                   context.read<BookableSpacesBloc>().add(
                         LoadBookableSpacesEvent(
-                          BookableSpacesParams(currentPage: currentPage + 2),
+                          BookableSpacesParam(currentPage: currentPage + 2),
                         ),
                       );
                 },

lib/pages/access_management/manage_bookable_spaces/presentation/widgets/main_manage_bookable_widgets/table_part_widget.dart

@@ -28,7 +28,7 @@ class TableOfBookableSpacesWidget extends StatelessWidget {
                 onPressed: () => context
                     .read<BookableSpacesBloc>()
                     .add(LoadBookableSpacesEvent(
-                      BookableSpacesParams(currentPage: 1),
+                      BookableSpacesParam(currentPage: 1),
                     )),
                 child: const Text('Try Again'))
           ]);
@@ -41,12 +41,9 @@ class TableOfBookableSpacesWidget extends StatelessWidget {
                   title: space.spaceName,
                 ),
               ),
-              DataCell(Padding(
-                  padding: const EdgeInsetsGeometry.only(left: 10),
-                  child: Text(
-                    space.spaceVirtualAddress,
-                    style: const TextStyle(fontSize: 11),
-                  ))),
+              DataCell(DataCellWidget(
+                title: space.spaceVirtualAddress,
+              )),
               DataCell(Container(
                 padding: const EdgeInsetsGeometry.only(left: 10),
                 width: 200,

lib/pages/access_management/manage_bookable_spaces/presentation/widgets/main_manage_bookable_widgets/top_part_widget.dart

@@ -53,8 +53,7 @@ class RowOfButtonsTitleWidget extends StatelessWidget {
             ],
           ),
           SvgTextButton(
-            verticalPadding: 10,
-            horizontalPadding: 10,
+            padding: const EdgeInsets.all(10),
             svgSize: 15,
             fontSize: 10,
             fontWeight: FontWeight.bold,

lib/pages/access_management/manage_bookable_spaces/presentation/widgets/points_part_widget.dart

@@ -73,34 +73,31 @@ class _PointsPartWidgetState extends State<PointsPartWidget> {
                     }),
                     value: state is ActivatePointsSwitch,
                     onChanged: (value) {
+                      final bloc = context.read<SetupBookableSpacesBloc>();
+                      final updatedCost = value ? -1 : 0;
+
+                      final switchCubit =
+                          context.read<TogglePointsSwitchCubit>();
                       if (value) {
-                        context
-                            .read<TogglePointsSwitchCubit>()
-                            .activateSwitch();
-                        context
-                            .read<SetupBookableSpacesBloc>()
-                            .selectedBookableSpaces
-                            .forEach(
-                              (e) => e.spaceConfig!.copyWith(cost: -1),
-                            );
-                        context
-                            .read<SetupBookableSpacesBloc>()
-                            .add(CheckConfigurValidityEvent());
+                        switchCubit.activateSwitch();
                       } else {
-                        context
-                            .read<TogglePointsSwitchCubit>()
-                            .unActivateSwitch();
+                        switchCubit.unActivateSwitch();
                         widget.pointsController.clear();
-                        context
-                            .read<SetupBookableSpacesBloc>()
-                            .selectedBookableSpaces
-                            .forEach(
-                              (e) => e.spaceConfig!.copyWith(cost: 0),
-                            );
-                        context
-                            .read<SetupBookableSpacesBloc>()
-                            .add(CheckConfigurValidityEvent());
                       }
+
+                      for (int i = 0;
+                          i < bloc.selectedBookableSpaces.length;
+                          i++) {
+                        final space = bloc.selectedBookableSpaces[i];
+                        final updatedConfig =
+                            space.spaceConfig?.copyWith(cost: updatedCost);
+                        final updatedSpace =
+                            space.copyWith(spaceConfig: updatedConfig);
+
+                        bloc.selectedBookableSpaces[i] = updatedSpace;
+                      }
+
+                      bloc.add(CheckConfigurValidityEvent());
                     },
                   ),
                 )
@@ -114,16 +111,21 @@ class _PointsPartWidgetState extends State<PointsPartWidget> {
                 title: 'Ex: 0',
                 height: 40,
                 onChanged: (p0) {
-                  context
-                      .read<SetupBookableSpacesBloc>()
-                      .selectedBookableSpaces
-                      .forEach(
-                        (e) => e.spaceConfig!.copyWith(
-                          cost: int.parse(widget.pointsController.text.isEmpty
-                              ? '0'
-                              : widget.pointsController.text),
-                        ),
-                      );
+                  final updatedCost =
+                      int.tryParse(widget.pointsController.text) ?? 0;
+
+                  final bloc = context.read<SetupBookableSpacesBloc>();
+
+                  for (var i = 0; i < bloc.selectedBookableSpaces.length; i++) {
+                    final space = bloc.selectedBookableSpaces[i];
+                    final updatedConfig =
+                        space.spaceConfig?.copyWith(cost: updatedCost);
+                    final updatedSpace =
+                        space.copyWith(spaceConfig: updatedConfig);
+
+                    bloc.selectedBookableSpaces[i] = updatedSpace;
+                  }
+
                   context
                       .read<SetupBookableSpacesBloc>()
                       .add(CheckConfigurValidityEvent());

lib/pages/access_management/manage_bookable_spaces/presentation/widgets/save_second_step_button.dart

@@ -65,7 +65,7 @@ class SaveSecondStepButton extends StatelessWidget {
           UpdateBookableSpace(
             onSuccess: () =>
                 context.read<NonBookableSpacesBloc>().add(CallInitStateEvent()),
-            updatedParams: UpdateBookableSpaceParam.fromBookableModel(
+            updatedParam: UpdateBookableSpaceParam.fromBookableModel(
               context
                   .read<SetupBookableSpacesBloc>()
                   .selectedBookableSpaces

lib/pages/access_management/manage_bookable_spaces/presentation/widgets/week_checkbox_title_widget.dart

@@ -52,21 +52,28 @@ class _WeekDaysCheckboxRowState extends State<WeekDaysCheckboxRow> {
                   onChanged: (newValue) {
                     setState(() {
                       _daysChecked[entry.key] = newValue ?? false;
-                      final selectedDays = _daysChecked.entries
-                          .where((e) => e.value)
-                          .map((e) => e.key)
-                          .toList();
-
-                      for (var space in context
-                          .read<SetupBookableSpacesBloc>()
-                          .selectedBookableSpaces) {
-                        space.spaceConfig!.copyWith(bookableDays: selectedDays);
-                      }
                     });
 
-                    context
-                        .read<SetupBookableSpacesBloc>()
-                        .add(CheckConfigurValidityEvent());
+                    final selectedDays = _daysChecked.entries
+                        .where((e) => e.value)
+                        .map((e) => e.key)
+                        .toList();
+
+                    final bloc = context.read<SetupBookableSpacesBloc>();
+
+                    for (int i = 0;
+                        i < bloc.selectedBookableSpaces.length;
+                        i++) {
+                      final space = bloc.selectedBookableSpaces[i];
+                      final updatedConfig = space.spaceConfig
+                          ?.copyWith(bookableDays: selectedDays);
+                      final updatedSpace =
+                          space.copyWith(spaceConfig: updatedConfig);
+
+                      bloc.selectedBookableSpaces[i] = updatedSpace;
+                    }
+
+                    bloc.add(CheckConfigurValidityEvent());
                   },
                 ),
               ),