Commit cd1d81c3 authored by George Kalampokis's avatar George Kalampokis
Browse files

Only Dataset Description Templates listing will show non-finalized templates (ref #227)

parent 95d713b2

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java

+8 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ public class DatasetProfileCriteria extends Criteria<DatasetProfile> { 
    private List<UUID> groupIds;

    private Short filter;

    private UUID userId;

    private boolean finalized;



    public boolean getAllVersions() { return allVersions; }

    public void setAllVersions(boolean allVersions) { this.allVersions = allVersions; }
@@ -52,4 +53,11 @@ public class DatasetProfileCriteria extends Criteria<DatasetProfile> { 
    public void setUserId(UUID userId) {

        this.userId = userId;

    }



    public boolean getFinalized() {

        return finalized;

    }

    public void setFinalized(boolean finalized) {

        this.finalized = finalized;

    }

}

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java

+5 −1
Original line number Diff line number Diff line
@@ -52,7 +52,11 @@ public class DatasetProfileDaoImpl extends DatabaseAccess<DatasetProfile> implem 
                                builder.notEqual(root.get("id"), criteria.getUserId())));

            }

        }

        if (criteria.getFinalized()) {

            query.where(((builder, root) -> builder.equal(root.get("status"), DatasetProfile.Status.FINALIZED.getValue())));

        } else {

            query.where(((builder, root) -> builder.notEqual(root.get("status"), DatasetProfile.Status.DELETED.getValue())));

        }

        return query;

    }

dmp-frontend/src/app/core/query/dataset-profile/dataset-profile-criteria.ts

+1 −0
Original line number Diff line number Diff line
@@ -4,4 +4,5 @@ export class DatasetProfileCriteria extends BaseCriteria { 
	public id: String;

	public groupIds: string[];

	public allVersions: boolean;

	public finalized: boolean = true;

}

dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ export class DatasetDataSource extends DataSource<DatasetListingModel> { 
				if (this._sort.active) { fields = this._sort.direction === 'asc' ? ['+' + this._sort.active] : ['-' + this._sort.active]; }

				const request = new DataTableRequest<DatasetProfileCriteria>(startIndex, this._paginator.pageSize, { fields: fields });

				request.criteria = this._criteria.criteria;

				request.criteria.finalized = false;

				if (this.itemId) {

					request.criteria.groupIds = [this.itemId];

					request.criteria.allVersions = true;