feat: image and file for event and tracked entity

dhis2 · Nov 6, 2024 · df7011f · df7011f
1 parent 292ff79
commit df7011f
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 5 deletions.
diff --git a/...ture-core/components/Pages/ViewEvent/EventDetailsSection/EventDetailsSection.component.js b/...ture-core/components/Pages/ViewEvent/EventDetailsSection/EventDetailsSection.component.js
@@ -56,6 +56,7 @@ const getStyles = () => ({
 type Props = {
     showEditEvent: ?boolean,
     eventId: string,
+    eventData: Object,
     onOpenEditEvent: (orgUnit: Object, programCategory: ?ProgramCategory) => void,
     programStage: ProgramStage,
     eventAccess: { read: boolean, write: boolean },
@@ -76,6 +77,7 @@ const EventDetailsSectionPlain = (props: Props) => {
     const {
         classes,
         eventId,
+        eventData,
         onOpenEditEvent,
         showEditEvent,
         programStage,
@@ -200,7 +202,7 @@ const EventDetailsSectionPlain = (props: Props) => {
                 <EventChangelogWrapper
                     isOpen
                     setIsOpen={setChangeLogIsOpen}
-                    eventData={{}}
+                    eventData={eventData}
                     eventId={eventId}
                     formFoundation={programStage.stageForm}
                 />

diff --git a/...ture-core/components/Pages/ViewEvent/EventDetailsSection/EventDetailsSection.container.js b/...ture-core/components/Pages/ViewEvent/EventDetailsSection/EventDetailsSection.container.js
@@ -10,6 +10,7 @@ import type { ProgramCategory } from '../../../WidgetEventSchedule/CategoryOptio
 const mapStateToProps = (state: ReduxState) => ({
     showEditEvent: state.viewEventPage.eventDetailsSection && state.viewEventPage.eventDetailsSection.showEditEvent,
     eventId: state.viewEventPage.eventId,
+    eventData: state.viewEventPage.loadedValues?.eventContainer?.values || {},
     programId: state.currentSelections.programId,
 });
 

diff --git a/...core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.component.js b/...core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.component.js
@@ -9,6 +9,7 @@ import { TrackedEntityChangelogWrapper } from './TrackedEntityChangelogWrapper';
 
 export const OverflowMenuComponent = ({
     trackedEntity,
+    trackedEntityData,
     trackedEntityTypeName,
     canWriteData,
     canCascadeDeleteTei,
@@ -68,6 +69,7 @@ export const OverflowMenuComponent = ({
                     programAPI={programAPI}
                     isOpen={changelogIsOpen}
                     setIsOpen={setChangelogIsOpen}
+                    trackedEntityData={trackedEntityData}
                 />
             )}
         </>

diff --git a/...core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.container.js b/...core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.container.js
@@ -8,6 +8,7 @@ export const OverflowMenu = ({
     trackedEntityTypeName,
     canWriteData,
     trackedEntity,
+    trackedEntityData,
     onDeleteSuccess,
     displayChangelog,
     teiId,
@@ -21,6 +22,7 @@ export const OverflowMenu = ({
             canWriteData={canWriteData}
             canCascadeDeleteTei={hasAuthority}
             trackedEntity={trackedEntity}
+            trackedEntityData={trackedEntityData}
             onDeleteSuccess={onDeleteSuccess}
             displayChangelog={displayChangelog}
             teiId={teiId}

diff --git a/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.types.js b/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.types.js
@@ -3,7 +3,9 @@
 export type Props = {|
     trackedEntity: { trackedEntity: string },
     trackedEntityTypeName: string,
+    trackedEntityData: Object,
     canWriteData: boolean,
+    trackedEntityData: Object,
     onDeleteSuccess?: () => void,
     displayChangelog: boolean,
     teiId: string,
@@ -13,6 +15,7 @@ export type Props = {|
 export type PlainProps = {|
     trackedEntity: { trackedEntity: string },
     trackedEntityTypeName: string,
+    trackedEntityData: Object,
     canWriteData: boolean,
     canCascadeDeleteTei: boolean,
     onDeleteSuccess?: () => void,

diff --git a/...ile/OverflowMenu/TrackedEntityChangelogWrapper/TrackedEntityChangelogWrapper.component.js b/...ile/OverflowMenu/TrackedEntityChangelogWrapper/TrackedEntityChangelogWrapper.component.js
@@ -5,9 +5,14 @@ import { useFormFoundation } from '../../DataEntry/hooks';
 import { WidgetTrackedEntityChangelog } from '../../../WidgetsChangelog';
 import type { Props } from './TrackedEntityChangelogWrapper.types';
 
-export const TrackedEntityChangelogWrapper = ({ programAPI, teiId, setIsOpen, ...passOnProps }: Props) => {
+export const TrackedEntityChangelogWrapper = ({ programAPI, teiId, setIsOpen, trackedEntityData, ...passOnProps }: Props) => {
     const formFoundation: RenderFoundation = useFormFoundation(programAPI);
 
+    const transformedTrackedEntityData = trackedEntityData.reduce((acc, item) => {
+        acc[item.attribute] = item.value;
+        return acc;
+    }, {});
+
     const dataItemDefinitions = useMemo(() => {
         if (!Object.keys(formFoundation)?.length) return {};
         const elements = formFoundation.getElements();
@@ -58,6 +63,7 @@ export const TrackedEntityChangelogWrapper = ({ programAPI, teiId, setIsOpen, ..
             close={() => setIsOpen(false)}
             programId={programAPI.id}
             dataItemDefinitions={dataItemDefinitions}
+            trackedEntityData={transformedTrackedEntityData}
         />
     );
 };
diff --git a/...Profile/OverflowMenu/TrackedEntityChangelogWrapper/TrackedEntityChangelogWrapper.types.js b/...Profile/OverflowMenu/TrackedEntityChangelogWrapper/TrackedEntityChangelogWrapper.types.js
@@ -5,6 +5,7 @@ type PassOnProps = {|
     teiId: string,
     isOpen: boolean,
     setIsOpen: (boolean | boolean => boolean) => void,
+    trackedEntityData: Object,
 |}
 
 export type Props = {

diff --git a/src/core_modules/capture-core/components/WidgetProfile/WidgetProfile.component.js b/src/core_modules/capture-core/components/WidgetProfile/WidgetProfile.component.js
@@ -162,6 +162,7 @@ const WidgetProfilePlain = ({
                                 trackedEntity={trackedEntity}
                                 onDeleteSuccess={onDeleteSuccess}
                                 displayChangelog={displayChangelog}
+                                trackedEntityData={trackedEntityInstanceAttributes}
                                 teiId={teiId}
                                 programAPI={program}
                             />

diff --git a/.../components/WidgetsChangelog/WidgetTrackedEntityChangelog/WidgetTrackedEntityChangelog.js b/.../components/WidgetsChangelog/WidgetTrackedEntityChangelog/WidgetTrackedEntityChangelog.js
@@ -9,18 +9,20 @@ type Props = {
     dataItemDefinitions: ItemDefinitions,
     isOpen: boolean,
     close: () => void,
+    trackedEntityData: Object,
 }
 
 export const WidgetTrackedEntityChangelog = ({
     teiId,
     programId,
     close,
+    trackedEntityData,
     ...passOnProps
 }: Props) => (
     <Changelog
         {...passOnProps}
         close={close}
-        entityData={{}}
+        entityData={trackedEntityData}
         entityId={teiId}
         programId={programId}
         entityType={CHANGELOG_ENTITY_TYPES.TRACKED_ENTITY}

diff --git a/...core_modules/capture-core/components/WidgetsChangelog/common/hooks/useClientDataValues.js b/...core_modules/capture-core/components/WidgetsChangelog/common/hooks/useClientDataValues.js
@@ -73,7 +73,9 @@ const fetchFormattedValues = async ({
 
             const getSubValue = subValueGetterByElementType[RECORD_TYPE[entityType]]?.[metadataElement.type];
 
-            const isLatestValue = entityData?.[change.dataElement]?.value === change.currentValue;
+            const isLatestValue = entityType === RECORD_TYPE.event
+                ? entityData?.[change.dataElement]?.value === change.currentValue
+                : entityData?.[change.attribute] === change.currentValue;
 
             const getValue = async (value, latestValue) => {
                 if (!getSubValue) {

diff --git a/...ules/capture-core/components/WidgetsChangelog/common/utils/getSubValueForChangelogData.js b/...ules/capture-core/components/WidgetsChangelog/common/utils/getSubValueForChangelogData.js
@@ -38,7 +38,7 @@ const buildTEAUrlByElementType: {|
             const { id, displayName: name } = await querySingleResource({ resource: `fileResources/${value}` });
 
             if (!latestValue) {
-                return 'name';
+                return 'File';
             }
 
             return {