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

Adds template preview on: clone dialog select template field, dmp upload select template field

This commit is contained in:
apapachristou 2020-10-27 12:04:11 +02:00
parent 7f654cc472
commit 5534f4f4a9
7 changed files with 147 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.html
View File

@ -36,7 +36,7 @@
<div class="col-12"> <div class="col-12">
<div class="heading">{{'DMP-EDITOR.FIELDS.TEMPLATES' | translate}}</div> <div class="heading">{{'DMP-EDITOR.FIELDS.TEMPLATES' | translate}}</div>
<mat-form-field> <mat-form-field>
<app-multiple-auto-complete required='true' [formControl]="this.data.formGroup.get('profiles')" placeholder="{{'DMP-EDITOR.FIELDS.SELECT-TEMPLATE' | translate}}" [configuration]="profilesAutoCompleteConfiguration"> <app-multiple-auto-complete required='true' [formControl]="this.data.formGroup.get('profiles')" placeholder="{{'DMP-EDITOR.FIELDS.SELECT-TEMPLATE' | translate}}" [configuration]="profilesAutoCompleteConfiguration" (optionActionClicked)="onPreviewTemplate($event)">
</app-multiple-auto-complete> </app-multiple-auto-complete>
<mat-error *ngIf="data.formGroup.get('profiles').hasError('backendError')"> <mat-error *ngIf="data.formGroup.get('profiles').hasError('backendError')">
{{data.formGroup.get('profiles').getError('backendError').message}}</mat-error> {{data.formGroup.get('profiles').getError('backendError').message}}</mat-error>

36
dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.ts
View File

@ -1,5 +1,5 @@
import { Component, Inject } from '@angular/core'; import { Component, Inject } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { DmpService } from '@app/core/services/dmp/dmp.service'; import { DmpService } from '@app/core/services/dmp/dmp.service';
import { map, takeUntil } from 'rxjs/operators'; import { map, takeUntil } from 'rxjs/operators';
import { DmpModel } from '@app/core/model/dmp/dmp'; import { DmpModel } from '@app/core/model/dmp/dmp';
@ -11,13 +11,15 @@ import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile';
import { DataTableRequest } from '@app/core/model/data-table/data-table-request'; import { DataTableRequest } from '@app/core/model/data-table/data-table-request';
import { DatasetProfileCriteria } from '@app/core/query/dataset-profile/dataset-profile-criteria'; import { DatasetProfileCriteria } from '@app/core/query/dataset-profile/dataset-profile-criteria';
import { AvailableProfilesComponent } from '../../editor/available-profiles/available-profiles.component'; import { AvailableProfilesComponent } from '../../editor/available-profiles/available-profiles.component';
import { DatasetPreviewDialogComponent } from '../../dataset-preview/dataset-preview-dialog.component';
import { BaseComponent } from '@common/base/base.component';
@Component({ @Component({
selector: 'app-clone-dialog', selector: 'app-clone-dialog',
templateUrl: './clone-dialog.component.html', templateUrl: './clone-dialog.component.html',
styleUrls: ['./clone-dialog.component.scss'] styleUrls: ['./clone-dialog.component.scss']
}) })
export class CloneDialogComponent { export class CloneDialogComponent extends BaseComponent {
agreePrivacyPolicyNames = false; agreePrivacyPolicyNames = false;
initialItems = []; initialItems = [];
@ -25,9 +27,12 @@ export class CloneDialogComponent {
constructor( constructor(
public dialogRef: MatDialogRef<CloneDialogComponent>, public dialogRef: MatDialogRef<CloneDialogComponent>,
private dialog: MatDialog,
private dmpService: DmpService, private dmpService: DmpService,
@Inject(MAT_DIALOG_DATA) public data: any @Inject(MAT_DIALOG_DATA) public data: any
) { ) {
super();
this.selectionChanged(this.initialItems) this.selectionChanged(this.initialItems)
this.profilesAutoCompleteConfiguration = { this.profilesAutoCompleteConfiguration = {
@ -78,4 +83,31 @@ export class CloneDialogComponent {
return this.dmpService.searchDMPProfiles(request); return this.dmpService.searchDMPProfiles(request);
} }
onPreviewTemplate(event) {
const dialogRef = this.dialog.open(DatasetPreviewDialogComponent, {
width: '590px',
minHeight: '200px',
restoreFocus: false,
data: {
template: event
},
panelClass: 'custom-modalbox'
});
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
if (result) {
let profiles = this.data.formGroup.get('profiles').value;
profiles.push(event);
this.data.formGroup.get('profiles').setValue(profiles);
this.profilesAutoCompleteConfiguration = {
filterFn: this.filterProfiles.bind(this),
initialItems: (excludedItems: any[]) => this.filterProfiles('').pipe(map(result => result.filter(resultItem => (excludedItems || []).map(x => x.id).indexOf(resultItem.id) === -1))),
displayFn: (item) => item['label'],
titleFn: (item) => item['label'],
subtitleFn: (item) => item['description'],
popupItemActionIcon: 'visibility'
};
}
});
}
} }

6
dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.html
View File

@ -31,17 +31,17 @@
</div> </div>
<div class="upload-form col-sm-12 col-md-12"> <div class="upload-form col-sm-12 col-md-12">
<mat-form-field> <mat-form-field>
<app-multiple-auto-complete required='true' [(ngModel)]="dmpProfiles" placeholder="{{'DMP-EDITOR.FIELDS.DATASET-TEMPLATES' | translate}}" [configuration]="profilesAutoCompleteConfiguration"> <app-multiple-auto-complete required='true' [(ngModel)]="dmpProfiles" placeholder="{{'DMP-EDITOR.FIELDS.DATASET-TEMPLATES' | translate}}" [configuration]="profilesAutoCompleteConfiguration" (optionActionClicked)="onPreviewTemplate($event)">
</app-multiple-auto-complete> </app-multiple-auto-complete>
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
<div class="row mt-3"> <div class="row mt-3">
<div class="col-auto ml-auto"> <div class="col-auto ml-auto">
<button mat-button type="button" class="cancel-btn" (click)="confirm()" [disabled]="data.fileList.length === 0">{{'DMP-UPLOAD.ACTIONS.IMPORT' | translate}}</button> <button mat-button type="button" class="cancel-btn" (click)="cancel()">{{'DMP-UPLOAD.ACTIONS.CANCEL' | translate}}</button>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<button mat-button type="button" class="next-btn" (click)="cancel()">{{'DMP-UPLOAD.ACTIONS.CANCEL' | translate}}</button> <button mat-button type="button" (click)="confirm()" [disabled]="data.fileList.length === 0" [ngClass]="{'next-btn-disabled': data.fileList.length === 0, 'next-btn': data.fileList.length !== 0}">{{'DMP-UPLOAD.ACTIONS.IMPORT' | translate}}</button>
</div> </div>
</div> </div>
</div> </div>

14
dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.scss
View File

@ -46,6 +46,20 @@
font-weight: 500; font-weight: 500;
} }
.next-btn-disabled {
width: 100px;
height: 43px;
background: #ffffff 0% 0% no-repeat padding-box;
border: 1px solid #b5b5b5;
border-radius: 30px;
opacity: 1;
}
.next-btn:hover {
background: #129d99;
color: #ffffff;
}
.attach-btn { .attach-btn {
top: -20px; top: -20px;
} }

41
dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts
View File

@ -1,19 +1,21 @@
import { Component, Inject } from '@angular/core'; import { Component, Inject } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { DmpService } from '../../../../core/services/dmp/dmp.service'; import { DmpService } from '../../../../core/services/dmp/dmp.service';
import { MultipleAutoCompleteConfiguration } from '@app/library/auto-complete/multiple/multiple-auto-complete-configuration'; import { MultipleAutoCompleteConfiguration } from '@app/library/auto-complete/multiple/multiple-auto-complete-configuration';
import { map } from 'rxjs/operators'; import { map, takeUntil } from 'rxjs/operators';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile'; import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile';
import { DataTableRequest } from '@app/core/model/data-table/data-table-request'; import { DataTableRequest } from '@app/core/model/data-table/data-table-request';
import { DatasetProfileCriteria } from '@app/core/query/dataset-profile/dataset-profile-criteria'; import { DatasetProfileCriteria } from '@app/core/query/dataset-profile/dataset-profile-criteria';
import { DatasetPreviewDialogComponent } from '../../dataset-preview/dataset-preview-dialog.component';
import { BaseComponent } from '@common/base/base.component';
@Component({ @Component({
selector: 'dmp-upload-dialogue', selector: 'dmp-upload-dialogue',
templateUrl: './dmp-upload-dialogue.component.html', templateUrl: './dmp-upload-dialogue.component.html',
styleUrls: ['./dmp-upload-dialogue.component.scss'] styleUrls: ['./dmp-upload-dialogue.component.scss']
}) })
export class DmpUploadDialogue { export class DmpUploadDialogue extends BaseComponent {
dmpTitle: string; dmpTitle: string;
dmpProfiles: any[] = []; dmpProfiles: any[] = [];
files: File[] = []; files: File[] = [];
@ -31,8 +33,11 @@ export class DmpUploadDialogue {
constructor( constructor(
public dialogRef: MatDialogRef<DmpUploadDialogue>, public dialogRef: MatDialogRef<DmpUploadDialogue>,
private _service: DmpService, private _service: DmpService,
private dialog: MatDialog,
@Inject(MAT_DIALOG_DATA) public data: any, @Inject(MAT_DIALOG_DATA) public data: any,
) { } ) {
super();
}
cancel() { cancel() {
this.data.success = false; this.data.success = false;
@ -79,6 +84,34 @@ export class DmpUploadDialogue {
this.dmpTitle = null; this.dmpTitle = null;
} }
onPreviewTemplate(event) {
const dialogRef = this.dialog.open(DatasetPreviewDialogComponent, {
width: '590px',
minHeight: '200px',
restoreFocus: false,
data: {
template: event
},
panelClass: 'custom-modalbox'
});
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
if (result) {
if(!this.dmpProfiles) {
this.dmpProfiles = [];
}
this.dmpProfiles.push(event);
this.profilesAutoCompleteConfiguration = {
filterFn: this.filterProfiles.bind(this),
initialItems: (excludedItems: any[]) => this.filterProfiles('').pipe(map(result => result.filter(resultItem => (excludedItems || []).map(x => x.id).indexOf(resultItem.id) === -1))),
displayFn: (item) => item['label'],
titleFn: (item) => item['label'],
subtitleFn: (item) => item['description'],
popupItemActionIcon: 'visibility'
};
}
});
}
filterProfiles(value: string): Observable<DatasetProfileModel[]> { filterProfiles(value: string): Observable<DatasetProfileModel[]> {
const request = new DataTableRequest<DatasetProfileCriteria>(null, null, { fields: ['+label'] }); const request = new DataTableRequest<DatasetProfileCriteria>(null, null, { fields: ['+label'] });
const criteria = new DatasetProfileCriteria(); const criteria = new DatasetProfileCriteria();

107
dmp-frontend/src/app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component.scss
View File

@ -1,96 +1,101 @@
::ng-deep .mat-dialog-container { ::ng-deep .mat-dialog-container {
border-radius: 8px; border-radius: 8px;
} }
.form-container { .form-container {
width: 33rem; width: 33rem;
min-height: 14rem; min-height: 14rem;
padding: 0.28rem 0.34rem 0rem 0.625rem; padding: 0.28rem 0.34rem 0rem 0.625rem;
} }
.logo { .logo {
width: 8.44rem; width: 8.44rem;
} }
.close-icon { .close-icon {
cursor: pointer; cursor: pointer;
} }
.content { .content {
margin: 2.17rem 0rem 1.1875rem 0rem; margin: 2.17rem 0rem 1.1875rem 0rem;
} }
.title, .title,
.text { .text {
font-size: 1.25rem; font-size: 1.25rem;
font-weight: lighter; font-weight: lighter;
color: #000000; color: #000000;
opacity: 0.8; opacity: 0.8;
} }
.title { .title {
text-align: left; text-align: left;
font-weight: 500; font-weight: 500;
font-size: 1.25rem; font-size: 1.25rem;
letter-spacing: 0px; letter-spacing: 0px;
color: #212121; color: #212121;
opacity: 1; opacity: 1;
} }
.text { .text {
margin-bottom: 2.9375rem; margin-bottom: 2.9375rem;
line-height: 1.9rem; line-height: 1.9rem;
} }
.cancel-btn { .cancel-btn {
background: #ffffff 0% 0% no-repeat padding-box; background: #ffffff 0% 0% no-repeat padding-box;
border: 1px solid #b5b5b5; border: 1px solid #b5b5b5;
border-radius: 30px; border-radius: 30px;
width: 101px; width: 101px;
height: 43px; height: 43px;
color: #212121; color: #212121;
font-weight: 500; font-weight: 500;
} }
.next-btn { .next-btn {
background: #ffffff 0% 0% no-repeat padding-box; background: #ffffff 0% 0% no-repeat padding-box;
border: 1px solid #129d99; border: 1px solid #129d99;
border-radius: 30px; border-radius: 30px;
opacity: 1; opacity: 1;
width: 101px; width: 101px;
height: 43px; height: 43px;
color: #129d99; color: #129d99;
font-weight: 500; font-weight: 500;
}
.next-btn:hover {
background-color: #129d99;
color: white;
} }
.disabled-btn { .disabled-btn {
border: 1px solid #b5b5b5; border: 1px solid #b5b5b5;
border-radius: 30px; border-radius: 30px;
opacity: 1; opacity: 1;
width: 101px; width: 101px;
height: 43px; height: 43px;
color: #b5b5b5; color: #b5b5b5;
font-weight: 500; font-weight: 500;
} }
.actions { .actions {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
.new-dmp { .new-dmp {
text-align: left; text-align: left;
text-decoration: underline; text-decoration: underline;
letter-spacing: 0px; letter-spacing: 0px;
color: #008887; color: #008887;
cursor: pointer; cursor: pointer;
} }
::ng-deep .dmp-form .mat-form-field-appearance-outline .mat-form-field-outline { ::ng-deep .dmp-form .mat-form-field-appearance-outline .mat-form-field-outline {
background: #fafafa !important; background: #fafafa !important;
} }
::ng-deep .dmp-form .mat-form-field-appearance-outline .mat-form-field-infix { ::ng-deep .dmp-form .mat-form-field-appearance-outline .mat-form-field-infix {
font-size: 1rem; font-size: 1rem;
padding: 0.6em 0 1em 0 !important; padding: 0.6em 0 1em 0 !important;
} }

6
dmp-frontend/src/app/ui/dmp/start-new-dmp-dialogue/start-new-dmp-dialog.component.html
View File

@ -7,14 +7,12 @@
<h1 mat-dialog-title class="title">{{'NAV-BAR.START-NEW-DMP' | translate}}</h1> <h1 mat-dialog-title class="title">{{'NAV-BAR.START-NEW-DMP' | translate}}</h1>
<p class="text">{{'NAV-BAR.START-NEW-DMP-TXT' | translate}}</p> <p class="text">{{'NAV-BAR.START-NEW-DMP-TXT' | translate}}</p>
<div class="actions"> <div class="actions">
<button type="button" class="normal-btn upload-btn d-flex flex-row align-items-center" <button type="button" class="normal-btn upload-btn d-flex flex-row align-items-center" (click)="uploadFile($event)">
(click)="uploadFile($event)">
<mat-icon class="pr-2">file_upload</mat-icon> <mat-icon class="pr-2">file_upload</mat-icon>
{{ 'NAV-BAR.IMPORT-FROM-FILE' | translate }} {{ 'NAV-BAR.IMPORT-FROM-FILE' | translate }}
</button> </button>
<p class="m-0">{{ 'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.OR' | translate }}</p> <p class="m-0">{{ 'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.OR' | translate }}</p>
<button type="button" class="normal-btn font-weight-bold d-flex flex-row align-items-center" <button type="button" class="normal-btn font-weight-bold d-flex flex-row align-items-center" (click)="startWizard()">
(click)="startWizard()">
<mat-icon>chevron_right</mat-icon> <mat-icon>chevron_right</mat-icon>
{{ 'NAV-BAR.START-WIZARD' | translate }} {{ 'NAV-BAR.START-WIZARD' | translate }}
</button> </button>