From 4a98f1e7a8deef0dc884390060ee72ab03f35042 Mon Sep 17 00:00:00 2001
From: WilliamThorenfeldt <william.thorenfeldt@accenture.com>
Date: Thu, 11 Jan 2024 12:28:22 +0100
Subject: [PATCH 1/3] fixing the tests

---
 .../editModal/EditDataModelBindings.test.tsx       | 14 ++++++++++++--
 .../config/editModal/EditDataModelBindings.tsx     |  1 +
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.test.tsx b/frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.test.tsx
index 97e32beba13..3d0b1de8505 100644
--- a/frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.test.tsx
+++ b/frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.test.tsx
@@ -9,8 +9,6 @@ import { ComponentType } from 'app-shared/types/ComponentType';
 import userEvent from '@testing-library/user-event';
 import { DatamodelMetadataResponse } from 'app-shared/types/api';
 
-const user = userEvent.setup();
-
 const datamodelMetadata: DatamodelMetadataResponse = {
   elements: {
     testModel: {
@@ -84,7 +82,10 @@ const render = async ({ dataModelBindings = {}, handleComponentChange = jest.fn(
 };
 
 describe('EditDataModelBindings', () => {
+  afterEach(jest.clearAllMocks);
+
   it('should show select with no selected option by default', async () => {
+    const user = userEvent.setup();
     await render();
     const linkIcon = screen.getByText(textMock('ux_editor.modal_properties_data_model_link'));
     await act(() => user.click(linkIcon));
@@ -95,6 +96,7 @@ describe('EditDataModelBindings', () => {
   });
 
   it('should show select with provided data model binding', async () => {
+    const user = userEvent.setup();
     await render();
     const linkIcon = screen.getByText(textMock('ux_editor.modal_properties_data_model_link'));
     await act(() => user.click(linkIcon));
@@ -111,6 +113,7 @@ describe('EditDataModelBindings', () => {
   });
 
   it('should show select when link icon is clicked', async () => {
+    const user = userEvent.setup();
     await render();
     const linkIcon = screen.getByText(textMock('ux_editor.modal_properties_data_model_link'));
     await act(() => user.click(linkIcon));
@@ -119,6 +122,7 @@ describe('EditDataModelBindings', () => {
   });
 
   it('should toggle select on link icon click', async () => {
+    const user = userEvent.setup();
     await render();
     expect(screen.queryByRole('combobox')).not.toBeInTheDocument();
     const linkIcon = screen.getByText(textMock('ux_editor.modal_properties_data_model_link'));
@@ -127,6 +131,7 @@ describe('EditDataModelBindings', () => {
   });
 
   it('check that handleComponentChange is called', async () => {
+    const user = userEvent.setup();
     const handleComponentChange = jest.fn();
     await render({ handleComponentChange });
     const linkIcon = screen.getByText(textMock('ux_editor.modal_properties_data_model_link'));
@@ -145,6 +150,7 @@ describe('EditDataModelBindings', () => {
   });
 
   it('should render save icon', async () => {
+    const user = userEvent.setup();
     await render();
     const linkIcon = screen.getByText(textMock('ux_editor.modal_properties_data_model_link'));
     await act(() => user.click(linkIcon));
@@ -153,6 +159,7 @@ describe('EditDataModelBindings', () => {
   });
 
   it('should render delete icon', async () => {
+    const user = userEvent.setup();
     await render();
     const linkIcon = screen.getByText(textMock('ux_editor.modal_properties_data_model_link'));
     await act(() => user.click(linkIcon));
@@ -161,6 +168,7 @@ describe('EditDataModelBindings', () => {
   });
 
   it('show link data model again when click on save button and no data model binding is selected', async () => {
+    const user = userEvent.setup();
     await render();
     const linkIcon = screen.getByText(textMock('ux_editor.modal_properties_data_model_link'));
     await act(() => user.click(linkIcon));
@@ -178,6 +186,7 @@ describe('EditDataModelBindings', () => {
   });
 
   it('deletes existing data model link', async () => {
+    const user = userEvent.setup();
     const handleComponentChange = jest.fn();
     const dataModelBindingKey = 'testModel.field1';
 
@@ -209,6 +218,7 @@ describe('EditDataModelBindings', () => {
   });
 
   it('shows edit form', async () => {
+    const user = userEvent.setup();
     const dataModelBindingKey = 'testModel.field1';
     await render({
       dataModelBindings: { simpleBinding: dataModelBindingKey },
diff --git a/frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.tsx b/frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.tsx
index a7be49937f2..6fc99972634 100644
--- a/frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.tsx
+++ b/frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.tsx
@@ -60,6 +60,7 @@ export const EditDataModelBindings = ({
 
   return (
     <div key={uniqueKey || ''}>
+      <p style={{ border: '1px solid red' }}>HALLAAAA</p>
       {!selectedOption && !dataModelSelectVisible ? (
         <Button
           onClick={() => setDataModelSelectVisible(true)}

From 7fa50008e9bb7793aba83ef86c542155a65188e4 Mon Sep 17 00:00:00 2001
From: WilliamThorenfeldt <william.thorenfeldt@accenture.com>
Date: Fri, 12 Jan 2024 09:42:25 +0100
Subject: [PATCH 2/3] removing unused code

---
 .../src/components/config/editModal/EditDataModelBindings.tsx    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.tsx b/frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.tsx
index 6fc99972634..a7be49937f2 100644
--- a/frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.tsx
+++ b/frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.tsx
@@ -60,7 +60,6 @@ export const EditDataModelBindings = ({
 
   return (
     <div key={uniqueKey || ''}>
-      <p style={{ border: '1px solid red' }}>HALLAAAA</p>
       {!selectedOption && !dataModelSelectVisible ? (
         <Button
           onClick={() => setDataModelSelectVisible(true)}

From f676ce111981a0affda707d5adc199b421a737d5 Mon Sep 17 00:00:00 2001
From: WilliamThorenfeldt <william.thorenfeldt@accenture.com>
Date: Fri, 12 Jan 2024 09:46:41 +0100
Subject: [PATCH 3/3] trying to run again

---
 .../components/config/editModal/EditDataModelBindings.test.tsx   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.test.tsx b/frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.test.tsx
index 3d0b1de8505..9f686beb87f 100644
--- a/frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.test.tsx
+++ b/frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.test.tsx
@@ -254,6 +254,7 @@ describe('EditDataModelBindings', () => {
         }}
       />,
     );
+
     expect(await screen.findByText('testModel.field2')).toBeInTheDocument();
   });
 });