fix: review changes

dhis2 · Aug 12, 2024 · 039c1ac · 039c1ac
1 parent 8be30ca
commit 039c1ac
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 34 deletions.
diff --git a/src/core_modules/capture-core/components/Tooltips/TooltipOrgUnit/TooltipOrgUnit.component.js b/src/core_modules/capture-core/components/Tooltips/TooltipOrgUnit/TooltipOrgUnit.component.js
@@ -15,7 +15,7 @@ export const TooltipOrgUnit = ({ orgUnitName, ancestors, tooltip }: Props) => {
     const tooltipParts = tooltip ? tooltip.split(orgUnitName) : [orgUnitName];
 
     return (
-        <Tooltip content={orgUnitNameFullPath} openDelay={400}>
+        <Tooltip content={orgUnitNameFullPath} openDelay={400} maxWidth={900}>
             <span>
                 {tooltip ? (
                     <>

diff --git a/src/core_modules/capture-core/components/WidgetProfile/WidgetProfile.component.js b/src/core_modules/capture-core/components/WidgetProfile/WidgetProfile.component.js
@@ -102,10 +102,7 @@ const WidgetProfilePlain = ({
         .filter(item => item.displayInList)
         .map((clientAttribute) => {
             const { attribute, key, valueType } = clientAttribute;
-            const value = valueType === 'ORGANISATION_UNIT' ? (
-                clientAttribute.value) : (
-                convertClientToView(clientAttribute)
-            );
+            const value = convertClientToView(clientAttribute);
             return {
                 attribute, key, value, valueType, reactKey: attribute,
             };

diff --git a/src/core_modules/capture-core/components/WidgetProfile/hooks/getSubValueForTei.js b/src/core_modules/capture-core/components/WidgetProfile/hooks/getSubValueForTei.js
@@ -51,10 +51,20 @@ const getOrganisationUnitSubvalue = async ({ attribute, querySingleResource }: S
         resource: 'organisationUnits',
         id: attribute.value,
         params: {
-            fields: 'id,name',
+            fields: 'id,name,ancestors[displayName,level]',
         },
     });
-    return { ...organisationUnit };
+
+    const orgUnitClientValue = {
+        id: organisationUnit.id,
+        orgUnitName: organisationUnit.name,
+        ancestors: organisationUnit.ancestors.map(ancestor => ({
+            displayName: ancestor.displayName,
+            level: ancestor.level,
+        })),
+    };
+
+    return orgUnitClientValue;
 };
 
 export const subValueGetterByElementType = {

diff --git a/src/core_modules/capture-ui/FlatList/FlatList.component.js b/src/core_modules/capture-ui/FlatList/FlatList.component.js
@@ -1,9 +1,9 @@
-import React from 'react';
+// @flow
+import React, { type ComponentType } from 'react';
 import cx from 'classnames';
 import { colors, spacersNum } from '@dhis2/ui';
 import { withStyles } from '@material-ui/core';
-import { useOrgUnitNameWithAncestors } from '../../capture-core/metadataRetrieval/orgUnitName';
-import { convertValue } from '../../capture-core/converters/clientToView';
+import type { Props } from './flatList.types';
 
 const itemStyles = {
     overflow: 'hidden',
@@ -36,41 +36,24 @@ const styles = {
     },
 };
 
-const FlatListItem = ({ item, classes, lastItemKey }) => {
-    const { displayName: orgUnitName, ancestors } = useOrgUnitNameWithAncestors(item.value?.id);
-
-    const orgUnitClientValue = {
-        orgUnitName,
-        ancestors,
-    };
-
-    return (
+const FlatListPlain = ({ list, classes, dataTest }: Props) => {
+    const lastItemKey = list[list.length - 1]?.reactKey;
+    const renderItem = item => (
         <div
             key={item.reactKey}
             className={cx(classes.itemRow, { isLastItem: item.reactKey === lastItemKey })}
         >
             <div className={classes.itemKey}>{item.key}:</div>
-            <div className={classes.itemValue}>
-                {item.valueType === 'ORGANISATION_UNIT' ? (
-                    convertValue(orgUnitClientValue, item.valueType)
-                ) : (
-                    item.value
-                )}
-            </div>
+            <div className={classes.itemValue}>{item.value}</div>
         </div>
     );
-};
 
-const FlatListPlain = ({ list, classes, dataTest }) => {
-    const lastItemKey = list[list.length - 1]?.reactKey;
 
     return (
         <div data-test={dataTest}>
-            {list.map(item => (
-                <FlatListItem key={item.reactKey} item={item} classes={classes} lastItemKey={lastItemKey} />
-            ))}
+            {list.map(item => renderItem(item))}
         </div>
     );
 };
 
-export const FlatList = withStyles(styles)(FlatListPlain);
+export const FlatList: ComponentType<$Diff<Props, CssClasses>> = withStyles(styles)(FlatListPlain);
diff --git a/src/core_modules/capture-ui/FlatList/flatList.types.js b/src/core_modules/capture-ui/FlatList/flatList.types.js
@@ -1,6 +1,6 @@
 // @flow
 export type Props = {|
-    list: { reactKey: string, key: string, value: { id: string, name: string }, valueType?: string }[],
+    list: { reactKey: string, key: string, value: Object, valueType?: string }[],
     dataTest?: string,
     ...CssClasses,
 |};