Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
svmon-web
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
7
Issues
7
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jie Yuan
svmon-web
Commits
cef5937a
Commit
cef5937a
authored
May 15, 2019
by
Jie Yuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add username resolver
parent
b3e4f7bf
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
20 additions
and
7 deletions
+20
-7
src/app/auth.service.ts
src/app/auth.service.ts
+2
-0
src/app/dashboard/fulltable/fulltable.component.html
src/app/dashboard/fulltable/fulltable.component.html
+1
-1
src/app/dashboard/fulltable/fulltable.component.ts
src/app/dashboard/fulltable/fulltable.component.ts
+2
-0
src/app/dashboard/hostname/hostname.component.html
src/app/dashboard/hostname/hostname.component.html
+1
-1
src/app/dashboard/hostname/hostname.component.ts
src/app/dashboard/hostname/hostname.component.ts
+2
-1
src/app/dashboard/service-component-history/service-component-history.component.html
...omponent-history/service-component-history.component.html
+1
-1
src/app/dashboard/service-component-history/service-component-history.component.ts
...-component-history/service-component-history.component.ts
+2
-1
src/app/dashboard/service-component/service-component.component.ts
...ashboard/service-component/service-component.component.ts
+2
-0
src/app/dashboard/site/site.component.html
src/app/dashboard/site/site.component.html
+1
-1
src/app/dashboard/site/site.component.ts
src/app/dashboard/site/site.component.ts
+2
-0
src/app/dashboard/table/table.component.html
src/app/dashboard/table/table.component.html
+1
-1
src/app/dashboard/table/table.component.ts
src/app/dashboard/table/table.component.ts
+3
-0
No files found.
src/app/auth.service.ts
View file @
cef5937a
...
...
@@ -54,6 +54,7 @@ export class AuthService {
//console.log(this.sharedHeaderString);
//console.log(response);
sessionStorage
.
setItem
(
'
authHeader
'
,
this
.
sharedHeaderString
);
sessionStorage
.
setItem
(
'
currentUser
'
,
response
[
'
email
'
]);
console
.
log
(
'
login success
'
);
}
else
if
(
response
[
'
authService
'
]
===
'
AAI
'
)
{
this
.
headerBuilder
(
''
);
...
...
@@ -170,6 +171,7 @@ aaiAuthentication(token) {
if
(
response
[
'
authService
'
]
===
'
AAI
'
)
{
this
.
loginSuccess
();
sessionStorage
.
setItem
(
'
authHeader
'
,
this
.
sharedHeaderString
);
sessionStorage
.
setItem
(
'
currentUser
'
,
response
[
'
email
'
]);
console
.
log
(
this
.
sharedHeaderString
);
console
.
log
(
response
);
console
.
log
(
'
#####################
'
);
...
...
src/app/dashboard/fulltable/fulltable.component.html
View file @
cef5937a
...
...
@@ -73,7 +73,7 @@
<button
class=
"menu-button"
mat-button
[matMenuTriggerFor]=
"menuuser"
>
Username
</button>
<button
class=
"menu-button"
mat-button
[matMenuTriggerFor]=
"menuuser"
>
{{username}}
</button>
<mat-menu
#menuuser
="
matMenu
"
>
<button
mat-menu-item
>
Profile
</button>
<button
mat-menu-item
(click)=
"onLogout()"
>
Logout
</button>
...
...
src/app/dashboard/fulltable/fulltable.component.ts
View file @
cef5937a
...
...
@@ -35,6 +35,7 @@ export class FulltableComponent implements OnInit , DoCheck, AfterViewInit{
eoscSiteNames
:
string
[];
gocdbSiteNames
:
string
[];
dpmtSiteNames
:
string
[];
username
:
string
;
@
ViewChild
(
MatPaginator
)
paginator
:
MatPaginator
;
@
ViewChild
(
MatSort
)
sort
:
MatSort
;
...
...
@@ -48,6 +49,7 @@ export class FulltableComponent implements OnInit , DoCheck, AfterViewInit{
)
{
console
.
log
(
'
fulltable constructor
'
);
this
.
username
=
sessionStorage
.
getItem
(
"
currentUser
"
);
const
source
=
sessionStorage
.
getItem
(
'
currentServiceSource
'
);
...
...
src/app/dashboard/hostname/hostname.component.html
View file @
cef5937a
...
...
@@ -70,7 +70,7 @@
<button
class=
"menu-button"
mat-button
[matMenuTriggerFor]=
"menuuser"
>
Username
</button>
<button
class=
"menu-button"
mat-button
[matMenuTriggerFor]=
"menuuser"
>
{{username}}
</button>
<mat-menu
#menuuser
="
matMenu
"
>
<button
mat-menu-item
>
Profile
</button>
<button
mat-menu-item
>
Logout
</button>
...
...
src/app/dashboard/hostname/hostname.component.ts
View file @
cef5937a
...
...
@@ -25,13 +25,14 @@ export class HostnameComponent implements OnInit, OnDestroy {
gocdbSiteNames
:
string
[];
dpmtSiteNames
:
string
[];
sidebarOpen
:
boolean
=
true
;
username
:
string
;
constructor
(
private
siteService
:
SiteShortService
,
public
router
:
Router
,
public
route
:
ActivatedRoute
,
public
authService
:
AuthService
)
{
// this.siteName = '';
// this.hostList = [];
this
.
siteName
=
this
.
siteService
.
currentSite
;
this
.
username
=
sessionStorage
.
getItem
(
"
currentUser
"
);
console
.
log
(
'
now in hostname component
'
);
console
.
log
(
this
.
siteName
);
console
.
log
(
this
.
hostList
);
...
...
src/app/dashboard/service-component-history/service-component-history.component.html
View file @
cef5937a
...
...
@@ -70,7 +70,7 @@
<button
class=
"menu-button"
mat-button
[matMenuTriggerFor]=
"menuuser"
>
Username
</button>
<button
class=
"menu-button"
mat-button
[matMenuTriggerFor]=
"menuuser"
>
{{username}}
</button>
<mat-menu
#menuuser
="
matMenu
"
>
<button
mat-menu-item
>
Profile
</button>
<button
mat-menu-item
(click)=
"onLogout"
>
Logout
</button>
...
...
src/app/dashboard/service-component-history/service-component-history.component.ts
View file @
cef5937a
...
...
@@ -19,13 +19,14 @@ export class ServiceComponentHistoryComponent implements OnInit, OnDestroy {
eoscSiteNames
:
string
[];
gocdbSiteNames
:
string
[];
dpmtSiteNames
:
string
[];
username
:
string
;
constructor
(
private
servComponentService
:
ServiceComponentService
,
private
siteService
:
SiteService
,
public
router
:
Router
,
public
route
:
ActivatedRoute
,
public
authService
:
AuthService
)
{
this
.
username
=
sessionStorage
.
getItem
(
"
currentUser
"
);
const
sessionData
=
sessionStorage
.
getItem
(
'
currentServComp
'
);
if
(
sessionData
!==
null
)
{
this
.
servComp
=
JSON
.
parse
(
sessionData
);
...
...
src/app/dashboard/service-component/service-component.component.ts
View file @
cef5937a
...
...
@@ -14,10 +14,12 @@ export class ServiceComponentComponent implements OnInit, OnDestroy {
// export class ServiceCompComponent implements OnDestroy {
servComps
:
ServiceComponent
[];
servName
:
string
;
username
:
string
;
constructor
(
private
servComponentService
:
ServiceComponentService
,
private
siteService
:
SiteShortService
,
public
router
:
Router
,
public
route
:
ActivatedRoute
)
{
this
.
username
=
sessionStorage
.
getItem
(
"
currentUser
"
);
//this.servComp = new ServiceComponent('default');
//this.servComp = servComponentService.getSelectedServComp();
this
.
servName
=
this
.
siteService
.
currentService
;
...
...
src/app/dashboard/site/site.component.html
View file @
cef5937a
...
...
@@ -69,7 +69,7 @@
<button
class=
"menu-button"
mat-button
[matMenuTriggerFor]=
"menuuser"
>
Username
</button>
<button
class=
"menu-button"
mat-button
[matMenuTriggerFor]=
"menuuser"
>
{{username}}
</button>
<mat-menu
#menuuser
="
matMenu
"
>
<button
mat-menu-item
>
Profile
</button>
<button
mat-menu-item
(click)=
"onLogout()"
>
Logout
</button>
...
...
src/app/dashboard/site/site.component.ts
View file @
cef5937a
...
...
@@ -25,6 +25,7 @@ export class SiteComponent implements OnInit, OnDestroy {
shorthomeUrl
:
string
;
shortgiisUrl
:
string
;
previousView
:
string
;
username
:
string
;
constructor
(
private
siteService
:
SiteService
,
public
router
:
Router
,
...
...
@@ -34,6 +35,7 @@ export class SiteComponent implements OnInit, OnDestroy {
private
domSanitizer
:
DomSanitizer
)
{
console
.
log
(
'
in site view constructor
'
);
this
.
username
=
sessionStorage
.
getItem
(
"
currentUser
"
);
this
.
matIconRegistry
.
addSvgIcon
(
`hosts`
,
this
.
domSanitizer
.
bypassSecurityTrustResourceUrl
(
"
../../../assets/hosts.svg
"
)
...
...
src/app/dashboard/table/table.component.html
View file @
cef5937a
...
...
@@ -76,7 +76,7 @@
<button
class=
"menu-button"
mat-button
[matMenuTriggerFor]=
"menuuser"
>
Username
</button>
<button
class=
"menu-button"
mat-button
[matMenuTriggerFor]=
"menuuser"
>
{{username}}
</button>
<mat-menu
#menuuser
="
matMenu
"
>
<button
mat-menu-item
>
Profile
</button>
<button
mat-menu-item
(click)=
"onLogout()"
>
Logout
</button>
...
...
src/app/dashboard/table/table.component.ts
View file @
cef5937a
...
...
@@ -34,6 +34,7 @@ export class TableComponent implements OnInit, DoCheck,AfterViewInit {
eoscSiteNames
:
string
[];
gocdbSiteNames
:
string
[];
dpmtSiteNames
:
string
[];
username
:
string
;
@
ViewChild
(
MatPaginator
)
paginator
:
MatPaginator
;
@
ViewChild
(
MatSort
)
sort
:
MatSort
;
...
...
@@ -45,6 +46,8 @@ export class TableComponent implements OnInit, DoCheck,AfterViewInit {
public
authService
:
AuthService
)
{
console
.
log
(
'
table constructor
'
);
this
.
username
=
sessionStorage
.
getItem
(
"
currentUser
"
);
const
stmp
=
sessionStorage
.
getItem
(
'
currentSiteShortSource
'
);
console
.
log
(
stmp
);
...
...
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