diff --git a/src/app/components/analysis-panel/view-list/view-list.component.html b/src/app/components/analysis-panel/view-list/view-list.component.html index ad817043487bd6f5352be7cc2805f4b362d985c2..b868d021715ff40d2535c455b572474220a23efc 100644 --- a/src/app/components/analysis-panel/view-list/view-list.component.html +++ b/src/app/components/analysis-panel/view-list/view-list.component.html @@ -10,12 +10,10 @@ > <div *ngIf="task" - (click)="open(task.token)" - pTooltip="Show selection view" - [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'" - tooltipPosition="top" > - <div class="columns mb-0"> + <div class="columns mb-0" (click)="open(task.token)" pTooltip="Show selection view" + [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'" + tooltipPosition="top"> <div class="column is-8"> <span class="is-capitalized" ><app-fa-solid-icon @@ -24,8 +22,6 @@ Manual selection</span > </div> - <div class="column"> - </div> </div> <div class="columns mb-0"> <div class="column is-8 pt-0 pb-0"> @@ -33,8 +29,11 @@ </div> <div class="column pt-0 pb-0"> <a - (click)="analysis.removeTask(task)" + (click)="analysis.removeView(task.token)" class="has-text-danger is-pulled-right" + pTooltip="Delete view" + [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'" + tooltipPosition="top" > <app-fa-solid-icon icon="trash"></app-fa-solid-icon> </a> diff --git a/src/app/components/analysis-panel/view-list/view-list.component.scss b/src/app/components/analysis-panel/view-list/view-list.component.scss index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..139597f9cb07c5d48bed18984ec4747f4b4f3438 100644 --- a/src/app/components/analysis-panel/view-list/view-list.component.scss +++ b/src/app/components/analysis-panel/view-list/view-list.component.scss @@ -0,0 +1,2 @@ + + diff --git a/src/app/components/task-list/task-list.component.html b/src/app/components/task-list/task-list.component.html index 8a45779a3b29ce5a15bf13f7d9a7f7e907debb52..ef5e2ab23ebbd13626c6b5e5a9a4bd212f297e0b 100644 --- a/src/app/components/task-list/task-list.component.html +++ b/src/app/components/task-list/task-list.component.html @@ -105,12 +105,11 @@ </div> <div *ngIf="task.info.done" - (click)="open(task.token)" - pTooltip="Show analysis results" - [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'" - tooltipPosition="top" > - <div class="columns mb-0"> + <div class="columns mb-0" (click)="open(task.token)" + pTooltip="Show analysis results" + [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'" + tooltipPosition="top"> <div class="column is-8"> <span class="is-capitalized" ><app-fa-solid-icon @@ -139,6 +138,9 @@ <a (click)="analysis.removeTask(task.token)" class="has-text-danger is-pulled-right" + pTooltip="Delete task" + [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'" + tooltipPosition="top" > <app-fa-solid-icon icon="trash"></app-fa-solid-icon> </a> diff --git a/src/app/components/task-list/task-list.component.scss b/src/app/components/task-list/task-list.component.scss index 156944455feb7c65ed424cacf38260cd0af95c47..fb3bd11db01f3eb424da5c97b93656a6c8ba388c 100644 --- a/src/app/components/task-list/task-list.component.scss +++ b/src/app/components/task-list/task-list.component.scss @@ -26,7 +26,8 @@ } .small-box { - margin: 0.5rem; - padding: 0.5rem; + //margin: 0.5rem; + //padding: 0.5rem; background-color: var(--drgstn-panel-secondary) !important; } + diff --git a/src/app/pages/explorer-page/explorer-page.component.html b/src/app/pages/explorer-page/explorer-page.component.html index d2628a88e677fc0590923ff0a183e088f0e4bc95..9919c62289d4550f8c6f89583b66c4a3b820c073 100644 --- a/src/app/pages/explorer-page/explorer-page.component.html +++ b/src/app/pages/explorer-page/explorer-page.component.html @@ -530,7 +530,7 @@ </header> <div *ngIf="collapseViews"> <div - class="card-content overflow task-list-container" + class="overflow task-list-container" *ngIf="analysis.viewTokens && analysis.viewTokens.length > 0" > <app-view-list [(token)]="selectedViewToken"></app-view-list> @@ -579,7 +579,7 @@ </header> <div *ngIf="collapseTask"> <div - class="card-content overflow task-list-container" + class="overflow task-list-container" *ngIf="analysis.tasks && analysis.tasks.length > 0" > <app-task-list [(token)]="selectedAnalysisToken"></app-task-list> diff --git a/src/app/services/analysis/analysis.service.ts b/src/app/services/analysis/analysis.service.ts index 88a810ea6f61c7a369fb586a37ec47e6bc8b715e..14fd10ab4ce47b21eb88ff9386add775920956b9 100644 --- a/src/app/services/analysis/analysis.service.ts +++ b/src/app/services/analysis/analysis.service.ts @@ -132,6 +132,7 @@ export class AnalysisService { } removeTask(token) { + console.log(token) this.tokens = this.tokens.filter((item) => item !== token); this.finishedTokens = this.finishedTokens.filter((item) => item !== token); this.tasks = this.tasks.filter((item) => item.token !== (token)); diff --git a/src/stylesheets/theme-styles.scss b/src/stylesheets/theme-styles.scss index d227b7141652bf952cf8094a907997f23c44e4fb..215aa3ce0b2aebd5caafc1a8d657c5495a5ff531 100644 --- a/src/stylesheets/theme-styles.scss +++ b/src/stylesheets/theme-styles.scss @@ -143,7 +143,7 @@ color: var(--drgstn-success) !important; } - app-task-list a, + app-task-list a, app-view-list a, a.card-header-icon { color: var(--drgstn-secondary) !important; }