Skip to content

Commit 37faef9

Browse files
committed
- corrected according to PR
1 parent 5608f94 commit 37faef9

File tree

2 files changed

+22
-23
lines changed

2 files changed

+22
-23
lines changed

projects/netgrif-components-core/src/lib/view/task-view/abstract-single-task-view.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export abstract class AbstractSingleTaskViewComponent extends AbstractViewWithHe
3131
this.subRoute = this._activatedRoute.paramMap.subscribe(paramMap => {
3232
if (!!(paramMap?.['params']?.[TaskConst.TRANSITION_ID])) {
3333
this.transitionId = paramMap['params'][TaskConst.TRANSITION_ID];
34+
this.subPanelData.unsubscribe();
3435
this.subPanelData = this.taskViewService.tasks$.subscribe(tasks => {
3536
if (!!tasks && tasks.length > 0) {
3637
this.taskPanelData.next(this.resolveTransitionTask(tasks));

projects/netgrif-components/src/lib/panel/task-panel-single/single-task.component.html

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,28 @@
77
<span class='font-size-20'>{{ 'tasks.view.noTasksSatisfyingThisFilter' | translate }}</span>
88
</div>
99

10-
<mat-accordion [multi]="false" class="full-width" fxFlex="100">
11-
<cdk-virtual-scroll-viewport itemSize="1" class="task-panel-scroll-container full-width full-height">
12-
<div *ngTemplateOutlet='pageHeader ?? defaultPageHeader'></div>
13-
<nc-task-panel
14-
[textEllipsis]='textEllipsis'
15-
[taskPanelData]='task'
16-
[selectedHeaders$]='selectedHeaders$'
17-
[forceLoadDataOnOpen]='forceLoadDataOnOpen'
18-
[responsiveBody]='responsiveBody'
19-
(taskEvent)='emitTaskEvent($event)'
20-
(panelRefOutput)='setPanelRef($event)'
21-
[preventCollapse]='preventCollapse'
22-
[hidePanelHeader]='hidePanelHeader'
23-
[actionButtonTemplates]='actionButtonTemplates'
24-
[actionRowJustifyContent]='actionRowJustifyContent'
25-
class='panel-expanded-spacing'>
26-
</nc-task-panel>
10+
<cdk-virtual-scroll-viewport itemSize="1" class="task-panel-scroll-container full-width full-height">
11+
<div *ngTemplateOutlet='pageHeader ?? defaultPageHeader'></div>
12+
<nc-task-panel
13+
[textEllipsis]='textEllipsis'
14+
[taskPanelData]='task'
15+
[selectedHeaders$]='selectedHeaders$'
16+
[forceLoadDataOnOpen]='forceLoadDataOnOpen'
17+
[responsiveBody]='responsiveBody'
18+
(taskEvent)='emitTaskEvent($event)'
19+
(panelRefOutput)='setPanelRef($event)'
20+
[preventCollapse]='preventCollapse'
21+
[hidePanelHeader]='hidePanelHeader'
22+
[actionButtonTemplates]='actionButtonTemplates'
23+
[actionRowJustifyContent]='actionRowJustifyContent'
24+
class='panel-expanded-spacing'>
25+
</nc-task-panel>
2726

28-
<div *ngIf='loading$ | async' fxLayout='column' fxLayoutAlign='center center'>
29-
<mat-spinner color='primary' diameter='52'></mat-spinner>
30-
</div>
31-
<div *ngTemplateOutlet='pageFooter ?? defaultPageFooter'></div>
32-
</cdk-virtual-scroll-viewport>
33-
</mat-accordion>
27+
<div *ngIf='loading$ | async' fxLayout='column' fxLayoutAlign='center center'>
28+
<mat-spinner color='primary' diameter='52'></mat-spinner>
29+
</div>
30+
<div *ngTemplateOutlet='pageFooter ?? defaultPageFooter'></div>
31+
</cdk-virtual-scroll-viewport>
3432

3533
<ng-template #defaultPageHeader>
3634
<mat-card class="top-card">

0 commit comments

Comments
 (0)