fix: account expiry clear (#1263)

dhis2 · Aug 7, 2023 · e26415e · e26415e
1 parent c201a56
commit e26415e
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/components/UserForm/getUserData.js b/src/components/UserForm/getUserData.js
@@ -43,6 +43,12 @@ export const getUserData = ({
             )
         )
 
+    // See https://jira.dhis2.org/browse/DHIS2-10569
+    const updatedAccountExpiry =
+        typeof accountExpiry === 'string' && accountExpiry !== ''
+            ? accountExpiry
+            : undefined
+
     return {
         // Because the data object is used as the payload of a PUT request,
         // properties that are omitted will be removed. To prevent this, all
@@ -60,11 +66,7 @@ export const getUserData = ({
                 !inviteUser && !externalAuth && (!user || changePassword)
                     ? password
                     : undefined,
-            // See https://jira.dhis2.org/browse/DHIS2-10569
-            accountExpiry:
-                typeof accountExpiry === 'string' && accountExpiry !== ''
-                    ? accountExpiry
-                    : undefined,
+            accountExpiry: updatedAccountExpiry,
             openId,
             ldapId,
             externalAuth,
@@ -77,6 +79,7 @@ export const getUserData = ({
             ),
         },
 
+        accountExpiry: updatedAccountExpiry,
         email,
         firstName,
         surname,