Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RadioObservatory
LOFAR
Commits
5a641af7
Commit
5a641af7
authored
Aug 11, 2021
by
Nithya Santhanam
Browse files
Options
Downloads
Patches
Plain Diff
TMSS:814: Fixed redirecting to Login page
parent
abb55eb8
Branches
Branches containing commit
Tags
Tags containing commit
3 merge requests
!634
WIP: COBALT commissioning delta
,
!535
Resolves TMSS-814
,
!481
Draft: SW-971 SW-973 SW-975: Various fixes to build LOFAR correctly.
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
SAS/TMSS/frontend/tmss_webapp/src/App.js
+2
-2
2 additions, 2 deletions
SAS/TMSS/frontend/tmss_webapp/src/App.js
SAS/TMSS/frontend/tmss_webapp/src/components/AuthComponent.js
+2
-2
2 additions, 2 deletions
...TMSS/frontend/tmss_webapp/src/components/AuthComponent.js
with
4 additions
and
4 deletions
SAS/TMSS/frontend/tmss_webapp/src/App.js
+
2
−
2
View file @
5a641af7
...
...
@@ -47,9 +47,9 @@ class App extends Component {
staticMenuInactive
:
localStorage
.
getItem
(
'
staticMenuInactive
'
)
===
'
true
'
?
true
:
false
,
overlayMenuActive
:
localStorage
.
getItem
(
'
overlayMenuActive
'
)
===
'
true
'
?
true
:
false
,
mobileMenuActive
:
localStorage
.
getItem
(
'
mobileMenuActive
'
)
===
'
true
'
?
true
:
false
,
authenticated
:
Auth
.
isAuthenticated
()
,
authenticated
:
true
,
findObjectPlaceholder
:
'
Sub Task
'
,
redirect
:
(
Auth
.
isAuthenticated
()
&&
window
.
location
.
pathname
===
"
/login
"
)?
"
/
"
:
window
.
location
.
pathname
,
redirect
:
window
.
location
.
pathname
,
isLogin
:
true
};
this
.
onWrapperClick
=
this
.
onWrapperClick
.
bind
(
this
);
...
...
This diff is collapsed.
Click to expand it.
SAS/TMSS/frontend/tmss_webapp/src/components/AuthComponent.js
+
2
−
2
View file @
5a641af7
...
...
@@ -23,7 +23,7 @@ class AuthComponent extends Component {
async
componentDidUpdate
(
prevProp
,
prevState
)
{
const
authenticate
=
await
Auth
.
isAuthenticated
();
if
(
prevState
.
authenticated
!=
authenticate
){
this
.
setState
({
authenticated
:
authenticate
,
isLogin
:
authenticate
});
this
.
setState
({
authenticated
:
authenticate
,
isLogin
Progress
:
authenticate
});
}
}
...
...
@@ -41,7 +41,7 @@ class AuthComponent extends Component {
<
Redirect
to
=
{{
pathname
:
"
/login
"
}}
/
>
<
Login
onLogin
=
{
this
.
loggedIn
}
/
>
<
/Router
>
}
;
}
<
/
>
}
<
/
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment