ammar/syncrow-web
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/web.git synced 2025-07-14 17:25:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71 from SyncrowIOT/feat/update-create-edit-space

Browse Source 
Feat/update-create-edit-space
This commit is contained in:
hannathkadher
2025-01-27 17:02:01 +04:00
committed by GitHub
parent 921d352207 c72297e0c8
commit ea5b6597f5
41 changed files with 1783 additions and 990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
assets/icons/duplicate.svg Normal file
View File

@ -0,0 +1,16 @@
<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M17.9807 2.67199L16.6413 0.219727H7.91051C7.43122 0.219727 7.04266 0.608281 7.04266 1.08758V16.605C7.04266 17.0843 7.43122 17.4729 7.91051 17.4729H18.2257C18.705 17.4729 19.0935 17.0843 19.0935 16.605V16.5459H19.7312V3.8127L17.9807 2.67199Z" fill="#60B7FF"/>
<path d="M18.1513 6.23445H9.12553C8.95881 6.23445 8.82373 6.09934 8.82373 5.93266C8.82373 5.76598 8.95885 5.63086 9.12553 5.63086H18.1513C18.318 5.63086 18.4531 5.76598 18.4531 5.93266C18.4531 6.09934 18.318 6.23445 18.1513 6.23445Z" fill="#0055A3"/>
<path d="M18.1513 8.54891H9.12553C8.95881 8.54891 8.82373 8.41379 8.82373 8.24711C8.82373 8.08043 8.95885 7.94531 9.12553 7.94531H18.1513C18.318 7.94531 18.4531 8.08043 18.4531 8.24711C18.4531 8.41379 18.318 8.54891 18.1513 8.54891Z" fill="#0055A3"/>
<path d="M18.1513 10.8634H9.12553C8.95881 10.8634 8.82373 10.7282 8.82373 10.5616C8.82373 10.3949 8.95885 10.2598 9.12553 10.2598H18.1513C18.318 10.2598 18.4531 10.3949 18.4531 10.5616C18.4531 10.7282 18.318 10.8634 18.1513 10.8634Z" fill="#0055A3"/>
<path d="M18.1513 13.1778H9.12556C8.95884 13.1778 8.82376 13.0427 8.82376 12.876C8.82376 12.7093 8.95888 12.5742 9.12556 12.5742H18.1513C18.3181 12.5742 18.4531 12.7093 18.4531 12.876C18.4531 13.0427 18.3181 13.1778 18.1513 13.1778Z" fill="#0055A3"/>
<path d="M19.0935 3.39648V16.6044C19.0935 17.0837 18.7049 17.4722 18.2256 17.4722H19.3663C19.8456 17.4722 20.2342 17.0837 20.2342 16.6044V3.81203L19.0935 3.39648Z" fill="#26A6FE"/>
<path d="M17.5091 3.8127H20.2342L16.6413 0.219727V2.94484C16.6413 3.42414 17.0298 3.8127 17.5091 3.8127Z" fill="#004281"/>
<path d="M11.4172 19.7805C11.8965 19.7805 12.2851 19.392 12.2851 18.9127V18.8937H12.8297V6.12031L11.039 4.78906L9.83279 2.52734H1.10204C0.622747 2.52734 0.234192 2.9159 0.234192 3.3952V18.9127C0.234192 19.392 0.622747 19.7805 1.10204 19.7805H11.4172Z" fill="#D5EDFF"/>
<path d="M12.285 4.97852V6.11922V18.9116C12.285 19.3909 11.8964 19.7794 11.4171 19.7794H12.5578C13.0371 19.7794 13.4257 19.3909 13.4257 18.9116V6.11922L12.285 4.97852Z" fill="#D8ECFE"/>
<path d="M10.7006 6.12031H13.4258L9.83279 2.52734V5.25246C9.83276 5.73176 10.2213 6.12031 10.7006 6.12031Z" fill="#B3DAFE"/>
<path d="M11.3429 8.54891H2.31709C2.15037 8.54891 2.01529 8.41379 2.01529 8.24711C2.01529 8.08043 2.15041 7.94531 2.31709 7.94531H11.3429C11.5096 7.94531 11.6447 8.08043 11.6447 8.24711C11.6447 8.41379 11.5096 8.54891 11.3429 8.54891Z" fill="#82AEE3"/>
<path d="M11.3428 10.8634H2.31706C2.15034 10.8634 2.01526 10.7282 2.01526 10.5616C2.01526 10.3949 2.15038 10.2598 2.31706 10.2598H11.3428C11.5096 10.2598 11.6446 10.3949 11.6446 10.5616C11.6446 10.7282 11.5096 10.8634 11.3428 10.8634Z" fill="#82AEE3"/>
<path d="M11.3428 13.1778H2.31706C2.15034 13.1778 2.01526 13.0427 2.01526 12.876C2.01526 12.7093 2.15038 12.5742 2.31706 12.5742H11.3428C11.5096 12.5742 11.6446 12.7093 11.6446 12.876C11.6446 13.0427 11.5096 13.1778 11.3428 13.1778Z" fill="#82AEE3"/>
<path d="M11.3428 15.4923H2.31706C2.15034 15.4923 2.01526 15.3571 2.01526 15.1905C2.01526 15.0238 2.15038 14.8887 2.31706 14.8887H11.3428C11.5096 14.8887 11.6446 15.0238 11.6446 15.1905C11.6447 15.3571 11.5096 15.4923 11.3428 15.4923Z" fill="#82AEE3"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

22
assets/icons/edit_space.svg Normal file
View File

@ -0,0 +1,22 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<g filter="url(#filter0_d_4618_3290)">
<path d="M18.7967 7.35156V19.8515C18.7967 21.0362 17.8329 22 16.6482 22H4.14825C2.9636 22 1.99982 21.0362 1.99982 19.8515V7.35156C1.99982 6.16691 2.9636 5.20312 4.14825 5.20312H16.6482C17.8329 5.20312 18.7967 6.16691 18.7967 7.35156Z" fill="#EDF2F2"/>
<path d="M18.7967 19.8515C18.7967 21.0361 17.8329 21.9999 16.6482 21.9999H4.14825C3.55591 21.9999 3.0188 21.7589 2.62978 21.3699L18.1667 5.83301C18.5557 6.22203 18.7967 6.75914 18.7967 7.35148V19.8515Z" fill="#C9DCDC"/>
<path d="M9.28417 14.7153C9.12722 14.5583 9.07241 14.3262 9.14265 14.1157L9.97128 11.6297C10 11.5434 10.0485 11.465 10.1128 11.4007L17.8468 3.66674C18.0756 3.43791 18.4466 3.43791 18.6754 3.66674L20.3327 5.324C20.5615 5.55283 20.5615 5.9238 20.3327 6.15263L12.5987 13.8866C12.5344 13.9509 12.456 13.9994 12.3697 14.0281L9.88374 14.8567C9.67323 14.927 9.44109 14.8722 9.28417 14.7153Z" fill="#4998EE"/>
<path d="M19.504 4.49512L9.28413 14.715C9.44105 14.8719 9.6732 14.9267 9.88374 14.8565L12.3697 14.0279C12.456 13.9992 12.5344 13.9507 12.5987 13.8864L20.3327 6.15242C20.5615 5.92359 20.5615 5.55261 20.3327 5.32379L19.504 4.49512Z" fill="#176EDE"/>
<path d="M20.3327 6.15305L17.8467 3.66711L19.2278 2.28602C19.6092 1.90466 20.2275 1.90466 20.6089 2.28602L21.7137 3.39087C22.0951 3.77223 22.0951 4.39055 21.7137 4.77192L20.3327 6.15305Z" fill="#FFE137"/>
<path d="M21.1613 2.83789L19.0897 4.90949L20.3327 6.15245L21.7138 4.77136C22.0951 4.39 22.0951 3.77168 21.7138 3.39031L21.1613 2.83789Z" fill="#FAC814"/>
</g>
<defs>
<filter id="filter0_d_4618_3290" x="-0.000183105" y="0" width="24" height="24" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset/>
<feGaussianBlur stdDeviation="1"/>
<feComposite in2="hardAlpha" operator="out"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4618_3290"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4618_3290" result="shape"/>
</filter>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

9
assets/icons/space_delete.svg Normal file
View File

@ -0,0 +1,9 @@
<svg width="16" height="20" viewBox="0 0 16 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M11.8069 19.9998H3.50035C2.16411 19.9998 1.08087 18.9165 1.08087 17.5804V4.51562H14.2262V17.5804C14.2262 18.9165 13.1432 19.9998 11.8069 19.9998Z" fill="#D8D8D8"/>
<path d="M1.08087 4.51562V5.48335H12.3715C12.8168 5.48335 13.1779 5.84438 13.1779 6.2898V17.3384C13.1779 18.2292 12.4557 18.9513 11.5649 18.9513H2.4519C2.05409 18.9513 1.67887 18.8547 1.34775 18.6844C1.74907 19.4652 2.56207 19.9998 3.50035 19.9998H11.8069C13.1432 19.9998 14.2262 18.9165 14.2262 17.5803V4.51562H1.08087Z" fill="#BABABA"/>
<path d="M14.2667 1.77417H10.7439L10.1633 0.612956C9.9742 0.234837 9.5941 0 9.17142 0H6.13594C5.71311 0 5.33316 0.234837 5.1441 0.612956L4.56349 1.77417H1.04063C0.595221 1.77417 0.234192 2.1352 0.234192 2.58061V3.70978C0.234192 4.15504 0.595221 4.51622 1.04063 4.51622H14.2667C14.7121 4.51622 15.0732 4.15504 15.0732 3.70978V2.58077C15.0732 2.1352 14.7121 1.77417 14.2667 1.77417ZM5.68503 0.8835C5.77094 0.71153 5.94368 0.604869 6.13594 0.604869H9.17142C9.36354 0.604869 9.53627 0.71153 9.62218 0.8835L10.0676 1.77417H5.23977L5.68503 0.8835Z" fill="#757575"/>
<path d="M14.2668 1.77441H12.9763C13.4217 1.77441 13.7829 2.13544 13.7829 2.58086V3.71003C13.7829 4.15529 13.4217 4.51647 12.9763 4.51647H14.2668C14.7122 4.51647 15.0732 4.15529 15.0732 3.71003V2.58101C15.0732 2.13544 14.7122 1.77441 14.2668 1.77441Z" fill="#595959"/>
<path d="M11.3634 17.5C10.918 17.5 10.5569 17.139 10.5569 16.6935V9.15312C10.5569 8.70771 10.918 8.34668 11.3634 8.34668C11.8088 8.34668 12.1698 8.70771 12.1698 9.15312V16.6935C12.1698 17.139 11.8088 17.5 11.3634 17.5Z" fill="#757575"/>
<path d="M3.94398 17.5C4.38924 17.5 4.75043 17.139 4.75043 16.6935V9.15312C4.75043 8.70771 4.38924 8.34668 3.94398 8.34668C3.49857 8.34668 3.13739 8.70771 3.13739 9.15312V16.6935C3.13739 17.139 3.49857 17.5 3.94398 17.5Z" fill="#757575"/>
<path d="M7.65361 17.5C7.2082 17.5 6.84717 17.139 6.84717 16.6935V9.15312C6.84717 8.70771 7.2082 8.34668 7.65361 8.34668C8.09902 8.34668 8.46005 8.70771 8.46005 9.15312V16.6935C8.46005 17.139 8.09902 17.5 7.65361 17.5Z" fill="#757575"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

39
lib/common/edit_chip.dart Normal file
View File

@ -0,0 +1,39 @@
import 'package:flutter/material.dart';
import 'package:syncrow_web/utils/color_manager.dart';
class EditChip extends StatelessWidget {
final String label;
final VoidCallback onTap;
final Color labelColor;
final Color backgroundColor;
final Color borderColor;
final double borderRadius;
const EditChip({
Key? key,
this.label = 'Edit',
required this.onTap,
this.labelColor = ColorsManager.spaceColor,
this.backgroundColor = ColorsManager.whiteColors,
this.borderColor = ColorsManager.spaceColor,
this.borderRadius = 16.0,
}) : super(key: key);
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: onTap,
child: Chip(
label: Text(
label,
style: TextStyle(color: labelColor),
),
backgroundColor: backgroundColor,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(borderRadius),
side: BorderSide(color: borderColor),
),
),
);
}
}

7
lib/pages/common/buttons/default_button.dart
View File

@ -19,12 +19,14 @@ class DefaultButton extends StatelessWidget {
this.padding, this.padding,
this.borderColor, this.borderColor,
this.elevation, this.elevation,
this.borderWidth = 1.0,
}); });
final void Function()? onPressed; final void Function()? onPressed;
final Widget child; final Widget child;
final double? height; final double? height;
final bool isSecondary; final bool isSecondary;
final double? borderRadius; final double? borderRadius;
final double borderWidth;
final bool enabled; final bool enabled;
final double? padding; final double? padding;
final bool isDone; final bool isDone;
@ -66,7 +68,10 @@ class DefaultButton extends StatelessWidget {
}), }),
shape: WidgetStateProperty.all( shape: WidgetStateProperty.all(
RoundedRectangleBorder( RoundedRectangleBorder(
side: BorderSide(color: borderColor ?? Colors.transparent), side: BorderSide(
color: borderColor ?? Colors.transparent,
width: borderWidth,
),
borderRadius: BorderRadius.circular(borderRadius ?? 20), borderRadius: BorderRadius.circular(borderRadius ?? 20),
), ),
), ),

68
lib/pages/spaces_management/add_device_type/bloc/add_device_model_bloc.dart
View File

@ -1,38 +1,74 @@
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:syncrow_web/pages/spaces_management/add_device_type/bloc/add_device_state.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
import 'package:syncrow_web/pages/spaces_management/add_device_type/bloc/add_device_type_model_event.dart'; import 'package:syncrow_web/pages/spaces_management/add_device_type/bloc/add_device_type_model_event.dart';
class AddDeviceTypeBloc class AddDeviceTypeBloc extends Bloc<AddDeviceTypeEvent, AddDeviceState> {
extends Bloc<AddDeviceTypeEvent, List<SelectedProduct>> { AddDeviceTypeBloc() : super(AddDeviceInitial()) {
AddDeviceTypeBloc(List<SelectedProduct> initialProducts) on<InitializeDevice>(_onInitializeTagModels);
: super(initialProducts) {
on<UpdateProductCountEvent>(_onUpdateProductCount); on<UpdateProductCountEvent>(_onUpdateProductCount);
} }
void _onInitializeTagModels(
InitializeDevice event, Emitter<AddDeviceState> emit) {
emit(AddDeviceLoaded(
selectedProducts: event.addedProducts,
initialTag: event.initialTags,
));
}
void _onUpdateProductCount( void _onUpdateProductCount(
UpdateProductCountEvent event, Emitter<List<SelectedProduct>> emit) { UpdateProductCountEvent event, Emitter<AddDeviceState> emit) {
final existingProduct = state.firstWhere( final currentState = state;
if (currentState is AddDeviceLoaded) {
final existingProduct = currentState.selectedProducts.firstWhere(
(p) => p.productId == event.productId, (p) => p.productId == event.productId,
orElse: () => SelectedProduct(productId: event.productId, count: 0,productName: event.productName,product: event.product ), orElse: () => SelectedProduct(
productId: event.productId,
count: 0,
productName: event.productName,
product: event.product,
),
); );
List<SelectedProduct> updatedProducts;
if (event.count > 0) { if (event.count > 0) {
if (!state.contains(existingProduct)) { if (!currentState.selectedProducts.contains(existingProduct)) {
emit([ updatedProducts = [
...state, ...currentState.selectedProducts,
SelectedProduct(productId: event.productId, count: event.count, productName: event.productName, product: event.product) SelectedProduct(
]); productId: event.productId,
count: event.count,
productName: event.productName,
product: event.product,
),
];
} else { } else {
final updatedList = state.map((p) { updatedProducts = currentState.selectedProducts.map((p) {
if (p.productId == event.productId) { if (p.productId == event.productId) {
return SelectedProduct(productId: p.productId, count: event.count, productName: p.productName,product: p.product); return SelectedProduct(
productId: p.productId,
count: event.count,
productName: p.productName,
product: p.product,
);
} }
return p; return p;
}).toList(); }).toList();
emit(updatedList);
} }
} else { } else {
emit(state.where((p) => p.productId != event.productId).toList()); // Remove the product if the count is 0
updatedProducts = currentState.selectedProducts
.where((p) => p.productId != event.productId)
.toList();
}
// Emit the updated state
emit(AddDeviceLoaded(
selectedProducts: updatedProducts,
initialTag: currentState.initialTag));
} }
} }
} }

36
lib/pages/spaces_management/add_device_type/bloc/add_device_state.dart Normal file
View File

@ -0,0 +1,36 @@
import 'package:equatable/equatable.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
abstract class AddDeviceState extends Equatable {
const AddDeviceState();
@override
List<Object> get props => [];
}
class AddDeviceInitial extends AddDeviceState {}
class AddDeviceLoading extends AddDeviceState {}
class AddDeviceLoaded extends AddDeviceState {
final List<SelectedProduct> selectedProducts;
final List<Tag> initialTag;
const AddDeviceLoaded({
required this.selectedProducts,
required this.initialTag,
});
@override
List<Object> get props => [selectedProducts, initialTag];
}
class AddDeviceError extends AddDeviceState {
final String errorMessage;
const AddDeviceError(this.errorMessage);
@override
List<Object> get props => [errorMessage];
}

24
lib/pages/spaces_management/add_device_type/bloc/add_device_type_model_event.dart
View File

@ -1,7 +1,11 @@
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
abstract class AddDeviceTypeEvent extends Equatable { abstract class AddDeviceTypeEvent extends Equatable {
const AddDeviceTypeEvent();
@override @override
List<Object> get props => []; List<Object> get props => [];
} }
@ -12,8 +16,26 @@ class UpdateProductCountEvent extends AddDeviceTypeEvent {
final String productName; final String productName;
final ProductModel product; final ProductModel product;
UpdateProductCountEvent({required this.productId, required this.count, required this.productName, required this.product}); UpdateProductCountEvent(
{required this.productId,
required this.count,
required this.productName,
required this.product});
@override @override
List<Object> get props => [productId, count]; List<Object> get props => [productId, count];
} }
class InitializeDevice extends AddDeviceTypeEvent {
final List<Tag> initialTags;
final List<SelectedProduct> addedProducts;
const InitializeDevice({
this.initialTags = const [],
required this.addedProducts,
});
@override
List<Object> get props => [initialTags, addedProducts];
}

69
lib/pages/spaces_management/add_device_type/views/add_device_type_widget.dart
View File

@ -1,17 +1,20 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:syncrow_web/pages/common/buttons/cancel_button.dart'; 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/add_device_type/bloc/add_device_model_bloc.dart'; import 'package:syncrow_web/pages/spaces_management/add_device_type/bloc/add_device_model_bloc.dart';
import 'package:syncrow_web/pages/spaces_management/add_device_type/bloc/add_device_state.dart';
import 'package:syncrow_web/pages/spaces_management/add_device_type/bloc/add_device_type_model_event.dart';
import 'package:syncrow_web/pages/spaces_management/add_device_type/widgets/scrollable_grid_view_widget.dart'; import 'package:syncrow_web/pages/spaces_management/add_device_type/widgets/scrollable_grid_view_widget.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/subspace_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/all_spaces/model/tag.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
import 'package:syncrow_web/pages/spaces_management/assign_tag/views/assign_tag_dialog.dart'; import 'package:syncrow_web/pages/spaces_management/assign_tag/views/assign_tag_dialog.dart';
import 'package:syncrow_web/pages/spaces_management/helper/tag_helper.dart';
import 'package:syncrow_web/pages/spaces_management/tag_model/widgets/action_button_widget.dart'; import 'package:syncrow_web/pages/spaces_management/tag_model/widgets/action_button_widget.dart';
import 'package:syncrow_web/utils/color_manager.dart'; import 'package:syncrow_web/utils/color_manager.dart';
class AddDeviceTypeWidget extends StatelessWidget { class AddDeviceTypeWidget extends StatelessWidget {
final List<ProductModel>? products; final List<ProductModel>? products;
final ValueChanged<List<SelectedProduct>>? onProductsSelected; final ValueChanged<List<SelectedProduct>>? onProductsSelected;
@ -20,8 +23,7 @@ class AddDeviceTypeWidget extends StatelessWidget {
final List<Tag>? spaceTags; final List<Tag>? spaceTags;
final List<String>? allTags; final List<String>? allTags;
final String spaceName; final String spaceName;
final Function(List<Tag>,List<SubspaceModel>?)? onSave; final Function(List<Tag>, List<SubspaceModel>?)? onSave;
const AddDeviceTypeWidget( const AddDeviceTypeWidget(
{super.key, {super.key,
@ -44,12 +46,22 @@ class AddDeviceTypeWidget extends StatelessWidget {
: 3; : 3;
return BlocProvider( return BlocProvider(
create: (_) => AddDeviceTypeBloc(initialSelectedProducts ?? []), create: (_) => AddDeviceTypeBloc()
..add(InitializeDevice(
initialTags: spaceTags ?? [],
addedProducts: initialSelectedProducts ?? [],
)),
child: Builder( child: Builder(
builder: (context) => AlertDialog( builder: (context) => AlertDialog(
title: const Text('Add Devices'), title: const Text('Add Devices'),
backgroundColor: ColorsManager.whiteColors, backgroundColor: ColorsManager.whiteColors,
content: SingleChildScrollView( content: BlocBuilder<AddDeviceTypeBloc, AddDeviceState>(
builder: (context, state) {
if (state is AddDeviceLoading) {
return const Center(child: CircularProgressIndicator());
}
if (state is AddDeviceLoaded) {
return SingleChildScrollView(
child: Container( child: Container(
width: size.width * 0.9, width: size.width * 0.9,
height: size.height * 0.65, height: size.height * 0.65,
@ -59,15 +71,20 @@ class AddDeviceTypeWidget extends StatelessWidget {
const SizedBox(height: 16), const SizedBox(height: 16),
Expanded( Expanded(
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 20.0), padding:
const EdgeInsets.symmetric(horizontal: 20.0),
child: ScrollableGridViewWidget( child: ScrollableGridViewWidget(
products: products, crossAxisCount: crossAxisCount), products: products,
crossAxisCount: crossAxisCount),
), ),
), ),
], ],
), ),
), ),
), );
}
return const SizedBox();
}),
actions: [ actions: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -78,20 +95,27 @@ class AddDeviceTypeWidget extends StatelessWidget {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
), ),
ActionButton( SizedBox(
label: 'Continue', width: 140,
child: BlocBuilder<AddDeviceTypeBloc, AddDeviceState>(
builder: (context, state) {
final isDisabled = state is AddDeviceLoaded &&
state.selectedProducts.isEmpty;
return DefaultButton(
borderRadius: 10,
backgroundColor: ColorsManager.secondaryColor, backgroundColor: ColorsManager.secondaryColor,
foregroundColor: ColorsManager.whiteColors, foregroundColor: isDisabled
? ColorsManager.whiteColorsWithOpacity
: ColorsManager.whiteColors,
onPressed: () async { onPressed: () async {
final currentState = if (state is AddDeviceLoaded &&
context.read<AddDeviceTypeBloc>().state; state.selectedProducts.isNotEmpty) {
Navigator.of(context).pop(); final initialTags =
TagHelper.generateInitialForTags(
if (currentState.isNotEmpty) {
final initialTags = generateInitialTags(
spaceTags: spaceTags, spaceTags: spaceTags,
subspaces: subspaces, subspaces: subspaces,
); );
Navigator.of(context).pop();
final dialogTitle = initialTags.isNotEmpty final dialogTitle = initialTags.isNotEmpty
? 'Edit Device' ? 'Edit Device'
@ -102,19 +126,22 @@ class AddDeviceTypeWidget extends StatelessWidget {
builder: (context) => AssignTagDialog( builder: (context) => AssignTagDialog(
products: products, products: products,
subspaces: subspaces, subspaces: subspaces,
addedProducts: currentState, addedProducts: state.selectedProducts,
allTags: allTags, allTags: allTags,
spaceName: spaceName, spaceName: spaceName,
initialTags: initialTags, initialTags: initialTags,
title: dialogTitle, title: dialogTitle,
onSave: (tags,subspaces){ onSave: (tags, subspaces) {
onSave!(tags,subspaces); onSave!(tags, subspaces);
}, },
), ),
); );
} }
}, },
), child: const Text('Next'),
);
},
)),
], ],
), ),
], ],

8
lib/pages/spaces_management/add_device_type/widgets/scrollable_grid_view_widget.dart
View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:syncrow_web/pages/spaces_management/add_device_type/bloc/add_device_model_bloc.dart'; import 'package:syncrow_web/pages/spaces_management/add_device_type/bloc/add_device_model_bloc.dart';
import 'package:syncrow_web/pages/spaces_management/add_device_type/bloc/add_device_state.dart';
import 'package:syncrow_web/pages/spaces_management/add_device_type/widgets/device_type_tile_widget.dart'; import 'package:syncrow_web/pages/spaces_management/add_device_type/widgets/device_type_tile_widget.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
@ -24,8 +25,11 @@ class ScrollableGridViewWidget extends StatelessWidget {
return Scrollbar( return Scrollbar(
controller: scrollController, controller: scrollController,
thumbVisibility: true, thumbVisibility: true,
child: BlocBuilder<AddDeviceTypeBloc, List<SelectedProduct>>( child: BlocBuilder<AddDeviceTypeBloc, AddDeviceState>(
builder: (context, productCounts) { builder: (context, state) {
final productCounts = state is AddDeviceLoaded
? state.selectedProducts
: <SelectedProduct>[];
return GridView.builder( return GridView.builder(
controller: scrollController, controller: scrollController,
shrinkWrap: true, shrinkWrap: true,

26
lib/pages/spaces_management/all_spaces/model/base_tag.dart Normal file
View File

@ -0,0 +1,26 @@
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
import 'package:uuid/uuid.dart';
abstract class BaseTag {
String? uuid;
String? tag;
final ProductModel? product;
String internalId;
String? location;
BaseTag({
this.uuid,
required this.tag,
this.product,
String? internalId,
this.location,
}) : internalId = internalId ?? const Uuid().v4();
Map<String, dynamic> toJson();
BaseTag copyWith({
String? tag,
ProductModel? product,
String? location,
String? internalId,
});
}

31
lib/pages/spaces_management/all_spaces/model/tag.dart
View File

@ -1,22 +1,23 @@
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/base_tag.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
import 'package:syncrow_web/pages/spaces_management/space_model/models/create_space_template_body_model.dart'; import 'package:syncrow_web/pages/spaces_management/space_model/models/create_space_template_body_model.dart';
import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_body_model.dart'; import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_body_model.dart';
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
class Tag { class Tag extends BaseTag {
String? uuid; Tag({
String? tag; String? uuid,
final ProductModel? product; required String? tag,
String internalId; ProductModel? product,
String? location;
Tag(
{this.uuid,
required this.tag,
this.product,
String? internalId, String? internalId,
this.location}) String? location,
: internalId = internalId ?? const Uuid().v4(); }) : super(
uuid: uuid,
tag: tag,
product: product,
internalId: internalId,
location: location,
);
factory Tag.fromJson(Map<String, dynamic> json) { factory Tag.fromJson(Map<String, dynamic> json) {
final String internalId = json['internalId'] ?? const Uuid().v4(); final String internalId = json['internalId'] ?? const Uuid().v4();
@ -31,15 +32,19 @@ class Tag {
); );
} }
@override
Tag copyWith({ Tag copyWith({
String? tag, String? tag,
ProductModel? product, ProductModel? product,
String? location, String? location,
String? internalId,
}) { }) {
return Tag( return Tag(
uuid: uuid,
tag: tag ?? this.tag, tag: tag ?? this.tag,
product: product ?? this.product, product: product ?? this.product,
location: location ?? this.location, location: location ?? this.location,
internalId: internalId ?? this.internalId,
); );
} }

68
lib/pages/spaces_management/all_spaces/widgets/community_structure_header_action_button.dart Normal file
View File

@ -0,0 +1,68 @@
import 'package:flutter/material.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/community_structure_header_button.dart';
import 'package:syncrow_web/utils/color_manager.dart';
import 'package:syncrow_web/utils/constants/assets.dart';
class CommunityStructureHeaderActionButtons extends StatelessWidget {
const CommunityStructureHeaderActionButtons(
{super.key,
required this.theme,
required this.isSave,
required this.onSave,
required this.onDelete,
required this.selectedSpace,
required this.onDuplicate,
required this.onEdit});
final ThemeData theme;
final bool isSave;
final VoidCallback onSave;
final VoidCallback onDelete;
final VoidCallback onDuplicate;
final VoidCallback onEdit;
final SpaceModel? selectedSpace;
@override
Widget build(BuildContext context) {
final canShowActions = selectedSpace != null &&
selectedSpace?.status != SpaceStatus.deleted &&
selectedSpace?.status != SpaceStatus.parentDeleted;
return Wrap(
alignment: WrapAlignment.end,
spacing: 10,
children: [
if (isSave)
CommunityStructureHeaderButton(
label: "Save",
icon: const Icon(Icons.save,
size: 18, color: ColorsManager.spaceColor),
onPressed: onSave,
theme: theme,
),
if (canShowActions) ...[
CommunityStructureHeaderButton(
label: "Edit",
svgAsset: Assets.editSpace,
onPressed: onEdit,
theme: theme,
),
CommunityStructureHeaderButton(
label: "Duplicate",
svgAsset: Assets.duplicate,
onPressed: onDuplicate,
theme: theme,
),
CommunityStructureHeaderButton(
label: "Delete",
svgAsset: Assets.spaceDelete,
onPressed: onDelete,
theme: theme,
),
],
],
);
}
}

65
lib/pages/spaces_management/all_spaces/widgets/community_structure_header_button.dart Normal file
View File

@ -0,0 +1,65 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:syncrow_web/pages/common/buttons/default_button.dart';
import 'package:syncrow_web/utils/color_manager.dart';
class CommunityStructureHeaderButton extends StatelessWidget {
const CommunityStructureHeaderButton({
super.key,
required this.label,
this.icon,
required this.onPressed,
this.svgAsset,
required this.theme,
});
final String label;
final Widget? icon;
final VoidCallback onPressed;
final String? svgAsset;
final ThemeData theme;
@override
Widget build(BuildContext context) {
const double buttonHeight = 40;
return ConstrainedBox(
constraints: const BoxConstraints(
maxWidth: 130,
minHeight: buttonHeight,
),
child: DefaultButton(
onPressed: onPressed,
borderWidth: 2,
backgroundColor: ColorsManager.textFieldGreyColor,
foregroundColor: ColorsManager.blackColor,
borderRadius: 12.0,
padding: 2.0,
height: buttonHeight,
elevation: 0,
borderColor: ColorsManager.lightGrayColor,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
if (icon != null) icon!,
if (svgAsset != null)
SvgPicture.asset(
svgAsset!,
width: 20,
height: 20,
),
const SizedBox(width: 10),
Flexible(
child: Text(
label,
style: theme.textTheme.bodySmall
?.copyWith(color: ColorsManager.blackColor, fontSize: 14),
overflow: TextOverflow.ellipsis,
maxLines: 1,
),
),
],
),
),
);
}
}

79
lib/pages/spaces_management/all_spaces/widgets/community_structure_header_widget.dart
View File

@ -1,8 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:syncrow_web/pages/common/buttons/default_button.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/community_structure_header_action_button.dart';
import 'package:syncrow_web/pages/spaces_management/create_community/view/create_community_dialog.dart'; import 'package:syncrow_web/pages/spaces_management/create_community/view/create_community_dialog.dart';
import 'package:syncrow_web/utils/color_manager.dart'; import 'package:syncrow_web/utils/color_manager.dart';
import 'package:syncrow_web/utils/constants/assets.dart'; import 'package:syncrow_web/utils/constants/assets.dart';
@ -14,6 +14,9 @@ class CommunityStructureHeader extends StatefulWidget {
final TextEditingController nameController; final TextEditingController nameController;
final VoidCallback onSave; final VoidCallback onSave;
final VoidCallback onDelete; final VoidCallback onDelete;
final VoidCallback onEdit;
final VoidCallback onDuplicate;
final VoidCallback onEditName; final VoidCallback onEditName;
final ValueChanged<String> onNameSubmitted; final ValueChanged<String> onNameSubmitted;
final List<CommunityModel> communities; final List<CommunityModel> communities;
@ -32,7 +35,9 @@ class CommunityStructureHeader extends StatefulWidget {
required this.onNameSubmitted, required this.onNameSubmitted,
this.community, this.community,
required this.communities, required this.communities,
this.selectedSpace}); this.selectedSpace,
required this.onDuplicate,
required this.onEdit});
@override @override
State<CommunityStructureHeader> createState() => State<CommunityStructureHeader> createState() =>
@ -141,70 +146,18 @@ class _CommunityStructureHeaderState extends State<CommunityStructureHeader> {
), ),
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
_buildActionButtons(theme), CommunityStructureHeaderActionButtons(
], theme: theme,
), isSave: widget.isSave,
], onSave: widget.onSave,
); onDelete: widget.onDelete,
} onDuplicate: widget.onDuplicate,
onEdit: widget.onEdit,
Widget _buildActionButtons(ThemeData theme) { selectedSpace: widget.selectedSpace,
return Wrap(
alignment: WrapAlignment.end,
spacing: 10,
children: [
if (widget.isSave)
_buildButton(
label: "Save",
icon: const Icon(Icons.save,
size: 18, color: ColorsManager.spaceColor),
onPressed: widget.onSave,
theme: theme),
if(widget.selectedSpace!= null)
_buildButton(
label: "Delete",
icon: const Icon(Icons.delete,
size: 18, color: ColorsManager.warningRed),
onPressed: widget.onDelete,
theme: theme),
],
);
}
Widget _buildButton(
{required String label,
required Widget icon,
required VoidCallback onPressed,
required ThemeData theme}) {
const double buttonHeight = 30;
return ConstrainedBox(
constraints: BoxConstraints(maxWidth: 80, minHeight: buttonHeight),
child: DefaultButton(
onPressed: onPressed,
backgroundColor: ColorsManager.textFieldGreyColor,
foregroundColor: ColorsManager.blackColor,
borderRadius: 8.0,
padding: 2.0,
height: buttonHeight,
elevation: 0,
borderColor: ColorsManager.lightGrayColor,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
icon,
const SizedBox(width: 5),
Flexible(
child: Text(
label,
style: theme.textTheme.bodySmall
?.copyWith(color: ColorsManager.blackColor),
overflow: TextOverflow.ellipsis,
maxLines: 1,
),
), ),
], ],
), ),
), ],
); );
} }
} }

229
lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
View File

@ -4,6 +4,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
// Syncrow project imports // Syncrow project imports
import 'package:syncrow_web/pages/common/buttons/add_space_button.dart'; import 'package:syncrow_web/pages/common/buttons/add_space_button.dart';
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/bloc/space_management_bloc.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/bloc/space_management_event.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
@ -17,6 +19,7 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/blank_com
import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/community_structure_header_widget.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/community_structure_header_widget.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/curved_line_painter.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/curved_line_painter.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/duplicate_process_dialog.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_card_widget.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_card_widget.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_container_widget.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_container_widget.dart';
import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart'; import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
@ -133,6 +136,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
onSave: _saveSpaces, onSave: _saveSpaces,
selectedSpace: widget.selectedSpace, selectedSpace: widget.selectedSpace,
onDelete: _onDelete, onDelete: _onDelete,
onDuplicate: () => {_onDuplicate(context)},
onEdit: () => {_showEditSpaceDialog()},
onEditName: () { onEditName: () {
setState(() { setState(() {
isEditingName = !isEditingName; isEditingName = !isEditingName;
@ -209,9 +214,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
opacity: isHighlighted ? 1.0 : 0.3, opacity: isHighlighted ? 1.0 : 0.3,
child: SpaceContainerWidget( child: SpaceContainerWidget(
index: index, index: index,
onDoubleTap: () {
_showEditSpaceDialog(spaces[index]);
},
onTap: () { onTap: () {
_selectSpace(context, spaces[index]); _selectSpace(context, spaces[index]);
}, },
@ -328,7 +330,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
parentSpace.addOutgoingConnection(newConnection); parentSpace.addOutgoingConnection(newConnection);
parentSpace.children.add(newSpace); parentSpace.children.add(newSpace);
} }
spaces.add(newSpace); spaces.add(newSpace);
_updateNodePosition(newSpace, newSpace.position); _updateNodePosition(newSpace, newSpace.position);
}); });
@ -338,15 +339,17 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
); );
} }
void _showEditSpaceDialog(SpaceModel space) { void _showEditSpaceDialog() {
if (widget.selectedSpace != null) {
showDialog( showDialog(
context: context, context: context,
builder: (BuildContext context) { builder: (BuildContext context) {
return CreateSpaceDialog( return CreateSpaceDialog(
products: widget.products, products: widget.products,
name: space.name, spaceModels: widget.spaceModels,
icon: space.icon, name: widget.selectedSpace!.name,
editSpace: space, icon: widget.selectedSpace!.icon,
editSpace: widget.selectedSpace,
isEdit: true, isEdit: true,
onCreateSpace: (String name, onCreateSpace: (String name,
String icon, String icon,
@ -356,22 +359,24 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
List<Tag>? tags) { List<Tag>? tags) {
setState(() { setState(() {
// Update the space's properties // Update the space's properties
space.name = name; widget.selectedSpace!.name = name;
space.icon = icon; widget.selectedSpace!.icon = icon;
space.spaceModel = spaceModel; widget.selectedSpace!.spaceModel = spaceModel;
space.subspaces = subspaces; widget.selectedSpace!.subspaces = subspaces;
space.tags = tags; widget.selectedSpace!.tags = tags;
if (space.status != SpaceStatus.newSpace) { if (widget.selectedSpace!.status != SpaceStatus.newSpace) {
space.status = SpaceStatus.modified; // Mark as modified widget.selectedSpace!.status =
SpaceStatus.modified; // Mark as modified
} }
}); });
}, },
key: Key(space.name), key: Key(widget.selectedSpace!.name),
); );
}, },
); );
} }
}
void _handleHoverChanged(int index, bool isHovered) { void _handleHoverChanged(int index, bool isHovered) {
setState(() { setState(() {
@ -545,4 +550,196 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
space.status == SpaceStatus.modified || space.status == SpaceStatus.modified ||
space.status == SpaceStatus.deleted); space.status == SpaceStatus.deleted);
} }
void _onDuplicate(BuildContext parentContext) {
final screenWidth = MediaQuery.of(context).size.width;
if (widget.selectedSpace != null) {
showDialog(
context: context,
builder: (BuildContext context) {
return AlertDialog(
backgroundColor: ColorsManager.whiteColors,
title: Text(
"Duplicate Space",
textAlign: TextAlign.center,
style: Theme.of(context)
.textTheme
.headlineLarge
?.copyWith(color: ColorsManager.blackColor),
),
content: SizedBox(
width: screenWidth * 0.4,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text("Are you sure you want to duplicate?",
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.headlineSmall),
const SizedBox(height: 15),
Text("All the child spaces will be duplicated.",
textAlign: TextAlign.center,
style: Theme.of(context)
.textTheme
.bodyMedium
?.copyWith(color: ColorsManager.lightGrayColor)),
const SizedBox(width: 15),
],
),
),
actions: [
Row(mainAxisAlignment: MainAxisAlignment.center, children: [
SizedBox(
width: 200,
child: CancelButton(
onPressed: () {
Navigator.of(context).pop();
},
label: "Cancel",
),
),
const SizedBox(width: 10),
SizedBox(
width: 200,
child: DefaultButton(
onPressed: () {
Navigator.of(context).pop();
showDialog(
context: context,
barrierDismissible: false,
builder: (BuildContext context) {
return DuplicateProcessDialog(
onDuplicate: () {
_duplicateSpace(widget.selectedSpace!);
_deselectSpace(parentContext);
},
);
},
);
},
backgroundColor: ColorsManager.secondaryColor,
borderRadius: 10,
foregroundColor: ColorsManager.whiteColors,
child: const Text('OK'),
),
),
])
],
);
},
);
}
}
void _duplicateSpace(SpaceModel space) {
final Map<SpaceModel, SpaceModel> originalToDuplicate = {};
const double horizontalGap = 200.0;
const double verticalGap = 100.0;
final Map<String, int> nameCounters = {};
String _generateCopyName(String originalName) {
final baseName = originalName.replaceAll(RegExp(r'\(\d+\)$'), '').trim();
nameCounters[baseName] = (nameCounters[baseName] ?? 0) + 1;
return "$baseName(${nameCounters[baseName]})";
}
SpaceModel duplicateRecursive(SpaceModel original, Offset parentPosition,
SpaceModel? duplicatedParent) {
Offset newPosition = parentPosition + Offset(horizontalGap, 0);
while (spaces.any((s) =>
(s.position - newPosition).distance < horizontalGap &&
s.status != SpaceStatus.deleted)) {
newPosition += Offset(horizontalGap, 0);
}
final duplicatedName = _generateCopyName(original.name);
final duplicated = SpaceModel(
name: duplicatedName,
icon: original.icon,
position: newPosition,
isPrivate: original.isPrivate,
children: [],
status: SpaceStatus.newSpace,
parent: duplicatedParent,
spaceModel: original.spaceModel,
subspaces: original.subspaces,
tags: original.tags,
);
originalToDuplicate[original] = duplicated;
setState(() {
spaces.add(duplicated);
_updateNodePosition(duplicated, duplicated.position);
if (duplicatedParent != null) {
final newConnection = Connection(
startSpace: duplicatedParent,
endSpace: duplicated,
direction: "down",
);
connections.add(newConnection);
duplicated.incomingConnection = newConnection;
duplicatedParent.addOutgoingConnection(newConnection);
}
if (original.parent != null && duplicatedParent == null) {
final originalParent = original.parent!;
final duplicatedParent =
originalToDuplicate[originalParent] ?? originalParent;
final parentConnection = Connection(
startSpace: duplicatedParent,
endSpace: duplicated,
direction: original.incomingConnection?.direction ?? "down",
);
connections.add(parentConnection);
duplicated.incomingConnection = parentConnection;
duplicatedParent.addOutgoingConnection(parentConnection);
}
});
final childrenWithDownDirection = original.children
.where((child) =>
child.incomingConnection?.direction == "down" &&
child.status != SpaceStatus.deleted)
.toList();
Offset childStartPosition = childrenWithDownDirection.length == 1
? duplicated.position
: newPosition + Offset(0, verticalGap);
for (final child in original.children) {
final isDownDirection =
child.incomingConnection?.direction == "down" ?? false;
if (isDownDirection && childrenWithDownDirection.length == 1) {
// Place the only "down" child vertically aligned with the parent
childStartPosition = duplicated.position + Offset(0, verticalGap);
} else if (!isDownDirection) {
// Position children with other directions horizontally
childStartPosition = duplicated.position + Offset(horizontalGap, 0);
}
final duplicatedChild =
duplicateRecursive(child, childStartPosition, duplicated);
duplicated.children.add(duplicatedChild);
childStartPosition += Offset(0, verticalGap);
}
return duplicated;
}
if (space.parent == null) {
duplicateRecursive(space, space.position, null);
} else {
final duplicatedParent =
originalToDuplicate[space.parent!] ?? space.parent!;
duplicateRecursive(space, space.position, duplicatedParent);
}
}
} }

306
lib/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:syncrow_web/common/edit_chip.dart';
import 'package:syncrow_web/pages/common/buttons/cancel_button.dart'; 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/common/buttons/default_button.dart';
import 'package:syncrow_web/pages/spaces_management/add_device_type/views/add_device_type_widget.dart'; import 'package:syncrow_web/pages/spaces_management/add_device_type/views/add_device_type_widget.dart';
@ -9,16 +10,25 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/subspace_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/all_spaces/model/tag.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/icon_selection_dialog.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/icon_selection_dialog.dart';
import 'package:syncrow_web/pages/spaces_management/assign_tag/views/assign_tag_dialog.dart';
import 'package:syncrow_web/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart'; import 'package:syncrow_web/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart';
import 'package:syncrow_web/pages/spaces_management/helper/tag_helper.dart';
import 'package:syncrow_web/pages/spaces_management/link_space_model/view/link_space_model_dialog.dart'; import 'package:syncrow_web/pages/spaces_management/link_space_model/view/link_space_model_dialog.dart';
import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart'; import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
import 'package:syncrow_web/pages/spaces_management/space_model/widgets/button_content_widget.dart';
import 'package:syncrow_web/pages/spaces_management/space_model/widgets/subspace_name_label_widget.dart';
import 'package:syncrow_web/utils/color_manager.dart'; import 'package:syncrow_web/utils/color_manager.dart';
import 'package:syncrow_web/utils/constants/assets.dart'; import 'package:syncrow_web/utils/constants/assets.dart';
import 'package:syncrow_web/utils/constants/space_icon_const.dart'; import 'package:syncrow_web/utils/constants/space_icon_const.dart';
class CreateSpaceDialog extends StatefulWidget { class CreateSpaceDialog extends StatefulWidget {
final Function(String, String, List<SelectedProduct> selectedProducts, final Function(
SpaceTemplateModel? spaceModel, List<SubspaceModel>? subspaces, List<Tag>? tags) onCreateSpace; String,
String,
List<SelectedProduct> selectedProducts,
SpaceTemplateModel? spaceModel,
List<SubspaceModel>? subspaces,
List<Tag>? tags) onCreateSpace;
final List<ProductModel>? products; final List<ProductModel>? products;
final String? name; final String? name;
final String? icon; final String? icon;
@ -211,42 +221,13 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
selectedSpaceModel == null selectedSpaceModel == null
? DefaultButton( ? TextButton(
onPressed: () { onPressed: () {
_showLinkSpaceModelDialog(context); _showLinkSpaceModelDialog(context);
}, },
backgroundColor: ColorsManager.textFieldGreyColor, child: const ButtonContentWidget(
foregroundColor: Colors.black, svgAssets: Assets.link,
borderColor: ColorsManager.neutralGray, label: 'Link a space model',
borderRadius: 16.0,
padding: 10.0, // Reduced padding for smaller size
child: Align(
alignment: Alignment.centerLeft,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Padding(
padding: const EdgeInsets.only(left: 6.0),
child: SvgPicture.asset(
Assets.link,
width: screenWidth *
0.015, // Adjust icon size
height: screenWidth * 0.015,
),
),
const SizedBox(width: 3),
Flexible(
child: Text(
'Link a space model',
overflow: TextOverflow
.ellipsis, // Prevent overflow
style: Theme.of(context)
.textTheme
.bodyMedium,
),
),
],
),
), ),
) )
: Container( : Container(
@ -307,7 +288,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
), ),
), ),
Padding( Padding(
padding: EdgeInsets.symmetric(horizontal: 8.0), padding: EdgeInsets.symmetric(horizontal: 6.0),
child: Text( child: Text(
'OR', 'OR',
style: TextStyle( style: TextStyle(
@ -326,47 +307,21 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
), ),
const SizedBox(height: 25), const SizedBox(height: 25),
subspaces == null subspaces == null
? DefaultButton( ? TextButton(
onPressed: () { style: TextButton.styleFrom(
overlayColor: ColorsManager.transparentColor,
),
onPressed: () async {
_showSubSpaceDialog(context, enteredName, [], _showSubSpaceDialog(context, enteredName, [],
false, widget.products, subspaces); false, widget.products, subspaces);
}, },
backgroundColor: ColorsManager.textFieldGreyColor, child: const ButtonContentWidget(
foregroundColor: Colors.black, icon: Icons.add,
borderColor: ColorsManager.neutralGray, label: 'Create Sub Space',
borderRadius: 16.0,
padding: 10.0, // Reduced padding for smaller size
child: Align(
alignment: Alignment.centerLeft,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Padding(
padding: const EdgeInsets.only(left: 6.0),
child: SvgPicture.asset(
Assets.addIcon,
width: screenWidth *
0.015, // Adjust icon size
height: screenWidth * 0.015,
),
),
const SizedBox(width: 3),
Flexible(
child: Text(
'Create sub space',
overflow: TextOverflow
.ellipsis, // Prevent overflow
style: Theme.of(context)
.textTheme
.bodyMedium,
),
),
],
),
), ),
) )
: SizedBox( : SizedBox(
width: screenWidth * 0.35, width: screenWidth * 0.25,
child: Container( child: Container(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
decoration: BoxDecoration( decoration: BoxDecoration(
@ -383,49 +338,15 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
children: [ children: [
if (subspaces != null) if (subspaces != null)
...subspaces!.map( ...subspaces!.map(
(subspace) => Chip( (subspace) => SubspaceNameDisplayWidget(
label: Text( text: subspace.subspaceName,
subspace.subspaceName, )),
style: const TextStyle( EditChip(
color: ColorsManager
.spaceColor), // Text color
),
backgroundColor: ColorsManager
.whiteColors, // Chip background color
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(
16), // Rounded chip
side: const BorderSide(
color: ColorsManager
.spaceColor), // Border color
),
),
),
GestureDetector(
onTap: () async { onTap: () async {
_showSubSpaceDialog( _showSubSpaceDialog(context, enteredName,
context, [], true, widget.products, subspaces);
enteredName,
[],
false,
widget.products,
subspaces);
}, },
child: Chip( )
label: const Text(
'Edit',
style: TextStyle(
color: ColorsManager.spaceColor),
),
backgroundColor:
ColorsManager.whiteColors,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(16),
side: const BorderSide(
color: ColorsManager.spaceColor),
),
),
),
], ],
), ),
), ),
@ -452,7 +373,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
runSpacing: 8.0, runSpacing: 8.0,
children: [ children: [
// Combine tags from spaceModel and subspaces // Combine tags from spaceModel and subspaces
..._groupTags([ ...TagHelper.groupTags([
...?tags, ...?tags,
...?subspaces?.expand( ...?subspaces?.expand(
(subspace) => subspace.tags ?? []) (subspace) => subspace.tags ?? [])
@ -484,70 +405,38 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
), ),
), ),
), ),
GestureDetector(
onTap: () async { EditChip(onTap: () async {
_showTagCreateDialog(context, enteredName, _showTagCreateDialog(
widget.products); context,
enteredName,
widget.isEdit,
widget.products,
subspaces,
);
// Edit action // Edit action
}, })
child: Chip(
label: const Text(
'Edit',
style: TextStyle(
color: ColorsManager.spaceColor),
),
backgroundColor:
ColorsManager.whiteColors,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(16),
side: const BorderSide(
color: ColorsManager.spaceColor),
),
),
),
], ],
), ),
), ),
) )
: DefaultButton( : TextButton(
onPressed: () { onPressed: () {
_showTagCreateDialog( _showTagCreateDialog(
context, enteredName, widget.products); context,
enteredName,
widget.isEdit,
widget.products,
subspaces,
);
}, },
backgroundColor: ColorsManager.textFieldGreyColor, style: TextButton.styleFrom(
foregroundColor: Colors.black, padding: EdgeInsets.zero,
borderColor: ColorsManager.neutralGray,
borderRadius: 16.0,
padding: 10.0, // Reduced padding for smaller size
child: Align(
alignment: Alignment.centerLeft,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Padding(
padding: const EdgeInsets.only(left: 6.0),
child: SvgPicture.asset(
Assets.addIcon,
width: screenWidth *
0.015, // Adjust icon size
height: screenWidth * 0.015,
), ),
), child: const ButtonContentWidget(
const SizedBox(width: 3), icon: Icons.add,
Flexible( label: 'Add Devices',
child: Text( ))
'Add devices',
overflow: TextOverflow
.ellipsis, // Prevent overflow
style: Theme.of(context)
.textTheme
.bodyMedium,
),
),
],
),
),
)
], ],
), ),
), ),
@ -579,8 +468,13 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
? enteredName ? enteredName
: (widget.name ?? ''); : (widget.name ?? '');
if (newName.isNotEmpty) { if (newName.isNotEmpty) {
widget.onCreateSpace(newName, selectedIcon, widget.onCreateSpace(
selectedProducts, selectedSpaceModel,subspaces,tags); newName,
selectedIcon,
selectedProducts,
selectedSpaceModel,
subspaces,
tags);
Navigator.of(context).pop(); Navigator.of(context).pop();
} }
} }
@ -655,7 +549,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
builder: (BuildContext context) { builder: (BuildContext context) {
return CreateSubSpaceDialog( return CreateSubSpaceDialog(
spaceName: name, spaceName: name,
dialogTitle: 'Create Sub-space', dialogTitle: isEdit ? 'Edit Sub-space' : 'Create Sub-space',
spaceTags: spaceTags, spaceTags: spaceTags,
isEdit: isEdit, isEdit: isEdit,
products: products, products: products,
@ -672,9 +566,25 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
); );
} }
void _showTagCreateDialog( void _showTagCreateDialog(BuildContext context, String name, bool isEdit,
BuildContext context, String name, List<ProductModel>? products) { List<ProductModel>? products, List<SubspaceModel>? subspaces) {
showDialog( isEdit
? showDialog(
context: context,
builder: (BuildContext context) {
return AssignTagDialog(
title: 'Edit Device',
addedProducts: TagHelper.createInitialSelectedProductsForTags(
tags, subspaces),
spaceName: name,
products: products,
subspaces: subspaces,
allTags: [],
onSave: (selectedSpaceTags, selectedSubspaces) {},
);
},
)
: showDialog(
context: context, context: context,
builder: (BuildContext context) { builder: (BuildContext context) {
return AddDeviceTypeWidget( return AddDeviceTypeWidget(
@ -684,7 +594,8 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
spaceTags: tags, spaceTags: tags,
allTags: [], allTags: [],
initialSelectedProducts: initialSelectedProducts:
createInitialSelectedProducts(tags, subspaces), TagHelper.createInitialSelectedProductsForTags(
tags, subspaces),
onSave: (selectedSpaceTags, selectedSubspaces) { onSave: (selectedSpaceTags, selectedSubspaces) {
setState(() { setState(() {
tags = selectedSpaceTags; tags = selectedSpaceTags;
@ -708,49 +619,4 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
}, },
); );
} }
List<SelectedProduct> createInitialSelectedProducts(
List<Tag>? tags, List<SubspaceModel>? subspaces) {
final Map<ProductModel, int> productCounts = {};
if (tags != null) {
for (var tag in tags) {
if (tag.product != null) {
productCounts[tag.product!] = (productCounts[tag.product!] ?? 0) + 1;
}
}
}
if (subspaces != null) {
for (var subspace in subspaces) {
if (subspace.tags != null) {
for (var tag in subspace.tags!) {
if (tag.product != null) {
productCounts[tag.product!] =
(productCounts[tag.product!] ?? 0) + 1;
}
}
}
}
}
return productCounts.entries
.map((entry) => SelectedProduct(
productId: entry.key.uuid,
count: entry.value,
productName: entry.key.name ?? 'Unnamed',
product: entry.key,
))
.toList();
}
Map<ProductModel, int> _groupTags(List<Tag> tags) {
final Map<ProductModel, int> groupedTags = {};
for (var tag in tags) {
if (tag.product != null) {
groupedTags[tag.product!] = (groupedTags[tag.product!] ?? 0) + 1;
}
}
return groupedTags;
}
} }

86
lib/pages/spaces_management/all_spaces/widgets/dialogs/duplicate_process_dialog.dart Normal file
View File

@ -0,0 +1,86 @@
import 'package:flutter/material.dart';
import 'package:syncrow_web/utils/color_manager.dart';
class DuplicateProcessDialog extends StatefulWidget {
final VoidCallback onDuplicate;
const DuplicateProcessDialog({required this.onDuplicate, Key? key})
: super(key: key);
@override
_DuplicateProcessDialogState createState() => _DuplicateProcessDialogState();
}
class _DuplicateProcessDialogState extends State<DuplicateProcessDialog> {
bool isDuplicating = true;
@override
void initState() {
super.initState();
_startDuplication();
}
void _startDuplication() async {
WidgetsBinding.instance.addPostFrameCallback((_) {
widget.onDuplicate();
});
await Future.delayed(const Duration(seconds: 2));
setState(() {
isDuplicating = false;
});
await Future.delayed(const Duration(seconds: 2));
if (mounted) {
Navigator.of(context).pop();
}
}
@override
Widget build(BuildContext context) {
final screenWidth = MediaQuery.of(context).size.width;
return AlertDialog(
backgroundColor: Colors.white,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20),
),
content: SizedBox(
width: screenWidth * 0.4,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
if (isDuplicating) ...[
const CircularProgressIndicator(
color: ColorsManager.vividBlue,
),
const SizedBox(height: 15),
Text(
"Duplicating in progress",
style: Theme.of(context)
.textTheme
.headlineSmall
?.copyWith(color: ColorsManager.primaryColor),
textAlign: TextAlign.center,
),
] else ...[
const Icon(
Icons.check_circle,
color: ColorsManager.vividBlue,
size: 50,
),
const SizedBox(height: 15),
Text(
"Duplicating successful",
textAlign: TextAlign.center,
style: Theme.of(context)
.textTheme
.headlineSmall
?.copyWith(color: ColorsManager.primaryColor),
),
],
],
),
),
);
}
}

4
lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
View File

@ -199,9 +199,11 @@ class _SidebarWidgetState extends State<SidebarWidget> {
}, },
children: hasChildren children: hasChildren
? community.spaces ? community.spaces
.where((space) => (space.status != SpaceStatus.deleted ||
space.status != SpaceStatus.parentDeleted))
.map((space) => _buildSpaceTile(space, community)) .map((space) => _buildSpaceTile(space, community))
.toList() .toList()
: null, // Render spaces within the community : null,
); );
} }

8
lib/pages/spaces_management/assign_tag/bloc/assign_tag_bloc.dart
View File

@ -48,7 +48,7 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
emit(AssignTagLoaded( emit(AssignTagLoaded(
tags: allTags, tags: allTags,
isSaveEnabled: _validateTags(allTags), isSaveEnabled: _validateTags(allTags),
)); errorMessage: ''));
}); });
on<UpdateTagEvent>((event, emit) { on<UpdateTagEvent>((event, emit) {
@ -117,12 +117,10 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
} }
bool _validateTags(List<Tag> tags) { bool _validateTags(List<Tag> tags) {
if (tags.isEmpty) {
return false;
}
final uniqueTags = tags.map((tag) => tag.tag?.trim() ?? '').toSet(); final uniqueTags = tags.map((tag) => tag.tag?.trim() ?? '').toSet();
final hasEmptyTag = tags.any((tag) => (tag.tag?.trim() ?? '').isEmpty); final hasEmptyTag = tags.any((tag) => (tag.tag?.trim() ?? '').isEmpty);
return uniqueTags.length == tags.length && !hasEmptyTag; final isValid = uniqueTags.length == tags.length && !hasEmptyTag;
return isValid;
} }
String? _getValidationError(List<Tag> tags) { String? _getValidationError(List<Tag> tags) {

326
lib/pages/spaces_management/assign_tag/views/assign_tag_dialog.dart
View File

@ -1,7 +1,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:syncrow_web/common/dialog_dropdown.dart';
import 'package:syncrow_web/common/dialog_textfield_dropdown.dart';
import 'package:syncrow_web/pages/common/buttons/cancel_button.dart'; 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/common/buttons/default_button.dart';
import 'package:syncrow_web/pages/spaces_management/add_device_type/views/add_device_type_widget.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_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/subspace_model.dart';
@ -79,6 +82,7 @@ class AssignTagDialog extends StatelessWidget {
style: style:
Theme.of(context).textTheme.bodyMedium)), Theme.of(context).textTheme.bodyMedium)),
DataColumn( DataColumn(
numeric: false,
label: Text('Tag', label: Text('Tag',
style: style:
Theme.of(context).textTheme.bodyMedium)), Theme.of(context).textTheme.bodyMedium)),
@ -109,10 +113,11 @@ class AssignTagDialog extends StatelessWidget {
: List.generate(state.tags.length, (index) { : List.generate(state.tags.length, (index) {
final tag = state.tags[index]; final tag = state.tags[index];
final controller = controllers[index]; final controller = controllers[index];
final availableTags = getAvailableTags(
allTags ?? [], state.tags, tag);
return DataRow( return DataRow(
cells: [ cells: [
DataCell(Text(index.toString())), DataCell(Text((index + 1).toString())),
DataCell( DataCell(
Row( Row(
mainAxisAlignment: mainAxisAlignment:
@ -123,28 +128,53 @@ class AssignTagDialog extends StatelessWidget {
tag.product?.name ?? 'Unknown', tag.product?.name ?? 'Unknown',
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
)), )),
IconButton( const SizedBox(width: 10),
icon: const Icon(Icons.close, Container(
color: ColorsManager.warningRed, width: 20.0,
size: 16), height: 20.0,
decoration: BoxDecoration(
shape: BoxShape.circle,
border: Border.all(
color: ColorsManager
.lightGrayColor,
width: 1.0,
),
),
child: IconButton(
icon: const Icon(
Icons.close,
color: ColorsManager
.lightGreyColor,
size: 16,
),
onPressed: () { onPressed: () {
context.read<AssignTagBloc>().add( context
DeleteTag( .read<AssignTagBloc>()
.add(DeleteTag(
tagToDelete: tag, tagToDelete: tag,
tags: state.tags)); tags: state.tags));
}, },
tooltip: 'Delete Tag', tooltip: 'Delete Tag',
) padding: EdgeInsets.zero,
constraints:
const BoxConstraints(),
),
),
], ],
), ),
), ),
DataCell( DataCell(
Row( Container(
children: [ alignment: Alignment
Expanded( .centerLeft, // Align cell content to the left
child: TextFormField( child: SizedBox(
controller: controller, width: double
onChanged: (value) { .infinity, // Ensure full width for dropdown
child: DialogTextfieldDropdown(
items: availableTags,
initialValue: tag.tag,
onSelected: (value) {
controller.text = value;
context context
.read<AssignTagBloc>() .read<AssignTagBloc>()
.add(UpdateTagEvent( .add(UpdateTagEvent(
@ -152,118 +182,26 @@ class AssignTagDialog extends StatelessWidget {
tag: value.trim(), tag: value.trim(),
)); ));
}, },
decoration: const InputDecoration(
hintText: 'Enter Tag',
border: InputBorder.none,
),
style: const TextStyle(
fontSize: 14,
color: ColorsManager.blackColor,
), ),
), ),
), ),
SizedBox(
width: MediaQuery.of(context)
.size
.width *
0.15,
child: PopupMenuButton<String>(
color: ColorsManager.whiteColors,
icon: const Icon(
Icons.arrow_drop_down,
color:
ColorsManager.blackColor),
onSelected: (value) {
controller.text = value;
context
.read<AssignTagBloc>()
.add(UpdateTagEvent(
index: index,
tag: value,
));
},
itemBuilder: (context) {
return (allTags ?? [])
.where((tagValue) => !state
.tags
.map((e) => e.tag)
.contains(tagValue))
.map((tagValue) {
return PopupMenuItem<String>(
textStyle: const TextStyle(
color: ColorsManager
.textPrimaryColor),
value: tagValue,
child: ConstrainedBox(
constraints:
BoxConstraints(
minWidth: MediaQuery.of(
context)
.size
.width *
0.15,
maxWidth: MediaQuery.of(
context)
.size
.width *
0.15,
),
child: Text(
tagValue,
overflow: TextOverflow
.ellipsis,
),
));
}).toList();
},
),
),
],
),
), ),
DataCell( DataCell(
DropdownButtonHideUnderline( SizedBox(
child: DropdownButton<String>( width: double.infinity,
value: tag.location ?? 'Main', child: DialogDropdown(
dropdownColor: ColorsManager items: locations,
.whiteColors, // Dropdown background selectedValue:
style: const TextStyle( tag.location ?? 'Main Space',
color: Colors onSelected: (value) {
.black), // Style for selected text
items: [
const DropdownMenuItem<String>(
value: 'Main Space',
child: Text(
'Main Space',
style: TextStyle(
color: ColorsManager
.textPrimaryColor),
),
),
...locations.map((location) {
return DropdownMenuItem<String>(
value: location,
child: Text(
location,
style: const TextStyle(
color: ColorsManager
.textPrimaryColor),
),
);
}).toList(),
],
onChanged: (value) {
if (value != null) {
context context
.read<AssignTagBloc>() .read<AssignTagBloc>()
.add(UpdateLocation( .add(UpdateLocation(
index: index, index: index,
location: value, location: value,
)); ));
}
}, },
), )),
),
), ),
], ],
); );
@ -284,13 +222,35 @@ class AssignTagDialog extends StatelessWidget {
children: [ children: [
const SizedBox(width: 10), const SizedBox(width: 10),
Expanded( Expanded(
child: CancelButton( child: Builder(
label: 'Cancel', builder: (buttonContext) => CancelButton(
label: 'Add New Device',
onPressed: () async { onPressed: () async {
final updatedTags = List<Tag>.from(state.tags);
final result = processTags(updatedTags, subspaces);
final processedTags =
result['updatedTags'] as List<Tag>;
final processedSubspaces = result['subspaces'];
Navigator.of(context).pop(); Navigator.of(context).pop();
await showDialog<bool>(
barrierDismissible: false,
context: context,
builder: (dialogContext) => AddDeviceTypeWidget(
products: products,
subspaces: processedSubspaces,
initialSelectedProducts: addedProducts,
allTags: allTags,
spaceName: spaceName,
spaceTags: processedTags,
),
);
}, },
), ),
), ),
),
const SizedBox(width: 10), const SizedBox(width: 10),
Expanded( Expanded(
child: DefaultButton( child: DefaultButton(
@ -302,22 +262,16 @@ class AssignTagDialog extends StatelessWidget {
onPressed: state.isSaveEnabled onPressed: state.isSaveEnabled
? () async { ? () async {
Navigator.of(context).pop(); Navigator.of(context).pop();
final assignedTags = <Tag>{}; final updatedTags = List<Tag>.from(state.tags);
for (var tag in state.tags) { final result =
if (tag.location == null || processTags(updatedTags, subspaces);
subspaces == null) {
continue; final processedTags =
} result['updatedTags'] as List<Tag>;
for (var subspace in subspaces!) { final processedSubspaces =
if (tag.location == subspace.subspaceName) { result['subspaces'] as List<SubspaceModel>;
subspace.tags ??= [];
subspace.tags!.add(tag); onSave!(processedTags, processedSubspaces);
assignedTags.add(tag);
break;
}
}
}
onSave!(state.tags,subspaces);
} }
: null, : null,
child: const Text('Save'), child: const Text('Save'),
@ -337,4 +291,110 @@ class AssignTagDialog extends StatelessWidget {
), ),
); );
} }
List<String> getAvailableTags(
List<String> allTags, List<Tag> currentTags, Tag currentTag) {
return allTags
.where((tagValue) => !currentTags
.where((e) => e != currentTag) // Exclude the current row
.map((e) => e.tag)
.contains(tagValue))
.toList();
}
Map<String, dynamic> processTags(
List<Tag> updatedTags, List<SubspaceModel>? subspaces) {
final modifiedTags = List<Tag>.from(updatedTags);
final modifiedSubspaces = List<SubspaceModel>.from(subspaces ?? []);
for (var tag in modifiedTags.toList()) {
if (modifiedSubspaces.isEmpty) continue;
final prevIndice = checkTagExistInSubspace(tag, modifiedSubspaces);
if ((tag.location == 'Main Space' || tag.location == null) &&
(prevIndice == null ||
modifiedSubspaces[prevIndice].subspaceName == 'Main Space')) {
continue;
}
if ((tag.location == 'Main Space' || tag.location == null) &&
prevIndice != null) {
modifiedSubspaces[prevIndice]
.tags
?.removeWhere((t) => t.internalId == tag.internalId);
continue;
}
if ((tag.location != 'Main Space' && tag.location != null) &&
prevIndice == null) {
final newIndex = modifiedSubspaces
.indexWhere((subspace) => subspace.subspaceName == tag.location);
if (newIndex != -1) {
if (modifiedSubspaces[newIndex]
.tags
?.any((t) => t.internalId == tag.internalId) !=
true) {
tag.location = modifiedSubspaces[newIndex].subspaceName;
modifiedSubspaces[newIndex].tags?.add(tag);
}
}
modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
continue;
}
if ((tag.location != 'Main Space' && tag.location != null) &&
tag.location != modifiedSubspaces[prevIndice!].subspaceName) {
modifiedSubspaces[prevIndice]
.tags
?.removeWhere((t) => t.internalId == tag.internalId);
final newIndex = modifiedSubspaces
.indexWhere((subspace) => subspace.subspaceName == tag.location);
if (newIndex != -1) {
if (modifiedSubspaces[newIndex]
.tags
?.any((t) => t.internalId == tag.internalId) !=
true) {
tag.location = modifiedSubspaces[newIndex].subspaceName;
modifiedSubspaces[newIndex].tags?.add(tag);
}
}
modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
continue;
}
if ((tag.location != 'Main Space' && tag.location != null) &&
tag.location == modifiedSubspaces[prevIndice!].subspaceName) {
modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
continue;
}
if ((tag.location == 'Main Space' || tag.location == null) &&
prevIndice != null) {
modifiedSubspaces[prevIndice]
.tags
?.removeWhere((t) => t.internalId == tag.internalId);
}
}
return {
'updatedTags': modifiedTags,
'subspaces': modifiedSubspaces,
};
}
int? checkTagExistInSubspace(Tag tag, List<SubspaceModel>? subspaces) {
if (subspaces == null) return null;
for (int i = 0; i < subspaces.length; i++) {
final subspace = subspaces[i];
if (subspace.tags == null) continue;
for (var t in subspace.tags!) {
if (tag.internalId == t.internalId) {
return i;
}
}
}
return null;
}
} }

203
lib/pages/spaces_management/assign_tag_models/views/assign_tag_models_dialog.dart
View File

@ -29,6 +29,7 @@ class AssignTagModelsDialog extends StatelessWidget {
final String title; final String title;
final BuildContext? pageContext; final BuildContext? pageContext;
final List<String>? otherSpaceModels; final List<String>? otherSpaceModels;
final List<SpaceTemplateModel>? allSpaceModels;
const AssignTagModelsDialog( const AssignTagModelsDialog(
{Key? key, {Key? key,
@ -42,7 +43,8 @@ class AssignTagModelsDialog extends StatelessWidget {
required this.title, required this.title,
this.pageContext, this.pageContext,
this.otherSpaceModels, this.otherSpaceModels,
this.spaceModel}) this.spaceModel,
this.allSpaceModels})
: super(key: key); : super(key: key);
@override @override
@ -211,8 +213,8 @@ class AssignTagModelsDialog extends StatelessWidget {
width: double.infinity, width: double.infinity,
child: DialogDropdown( child: DialogDropdown(
items: locations, items: locations,
selectedValue: selectedValue: tag.location ??
tag.location ?? 'Main Space', 'Main Space',
onSelected: (value) { onSelected: (value) {
context context
.read< .read<
@ -248,33 +250,15 @@ class AssignTagModelsDialog extends StatelessWidget {
builder: (buttonContext) => CancelButton( builder: (buttonContext) => CancelButton(
label: 'Add New Device', label: 'Add New Device',
onPressed: () async { onPressed: () async {
for (var tag in state.tags) { final updatedTags =
if (tag.location == null || List<TagModel>.from(state.tags);
subspaces == null) { final result =
continue; processTags(updatedTags, subspaces);
}
final previousTagSubspace = final processedTags =
checkTagExistInSubspace( result['updatedTags'] as List<TagModel>;
tag, subspaces ?? []); final processedSubspaces = result['subspaces'];
if (tag.location == 'Main Space') {
removeTagFromSubspace(
tag, previousTagSubspace);
} else if (tag.location !=
previousTagSubspace?.subspaceName) {
removeTagFromSubspace(
tag, previousTagSubspace);
moveToNewSubspace(tag, subspaces ?? []);
state.tags.removeWhere(
(t) => t.internalId == tag.internalId);
} else {
updateTagInSubspace(
tag, previousTagSubspace);
state.tags.removeWhere(
(t) => t.internalId == tag.internalId);
}
}
if (context.mounted) { if (context.mounted) {
Navigator.of(context).pop(); Navigator.of(context).pop();
@ -291,15 +275,16 @@ class AssignTagModelsDialog extends StatelessWidget {
allTags: allTags, allTags: allTags,
spaceName: spaceName, spaceName: spaceName,
otherSpaceModels: otherSpaceModels, otherSpaceModels: otherSpaceModels,
spaceTagModels: state.tags, spaceTagModels: processedTags,
pageContext: pageContext, pageContext: pageContext,
spaceModel: SpaceTemplateModel( spaceModel: SpaceTemplateModel(
modelName: spaceName, modelName: spaceName,
tags: state.tags, tags: updatedTags,
uuid: spaceModel?.uuid, uuid: spaceModel?.uuid,
internalId: internalId:
spaceModel?.internalId, spaceModel?.internalId,
subspaceModels: subspaces)), subspaceModels:
processedSubspaces)),
); );
} }
}, },
@ -316,33 +301,17 @@ class AssignTagModelsDialog extends StatelessWidget {
foregroundColor: ColorsManager.whiteColors, foregroundColor: ColorsManager.whiteColors,
onPressed: state.isSaveEnabled onPressed: state.isSaveEnabled
? () async { ? () async {
for (var tag in state.tags) { final updatedTags =
if (tag.location == null || List<TagModel>.from(state.tags);
subspaces == null) { final result =
continue; processTags(updatedTags, subspaces);
}
final previousTagSubspace = final processedTags =
checkTagExistInSubspace( result['updatedTags'] as List<TagModel>;
tag, subspaces ?? []); final processedSubspaces =
result['subspaces']
as List<SubspaceTemplateModel>;
if (tag.location == 'Main Space') {
removeTagFromSubspace(
tag, previousTagSubspace);
} else if (tag.location !=
previousTagSubspace?.subspaceName) {
removeTagFromSubspace(
tag, previousTagSubspace);
moveToNewSubspace(tag, subspaces ?? []);
state.tags.removeWhere((t) =>
t.internalId == tag.internalId);
} else {
updateTagInSubspace(
tag, previousTagSubspace);
state.tags.removeWhere((t) =>
t.internalId == tag.internalId);
}
}
Navigator.of(context) Navigator.of(context)
.popUntil((route) => route.isFirst); .popUntil((route) => route.isFirst);
@ -351,16 +320,18 @@ class AssignTagModelsDialog extends StatelessWidget {
builder: (BuildContext dialogContext) { builder: (BuildContext dialogContext) {
return CreateSpaceModelDialog( return CreateSpaceModelDialog(
products: products, products: products,
allSpaceModels: allSpaceModels,
allTags: allTags, allTags: allTags,
pageContext: pageContext, pageContext: pageContext,
otherSpaceModels: otherSpaceModels, otherSpaceModels: otherSpaceModels,
spaceModel: SpaceTemplateModel( spaceModel: SpaceTemplateModel(
modelName: spaceName, modelName: spaceName,
tags: state.tags, tags: processedTags,
uuid: spaceModel?.uuid, uuid: spaceModel?.uuid,
internalId: internalId:
spaceModel?.internalId, spaceModel?.internalId,
subspaceModels: subspaces), subspaceModels:
processedSubspaces),
); );
}, },
); );
@ -394,39 +365,109 @@ class AssignTagModelsDialog extends StatelessWidget {
.toList(); .toList();
} }
void removeTagFromSubspace(TagModel tag, SubspaceTemplateModel? subspace) { int? checkTagExistInSubspace(
subspace?.tags?.removeWhere((t) => t.internalId == tag.internalId);
}
SubspaceTemplateModel? checkTagExistInSubspace(
TagModel tag, List<SubspaceTemplateModel>? subspaces) { TagModel tag, List<SubspaceTemplateModel>? subspaces) {
if (subspaces == null) return null; if (subspaces == null) return null;
for (var subspace in subspaces) { for (int i = 0; i < subspaces.length; i++) {
if (subspace.tags == null) return null; final subspace = subspaces[i];
if (subspace.tags == null) continue;
for (var t in subspace.tags!) { for (var t in subspace.tags!) {
if (tag.internalId == t.internalId) return subspace; if (tag.internalId == t.internalId) {
return i;
}
} }
} }
return null; return null;
} }
void moveToNewSubspace(TagModel tag, List<SubspaceTemplateModel> subspaces) { Map<String, dynamic> processTags(
final targetSubspace = subspaces List<TagModel> updatedTags, List<SubspaceTemplateModel>? subspaces) {
.firstWhere((subspace) => subspace.subspaceName == tag.location); final modifiedTags = List<TagModel>.from(updatedTags);
final modifiedSubspaces = List<SubspaceTemplateModel>.from(subspaces ?? []);
targetSubspace.tags ??= []; if (subspaces != null) {
if (targetSubspace.tags?.any((t) => t.internalId == tag.internalId) != for (var subspace in subspaces) {
true) { subspace.tags?.removeWhere(
targetSubspace.tags?.add(tag); (tag) => !modifiedTags
} .any((updatedTag) => updatedTag.internalId == tag.internalId),
}
void updateTagInSubspace(TagModel tag, SubspaceTemplateModel? subspace) {
final currentTag = subspace?.tags?.firstWhere(
(t) => t.internalId == tag.internalId,
); );
if (currentTag != null) {
currentTag.tag = tag.tag;
} }
} }
for (var tag in modifiedTags.toList()) {
if (modifiedSubspaces.isEmpty) continue;
final prevIndice = checkTagExistInSubspace(tag, modifiedSubspaces);
if ((tag.location == 'Main Space' || tag.location == null) &&
(prevIndice == null ||
modifiedSubspaces[prevIndice].subspaceName == 'Main Space')) {
continue;
}
if ((tag.location == 'Main Space' || tag.location == null) &&
prevIndice != null) {
modifiedSubspaces[prevIndice]
.tags
?.removeWhere((t) => t.internalId == tag.internalId);
continue;
}
if ((tag.location != 'Main Space' && tag.location != null) &&
prevIndice == null) {
final newIndex = modifiedSubspaces
.indexWhere((subspace) => subspace.subspaceName == tag.location);
if (newIndex != -1) {
if (modifiedSubspaces[newIndex]
.tags
?.any((t) => t.internalId == tag.internalId) !=
true) {
tag.location = modifiedSubspaces[newIndex].subspaceName;
modifiedSubspaces[newIndex].tags?.add(tag);
}
}
modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
continue;
}
if ((tag.location != 'Main Space' && tag.location != null) &&
tag.location != modifiedSubspaces[prevIndice!].subspaceName) {
modifiedSubspaces[prevIndice]
.tags
?.removeWhere((t) => t.internalId == tag.internalId);
final newIndex = modifiedSubspaces
.indexWhere((subspace) => subspace.subspaceName == tag.location);
if (newIndex != -1) {
if (modifiedSubspaces[newIndex]
.tags
?.any((t) => t.internalId == tag.internalId) !=
true) {
tag.location = modifiedSubspaces[newIndex].subspaceName;
modifiedSubspaces[newIndex].tags?.add(tag);
}
}
modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
continue;
}
if ((tag.location != 'Main Space' && tag.location != null) &&
tag.location == modifiedSubspaces[prevIndice!].subspaceName) {
modifiedTags.removeWhere((t) => t.internalId == tag.internalId);
continue;
}
if ((tag.location == 'Main Space' || tag.location == null) &&
prevIndice != null) {
modifiedSubspaces[prevIndice]
.tags
?.removeWhere((t) => t.internalId == tag.internalId);
}
}
return {
'updatedTags': modifiedTags,
'subspaces': modifiedSubspaces,
};
}
} }

68
lib/pages/spaces_management/create_subspace/bloc/subspace_bloc.dart
View File

@ -6,27 +6,43 @@ import 'subspace_event.dart';
import 'subspace_state.dart'; import 'subspace_state.dart';
class SubSpaceBloc extends Bloc<SubSpaceEvent, SubSpaceState> { class SubSpaceBloc extends Bloc<SubSpaceEvent, SubSpaceState> {
SubSpaceBloc() : super(SubSpaceState([], [], '')) { SubSpaceBloc() : super(SubSpaceState([], [], '', {})) {
on<AddSubSpace>((event, emit) { on<AddSubSpace>((event, emit) {
final existingNames = final existingNames = state.subSpaces.map((e) => e.subspaceName).toSet();
state.subSpaces.map((e) => e.subspaceName).toSet();
if (existingNames.contains(event.subSpace.subspaceName.toLowerCase())) { if (existingNames.contains(event.subSpace.subspaceName.toLowerCase())) {
final updatedDuplicates = Set<String>.from(state.duplicates)
..add(event.subSpace.subspaceName.toLowerCase());
final updatedSubSpaces = List<SubspaceModel>.from(state.subSpaces)
..add(event.subSpace);
emit(SubSpaceState( emit(SubSpaceState(
state.subSpaces, updatedSubSpaces,
state.updatedSubSpaceModels, state.updatedSubSpaceModels,
'Subspace name already exists.', '*Duplicated sub-space name',
updatedDuplicates,
)); ));
} else { } else {
// Add subspace if no duplicate exists
final updatedSubSpaces = List<SubspaceModel>.from(state.subSpaces) final updatedSubSpaces = List<SubspaceModel>.from(state.subSpaces)
..add(event.subSpace); ..add(event.subSpace);
if (state.duplicates.isNotEmpty) {
emit(SubSpaceState(
updatedSubSpaces,
state.updatedSubSpaceModels,
'*Duplicated sub-space name',
state.duplicates,
));
} else {
emit(SubSpaceState( emit(SubSpaceState(
updatedSubSpaces, updatedSubSpaces,
state.updatedSubSpaceModels, state.updatedSubSpaceModels,
'', '',
state.duplicates,
// Clear error message
)); ));
} }
}
}); });
// Handle RemoveSubSpace Event // Handle RemoveSubSpace Event
@ -45,13 +61,51 @@ class SubSpaceBloc extends Bloc<SubSpaceEvent, SubSpaceState> {
)); ));
} }
final nameOccurrences = <String, int>{};
for (final subSpace in updatedSubSpaces) {
final lowerName = subSpace.subspaceName.toLowerCase();
nameOccurrences[lowerName] = (nameOccurrences[lowerName] ?? 0) + 1;
}
final updatedDuplicates = nameOccurrences.entries
.where((entry) => entry.value > 1)
.map((entry) => entry.key)
.toSet();
final errorMessage =
updatedDuplicates.isNotEmpty ? '*Duplicated sub-space name' : '';
emit(SubSpaceState( emit(SubSpaceState(
updatedSubSpaces, updatedSubSpaces,
updatedSubspaceModels, updatedSubspaceModels,
'', // Clear error message errorMessage,
updatedDuplicates,
)); ));
}); });
// Handle UpdateSubSpace Event
on<UpdateSubSpace>((event, emit) {
final updatedSubSpaces = state.subSpaces.map((subSpace) {
if (subSpace.uuid == event.updatedSubSpace.uuid) {
return event.updatedSubSpace;
}
return subSpace;
}).toList();
final updatedSubspaceModels = List<UpdateSubspaceModel>.from(
state.updatedSubSpaceModels,
);
updatedSubspaceModels.add(UpdateSubspaceModel(
action: Action.update,
uuid: event.updatedSubSpace.uuid!,
));
emit(SubSpaceState(
updatedSubSpaces,
updatedSubspaceModels,
'',
state.duplicates,
));
});
} }
} }

5
lib/pages/spaces_management/create_subspace/bloc/subspace_state.dart
View File

@ -4,23 +4,26 @@ class SubSpaceState {
final List<SubspaceModel> subSpaces; final List<SubspaceModel> subSpaces;
final List<UpdateSubspaceModel> updatedSubSpaceModels; final List<UpdateSubspaceModel> updatedSubSpaceModels;
final String errorMessage; final String errorMessage;
final Set<String> duplicates;
SubSpaceState( SubSpaceState(
this.subSpaces, this.subSpaces,
this.updatedSubSpaceModels, this.updatedSubSpaceModels,
this.errorMessage, this.errorMessage,
this.duplicates,
); );
SubSpaceState copyWith({ SubSpaceState copyWith({
List<SubspaceModel>? subSpaces, List<SubspaceModel>? subSpaces,
List<UpdateSubspaceModel>? updatedSubSpaceModels, List<UpdateSubspaceModel>? updatedSubSpaceModels,
String? errorMessage, String? errorMessage,
Set<String>? duplicates,
}) { }) {
return SubSpaceState( return SubSpaceState(
subSpaces ?? this.subSpaces, subSpaces ?? this.subSpaces,
updatedSubSpaceModels ?? this.updatedSubSpaceModels, updatedSubSpaceModels ?? this.updatedSubSpaceModels,
errorMessage ?? this.errorMessage, errorMessage ?? this.errorMessage,
duplicates ?? this.duplicates,
); );
} }
} }

47
lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
View File

@ -81,18 +81,40 @@ class CreateSubSpaceDialog extends StatelessWidget {
spacing: 8.0, spacing: 8.0,
runSpacing: 8.0, runSpacing: 8.0,
children: [ children: [
...state.subSpaces.map( ...state.subSpaces.asMap().entries.map(
(subSpace) => Chip( (entry) {
final index = entry.key;
final subSpace = entry.value;
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 Chip(
label: Text( label: Text(
subSpace.subspaceName, subSpace.subspaceName,
style: const TextStyle( style: const TextStyle(
color: ColorsManager.spaceColor), color: ColorsManager.spaceColor,
),
), ),
backgroundColor: ColorsManager.whiteColors, backgroundColor: ColorsManager.whiteColors,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(10),
side: const BorderSide( side: BorderSide(
color: ColorsManager.transparentColor, color: isDuplicate
? ColorsManager.red
: ColorsManager.transparentColor,
width: 0, width: 0,
), ),
), ),
@ -115,7 +137,8 @@ class CreateSubSpaceDialog extends StatelessWidget {
onDeleted: () => context onDeleted: () => context
.read<SubSpaceBloc>() .read<SubSpaceBloc>()
.add(RemoveSubSpace(subSpace)), .add(RemoveSubSpace(subSpace)),
), );
},
), ),
SizedBox( SizedBox(
width: 200, width: 200,
@ -142,6 +165,9 @@ class CreateSubSpaceDialog extends StatelessWidget {
color: ColorsManager.blackColor), color: ColorsManager.blackColor),
), ),
), ),
],
),
),
if (state.errorMessage.isNotEmpty) if (state.errorMessage.isNotEmpty)
Padding( Padding(
padding: const EdgeInsets.only(top: 8.0), padding: const EdgeInsets.only(top: 8.0),
@ -153,16 +179,15 @@ class CreateSubSpaceDialog extends StatelessWidget {
), ),
), ),
), ),
],
),
),
const SizedBox(height: 16), const SizedBox(height: 16),
Row( Row(
children: [ children: [
Expanded( Expanded(
child: CancelButton( child: CancelButton(
label: 'Cancel', label: 'Cancel',
onPressed: () async {}, onPressed: () async {
Navigator.of(context).pop();
},
), ),
), ),
const SizedBox(width: 10), const SizedBox(width: 10),

42
lib/pages/spaces_management/create_subspace_model/bloc/subspace_model_bloc.dart
View File

@ -25,22 +25,30 @@ class SubSpaceModelBloc extends Bloc<SubSpaceModelEvent, SubSpaceModelState> {
updatedDuplicates, updatedDuplicates,
)); ));
} else { } else {
// Add subspace if no duplicate exists
final updatedSubSpaces = final updatedSubSpaces =
List<SubspaceTemplateModel>.from(state.subSpaces) List<SubspaceTemplateModel>.from(state.subSpaces)
..add(event.subSpace); ..add(event.subSpace);
if (state.duplicates.isNotEmpty) {
emit(SubSpaceModelState(
updatedSubSpaces,
state.updatedSubSpaceModels,
'*Duplicated sub-space name',
state.duplicates,
));
} else {
emit(SubSpaceModelState( emit(SubSpaceModelState(
updatedSubSpaces, updatedSubSpaces,
state.updatedSubSpaceModels, state.updatedSubSpaceModels,
'', '',
state.duplicates, state.duplicates,
// Clear error message
)); ));
} }
}
}); });
// Handle RemoveSubSpaceModel Event // Handle RemoveSubSpaceModel Event
on<RemoveSubSpaceModel>((event, emit) { on<RemoveSubSpaceModel>((event, emit) {
final updatedSubSpaces = List<SubspaceTemplateModel>.from(state.subSpaces) final updatedSubSpaces = List<SubspaceTemplateModel>.from(state.subSpaces)
..remove(event.subSpace); ..remove(event.subSpace);
@ -48,16 +56,6 @@ class SubSpaceModelBloc extends Bloc<SubSpaceModelEvent, SubSpaceModelState> {
final updatedSubspaceModels = List<UpdateSubspaceTemplateModel>.from( final updatedSubspaceModels = List<UpdateSubspaceTemplateModel>.from(
state.updatedSubSpaceModels, state.updatedSubSpaceModels,
); );
final nameOccurrences = <String, int>{};
for (final subSpace in updatedSubSpaces) {
final lowerName = subSpace.subspaceName.toLowerCase();
nameOccurrences[lowerName] = (nameOccurrences[lowerName] ?? 0) + 1;
}
final updatedDuplicates = nameOccurrences.entries
.where((entry) => entry.value > 1)
.map((entry) => entry.key)
.toSet();
if (event.subSpace.uuid?.isNotEmpty ?? false) { if (event.subSpace.uuid?.isNotEmpty ?? false) {
updatedSubspaceModels.add(UpdateSubspaceTemplateModel( updatedSubspaceModels.add(UpdateSubspaceTemplateModel(
@ -66,12 +64,28 @@ class SubSpaceModelBloc extends Bloc<SubSpaceModelEvent, SubSpaceModelState> {
)); ));
} }
// Count occurrences of sub-space names to identify duplicates
final nameOccurrences = <String, int>{};
for (final subSpace in updatedSubSpaces) {
final lowerName = subSpace.subspaceName.toLowerCase();
nameOccurrences[lowerName] = (nameOccurrences[lowerName] ?? 0) + 1;
}
// Identify duplicate names
final updatedDuplicates = nameOccurrences.entries
.where((entry) => entry.value > 1)
.map((entry) => entry.key)
.toSet();
// Determine the error message
final errorMessage =
updatedDuplicates.isNotEmpty ? '*Duplicated sub-space name' : '';
emit(SubSpaceModelState( emit(SubSpaceModelState(
updatedSubSpaces, updatedSubSpaces,
updatedSubspaceModels, updatedSubspaceModels,
'', errorMessage,
updatedDuplicates, updatedDuplicates,
// Clear error message
)); ));
}); });

77
lib/pages/spaces_management/helper/tag_helper.dart
View File

@ -1,5 +1,8 @@
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/base_tag.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_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/space_model/models/subspace_template_model.dart'; import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart'; import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
@ -17,23 +20,52 @@ class TagHelper {
if (subspaces != null) { if (subspaces != null) {
for (var subspace in subspaces) { for (var subspace in subspaces) {
if (subspace.tags != null) { if (subspace.tags != null) {
for (var existingTag in subspace.tags!) {
initialTags.addAll( initialTags.addAll(
subspace.tags!.map( subspace.tags!.map(
(tag) => tag.copyWith( (tag) => tag.copyWith(
location: subspace.subspaceName, location: subspace.subspaceName,
internalId: existingTag.internalId, internalId: tag.internalId,
tag: existingTag.tag), tag: tag.tag,
),
), ),
); );
} }
} }
} }
}
return initialTags; return initialTags;
} }
static Map<ProductModel, int> groupTags(List<TagModel> tags) { static List<Tag> generateInitialForTags({
List<Tag>? spaceTags,
List<SubspaceModel>? subspaces,
}) {
final List<Tag> initialTags = [];
if (spaceTags != null) {
initialTags.addAll(spaceTags);
}
if (subspaces != null) {
for (var subspace in subspaces) {
if (subspace.tags != null) {
initialTags.addAll(
subspace.tags!.map(
(tag) => tag.copyWith(
location: subspace.subspaceName,
internalId: tag.internalId,
tag: tag.tag,
),
),
);
}
}
}
return initialTags;
}
static Map<ProductModel, int> groupTags(List<BaseTag> tags) {
final Map<ProductModel, int> groupedTags = {}; final Map<ProductModel, int> groupedTags = {};
for (var tag in tags) { for (var tag in tags) {
if (tag.product != null) { if (tag.product != null) {
@ -78,4 +110,39 @@ class TagHelper {
)) ))
.toList(); .toList();
} }
static List<SelectedProduct> createInitialSelectedProductsForTags(
List<Tag>? tags, List<SubspaceModel>? subspaces) {
final Map<ProductModel, int> productCounts = {};
if (tags != null) {
for (var tag in tags) {
if (tag.product != null) {
productCounts[tag.product!] = (productCounts[tag.product!] ?? 0) + 1;
}
}
}
if (subspaces != null) {
for (var subspace in subspaces) {
if (subspace.tags != null) {
for (var tag in subspace.tags!) {
if (tag.product != null) {
productCounts[tag.product!] =
(productCounts[tag.product!] ?? 0) + 1;
}
}
}
}
}
return productCounts.entries
.map((entry) => SelectedProduct(
productId: entry.key.uuid,
count: entry.value,
productName: entry.key.name ?? 'Unnamed',
product: entry.key,
))
.toList();
}
} }

61
lib/pages/spaces_management/space_model/bloc/create_space_model_bloc.dart
View File

@ -68,8 +68,11 @@ class CreateSpaceModelBloc
on<UpdateSpaceTemplate>((event, emit) { on<UpdateSpaceTemplate>((event, emit) {
_space = event.spaceTemplate; _space = event.spaceTemplate;
emit(CreateSpaceModelLoaded(_space!)); final String? errorMessage = _checkDuplicateModelName(
event.allModels ?? [], event.spaceTemplate.modelName);
emit(CreateSpaceModelLoaded(_space!, errorMessage: errorMessage));
}); });
on<AddSubspacesToSpaceTemplate>((event, emit) { on<AddSubspacesToSpaceTemplate>((event, emit) {
final currentState = state; final currentState = state;
@ -132,7 +135,8 @@ class CreateSpaceModelBloc
final updatedSpace = final updatedSpace =
currentState.space.copyWith(subspaceModels: updatedSubspaces); currentState.space.copyWith(subspaceModels: updatedSubspaces);
emit(CreateSpaceModelLoaded(updatedSpace)); emit(CreateSpaceModelLoaded(updatedSpace,
errorMessage: currentState.errorMessage));
} else { } else {
emit(CreateSpaceModelError("Space template not initialized")); emit(CreateSpaceModelError("Space template not initialized"));
} }
@ -197,26 +201,30 @@ class CreateSpaceModelBloc
on<ModifySpaceTemplate>((event, emit) async { on<ModifySpaceTemplate>((event, emit) async {
try { try {
final prevSpaceModel = event.spaceTemplate; if (event.spaceTemplate.uuid != null) {
final prevSpaceModel =
await _api.getSpaceModel(event.spaceTemplate.uuid ?? '');
final newSpaceModel = event.updatedSpaceTemplate; final newSpaceModel = event.updatedSpaceTemplate;
String? spaceModelName; String? spaceModelName;
if (prevSpaceModel.modelName != newSpaceModel.modelName) { if (prevSpaceModel?.modelName != newSpaceModel.modelName) {
spaceModelName = newSpaceModel.modelName; spaceModelName = newSpaceModel.modelName;
} }
List<TagModelUpdate> tagUpdates = []; List<TagModelUpdate> tagUpdates = [];
final List<UpdateSubspaceTemplateModel> subspaceUpdates = []; final List<UpdateSubspaceTemplateModel> subspaceUpdates = [];
final List<SubspaceTemplateModel>? prevSubspaces = final List<SubspaceTemplateModel>? prevSubspaces =
prevSpaceModel.subspaceModels; prevSpaceModel?.subspaceModels;
final List<SubspaceTemplateModel>? newSubspaces = final List<SubspaceTemplateModel>? newSubspaces =
newSpaceModel.subspaceModels; newSpaceModel.subspaceModels;
tagUpdates = processTagUpdates(prevSpaceModel.tags, newSpaceModel.tags); tagUpdates =
processTagUpdates(prevSpaceModel?.tags, newSpaceModel.tags);
if (prevSubspaces != null || newSubspaces != null) { if (prevSubspaces != null || newSubspaces != null) {
if (prevSubspaces != null && newSubspaces != null) { if (prevSubspaces != null && newSubspaces != null) {
for (var prevSubspace in prevSubspaces!) { for (var prevSubspace in prevSubspaces) {
final existsInNew = newSubspaces! final existsInNew = newSubspaces
.any((newTag) => newTag.uuid == prevSubspace.uuid); .any((subspace) => subspace.uuid == prevSubspace.uuid);
if (!existsInNew) { if (!existsInNew) {
subspaceUpdates.add(UpdateSubspaceTemplateModel( subspaceUpdates.add(UpdateSubspaceTemplateModel(
action: Action.delete, uuid: prevSubspace.uuid)); action: Action.delete, uuid: prevSubspace.uuid));
@ -239,6 +247,7 @@ class CreateSpaceModelBloc
for (var tag in newSubspace.tags!) { for (var tag in newSubspace.tags!) {
tagUpdates.add(TagModelUpdate( tagUpdates.add(TagModelUpdate(
action: Action.add, action: Action.add,
uuid: tag.uuid == '' ? null : tag.uuid,
tag: tag.tag, tag: tag.tag,
productUuid: tag.product?.uuid)); productUuid: tag.product?.uuid));
} }
@ -256,8 +265,9 @@ class CreateSpaceModelBloc
for (var subspace in newSubspaces!) subspace.uuid: subspace for (var subspace in newSubspaces!) subspace.uuid: subspace
}; };
for (var prevSubspace in prevSubspaces!) { for (var prevSubspace in prevSubspaces) {
final newSubspace = newSubspaceMap[prevSubspace.uuid]; final newSubspace = newSubspaceMap[prevSubspace.uuid];
if (newSubspace != null) { if (newSubspace != null) {
final List<TagModelUpdate> tagSubspaceUpdates = final List<TagModelUpdate> tagSubspaceUpdates =
processTagUpdates(prevSubspace.tags, newSubspace.tags); processTagUpdates(prevSubspace.tags, newSubspace.tags);
@ -266,7 +276,7 @@ class CreateSpaceModelBloc
uuid: newSubspace.uuid, uuid: newSubspace.uuid,
subspaceName: newSubspace.subspaceName, subspaceName: newSubspace.subspaceName,
tags: tagSubspaceUpdates)); tags: tagSubspaceUpdates));
} else {} }
} }
} }
} }
@ -277,7 +287,7 @@ class CreateSpaceModelBloc
subspaceModels: subspaceUpdates); subspaceModels: subspaceUpdates);
final res = await _api.updateSpaceModel( final res = await _api.updateSpaceModel(
spaceModelBody, prevSpaceModel.uuid ?? ''); spaceModelBody, prevSpaceModel?.uuid ?? '');
if (res != null) { if (res != null) {
emit(CreateSpaceModelLoaded(newSpaceModel)); emit(CreateSpaceModelLoaded(newSpaceModel));
@ -285,6 +295,7 @@ class CreateSpaceModelBloc
event.onUpdate!(event.updatedSpaceTemplate); event.onUpdate!(event.updatedSpaceTemplate);
} }
} }
}
} catch (e) { } catch (e) {
emit(CreateSpaceModelError('Error creating space model')); emit(CreateSpaceModelError('Error creating space model'));
} }
@ -298,10 +309,22 @@ class CreateSpaceModelBloc
final List<TagModelUpdate> tagUpdates = []; final List<TagModelUpdate> tagUpdates = [];
final processedTags = <String?>{}; final processedTags = <String?>{};
if (prevTags == null && newTags != null) {
for (var newTag in newTags) {
tagUpdates.add(TagModelUpdate(
action: Action.add,
tag: newTag.tag,
uuid: newTag.uuid,
productUuid: newTag.product?.uuid,
));
}
return tagUpdates;
}
if (newTags != null || prevTags != null) { if (newTags != null || prevTags != null) {
// Case 1: Tags deleted // Case 1: Tags deleted
if (prevTags != null && newTags != null) { if (prevTags != null && newTags != null) {
for (var prevTag in prevTags!) { for (var prevTag in prevTags) {
final existsInNew = final existsInNew =
newTags!.any((newTag) => newTag.uuid == prevTag.uuid); newTags!.any((newTag) => newTag.uuid == prevTag.uuid);
if (!existsInNew) { if (!existsInNew) {
@ -318,13 +341,16 @@ class CreateSpaceModelBloc
// Case 2: Tags added // Case 2: Tags added
if (newTags != null) { if (newTags != null) {
final prevTagUuids = prevTags?.map((t) => t.uuid).toSet() ?? {};
for (var newTag in newTags!) { for (var newTag in newTags!) {
// Tag without UUID // Tag without UUID
if ((newTag.uuid == null || newTag.uuid!.isEmpty) && if ((newTag.uuid == null || !prevTagUuids.contains(newTag.uuid)) &&
!processedTags.contains(newTag.tag)) { !processedTags.contains(newTag.tag)) {
tagUpdates.add(TagModelUpdate( tagUpdates.add(TagModelUpdate(
action: Action.add, action: Action.add,
tag: newTag.tag, tag: newTag.tag,
uuid: newTag.uuid == '' ? null : newTag.uuid,
productUuid: newTag.product?.uuid)); productUuid: newTag.product?.uuid));
processedTags.add(newTag.tag); processedTags.add(newTag.tag);
} }
@ -350,4 +376,11 @@ class CreateSpaceModelBloc
return tagUpdates; return tagUpdates;
} }
String? _checkDuplicateModelName(List<String> allModels, String name) {
if (allModels.contains(name)) {
return "Duplicate Model name";
}
return null;
}
} }

3
lib/pages/spaces_management/space_model/bloc/create_space_model_event.dart
View File

@ -14,8 +14,9 @@ class LoadSpaceTemplate extends CreateSpaceModelEvent {}
class UpdateSpaceTemplate extends CreateSpaceModelEvent { class UpdateSpaceTemplate extends CreateSpaceModelEvent {
final SpaceTemplateModel spaceTemplate; final SpaceTemplateModel spaceTemplate;
List<String>? allModels;
UpdateSpaceTemplate(this.spaceTemplate); UpdateSpaceTemplate(this.spaceTemplate,this.allModels);
} }
class CreateSpaceTemplate extends CreateSpaceModelEvent { class CreateSpaceTemplate extends CreateSpaceModelEvent {

2
lib/pages/spaces_management/space_model/models/create_space_template_body_model.dart
View File

@ -1,5 +1,5 @@
class TagBodyModel { class TagBodyModel {
late String uuid; late String? uuid;
late String tag; late String tag;
late final String? productUuid; late final String? productUuid;

2
lib/pages/spaces_management/space_model/models/subspace_template_model.dart
View File

@ -20,7 +20,7 @@ class SubspaceTemplateModel {
final String internalId = json['internalId'] ?? const Uuid().v4(); final String internalId = json['internalId'] ?? const Uuid().v4();
return SubspaceTemplateModel( return SubspaceTemplateModel(
uuid: json['uuid'] ?? '', uuid: json['uuid'],
subspaceName: json['subspaceName'] ?? '', subspaceName: json['subspaceName'] ?? '',
internalId: internalId, internalId: internalId,
disabled: json['disabled'] ?? false, disabled: json['disabled'] ?? false,

35
lib/pages/spaces_management/space_model/models/tag_model.dart
View File

@ -1,27 +1,27 @@
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/base_tag.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
import 'package:syncrow_web/pages/spaces_management/space_model/models/create_space_template_body_model.dart'; import 'package:syncrow_web/pages/spaces_management/space_model/models/create_space_template_body_model.dart';
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
class TagModel { class TagModel extends BaseTag {
String? uuid; TagModel({
String? tag; String? uuid,
final ProductModel? product; required String? tag,
String internalId; ProductModel? product,
String? location;
TagModel(
{this.uuid,
required this.tag,
this.product,
String? internalId, String? internalId,
this.location}) String? location,
: internalId = internalId ?? const Uuid().v4(); }) : super(
uuid: uuid,
tag: tag,
product: product,
internalId: internalId,
location: location,
);
factory TagModel.fromJson(Map<String, dynamic> json) { factory TagModel.fromJson(Map<String, dynamic> json) {
final String internalId = json['internalId'] ?? const Uuid().v4(); final String internalId = json['internalId'] ?? const Uuid().v4();
return TagModel( return TagModel(
uuid: json['uuid'] ?? '', uuid: json['uuid'] ,
internalId: internalId, internalId: internalId,
tag: json['tag'] ?? '', tag: json['tag'] ?? '',
product: json['product'] != null product: json['product'] != null
@ -30,9 +30,11 @@ class TagModel {
); );
} }
@override
TagModel copyWith( TagModel copyWith(
{String? tag, {String? tag,
ProductModel? product, ProductModel? product,
String? uuid,
String? location, String? location,
String? internalId}) { String? internalId}) {
return TagModel( return TagModel(
@ -40,6 +42,7 @@ class TagModel {
product: product ?? this.product, product: product ?? this.product,
location: location ?? this.location, location: location ?? this.location,
internalId: internalId ?? this.internalId, internalId: internalId ?? this.internalId,
uuid:uuid?? this.uuid
); );
} }
@ -55,7 +58,7 @@ class TagModel {
extension TagModelExtensions on TagModel { extension TagModelExtensions on TagModel {
TagBodyModel toTagBodyModel() { TagBodyModel toTagBodyModel() {
return TagBodyModel() return TagBodyModel()
..uuid = uuid ?? '' ..uuid = uuid
..tag = tag ?? '' ..tag = tag ?? ''
..productUuid = product?.uuid; ..productUuid = product?.uuid;
} }

4
lib/pages/spaces_management/space_model/view/space_model_page.dart
View File

@ -63,7 +63,8 @@ class SpaceModelPage extends StatelessWidget {
} }
// Render existing space model // Render existing space model
final model = spaceModels[index]; final model = spaceModels[index];
final otherModel = List<String>.from(allSpaceModelNames); final otherModel =
List<String>.from(allSpaceModelNames);
otherModel.remove(model.modelName); otherModel.remove(model.modelName);
return GestureDetector( return GestureDetector(
onTap: () { onTap: () {
@ -76,6 +77,7 @@ class SpaceModelPage extends StatelessWidget {
spaceModel: model, spaceModel: model,
otherSpaceModels: otherModel, otherSpaceModels: otherModel,
pageContext: context, pageContext: context,
allSpaceModels: spaceModels,
); );
}, },
); );

22
lib/pages/spaces_management/space_model/widgets/button_content_widget.dart
View File

@ -1,15 +1,15 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:syncrow_web/utils/color_manager.dart'; import 'package:syncrow_web/utils/color_manager.dart';
class ButtonContentWidget extends StatelessWidget { class ButtonContentWidget extends StatelessWidget {
final IconData icon; final IconData? icon;
final String label; final String label;
final String? svgAssets;
const ButtonContentWidget({ const ButtonContentWidget(
Key? key, {Key? key, this.icon, required this.label, this.svgAssets})
required this.icon, : super(key: key);
required this.label,
}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -30,10 +30,20 @@ class ButtonContentWidget extends StatelessWidget {
padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 16.0), padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 16.0),
child: Row( child: Row(
children: [ children: [
if (icon != null)
Icon( Icon(
icon, icon,
color: ColorsManager.spaceColor, color: ColorsManager.spaceColor,
), ),
if (svgAssets != null)
Padding(
padding: const EdgeInsets.only(left: 6.0),
child: SvgPicture.asset(
svgAssets!,
width: screenWidth * 0.015, // Adjust icon size
height: screenWidth * 0.015,
),
),
const SizedBox(width: 10), const SizedBox(width: 10),
Expanded( Expanded(
child: Text( child: Text(

27
lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart
View File

@ -22,6 +22,7 @@ class CreateSpaceModelDialog extends StatelessWidget {
final SpaceTemplateModel? spaceModel; final SpaceTemplateModel? spaceModel;
final BuildContext? pageContext; final BuildContext? pageContext;
final List<String>? otherSpaceModels; final List<String>? otherSpaceModels;
final List<SpaceTemplateModel>? allSpaceModels;
const CreateSpaceModelDialog( const CreateSpaceModelDialog(
{Key? key, {Key? key,
@ -29,7 +30,8 @@ class CreateSpaceModelDialog extends StatelessWidget {
this.allTags, this.allTags,
this.spaceModel, this.spaceModel,
this.pageContext, this.pageContext,
this.otherSpaceModels}) this.otherSpaceModels,
this.allSpaceModels})
: super(key: key); : super(key: key);
@override @override
@ -50,12 +52,14 @@ class CreateSpaceModelDialog extends StatelessWidget {
create: (_) { create: (_) {
final bloc = CreateSpaceModelBloc(_spaceModelApi); final bloc = CreateSpaceModelBloc(_spaceModelApi);
if (spaceModel != null) { if (spaceModel != null) {
bloc.add(UpdateSpaceTemplate(spaceModel!)); bloc.add(UpdateSpaceTemplate(spaceModel!, otherSpaceModels));
} else { } else {
bloc.add(UpdateSpaceTemplate(SpaceTemplateModel( bloc.add(UpdateSpaceTemplate(
SpaceTemplateModel(
modelName: '', modelName: '',
subspaceModels: const [], subspaceModels: const [],
))); ),
otherSpaceModels));
} }
spaceNameController.addListener(() { spaceNameController.addListener(() {
@ -138,6 +142,7 @@ class CreateSpaceModelDialog extends StatelessWidget {
spaceNameController: spaceNameController, spaceNameController: spaceNameController,
pageContext: pageContext, pageContext: pageContext,
otherSpaceModels: otherSpaceModels, otherSpaceModels: otherSpaceModels,
allSpaceModels: allSpaceModels,
), ),
const SizedBox(height: 20), const SizedBox(height: 20),
SizedBox( SizedBox(
@ -147,14 +152,15 @@ class CreateSpaceModelDialog extends StatelessWidget {
Expanded( Expanded(
child: CancelButton( child: CancelButton(
label: 'Cancel', label: 'Cancel',
onPressed: () => Navigator.of(context).pop(), onPressed: () {
Navigator.of(context).pop();
},
), ),
), ),
const SizedBox(width: 10), const SizedBox(width: 10),
Expanded( Expanded(
child: DefaultButton( child: DefaultButton(
onPressed: state.errorMessage == null || onPressed: (state.errorMessage == null)
isNameValid
? () { ? () {
final updatedSpaceTemplate = final updatedSpaceTemplate =
updatedSpaceModel.copyWith( updatedSpaceModel.copyWith(
@ -232,9 +238,10 @@ class CreateSpaceModelDialog extends StatelessWidget {
: null, : null,
backgroundColor: ColorsManager.secondaryColor, backgroundColor: ColorsManager.secondaryColor,
borderRadius: 10, borderRadius: 10,
foregroundColor: isNameValid foregroundColor: (state.errorMessage != null &&
? ColorsManager.whiteColors state.errorMessage != '')
: ColorsManager.whiteColorsWithOpacity, ? ColorsManager.whiteColorsWithOpacity
: ColorsManager.whiteColors,
child: const Text('OK'), child: const Text('OK'),
), ),
), ),

34
lib/pages/spaces_management/space_model/widgets/subspace_model_create_widget.dart
View File

@ -1,7 +1,9 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:syncrow_web/common/edit_chip.dart';
import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart'; import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
import 'package:syncrow_web/pages/spaces_management/space_model/widgets/button_content_widget.dart'; import 'package:syncrow_web/pages/spaces_management/space_model/widgets/button_content_widget.dart';
import 'package:syncrow_web/pages/spaces_management/create_subspace_model/views/create_subspace_model_dialog.dart'; import 'package:syncrow_web/pages/spaces_management/create_subspace_model/views/create_subspace_model_dialog.dart';
import 'package:syncrow_web/pages/spaces_management/space_model/widgets/subspace_name_label_widget.dart';
import 'package:syncrow_web/utils/color_manager.dart'; import 'package:syncrow_web/utils/color_manager.dart';
class SubspaceModelCreate extends StatelessWidget { class SubspaceModelCreate extends StatelessWidget {
@ -46,39 +48,13 @@ class SubspaceModelCreate extends StatelessWidget {
spacing: 8.0, spacing: 8.0,
runSpacing: 8.0, runSpacing: 8.0,
children: [ children: [
...subspaces.map((subspace) => Container( ...subspaces.map((subspace) => SubspaceNameDisplayWidget(
padding: const EdgeInsets.symmetric( text: subspace.subspaceName,
horizontal: 8.0, vertical: 4.0),
decoration: BoxDecoration(
color: ColorsManager.whiteColors,
borderRadius: BorderRadius.circular(10),
border: Border.all(
color: ColorsManager.transparentColor),
),
child: Text(
subspace.subspaceName,
style: Theme.of(context)
.textTheme
.bodySmall
?.copyWith(color: ColorsManager.spaceColor),
),
)), )),
GestureDetector( EditChip(
onTap: () async { onTap: () async {
await _openDialog(context, 'Edit Sub-space'); await _openDialog(context, 'Edit Sub-space');
}, },
child: Chip(
label: const Text(
'Edit',
style: TextStyle(color: ColorsManager.spaceColor),
),
backgroundColor: ColorsManager.whiteColors,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(16),
side:
const BorderSide(color: ColorsManager.spaceColor),
),
),
), ),
], ],
), ),

41
lib/pages/spaces_management/space_model/widgets/subspace_name_label_widget.dart Normal file
View File

@ -0,0 +1,41 @@
import 'package:flutter/material.dart';
import 'package:syncrow_web/utils/color_manager.dart';
class SubspaceNameDisplayWidget extends StatelessWidget {
final String text;
final TextStyle? textStyle;
final Color backgroundColor;
final Color borderColor;
final EdgeInsetsGeometry padding;
final BorderRadiusGeometry borderRadius;
const SubspaceNameDisplayWidget({
Key? key,
required this.text,
this.textStyle,
this.backgroundColor = ColorsManager.whiteColors,
this.borderColor = ColorsManager.transparentColor,
this.padding = const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0),
this.borderRadius = const BorderRadius.all(Radius.circular(10)),
}) : super(key: key);
@override
Widget build(BuildContext context) {
return Container(
padding: padding,
decoration: BoxDecoration(
color: backgroundColor,
borderRadius: borderRadius,
border: Border.all(color: borderColor),
),
child: Text(
text,
style: textStyle ??
Theme.of(context)
.textTheme
.bodySmall
?.copyWith(color: ColorsManager.spaceColor),
),
);
}
}

32
lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:syncrow_web/common/edit_chip.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
import 'package:syncrow_web/pages/spaces_management/assign_tag_models/views/assign_tag_models_dialog.dart'; import 'package:syncrow_web/pages/spaces_management/assign_tag_models/views/assign_tag_models_dialog.dart';
import 'package:syncrow_web/pages/spaces_management/helper/tag_helper.dart'; import 'package:syncrow_web/pages/spaces_management/helper/tag_helper.dart';
@ -18,6 +19,7 @@ class TagChipDisplay extends StatelessWidget {
final TextEditingController spaceNameController; final TextEditingController spaceNameController;
final BuildContext? pageContext; final BuildContext? pageContext;
final List<String>? otherSpaceModels; final List<String>? otherSpaceModels;
final List<SpaceTemplateModel>? allSpaceModels;
const TagChipDisplay(BuildContext context, const TagChipDisplay(BuildContext context,
{Key? key, {Key? key,
@ -28,7 +30,8 @@ class TagChipDisplay extends StatelessWidget {
required this.allTags, required this.allTags,
required this.spaceNameController, required this.spaceNameController,
this.pageContext, this.pageContext,
this.otherSpaceModels}) this.otherSpaceModels,
this.allSpaceModels})
: super(key: key); : super(key: key);
@override @override
@ -83,22 +86,21 @@ class TagChipDisplay extends StatelessWidget {
), ),
), ),
), ),
GestureDetector( EditChip(onTap: () async {
onTap: () async {
// Use the Navigator's context for showDialog // Use the Navigator's context for showDialog
final navigatorContext = Navigator.of(context).pop();
Navigator.of(context).overlay?.context;
if (navigatorContext != null) {
await showDialog<bool>( await showDialog<bool>(
barrierDismissible: false, barrierDismissible: false,
context: navigatorContext, context: context,
builder: (context) => AssignTagModelsDialog( builder: (context) => AssignTagModelsDialog(
products: products, products: products,
allSpaceModels: allSpaceModels,
subspaces: subspaces, subspaces: subspaces,
pageContext: pageContext, pageContext: pageContext,
allTags: allTags, allTags: allTags,
spaceModel: spaceModel, spaceModel: spaceModel,
otherSpaceModels: otherSpaceModels,
initialTags: TagHelper.generateInitialTags( initialTags: TagHelper.generateInitialTags(
subspaces: subspaces, subspaces: subspaces,
spaceTagModels: spaceModel?.tags ?? []), spaceTagModels: spaceModel?.tags ?? []),
@ -108,20 +110,7 @@ class TagChipDisplay extends StatelessWidget {
spaceModel?.tags ?? [], subspaces), spaceModel?.tags ?? [], subspaces),
spaceName: spaceModel?.modelName ?? '', spaceName: spaceModel?.modelName ?? '',
)); ));
} })
},
child: Chip(
label: const Text(
'Edit',
style: TextStyle(color: ColorsManager.spaceColor),
),
backgroundColor: ColorsManager.whiteColors,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(16),
side: const BorderSide(color: ColorsManager.spaceColor),
),
),
),
], ],
), ),
), ),
@ -141,6 +130,7 @@ class TagChipDisplay extends StatelessWidget {
pageContext: pageContext, pageContext: pageContext,
isCreate: true, isCreate: true,
spaceModel: spaceModel, spaceModel: spaceModel,
otherSpaceModels: otherSpaceModels,
), ),
); );
}, },

39
lib/pages/spaces_management/tag_model/views/add_device_type_model_widget.dart
View File

@ -5,6 +5,7 @@ import 'package:syncrow_web/pages/common/buttons/default_button.dart';
import 'package:syncrow_web/pages/spaces_management/assign_tag_models/views/assign_tag_models_dialog.dart'; import 'package:syncrow_web/pages/spaces_management/assign_tag_models/views/assign_tag_models_dialog.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
import 'package:syncrow_web/pages/spaces_management/helper/tag_helper.dart';
import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart'; import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart'; import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart'; import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
@ -26,6 +27,7 @@ class AddDeviceTypeModelWidget extends StatelessWidget {
final List<String>? otherSpaceModels; final List<String>? otherSpaceModels;
final BuildContext? pageContext; final BuildContext? pageContext;
final SpaceTemplateModel? spaceModel; final SpaceTemplateModel? spaceModel;
final List<SpaceTemplateModel>? allSpaceModels;
const AddDeviceTypeModelWidget( const AddDeviceTypeModelWidget(
{super.key, {super.key,
@ -38,7 +40,8 @@ class AddDeviceTypeModelWidget extends StatelessWidget {
required this.isCreate, required this.isCreate,
this.pageContext, this.pageContext,
this.otherSpaceModels, this.otherSpaceModels,
this.spaceModel}); this.spaceModel,
this.allSpaceModels});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -106,6 +109,7 @@ class AddDeviceTypeModelWidget extends StatelessWidget {
context: context, context: context,
builder: (BuildContext dialogContext) { builder: (BuildContext dialogContext) {
return CreateSpaceModelDialog( return CreateSpaceModelDialog(
allSpaceModels: allSpaceModels,
products: products, products: products,
allTags: allTags, allTags: allTags,
pageContext: pageContext, pageContext: pageContext,
@ -120,7 +124,7 @@ class AddDeviceTypeModelWidget extends StatelessWidget {
}, },
); );
} else { } else {
final initialTags = generateInitialTags( final initialTags = TagHelper.generateInitialTags(
spaceTagModels: spaceTagModels, spaceTagModels: spaceTagModels,
subspaces: subspaces, subspaces: subspaces,
); );
@ -162,7 +166,8 @@ class AddDeviceTypeModelWidget extends StatelessWidget {
: () async { : () async {
if (state is AddDeviceModelLoaded && if (state is AddDeviceModelLoaded &&
state.selectedProducts.isNotEmpty) { state.selectedProducts.isNotEmpty) {
final initialTags = generateInitialTags( final initialTags =
TagHelper.generateInitialTags(
spaceTagModels: spaceTagModels, spaceTagModels: spaceTagModels,
subspaces: subspaces, subspaces: subspaces,
); );
@ -175,11 +180,12 @@ class AddDeviceTypeModelWidget extends StatelessWidget {
context: context, context: context,
builder: (context) => AssignTagModelsDialog( builder: (context) => AssignTagModelsDialog(
products: products, products: products,
allSpaceModels: allSpaceModels,
subspaces: subspaces, subspaces: subspaces,
addedProducts: state.selectedProducts, addedProducts: state.selectedProducts,
allTags: allTags, allTags: allTags,
spaceName: spaceName, spaceName: spaceName,
initialTags: state.initialTag, initialTags: initialTags,
otherSpaceModels: otherSpaceModels, otherSpaceModels: otherSpaceModels,
title: dialogTitle, title: dialogTitle,
spaceModel: spaceModel, spaceModel: spaceModel,
@ -200,29 +206,4 @@ class AddDeviceTypeModelWidget extends StatelessWidget {
), ),
); );
} }
List<TagModel> generateInitialTags({
List<TagModel>? spaceTagModels,
List<SubspaceTemplateModel>? subspaces,
}) {
final List<TagModel> initialTags = [];
if (spaceTagModels != null) {
initialTags.addAll(spaceTagModels);
}
if (subspaces != null) {
for (var subspace in subspaces) {
if (subspace.tags != null) {
initialTags.addAll(
subspace.tags!.map(
(tag) => tag.copyWith(location: subspace.subspaceName),
),
);
}
}
}
return initialTags;
}
} }

2
lib/utils/color_manager.dart
View File

@ -70,5 +70,5 @@ abstract class ColorsManager {
static const Color invitedOrangeText = Color(0xFFFFBF00); static const Color invitedOrangeText = Color(0xFFFFBF00);
static const Color lightGrayBorderColor = Color(0xB2D5D5D5); static const Color lightGrayBorderColor = Color(0xB2D5D5D5);
//background: #F8F8F8; //background: #F8F8F8;
static const Color vividBlue = Color(0xFF023DFE);
} }

3
lib/utils/constants/assets.dart
View File

@ -259,6 +259,7 @@ class Assets {
static const String delete = 'assets/icons/delete.svg'; static const String delete = 'assets/icons/delete.svg';
static const String edit = 'assets/icons/edit.svg'; static const String edit = 'assets/icons/edit.svg';
static const String editSpace = 'assets/icons/edit_space.svg';
//assets/icons/routine/tab_to_run.svg //assets/icons/routine/tab_to_run.svg
static const String tabToRun = 'assets/icons/routine/tab_to_run.svg'; static const String tabToRun = 'assets/icons/routine/tab_to_run.svg';
@ -398,5 +399,7 @@ class Assets {
static const String ZtoAIcon = 'assets/icons/ztoa_icon.png'; static const String ZtoAIcon = 'assets/icons/ztoa_icon.png';
static const String AtoZIcon = 'assets/icons/atoz_icon.png'; static const String AtoZIcon = 'assets/icons/atoz_icon.png';
static const String link = 'assets/icons/link.svg'; static const String link = 'assets/icons/link.svg';
static const String duplicate = 'assets/icons/duplicate.svg';
static const String spaceDelete = 'assets/icons/space_delete.svg';
} }
//user_management.svg //user_management.svg