Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Eclipse Foundation
IT
Websites
membership.eclipse.org
Commits
d80c9428
Commit
d80c9428
authored
Jan 05, 2022
by
Zhou Fang
Browse files
Updated redirect logic to handle the login
parent
0e448291
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/main/www/src/components/Portal/ContactManagement/ContactManagement.tsx
View file @
d80c9428
...
...
@@ -22,6 +22,7 @@ import {
PERMISSIONS_BASED_ON_ROLES
,
UPDATE_DENYLISTED_RELATIONS
,
ROLE_DESCRIPTION
,
ORIGINAL_PATH_KEY
,
}
from
'
../../../Constants/Constants
'
;
import
{
useContext
,
useEffect
,
useState
}
from
'
react
'
;
import
PortalContext
from
'
../../../Context/PortalContext
'
;
...
...
@@ -493,6 +494,10 @@ export default function ContactManagement() {
saveContacts
(
contactData
);
},
[
contactData
,
allRelations
]);
useEffect
(()
=>
{
currentUser
!==
null
&&
sessionStorage
.
setItem
(
ORIGINAL_PATH_KEY
,
'
/portal
'
);
},
[
currentUser
]);
return
!
checkPermission
(
PERMISSIONS_BASED_ON_ROLES
.
accessContacts
,
currentUser
?.
relation
)
?
(
<
NoAccess
/>
)
:
(
...
...
src/main/www/src/components/Portal/Dashboard/Dashboard.tsx
View file @
d80c9428
...
...
@@ -6,12 +6,20 @@ import DashboardProjectsAndWG from './DashboardProjectsAndWG/DashboardProjectsAn
import
DashboardResources
from
'
./DashboardResources
'
;
import
{
useContext
,
useEffect
,
useState
}
from
'
react
'
;
import
{
fetchWrapper
}
from
'
../../../Utils/formFunctionHelpers
'
;
import
{
api_prefix
,
FETCH_METHOD
,
getCurrentMode
,
MODE_REACT_ONLY
}
from
'
../../../Constants/Constants
'
;
import
{
api_prefix
,
FETCH_METHOD
,
getCurrentMode
,
MODE_REACT_ONLY
,
ORIGINAL_PATH_KEY
,
}
from
'
../../../Constants/Constants
'
;
import
{
OrganizationRoles
,
OrgInfoBackend
,
OrgRep
}
from
'
../../../Interfaces/portal_interface
'
;
import
PortalContext
from
'
../../../Context/PortalContext
'
;
import
GlobalContext
from
'
../../../Context/GlobalContext
'
;
export
default
function
Dashboard
()
{
const
{
orgId
,
orgInfo
,
setOrgInfo
}
=
useContext
(
PortalContext
);
const
{
currentUser
}
=
useContext
(
GlobalContext
);
const
[
orgRepData
,
setOrgRepData
]
=
useState
<
Array
<
OrgRep
>
|
null
>
(
null
);
useEffect
(()
=>
{
...
...
@@ -62,6 +70,9 @@ export default function Dashboard() {
fetchWrapper
(
urlForOrgInfo
,
FETCH_METHOD
.
GET
,
saveOrgInfo
);
},
[
orgId
,
orgInfo
,
setOrgInfo
]);
useEffect
(()
=>
{
currentUser
!==
null
&&
sessionStorage
.
setItem
(
ORIGINAL_PATH_KEY
,
'
/portal
'
);
},
[
currentUser
]);
return
(
<>
<
DashboardIntro
orgRepData
=
{
orgRepData
}
/>
...
...
src/main/www/src/components/Portal/OrgProfile/OrgProfiles.tsx
View file @
d80c9428
import
{
createStyles
,
makeStyles
,
Typography
,
Theme
}
from
'
@material-ui/core
'
;
import
BusinessIcon
from
'
@material-ui/icons/Business
'
;
import
{
brightOrange
,
iconGray
,
PERMISSIONS_BASED_ON_ROLES
}
from
'
../../../Constants/Constants
'
;
import
{
brightOrange
,
iconGray
,
ORIGINAL_PATH_KEY
,
PERMISSIONS_BASED_ON_ROLES
}
from
'
../../../Constants/Constants
'
;
import
GlobalContext
from
'
../../../Context/GlobalContext
'
;
import
{
checkPermission
}
from
'
../../../Utils/portalFunctionHelpers
'
;
import
OrgProfilesBasicInfo
from
'
./OrgProfilesBasicInfo
'
;
import
OrgProfilesLinks
from
'
./OrgProfilesLinks
'
;
import
{
useContext
}
from
'
react
'
;
import
{
useContext
,
useEffect
}
from
'
react
'
;
import
NoAccess
from
'
../../ErrorPages/NoAccess
'
;
const
useStyle
=
makeStyles
((
theme
:
Theme
)
=>
...
...
@@ -25,7 +25,11 @@ export default function OrgProfile() {
const
classes
=
useStyle
();
const
{
currentUser
}
=
useContext
(
GlobalContext
);
return
!
checkPermission
(
PERMISSIONS_BASED_ON_ROLES
.
accessOrgProfile
,
currentUser
?.
relation
)
?
(
useEffect
(()
=>
{
currentUser
!==
null
&&
sessionStorage
.
setItem
(
ORIGINAL_PATH_KEY
,
'
/portal
'
);
},
[
currentUser
]);
return
!
checkPermission
(
PERMISSIONS_BASED_ON_ROLES
.
accessContacts
,
currentUser
?.
relation
)
?
(
<
NoAccess
/>
)
:
(
<>
...
...
src/main/www/src/components/Portal/Portal.tsx
View file @
d80c9428
...
...
@@ -19,7 +19,7 @@ import { useEffect, useContext, useState } from 'react';
import
GlobalContext
from
'
../../Context/GlobalContext
'
;
import
PortalFooter
from
'
./PortalFooter
'
;
import
PortalLogin
from
'
./Login/PortalLogin
'
;
const
useStyles
=
makeStyles
((
theme
:
Theme
)
=>
createStyles
({
root
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment