MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Prevent deleted datasets to be shown on th dataset List

This commit is contained in:
George Kalampokis 2020-03-16 11:09:24 +02:00
parent ec0fd47021
commit f480ee6986
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java
View File

@ -105,7 +105,7 @@ public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteri
boolQuery = boolQuery.should(QueryBuilders.termsQuery("tags.name.keyword", criteria.getTags().stream().map(Tag::getName).collect(Collectors.toList())));
}
if (boolQuery.should().isEmpty()) {
if (boolQuery.should().isEmpty() && boolQuery.mustNot().isEmpty()) {
boolQuery.should(QueryBuilders.matchAllQuery());
} else {
boolQuery.minimumShouldMatch(boolQuery.should().size());

2
dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
View File

@ -1,4 +1,4 @@
<div class="listing-item">
<div class="listing-item" *ngIf="!isDeleted">
<a [routerLink]="['/datasets/edit/' + dataset.id]">
<div class="col">
<div class="row">

13
dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts
View File

@ -15,12 +15,21 @@ export class DatasetListingItemComponent implements OnInit {
@Output() onClick: EventEmitter<DatasetListingModel> = new EventEmitter();
isDraft: boolean;
isDeleted: boolean;
constructor(private router: Router) { }
ngOnInit() {
if (this.dataset.status == DatasetStatus.Draft) { this.isDraft = true }
else { this.isDraft = false }
if (this.dataset.status === DatasetStatus.Draft) {
this.isDraft = true;
this.isDeleted = false;
} else if (this.dataset.status === DatasetStatus.Deleted) {
this.isDeleted = true;
}
else {
this.isDraft = false;
this.isDeleted = false;
}
}