feat: [DHIS2-15480] widget assignee #3412

simonadomnisoru · 2023-09-13T12:45:13Z

Tech summary

Created WidgetAssignee and used it the view and edit pages in the tracker program
Posting to the API is done from within the WidgetAssignee using the app runtime hooks
getSaveContext callback is in charge of getting all the current event information.
The Redux store is updated on the onSave and OnSaveError callbacks
Reused the WidgetAssignee in event programs

github-actions · 2023-10-11T06:42:30Z

🚀 Deployed on https://deploy-preview-3412--dhis2-capture.netlify.app

JoakimSM

I see that I didn't write anything about self-contained, but would be great if we can make it a bit more contained and not use Redux in the Widget itself.

Widget interface suggestion

assignedUser?: { id: string, name: string },
writeAccess: boolean,
getSaveContext: () => Object,
onSave: (assignee) => void,
onSaveError: (prevAssignee) => void,

We can update the Redux store from the onSave and OnSaveError callbacks. Let's use mutate from app-runtime when saving (don't worry about offline support for now)

Let's only send the current event and not other events in the enrollment to the api (if you have multiple events in the same enrollment, they are all sent to the api when updating the assigned user it seems). But fixing the first point might also fix this one.
Make sure that after we update the event itself, the assigned user is still persisted/shown in the Widget (I saw some weird behaviour here, but couldn't instantly figure out what was going on. It also seemed to differ between v39 and v40)

I'm open for a chat about this!

simonadomnisoru · 2023-11-01T09:44:18Z

I see that I didn't write anything about self-contained, but would be great if we can make it a bit more contained and not use Redux in the Widget itself.

Widget interface suggestion
assignedUser?: { id: string, name: string },
writeAccess: boolean,
getSaveContext: () => Object,
onSave: (assignee) => void,
onSaveError: (prevAssignee) => void,
We can update the Redux store from the onSave and OnSaveError callbacks. Let's use mutate from app-runtime when saving (don't worry about offline support for now)

Let's only send the current event and not other events in the enrollment to the api (if you have multiple events in the same enrollment, they are all sent to the api when updating the assigned user it seems). But fixing the first point might also fix this one.

Make sure that after we update the event itself, the assigned user is still persisted/shown in the Widget (I saw some weird behaviour here, but couldn't instantly figure out what was going on. It also seemed to differ between v39 and v40)

Hi @JoakimSM,
I implemented the suggested architecture. You can take a look?
Thanks!

JoakimSM · 2023-11-10T13:05:54Z

src/core_modules/capture-core/components/WidgetAssignee/WidgetAssignee.types.js

+
+export type Props = {|
+    assignee: UserFormField | null,
+    programStage: ?ProgramStage,


can we just pass in enabled instead of passing in the entire programStage? Easier to resume work here later

JoakimSM · 2023-11-10T13:19:36Z

src/core_modules/capture-core/components/WidgetAssignee/WidgetAssignee.types.js

+    eventAccess: {|
+        read: boolean,
+        write: boolean,


In its current state I think it would be great if we don't pass in read-access. Can we just replace this with writeAccess?

JoakimSM · 2023-11-10T13:50:09Z

src/core_modules/capture-core/components/WidgetAssignee/WidgetAssignee.component.js

+                onClose={useCallback(() => setOpenStatus(false), [setOpenStatus])}
+                open={open}
+            >
+                <div className={classes.wrapper}>{eventAccess?.write ? renderContent() : renderNoAccess()}</div>


We should show the assignee even if the user doesn't have write access. In read-only mode we should disable the edit button.

I also just realised we don't have any way of removing the assignment altogether. We will have to look into a way of doing this. We might just add an "x"-button for now (beside the edit button), but feel free to ask the designers for a proper design.

simonadomnisoru · 2023-11-15T08:31:40Z

Hi @JoakimSM,
I implemented the suggested changes. Let me know if you find any other issues.
Thanks!

eirikhaugstulen · 2023-11-28T12:23:26Z

Hey @simonadomnisoru,
I think this PR looks very good now!
One quick comment:
It looks like we are sending trackedEntityInstance as the payload when editing enrollment event assignee. Do you think this should be replaced with trackedEntity? I see that it's referenced quite a lot of times in the types as well, not sure if that's intentional. We also pass in followUp twice (nit).

superskip

Last code changes looks good and the widget is looking and functioning satisfactory, well done 🎉

geethaalwan

Tested successfully on 2.41,2.40.3,2.39.5 ,2.38.7 versions

geethaalwan

Tested successfully on 2.41,2.40.3,2.39.5 ,2.38.7 versions

# [100.51.0](v100.50.7...v100.51.0) (2024-01-25) ### Features * [DHIS2-15480] widget assignee ([#3412](#3412)) ([d61efae](d61efae))

dhis2-bot · 2024-01-25T11:53:05Z

🎉 This PR is included in version 100.51.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

simonadomnisoru added 2 commits September 13, 2023 15:37

feat: widget assignee

03170ab

Merge branch 'master' into DHIS2-15480

fa263d7

simonadomnisoru marked this pull request as ready for review September 13, 2023 13:06

simonadomnisoru requested a review from a team as a code owner September 13, 2023 13:06

simonadomnisoru requested a review from superskip September 13, 2023 13:07

simonadomnisoru added the preview label Oct 11, 2023

chore: improve displaymodel types

0282008

simonadomnisoru removed the preview label Oct 11, 2023

Merge branch 'master' into DHIS2-15480

0170414

JoakimSM reviewed Oct 16, 2023

View reviewed changes

simonadomnisoru added 4 commits November 1, 2023 08:42

feat: remove redux and use app runtime hooks and callbacks

4cf93f5

Merge branch 'master' into DHIS2-15480

929c7e7

chore: split enrollment event page

e0d91ad

Merge branch 'master' into DHIS2-15480

fdf9f23

simonadomnisoru requested a review from JoakimSM November 1, 2023 09:44

chore: improve converters

af609d0

JoakimSM reviewed Nov 10, 2023

View reviewed changes

simonadomnisoru added 4 commits November 14, 2023 08:16

chore: simplify widget assignee props

fac65a1

chore: disable action buttons in the read-only mode

fd3974e

feat: add delete assigned user functionality

52ae166

Merge branch 'master' into DHIS2-15480

f353687

simonadomnisoru requested a review from JoakimSM November 15, 2023 08:30

simonadomnisoru added 4 commits December 4, 2023 09:57

chore: clean trackedEntityInstance

95453dd

Merge branch 'master' into DHIS2-15480

feb615a

chore: clean trackedEntityInstance from payload

7a5ffe3

fix: hide assignee in form when rescheaduling an event

667b1cb

feat: get the user avatar id with react query

da212bc

simonadomnisoru added preview and removed preview labels Jan 23, 2024

simonadomnisoru requested a review from superskip January 23, 2024 10:58

fix: wait for the user avatar to load

c96bac8

simonadomnisoru added preview and removed preview labels Jan 23, 2024

simonadomnisoru added 2 commits January 23, 2024 13:30

chore: apply mockup css properties

27d4ce2

Merge branch 'master' into DHIS2-15480

1290bfc

simonadomnisoru added preview and removed preview labels Jan 23, 2024

superskip approved these changes Jan 23, 2024

View reviewed changes

simonadomnisoru added testing and removed preview labels Jan 23, 2024

test: fix 2.38 cypress failures

8529d35

simonadomnisoru added testing and removed testing labels Jan 23, 2024

test: scenario for removing the assigned user

c272d46

simonadomnisoru added testing and removed testing labels Jan 23, 2024

geethaalwan approved these changes Jan 24, 2024

View reviewed changes

fix: fallback to firstname and surname

094b32e

simonadomnisoru added testing and removed testing labels Jan 25, 2024

geethaalwan approved these changes Jan 25, 2024

View reviewed changes

simonadomnisoru merged commit d61efae into master Jan 25, 2024
36 of 37 checks passed

simonadomnisoru deleted the DHIS2-15480 branch January 25, 2024 11:45

dhis2-bot added a commit that referenced this pull request Jan 25, 2024

chore(release): cut 100.51.0 [skip release]

09b1989

# [100.51.0](v100.50.7...v100.51.0) (2024-01-25) ### Features * [DHIS2-15480] widget assignee ([#3412](#3412)) ([d61efae](d61efae))

dhis2-bot added the released label Jan 25, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: [DHIS2-15480] widget assignee #3412

feat: [DHIS2-15480] widget assignee #3412

simonadomnisoru commented Sep 13, 2023 •

edited

Loading

github-actions bot commented Oct 11, 2023 •

edited

Loading

JoakimSM left a comment •

edited

Loading

simonadomnisoru commented Nov 1, 2023

JoakimSM Nov 10, 2023

JoakimSM Nov 10, 2023

JoakimSM Nov 10, 2023

simonadomnisoru commented Nov 15, 2023

eirikhaugstulen commented Nov 28, 2023

superskip left a comment

geethaalwan left a comment

geethaalwan left a comment

dhis2-bot commented Jan 25, 2024

feat: [DHIS2-15480] widget assignee #3412

feat: [DHIS2-15480] widget assignee #3412

Conversation

simonadomnisoru commented Sep 13, 2023 • edited Loading

github-actions bot commented Oct 11, 2023 • edited Loading

JoakimSM left a comment • edited Loading

Choose a reason for hiding this comment

simonadomnisoru commented Nov 1, 2023

JoakimSM Nov 10, 2023

Choose a reason for hiding this comment

JoakimSM Nov 10, 2023

Choose a reason for hiding this comment

JoakimSM Nov 10, 2023

Choose a reason for hiding this comment

simonadomnisoru commented Nov 15, 2023

eirikhaugstulen commented Nov 28, 2023

superskip left a comment

Choose a reason for hiding this comment

geethaalwan left a comment

Choose a reason for hiding this comment

geethaalwan left a comment

Choose a reason for hiding this comment

dhis2-bot commented Jan 25, 2024

simonadomnisoru commented Sep 13, 2023 •

edited

Loading

github-actions bot commented Oct 11, 2023 •

edited

Loading

JoakimSM left a comment •

edited

Loading