Merge remote-tracking branch 'origin/main'

moevm · Dec 22, 2024 · d8112c8 · d8112c8
2 parents 621c09c + 6db2040
commit d8112c8
Show file tree

Hide file tree

Showing 10 changed files with 152 additions and 96 deletions.
diff --git a/backend/src/main/java/ru/yandex/forms/controllers/FormController.java b/backend/src/main/java/ru/yandex/forms/controllers/FormController.java
@@ -76,7 +76,7 @@ public ResponseEntity<String> createForm(@RequestBody FormRequest formRequest){
             return new ResponseEntity<>("Название таблицы не может быть пустым", HttpStatus.BAD_REQUEST);
         }
         if (formService.isContain(formRequest.getOwnerMail(), formRequest.getFormName())){
-            return new ResponseEntity<>("Название таблицы не уникальное", HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>("Название формы не уникальное", HttpStatus.BAD_REQUEST);
         }
         Form form = new Form();
 
@@ -88,7 +88,7 @@ public ResponseEntity<String> createForm(@RequestBody FormRequest formRequest){
         if (!formService.isTableExist(formRequest.getTableName())){
             formService.createXlsxFile(formRequest.getTableName());
         }
-        form.setPath("./backend/uploads/tables/" + formRequest.getTableName() + ".xlsx");
+        form.setPath("./uploads/tables/" + formRequest.getTableName() + ".xlsx");
         form.setTableName(formRequest.getTableName());
 
         formRepository.save(form);
@@ -159,7 +159,7 @@ public ResponseEntity<String> updateForm(
             return new ResponseEntity<>(HttpStatus.NOT_FOUND);
         }
         if (formService.isContain(form.get().getOwnerEmail(), patchFormRequest.getFormName())){
-            return new ResponseEntity<>("Название таблицы не уникальное", HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>("Название формы не уникальное", HttpStatus.BAD_REQUEST);
         }
 
         return formService.updateForm(patchFormRequest.getFormId(), patchFormRequest.getFormName(), patchFormRequest.getTableName());

diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
@@ -1,8 +1,8 @@
 spring.application.name=forms
 
 
-#spring.data.mongodb.uri=${DB_URL}
-spring.data.mongodb.uri=mongodb://localhost:27017/test
+spring.data.mongodb.uri=${DB_URL}
+#spring.data.mongodb.uri=mongodb://localhost:27017/test
 
 spring.jpa.hibernate.ddl-auto=update
 

diff --git a/backend/uploads/tables/form1.xlsx b/backend/uploads/tables/form1.xlsx
diff --git a/backend/uploads/tables/form2.xlsx b/backend/uploads/tables/form2.xlsx
diff --git a/backend/uploads/tables/form3.xlsx b/backend/uploads/tables/form3.xlsx
diff --git a/frontend/public/blackArrow.svg b/frontend/public/blackArrow.svg
diff --git a/frontend/src/components/SignIn/SignIn.jsx b/frontend/src/components/SignIn/SignIn.jsx
@@ -25,7 +25,6 @@ export default function SignIn() {
             })
 
             await axios.get(`http://localhost:8080/forms/available/redactors/${foundItem.id}`).then((res) => {
-                console.log("res - ", res.data);
                 dispatch(setUsers(res.data))
             })
 

diff --git a/frontend/src/components/Tables/Tables.jsx b/frontend/src/components/Tables/Tables.jsx
@@ -27,11 +27,10 @@ export default function Tables() {
   let allUsers = useSelector((state) => state.user.users);
 
   const initialValuesForNewLink = {
-    table_name: "",
-    form_name: "",
-    redactors: "",
-    creation_date: getCurrentDate("-"),
-    owner_mail: `${mail}`,
+    tableName: "",
+    formName: "",
+    redactors: [],
+    ownerMail: `${mail}`,
   };
   const [newValues, setNewValues] = useState(initialValuesForNewLink);
 
@@ -64,25 +63,31 @@ export default function Tables() {
     setNewValues({ ...newValues, [name]: value });
   };
   const sendNewLink = async (event) => {
-    let modalWindow = document.querySelector(".add-modal-overlay");
     event.preventDefault();
-    console.log("new - ", newValues);
+    let modalWindow = document.querySelector(".add-modal-overlay");
+    let errorSpan = modalWindow.querySelector(".add-error-msg")
+
+    console.log("newValues --- ", newValues);
     try {
-      await axios.post("http://localhost:8080/forms/create-form", {
-        ownerMail: mail,
-        name: newValues.table_name,
-      });
-
+      await axios.post("http://localhost:8080/forms/create-form", newValues);
       const res = await axios.get(`http://localhost:8080/forms/${mail}`);
       dispatch(setBrokers(res.data));
+      modalWindow.classList.add("add-modal-overlay_hidden");
+      errorSpan.innerText = ""
     } catch (error) {
-      console.error("Ошибка при обработке форм: ", error);
+      console.log(error);
+      errorSpan.innerText = `${error.response.data}`
+      // console.error("Ошибка при обработке форм: ", error);
     }
-    modalWindow.classList.add("add-modal-overlay_hidden");
+
   };
   const handleSubmit = () => {
     let modalWindow = document.querySelector(".add-modal-overlay");
     modalWindow.classList.remove("add-modal-overlay_hidden");
+    let addErrorSpan = modalWindow.querySelector(".add-error-msg")
+    addErrorSpan.innerText = ""
+
+    setNewValues({ ...newValues, "redactors": [] });
   };
 
   const exportData = () => {
@@ -99,10 +104,10 @@ export default function Tables() {
   };
   const fileInputRef = useRef(null);
   const importData = () => {
+    fileInputRef.current.value = "";
     fileInputRef.current.click();
   };
   const handleFileChange = async (event) => {
-    console.log("asdasd");
     const selectedFile = event.target.files[0];
     if (selectedFile) {
       const formData = new FormData();
@@ -115,6 +120,7 @@ export default function Tables() {
           });
 
         const res = await axios.get(`http://localhost:8080/forms/${mail}`);
+        console.log("res data - ", res.data);
         dispatch(setBrokers(res.data));
       } catch (error) {
         console.error("Ошибка при обработке форм: ", error);
@@ -125,8 +131,6 @@ export default function Tables() {
   let activeForm = null;
   const deleteForm = async () => {
     if (activeForm) {
-      console.log("удаляем activeForm и загружаем оставшиеся", activeForm);
-      console.log("activeForm.id", activeForm.id);
       await axios.delete(`http://localhost:8080/forms/${activeForm.id}`);
       const res = await axios.get(`http://localhost:8080/forms/${mail}`);
       dispatch(setBrokers(res.data));
@@ -144,6 +148,8 @@ export default function Tables() {
     let currentForm = event.target.closest("tr")
     activeForm = JSON.parse(currentForm.dataset.form);
 
+    let editErrorSpan = document.querySelector(".edit-error-msg")
+
     if (showbut) {
       let saveBut = document.querySelector('[name="saveBut"]')
       console.log("saveBut in tbody - ", saveBut);
@@ -191,6 +197,7 @@ export default function Tables() {
       }
     }
     if (editImg) {
+      editErrorSpan.innerText = ""
       let editModalWindow = document.querySelector(".edit-modal-overlay");
       editModalWindow.classList.remove("edit-modal-overlay_hidden");
     }
@@ -213,28 +220,34 @@ export default function Tables() {
     redactorsModalWindow.classList.remove("redactors-modal-overlay_hidden");
     let saveBut = redactorsModalWindow.querySelector('[name="saveBut"]')
     saveBut.setAttribute("data-create", "true")
-    console.log("saveBut", saveBut);
   }
   const editForm = async (event) => {
     event.preventDefault()
 
     if (activeForm) {
-      let editInfo = event.target.querySelectorAll(".text-field__input")
+      let editModalWindow = document.querySelector(".edit-modal-overlay");
+      let errorSpan = editModalWindow.querySelector(".edit-error-msg")
+
+      let editInfo = editModalWindow.querySelectorAll(".text-field__input")
+      console.log(editInfo);
       const values = Array.from(editInfo).map(input => input.value);
 
       const formData = Object.fromEntries(values.map((value, index) => [`${index === 0 ? 'formName' : 'tableName'}`, value]));
       formData["formId"] = activeForm.id
 
-      await axios.patch(`http://localhost:8080/forms/update`, formData);
-      const res = await axios.get(`http://localhost:8080/forms/${mail}`);
-      dispatch(setBrokers(res.data));
-      console.log("new ---", res.data);
-      editInfo.forEach((input) => {
-        input.value = ''
-      })
-
-      let editModalWindow = document.querySelector(".edit-modal-overlay");
-      editModalWindow.classList.add("edit-modal-overlay_hidden");
+      try {
+
+        await axios.patch(`http://localhost:8080/forms/update`, formData);
+        const res = await axios.get(`http://localhost:8080/forms/${mail}`);
+        dispatch(setBrokers(res.data));
+        editInfo.forEach((input) => {
+          input.value = ''
+        })
+        editModalWindow.classList.add("edit-modal-overlay_hidden");
+      }
+      catch (error) {
+        errorSpan.innerText = `${error.response.data}`
+      }
     }
   }
 
@@ -245,11 +258,9 @@ export default function Tables() {
     let allCheckBoxes = redactorsModalWindow.querySelectorAll('[type="checkbox"]')
     const filteredCheckBoxes = Array.from(allCheckBoxes).filter(input => input.checked);
     const namesNewRedactors = filteredCheckBoxes.map(input => input.name);
-
+    console.log("namesNewRedactors", namesNewRedactors);
 
     if (saveBut.dataset.create) {
-      console.log("[В кнопке создания] newRedactors - ", namesNewRedactors);
-      console.log("[В кнопке создания] ждем остальных данных и отправялем");
       setNewValues({ ...newValues, "redactors": namesNewRedactors });
     }
     else {
@@ -258,9 +269,6 @@ export default function Tables() {
         const res = await axios.get(`http://localhost:8080/forms/${mail}`);
         dispatch(setBrokers(res.data));
       }
-
-      console.log("[В таблице] newRedactors - ", namesNewRedactors);
-      console.log("[В таблице] отправляем косте запрос и получаем новый forms");
     }
 
     redactorsModalWindow.classList.add("redactors-modal-overlay_hidden");
@@ -375,16 +383,16 @@ export default function Tables() {
             </h3>
             <div className="inputs">
               <input
-                name="table_name"
+                name="formName"
                 className="text-field__input"
                 onChange={handleChange}
-                placeholder="Название таблицы"
+                placeholder="Название связи (формы)"
               ></input>
               <input
-                name="form_name"
+                name="tableName"
                 className="text-field__input"
                 onChange={handleChange}
-                placeholder="Название связи (формы)"
+                placeholder="Название таблицы"
               ></input>
               <button type="button" className="button addRedactor" onClick={showAllUsers}>Настроить редакторов</button>
 
@@ -399,6 +407,7 @@ export default function Tables() {
               <Button type="button" text="Отмена" click={closeModal}></Button>
               <Button type="submit" text="Добавить связь"></Button>
             </div>
+            <span className="add-error-msg"></span>
           </form>
         </div>
       </div>
@@ -430,6 +439,7 @@ export default function Tables() {
               <Button type="button" text="Отмена" click={closeModal}></Button>
               <Button type="submit" text="Сохранить" ></Button>
             </div>
+            <span className="edit-error-msg"></span>
           </form>
 
         </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,6 @@ export default function SignIn() { @@
                 })
                 await axios.get(`http://localhost:8080/forms/available/redactors/${foundItem.id}`).then((res) => {
-                    console.log("res - ", res.data);
                     dispatch(setUsers(res.data))
                 })
@@ Expand Down @@