Skip to content

Commit cfd8be8

Browse files
committed
allow merging on relaunch
1 parent d1c5817 commit cfd8be8

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

frontend/src/app/shared/components/toolbar/modals/merge-modal/merge-modal.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div *ngFor="let sbom of sboms">{{ sbom }}</div>
55
</div>
66
<div actions style="display: flex; gap: 15px">
7-
<div class="btn-modal button flex center hover" (click)="loading ? '' : merge()">
7+
<div class="btn-modal button flex center hover" (click)="merge()">
88
<span>Merge</span>
99
</div>
1010
<div class="btn-modal button flex center hover" (click)="close()">

frontend/src/app/shared/components/toolbar/modals/merge-modal/merge-modal.component.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import { ToastService } from 'src/app/shared/services/toast.service';
1111
export class MergeModalComponent {
1212
@Input() open!: boolean;
1313
@Output() openChange: EventEmitter<boolean> = new EventEmitter<boolean>();
14-
loading = false;
1514

1615
@Input() sboms!: string[];
1716

@@ -22,7 +21,6 @@ export class MergeModalComponent {
2221
) {}
2322

2423
merge() {
25-
this.loading = true;
2624
const ids: number[] = [];
2725
this.sboms.forEach((sbom) => {
2826
const id = this.sbomService.GetSBOMInfo(sbom).id;

0 commit comments

Comments
 (0)