Fix(UI) #7441: Fixed issue with profile picture. (#7451)

* Fixed issue with profile picture showing fallback image in navbar even with profile image is present in user details

* Added additional check for displaying profile picture in user details page

* Worked on comments
This commit is contained in:
Aniket Katkar 2022-09-14 18:00:20 +05:30 committed by GitHub
parent 2c609b4ea4
commit 1d0c6360bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 2 deletions

View File

@ -784,6 +784,12 @@ const Users = ({
prepareSelectedTeams(); prepareSelectedTeams();
}, [userData]); }, [userData]);
useEffect(() => {
if (image) {
SetIsImgUrlValid(true);
}
}, [image]);
const getEntityData = useCallback( const getEntityData = useCallback(
(entityData: EntityReference[], tabNumber: number) => { (entityData: EntityReference[], tabNumber: number) => {
const updatedEntityData = filterEntityAssets(entityData || []); const updatedEntityData = filterEntityAssets(entityData || []);

View File

@ -64,6 +64,11 @@ const NavBar = ({
handleKeyDown, handleKeyDown,
handleOnClick, handleOnClick,
}: NavBarProps) => { }: NavBarProps) => {
// get current user details
const currentUser = useMemo(
() => AppState.getCurrentUserDetails(),
[AppState.userDetails, AppState.nonSecureUserDetails]
);
const history = useHistory(); const history = useHistory();
const [searchIcon, setSearchIcon] = useState<string>('icon-searchv1'); const [searchIcon, setSearchIcon] = useState<string>('icon-searchv1');
const [suggestionSearch, setSuggestionSearch] = useState<string>(''); const [suggestionSearch, setSuggestionSearch] = useState<string>('');
@ -75,8 +80,8 @@ const NavBar = ({
const [isImgUrlValid, SetIsImgUrlValid] = useState<boolean>(true); const [isImgUrlValid, SetIsImgUrlValid] = useState<boolean>(true);
const profilePicture = useMemo( const profilePicture = useMemo(
() => AppState?.userDetails?.profile?.images?.image512, () => currentUser?.profile?.images?.image512,
[AppState] [currentUser]
); );
const { socket } = useWebSocketConnector(); const { socket } = useWebSocketConnector();
@ -212,6 +217,12 @@ const NavBar = ({
}; };
}, [socket]); }, [socket]);
useEffect(() => {
if (profilePicture) {
SetIsImgUrlValid(true);
}
}, [profilePicture]);
return ( return (
<> <>
<div className="tw-h-16 tw-py-3 tw-border-b-2 tw-border-separator"> <div className="tw-h-16 tw-py-3 tw-border-b-2 tw-border-separator">