GUI2 Changed loading screen display to be a component
Change-Id: Id1592b498e6827ec4cd3544dec92e46f00e8d378
diff --git a/web/gui2/src/main/webapp/app/view/partition/partition/partition.component.html b/web/gui2/src/main/webapp/app/view/partition/partition/partition.component.html
index 0adac19..f3e7927 100644
--- a/web/gui2/src/main/webapp/app/view/partition/partition/partition.component.html
+++ b/web/gui2/src/main/webapp/app/view/partition/partition/partition.component.html
@@ -14,6 +14,7 @@
~ limitations under the License.
-->
<div id="ov-partition">
+ <onos-loading [theme]="'light'" [running]="loadingIconShown"></onos-loading>
<div class="tabular-header">
<h2>Partitions ({{tableData.length}} total)</h2>
<div class="ctrl-btns">
@@ -53,4 +54,4 @@
</table>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/web/gui2/src/main/webapp/app/view/partition/partition/partition.component.spec.ts b/web/gui2/src/main/webapp/app/view/partition/partition/partition.component.spec.ts
index ff43f9e..2757283 100644
--- a/web/gui2/src/main/webapp/app/view/partition/partition/partition.component.spec.ts
+++ b/web/gui2/src/main/webapp/app/view/partition/partition/partition.component.spec.ts
@@ -21,14 +21,14 @@
FnService,
IconService,
IconComponent,
- LoadingService,
LogService,
- WebSocketService
+ WebSocketService, LoadingComponent
} from 'gui2-fw-lib';
import { of } from 'rxjs';
import { } from 'jasmine';
import { RouterTestingModule } from '@angular/router/testing';
import { PartitionComponent } from './partition.component';
+import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
class MockActivatedRoute extends ActivatedRoute {
constructor(params: Params) {
@@ -41,12 +41,6 @@
loadIconDef() { }
}
-class MockLoadingService {
- startAnim() { }
- stop() { }
- waiting() { }
-}
-
class MockWebSocketService {
createWebSocket() { }
isConnected() { return false; }
@@ -83,11 +77,14 @@
fs = new FnService(ar, logSpy, windowMock);
TestBed.configureTestingModule({
- imports: [RouterTestingModule],
- declarations: [PartitionComponent, IconComponent],
+ imports: [BrowserAnimationsModule, RouterTestingModule],
+ declarations: [
+ PartitionComponent,
+ IconComponent,
+ LoadingComponent
+ ],
providers: [
{ provide: FnService, useValue: fs },
- { provide: LoadingService, useClass: MockLoadingService },
{ provide: IconService, useClass: MockIconService },
{ provide: LogService, useValue: logSpy },
{ provide: WebSocketService, useClass: MockWebSocketService },
diff --git a/web/gui2/src/main/webapp/app/view/partition/partition/partition.component.ts b/web/gui2/src/main/webapp/app/view/partition/partition/partition.component.ts
index aec5e85..f8518a4 100644
--- a/web/gui2/src/main/webapp/app/view/partition/partition/partition.component.ts
+++ b/web/gui2/src/main/webapp/app/view/partition/partition/partition.component.ts
@@ -16,10 +16,9 @@
import { Component, OnDestroy, OnInit } from '@angular/core';
import {
FnService,
- LoadingService,
LogService,
WebSocketService,
- SortDir, TableBaseImpl, TableResponse
+ SortDir, TableBaseImpl
} from 'gui2-fw-lib';
import { ActivatedRoute } from '@angular/router';
@@ -36,11 +35,10 @@
constructor(
protected fs: FnService,
protected log: LogService,
- protected ls: LoadingService,
protected as: ActivatedRoute,
protected wss: WebSocketService,
) {
- super(fs, ls, log, wss, 'partition');
+ super(fs, log, wss, 'partition');
this.sortParams = {
firstCol: 'name',
firstDir: SortDir.desc,