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

fixed space creation api

Browse Source
This commit is contained in:
hannathkadher
2025-01-12 11:37:10 +04:00
parent 1be52adcc8
commit a588351482
10 changed files with 123 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,7 +107,9 @@ class AddDeviceTypeWidget extends StatelessWidget {
spaceName: spaceName,
initialTags: initialTags,
title: dialogTitle,
onSave: onSave,
onSave: (tags,subspaces){
onSave!(tags,subspaces);
},
),
);
}

40
lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
View File

@ -1,10 +1,14 @@
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/create_subspace_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/space_model.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_state.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.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/space_template_model.dart';
import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_body_model.dart';
import 'package:syncrow_web/services/product_api.dart';
import 'package:syncrow_web/services/space_mana_api.dart';
import 'package:syncrow_web/services/space_model_mang_api.dart';
@ -343,7 +347,7 @@ class SpaceManagementBloc
emit(SpaceCreationSuccess(spaces: updatedSpaces));
if (previousState is SpaceManagementLoaded) {
_updateLoadedState(
await _updateLoadedState(
previousState,
allSpaces,
event.communityUuid,
@ -361,23 +365,25 @@ class SpaceManagementBloc
}
}
void _updateLoadedState(
Future<void> _updateLoadedState(
SpaceManagementLoaded previousState,
List<SpaceModel> allSpaces,
String communityUuid,
Emitter<SpaceManagementState> emit,
) {
) async {
var prevSpaceModels = await fetchSpaceModels(previousState);
final communities = List<CommunityModel>.from(previousState.communities);
for (var community in communities) {
if (community.uuid == communityUuid) {
community.spaces = allSpaces;
emit(SpaceManagementLoaded(
communities: communities,
products: _cachedProducts ?? [],
selectedCommunity: community,
selectedSpace: null,
));
communities: communities,
products: _cachedProducts ?? [],
selectedCommunity: community,
selectedSpace: null,
spaceModels: prevSpaceModels));
return;
}
}
@ -416,6 +422,21 @@ class SpaceManagementBloc
);
} else {
// Call create if the space does not have a UUID
final List<CreateTagBodyModel> tagBodyModels = space.tags != null
? space.tags!.map((tag) => tag.toCreateTagBodyModel()).toList()
: [];
final createSubspaceBodyModels = space.subspaces?.map((subspace) {
final tagBodyModels = subspace.tags
?.map((tag) => tag.toCreateTagBodyModel())
.toList() ??
[];
return CreateSubspaceModel()
..subspaceName = subspace.subspaceName
..tags = tagBodyModels;
}).toList() ??
[];
final response = await _api.createSpace(
communityId: communityUuid,
name: space.name,
@ -424,6 +445,9 @@ class SpaceManagementBloc
position: space.position,
icon: space.icon,
direction: space.incomingConnection?.direction,
spaceModelUuid: space.spaceModel?.uuid,
tags: tagBodyModels,
subspaces: createSubspaceBodyModels,
);
space.uuid = response?.uuid;
}

13
lib/pages/spaces_management/all_spaces/model/create_subspace_model.dart Normal file
View File

@ -0,0 +1,13 @@
import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_body_model.dart';
class CreateSubspaceModel {
late String subspaceName;
late List<CreateTagBodyModel>? tags;
Map<String, dynamic> toJson() {
return {
'subspaceName': subspaceName,
'tags': tags?.map((tag) => tag.toJson()).toList(),
};
}
}

2
lib/pages/spaces_management/all_spaces/model/space_model.dart
View File

@ -24,7 +24,7 @@ class SpaceModel {
SpaceStatus status;
String internalId;
SpaceTemplateModel? spaceModel;
final List<Tag>? tags;
List<Tag>? tags;
List<SubspaceModel>? subspaces;
List<Connection> outgoingConnections = []; // Connections from this space

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

@ -1,5 +1,6 @@
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/tag_body_model.dart';
import 'package:uuid/uuid.dart';
class Tag {
@ -58,4 +59,10 @@ extension TagModelExtensions on Tag {
..tag = tag ?? ''
..productUuid = product?.uuid;
}
CreateTagBodyModel toCreateTagBodyModel() {
return CreateTagBodyModel()
..tag = tag ?? ''
..productUuid = product?.uuid;
}
}

1
lib/pages/spaces_management/all_spaces/view/spaces_management_page.dart
View File

@ -54,7 +54,6 @@ class SpaceManagementPageState extends State<SpaceManagementPage> {
shouldNavigateToSpaceModelPage: false,
);
} else if (state is SpaceManagementLoaded) {
print("sdksndsnadf ${state.spaceModels}");
return LoadedSpaceView(
communities: state.communities,
selectedCommunity: state.selectedCommunity,

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

@ -11,6 +11,8 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_pr
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_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/connection_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/widgets/blank_community_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';
@ -55,7 +57,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
@override
void initState() {
super.initState();
print("sxdsf ${widget.spaceModels}");
spaces = widget.spaces.isNotEmpty ? flattenSpaces(widget.spaces) : [];
connections =
widget.spaces.isNotEmpty ? createConnections(widget.spaces) : [];
@ -293,21 +294,24 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
onCreateSpace: (String name,
String icon,
List<SelectedProduct> selectedProducts,
SpaceTemplateModel? spaceModel) {
SpaceTemplateModel? spaceModel,
List<SubspaceModel>? subspaces,
List<Tag>? tags) {
setState(() {
// Set the first space in the center or use passed position
Offset centerPosition =
position ?? _getCenterPosition(screenSize);
SpaceModel newSpace = SpaceModel(
name: name,
icon: icon,
position: centerPosition,
isPrivate: false,
children: [],
status: SpaceStatus.newSpace,
spaceModel: spaceModel,
);
name: name,
icon: icon,
position: centerPosition,
isPrivate: false,
children: [],
status: SpaceStatus.newSpace,
spaceModel: spaceModel,
subspaces: subspaces,
tags: tags);
if (parentIndex != null && direction != null) {
SpaceModel parentSpace = spaces[parentIndex];
@ -346,12 +350,16 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
onCreateSpace: (String name,
String icon,
List<SelectedProduct> selectedProducts,
SpaceTemplateModel? spaceModel) {
SpaceTemplateModel? spaceModel,
List<SubspaceModel>? subspaces,
List<Tag>? tags) {
setState(() {
// Update the space's properties
space.name = name;
space.icon = icon;
space.spaceModel = spaceModel;
space.subspaces= subspaces;
space.tags = tags;
if (space.status != SpaceStatus.newSpace) {
space.status = SpaceStatus.modified; // Mark as modified

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

@ -18,7 +18,7 @@ import 'package:syncrow_web/utils/constants/space_icon_const.dart';
class CreateSpaceDialog extends StatefulWidget {
final Function(String, String, List<SelectedProduct> selectedProducts,
SpaceTemplateModel? spaceModel) onCreateSpace;
SpaceTemplateModel? spaceModel, List<SubspaceModel>? subspaces, List<Tag>? tags) onCreateSpace;
final List<ProductModel>? products;
final String? name;
final String? icon;
@ -487,7 +487,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
GestureDetector(
onTap: () async {
_showTagCreateDialog(context, enteredName,
tags, subspaces, widget.products);
widget.products);
// Edit action
},
child: Chip(
@ -511,8 +511,8 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
)
: DefaultButton(
onPressed: () {
_showTagCreateDialog(context, enteredName, tags,
subspaces, widget.products);
_showTagCreateDialog(
context, enteredName, widget.products);
},
backgroundColor: ColorsManager.textFieldGreyColor,
foregroundColor: Colors.black,
@ -580,7 +580,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
: (widget.name ?? '');
if (newName.isNotEmpty) {
widget.onCreateSpace(newName, selectedIcon,
selectedProducts, selectedSpaceModel);
selectedProducts, selectedSpaceModel,subspaces,tags);
Navigator.of(context).pop();
}
}
@ -673,11 +673,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
}
void _showTagCreateDialog(
BuildContext context,
String name,
final List<Tag>? spaceTags,
List<SubspaceModel>? subspaces,
List<ProductModel>? products) {
BuildContext context, String name, List<ProductModel>? products) {
showDialog(
context: context,
builder: (BuildContext context) {
@ -685,16 +681,18 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
spaceName: name,
products: products,
subspaces: subspaces,
spaceTags: spaceTags,
spaceTags: tags,
allTags: [],
initialSelectedProducts:
createInitialSelectedProducts(tags, subspaces),
onSave: (selectedSpaceTags, selectedSubspaces) {
setState(() {
if (spaceTags != null) selectedSpaceTags = spaceTags;
tags = selectedSpaceTags;
selectedSpaceModel = null;
if (selectedSubspaces != null) {
if (subspaces != null) {
for (final subspace in subspaces) {
for (final subspace in subspaces!) {
for (final selectedSubspace in selectedSubspaces) {
if (subspace.subspaceName ==
selectedSubspace.subspaceName) {

16
lib/pages/spaces_management/space_model/models/tag_body_model.dart Normal file
View File

@ -0,0 +1,16 @@
class CreateTagBodyModel {
late String tag;
late final String? productUuid;
Map<String, dynamic> toJson() {
return {
'tag': tag,
'productUuid': productUuid,
};
}
@override
String toString() {
return toJson().toString();
}
}

31
lib/services/space_mana_api.dart
View File

@ -1,7 +1,10 @@
import 'package:flutter/material.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
import 'package:syncrow_web/pages/spaces_management/all_spaces/model/create_subspace_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_response_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/services/api/http_service.dart';
import 'package:syncrow_web/utils/constants/api_const.dart';
import 'package:syncrow_web/utils/constants/temp_const.dart';
@ -161,15 +164,17 @@ class CommunitySpaceManagementApi {
}
}
Future<SpaceModel?> createSpace({
required String communityId,
required String name,
String? parentId,
String? direction,
bool isPrivate = false,
required Offset position,
String? icon,
}) async {
Future<SpaceModel?> createSpace(
{required String communityId,
required String name,
String? parentId,
String? direction,
bool isPrivate = false,
required Offset position,
String? spaceModelUuid,
String? icon,
List<CreateTagBodyModel>? tags,
List<CreateSubspaceModel>? subspaces}) async {
try {
final body = {
'spaceName': name,
@ -182,6 +187,13 @@ class CommunitySpaceManagementApi {
if (parentId != null) {
body['parentUuid'] = parentId;
}
if (tags != null) {
body['tags'] = tags;
}
if (spaceModelUuid != null) body['spaceModelUuid'] = spaceModelUuid;
if (subspaces != null) body['subspaces'] = subspaces;
final response = await HTTPService().post(
path: ApiEndpoints.createSpace
.replaceAll('{communityId}', communityId)
@ -263,7 +275,6 @@ class CommunitySpaceManagementApi {
.replaceAll('{communityId}', communityId)
.replaceAll('{projectId}', TempConst.projectId),
expectedResponseModel: (json) {
print(json);
final spaceModels = (json['data'] as List)
.map((spaceJson) => SpaceModel.fromJson(spaceJson))
.toList();