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

dataset-overview: dmp label changed & copy-edit urls open in new tab

This commit is contained in:
gpapavgeri 2020-07-22 11:21:03 +03:00
parent 20cd23ee35
commit 5fc779a172
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@
<div class="row ">
<button class="dmp-btn" (click)="dmpClicked(dataset.dmp.id)">
<div class="dmp-btn-label">
{{ this.dataset.dmp.label }}: {{ dataset.datasetTemplate.label }}
{{ this.dataset.dmp.label }}
<!-- {{ 'DATASET-LISTING.TOOLTIP.DMP-FOR' | translate }}: {{ dataset.datasetTemplate.label }} -->
</div>
<mat-icon>launch</mat-icon>

14
dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts
View File

@ -138,7 +138,8 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
}
getDatasetWizardModel(id: string) {
this.datasetWizardService.getSingle(id).pipe(takeUntil(this._destroyed))
this.datasetWizardService.getSingle(id)
.pipe(takeUntil(this._destroyed))
.subscribe(data => {
this.datasetWizardEditorModel = new DatasetWizardEditorModel().fromModel(data);
this.datasetWizardModel = data;
@ -165,7 +166,7 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
}
reloadPage(): void {
this.router.navigateByUrl('/datasets', { skipLocationChange: true }).then(() => {
this.router.navigateByUrl('/reload', { skipLocationChange: true }).then(() => {
this.router.navigate([`/datasets/overview/${this.dataset.id}`]);
});
}
@ -263,9 +264,11 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
editClicked(dataset: DatasetOverviewModel) {
if (dataset.public) {
this.router.navigate(['/datasets/publicEdit/' + dataset.id]);
let url = this.router.createUrlTree(['/datasets/publicEdit/', dataset.id])
window.open(url.toString(), '_blank')
} else {
this.router.navigate(['/datasets/edit/' + dataset.id]);
let url = this.router.createUrlTree(['/datasets/edit/', dataset.id])
window.open(url.toString(), '_blank')
}
}
@ -406,7 +409,8 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
.subscribe(result => {
if (result && result.datasetProfileExist) {
const newDmpId = result.formControl.value.id
this.router.navigate(['/datasets/copy/' + result.datasetId], { queryParams: { newDmpId: newDmpId } });
let url = this.router.createUrlTree(['/datasets/copy/', result.datasetId, { newDmpId: newDmpId } ])
window.open(url.toString(), '_blank')
}
});
}