From c4d168d74062afc7907a82b0e8dbb8a1ef2a632d Mon Sep 17 00:00:00 2001
From: raphaelsack <i20029@hb.dhbw-stuttgart.de>
Date: Tue, 10 May 2022 14:22:19 +0200
Subject: [PATCH] hotfix 3.2

---
 frontend/public/locales/de-DE/translation.json                | 4 ++++
 .../components/Modals/DungeonConfigurator/AddActionModal.tsx  | 2 +-
 .../components/Modals/DungeonConfigurator/AddClassModal.tsx   | 2 +-
 .../components/Modals/DungeonConfigurator/AddGenderModal.tsx  | 2 +-
 .../components/Modals/DungeonConfigurator/AddItemModal.tsx    | 2 +-
 .../src/components/Modals/DungeonConfigurator/AddNpcModal.tsx | 2 +-
 .../components/Modals/DungeonConfigurator/AddRoomModal.tsx    | 1 -
 .../components/Modals/DungeonConfigurator/AddSpeciesModal.tsx | 2 +-
 8 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/frontend/public/locales/de-DE/translation.json b/frontend/public/locales/de-DE/translation.json
index 4b7d64a5..49dc9110 100644
--- a/frontend/public/locales/de-DE/translation.json
+++ b/frontend/public/locales/de-DE/translation.json
@@ -288,6 +288,10 @@
                 "title": "Bitte gebe alle geforderten Daten ein",
                 "text": "Um einen Raum zu speichern, muss es einen Eintrag in den folgenden Feldern geben: Name, Beschreibung!"
             },
+            "npc":{
+                "title": "Bitte gebe alle geforderten Daten ein",
+                "text": "Um einen NPC zu speichern, muss es einen Eintrag in den folgenden Feldern geben: Name, Beschreibung und Spezies!"
+            },
             "gender": {
                 "title": "Bitte gebe alle geforderten Daten ein",
                 "text": "Bitte gebe einen Namen für das Geschlecht an"
diff --git a/frontend/src/components/Modals/DungeonConfigurator/AddActionModal.tsx b/frontend/src/components/Modals/DungeonConfigurator/AddActionModal.tsx
index 91d895d0..a0040836 100644
--- a/frontend/src/components/Modals/DungeonConfigurator/AddActionModal.tsx
+++ b/frontend/src/components/Modals/DungeonConfigurator/AddActionModal.tsx
@@ -135,7 +135,7 @@ const AddActionModal: React.FC<AddActionModalProps> = (props) => {
     ]
 
     const onSubmit = () => {
-        if (validator.alreadyExists(command, "command", dconf.actions)){
+        if (!props.editData && validator.alreadyExists(command, "command", dconf.actions)){
             setError(t(`actionalreadyexists`));
             return;
         }
diff --git a/frontend/src/components/Modals/DungeonConfigurator/AddClassModal.tsx b/frontend/src/components/Modals/DungeonConfigurator/AddClassModal.tsx
index 597ac4d0..56446b43 100644
--- a/frontend/src/components/Modals/DungeonConfigurator/AddClassModal.tsx
+++ b/frontend/src/components/Modals/DungeonConfigurator/AddClassModal.tsx
@@ -40,7 +40,7 @@ const AddClassModal: React.FC<AddClassModalProps> = (props) => {
     }
     
     const onSubmit = () => {
-        if (validator.alreadyExists(name, "name", dconf.classes)) {
+        if (!props.editData && validator.alreadyExists(name, "name", dconf.classes)) {
             setError(t(`classalreadyexists`));
             return;
         }
diff --git a/frontend/src/components/Modals/DungeonConfigurator/AddGenderModal.tsx b/frontend/src/components/Modals/DungeonConfigurator/AddGenderModal.tsx
index 75260016..2ee41e0a 100644
--- a/frontend/src/components/Modals/DungeonConfigurator/AddGenderModal.tsx
+++ b/frontend/src/components/Modals/DungeonConfigurator/AddGenderModal.tsx
@@ -36,7 +36,7 @@ const AddGenderModal: React.FC<AddGenderModalProps> = (props) => {
     }
 
     const onSubmit = () => {
-        if (validator.alreadyExists(name, "name", dconf.genders)) {
+        if (!props.editData && validator.alreadyExists(name, "name", dconf.genders)) {
             setError(t(`genderalreadyexists`));
             return;
         }
diff --git a/frontend/src/components/Modals/DungeonConfigurator/AddItemModal.tsx b/frontend/src/components/Modals/DungeonConfigurator/AddItemModal.tsx
index f43d4467..c52cb0e4 100644
--- a/frontend/src/components/Modals/DungeonConfigurator/AddItemModal.tsx
+++ b/frontend/src/components/Modals/DungeonConfigurator/AddItemModal.tsx
@@ -37,7 +37,7 @@ const AddItemModal: React.FC<AddItemModalProps> = (props) => {
     }
 
     const onSubmit = () => {
-        if (validator.alreadyExists(name, "name", dconf.items)) {
+        if (!props.editData && validator.alreadyExists(name, "name", dconf.items)) {
             setError(t(`itemalreadyexists`));
             return;
         }
diff --git a/frontend/src/components/Modals/DungeonConfigurator/AddNpcModal.tsx b/frontend/src/components/Modals/DungeonConfigurator/AddNpcModal.tsx
index 764dbc27..53a9f8b0 100644
--- a/frontend/src/components/Modals/DungeonConfigurator/AddNpcModal.tsx
+++ b/frontend/src/components/Modals/DungeonConfigurator/AddNpcModal.tsx
@@ -40,7 +40,7 @@ const AddNpcModal: React.FC<AddNpcModalProps> = (props) => {
     }
 
     const onSubmit = () => {
-        if (validator.alreadyExists(name, "name", npcs)) {
+        if (!props.editData && validator.alreadyExists(name, "name", npcs)) {
             setError(t(`npcalreadyexists`));
             return;
         }
diff --git a/frontend/src/components/Modals/DungeonConfigurator/AddRoomModal.tsx b/frontend/src/components/Modals/DungeonConfigurator/AddRoomModal.tsx
index 7b68ee05..2f974a8a 100644
--- a/frontend/src/components/Modals/DungeonConfigurator/AddRoomModal.tsx
+++ b/frontend/src/components/Modals/DungeonConfigurator/AddRoomModal.tsx
@@ -37,7 +37,6 @@ const AddRoomModal: React.FC<AddRoomModalProps> = (props) => {
     }
 
     const onSubmit = () => {
-        console.log(validator.alreadyExists(name, "name", rooms))
         if (validator.alreadyExists(name, "name", rooms)) {
             setError(t(`roomalreadyexists`));
             return;
diff --git a/frontend/src/components/Modals/DungeonConfigurator/AddSpeciesModal.tsx b/frontend/src/components/Modals/DungeonConfigurator/AddSpeciesModal.tsx
index afee21dc..338d3366 100644
--- a/frontend/src/components/Modals/DungeonConfigurator/AddSpeciesModal.tsx
+++ b/frontend/src/components/Modals/DungeonConfigurator/AddSpeciesModal.tsx
@@ -36,7 +36,7 @@ const AddSpeciesModal: React.FC<AddSpeciesModalProps> = (props) => {
     }
 
     const onSubmit = () => {
-        if (validator.alreadyExists(name, "name", species)) {
+        if (!props.editData && validator.alreadyExists(name, "name", species)) {
             setError(t(`speciesalreadyexists`));
             return;
         }