diff --git a/UI/src/app/modules/dataset/components/dataset/dataset.component.ts b/UI/src/app/modules/dataset/components/dataset/dataset.component.ts index 264b4be5a..7aa1d5d24 100644 --- a/UI/src/app/modules/dataset/components/dataset/dataset.component.ts +++ b/UI/src/app/modules/dataset/components/dataset/dataset.component.ts @@ -58,7 +58,12 @@ export class DatasetComponent implements OnInit { this.datasets$ = this.allDatasets$.pipe(map(datasets => { return this.sortById(datasets.filter(dataset => dataset.pretty_name !== 'ISMN')); })); - } else { + } else if(configs.filter(config => config.datasetModel.selectedDataset.user).length == configs.length - 1 && !this.selectionModel.selectedDataset?.user){ + this.datasets$ = this.allDatasets$.pipe(map(datasets => { + return this.sortById(datasets.filter(dataset => !dataset.user)); + })); + } + else { this.datasets$ = this.allDatasets$.pipe(map(datasets => { return this.sortById(datasets); })); diff --git a/UI/src/app/modules/validation-reference/components/validation-reference/validation-reference.component.ts b/UI/src/app/modules/validation-reference/components/validation-reference/validation-reference.component.ts index 2bffb250e..4b791dcf6 100644 --- a/UI/src/app/modules/validation-reference/components/validation-reference/validation-reference.component.ts +++ b/UI/src/app/modules/validation-reference/components/validation-reference/validation-reference.component.ts @@ -44,8 +44,12 @@ export class ValidationReferenceComponent implements OnInit { if (this.referenceType === 'spatialReference$'){ const listOfISMNDatasets = this.validationModel.datasetConfigurations.filter(dataset => dataset.datasetModel.selectedDataset?.short_name === 'ISMN'); + const listOfServiceDatasets = this.validationModel.datasetConfigurations.filter(dataset => + !dataset.datasetModel.selectedDataset?.user); if (listOfISMNDatasets.length !== 0){ this.chosenDatasets$.next(listOfISMNDatasets); + } else if (listOfServiceDatasets.length < this.validationModel.datasetConfigurations.length) { + this.chosenDatasets$.next(listOfServiceDatasets); } } return this.chosenDatasets$; diff --git a/UI/src/app/pages/validate/validate.component.html b/UI/src/app/pages/validate/validate.component.html index 97d8536aa..fdc7b2fe1 100644 --- a/UI/src/app/pages/validate/validate.component.html +++ b/UI/src/app/pages/validate/validate.component.html @@ -120,7 +120,9 @@