Merge branch 'main' into feature-import-export-custom-property

open-metadata · Sep 28, 2024 · 9228945 · 9228945
2 parents 01ec59d + f9e70f8
commit 9228945
Show file tree

Hide file tree

Showing 3 changed files with 473 additions and 365 deletions.
diff --git a/openmetadata-ui/src/main/resources/ui/package.json b/openmetadata-ui/src/main/resources/ui/package.json
@@ -105,7 +105,7 @@
     "qs": "6.10.3",
     "quill-mention": "^6.0.1",
     "quilljs-markdown": "^1.2.0",
-    "rapidoc": "9.3.4",
+    "rapidoc": "9.3.7",
     "react": "^17.0.2",
     "react-antd-column-resize": "1.0.3",
     "react-awesome-query-builder": "5.1.2",

diff --git a/...omponents/Settings/Users/UsersProfile/UserProfileDetails/UserProfileDetails.component.tsx b/...omponents/Settings/Users/UsersProfile/UserProfileDetails/UserProfileDetails.component.tsx
@@ -15,7 +15,7 @@ import { ExclamationCircleFilled } from '@ant-design/icons';
 import { Button, Divider, Input, Space, Tooltip, Typography } from 'antd';
 import { AxiosError } from 'axios';
 import { isEmpty } from 'lodash';
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ReactComponent as EditIcon } from '../../../../../assets/svg/edit-new.svg';
 import {
@@ -269,6 +269,11 @@ const UserProfileDetails = ({
     }
   }, [userData.id]);
 
+  useEffect(() => {
+    // Reset display name when user data changes
+    setDisplayName(userData.displayName);
+  }, [userData.displayName]);
+
   return (
     <>
       <Space