Skip to content

Show Close instead of Apply in labels modal when there are no labels #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hupponen wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −5
Open

Show Close instead of Apply in labels modal when there are no labels #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/views/sessions/session/labels/label-editor-modal.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h4 class="modal-title">{{ isEdit ? "Edit label" : "New label" }}</h4>
</div>

<div class="modal-footer">
<button type="button" class="btn btn-outline-secondary" (click)="cancel()">Cancel</button>
<button type="button" class="btn btn-secondary" (click)="cancel()">Cancel</button>
<button type="button" class="btn btn-primary" [disabled]="!canSave()" (click)="save()">
{{ isEdit ? "Save" : "Create" }}
</button>
Expand Down
13 changes: 9 additions & 4 deletions src/app/views/sessions/session/labels/labels-modal.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,14 @@ <h4 class="modal-title d-flex align-items-baseline" style="min-width: 0">
(click)="openCreateLabel()">
+ New label
</button>
<button *ngIf="hasSelection()" type="button" class="btn btn-outline-secondary" (click)="cancel()">Cancel</button>
<button type="button" class="btn btn-primary" [disabled]="saving" (click)="confirm()">
<span *ngIf="hasSelection()">Apply</span>
<span *ngIf="!hasSelection()">Close</span>
<button *ngIf="canApply()" type="button" class="btn btn-secondary" (click)="cancel()">Cancel</button>
<button
type="button"
class="btn"
[ngClass]="{ 'btn-primary': canApply(), 'btn-secondary': !canApply() }"
[disabled]="saving"
(click)="confirm()">
<span *ngIf="canApply()">Apply</span>
<span *ngIf="!canApply()">Close</span>
</button>
</div>
5 changes: 5 additions & 0 deletions src/app/views/sessions/session/labels/labels-modal.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ export class LabelsModalComponent implements OnInit {
return this.selectedDatasets.length > 0;
}

/** There is something to apply only if files are selected and there are labels to check */
canApply(): boolean {
return this.hasSelection() && this.rows.length > 0;
}

toggleRow(row: LabelRow): void {
row.selection = row.selection === "checked" ? "unchecked" : "checked";
}
Expand Down