[WEB-2129] fix: module creation and updation toast error (#5550)
* chore: added error message for module name * used the backend message --------- Co-authored-by: NarayanBavisetti <narayan3119@gmail.com>
This commit is contained in:
parent
68b412badf
commit
29fd1186ee
3 changed files with 48 additions and 2 deletions
|
|
@ -71,6 +71,16 @@ class ModuleSerializer(BaseSerializer):
|
||||||
project_id = self.context["project_id"]
|
project_id = self.context["project_id"]
|
||||||
workspace_id = self.context["workspace_id"]
|
workspace_id = self.context["workspace_id"]
|
||||||
|
|
||||||
|
module_name = validated_data.get("name")
|
||||||
|
if module_name:
|
||||||
|
# Lookup for the module name in the module table for that project
|
||||||
|
if Module.objects.filter(
|
||||||
|
name=module_name, project_id=project_id
|
||||||
|
).exists():
|
||||||
|
raise serializers.ValidationError(
|
||||||
|
{"error": "Module with this name already exists"}
|
||||||
|
)
|
||||||
|
|
||||||
module = Module.objects.create(**validated_data, project_id=project_id)
|
module = Module.objects.create(**validated_data, project_id=project_id)
|
||||||
if members is not None:
|
if members is not None:
|
||||||
ModuleMember.objects.bulk_create(
|
ModuleMember.objects.bulk_create(
|
||||||
|
|
@ -93,6 +103,19 @@ class ModuleSerializer(BaseSerializer):
|
||||||
|
|
||||||
def update(self, instance, validated_data):
|
def update(self, instance, validated_data):
|
||||||
members = validated_data.pop("members", None)
|
members = validated_data.pop("members", None)
|
||||||
|
module_name = validated_data.get("name")
|
||||||
|
if module_name:
|
||||||
|
# Lookup for the module name in the module table for that project
|
||||||
|
if (
|
||||||
|
Module.objects.filter(
|
||||||
|
name=module_name, project=instance.project
|
||||||
|
)
|
||||||
|
.exclude(id=instance.id)
|
||||||
|
.exists()
|
||||||
|
):
|
||||||
|
raise serializers.ValidationError(
|
||||||
|
{"error": "Module with this name already exists"}
|
||||||
|
)
|
||||||
|
|
||||||
if members is not None:
|
if members is not None:
|
||||||
ModuleMember.objects.filter(module=instance).delete()
|
ModuleMember.objects.filter(module=instance).delete()
|
||||||
|
|
|
||||||
|
|
@ -68,6 +68,16 @@ class ModuleWriteSerializer(BaseSerializer):
|
||||||
members = validated_data.pop("member_ids", None)
|
members = validated_data.pop("member_ids", None)
|
||||||
project = self.context["project"]
|
project = self.context["project"]
|
||||||
|
|
||||||
|
module_name = validated_data.get("name")
|
||||||
|
if module_name:
|
||||||
|
# Lookup for the module name in the module table for that project
|
||||||
|
if Module.objects.filter(
|
||||||
|
name=module_name, project=project
|
||||||
|
).exists():
|
||||||
|
raise serializers.ValidationError(
|
||||||
|
{"error": "Module with this name already exists"}
|
||||||
|
)
|
||||||
|
|
||||||
module = Module.objects.create(**validated_data, project=project)
|
module = Module.objects.create(**validated_data, project=project)
|
||||||
if members is not None:
|
if members is not None:
|
||||||
ModuleMember.objects.bulk_create(
|
ModuleMember.objects.bulk_create(
|
||||||
|
|
@ -90,6 +100,19 @@ class ModuleWriteSerializer(BaseSerializer):
|
||||||
|
|
||||||
def update(self, instance, validated_data):
|
def update(self, instance, validated_data):
|
||||||
members = validated_data.pop("member_ids", None)
|
members = validated_data.pop("member_ids", None)
|
||||||
|
module_name = validated_data.get("name")
|
||||||
|
if module_name:
|
||||||
|
# Lookup for the module name in the module table for that project
|
||||||
|
if (
|
||||||
|
Module.objects.filter(
|
||||||
|
name=module_name, project=instance.project
|
||||||
|
)
|
||||||
|
.exclude(id=instance.id)
|
||||||
|
.exists()
|
||||||
|
):
|
||||||
|
raise serializers.ValidationError(
|
||||||
|
{"error": "Module with this name already exists"}
|
||||||
|
)
|
||||||
|
|
||||||
if members is not None:
|
if members is not None:
|
||||||
ModuleMember.objects.filter(module=instance).delete()
|
ModuleMember.objects.filter(module=instance).delete()
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ export const CreateUpdateModuleModal: React.FC<Props> = observer((props) => {
|
||||||
setToast({
|
setToast({
|
||||||
type: TOAST_TYPE.ERROR,
|
type: TOAST_TYPE.ERROR,
|
||||||
title: "Error!",
|
title: "Error!",
|
||||||
message: err?.detail ?? "Module could not be created. Please try again.",
|
message: err?.detail ?? err?.error ?? "Module could not be created. Please try again.",
|
||||||
});
|
});
|
||||||
captureModuleEvent({
|
captureModuleEvent({
|
||||||
eventName: MODULE_CREATED,
|
eventName: MODULE_CREATED,
|
||||||
|
|
@ -102,7 +102,7 @@ export const CreateUpdateModuleModal: React.FC<Props> = observer((props) => {
|
||||||
setToast({
|
setToast({
|
||||||
type: TOAST_TYPE.ERROR,
|
type: TOAST_TYPE.ERROR,
|
||||||
title: "Error!",
|
title: "Error!",
|
||||||
message: err?.detail ?? "Module could not be updated. Please try again.",
|
message: err?.detail ?? err?.error ?? "Module could not be updated. Please try again.",
|
||||||
});
|
});
|
||||||
captureModuleEvent({
|
captureModuleEvent({
|
||||||
eventName: MODULE_UPDATED,
|
eventName: MODULE_UPDATED,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue