Added in panel support - details panels
Change-Id: I2803edd6fe12cb0d97a2d3c45a692ea701786dd2
diff --git a/web/gui2/src/main/webapp/app/fw/mast/mast/mast.component.css b/web/gui2/src/main/webapp/app/fw/mast/mast/mast.component.css
index b5f1e5f..5b2d464 100644
--- a/web/gui2/src/main/webapp/app/fw/mast/mast/mast.component.css
+++ b/web/gui2/src/main/webapp/app/fw/mast/mast/mast.component.css
@@ -17,10 +17,20 @@
/*
ONOS GUI -- Masthead (layout) -- CSS file
*/
+#mast-top-block {
+ display: block;
+ z-index: -1;
+ height: 48px;
+ width: 100%;
+}
#mast {
+ position: absolute;
+ width: 100%;
+ top: 0px;
height: 48px;
padding: 0;
+ z-index: 10000;
}
#mast a:hover {
diff --git a/web/gui2/src/main/webapp/app/fw/mast/mast/mast.component.html b/web/gui2/src/main/webapp/app/fw/mast/mast/mast.component.html
index e7d0995..72242ba 100644
--- a/web/gui2/src/main/webapp/app/fw/mast/mast/mast.component.html
+++ b/web/gui2/src/main/webapp/app/fw/mast/mast/mast.component.html
@@ -13,6 +13,12 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
+<div id="mast-top-block"></div>
+<!-- The mast-top-block is an inline display element that pushes any
+ subsequent elements down the page. It has a height of 48px
+ The mast block overlays the mast-top-block. It is is positioned
+ absolutely so that the nav component can slide in behind it when
+ not shown -->
<div id="mast" align="left">
<span class="nav-menu-button clickable" (click)="ns.toggleNav()">
<img src="data/img/nav-menu-mojo.png"/>
@@ -21,17 +27,14 @@
<div id="mast-right">
<nav>
<div class="dropdown-parent">
- <a class="clickable user-menu__name">{{username}} <i class="dropdown-icon"></i></a>
+ <a class="clickable user-menu__name">{{ username }} <i class="dropdown-icon"></i></a>
<div class="dropdown">
- <!--<a href="rs/logout"> {{getLion('logout')}} </a> !!FIXME-->
- <a href="rs/logout">logout</a>
+ <a href="rs/logout"> {{ lionFn('logout') }} </a>
</div>
</div>
<div class="ctrl-btns">
- <div class="active clickable icon"
- tooltip tt-msg="helpTip"
- ng-click="directTo()">
- <onos-icon iconId="query" iconSize="32"></onos-icon>
+ <div class="active clickable icon" (click)="directTo()">
+ <onos-icon iconId="query" iconSize="32" toolTip="{{ lionFn('tt_help') }}"></onos-icon>
</div>
</div>
</nav>
diff --git a/web/gui2/src/main/webapp/app/fw/mast/mast/mast.component.spec.ts b/web/gui2/src/main/webapp/app/fw/mast/mast/mast.component.spec.ts
new file mode 100644
index 0000000..3d061a5
--- /dev/null
+++ b/web/gui2/src/main/webapp/app/fw/mast/mast/mast.component.spec.ts
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2015-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { DebugElement } from '@angular/core';
+import { By } from '@angular/platform-browser';
+
+import { LogService } from '../../../log.service';
+import { ConsoleLoggerService } from '../../../consolelogger.service';
+import { MastComponent } from './mast.component';
+import { IconComponent } from '../../svg/icon/icon.component';
+import { LionService } from '../../util/lion.service';
+import { IconService } from '../../svg/icon.service';
+import { NavService } from '../../nav/nav.service';
+import { WebSocketService } from '../../remote/websocket.service';
+
+class MockNavService {}
+
+class MockIconService {
+ loadIconDef() {}
+}
+
+class MockWebSocketService {
+ createWebSocket() {}
+ isConnected() { return false; }
+ unbindHandlers() {}
+ bindHandlers() {}
+}
+
+/**
+ * ONOS GUI -- Masthead Controller - Unit Tests
+ */
+describe('MastComponent', () => {
+ let log: LogService;
+ let windowMock: Window;
+ let component: MastComponent;
+ let fixture: ComponentFixture<MastComponent>;
+ const bundleObj = {
+ 'core.view.App': {
+ test: 'test1',
+ tt_help: 'Help!'
+ }
+ };
+ const mockLion = (key) => {
+ return bundleObj[key] || '%' + key + '%';
+ };
+
+ beforeEach(async(() => {
+ log = new ConsoleLoggerService();
+ windowMock = <any>{
+ location: <any> {
+ hostname: 'foo',
+ pathname: 'apps',
+ host: 'foo',
+ port: '80',
+ protocol: 'http',
+ search: { debug: 'true'},
+ href: 'ws://foo:123/onos/ui/websock/path',
+ absUrl: 'ws://foo:123/onos/ui/websock/path'
+ }
+ };
+
+ TestBed.configureTestingModule({
+ declarations: [ MastComponent, IconComponent ],
+ providers: [
+ { provide: LogService, useValue: log },
+ { provide: NavService, useClass: MockNavService },
+ { provide: LionService, useFactory: (() => {
+ return {
+ bundle: ((bundleId) => mockLion),
+ ubercache: new Array(),
+ loadCbs: new Map<string, () => void>([])
+ };
+ })
+ },
+ { provide: IconService, useClass: MockIconService },
+ { provide: WebSocketService, useClass: MockWebSocketService },
+ { provide: 'Window', useValue: windowMock }
+ ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(MastComponent);
+ component = fixture.debugElement.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ it('should have a div#mast-top-block', () => {
+ const appDe: DebugElement = fixture.debugElement;
+ const divDe = appDe.query(By.css('div#mast-top-block'));
+ expect(divDe).toBeTruthy();
+ });
+
+ it('should have a span.nav-menu-button inside a div#mast', () => {
+ const appDe: DebugElement = fixture.debugElement;
+ const divDe = appDe.query(By.css('div#mast span.nav-menu-button'));
+ expect(divDe).toBeTruthy();
+ });
+
+ it('should have a div.dropdown-parent inside a div#mast-right inside a div#mast', () => {
+ const appDe: DebugElement = fixture.debugElement;
+ const divDe = appDe.query(By.css('div#mast div#mast-right div.dropdown-parent'));
+ const div: HTMLElement = divDe.nativeElement;
+ expect(div.textContent).toEqual(' %logout% ');
+ });
+
+ it('should have an onos-icon inside a div#mast-right inside a div#mast', () => {
+ const appDe: DebugElement = fixture.debugElement;
+ const divDe = appDe.query(By.css('div#mast div#mast-right div.ctrl-btns div.active onos-icon'));
+ expect(divDe).toBeTruthy();
+ });
+
+});
diff --git a/web/gui2/src/main/webapp/app/fw/mast/mast/mast.component.ts b/web/gui2/src/main/webapp/app/fw/mast/mast/mast.component.ts
index a8b85a4..2cb110f 100644
--- a/web/gui2/src/main/webapp/app/fw/mast/mast/mast.component.ts
+++ b/web/gui2/src/main/webapp/app/fw/mast/mast/mast.component.ts
@@ -13,12 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { Component, OnInit } from '@angular/core';
-import { DialogService } from '../../layer/dialog.service';
+import { Component, Input, OnInit, OnDestroy, Inject } from '@angular/core';
import { LionService } from '../../util/lion.service';
import { LogService } from '../../../log.service';
import { NavService } from '../../nav/nav.service';
-import { WebSocketService } from '../../remote/websocket.service';
/**
* ONOS GUI -- Masthead Component
@@ -28,39 +26,67 @@
templateUrl: './mast.component.html',
styleUrls: ['./mast.component.css', './mast.theme.css']
})
-export class MastComponent implements OnInit {
- public username;
+export class MastComponent implements OnInit, OnDestroy {
+ @Input() username: string;
+
+ lionFn; // Function
+ viewMap = new Map<string, string>([]); // A map of app names
constructor(
- private ds: DialogService,
- private ls: LionService,
+ private lion: LionService,
private log: LogService,
public ns: NavService,
- private wss: WebSocketService
+ @Inject('Window') private window: Window,
) {
- this.log.debug('MastComponent constructed');
-
+ this.viewMap.set('apps', 'https://wiki.onosproject.org/display/ONOS/GUI+Application+View');
+ this.viewMap.set('device', 'https://wiki.onosproject.org/display/ONOS/GUI+Device+View');
+ this.viewMap.set('', 'https://wiki.onosproject.org/display/ONOS/The+ONOS+Web+GUI');
}
ngOnInit() {
- // onosUser is a global set via the index.html generated source
- // TODO: Fix onosuser below to get it from index.html like before
- // TODO: Fix the lionService
- this.username = 'onosUser'; // || this.getLion('unknown_user');
-
+ if (this.lion.ubercache.length === 0) {
+ this.lionFn = this.dummyLion;
+ this.lion.loadCbs.set('mast', () => this.doLion());
+ this.log.debug('LION not available when MastComponent initialized');
+ } else {
+ this.doLion();
+ }
this.log.debug('MastComponent initialized');
}
-
-
- /* In the case of Masthead, we cannot cache the lion bundle, because we
- * call too early (before the lion data is uploaded from the server).
- * So we'll dig into the lion service for each request...
+ /**
+ * Nav component should never be closed, but in case it does, it's
+ * safer to tidy up after itself
*/
- getLion(x: string): string {
- // lion is a function that takes a string and returns a string
- const lion: (string) => string = this.ls.bundle('core.fw.Mast');
- return lion(x);
+ ngOnDestroy() {
+ this.lion.loadCbs.delete('mast');
}
+ /**
+ * Read the LION bundle for App and set up the lionFn
+ */
+ doLion() {
+ this.lionFn = this.lion.bundle('core.fw.Mast');
+ if (this.username === undefined) {
+ this.username = this.lionFn('unknown_user');
+ }
+ }
+
+ /**
+ * A dummy implementation of the lionFn until the response is received and the LION
+ * bundle is received from the WebSocket
+ */
+ dummyLion(key: string): string {
+ return '%' + key + '%';
+ }
+
+ directTo() {
+ const curId = this.window.location.pathname.replace('/', '');
+ let helpUrl: string = this.viewMap.get(curId);
+ if (helpUrl === undefined) {
+ helpUrl = this.viewMap.get('');
+ this.log.warn('No help file linked for view:', curId);
+ }
+ this.window.open(helpUrl);
+ }
}