fix: assignedUser can be an empty object

dhis2 · Nov 13, 2023 · f64a7d7 · f64a7d7
1 parent d2b89e9
commit f64a7d7
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/core_modules/capture-core/converters/serverToClient.js b/src/core_modules/capture-core/converters/serverToClient.js
@@ -11,18 +11,14 @@ function convertTime(d2Value: string) {
     return parseData.momentTime;
 }
 
-const convertAssignedUserToClient = (assignedUser?: ApiAssignedUser) => {
-    if (!assignedUser) {
-        return null;
-    }
-    return {
+const convertAssignedUserToClient = (assignedUser?: ApiAssignedUser) =>
+    ((assignedUser && assignedUser.uid) ? {
         id: assignedUser.uid,
         name: assignedUser.displayName,
         username: assignedUser.username,
         firstName: assignedUser.firstName,
         surname: assignedUser.surname,
-    };
-};
+    } : null);
 
 const optionSetConvertersForType = {
     [dataElementTypes.NUMBER]: parseNumber,