mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-29 06:15:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Correct use selector (#515)

Browse source
This commit is contained in:
mrdrogdrog 2020-08-30 21:24:34 +02:00 • committed by GitHub
parent 971421925a
commit a41d3d1515
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 74 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/profile-page/profile-page.tsx
View file

@ -10,9 +10,9 @@ import { ProfileChangePassword } from './settings/profile-change-password'
import { ProfileDisplayName } from './settings/profile-display-name'
export const ProfilePage: React.FC = () => {
const user = useSelector((state: ApplicationState) => state.user)
const userProvider = useSelector((state: ApplicationState) => state.user?.provider)
if (!user) {
if (!userProvider) {
return (
<Redirect to={'/login'}/>
)
@ -23,7 +23,7 @@ export const ProfilePage: React.FC = () => {
<Row className="h-100 flex justify-content-center">
<Col lg={6}>
<ProfileDisplayName/>
<ShowIf condition={user.provider === LoginProvider.INTERNAL}>
<ShowIf condition={userProvider === LoginProvider.INTERNAL}>
<ProfileChangePassword/>
</ShowIf>
<ProfileAccountManagement/>

10
src/components/profile-page/settings/profile-display-name.tsx
View file

@ -9,18 +9,18 @@ import { getAndSetUser } from '../../login-page/auth/utils'
export const ProfileDisplayName: React.FC = () => {
const regexInvalidDisplayName = /^\s*$/
const { t } = useTranslation()
const user = useSelector((state: ApplicationState) => state.user)
const userName = useSelector((state: ApplicationState) => state.user?.name)
const [submittable, setSubmittable] = useState(false)
const [error, setError] = useState(false)
const [displayName, setDisplayName] = useState('')
useEffect(() => {
if (user) {
setDisplayName(user.name)
if (userName !== undefined) {
setDisplayName(userName)
}
}, [user])
}, [userName])
if (!user) {
if (!userName) {
return <Alert variant={'danger'}>User not logged in</Alert>
}