GUI2 Changed loading screen display to be a component
Change-Id: Id1592b498e6827ec4cd3544dec92e46f00e8d378
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/details/details.component.ts b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/details/details.component.ts
index ea1462c..85282e1 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/details/details.component.ts
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/details/details.component.ts
@@ -25,7 +25,6 @@
import {
DetailsPanelBaseImpl,
FnService, LionService,
- LoadingService,
LogService,
WebSocketService
} from 'gui2-fw-lib';
@@ -119,12 +118,11 @@
constructor(
protected fs: FnService,
protected log: LogService,
- protected ls: LoadingService,
protected router: Router,
protected wss: WebSocketService,
private lion: LionService
) {
- super(fs, ls, log, wss, 'topo');
+ super(fs, log, wss, 'topo');
if (this.lion.ubercache.length === 0) {
this.lionFn = this.dummyLion;
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/instance/instance.component.ts b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/instance/instance.component.ts
index 487550d..70cbb1f 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/instance/instance.component.ts
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/instance/instance.component.ts
@@ -22,7 +22,6 @@
import { animate, state, style, transition, trigger } from '@angular/animations';
import {
LogService,
- LoadingService,
FnService,
PanelBaseImpl,
IconService,
@@ -83,12 +82,11 @@
constructor(
protected fs: FnService,
protected log: LogService,
- protected ls: LoadingService,
protected is: IconService,
protected sus: SvgUtilService,
private lion: LionService
) {
- super(fs, ls, log);
+ super(fs, log);
this.onosInstances = <Array<Instance>>[];
if (this.lion.ubercache.length === 0) {
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/mapselector/mapselector.component.ts b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/mapselector/mapselector.component.ts
index c97e0ca..5e4cf17 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/mapselector/mapselector.component.ts
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/mapselector/mapselector.component.ts
@@ -1,13 +1,13 @@
import {
- Component, EventEmitter, OnChanges,
+ Component, EventEmitter,
OnDestroy,
- OnInit, Output, SimpleChanges,
+ OnInit, Output,
} from '@angular/core';
import {
DetailsPanelBaseImpl,
FnService,
- LionService, LoadingService,
+ LionService,
LogService,
WebSocketService
} from 'gui2-fw-lib';
@@ -38,11 +38,10 @@
constructor(
protected fs: FnService,
protected log: LogService,
- protected ls: LoadingService,
protected wss: WebSocketService,
private lion: LionService
) {
- super(fs, ls, log, wss, 'topo');
+ super(fs, log, wss, 'topo');
if (this.lion.ubercache.length === 0) {
this.lionFn = this.dummyLion;
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/summary/summary.component.ts b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/summary/summary.component.ts
index 3a42a0b..e47fa64 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/summary/summary.component.ts
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/summary/summary.component.ts
@@ -25,7 +25,6 @@
import { TopoPanelBaseImpl } from '../topopanel.base';
import {
LogService,
- LoadingService,
FnService,
WebSocketService,
GlyphService
@@ -74,11 +73,10 @@
constructor(
protected fs: FnService,
protected log: LogService,
- protected ls: LoadingService,
protected wss: WebSocketService,
protected gs: GlyphService
) {
- super(fs, ls, log, 'summary');
+ super(fs, log, 'summary');
this.summaryData = <SummaryResponse>{};
this.log.debug('SummaryComponent constructed');
}
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/toolbar/toolbar.component.ts b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/toolbar/toolbar.component.ts
index ce7b90b..40fdfda 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/toolbar/toolbar.component.ts
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/toolbar/toolbar.component.ts
@@ -16,7 +16,6 @@
import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
import {
LogService,
- LoadingService,
FnService,
PanelBaseImpl, LionService
} from 'gui2-fw-lib';
@@ -88,10 +87,9 @@
constructor(
protected fs: FnService,
protected log: LogService,
- protected ls: LoadingService,
private lion: LionService
) {
- super(fs, ls, log);
+ super(fs, log);
if (this.lion.ubercache.length === 0) {
this.lionFn = this.dummyLion;
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/topopanel.base.ts b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/topopanel.base.ts
index 48aa2ed..52966ab 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/topopanel.base.ts
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/topopanel.base.ts
@@ -15,7 +15,6 @@
*/
import {
FnService,
- LoadingService,
LogService,
PanelBaseImpl
} from 'gui2-fw-lib';
@@ -31,11 +30,10 @@
protected constructor(
protected fs: FnService,
- protected ls: LoadingService,
protected log: LogService,
protected id: string
) {
- super(fs, ls, log);
+ super(fs, log);
}
protected init(el: any) {