Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
hpc-team
strudelv2_spa
Commits
a709c844
Commit
a709c844
authored
Jul 24, 2019
by
Chris Hines
Browse files
deploy user_information to dev service
parent
a3fa403c
Pipeline
#7526
passed with stages
in 2 minutes and 59 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/app/authorisation.service.ts
View file @
a709c844
...
@@ -153,8 +153,6 @@ export class AuthorisationService {
...
@@ -153,8 +153,6 @@ export class AuthorisationService {
//Verify that the state matched the nonce we used when initiating login
//Verify that the state matched the nonce we used when initiating login
let
tuple
=
JSON
.
parse
(
localStorage
.
getItem
(
'
authservice
'
));
let
tuple
=
JSON
.
parse
(
localStorage
.
getItem
(
'
authservice
'
));
if
(
tuple
==
null
)
{
if
(
tuple
==
null
)
{
console
.
log
(
'
unable to get the authservice from localStorage
'
);
console
.
log
(
localStorage
.
getItem
(
'
authservice
'
));
return
return
}
}
if
(
tuple
[
1
]
!=
state
)
{
if
(
tuple
[
1
]
!=
state
)
{
...
@@ -170,10 +168,6 @@ export class AuthorisationService {
...
@@ -170,10 +168,6 @@ export class AuthorisationService {
public
getCert
()
{
public
getCert
()
{
var
token
:
AuthToken
;
var
token
:
AuthToken
;
token
=
this
.
token
.
value
;
token
=
this
.
token
.
value
;
// if (this.backendSelectionService.apiserver.value === null) {
// this.backendSelectionService.apiserver.pipe(take(1)).subscribe(() => this.getCert())
// return
//}
if
(
token
===
null
||
token
===
undefined
||
token
.
token
===
undefined
||
token
.
token
===
''
||
token
.
token
===
null
)
{
if
(
token
===
null
||
token
===
undefined
||
token
.
token
===
undefined
||
token
.
token
===
''
||
token
.
token
===
null
)
{
this
.
token
.
pipe
(
skip
(
1
),
take
(
1
)).
subscribe
(()
=>
this
.
getCert
())
this
.
token
.
pipe
(
skip
(
1
),
take
(
1
)).
subscribe
(()
=>
this
.
getCert
())
return
return
...
...
src/app/launcher/launcher.component.ts
View file @
a709c844
...
@@ -81,11 +81,17 @@ export class LauncherComponent implements OnInit {
...
@@ -81,11 +81,17 @@ export class LauncherComponent implements OnInit {
if
(
h
.
stat
==
'
error
'
||
h
.
stat
==
'
warn
'
)
{
if
(
h
.
stat
==
'
error
'
||
h
.
stat
==
'
warn
'
)
{
count
++
;
count
++
;
}
}
if
(
!
isNaN
(
parseInt
(
h
.
stat
)))
{
count
=
count
+
parseInt
(
h
.
stat
);
}
}
}
for
(
h
of
b
)
{
for
(
h
of
b
)
{
if
(
h
.
stat
==
'
error
'
||
h
.
stat
==
'
warn
'
)
{
if
(
h
.
stat
==
'
error
'
||
h
.
stat
==
'
warn
'
)
{
count
++
;
count
++
;
}
}
if
(
!
isNaN
(
parseInt
(
h
.
stat
)))
{
count
=
count
+
parseInt
(
h
.
stat
);
}
}
}
return
count
;
return
count
;
}
}
...
...
src/assets/config/computesites.dev.json
View file @
a709c844
...
@@ -9,7 +9,9 @@
...
@@ -9,7 +9,9 @@
"appCatalogUri"
:
"./assets/config/m3apps.dev.json"
,
"appCatalogUri"
:
"./assets/config/m3apps.dev.json"
,
"cancelcmd"
:
"/usr/local/sv2/dev/sv2scancel.sh {jobid}"
,
"cancelcmd"
:
"/usr/local/sv2/dev/sv2scancel.sh {jobid}"
,
"statcmd"
:
"/usr/local/sv2/dev/sv2stat.py"
,
"statcmd"
:
"/usr/local/sv2/dev/sv2stat.py"
,
"userhealth"
:
"/usr/local/sv2/dev/userhealth/bin/jsonuserhealth"
"userhealth"
:
"/usr/local/sv2/dev/userhealth/bin/uijson"
,
"cacheturis"
:
[
"https://cachet-dev.erc.monash.edu.au/api/v1/incidents"
]
},
},
{
{
"url"
:
"https://strudel2-api-dev.cloud.cvl.org.au/cvluwa/"
,
"url"
:
"https://strudel2-api-dev.cloud.cvl.org.au/cvluwa/"
,
...
...
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