Skip to content
Snippets Groups Projects
Commit 9034094e authored by Tifenn Guillas's avatar Tifenn Guillas
Browse files

Fixed bug search lost

parent ecdee838
No related branches found
No related tags found
2 merge requests!147Develop,!119Resolve "Bug search lost"
......@@ -5,7 +5,7 @@
<li *ngFor="let dataset of getDatasetListByFamily(datasetFamilyList[0].id); last as isLast"
class="list-unstyled px-3 pt-3 pb-0">
<app-dataset-card [dataset]="dataset" [project]="getProject(dataset)"
[datasetSelected]="datasetSelected" (select)="select.emit($event)">
[datasetSelected]="dnameSelected" (select)="select.emit($event)">
</app-dataset-card>
<hr *ngIf="!isLast">
</li>
......@@ -33,7 +33,7 @@
<app-dataset-card
[dataset]="dataset"
[project]="getProject(dataset)"
[datasetSelected]="datasetSelected"
[datasetSelected]="dnameSelected"
(select)="select.emit($event)">
</app-dataset-card>
<hr *ngIf="!isLast">
......
......@@ -73,6 +73,7 @@ describe('[Search][Dataset] Component: DatasetTabsComponent', () => {
it('should select dataset if only one dataset in instance', () => {
testedComponent.select.subscribe((event: string) => expect(event).toBe('cat_1'));
testHostComponent.datasetList = [DATASET]
testHostComponent.datasetSelected = null;
testHostFixture.detectChanges();
});
});
......
......@@ -10,21 +10,21 @@ import { Project, Dataset, Family } from '../../../metamodel/model';
})
export class DatasetTabsComponent {
@Input() projectList: Project[];
@Input()
set datasetList(datasetList: Dataset[]) {
this.datasets = datasetList;
if (datasetList.length === 1) {
this.select.emit(datasetList[0].name);
@Input() datasetList: Dataset[];
@Input() datasetFamilyList: Family[];
@Input()
set datasetSelected(datasetSelected: string) {
this.dnameSelected = datasetSelected;
if (this.dnameSelected === null && this.datasetList.length === 1) {
this.select.emit(this.datasetList[0].name);
}
}
@Input() datasetFamilyList: Family[];
@Input() datasetSelected: string;
@Output() select: EventEmitter<string> = new EventEmitter();
datasets: Dataset[];
dnameSelected: string;
getDatasetListByFamily(idFamily: number): Dataset[] {
return this.datasets
return this.datasetList
.filter(d => d.id_dataset_family === idFamily)
.sort((a, b) => a.display - b.display);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment