Merge pull request #293 from City-of-Helsinki/TILA-1386

TILA-1486 Sort application events after save so that they are in creation order

Author: siren

ui/modules/application/applicationReducer.test.ts

@@ -0,0 +1,35 @@
+import { Application, ApplicationEvent, EditorState } from "../types";
+import reducer from "./applicationReducer";
+
+jest.mock("next/config", () => () => ({
+  serverRuntimeConfig: {},
+  publicRuntimeConfig: {},
+}));
+
+describe("applicationReducer", () => {
+  test("same maintains applicationEventOrder", () => {
+    const newState = reducer(
+      {
+        application: {
+          applicationEvents: [] as ApplicationEvent[],
+        } as Application,
+      } as EditorState,
+      {
+        type: "save",
+        application: {
+          applicationEvents: [
+            { id: 9 } as ApplicationEvent,
+            { id: 2 } as ApplicationEvent,
+            { id: 5 } as ApplicationEvent,
+          ],
+        } as Application,
+      }
+    );
+
+    expect(newState.application.applicationEvents.length).toBe(3);
+
+    expect(newState.application.applicationEvents[0].id).toBe(2);
+    expect(newState.application.applicationEvents[1].id).toBe(5);
+    expect(newState.application.applicationEvents[2].id).toBe(9);
+  });
+});

ui/modules/application/applicationReducer.ts

@@ -7,6 +7,7 @@ import {
   ApplicationEvent,
   EditorState,
 } from "../types";
+import { deepCopy } from "../util";
 
 const applicationEvent = (
   applicationId?: number,
@@ -94,9 +95,12 @@ const reducer = (state: EditorState, action: Action): EditorState => {
       return nextState;
     }
     case "save": {
+      const editedApplication = deepCopy(action.application);
+      editedApplication.applicationEvents.sort((ae1, ae2) => ae1.id - ae2.id);
+
       const nextState = {
         ...state,
-        application: { ...action.application } as Application,
+        application: editedApplication,
         savedEventId: action.savedEventId,
         accordionStates:
           action.application?.applicationEvents.map((ae) => ({