Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Eclipse Foundation
IT
Websites
membership.eclipse.org
Commits
6cd8cc9e
Commit
6cd8cc9e
authored
Jan 05, 2022
by
Zhou Fang
Browse files
Minor improvements on overall logic
parent
d80c9428
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/main/www/src/components/Portal/ContactManagement/ContactManagement.tsx
View file @
6cd8cc9e
...
...
@@ -22,7 +22,6 @@ 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
'
;
...
...
@@ -494,10 +493,6 @@ 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 @
6cd8cc9e
...
...
@@ -6,20 +6,12 @@ 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
,
ORIGINAL_PATH_KEY
,
}
from
'
../../../Constants/Constants
'
;
import
{
api_prefix
,
FETCH_METHOD
,
getCurrentMode
,
MODE_REACT_ONLY
}
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
(()
=>
{
...
...
@@ -70,9 +62,6 @@ 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 @
6cd8cc9e
import
{
createStyles
,
makeStyles
,
Typography
,
Theme
}
from
'
@material-ui/core
'
;
import
BusinessIcon
from
'
@material-ui/icons/Business
'
;
import
{
brightOrange
,
iconGray
,
ORIGINAL_PATH_KEY
,
PERMISSIONS_BASED_ON_ROLES
}
from
'
../../../Constants/Constants
'
;
import
{
brightOrange
,
iconGray
,
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
,
useEffect
}
from
'
react
'
;
import
{
useContext
}
from
'
react
'
;
import
NoAccess
from
'
../../ErrorPages/NoAccess
'
;
const
useStyle
=
makeStyles
((
theme
:
Theme
)
=>
...
...
@@ -25,10 +25,6 @@ export default function OrgProfile() {
const
classes
=
useStyle
();
const
{
currentUser
}
=
useContext
(
GlobalContext
);
useEffect
(()
=>
{
currentUser
!==
null
&&
sessionStorage
.
setItem
(
ORIGINAL_PATH_KEY
,
'
/portal
'
);
},
[
currentUser
]);
return
!
checkPermission
(
PERMISSIONS_BASED_ON_ROLES
.
accessContacts
,
currentUser
?.
relation
)
?
(
<
NoAccess
/>
)
:
(
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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