Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: [DHIS2-17613] Use new note endpoint #3908

Merged
merged 9 commits into from
Jan 12, 2025
Merged

fix: [DHIS2-17613] Use new note endpoint #3908

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e9181ef
fix: new note endpoint
henrikmv Dec 14, 2024
443c643
fix: use new enpoint for view event
henrikmv Dec 17, 2024
1c792b4
fix: version based api call
henrikmv Dec 23, 2024
c1d2a7b
fix: serverdata structure based on version
henrikmv Jan 6, 2025
7f3de06
fix: every serverdate structure based on version
henrikmv Jan 6, 2025
d6aeae8
fix: bug in function
henrikmv Jan 6, 2025
3645321
Merge remote-tracking branch 'origin/master' into hv/fix/DHIS2-17613_…
henrikmv Jan 7, 2025
27e49ba
Merge remote-tracking branch 'origin/master' into hv/fix/DHIS2-17613_…
henrikmv Jan 8, 2025
81709bf
Merge branch 'master' into hv/fix/DHIS2-17613_UseNewNoteEndpoints
henrikmv Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...core_modules/capture-core/components/WidgetEnrollmentNote/WidgetEnrollmentNote.actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ export const batchActionTypes = {
export const requestAddNoteForEnrollment = (enrollmentId: string, note: string) =>
actionCreator(actionTypes.REQUEST_ADD_NOTE_FOR_ENROLLMENT)({ enrollmentId, note });

export const startAddNoteForEnrollment = (enrollmentId: string, serverData: Object, selections: Object, context: Object) =>
export const startAddNoteForEnrollment = (enrollmentUid: string, serverData: Object, selections: Object, context: Object) =>
actionCreator(actionTypes.START_ADD_NOTE_FOR_ENROLLMENT)({ selections, context }, {
offline: {
effect: {
url: `enrollments/${enrollmentId}/note`,
url: `tracker/enrollments/${enrollmentUid}/note`,
method: effectMethods.POST,
data: serverData,
},
Expand All @@ -31,5 +31,5 @@ export const startAddNoteForEnrollment = (enrollmentId: string, serverData: Obje
},
});

export const addEnrollmentNote = (enrollmentId: string, note: Object) =>
actionCreator(actionTypes.ADD_ENROLLMENT_NOTE)({ enrollmentId, note });
export const addEnrollmentNote = (enrollmentUid: string, note: Object) =>
actionCreator(actionTypes.ADD_ENROLLMENT_NOTE)({ enrollmentUid, note });
2 changes: 1 addition & 1 deletion src/core_modules/capture-core/components/WidgetEnrollmentNote/WidgetEnrollmentNote.epics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const addNoteForEnrollmentEpic = (action$: InputObservable, store: ReduxS
const clientId = uuid();

const serverData = {
notes: [{ value: note }],
value: note,
};

const clientNote = {
Expand Down
4 changes: 2 additions & 2 deletions src/core_modules/capture-core/components/WidgetEventNote/WidgetEventNote.actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ export const batchActionTypes = {
export const requestAddNoteForEvent = (itemId: string, dataEntryId: string, note: string) =>
actionCreator(actionTypes.REQUEST_ADD_NOTE_FOR_EVENT)({ itemId, dataEntryId, note });

export const startAddNoteForEvent = (eventId: string, serverData: Object, selections: Object, context: Object) =>
export const startAddNoteForEvent = (eventUid: string, serverData: Object, selections: Object, context: Object) =>
actionCreator(actionTypes.START_ADD_NOTE_FOR_EVENT)({ selections, context }, {
offline: {
effect: {
url: `events/${eventId}/note`,
url: `/tracker/events/${eventUid}/note`,
method: effectMethods.POST,
data: serverData,
},
Expand Down
2 changes: 1 addition & 1 deletion src/core_modules/capture-core/components/WidgetEventNote/WidgetEventNote.epics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const addNoteForEventEpic = (action$: InputObservable, store: ReduxStore,

const serverData = {
event: eventId,
notes: [{ value: payload.note }],
value: payload.note,
};

const clientNote = {
Expand Down
Loading