Merge branch 'enhancement/26-wrong-input', fixes #26
es wurde vor allem das required vom eingabefeld entfernt weil die ganzen fehlerdemlungen vom server kommen und das für bessere Fehlermeldungen un Eingabealdiderung erlaubt
This commit is contained in:
commit
75d9591f2d
12 files changed
+122
-55
No files matched your search
@@ -4,5 +4,5 @@ import jakarta.validation.constraints.NotBlank;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public record ShoppingCategoryPostDTO(@NotBlank String categoryName, UUID listID) {
|
||||
public record ShoppingCategoryPostDTO(@NotBlank(message = "categoryName must not be blank!") String categoryName, UUID listID) {
|
||||
}
|
||||
@@ -58,12 +58,15 @@ input:not([type="checkbox"]):not([type="radio"]), select {
|
||||
input::placeholder { color: var(--c-muted); }
|
||||
|
||||
input.is-invalid:not([type="checkbox"]):not([type="radio"]),
|
||||
input:user-invalid:not([type="checkbox"]):not([type="radio"]),
|
||||
select.is-invalid {
|
||||
border-color: var(--c-danger);
|
||||
}
|
||||
|
||||
.is-invalid:focus-visible {
|
||||
outline-color: var(--c-danger);
|
||||
}
|
||||
|
||||
button {
|
||||
font: inherit;
|
||||
padding: var(--space-2) var(--space-3);
|
||||
@@ -82,13 +85,19 @@ button:hover { background: var(--c-accent-hover); }
|
||||
|
||||
|
||||
/* ---- Bearbeitung ---- */
|
||||
.editForm__saveButton, .editForm__abortButton {
|
||||
margin-top: var(--space-2);
|
||||
margin-right: var(--space-1);
|
||||
.error-message{
|
||||
flex-basis: 100%;
|
||||
font-size: .75rem;
|
||||
color: var(--c-danger);
|
||||
}
|
||||
|
||||
.editForm__name {
|
||||
margin-right: var(--space-2);
|
||||
.editForm {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: var(--space-2);
|
||||
align-items: center;
|
||||
margin: var(--space-1);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
display: flex;
|
||||
gap: var(--space-2);
|
||||
margin-bottom: var(--space-4);
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.addListForm input { flex: 1; }
|
||||
|
||||
@@ -19,8 +20,6 @@
|
||||
border-radius: var(--radius);
|
||||
}
|
||||
|
||||
|
||||
|
||||
shopping-list {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
@@ -32,7 +32,10 @@ shopping-category {
|
||||
border-radius: var(--radius)
|
||||
}
|
||||
|
||||
.category__header {
|
||||
.category__header{
|
||||
display: flex;
|
||||
}
|
||||
.category__innerHeader {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: var(--space-2);
|
||||
@@ -56,8 +59,6 @@ shopping-category {
|
||||
color: var(--c-muted);
|
||||
margin-left: auto;
|
||||
}
|
||||
|
||||
|
||||
shopping-category > ul {
|
||||
list-style: none;
|
||||
display: flex;
|
||||
|
||||
@@ -9,7 +9,9 @@ export class ShoppingCategory extends HTMLElement {
|
||||
|
||||
connectedCallback() {
|
||||
if (this._rendered) return;
|
||||
|
||||
const categoryHeaderDiv = document.createElement("div");
|
||||
const categoryHeaderInnerDiv = document.createElement("div");
|
||||
const span = document.createElement("span");
|
||||
const deleteCategoryButton = document.createElement("button");
|
||||
const deleteAllItemsLabel = document.createElement("label");
|
||||
@@ -19,6 +21,7 @@ export class ShoppingCategory extends HTMLElement {
|
||||
|
||||
|
||||
categoryHeaderDiv.classList.add("category__header");
|
||||
categoryHeaderInnerDiv.classList.add("category__innerHeader");
|
||||
|
||||
span.textContent = this.getAttribute("category-name");
|
||||
span.classList.add("category__name", "category__name--bold", "category__name--big");
|
||||
@@ -33,7 +36,9 @@ export class ShoppingCategory extends HTMLElement {
|
||||
|
||||
deleteAllItemsLabel.append(deleteAllItemsCheckbox);
|
||||
|
||||
categoryHeaderDiv.append(span, deleteCategoryButton, deleteAllItemsLabel);
|
||||
categoryHeaderInnerDiv.append(span, deleteCategoryButton, deleteAllItemsLabel);
|
||||
|
||||
categoryHeaderDiv.append(categoryHeaderInnerDiv);
|
||||
|
||||
this.prepend(categoryHeaderDiv);
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { ShoppingList } from "../../models/ShoppingList.js";
|
||||
import { editElement } from "../../shared/editing.js";
|
||||
import { initErrors } from "../../shared/error.js";
|
||||
import { showError } from "../../shared/error.js";
|
||||
import { handleResponse } from "../../shared/helper.js";
|
||||
import { setElementAttributes } from "../../shared/sharedUI.js";
|
||||
import * as api from "./api/indexAPI.js";
|
||||
@@ -9,18 +9,23 @@ import * as ui from "./frontend/indexUI.js"
|
||||
const addListForm = document.querySelector(".addListForm");
|
||||
|
||||
async function addList(listName) {
|
||||
const json = await handleResponse(api.addList(listName), `error creating list`);
|
||||
if (json) ui.addList(json);
|
||||
const response = await handleResponse(api.addList(listName), `error creating list`);
|
||||
if (response.ok) {
|
||||
ui.addList(response.json);
|
||||
} else {
|
||||
const name = document.querySelector(".addListForm__inputName");
|
||||
showError({ highlightFields: [name], elementForMessage: addListForm, message: response.json.msg });
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
async function deleteList(listElement) {
|
||||
const json = await handleResponse(api.deleteList(listElement.dataset.id), `error deleting list`);
|
||||
if (json) ui.deleteList(listElement);
|
||||
const response = await handleResponse(api.deleteList(listElement.dataset.id), `error deleting list`);
|
||||
if (response.ok) ui.deleteList(listElement);
|
||||
}
|
||||
|
||||
function init() {
|
||||
|
||||
initErrors(document.querySelector(".nav"));
|
||||
customElements.define("shopping-list", ShoppingList);
|
||||
|
||||
addListForm.addEventListener("submit", (e) => {
|
||||
@@ -44,6 +49,14 @@ function init() {
|
||||
setElementAttributes(shoppingListElement, { "list-name": f.listName });
|
||||
//nav wird hier ^ aktualisiert
|
||||
}
|
||||
, onFailure: (response) => {
|
||||
|
||||
const editForm = document.querySelector(".editForm");
|
||||
const name = document.querySelector("input.editForm__name");
|
||||
|
||||
showError({ highlightFields: [name], elementForMessage: editForm, message: response.json.msg });
|
||||
}
|
||||
|
||||
, errmsg: `liste konnte nicht aktualsiiert werden`
|
||||
|
||||
})
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import { ShoppingCategory } from "../../models/ShoppingCategory.js";
|
||||
import { ShoppingItem } from "../../models/ShoppingItem.js";
|
||||
import { initErrors } from "../../shared/error.js";
|
||||
import * as api from "./api/listAPI.js"
|
||||
import * as ui from "./frontend/listUI.js"
|
||||
import { handleResponse } from "../../shared/helper.js";
|
||||
import { editElement } from "../../shared/editing.js";
|
||||
import * as sharedUI from "../../shared/sharedUI.js";
|
||||
import { createErrorSpan, showError } from "../../shared/error.js";
|
||||
|
||||
const addCategoryForm = document.querySelector(".addCategoryForm");
|
||||
const addItemForm = document.querySelector(".addItemForm");
|
||||
@@ -15,41 +15,53 @@ const deleteAllDoneItemsButton = document.querySelector(".deleteAllDoneItemsButt
|
||||
async function addItem(itemName, itemAmount, categoryID) {
|
||||
console.log(` adding item with id:${currentList.dataset.id}, name: ${itemName}, amount: ${itemAmount}, category: ${categoryID}`)
|
||||
|
||||
const json = await handleResponse(api.addItem(currentList.dataset.id, itemName, itemAmount, categoryID), `item couldnt be created!`);
|
||||
if (json) ui.addItem(json);
|
||||
const response = await handleResponse(api.addItem(currentList.dataset.id, itemName, itemAmount, categoryID), `item couldnt be created!`);
|
||||
if (response.ok) {
|
||||
ui.addItem(response.json);
|
||||
} else {
|
||||
const form = document.querySelector(".addItemForm");
|
||||
const name = document.querySelector(".addItemForm__nameInput");
|
||||
const amount = document.querySelector(".addItemForm__amountInput");
|
||||
showError({ highlightFields: [name, amount], elementForMessage: form, message: response.json.msg });
|
||||
}
|
||||
}
|
||||
|
||||
async function addCategory(categoryName) {
|
||||
console.log(`adding category ${categoryName}`)
|
||||
|
||||
const json = await handleResponse(api.addCategory(currentList.dataset.id, categoryName), `category couldnt be added!`);
|
||||
if (json) ui.addCategory(json);
|
||||
const response = await handleResponse(api.addCategory(currentList.dataset.id, categoryName), `category couldnt be added!`);
|
||||
if (response.ok) {
|
||||
ui.addCategory(response.json);
|
||||
} else {
|
||||
const form = document.querySelector(".addCategoryForm");
|
||||
const name = document.querySelector(".addCategoryForm__nameInput");
|
||||
showError({ highlightFields: [name], elementForMessage: form, message: response.json.msg });
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
async function deleteItem(li) {
|
||||
console.log(`deleting item ${li.dataset.id}`)
|
||||
|
||||
const json = await handleResponse(api.deleteItem(li.dataset.id), `error deleting item`);
|
||||
if (json) ui.deleteItem(li);
|
||||
const response = await handleResponse(api.deleteItem(li.dataset.id), `error deleting item`);
|
||||
if (response.ok) ui.deleteItem(li);
|
||||
}
|
||||
|
||||
async function deleteCategory(deleteAllItems, categoryID) {
|
||||
console.log(`deleting category with allItems: ${deleteAllItems} id: ${categoryID}`);
|
||||
const json = await handleResponse(api.deleteCategory(deleteAllItems, categoryID), `error deleting category`);
|
||||
const response = await handleResponse(api.deleteCategory(deleteAllItems, categoryID), `error deleting category`);
|
||||
|
||||
if (json) ui.deleteCategory(deleteAllItems, categoryID);
|
||||
if (response.ok) ui.deleteCategory(deleteAllItems, categoryID);
|
||||
}
|
||||
|
||||
async function deleteAllDoneItems() {
|
||||
console.log(`deleting all done items...`)
|
||||
const json = await handleResponse(api.deleteAllDoneItems(currentList.dataset.id), `error deleting all done items`);
|
||||
if (json) ui.deleteAllDoneItems();
|
||||
const response = await handleResponse(api.deleteAllDoneItems(currentList.dataset.id), `error deleting all done items`);
|
||||
if (response.ok) ui.deleteAllDoneItems();
|
||||
}
|
||||
|
||||
function init() {
|
||||
|
||||
initErrors(document.querySelector(".nav"));
|
||||
|
||||
customElements.define("shopping-item", ShoppingItem);
|
||||
customElements.define("shopping-category", ShoppingCategory);
|
||||
@@ -99,19 +111,27 @@ function init() {
|
||||
{ name: "itemAmount", value: itemAmount, class: "editForm__amount", attr: "item-amount" }
|
||||
]
|
||||
, onSuccess: (f) => { sharedUI.setElementAttributes(shoppingItemElement, { "item-name": f.itemName, "item-amount": f.itemAmount }) }
|
||||
, onFailure: (response) => {
|
||||
|
||||
const editForm = document.querySelector(".editForm");
|
||||
const name = document.querySelector("input.editForm__name");
|
||||
const amount = document.querySelector("input.editForm__amount")
|
||||
|
||||
showError({ highlightFields: [name, amount], elementForMessage: editForm, message: response.json.msg });
|
||||
}
|
||||
, errmsg: `konnte Item nicht bearbeiten`
|
||||
});
|
||||
|
||||
} else if (event.target.closest(".category__name")) {
|
||||
|
||||
const categoryElement = event.target.closest("shopping-category");
|
||||
const categoryHeader = event.target.closest(".category__header");
|
||||
const categoryInnerHeader = event.target.closest(".category__innerHeader");
|
||||
const id = event.target.closest("li").dataset.id;
|
||||
|
||||
let categoryName = categoryElement.querySelector(".category__name").textContent;
|
||||
|
||||
editElement({
|
||||
element: categoryHeader, apiCall: api.editCategory, id: id,
|
||||
element: categoryInnerHeader, apiCall: api.editCategory, id: id,
|
||||
fields: [
|
||||
{ name: "categoryName", value: categoryName, class: "editForm__name", attr: "category-name" },
|
||||
]
|
||||
@@ -119,6 +139,14 @@ function init() {
|
||||
sharedUI.setElementAttributes(categoryElement, { "category-name": f.categoryName })
|
||||
document.querySelector(`option[value='${id}']`).textContent = f.categoryName;
|
||||
}
|
||||
, onFailure: (response) => {
|
||||
|
||||
const editForm = document.querySelector(".editForm");
|
||||
const name = document.querySelector(".editForm__name");
|
||||
|
||||
showError({ highlightFields: [name], elementForMessage: editForm, message: response.json.msg });
|
||||
|
||||
}
|
||||
, errmsg: `konnte Kategorie nicht bearbeiten`
|
||||
});
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { abortEditing, createEditForm } from "./sharedUI.js";
|
||||
import { handleResponse } from "./helper.js";
|
||||
|
||||
export async function editElement({ element, fields, apiCall, id, onSuccess, errmsg }) {
|
||||
export async function editElement({ element, fields, apiCall, id, onSuccess, onFailure, errmsg }) {
|
||||
const formElement = createEditForm(fields);
|
||||
|
||||
element.replaceWith(formElement);
|
||||
@@ -14,9 +14,14 @@ export async function editElement({ element, fields, apiCall, id, onSuccess, err
|
||||
let formData = Object.fromEntries(new FormData(formElement));
|
||||
let result = await handleResponse(apiCall(id, formData), errmsg);
|
||||
|
||||
abortEditing(formElement, element);
|
||||
|
||||
if (result) onSuccess(formData);
|
||||
if (result.ok) {
|
||||
abortEditing(formElement, element);
|
||||
onSuccess(formData);
|
||||
} else {
|
||||
onFailure(result);
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
formElement.addEventListener("click", (e) => {
|
||||
|
||||
@@ -1,22 +1,30 @@
|
||||
const errorDiv = document.createElement("div");
|
||||
const errorSpan = document.createElement("span");
|
||||
let errorTimer;
|
||||
export function createErrorSpan(msg) {
|
||||
const span = document.createElement("span");
|
||||
span.textContent = msg;
|
||||
span.classList.add("error-message");
|
||||
return span;
|
||||
}
|
||||
|
||||
export function showError(msg) {
|
||||
errorSpan.textContent = msg;
|
||||
errorDiv.hidden = false
|
||||
|
||||
export function showError({ highlightFields, elementForMessage, message }) {
|
||||
|
||||
highlightFields.forEach(field => {
|
||||
field.classList.add("is-invalid");
|
||||
});
|
||||
|
||||
const errSpan = createErrorSpan(message);
|
||||
|
||||
elementForMessage.append(errSpan);
|
||||
|
||||
let errorTimer;
|
||||
clearTimeout(errorTimer);
|
||||
errorTimer = (setTimeout(() => {
|
||||
errorDiv.hidden = true;
|
||||
errorSpan.textContent = "";
|
||||
}, 3000));
|
||||
}
|
||||
|
||||
highlightFields.forEach(field => {
|
||||
field.classList.remove("is-invalid");
|
||||
})
|
||||
|
||||
export function initErrors(element) {
|
||||
errorDiv.hidden = true;
|
||||
errorDiv.append(errorSpan);
|
||||
elementForMessage.removeChild(errSpan);
|
||||
}, 5000));
|
||||
|
||||
element.append(errorDiv);
|
||||
}
|
||||
@@ -1,21 +1,19 @@
|
||||
import { showError } from "./error.js";
|
||||
|
||||
export async function handleResponse(promise, errorMsg) {
|
||||
const response = await promise;
|
||||
|
||||
//weil 204 kein body ist un damit unparsbar, geben wir vorab true zurück
|
||||
if (response.status == 204) {
|
||||
return true;
|
||||
return { ok: true, json: null };
|
||||
}
|
||||
|
||||
const json = await response.json();
|
||||
|
||||
if (!response.ok) {
|
||||
showError(json.msg);
|
||||
console.error(errorMsg);
|
||||
return false;
|
||||
return { ok: false, json: json };
|
||||
}
|
||||
|
||||
return json;
|
||||
return { ok: true, json: json };
|
||||
|
||||
}
|
||||
@@ -25,6 +25,7 @@ export function createEditForm(fields) {
|
||||
|
||||
|
||||
editForm.append(...inputs, saveButton, abortButton);
|
||||
editForm.classList.add("editForm");
|
||||
|
||||
return editForm;
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<div class="index">
|
||||
<form class="addListForm">
|
||||
<input type="text" name="listName" required />
|
||||
<input class="addListForm__inputName" type="text" name="listName"/>
|
||||
<button type="submit">Neue Liste erstellen</button>
|
||||
</form>
|
||||
|
||||
|
||||
Reference in new issue
Block a user