From 6278509cfa73c10df314f026d97a11ae2b69fe72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arto=20P=C3=A4rssinen?= <arto.parssinen@gofore.com>
Date: Fri, 4 Apr 2025 12:20:38 +0300
Subject: [PATCH 1/4] fix: hearing saveAndPreview fix for existing hearings

---
 src/actions/hearingEditor.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/actions/hearingEditor.js b/src/actions/hearingEditor.js
index 210405956..f3af7d2f6 100644
--- a/src/actions/hearingEditor.js
+++ b/src/actions/hearingEditor.js
@@ -391,9 +391,11 @@ export function addSectionAttachment(section, file, title, isNew) {
 
 export function saveAndPreviewHearingChanges(hearing) {
   return (dispatch, getState) => {
-    const preparedHearing = prepareHearingForSave(hearing);
+    if (hearing.isNew) {
+      hearing = prepareHearingForSave(hearing);
+    }
     const cleanedHearing = filterTitleAndContentByLanguage(
-      filterFrontIdsFromAttributes(preparedHearing), getState().hearingEditor.languages
+      filterFrontIdsFromAttributes(hearing), getState().hearingEditor.languages
     );
     const preSaveAction = createAction(EditorActions.SAVE_HEARING, null, () => ({ fyi: 'saveAndPreview' }))({
       cleanedHearing,

From 460ea54ac159648050442c10c8942d635f926782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arto=20P=C3=A4rssinen?= <arto.parssinen@gofore.com>
Date: Fri, 4 Apr 2025 12:35:49 +0300
Subject: [PATCH 2/4] chore: fix linter errors

---
 src/actions/hearingEditor.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/actions/hearingEditor.js b/src/actions/hearingEditor.js
index f3af7d2f6..4fe2557af 100644
--- a/src/actions/hearingEditor.js
+++ b/src/actions/hearingEditor.js
@@ -391,9 +391,6 @@ export function addSectionAttachment(section, file, title, isNew) {
 
 export function saveAndPreviewHearingChanges(hearing) {
   return (dispatch, getState) => {
-    if (hearing.isNew) {
-      hearing = prepareHearingForSave(hearing);
-    }
     const cleanedHearing = filterTitleAndContentByLanguage(
       filterFrontIdsFromAttributes(hearing), getState().hearingEditor.languages
     );

From 0c92f21525fd067c0527c05c01e1c93ee81f40e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arto=20P=C3=A4rssinen?= <arto.parssinen@gofore.com>
Date: Fri, 4 Apr 2025 15:02:29 +0300
Subject: [PATCH 3/4] fix: fixed e2e test being giga flaky

---
 e2e/tests/pages/hearing.spec.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/e2e/tests/pages/hearing.spec.js b/e2e/tests/pages/hearing.spec.js
index 42b6cabf4..7a50d5cc5 100644
--- a/e2e/tests/pages/hearing.spec.js
+++ b/e2e/tests/pages/hearing.spec.js
@@ -3,10 +3,11 @@ import { expect, test } from '@playwright/test';
 const API_URL = process.env.API_URL || 'https://kerrokantasi.api.dev.hel.ninja';
 
 const fetchHearing = async () => {
-  const res = await fetch(`${API_URL}/v1/hearing/`);
+  /* const res = await fetch(`${API_URL}/v1/hearing/`);
   const json = await res.json();
   const openHearings = json.results.filter((hearing) => !hearing.closed);
-  const hearingId = openHearings[0].id;
+  */
+  const hearingId = 'NgHqPUpc4JD91uaMoyGYXSnC2z9YwkvO';
   const hearing = await fetch(`${API_URL}/v1/hearing/${hearingId}/`);
 
   return hearing.json();
@@ -99,7 +100,11 @@ test.describe('Hearing', () => {
     const questionText = firstQuestion.text.fi;
     const options = firstQuestion.options.map((o) => o.text.fi);
     await expect(page.locator('.comment-form')).toContainText(questionText);
-    await expect(page.getByTestId('question-form-group').locator('.radio')).toContainText(options);
+    
+    // Check each option individually to ensure they are present in the form
+    for (const option of options) {
+      await expect(page.getByTestId('question-form-group')).toContainText(option);
+    }
   });
 
   test('user can successfully submit a comment', async () => {

From e7c4dcfce548a62eeade373a4a3e3b1443dec47b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arto=20P=C3=A4rssinen?= <arto.parssinen@gofore.com>
Date: Mon, 7 Apr 2025 08:48:56 +0300
Subject: [PATCH 4/4] fix: fixed hearing page e2e test to use slug instead of
 ID

---
 e2e/tests/pages/hearing.spec.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/e2e/tests/pages/hearing.spec.js b/e2e/tests/pages/hearing.spec.js
index 7a50d5cc5..f6619f574 100644
--- a/e2e/tests/pages/hearing.spec.js
+++ b/e2e/tests/pages/hearing.spec.js
@@ -3,12 +3,8 @@ import { expect, test } from '@playwright/test';
 const API_URL = process.env.API_URL || 'https://kerrokantasi.api.dev.hel.ninja';
 
 const fetchHearing = async () => {
-  /* const res = await fetch(`${API_URL}/v1/hearing/`);
-  const json = await res.json();
-  const openHearings = json.results.filter((hearing) => !hearing.closed);
-  */
-  const hearingId = 'NgHqPUpc4JD91uaMoyGYXSnC2z9YwkvO';
-  const hearing = await fetch(`${API_URL}/v1/hearing/${hearingId}/`);
+  const hearingSlug = 'kuuleminen-e2e-testausta-varten';
+  const hearing = await fetch(`${API_URL}/v1/hearing/${hearingSlug}/`);
 
   return hearing.json();
 };