fix: [DHIS2-16317] Incorrect error message on orgUnit type data eleme…

…nt (#3484) Co-authored-by: Tony Valle <[email protected]>
dhis2 · Dec 20, 2023 · ef30449 · ef30449
1 parent d5d4ded
commit ef30449
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...-core/components/FormFields/New/Fields/OrgUnitField/SingleOrgUnitSelectField.component.js b/...-core/components/FormFields/New/Fields/OrgUnitField/SingleOrgUnitSelectField.component.js
@@ -13,7 +13,7 @@ const getStyles = () => ({
 
 type OrgUnitValue = {
     id: string,
-    displayName: string,
+    name: string,
     path: string,
 }
 
@@ -44,15 +44,15 @@ class SingleOrgUnitSelectFieldPlain extends React.Component<Props, State> {
         const { classes } = this.props;
         return (
             <div className={classes.selectedOrgUnitContainer}>
-                <Chip onRemove={this.onDeselectOrgUnit}>{selectedOrgUnit.displayName}</Chip>
+                <Chip onRemove={this.onDeselectOrgUnit}>{selectedOrgUnit.name}</Chip>
             </div>
         );
     }
 
     onSelectOrgUnit = (orgUnit: Object) => {
         this.props.onBlur({
             id: orgUnit.id,
-            displayName: orgUnit.displayName,
+            name: orgUnit.displayName,
             path: orgUnit.path,
         });
     }

diff --git a/...psWidget/TrackedEntityRelationshipsWrapper/TrackedEntityRelationshipsWrapper.component.js b/...psWidget/TrackedEntityRelationshipsWrapper/TrackedEntityRelationshipsWrapper.component.js
@@ -15,7 +15,7 @@ import {
 } from '../../../NewRelationship/TeiRelationship/SearchResults/TeiRelationshipSearchResults.component';
 import { ResultsPageSizeContext } from '../../../shared-contexts';
 import { RegisterTei } from '../RegisterTei';
-import { useOrganisationUnit } from '../../../../../dataQueries';
+import { useCoreOrgUnit } from '../../../../../metadataRetrieval/coreOrgUnit';
 
 export const TrackedEntityRelationshipsWrapper = ({
     trackedEntityTypeId,
@@ -29,7 +29,8 @@ export const TrackedEntityRelationshipsWrapper = ({
 }: Props) => {
     const dispatch = useDispatch();
     const { relationshipTypes, isError } = useTEIRelationshipsWidgetMetadata();
-    const { orgUnit: initialOrgUnit } = useOrganisationUnit(orgUnitId, 'id,displayName,code');
+    const { orgUnit } = useCoreOrgUnit(orgUnitId);
+    const initialOrgUnit = orgUnit ? { id: orgUnitId, name: orgUnit.name, path: orgUnit.path } : null;
 
     const onSelectFindMode = ({ findMode, relationshipConstraint }: OnSelectFindModeProps) => {
         dispatch(selectFindMode({