feat: compare with event data to find latest value

dhis2 · Nov 5, 2024 · 292ff79 · 292ff79
1 parent 8217a68
commit 292ff79
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 22 deletions.
diff --git a/...core_modules/capture-core/components/WidgetsChangelog/common/hooks/useClientDataValues.js b/...core_modules/capture-core/components/WidgetsChangelog/common/hooks/useClientDataValues.js
@@ -1,6 +1,5 @@
 // @flow
 import { useMemo } from 'react';
-import moment from 'moment';
 import { v4 as uuid } from 'uuid';
 import log from 'loglevel';
 import { useTimeZoneConversion, useConfig, useDataEngine } from '@dhis2/app-runtime';
@@ -42,16 +41,6 @@ const fetchFormattedValues = async ({
 }) => {
     if (!rawRecords) return [];
 
-    const mostRecentCreatedAtByFieldId = rawRecords.changeLogs.reduce((acc, record) => {
-        const elementKey = Object.keys(record.change)[0];
-        const fieldId = record.change[elementKey]?.dataElement ?? record.change[elementKey]?.attribute;
-
-        if (!acc[fieldId] || moment(record.createdAt).isAfter(acc[fieldId])) {
-            acc[fieldId] = record.createdAt;
-        }
-        return acc;
-    }, {});
-
     const getMetadataItemDefinition = (
         elementKey: string,
         change: Change,
@@ -82,14 +71,9 @@ const fetchFormattedValues = async ({
                 return null;
             }
 
-            console.log('change', change);
-            console.log('entityData', entityData);
-
-            const getSubValue =
-                subValueGetterByElementType[RECORD_TYPE[entityType]]?.[metadataElement.type];
+            const getSubValue = subValueGetterByElementType[RECORD_TYPE[entityType]]?.[metadataElement.type];
 
-            const isLatestValue =
-                moment(createdAt).isSameOrAfter(mostRecentCreatedAtByFieldId[fieldId]);
+            const isLatestValue = entityData?.[change.dataElement]?.value === 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 'name';
             }
 
             return {
@@ -67,7 +67,7 @@ const buildTEAUrlByElementType: {|
             const { id, displayName: name } = await querySingleResource({ resource: `fileResources/${value}` });
 
             if (!latestValue) {
-                return name;
+                return 'Image';
             }
 
             return {
@@ -96,7 +96,7 @@ const buildDataElementUrlByElementType: {|
             const { id, displayName: name } = await querySingleResource({ resource: `fileResources/${value}` });
 
             if (!latestValue) {
-                return name;
+                return 'File';
             }
 
             return {
@@ -119,7 +119,7 @@ const buildDataElementUrlByElementType: {|
             const { id, displayName: name } = await querySingleResource({ resource: `fileResources/${value}` });
 
             if (!latestValue) {
-                return name;
+                return 'Image';
             }
 
             return {