From 477a3f22510688b6d31e41e24c602a8dc9a183a4 Mon Sep 17 00:00:00 2001
From: Julian Matschinske <julian.matschinske@wzw.tum.de>
Date: Fri, 10 Apr 2020 10:04:45 +0200
Subject: [PATCH] Add feedback after launching quick find drugs
---
src/app/analysis.service.ts | 9 +++++++++
src/app/pages/explorer-page/explorer-page.component.html | 9 +++++----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/app/analysis.service.ts b/src/app/analysis.service.ts
index 55306456..96951f76 100644
--- a/src/app/analysis.service.ts
+++ b/src/app/analysis.service.ts
@@ -43,6 +43,8 @@ export class AnalysisService {
private intervalId: any;
private canLaunchNewTask = false;
+ private launchingQuick = false;
+
constructor(private http: HttpClient) {
const tokens = localStorage.getItem('tokens');
const finishedTokens = localStorage.getItem('finishedTokens');
@@ -151,6 +153,8 @@ export class AnalysisService {
return;
}
+ this.launchingQuick = true;
+
const resp = await this.http.post<any>(`${environment.backend}task/`, {
algorithm: 'quick',
target: 'drug',
@@ -198,6 +202,10 @@ export class AnalysisService {
this.startWatching();
}
+ public isLaunchingQuick(): boolean {
+ return this.launchingQuick;
+ }
+
showToast(task: Task, status: 'DONE' | 'FAILED') {
let toastMessage;
let toastType;
@@ -250,6 +258,7 @@ export class AnalysisService {
} else {
this.canLaunchNewTask = true;
}
+ this.launchingQuick = false;
};
watch();
if (this.intervalId) {
diff --git a/src/app/pages/explorer-page/explorer-page.component.html b/src/app/pages/explorer-page/explorer-page.component.html
index e5829e9f..ff8a1cf7 100644
--- a/src/app/pages/explorer-page/explorer-page.component.html
+++ b/src/app/pages/explorer-page/explorer-page.component.html
@@ -224,8 +224,8 @@
<header class="card-header">
<p class="card-header-title">
<span class="icon">
- <i class="fas fa-flask" aria-hidden="true"></i>
- </span> Quick Find Drugs
+ <i class="fas fa-flask" aria-hidden="true"></i>
+ </span> Quick Find Drugs
</p>
<a (click)="collapseAnalysisQuick = !collapseAnalysisQuick" data-action="collapse"
class="card-header-icon is-hidden-fullscreen" aria-label="more options">
@@ -251,10 +251,11 @@
<div class="tile notification is-info">
<div class="align-vmiddle">
<div class="digit">2</div>
- <button (click)="analysis.startQuickAnalysis()" [disabled]="analysis.getCount() === 0"
+ <button (click)="analysis.startQuickAnalysis()" [disabled]="analysis.getCount() === 0 || analysis.isLaunchingQuick()"
class="button is-white is-rounded">
<span class="icon">
- <i class="fa fa-capsules"></i>
+ <i class="fa fa-capsules" *ngIf="!analysis.isLaunchingQuick()"></i>
+ <i class="fa fa-spin fa-spinner" *ngIf="analysis.isLaunchingQuick()"></i>
</span>
<span>
Find Drugs
--
GitLab