Fixes option view all dmp versions on listings

This commit is contained in:
apapachristou 2020-07-27 13:52:59 +03:00
parent 87398428c5
commit 81a7ff0955
6 changed files with 42 additions and 8 deletions

View File

@ -79,7 +79,7 @@
<button *ngIf="isUserOwner(activity)" mat-menu-item (click)="newVersion(activity.id, activity.title)"> <button *ngIf="isUserOwner(activity)" mat-menu-item (click)="newVersion(activity.id, activity.title)">
<mat-icon>queue</mat-icon>{{'DMP-LISTING.ACTIONS.NEW-VERSION' | translate}} <mat-icon>queue</mat-icon>{{'DMP-LISTING.ACTIONS.NEW-VERSION' | translate}}
</button> </button>
<button mat-menu-item (click)="viewVersions(getGroupId(activity), activity.title)"> <button mat-menu-item (click)="viewVersions(getGroupId(activity), activity.title, activity)">
<mat-icon>library_books</mat-icon>{{'DMP-LISTING.ACTIONS.VIEW-VERSION' | translate}} <mat-icon>library_books</mat-icon>{{'DMP-LISTING.ACTIONS.VIEW-VERSION' | translate}}
</button> </button>
<button mat-menu-item *ngIf="isUserOwner(activity)" (click)="deleteClicked(activity)" class="menu-item"> <button mat-menu-item *ngIf="isUserOwner(activity)" (click)="deleteClicked(activity)" class="menu-item">

View File

@ -78,7 +78,7 @@
<button *ngIf="isUserOwner(activity)" mat-menu-item (click)="newVersion(activity.id, activity.label)"> <button *ngIf="isUserOwner(activity)" mat-menu-item (click)="newVersion(activity.id, activity.label)">
<mat-icon>queue</mat-icon>{{'DMP-LISTING.ACTIONS.NEW-VERSION' | translate}} <mat-icon>queue</mat-icon>{{'DMP-LISTING.ACTIONS.NEW-VERSION' | translate}}
</button> </button>
<button mat-menu-item (click)="viewVersions(activity.groupId, activity.label)"> <button mat-menu-item (click)="viewVersions(activity.groupId, activity.label, activity)">
<mat-icon>library_books</mat-icon>{{'DMP-LISTING.ACTIONS.VIEW-VERSION' | translate}} <mat-icon>library_books</mat-icon>{{'DMP-LISTING.ACTIONS.VIEW-VERSION' | translate}}
</button> </button>
<button mat-menu-item *ngIf="isUserOwner(activity)" (click)="deleteClicked()" class="menu-item"> <button mat-menu-item *ngIf="isUserOwner(activity)" (click)="deleteClicked()" class="menu-item">

View File

@ -109,7 +109,6 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
} else if (params['groupId']) { } else if (params['groupId']) {
this.itemId = params['groupId']; this.itemId = params['groupId'];
this.showGrant = true; this.showGrant = true;
const breadCrumbs = [];
this.allVersions = true; this.allVersions = true;
this.language.get('NAV-BAR.MY-DMPS').pipe(takeUntil(this._destroyed)).subscribe(x => { this.language.get('NAV-BAR.MY-DMPS').pipe(takeUntil(this._destroyed)).subscribe(x => {
@ -125,6 +124,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
// this.criteria.setCriteria(this.getDefaultCriteria()); // this.criteria.setCriteria(this.getDefaultCriteria());
this.criteria = this.getDefaultCriteria(); this.criteria = this.getDefaultCriteria();
this.criteria.groupIds ? this.criteria.groupIds.push(this.itemId) : this.criteria.groupIds = [this.itemId];
this.refresh(); this.refresh();
// this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages)); // this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages));
} else { } else {
@ -270,6 +270,9 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
defaultCriteria.isPublic = true; defaultCriteria.isPublic = true;
defaultCriteria.onlyPublic = true; defaultCriteria.onlyPublic = true;
} }
if (this.allVersions) {
defaultCriteria.allVersions = true;
}
return defaultCriteria; return defaultCriteria;
} }

View File

@ -928,10 +928,12 @@
"DATASET-EDITOR": { "DATASET-EDITOR": {
"TITLE": { "TITLE": {
"NEW": "New Data Management Plan", "NEW": "New Data Management Plan",
"EDIT": "Edit" "EDIT": "Edit",
"INTRO": "A Data Management Plan (DMP) consist of your Data Management Plans closer to where they are generated, analysed and stored. argos is an open, extensible, collaborative tool supporting Open and FAIR Data Management Plans."
}, },
"FIELDS": { "FIELDS": {
"NAME": "Name of the Dataset Description", "NAME": "Name of the Dataset Description",
"TITLE": "Title",
"DESCRIPTION": "Description", "DESCRIPTION": "Description",
"PROFILE": "Template", "PROFILE": "Template",
"URI": "Uri", "URI": "Uri",
@ -944,6 +946,7 @@
"EXTERNAL-DATASET-TYPE": "External Dataset Type", "EXTERNAL-DATASET-TYPE": "External Dataset Type",
"EXTERNAL-DATASET-INFO": "External Dataset Info", "EXTERNAL-DATASET-INFO": "External Dataset Info",
"DATAREPOSITORIES-INFO": "Data Repositories Info", "DATAREPOSITORIES-INFO": "Data Repositories Info",
"EXTERNAL-LINK": "External link",
"TAGS": "Tags", "TAGS": "Tags",
"CREATE": "Create New" "CREATE": "Create New"
}, },
@ -954,7 +957,12 @@
"UPDATE": "Update" "UPDATE": "Update"
}, },
"PLACEHOLDER": { "PLACEHOLDER": {
"DESCRIPTION": "Fill with description" "DESCRIPTION": "Fill with description",
"EXTERNAL-LINK": "Provide an external URL link"
},
"HINT": {
"TITLE": "A brief description of what the ",
"TITLE-REST": " is about its scope and objectives."
}, },
"VERSION-DIALOG": { "VERSION-DIALOG": {
"ABOUT": "Versioning is automated.", "ABOUT": "Versioning is automated.",
@ -1026,7 +1034,8 @@
"SOURCES": "Sources", "SOURCES": "Sources",
"SOURCE:": "Source: ", "SOURCE:": "Source: ",
"NO-SOURCE": "Not bind with source", "NO-SOURCE": "Not bind with source",
"OUTPUT": "Output" "OUTPUT": "Output",
"SELECT": "Select"
}, },
"DMP": { "DMP": {
"FINALISED": "Finalized", "FINALISED": "Finalized",

View File

@ -920,10 +920,12 @@
"DATASET-EDITOR": { "DATASET-EDITOR": {
"TITLE": { "TITLE": {
"NEW": "Nuevo Plan de Gestión de Datos", "NEW": "Nuevo Plan de Gestión de Datos",
"EDIT": "Editar" "EDIT": "Editar",
"INTRO": "A Data Management Plan (DMP) consist of your Data Management Plans closer to where they are generated, analysed and stored. argos is an open, extensible, collaborative tool supporting Open and FAIR Data Management Plans."
}, },
"FIELDS": { "FIELDS": {
"NAME": "Nombre de la descripción del Dataset", "NAME": "Nombre de la descripción del Dataset",
"TITLE": "Title",
"DESCRIPTION": "Descripción", "DESCRIPTION": "Descripción",
"PROFILE": "Plantilla", "PROFILE": "Plantilla",
"URI": "Uri", "URI": "Uri",
@ -936,6 +938,7 @@
"EXTERNAL-DATASET-TYPE": "Tipo de Dataset externos", "EXTERNAL-DATASET-TYPE": "Tipo de Dataset externos",
"EXTERNAL-DATASET-INFO": "Información Dataset externos", "EXTERNAL-DATASET-INFO": "Información Dataset externos",
"DATAREPOSITORIES-INFO": "Información Repositorios de Datos", "DATAREPOSITORIES-INFO": "Información Repositorios de Datos",
"EXTERNAL-LINK": "External link",
"TAGS": "Etiquetas", "TAGS": "Etiquetas",
"CREATE": "Crear nuevo" "CREATE": "Crear nuevo"
}, },
@ -945,6 +948,14 @@
"DELETE": "Borrar", "DELETE": "Borrar",
"UPDATE": "Update" "UPDATE": "Update"
}, },
"PLACEHOLDER": {
"DESCRIPTION": "Fill with description",
"EXTERNAL-LINK": "Provide an external URL link"
},
"HINT": {
"TITLE": "A brief description of what the",
"TITLE-REST": "is about its scope and objectives."
},
"VERSION-DIALOG": { "VERSION-DIALOG": {
"ABOUT": "Versionado es automático.", "ABOUT": "Versionado es automático.",
"QUESTION": "Parece que su plantilla de descripción del Dataset está desactualizada. ¿Queire actualizarla a la última versión?" "QUESTION": "Parece que su plantilla de descripción del Dataset está desactualizada. ¿Queire actualizarla a la última versión?"

View File

@ -921,10 +921,12 @@
"DATASET-EDITOR": { "DATASET-EDITOR": {
"TITLE": { "TITLE": {
"NEW": "Νέο Σχέδιο Διαχείρισης Δεδομένων", "NEW": "Νέο Σχέδιο Διαχείρισης Δεδομένων",
"EDIT": "Επεξεργασία" "EDIT": "Επεξεργασία",
"INTRO": "A Data Management Plan (DMP) consist of your Data Management Plans closer to where they are generated, analysed and stored. argos is an open, extensible, collaborative tool supporting Open and FAIR Data Management Plans."
}, },
"FIELDS": { "FIELDS": {
"NAME": "Τίτλος Περιγραφής Συνόλου Δεδομένων", "NAME": "Τίτλος Περιγραφής Συνόλου Δεδομένων",
"TITLE": "Title",
"DESCRIPTION": "Περιγραφή", "DESCRIPTION": "Περιγραφή",
"PROFILE": "Template", "PROFILE": "Template",
"URI": "Uri", "URI": "Uri",
@ -937,6 +939,7 @@
"EXTERNAL-DATASET-TYPE": "Τύπος Εξωτερικού Συνόλου Δεδομένων", "EXTERNAL-DATASET-TYPE": "Τύπος Εξωτερικού Συνόλου Δεδομένων",
"EXTERNAL-DATASET-INFO": "Πληροφορίες για το Εξωτερικό Σύνολο Δεδομένων", "EXTERNAL-DATASET-INFO": "Πληροφορίες για το Εξωτερικό Σύνολο Δεδομένων",
"DATAREPOSITORIES-INFO": "Πληροφορίες για τα Αποθετήρια Δεδομένων", "DATAREPOSITORIES-INFO": "Πληροφορίες για τα Αποθετήρια Δεδομένων",
"EXTERNAL-LINK": "External link",
"TAGS": "Ετικέτες", "TAGS": "Ετικέτες",
"CREATE": "Δημιουργία νέου" "CREATE": "Δημιουργία νέου"
}, },
@ -946,6 +949,14 @@
"DELETE": "Διαγραφή", "DELETE": "Διαγραφή",
"UPDATE": "Update" "UPDATE": "Update"
}, },
"PLACEHOLDER": {
"DESCRIPTION": "Fill with description",
"EXTERNAL-LINK": "Provide an external URL link"
},
"HINT": {
"TITLE": "A brief description of what the",
"TITLE-REST": "is about its scope and objectives."
},
"VERSION-DIALOG": { "VERSION-DIALOG": {
"ABOUT": "Η δημιουργία νέας έκδοσης συμβαίνει αυτόματα", "ABOUT": "Η δημιουργία νέας έκδοσης συμβαίνει αυτόματα",
"QUESTION": "Το Template το Συνόλου Δεδομένων που επιλέξατε χρειάζεται επικαιροποίηση. Θα θέλατε να το ενημερώσετε στην πιο πρόσφατη έκδοσή του;" "QUESTION": "Το Template το Συνόλου Δεδομένων που επιλέξατε χρειάζεται επικαιροποίηση. Θα θέλατε να το ενημερώσετε στην πιο πρόσφατη έκδοσή του;"