fix: every serverdate structure based on version

dhis2 · Jan 6, 2025 · 7f3de06 · 7f3de06
1 parent c1d2a7b
commit 7f3de06
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentNote/WidgetEnrollmentNote.epics.js b/src/core_modules/capture-core/components/WidgetEnrollmentNote/WidgetEnrollmentNote.epics.js
@@ -1,18 +1,27 @@
 // @flow
 import { batchActions } from 'redux-batched-actions';
 import { ofType } from 'redux-observable';
+import { featureAvailable, FEATURES } from 'capture-core-utils';
 import { switchMap } from 'rxjs/operators';
 import uuid from 'd2-utilizr/lib/uuid';
 import moment from 'moment';
 import { actionTypes, batchActionTypes, startAddNoteForEnrollment, addEnrollmentNote }
     from './WidgetEnrollmentNote.actions';
 
+const createServerData = (eventId, note, useNewEndpoint) => {
+    if (useNewEndpoint) {
+        return { value: note };
+    }
+    return { notes: [{ value: note }] };
+};
+
 export const addNoteForEnrollmentEpic = (action$: InputObservable, store: ReduxStore, { querySingleResource }: ApiUtils) =>
     action$.pipe(
         ofType(actionTypes.REQUEST_ADD_NOTE_FOR_ENROLLMENT),
         switchMap((action) => {
             const state = store.value;
             const { enrollmentId, note } = action.payload;
+            const useNewEndpoint = featureAvailable(FEATURES.newNoteEndpoint);
             return querySingleResource({
                 resource: 'me',
                 params: {
@@ -22,9 +31,7 @@ export const addNoteForEnrollmentEpic = (action$: InputObservable, store: ReduxS
                 const { firstName, surname, userName } = user;
                 const clientId = uuid();
 
-                const serverData = {
-                    value: note,
-                };
+                const serverData = createServerData(note, useNewEndpoint);
 
                 const clientNote = {
                     value: note,

diff --git a/src/core_modules/capture-core/components/WidgetEventNote/WidgetEventNote.epics.js b/src/core_modules/capture-core/components/WidgetEventNote/WidgetEventNote.epics.js
@@ -1,6 +1,7 @@
 // @flow
 import { batchActions } from 'redux-batched-actions';
 import { ofType } from 'redux-observable';
+import { featureAvailable, FEATURES } from 'capture-core-utils';
 import { map, switchMap } from 'rxjs/operators';
 import uuid from 'd2-utilizr/lib/uuid';
 import moment from 'moment';
@@ -18,13 +19,21 @@ import {
     removeNote,
 } from '../DataEntry/actions/dataEntry.actions';
 
+const createServerData = (eventId, note, useNewEndpoint) => {
+    if (useNewEndpoint) {
+        return { event: eventId, value: note };
+    }
+    return { event: eventId, notes: [{ value: note }] };
+};
+
 export const addNoteForEventEpic = (action$: InputObservable, store: ReduxStore, { querySingleResource }: ApiUtils) =>
     action$.pipe(
         ofType(actionTypes.REQUEST_ADD_NOTE_FOR_EVENT),
         switchMap((action) => {
             const state = store.value;
             const payload = action.payload;
             const eventId = state.dataEntries[payload.dataEntryId].eventId;
+            const useNewEndpoint = featureAvailable(FEATURES.newNoteEndpoint);
             return querySingleResource({
                 resource: 'me',
                 params: {
@@ -34,10 +43,7 @@ export const addNoteForEventEpic = (action$: InputObservable, store: ReduxStore,
                 const { firstName, surname, userName } = user;
                 const clientId = uuid();
 
-                const serverData = {
-                    event: eventId,
-                    value: payload.note,
-                };
+                const serverData = createServerData(eventId, payload.note, useNewEndpoint);
 
                 const clientNote = {
                     value: payload.note,