Skip to content

Commit c57f764

Browse files
committed
Revert "remove linked dataset filter functionality (to be added in a separate PR)"
This reverts commit 1e18539.
1 parent 1e18539 commit c57f764

2 files changed

Lines changed: 25 additions & 6 deletions

File tree

scilog/src/app/logbook/widgets/scicat-viewer/scicat-viewer.component.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@
1212
(selectionChange)="onDatasetSelect($event)"
1313
[value]="selectedDataset?.pid"
1414
>
15-
@for (dataset of datasetSummary(); track dataset.pid) {
15+
@for (dataset of filteredDatasetSummary(); track dataset.pid) {
1616
<mat-option [value]="dataset.pid">{{ dataset.datasetName }}</mat-option>
1717
}
1818
</mat-select></mat-form-field
1919
>
20+
<mat-checkbox [(ngModel)]="showProposalLinked">Proposal-linked</mat-checkbox>
21+
<mat-checkbox [(ngModel)]="showUserLinked">User-linked</mat-checkbox>
2022
</div>
2123

2224
<div *ngIf="selectedDataset">

scilog/src/app/logbook/widgets/scicat-viewer/scicat-viewer.component.ts

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,26 @@ export class ScicatViewerComponent implements OnInit {
5454
private proposalLinkedPids = new Set<string>();
5555
private userLinkedPids = signal<Set<string>>(new Set());
5656

57+
showProposalLinked = signal(false);
58+
showUserLinked = signal(false);
59+
60+
filteredDatasetSummary = computed(() => {
61+
const showProposalLinked = this.showProposalLinked();
62+
const showUserLinked = this.showUserLinked();
63+
if (!showProposalLinked && !showUserLinked) {
64+
return this.datasetSummary();
65+
}
66+
return this.datasetSummary().filter((ds) => {
67+
if (showProposalLinked && this.proposalLinkedPids.has(ds.pid)) {
68+
return true;
69+
}
70+
if (showUserLinked && this.userLinkedPids().has(ds.pid)) {
71+
return true;
72+
}
73+
return false;
74+
});
75+
});
76+
5777
ngOnInit(): void {
5878
this.scicatService.getMyself().subscribe({
5979
next: (data: ScicatUser) => {
@@ -101,11 +121,8 @@ export class ScicatViewerComponent implements OnInit {
101121
}
102122
},
103123
error: (err) => {
104-
console.error('Error fetching datasets or linked datasets', err);
105-
this.snackbarService.showSnackbarMessage(
106-
'Error fetching datasets or linked datasets',
107-
'warning',
108-
);
124+
console.error('Error in getDatasets or getUserLinkedDatasets', err);
125+
this.snackbarService.showSnackbarMessage('Error fetching linked datasets', 'warning');
109126
},
110127
});
111128
}

0 commit comments

Comments
 (0)