feat/qg-273: реализован возврат на исходную страницу со страницы формы записи журнала

Author: d-r-q

app/src/main/kotlin/pro/qyoga/app/therapist/clients/journal/edit_entry/create/CreateJournalEntryPageController.kt

@@ -1,6 +1,7 @@
 package pro.qyoga.app.therapist.clients.journal.edit_entry.create
 
 import org.springframework.data.repository.findByIdOrNull
+import org.springframework.http.ResponseEntity
 import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.stereotype.Controller
 import org.springframework.web.bind.annotation.GetMapping
@@ -9,7 +10,6 @@ import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.servlet.ModelAndView
 import pro.azhidkov.platform.kotlin.isFailureOf
-import pro.azhidkov.platform.spring.http.hxRedirect
 import pro.qyoga.app.platform.notFound
 import pro.qyoga.app.therapist.clients.ClientPageModel
 import pro.qyoga.app.therapist.clients.ClientPageTab
@@ -68,7 +68,10 @@ class CreateJournalEntryPageController(
 
         return when {
             result.isSuccess ->
-                hxRedirect("/therapist/clients/$clientId/journal", "HX-Trigger" to "formSaved")
+                ResponseEntity
+                    .ok()
+                    .header("HX-Trigger", "formSaved")
+                    .build<Unit>()
 
             result.isFailureOf<DuplicatedDate>() -> {
                 val ex = result.exceptionOrNull() as DuplicatedDate

app/src/main/resources/templates/therapist/clients/client-add_journal_entry-fragment.html

@@ -69,6 +69,11 @@
                 return serverState != null && serverState[key] !== form[key];
             }
 
+            function closeForm() {
+                resetLocalState();
+                window.location.href = document.referrer;
+            }
+
             window.addEventListener("htmx:afterSettle", () => {
                 document.querySelectorAll(".form-control").forEach(it => {
                     it.setAttribute("x-model", "form." + it.name);
@@ -78,7 +83,7 @@
 
             document.body.addEventListener('formSaved', function () {
                 console.debug('Form saved successfully, resetting local storage');
-                resetLocalState();
+                closeForm();
             });
 
         </script>
@@ -136,26 +141,25 @@
                 <div class="form-text">Начните вводить название для поиска</div>
             </div>
         </div>
-            <div class="mb-3 col">
+        <div class="mb-3 col">
 
-                <div class="form-floating">
+            <div class="form-floating">
             <textarea class="form-control full-height"
                       id="text-input" name="journalEntryText" required rows="12"
                       th:text="${entry?.journalEntryText ?: ''}"
                       placeholder=""
             ></textarea>
-                    <label class="form-label" for="text-input">Запись <span class="text-danger">*</span></label>
-                </div>
+                <label class="form-label" for="text-input">Запись <span class="text-danger">*</span></label>
+            </div>
         </div>
 
         <div class="row g-2 justify-content-end">
             <div class="col-6 col-sm-auto text-center">
-                <a @click="resetLocalState()"
+                <button @click="closeForm()"
                    class="btn btn-outline-danger"
-                   style="min-width: 110px;"
-                   th:href="@{/therapist/clients/{id}/journal(id=${client.id})}">
+                        style="min-width: 110px;">
                     Отмена
-                </a>
+                </button>
             </div>
             <div class="col-6 col-sm-auto text-center">
                 <button

app/src/test/kotlin/pro/qyoga/tests/clients/api/TherapistClientJournalApi.kt

@@ -92,7 +92,6 @@ class TherapistClientJournalApi(override val authCookie: Cookie) : AuthorizedApi
     fun createJournalEntry(clientId: UUID, journalEntry: EditJournalEntryRq) {
         postNewJournalEntry(journalEntry, clientId) Then {
             statusCode(HttpStatus.OK.value())
-            header("Hx-Redirect", Matchers.matchesRegex(".*" + JournalPageController.JOURNAL_PAGE_PATH.pathToRegex()))
         }
     }