diff --git a/web/src/app/app.component.scss b/web/src/app/app.component.scss
index 541c15c2b..76e289188 100644
--- a/web/src/app/app.component.scss
+++ b/web/src/app/app.component.scss
@@ -17,9 +17,11 @@
width: 350px;
background-color: $dark-green;
}
+
.mat-drawer-content {
overflow: hidden !important;
}
+
.sidenav__drawer-list-item {
margin-left: 30px;
}
@@ -60,8 +62,9 @@
}
.taskana-main__progress-bar {
- height: 4px;
+ height: 8px;
background-color: $light-grey;
+ margin-bottom: 2px;
}
::ng-deep .mat-drawer-inner-container {
@@ -75,3 +78,7 @@
::ng-deep mat-tooltip-component {
word-break: break-word;
}
+
+mat-progress-bar {
+ height: 3px;
+}
diff --git a/web/src/app/monitor/components/classification-report/classification-report.component.ts b/web/src/app/monitor/components/classification-report/classification-report.component.ts
index 1c960e1da..b75083fdd 100644
--- a/web/src/app/monitor/components/classification-report/classification-report.component.ts
+++ b/web/src/app/monitor/components/classification-report/classification-report.component.ts
@@ -3,6 +3,7 @@ import { MonitorService } from 'app/monitor/services/monitor.service';
import { ChartData } from 'app/monitor/models/chart-data';
import { ReportData } from '../../models/report-data';
import { ChartColorsDefinition } from '../../models/chart-colors';
+import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service';
@Component({
selector: 'taskana-monitor-classification-report',
@@ -22,12 +23,19 @@ export class ClassificationReportComponent implements OnInit {
lineChartColors = ChartColorsDefinition.getColors();
- constructor(private restConnectorService: MonitorService) {}
+ constructor(
+ private restConnectorService: MonitorService,
+ private requestInProgressService: RequestInProgressService
+ ) {}
- async ngOnInit() {
- this.reportData = await this.restConnectorService.getClassificationTasksReport().toPromise();
- this.lineChartData = this.restConnectorService.getChartData(this.reportData);
- this.lineChartLabels = this.reportData.meta.header;
+ ngOnInit() {
+ this.requestInProgressService.setRequestInProgress(true);
+ this.restConnectorService.getClassificationTasksReport().subscribe((report) => {
+ this.reportData = report;
+ this.lineChartData = this.restConnectorService.getChartData(this.reportData);
+ this.lineChartLabels = this.reportData.meta.header;
+ this.requestInProgressService.setRequestInProgress(false);
+ });
}
getTitle(): string {
diff --git a/web/src/app/monitor/components/monitor/monitor.component.ts b/web/src/app/monitor/components/monitor/monitor.component.ts
index 770f00e76..4230d47a5 100644
--- a/web/src/app/monitor/components/monitor/monitor.component.ts
+++ b/web/src/app/monitor/components/monitor/monitor.component.ts
@@ -9,10 +9,6 @@ import { Router } from '@angular/router';
export class MonitorComponent implements OnInit {
selectedTab = '';
- constructor(public router: Router) {
- this.router.navigate(['/taskana/monitor/tasks-priority']);
- }
-
ngOnInit(): void {
this.selectedTab = 'tasks-priority';
}
diff --git a/web/src/app/monitor/components/task-priority-report/task-priority-report.component.spec.ts b/web/src/app/monitor/components/task-priority-report/task-priority-report.component.spec.ts
index e7b61add4..4cd9ac94d 100644
--- a/web/src/app/monitor/components/task-priority-report/task-priority-report.component.spec.ts
+++ b/web/src/app/monitor/components/task-priority-report/task-priority-report.component.spec.ts
@@ -11,6 +11,7 @@ import { settingsStateMock } from '../../../shared/store/mock-data/mock-store';
import { SettingsState } from '../../../shared/store/settings-store/settings.state';
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { MatDividerModule } from '@angular/material/divider';
+import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service';
@Pipe({ name: 'germanTimeFormat' })
class GermanTimeFormatPipe implements PipeTransform {
@@ -48,6 +49,7 @@ describe('TaskPriorityReportComponent', () => {
imports: [NgxsModule.forRoot([SettingsState]), MatTableModule, HttpClientTestingModule, MatDividerModule],
declarations: [TaskPriorityReportComponent, GermanTimeFormatPipe, CanvasStub, TaskPriorityReportFilterStub],
providers: [
+ RequestInProgressService,
{ provide: MonitorService, useValue: monitorServiceSpy },
{ provide: NotificationService, useValue: notificationServiceSpy }
]
diff --git a/web/src/app/monitor/components/task-priority-report/task-priority-report.component.ts b/web/src/app/monitor/components/task-priority-report/task-priority-report.component.ts
index 838fd3434..52217d19e 100644
--- a/web/src/app/monitor/components/task-priority-report/task-priority-report.component.ts
+++ b/web/src/app/monitor/components/task-priority-report/task-priority-report.component.ts
@@ -1,7 +1,6 @@
import { AfterViewChecked, Component, OnDestroy, OnInit } from '@angular/core';
import { ReportData } from '../../models/report-data';
import { MonitorService } from '../../services/monitor.service';
-import { NotificationService } from '../../../shared/services/notifications/notification.service';
import { WorkbasketType } from '../../../shared/models/workbasket-type';
import { Select } from '@ngxs/store';
import { Observable, Subject } from 'rxjs';
@@ -9,6 +8,7 @@ import { SettingsSelectors } from '../../../shared/store/settings-store/settings
import { Settings } from '../../../settings/models/settings';
import { mergeMap, take, takeUntil } from 'rxjs/operators';
import { SettingMembers } from '../../../settings/components/Settings/expected-members';
+import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service';
@Component({
selector: 'taskana-monitor-task-priority-report',
@@ -34,9 +34,10 @@ export class TaskPriorityReportComponent implements OnInit, AfterViewChecked, On
@Select(SettingsSelectors.getSettings)
settings$: Observable
;
- constructor(private monitorService: MonitorService, private notificationService: NotificationService) {}
+ constructor(private monitorService: MonitorService, private requestInProgressService: RequestInProgressService) {}
ngOnInit() {
+ this.requestInProgressService.setRequestInProgress(true);
this.settings$
.pipe(
takeUntil(this.destroy$),
@@ -53,6 +54,7 @@ export class TaskPriorityReportComponent implements OnInit, AfterViewChecked, On
)
.subscribe((reportData) => {
this.setValuesFromReportData(reportData);
+ this.requestInProgressService.setRequestInProgress(false);
});
}
@@ -114,13 +116,14 @@ export class TaskPriorityReportComponent implements OnInit, AfterViewChecked, On
}
applyFilter(filter: {}) {
+ this.requestInProgressService.setRequestInProgress(true);
this.monitorService
.getTasksByPriorityReport([WorkbasketType.TOPIC], this.priority, filter)
.pipe(take(1))
.subscribe((reportData) => {
this.colorShouldChange = true;
this.setValuesFromReportData(reportData);
- return;
+ this.requestInProgressService.setRequestInProgress(false);
});
}
diff --git a/web/src/app/monitor/components/task-report/task-report.component.ts b/web/src/app/monitor/components/task-report/task-report.component.ts
index 8e6cb837c..61f039f68 100644
--- a/web/src/app/monitor/components/task-report/task-report.component.ts
+++ b/web/src/app/monitor/components/task-report/task-report.component.ts
@@ -1,6 +1,9 @@
import { Component, OnInit } from '@angular/core';
import { ReportData } from 'app/monitor/models/report-data';
import { MonitorService } from '../../services/monitor.service';
+import { takeUntil } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service';
@Component({
selector: 'taskana-monitor-task-report',
@@ -12,15 +15,23 @@ export class TaskReportComponent implements OnInit {
pieChartData: number[] = [];
pieChartType = 'pie';
reportData: ReportData;
+ private destroy$ = new Subject();
- constructor(private restConnectorService: MonitorService) {}
+ constructor(private monitorService: MonitorService, private requestInProgressService: RequestInProgressService) {}
- async ngOnInit() {
- this.reportData = await this.restConnectorService.getTaskStatusReport().toPromise();
- this.pieChartLabels = this.reportData.meta.header;
- this.reportData.sumRow[0].cells.forEach((c) => {
- this.pieChartData.push(c);
- });
+ ngOnInit() {
+ this.requestInProgressService.setRequestInProgress(true);
+ this.monitorService
+ .getTaskStatusReport()
+ .pipe(takeUntil(this.destroy$))
+ .subscribe((report) => {
+ this.reportData = report;
+ this.pieChartLabels = this.reportData.meta.header;
+ this.reportData.sumRow[0].cells.forEach((cell) => {
+ this.pieChartData.push(cell);
+ });
+ this.requestInProgressService.setRequestInProgress(false);
+ });
}
getTitle(): string {
diff --git a/web/src/app/monitor/components/timestamp-report/timestamp-report.component.ts b/web/src/app/monitor/components/timestamp-report/timestamp-report.component.ts
index 36de12a94..a20f390b4 100644
--- a/web/src/app/monitor/components/timestamp-report/timestamp-report.component.ts
+++ b/web/src/app/monitor/components/timestamp-report/timestamp-report.component.ts
@@ -1,6 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { ReportData } from '../../models/report-data';
import { MonitorService } from '../../services/monitor.service';
+import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service';
@Component({
selector: 'taskana-monitor-timestamp-report',
@@ -10,11 +11,16 @@ import { MonitorService } from '../../services/monitor.service';
export class TimestampReportComponent implements OnInit {
reportData: ReportData;
- constructor(private restConnectorService: MonitorService) {}
+ constructor(
+ private restConnectorService: MonitorService,
+ private requestInProgressService: RequestInProgressService
+ ) {}
ngOnInit() {
+ this.requestInProgressService.setRequestInProgress(true);
this.restConnectorService.getDailyEntryExitReport().subscribe((data: ReportData) => {
this.reportData = data;
+ this.requestInProgressService.setRequestInProgress(false);
});
}
}
diff --git a/web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.ts b/web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.ts
index 3265f782a..a7018caa5 100644
--- a/web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.ts
+++ b/web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.ts
@@ -4,6 +4,7 @@ import { ChartData } from '../../models/chart-data';
import { ChartColorsDefinition } from '../../models/chart-colors';
import { MonitorService } from '../../services/monitor.service';
import { MetaInfoData } from '../../models/meta-info-data';
+import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service';
@Component({
selector: 'taskana-monitor-workbasket-report-due-date',
@@ -26,12 +27,19 @@ export class WorkbasketReportDueDateComponent implements OnInit {
lineChartColors = ChartColorsDefinition.getColors();
- constructor(private restConnectorService: MonitorService) {}
+ constructor(
+ private restConnectorService: MonitorService,
+ private requestInProgressService: RequestInProgressService
+ ) {}
async ngOnInit() {
- this.reportData = await this.restConnectorService.getWorkbasketStatisticsQueryingByDueDate().toPromise();
- this.metaInformation.emit(this.reportData.meta);
- this.lineChartLabels = this.reportData.meta.header;
- this.lineChartData = this.restConnectorService.getChartData(this.reportData);
+ this.requestInProgressService.setRequestInProgress(true);
+ this.restConnectorService.getWorkbasketStatisticsQueryingByDueDate().subscribe((report) => {
+ this.reportData = report;
+ this.metaInformation.emit(this.reportData.meta);
+ this.lineChartLabels = this.reportData.meta.header;
+ this.lineChartData = this.restConnectorService.getChartData(this.reportData);
+ this.requestInProgressService.setRequestInProgress(false);
+ });
}
}
diff --git a/web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.ts b/web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.ts
index 4423650ff..57dbfd34f 100644
--- a/web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.ts
+++ b/web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.ts
@@ -4,6 +4,7 @@ import { ChartData } from '../../models/chart-data';
import { ChartColorsDefinition } from '../../models/chart-colors';
import { MonitorService } from '../../services/monitor.service';
import { MetaInfoData } from '../../models/meta-info-data';
+import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service';
@Component({
selector: 'taskana-monitor-workbasket-report-planned-date',
@@ -27,12 +28,19 @@ export class WorkbasketReportPlannedDateComponent implements OnInit {
lineChartColors = ChartColorsDefinition.getColors();
- constructor(private restConnectorService: MonitorService) {}
+ constructor(
+ private restConnectorService: MonitorService,
+ private requestInProgressService: RequestInProgressService
+ ) {}
- async ngOnInit() {
- this.reportData = await this.restConnectorService.getWorkbasketStatisticsQueryingByPlannedDate().toPromise();
- this.metaInformation.emit(this.reportData.meta);
- this.lineChartLabels = this.reportData.meta.header;
- this.lineChartData = this.restConnectorService.getChartData(this.reportData);
+ ngOnInit() {
+ this.requestInProgressService.setRequestInProgress(true);
+ this.restConnectorService.getWorkbasketStatisticsQueryingByPlannedDate().subscribe((report) => {
+ this.reportData = report;
+ this.metaInformation.emit(this.reportData.meta);
+ this.lineChartLabels = this.reportData.meta.header;
+ this.lineChartData = this.restConnectorService.getChartData(this.reportData);
+ this.requestInProgressService.setRequestInProgress(false);
+ });
}
}
diff --git a/web/src/app/monitor/monitor-routing.module.ts b/web/src/app/monitor/monitor-routing.module.ts
index d6cf6735e..2a40b9449 100644
--- a/web/src/app/monitor/monitor-routing.module.ts
+++ b/web/src/app/monitor/monitor-routing.module.ts
@@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
+import { RouterModule, Routes } from '@angular/router';
import { MonitorComponent } from './components/monitor/monitor.component';
import { TaskReportComponent } from './components/task-report/task-report.component';
import { WorkbasketReportComponent } from './components/workbasket-report/workbasket-report.component';
@@ -36,7 +36,7 @@ const routes: Routes = [
},
{
path: '',
- redirectTo: '',
+ redirectTo: 'tasks-priority',
pathMatch: 'full'
},
{
diff --git a/web/src/app/settings/components/Settings/settings.component.scss b/web/src/app/settings/components/Settings/settings.component.scss
index e59d72541..dd2a5afe8 100644
--- a/web/src/app/settings/components/Settings/settings.component.scss
+++ b/web/src/app/settings/components/Settings/settings.component.scss
@@ -2,10 +2,10 @@
.settings {
padding: 8px 32px;
+ overflow-y: scroll;
&__content {
height: calc(100vh - 116px);
- overflow-y: scroll;
padding: 4px;
}
diff --git a/web/src/app/settings/components/Settings/settings.component.spec.ts b/web/src/app/settings/components/Settings/settings.component.spec.ts
index e88eea087..8da35cc7c 100644
--- a/web/src/app/settings/components/Settings/settings.component.spec.ts
+++ b/web/src/app/settings/components/Settings/settings.component.spec.ts
@@ -14,6 +14,7 @@ import { SettingsComponent } from './settings.component';
import { settingsStateMock } from '../../../shared/store/mock-data/mock-store';
import { SetSettings } from '../../../shared/store/settings-store/settings.actions';
import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service';
const notificationServiceSpy: Partial = {
showError: jest.fn(),
@@ -42,7 +43,13 @@ describe('SettingsComponent', () => {
BrowserAnimationsModule
],
declarations: [SettingsComponent],
- providers: [{ provide: NotificationService, useValue: notificationServiceSpy }]
+ providers: [
+ RequestInProgressService,
+ {
+ provide: NotificationService,
+ useValue: notificationServiceSpy
+ }
+ ]
}).compileComponents();
fixture = TestBed.createComponent(SettingsComponent);
diff --git a/web/src/app/settings/components/Settings/settings.component.ts b/web/src/app/settings/components/Settings/settings.component.ts
index 7f6a17ee8..67bc0ab39 100644
--- a/web/src/app/settings/components/Settings/settings.component.ts
+++ b/web/src/app/settings/components/Settings/settings.component.ts
@@ -7,6 +7,7 @@ import { SetSettings } from '../../../shared/store/settings-store/settings.actio
import { SettingsSelectors } from '../../../shared/store/settings-store/settings.selectors';
import { takeUntil } from 'rxjs/operators';
import { validateSettings } from './settings.validators';
+import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service';
@Component({
selector: 'taskana-administration-settings',
@@ -22,10 +23,15 @@ export class SettingsComponent implements OnInit, OnDestroy {
@Select(SettingsSelectors.getSettings) settings$: Observable;
- constructor(private store: Store, private notificationService: NotificationService) {}
+ constructor(
+ private store: Store,
+ private notificationService: NotificationService,
+ private requestInProgressService: RequestInProgressService
+ ) {}
ngOnInit() {
this.settings$.pipe(takeUntil(this.destroy$)).subscribe((settings) => {
+ this.requestInProgressService.setRequestInProgress(false);
this.settings = this.deepCopy(settings);
this.oldSettings = this.deepCopy(settings);
});
diff --git a/web/src/app/shared/components/sidenav-list/sidenav-list.component.html b/web/src/app/shared/components/sidenav-list/sidenav-list.component.html
index 5401663f7..63234e8a4 100644
--- a/web/src/app/shared/components/sidenav-list/sidenav-list.component.html
+++ b/web/src/app/shared/components/sidenav-list/sidenav-list.component.html
@@ -1,40 +1,38 @@
- Administration
- Monitor
- Workplace
- History
- Settings
diff --git a/web/src/app/shared/components/sidenav-list/sidenav-list.component.spec.ts b/web/src/app/shared/components/sidenav-list/sidenav-list.component.spec.ts
index 5f4eb6fd6..c480bd6b6 100644
--- a/web/src/app/shared/components/sidenav-list/sidenav-list.component.spec.ts
+++ b/web/src/app/shared/components/sidenav-list/sidenav-list.component.spec.ts
@@ -16,6 +16,7 @@ import { MatGridListModule } from '@angular/material/grid-list';
import { MatListModule } from '@angular/material/list';
import { MatIconModule } from '@angular/material/icon';
import { EMPTY } from 'rxjs';
+import { RequestInProgressService } from '../../services/request-in-progress/request-in-progress.service';
const SidenavServiceSpy: Partial = {
toggleSidenav: jest.fn().mockReturnValue(EMPTY)
@@ -48,6 +49,7 @@ describe('SidenavListComponent', () => {
HttpClientTestingModule
],
providers: [
+ RequestInProgressService,
{ provide: SidenavService, useValue: SidenavServiceSpy },
{ provide: TaskanaEngineService, useValue: TaskanaEngineServiceSpy }
]
diff --git a/web/src/app/shared/components/sidenav-list/sidenav-list.component.ts b/web/src/app/shared/components/sidenav-list/sidenav-list.component.ts
index fe4c60227..ba65d2278 100644
--- a/web/src/app/shared/components/sidenav-list/sidenav-list.component.ts
+++ b/web/src/app/shared/components/sidenav-list/sidenav-list.component.ts
@@ -4,6 +4,8 @@ import { MonitorGuard } from 'app/shared/guards/monitor.guard';
import { UserGuard } from 'app/shared/guards/user.guard';
import { TaskanaEngineService } from '../../services/taskana-engine/taskana-engine.service';
import { SidenavService } from '../../services/sidenav/sidenav.service';
+import { RequestInProgressService } from '../../services/request-in-progress/request-in-progress.service';
+import { Router } from '@angular/router';
@Component({
selector: 'taskana-sidenav-list',
@@ -30,7 +32,12 @@ export class SidenavListComponent implements OnInit {
routingAccess = false;
settingsAccess = false;
- constructor(private taskanaEngineService: TaskanaEngineService, private sidenavService: SidenavService) {}
+ constructor(
+ private taskanaEngineService: TaskanaEngineService,
+ private sidenavService: SidenavService,
+ private requestInProgressService: RequestInProgressService,
+ private router: Router
+ ) {}
ngOnInit() {
this.administrationAccess = this.taskanaEngineService.hasRole(BusinessAdminGuard.roles);
@@ -45,7 +52,8 @@ export class SidenavListComponent implements OnInit {
this.settingsAccess = this.administrationAccess;
}
- toggleSidenav() {
+ toggleSidenav(target: string) {
+ if (!this.router.url.includes(target)) this.requestInProgressService.setRequestInProgress(true);
this.toggle = !this.toggle;
this.sidenavService.toggleSidenav();
}
diff --git a/web/src/app/workplace/components/task-list-toolbar/task-list-toolbar.component.ts b/web/src/app/workplace/components/task-list-toolbar/task-list-toolbar.component.ts
index 1afbf81e4..613413f6c 100644
--- a/web/src/app/workplace/components/task-list-toolbar/task-list-toolbar.component.ts
+++ b/web/src/app/workplace/components/task-list-toolbar/task-list-toolbar.component.ts
@@ -15,6 +15,7 @@ import { Actions, ofActionCompleted, Select, Store } from '@ngxs/store';
import { ClearTaskFilter, SetTaskFilter } from '../../../shared/store/filter-store/filter.actions';
import { WorkplaceSelectors } from '../../../shared/store/workplace-store/workplace.selectors';
import { SetFilterExpansion } from '../../../shared/store/workplace-store/workplace.actions';
+import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service';
export enum Search {
byWorkbasket = 'workbasket',
@@ -62,7 +63,8 @@ export class TaskListToolbarComponent implements OnInit {
private router: Router,
private route: ActivatedRoute,
private store: Store,
- private ngxsActions$: Actions
+ private ngxsActions$: Actions,
+ private requestInProgressService: RequestInProgressService
) {}
ngOnInit() {
@@ -139,6 +141,7 @@ export class TaskListToolbarComponent implements OnInit {
onTabChange(search) {
const tab = search.path[0].innerText;
+ this.requestInProgressService.setRequestInProgress(true);
if (tab === 'Workbaskets') {
this.router.navigate(['taskana/workplace'], { queryParams: { component: 'workbaskets' } });
}
diff --git a/web/src/app/workplace/components/task-master/task-master.component.ts b/web/src/app/workplace/components/task-master/task-master.component.ts
index dff5dd2a8..d2b703610 100644
--- a/web/src/app/workplace/components/task-master/task-master.component.ts
+++ b/web/src/app/workplace/components/task-master/task-master.component.ts
@@ -16,6 +16,7 @@ import { Select, Store } from '@ngxs/store';
import { FilterSelectors } from '../../../shared/store/filter-store/filter.selectors';
import { WorkplaceSelectors } from '../../../shared/store/workplace-store/workplace.selectors';
import { CalculateNumberOfCards } from '../../../shared/store/workplace-store/workplace.actions';
+import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service';
@Component({
selector: 'taskana-task-master',
@@ -52,7 +53,8 @@ export class TaskMasterComponent implements OnInit, OnDestroy {
private workplaceService: WorkplaceService,
private notificationsService: NotificationService,
private orientationService: OrientationService,
- private store: Store
+ private store: Store,
+ private requestInProgressService: RequestInProgressService
) {}
ngOnInit() {
@@ -120,8 +122,14 @@ export class TaskMasterComponent implements OnInit, OnDestroy {
this.getTasks();
}
+ ngOnDestroy(): void {
+ this.destroy$.next(null);
+ this.destroy$.complete();
+ }
+
private getTasks(): void {
this.requestInProgress = true;
+ this.requestInProgressService.setRequestInProgress(true);
if (this.selectedSearchType === Search.byTypeAndValue) {
delete this.currentBasket;
@@ -131,6 +139,7 @@ export class TaskMasterComponent implements OnInit, OnDestroy {
if (this.selectedSearchType === Search.byWorkbasket && !this.currentBasket) {
this.requestInProgress = false;
+ this.requestInProgressService.setRequestInProgress(false);
this.tasks = [];
} else {
this.taskService
@@ -138,6 +147,7 @@ export class TaskMasterComponent implements OnInit, OnDestroy {
.pipe(take(1))
.subscribe((taskResource) => {
this.requestInProgress = false;
+ this.requestInProgressService.setRequestInProgress(false);
if (taskResource.tasks && taskResource.tasks.length > 0) {
this.tasks = taskResource.tasks;
} else {
@@ -150,9 +160,4 @@ export class TaskMasterComponent implements OnInit, OnDestroy {
});
}
}
-
- ngOnDestroy(): void {
- this.destroy$.next(null);
- this.destroy$.complete();
- }
}