GUI2 Changed loading screen display to be a component
Change-Id: Id1592b498e6827ec4cd3544dec92e46f00e8d378
diff --git a/web/gui2-fw-lib/projects/gui2-fw-lib/src/lib/widget/table.base.ts b/web/gui2-fw-lib/projects/gui2-fw-lib/src/lib/widget/table.base.ts
index e011057..9a99e5a 100644
--- a/web/gui2-fw-lib/projects/gui2-fw-lib/src/lib/widget/table.base.ts
+++ b/web/gui2-fw-lib/projects/gui2-fw-lib/src/lib/widget/table.base.ts
@@ -14,7 +14,6 @@
* limitations under the License.
*/
import { FnService } from '../util/fn.service';
-import { LoadingService } from '../layer/loading.service';
import { LogService } from '../log.service';
import { WebSocketService } from '../remote/websocket.service';
import { Observable, of } from 'rxjs';
@@ -84,6 +83,7 @@
public selectCallback; // Function
protected parentSelCb = null;
protected responseCallback; // Function
+ public loadingIconShown: boolean = false;
selId: string = undefined;
tableData: any[] = [];
tableDataFilter: TableFilter;
@@ -99,7 +99,6 @@
protected constructor(
protected fs: FnService,
- protected ls: LoadingService,
protected log: LogService,
protected wss: WebSocketService,
protected tag: string,
@@ -144,7 +143,7 @@
destroy() {
this.wss.unbindHandlers(this.handlers);
this.stopRefresh();
- this.ls.stop();
+ this.loadingIconShown = false;
}
/**
@@ -154,7 +153,7 @@
* Happens every 2 seconds
*/
tableDataResponseCb(data: TableResponse) {
- this.ls.stop();
+ this.loadingIconShown = false;
const newTableData: any[] = Array.from(data[this.root]);
this.annots.noRowsMsg = data.annots.no_rows_msg;
@@ -196,7 +195,7 @@
this.log.debug('Table data REQUEST:', this.req, p);
}
this.wss.sendEvent(this.req, p);
- this.ls.start();
+ this.loadingIconShown = true;
}
}
@@ -218,7 +217,7 @@
startRefresh() {
this.refreshPromise =
setInterval(() => {
- if (!this.ls.waiting()) {
+ if (!this.loadingIconShown) {
if (this.fs.debugOn('table')) {
this.log.debug('Refreshing ' + this.root + ' page');
}