Merge branch '93-auto-select-dataset' into 'develop'

Resolve "Auto select dataset"

Closes #93

See merge request !103

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [3.3.0] - 2020-05
 ### Added
 - #90 => Dynamic documentation to explain how to export results via server urls
+- #88 => Search by cone search
+- #93 => Auto select dataset if only one present
 
 ### Fixed
 

src/app/search/components/dataset/dataset-tabs.component.html

@@ -4,7 +4,6 @@
         <ul class="p-0">
             <li *ngFor="let dataset of getDatasetListByFamily(datasetFamilyList[0].id); last as isLast"
                 class="list-unstyled px-3 pt-3 pb-0">
-                <!-- {{ i }} -->
                 <app-dataset-card [dataset]="dataset" [project]="getProject(dataset)"
                     [datasetSelected]="datasetSelected" (select)="select.emit($event)">
                 </app-dataset-card>
@@ -30,7 +29,7 @@
                     </span>
                 </div>
             </button>
-            <div  *ngFor="let dataset of getDatasetListByFamily(family.id); last as isLast">
+            <div *ngFor="let dataset of getDatasetListByFamily(family.id); last as isLast">
                 <app-dataset-card
                     [dataset]="dataset" 
                     [project]="getProject(dataset)"

src/app/search/components/dataset/dataset-tabs.component.spec.ts

@@ -21,11 +21,11 @@ describe('[Search][Dataset] Component: DatasetTabsComponent', () => {
     })
     class TestHostComponent {
         @ViewChild(DatasetTabsComponent, { static: false })
-        public testedComponent: DatasetTabsComponent;
-        private projectList: Project[] = PROJECT_LIST;
-        private datasetList: Dataset[] = DATASET_LIST;
-        private datasetFamilyList: Family[] = DATASET_FAMILY_LIST;
-        private datasetSelected = 'cat_1';
+        testedComponent: DatasetTabsComponent;
+        projectList: Project[] = PROJECT_LIST;
+        datasetList: Dataset[] = DATASET_LIST;
+        datasetFamilyList: Family[] = DATASET_FAMILY_LIST;
+        datasetSelected = 'cat_1';
     }
 
     @Component({ selector: 'app-dataset-card', template: '' })
@@ -69,5 +69,11 @@ describe('[Search][Dataset] Component: DatasetTabsComponent', () => {
         const project = testedComponent.getProject(DATASET);
         expect(project.name).toBe('project_1');
     });
+    
+    it('should select dataset if only one dataset in instance', () => {
+        testedComponent.select.subscribe((event: string) => expect(event).toBe('cat_1'));
+        testHostComponent.datasetList = [DATASET]
+        testHostFixture.detectChanges();
+    });
 });
 

src/app/search/components/dataset/dataset-tabs.component.ts

@@ -10,13 +10,21 @@ import { Project, Dataset, Family } from '../../../metamodel/model';
 })
 export class DatasetTabsComponent {
     @Input() projectList: Project[];
-    @Input() datasetList: Dataset[];
+    @Input() 
+    set datasetList(datasetList: Dataset[]) {
+        this.datasets = datasetList;
+        if (datasetList.length === 1) {
+            this.select.emit(datasetList[0].name);
+        }
+    }
     @Input() datasetFamilyList: Family[];
     @Input() datasetSelected: string;
     @Output() select: EventEmitter<string> = new EventEmitter();
+    
+    datasets: Dataset[];
 
     getDatasetListByFamily(idFamily: number): Dataset[] {
-        return this.datasetList
+        return this.datasets
             .filter(d => d.id_dataset_family === idFamily)
             .sort((a, b) => a.display - b.display);
     }

src/app/search/containers/dataset.component.ts

@@ -70,7 +70,9 @@ export class DatasetComponent implements OnInit {
     }
 
     selectDataset(datasetName: string): void {
-        this.store.dispatch(new searchActions.NewSearchAction(datasetName));
+        // Create a micro tasks that is processed after the current synchronous code
+        // This micro task prevent the expression has changed after it was checked
+        Promise.resolve(null).then(() => this.store.dispatch(new searchActions.NewSearchAction(datasetName)));
         this.store.dispatch(new attributeActions.LoadAttributeSearchMetaAction(datasetName));
         this.store.dispatch(new criteriaActions.LoadCriteriaSearchMetaAction(datasetName));
         this.store.dispatch(new outputActions.LoadOutputSearchMetaAction(datasetName));