From 6916021ca310b83611d96721321e4784f0b2542b Mon Sep 17 00:00:00 2001
From: Yanick Minder <minder@puzzle.ch>
Date: Thu, 20 Feb 2025 09:14:49 +0100
Subject: [PATCH 1/6] add version to item

---
 .../components/action-plan/action-plan.component.ts  |  4 +++-
 .../checkin/check-in-form/check-in-form.component.ts | 12 ++----------
 frontend/src/app/shared/common.ts                    |  6 ++++--
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/frontend/src/app/components/action-plan/action-plan.component.ts b/frontend/src/app/components/action-plan/action-plan.component.ts
index 8a839b7e4b..c7489bd177 100644
--- a/frontend/src/app/components/action-plan/action-plan.component.ts
+++ b/frontend/src/app/components/action-plan/action-plan.component.ts
@@ -24,13 +24,15 @@ export interface Item {
   id: number | undefined;
   item: string;
   isChecked: boolean;
+  version: number;
 }
 
 export function initFormGroupFromItem(item?: Item): FormGroup<FormControlsOf<Item>> {
   return new FormGroup({
     item: new FormControl<string>(item?.item || '', [Validators.minLength(2)]),
     id: new FormControl<number | undefined>(item?.id || undefined),
-    isChecked: new FormControl<boolean>(item?.isChecked || false)
+    isChecked: new FormControl<boolean>(item?.isChecked || false),
+    version: new FormControl<number>(item?.version || 1)
   } as FormControlsOf<Item>);
 }
 
diff --git a/frontend/src/app/components/checkin/check-in-form/check-in-form.component.ts b/frontend/src/app/components/checkin/check-in-form/check-in-form.component.ts
index 3f8be9f524..a0b1aa563c 100644
--- a/frontend/src/app/components/checkin/check-in-form/check-in-form.component.ts
+++ b/frontend/src/app/components/checkin/check-in-form/check-in-form.component.ts
@@ -19,7 +19,7 @@ import { CheckInOrdinalMin } from '../../../shared/types/model/check-in-ordinal-
 import { Zone } from '../../../shared/types/enums/zone';
 import { numberValidator } from '../../../shared/constant-library';
 
-import { FormControlsOf, Item } from '../../action-plan/action-plan.component';
+import { FormControlsOf, initFormGroupFromItem, Item } from '../../action-plan/action-plan.component';
 import { Observable } from 'rxjs';
 @Component({
   selector: 'app-check-in-form',
@@ -169,7 +169,7 @@ export class CheckInFormComponent implements OnInit {
 
   addNewItem(item?: Item) {
     this.getFormControlArray()
-      ?.push(this.initFormGroupFromItem(item));
+      ?.push(initFormGroupFromItem(item));
   }
 
   setValidators(type: string) {
@@ -178,12 +178,4 @@ export class CheckInFormComponent implements OnInit {
     this.dialogForm.get(this.checkInTypes.filter((formName) => formName.includes(type)))
       ?.enable({ emitEvent: false });
   }
-
-  initFormGroupFromItem(item?: Item): FormGroup<FormControlsOf<Item>> {
-    return new FormGroup({
-      item: new FormControl<string>(item?.item || '', [Validators.minLength(2)]),
-      id: new FormControl<number | undefined>(item?.id || undefined),
-      isChecked: new FormControl<boolean>(item?.isChecked || false)
-    } as FormControlsOf<Item>);
-  }
 }
diff --git a/frontend/src/app/shared/common.ts b/frontend/src/app/shared/common.ts
index 718166601f..3623cb8967 100644
--- a/frontend/src/app/shared/common.ts
+++ b/frontend/src/app/shared/common.ts
@@ -151,7 +151,8 @@ export function actionListToItemList(actionList: Action[]): Item[] {
   return (actionList || []).map((action) => {
     return { id: action.id,
       item: action.action,
-      isChecked: action.isChecked } as Item;
+      isChecked: action.isChecked,
+      version: action.version || 1 } as Item;
   });
 }
 
@@ -163,7 +164,8 @@ export function itemListToActionList(itemList: Item[], keyResultId: number | nul
         action: item.item,
         priority: index,
         keyResultId: keyResultId,
-        isChecked: item.isChecked
+        isChecked: item.isChecked,
+        version: item.version
       } as Action;
     });
 }

From d90db4cbab89a08f81b3f3132d52d31356d3ed3a Mon Sep 17 00:00:00 2001
From: Yanick Minder <minder@puzzle.ch>
Date: Thu, 20 Feb 2025 09:23:17 +0100
Subject: [PATCH 2/6] add e2e to ensure behavior

---
 .run/OkrApplication-E2E.run.xml     |  2 +-
 frontend/cypress/e2e/check-in.cy.ts | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/.run/OkrApplication-E2E.run.xml b/.run/OkrApplication-E2E.run.xml
index aa7706165a..d14babf764 100644
--- a/.run/OkrApplication-E2E.run.xml
+++ b/.run/OkrApplication-E2E.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="OkrApplication-E2E" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <option name="ACTIVE_PROFILES" value="integration-test" />
-    <option name="ALTERNATIVE_JRE_PATH" value="$USER_HOME$/.sdkman/candidates/java/current" />
+    <option name="ALTERNATIVE_JRE_PATH" value="corretto-21" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <module name="backend" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="ch.puzzle.okr.OkrApplication" />
diff --git a/frontend/cypress/e2e/check-in.cy.ts b/frontend/cypress/e2e/check-in.cy.ts
index a6d389027c..26966fb609 100644
--- a/frontend/cypress/e2e/check-in.cy.ts
+++ b/frontend/cypress/e2e/check-in.cy.ts
@@ -483,6 +483,29 @@ describe('okr check-in', () => {
       .should('not.exist');
   });
 
+  it('should ensure version of actions work properly', () => {
+    FilterHelper.do()
+      .toggleOption('/BBT');
+    keyResultDetailPage.visit('Im Durchschnitt soll die Lautstärke 60dB nicht überschreiten');
+    isChecked('Neuer Garten', true);
+
+    keyResultDetailPage.createCheckIn()
+      .checkActionOfActionPlan(2)
+    // .fillCheckInCommentary('This should not appear anywhere!')
+      .fillMetricCheckInValue('5')
+      .submit();
+    isChecked('Neuer Garten', false);
+
+    keyResultDetailPage.createCheckIn()
+      .checkActionOfActionPlan(2)
+    // .fillCheckInCommentary('This should not appear anywhere!')
+      .fillMetricCheckInValue('5')
+      .submit();
+
+
+    isChecked('Neuer Garten', true);
+  });
+
   it('should have a primary button on every check-in dialog', () => {
     keyResultDetailPage.visit('Very important keyresult')
       .createCheckIn()

From 14b55157e2f5a9a726bd7775ce3fdc85469ef849 Mon Sep 17 00:00:00 2001
From: Yanick Minder <minder@puzzle.ch>
Date: Thu, 20 Feb 2025 09:31:58 +0100
Subject: [PATCH 3/6] fix unit tests

---
 .../manage-units-dialog.component.spec.ts     | 23 ++++++++++---------
 frontend/src/app/shared/test-data.ts          |  4 ++++
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/frontend/src/app/components/manage-units-dialog/manage-units-dialog.component.spec.ts b/frontend/src/app/components/manage-units-dialog/manage-units-dialog.component.spec.ts
index b789ade5fa..a6c2c9662c 100644
--- a/frontend/src/app/components/manage-units-dialog/manage-units-dialog.component.spec.ts
+++ b/frontend/src/app/components/manage-units-dialog/manage-units-dialog.component.spec.ts
@@ -9,8 +9,8 @@ import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { UnitTransformationPipe } from '../../shared/pipes/unit-transformation/unit-transformation.pipe';
 import { DialogTemplateCoreComponent } from '../../shared/custom/dialog-template-core/dialog-template-core.component';
 import { ErrorComponent } from '../../shared/custom/error/error.component';
-import { ActionPlanComponent, FormControlsOf, Item } from '../action-plan/action-plan.component';
-import { FormArray, FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
+import { ActionPlanComponent, initFormGroupFromItem, Item } from '../action-plan/action-plan.component';
+import { FormArray, ReactiveFormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
 import { MatDividerModule } from '@angular/material/divider';
 import { UnitService } from '../../services/unit.service';
@@ -148,22 +148,31 @@ describe('ManageUnitsDialogComponent', () => {
     const mockItems: Item[] = [
       { id: 1,
         item: 'Kilogram',
+        version: 1,
         isChecked: false },
       { id: 1,
         item: 'Kilogram',
+        version: 1,
+
         isChecked: false },
       { id: undefined,
         item: 'Meter',
+        version: 1,
+
         isChecked: false },
       { id: undefined,
         item: 'Meter',
+        version: 1,
+
         isChecked: false },
       { id: undefined,
         item: 'Meter',
+        version: 1,
+
         isChecked: false }
     ];
     (component.fg.get('unitFormArray') as FormArray)?.clear();
-    mockItems.forEach((item) => addNewItem(item));
+    mockItems.forEach((item) => initFormGroupFromItem(item));
 
     jest.spyOn(component, 'getChangedItems')
       .mockReturnValue(mockItems);
@@ -219,14 +228,6 @@ describe('ManageUnitsDialogComponent', () => {
         .toHaveBeenCalledWith('Kilogram');
     });
   });
-  function addNewItem(item?: Item) {
-    const newFormGroup = new FormGroup({
-      item: new FormControl<string>(item?.item || ''),
-      id: new FormControl<number | undefined>(item?.id || undefined),
-      isChecked: new FormControl<boolean>(item?.isChecked || false)
-    } as FormControlsOf<Item>);
-    (component.fg.get('unitFormArray') as FormArray)?.push(newFormGroup);
-  }
 });
 
 
diff --git a/frontend/src/app/shared/test-data.ts b/frontend/src/app/shared/test-data.ts
index 43a53dc6e8..83120392c2 100644
--- a/frontend/src/app/shared/test-data.ts
+++ b/frontend/src/app/shared/test-data.ts
@@ -647,15 +647,19 @@ export const keyResultActions: KeyResultMetric = {
 
 export const minItem: Item = { item: '',
   isChecked: false,
+  version: 1,
   id: undefined };
 export const item1: Item = { item: 'item1',
   isChecked: false,
+  version: 1,
   id: 1 };
 export const item2: Item = { item: 'item2',
   isChecked: false,
+  version: 1,
   id: 2 };
 export const item3: Item = { item: 'item3',
   isChecked: false,
+  version: 1,
   id: 3 };
 export const items: Item[] = [item1,
   item2,

From 682091a5cce65d2e7da8567a5d01959dfccafa82 Mon Sep 17 00:00:00 2001
From: Yanick Minder <minder@puzzle.ch>
Date: Thu, 20 Feb 2025 11:04:05 +0100
Subject: [PATCH 4/6] implement reveiw

---
 .run/OkrApplication-E2E.run.xml     | 2 +-
 frontend/cypress/e2e/check-in.cy.ts | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.run/OkrApplication-E2E.run.xml b/.run/OkrApplication-E2E.run.xml
index d14babf764..aa7706165a 100644
--- a/.run/OkrApplication-E2E.run.xml
+++ b/.run/OkrApplication-E2E.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="OkrApplication-E2E" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <option name="ACTIVE_PROFILES" value="integration-test" />
-    <option name="ALTERNATIVE_JRE_PATH" value="corretto-21" />
+    <option name="ALTERNATIVE_JRE_PATH" value="$USER_HOME$/.sdkman/candidates/java/current" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <module name="backend" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="ch.puzzle.okr.OkrApplication" />
diff --git a/frontend/cypress/e2e/check-in.cy.ts b/frontend/cypress/e2e/check-in.cy.ts
index 26966fb609..c68d7338f1 100644
--- a/frontend/cypress/e2e/check-in.cy.ts
+++ b/frontend/cypress/e2e/check-in.cy.ts
@@ -491,14 +491,12 @@ describe('okr check-in', () => {
 
     keyResultDetailPage.createCheckIn()
       .checkActionOfActionPlan(2)
-    // .fillCheckInCommentary('This should not appear anywhere!')
       .fillMetricCheckInValue('5')
       .submit();
     isChecked('Neuer Garten', false);
 
     keyResultDetailPage.createCheckIn()
       .checkActionOfActionPlan(2)
-    // .fillCheckInCommentary('This should not appear anywhere!')
       .fillMetricCheckInValue('5')
       .submit();
 

From 056d5db8ef0bb2a10c316b68621c6d046fa1c875 Mon Sep 17 00:00:00 2001
From: Yanick Minder <minder@puzzle.ch>
Date: Thu, 20 Feb 2025 11:06:28 +0100
Subject: [PATCH 5/6] add release notes

---
 release-notes.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release-notes.txt b/release-notes.txt
index 4fc7497553..4ca8fe6d5e 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -29,6 +29,7 @@ WIP         - Erweiterung #1293: KeyResult Metric unterstützen eigene Units
             - Erweiterung #1169: Deploy Workflows aufgeräumt
             - Erweiterung #1334: Model-Attribute isBacklogQuarter für eine eindeutige Identifizierung des Backlog-Quarters implementiert
 
+            - Fehlerbehebung #1410: Eine Action kan nun wieder über den Check-in Dialog als abgeschlossen markiert werden.
             - Fehlerbehebung #1255: Wenn ein Objective dupliziert wird, wird nun auch der Actionplan übernommen
             - Fehlerbehebung #1298: SCSS-Warnungen behoben
             - Fehlerbehebung #1236: Flaky E2E-Tests gefixt

From 226bf1548226477a94b32c061ffcacce1ae21d81 Mon Sep 17 00:00:00 2001
From: Giannin <puzzle@giannin.ch>
Date: Fri, 21 Feb 2025 07:30:25 +0100
Subject: [PATCH 6/6] Fix typo

---
 release-notes.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release-notes.txt b/release-notes.txt
index 4ca8fe6d5e..f175e0078f 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -29,7 +29,7 @@ WIP         - Erweiterung #1293: KeyResult Metric unterstützen eigene Units
             - Erweiterung #1169: Deploy Workflows aufgeräumt
             - Erweiterung #1334: Model-Attribute isBacklogQuarter für eine eindeutige Identifizierung des Backlog-Quarters implementiert
 
-            - Fehlerbehebung #1410: Eine Action kan nun wieder über den Check-in Dialog als abgeschlossen markiert werden.
+            - Fehlerbehebung #1410: Eine Action kann nun wieder über den Check-in Dialog als abgeschlossen markiert werden.
             - Fehlerbehebung #1255: Wenn ein Objective dupliziert wird, wird nun auch der Actionplan übernommen
             - Fehlerbehebung #1298: SCSS-Warnungen behoben
             - Fehlerbehebung #1236: Flaky E2E-Tests gefixt