feat: [DHIS2-16322] One Click Transfer

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-01-25T12:12:47.253Z\n"
-"PO-Revision-Date: 2024-01-25T12:12:47.253Z\n"
+"POT-Creation-Date: 2024-01-29T10:42:09.557Z\n"
+"PO-Revision-Date: 2024-01-29T10:42:09.557Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -1173,6 +1173,12 @@ msgstr "Remove mark for follow-up"
 msgid "Mark for follow-up"
 msgstr "Mark for follow-up"
 
+msgid "Transfer"
+msgstr "Transfer"
+
+msgid "An error occurred while transferring ownership"
+msgstr "An error occurred while transferring ownership"
+
 msgid "Existing dates for auto-generated events will not be updated."
 msgstr "Existing dates for auto-generated events will not be updated."
 
@@ -1200,6 +1206,30 @@ msgstr "Finish drawing before saving"
 msgid "Set area"
 msgstr "Set area"
 
+msgid ""
+"Transferring enrollment ownership from {{ownerOrgUnit}} to "
+"{{newOrgUnit}}{{escape}}"
+msgstr ""
+"Transferring enrollment ownership from {{ownerOrgUnit}} to "
+"{{newOrgUnit}}{{escape}}"
+
+msgid ""
+"You will lose access to the enrollment when transferring ownership to "
+"{{organisationUnit}}."
+msgstr ""
+"You will lose access to the enrollment when transferring ownership to "
+"{{organisationUnit}}."
+
+msgid "Transfer Ownership"
+msgstr "Transfer Ownership"
+
+msgid ""
+"Choose the organisation unit to which enrollment ownership should be "
+"transferred."
+msgstr ""
+"Choose the organisation unit to which enrollment ownership should be "
+"transferred."
+
 msgid "Enrollment date"
 msgstr "Enrollment date"
 
@@ -1377,9 +1407,6 @@ msgstr "This stage can only have one event"
 msgid "Events could not be retrieved. Please try again later."
 msgstr "Events could not be retrieved. Please try again later."
 
-msgid "Assigned to"
-msgstr "Assigned to"
-
 msgid "{{ totalEvents }} events"
 msgstr "{{ totalEvents }} events"
 

src/core_modules/capture-core/components/FormFields/New/Fields/OrgUnitField/OrgUnitField.component.js

@@ -142,6 +142,7 @@ const OrgUnitFieldPlain = (props: Props) => {
         onBlur && onBlur(null);
     };
 
+
     const styles = maxTreeHeight ? { maxHeight: maxTreeHeight, overflowY: 'auto' } : null;
     return (
         <div

src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.component.js

@@ -72,6 +72,7 @@ export const EnrollmentPageDefaultPlain = ({
     onUpdateIncidentDate,
     onEnrollmentError,
     ruleEffects,
+    onTransferOutsideCaptureScope,
 }: PlainProps) => {
     const [mainContentVisible, setMainContentVisibility] = useState(true);
     const [addRelationShipContainerElement, setAddRelationshipContainerElement] =
@@ -149,6 +150,7 @@ export const EnrollmentPageDefaultPlain = ({
                             onUpdateEnrollmentDate={onUpdateEnrollmentDate}
                             onUpdateIncidentDate={onUpdateIncidentDate}
                             onError={onEnrollmentError}
+                            onTransferOutsideCaptureScope={onTransferOutsideCaptureScope}
                         />}
                     </div>
                 </div>

src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.container.js

@@ -103,6 +103,10 @@ export const EnrollmentPageDefault = () => {
         history.push(`/new?${buildUrlQueryString({ orgUnitId, programId, teiId })}`);
     };
 
+    const onTransferOutsideCaptureScope = () => {
+        history.push(`/?${buildUrlQueryString({ orgUnitId, programId })}`);
+    };
+
     const onEnrollmentError = message => dispatch(showEnrollmentError({ message }));
 
     if (error) {
@@ -131,6 +135,7 @@ export const EnrollmentPageDefault = () => {
             onUpdateIncidentDate={onUpdateIncidentDate}
             onEnrollmentError={onEnrollmentError}
             ruleEffects={ruleEffects}
+            onTransferOutsideCaptureScope={onTransferOutsideCaptureScope}
         />
     );
 };

src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.types.js

@@ -24,6 +24,7 @@ export type Props = {|
     onLinkedRecordClick: LinkedRecordClick,
     onUpdateEnrollmentDate: (enrollmentDate: string) => void,
     onUpdateIncidentDate: (incidentDate: string) => void,
+    onTransferOutsideCaptureScope: () => void,
     onEnrollmentError: (message: string) => void,
     ruleEffects?: Array<{id: string, type: $Values<effectActions>}>;
 |};

src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.component.js

@@ -55,6 +55,7 @@ const EnrollmentAddEventPagePain = ({
     onEnrollmentSuccess,
     pageFailure,
     ready,
+    onTransferOutsideCaptureScope,
     classes,
     ...passOnProps
 }: Props) => (
@@ -132,6 +133,7 @@ const EnrollmentAddEventPagePain = ({
                                 onAddNew={onAddNew}
                                 onError={onEnrollmentError}
                                 onSuccess={onEnrollmentSuccess}
+                                onTransferOutsideCaptureScope={onTransferOutsideCaptureScope}
                             />
                         </div>
                     </div>

src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.container.js

@@ -64,6 +64,10 @@ export const EnrollmentAddEventPageDefault = ({
     const onEnrollmentError = message => dispatch(showEnrollmentError({ message }));
     const onEnrollmentSuccess = () => dispatch(fetchEnrollments());
 
+    const onTransferOutsideCaptureScope = () => {
+        history.push(`/?${buildUrlQueryString({ orgUnitId, programId })}`);
+    };
+
     const widgetReducerName = 'enrollmentEvent-newEvent';
 
     const dataEntryHasChanges = useSelector(state => getDataEntryHasChanges(state, widgetReducerName));
@@ -151,6 +155,7 @@ export const EnrollmentAddEventPageDefault = ({
                 dataEntryHasChanges={dataEntryHasChanges}
                 onEnrollmentError={onEnrollmentError}
                 onEnrollmentSuccess={onEnrollmentSuccess}
+                onTransferOutsideCaptureScope={onTransferOutsideCaptureScope}
             />
         </>
     );

src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.types.js

@@ -14,6 +14,7 @@ export type Props = {|
     onDelete: () => void,
     onAddNew: () => void,
     onEnrollmentError: (message: string) => void,
+    onTransferOutsideCaptureScope?: () => void,
     onEnrollmentSuccess: () => void,
     widgetEffects: ?WidgetEffects,
     hideWidgets: HideWidgets,

src/core_modules/capture-core/components/Pages/EnrollmentEditEvent/EnrollmentEditEventPage.component.js

@@ -116,6 +116,7 @@ const EnrollmentEditEventPageRight = ({
     getAssignedUserSaveContext,
     onSaveAssignee,
     onSaveAssigneeError,
+    onTransferOutsideCaptureScope,
     addRelationShipContainerElement,
     toggleVisibility,
 }) => (
@@ -152,7 +153,8 @@ const EnrollmentEditEventPageRight = ({
                 addRelationshipRenderElement={addRelationShipContainerElement}
                 onOpenAddRelationship={toggleVisibility}
                 onCloseAddRelationship={toggleVisibility}
-                onAddRelationship={() => {}}
+                onAddRelationship={() => {
+                }}
                 onLinkedRecordClick={onLinkedRecordClick}
             />
         )}
@@ -166,6 +168,7 @@ const EnrollmentEditEventPageRight = ({
             onAddNew={onAddNew}
             onError={onEnrollmentError}
             onSuccess={onEnrollmentSuccess}
+            onTransferOutsideCaptureScope={onTransferOutsideCaptureScope}
         />
     </>
 );
@@ -201,6 +204,7 @@ const EnrollmentEditEventPagePain = ({
     getAssignedUserSaveContext,
     onSaveAssignee,
     onSaveAssigneeError,
+    onTransferOutsideCaptureScope,
 }: PlainProps) => {
     const [mainContentVisible, setMainContentVisible] = useState(true);
     const [addRelationShipContainerElement, setAddRelationShipContainerElement] = useState<?HTMLDivElement>(undefined);
@@ -272,6 +276,7 @@ const EnrollmentEditEventPagePain = ({
                             onSaveAssigneeError={onSaveAssigneeError}
                             addRelationShipContainerElement={addRelationShipContainerElement}
                             toggleVisibility={toggleVisibility}
+                            onTransferOutsideCaptureScope={onTransferOutsideCaptureScope}
                         />
                     </div>
                 </div>

src/core_modules/capture-core/components/Pages/EnrollmentEditEvent/EnrollmentEditEventPage.container.js

@@ -161,6 +161,9 @@ const EnrollmentEditEventPageWithContextPlain = ({
         const assignedUser: ApiAssignedUser = convertClientToServer(newAssignee, dataElementTypes.ASSIGNEE);
         dispatch(setAssignee(assignedUser, newAssignee, eventId));
     };
+    const onTransferOutsideCaptureScope = () => {
+        history.push(`/?${buildUrlQueryString({ orgUnitId, programId })}`);
+    };
     const onSaveAssigneeError = (prevAssignee) => {
         const assignedUser: ApiAssignedUser | typeof undefined = prevAssignee
             // $FlowFixMe dataElementTypes flow error
@@ -200,6 +203,7 @@ const EnrollmentEditEventPageWithContextPlain = ({
             getAssignedUserSaveContext={getAssignedUserSaveContext}
             onSaveAssignee={onSaveAssignee}
             onSaveAssigneeError={onSaveAssigneeError}
+            onTransferOutsideCaptureScope={onTransferOutsideCaptureScope}
         />
     );
 };

src/core_modules/capture-core/components/Pages/EnrollmentEditEvent/EnrollmentEditEventPage.types.js

@@ -27,6 +27,7 @@ export type PlainProps = {|
     onEnrollmentSuccess: () => void,
     onCancelEditEvent: (isScheduled: boolean) => void,
     onHandleScheduleSave: (eventData: Object) => void,
+    onTransferOutsideCaptureScope?: () => void,
     pageStatus: string,
     eventStatus?: string,
     eventAccess: {|

src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.component.js

@@ -12,6 +12,8 @@ import { AddLocation } from './AddLocation';
 import type { PlainProps } from './actions.types';
 import { LoadingMaskForButton } from '../../LoadingMasks';
 import { MapModal } from '../MapModal';
+import { Transfer } from './Transfer';
+import { TransferModal } from '../TransferModal';
 
 const styles = {
     actions: {
@@ -28,17 +30,20 @@ const styles = {
 
 export const ActionsPlain = ({
     enrollment = {},
+    ownerOrgUnitId,
     tetName,
     canAddNew,
     onUpdate,
     onDelete,
+    onUpdateOwnership,
     onAddNew,
     loading,
     onlyEnrollOnce,
     classes,
 }: PlainProps) => {
     const [isOpenActions, setOpenActions] = useState(false);
     const [isOpenMap, setOpenMap] = useState(false);
+    const [isOpenTransfer, setOpenTransfer] = useState(false);
     const handleOnUpdate = (arg) => {
         setOpenActions(false);
         onUpdate(arg);
@@ -75,6 +80,13 @@ export const ActionsPlain = ({
                                 enrollment={enrollment}
                                 onUpdate={handleOnUpdate}
                             />
+                            <Transfer
+                                enrollment={enrollment}
+                                setOpenTransfer={() => {
+                                    setOpenTransfer(true);
+                                    setOpenActions(false);
+                                }}
+                            />
                             <AddLocation
                                 enrollment={enrollment}
                                 setOpenMap={() => {
@@ -110,6 +122,14 @@ export const ActionsPlain = ({
                 onUpdate={handleOnUpdate}
                 setOpenMap={setOpenMap}
             />}
+            {isOpenTransfer && (
+                <TransferModal
+                    enrollment={enrollment}
+                    ownerOrgUnitId={ownerOrgUnitId}
+                    setOpenTransfer={setOpenTransfer}
+                    onUpdateOwnership={onUpdateOwnership}
+                />
+            )}
         </>
     );
 };

src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.container.js

@@ -3,6 +3,7 @@ import React from 'react';
 import { ActionsComponent } from './Actions.component';
 import type { Props } from './actions.types';
 import { useUpdateEnrollment, useDeleteEnrollment } from '../dataMutation/dataMutation';
+import { useUpdateOwnership } from './Transfer/hooks';
 
 export const Actions = ({
     enrollment = {},
@@ -11,16 +12,24 @@ export const Actions = ({
     onDelete,
     onError,
     onSuccess,
+    onTransferOutsideCaptureScope,
     ...passOnProps
 }: Props) => {
     const { updateMutation, updateLoading } = useUpdateEnrollment(refetchEnrollment, refetchTEI, onError);
     const { deleteMutation, deleteLoading } = useDeleteEnrollment(onDelete, onError);
+    const { updateEnrollmentOwnership } = useUpdateOwnership({
+        teiId: enrollment.trackedEntity,
+        programId: enrollment.program,
+        onTransferOutsideCaptureScope,
+        refetchTEI,
+    });
 
     return (
         <ActionsComponent
             enrollment={enrollment}
             onUpdate={updateMutation}
             onDelete={deleteMutation}
+            onUpdateOwnership={updateEnrollmentOwnership}
             loading={updateLoading || deleteLoading}
             {...passOnProps}
         />

src/core_modules/capture-core/components/WidgetEnrollment/Actions/Transfer/Transfer.component.js

@@ -0,0 +1,15 @@
+// @flow
+import React from 'react';
+import i18n from '@dhis2/d2-i18n';
+import { IconArrowRight16, MenuItem } from '@dhis2/ui';
+import type { Props } from './transfer.types';
+
+export const Transfer = ({ setOpenTransfer }: Props) => (
+    <MenuItem
+        dense
+        dataTest="widget-enrollment-actions-transfer"
+        onClick={() => setOpenTransfer(true)}
+        icon={<IconArrowRight16 />}
+        label={i18n.t('Transfer')}
+    />
+);

src/core_modules/capture-core/components/WidgetEnrollment/Actions/Transfer/hooks/index.js

@@ -0,0 +1,3 @@
+// @flow
+
+export { useUpdateOwnership } from './useUpdateOwnership';