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

Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot.git into Development

This commit is contained in:
George Kalampokis 2020-10-29 11:54:28 +02:00
parent c1d473f8d4 a926d933e3
commit d77fefc7c5
23 changed files with 49 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
View File

@ -46,7 +46,7 @@
</a> </a>
<div class="dataset-card-actions"> <div class="dataset-card-actions">
<a class="col-auto border-right pointer" [matMenuTriggerFor]="exportMenu"><span class="material-icons icon-align pr-2">open_in_new</span>{{'DATASET-LISTING.ACTIONS.EXPORT' | translate}}</a> <a class="col-auto border-right pointer" [matMenuTriggerFor]="exportMenu"><span class="material-icons icon-align pr-2">open_in_new</span>{{'DATASET-LISTING.ACTIONS.EXPORT' | translate}}</a>
<a class="col-auto border-right pointer" (click)="openShareDialog(activity.dmpId, activity.dmp)"><span class="material-icons icon-align pr-2">group_add</span>{{'DATASET-LISTING.ACTIONS.INVITE-COLLABORATORS' | translate}}</a> <a class="col-auto border-right pointer" (click)="openShareDialog(activity.dmpId, activity.dmp)"><span class="material-icons icon-align pr-2">group_add</span>{{'DATASET-LISTING.ACTIONS.INVITE-SHORT' | translate}}</a>
<a class="col-auto pointer" [matMenuTriggerFor]="actionsMenu"><span class="material-icons icon-align pl-2">more_horiz</span></a> <a class="col-auto pointer" [matMenuTriggerFor]="actionsMenu"><span class="material-icons icon-align pl-2">more_horiz</span></a>
<!-- <a class="col-auto" [matMenuTriggerFor]="actionsMenu" *ngIf="!publicMode"><span class="material-icons icon-align pl-2">more_horiz</span></a> --> <!-- <a class="col-auto" [matMenuTriggerFor]="actionsMenu" *ngIf="!publicMode"><span class="material-icons icon-align pl-2">more_horiz</span></a> -->
</div> </div>

1
dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts
View File

@ -209,6 +209,7 @@ export class DraftsComponent extends BaseComponent implements OnInit {
const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
// height: '250px', // height: '250px',
// width: '700px', // width: '700px',
autoFocus: false,
restoreFocus: false, restoreFocus: false,
data: { data: {
dmpId: dmpRowId, dmpId: dmpRowId,

2
dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
View File

@ -125,7 +125,7 @@
</a> </a>
<div class="dataset-card-actions"> <div class="dataset-card-actions">
<a class="col-auto border-right pointer" [matMenuTriggerFor]="exportMenu"><span class="material-icons icon-align pr-2">open_in_new</span>{{'DATASET-LISTING.ACTIONS.EXPORT' | translate}}</a> <a class="col-auto border-right pointer" [matMenuTriggerFor]="exportMenu"><span class="material-icons icon-align pr-2">open_in_new</span>{{'DATASET-LISTING.ACTIONS.EXPORT' | translate}}</a>
<a class="col-auto border-right pointer" (click)="openShareDialog(getDmpId(activity), getDmp(activity))"><span class="material-icons icon-align pr-2">group_add</span>{{'DATASET-LISTING.ACTIONS.INVITE-COLLABORATORS' | translate}}</a> <a class="col-auto border-right pointer" (click)="openShareDialog(getDmpId(activity), getDmp(activity))"><span class="material-icons icon-align pr-2">group_add</span>{{'DATASET-LISTING.ACTIONS.INVITE-SHORT' | translate}}</a>
<a class="col-auto pointer" [matMenuTriggerFor]="actionsMenu"><span class="material-icons icon-align pl-2">more_horiz</span></a> <a class="col-auto pointer" [matMenuTriggerFor]="actionsMenu"><span class="material-icons icon-align pl-2">more_horiz</span></a>
<!-- <a class="col-auto" [matMenuTriggerFor]="actionsMenu" *ngIf="!publicMode"><span class="material-icons icon-align pl-2">more_horiz</span></a> --> <!-- <a class="col-auto" [matMenuTriggerFor]="actionsMenu" *ngIf="!publicMode"><span class="material-icons icon-align pl-2">more_horiz</span></a> -->
</div> </div>

1
dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
View File

@ -285,6 +285,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
// height: '250px', // height: '250px',
// width: '700px', // width: '700px',
autoFocus: false,
restoreFocus: false, restoreFocus: false,
data: { data: {
dmpId: rowId, dmpId: rowId,

2
dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html
View File

@ -49,7 +49,7 @@
</a> </a>
<div class="dataset-card-actions"> <div class="dataset-card-actions">
<a class="col-auto border-right pointer" [matMenuTriggerFor]="exportMenu"><span class="material-icons icon-align pr-2">open_in_new</span>{{'DATASET-LISTING.ACTIONS.EXPORT' | translate}}</a> <a class="col-auto border-right pointer" [matMenuTriggerFor]="exportMenu"><span class="material-icons icon-align pr-2">open_in_new</span>{{'DATASET-LISTING.ACTIONS.EXPORT' | translate}}</a>
<a class="col-auto border-right pointer" *ngIf="isUserOwner(activity)" (click)="openShareDialog(activity.dmpId, activity.dmp)"><span class="material-icons icon-align pr-2">group_add</span>{{'DATASET-LISTING.ACTIONS.INVITE-COLLABORATORS' | translate}}</a> <a class="col-auto border-right pointer" *ngIf="isUserOwner(activity)" (click)="openShareDialog(activity.dmpId, activity.dmp)"><span class="material-icons icon-align pr-2">group_add</span>{{'DATASET-LISTING.ACTIONS.INVITE-SHORT' | translate}}</a>
<a *ngIf="this.isAuthenticated()" class="col-auto pointer" [matMenuTriggerFor]="actionsMenu"><span class="material-icons icon-align pl-2">more_horiz</span></a> <a *ngIf="this.isAuthenticated()" class="col-auto pointer" [matMenuTriggerFor]="actionsMenu"><span class="material-icons icon-align pl-2">more_horiz</span></a>
<!-- <a class="col-auto" [matMenuTriggerFor]="actionsMenu" *ngIf="!publicMode"><span class="material-icons icon-align pl-2">more_horiz</span></a> --> <!-- <a class="col-auto" [matMenuTriggerFor]="actionsMenu" *ngIf="!publicMode"><span class="material-icons icon-align pl-2">more_horiz</span></a> -->
</div> </div>

1
dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts
View File

@ -262,6 +262,7 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen
const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
// height: '250px', // height: '250px',
// width: '700px', // width: '700px',
autoFocus: false,
restoreFocus: false, restoreFocus: false,
data: { data: {
dmpId: dmpRowId, dmpId: dmpRowId,

1
dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts
View File

@ -266,6 +266,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
// height: '250px', // height: '250px',
// width: '700px', // width: '700px',
autoFocus: false,
restoreFocus: false, restoreFocus: false,
data: { data: {
dmpId: rowId, dmpId: rowId,

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

@ -26,7 +26,7 @@
</a> </a>
<div class="dataset-card-actions"> <div class="dataset-card-actions">
<a class="col-auto border-right pointer" [matMenuTriggerFor]="exportMenu"><span class="material-icons icon-align pr-2">open_in_new</span>{{'DATASET-LISTING.ACTIONS.EXPORT' | translate}}</a> <a class="col-auto border-right pointer" [matMenuTriggerFor]="exportMenu"><span class="material-icons icon-align pr-2">open_in_new</span>{{'DATASET-LISTING.ACTIONS.EXPORT' | translate}}</a>
<a class="col-auto border-right pointer" *ngIf="isUserOwner" (click)="openShareDialog(dataset.dmpId, dataset.dmp)"><span class="material-icons icon-align pr-2">group_add</span>{{'DATASET-LISTING.ACTIONS.INVITE-COLLABORATORS' | translate}}</a> <a class="col-auto border-right pointer" *ngIf="isUserOwner" (click)="openShareDialog(dataset.dmpId, dataset.dmp)"><span class="material-icons icon-align pr-2">group_add</span>{{'DATASET-LISTING.ACTIONS.INVITE-SHORT' | translate}}</a>
<a *ngIf="this.isAuthenticated()" class="col-auto pointer" [matMenuTriggerFor]="actionsMenu"><span class="material-icons icon-align pl-2">more_horiz</span></a> <a *ngIf="this.isAuthenticated()" class="col-auto pointer" [matMenuTriggerFor]="actionsMenu"><span class="material-icons icon-align pl-2">more_horiz</span></a>
<!-- <a class="col-auto" [matMenuTriggerFor]="actionsMenu" *ngIf="!publicMode"><span class="material-icons icon-align pl-2">more_horiz</span></a> --> <!-- <a class="col-auto" [matMenuTriggerFor]="actionsMenu" *ngIf="!publicMode"><span class="material-icons icon-align pl-2">more_horiz</span></a> -->
</div> </div>

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

@ -142,6 +142,7 @@ export class DatasetListingItemComponent extends BaseComponent implements OnInit
const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
// height: '250px', // height: '250px',
// width: '700px', // width: '700px',
autoFocus: false,
restoreFocus: false, restoreFocus: false,
data: { data: {
dmpId: dmpRowId, dmpId: dmpRowId,

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

@ -215,6 +215,7 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
openShareDialog(rowId: any, rowName: any) { openShareDialog(rowId: any, rowName: any) {
const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
autoFocus: false,
restoreFocus: false, restoreFocus: false,
data: { data: {
dmpId: rowId, dmpId: rowId,

3
dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts
View File

@ -37,6 +37,7 @@ export class PeopleTabComponent implements OnInit {
const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
// height: '250px', // height: '250px',
// width: '700px', // width: '700px',
autoFocus: false,
data: { data: {
dmpId: rowId, dmpId: rowId,
dmpName: rowName dmpName: rowName
@ -86,5 +87,5 @@ export class PeopleTabComponent implements OnInit {
})); }));
} }
}); });
} }
} }

12
dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.html
View File

@ -7,10 +7,8 @@
<h1 mat-dialog-title class="title">{{'DMP-LISTING.ACTIONS.INVITE-AUTHORS' | translate}}</h1> <h1 mat-dialog-title class="title">{{'DMP-LISTING.ACTIONS.INVITE-AUTHORS' | translate}}</h1>
</div> </div>
<div mat-dialog-content class="row content"> <div mat-dialog-content class="row content">
<mat-form-field class="col pt-0 pb-2 mb-4 search" appearance="standard"> <mat-form-field class="col pt-0 pb-2 mb-4 search">
<app-multiple-auto-complete [formControl]="formGroup.get('users')" <app-multiple-auto-complete [formControl]="formGroup.get('users')" placeholder="{{'INVITATION-EDITOR.AUTOCOMPLETE-USER-EMAIL' | translate}}" [configuration]="usersAutoCompleteConfiguration">
placeholder="{{'INVITATION-EDITOR.AUTOCOMPLETE-USER-EMAIL' | translate}}"
[configuration]="usersAutoCompleteConfiguration">
</app-multiple-auto-complete> </app-multiple-auto-complete>
</mat-form-field> </mat-form-field>
<p class="d-flex m-0 hint"> <p class="d-flex m-0 hint">
@ -20,10 +18,10 @@
<div class="col-12 d-flex justify-content-end align-items-center row m-0 pt-1 pb-1"> <div class="col-12 d-flex justify-content-end align-items-center row m-0 pt-1 pb-1">
<mat-form-field class="select-role"> <mat-form-field class="select-role">
<mat-select [formControl]="formGroup.get('role')"> <mat-select [formControl]="formGroup.get('role')">
<mat-option [value]="roles.Owner">{{enumUtils.toRoleString(roles.Owner)}}</mat-option> <mat-option [value]="roles.Owner">{{enumUtils.toRoleString(roles.Owner)}}</mat-option>
<mat-option [value]="roles.Member">{{enumUtils.toRoleString(roles.Member)}}</mat-option> <mat-option [value]="roles.Member">{{enumUtils.toRoleString(roles.Member)}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<button mat-raised-button *ngIf="hasValue()" (click)="send()" type="button" class="invite-btn mt-2">{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}}</button> <button mat-raised-button *ngIf="hasValue()" (click)="send()" type="button" class="invite-btn mt-2">{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}}</button>
<button mat-raised-button *ngIf="!hasValue()" type="button" class="invite-btn-disabled mt-2">{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}}</button> <button mat-raised-button *ngIf="!hasValue()" type="button" class="invite-btn-disabled mt-2">{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}}</button>
</div> </div>

32
dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss
View File

@ -22,11 +22,11 @@
padding: 0px; padding: 0px;
} }
.mat-form-field { // .mat-form-field {
background: #fafafa; // background: #fafafa;
border: 1px solid #d1d1d1; // border: 1px solid #d1d1d1;
border-radius: 4px; // border-radius: 4px;
} // }
.hint { .hint {
font-size: 0.875rem; font-size: 0.875rem;
@ -45,18 +45,18 @@
::ng-deep .search { ::ng-deep .search {
.mat-form-field-infix { .mat-form-field-infix {
border: none; font-size: 1rem;
padding: 14px; padding: 0.6em 0 1em 0 !important;
}
.mat-form-field-underline {
display: none;
}
.mat-form-field-flex {
padding: 0em;
}
.align-arrow-right {
display: none;
} }
// .mat-form-field-underline {
// display: none;
// }
// .mat-form-field-flex {
// padding: 0em;
// }
// .align-arrow-right {
// display: none;
// }
} }
.select-role { .select-role {

1
dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
View File

@ -347,6 +347,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
openShareDialog(rowId: any, rowName: any) { openShareDialog(rowId: any, rowName: any) {
const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
autoFocus: false,
data: { data: {
dmpId: rowId, dmpId: rowId,
dmpName: rowName dmpName: rowName

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

@ -80,6 +80,7 @@ export class DmpListingItemComponent extends BaseComponent implements OnInit {
const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
// height: '250px', // height: '250px',
// width: '700px', // width: '700px',
autoFocus: false,
restoreFocus: false, restoreFocus: false,
data: { data: {
dmpId: rowId, dmpId: rowId,

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

@ -647,6 +647,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
// height: '250px', // height: '250px',
// width: '700px', // width: '700px',
autoFocus: false,
restoreFocus: false, restoreFocus: false,
data: { data: {
dmpId: rowId, dmpId: rowId,

2
dmp-frontend/src/app/ui/user-profile/user-profile.component.scss
View File

@ -246,7 +246,7 @@
transform: scale(0.35); transform: scale(0.35);
width: 200px; width: 200px;
height: 80px; height: 80px;
margin-left: -50px; margin-left: -57px;
} }
} }

3
dmp-frontend/src/assets/i18n/de.json
View File

@ -658,7 +658,8 @@
"NEW": "Neue Datensatzbeschreibung", "NEW": "Neue Datensatzbeschreibung",
"CREATE-NEW": "Neue Datensatzbeschreibung erstellen", "CREATE-NEW": "Neue Datensatzbeschreibung erstellen",
"EXPORT": "Export", "EXPORT": "Export",
"INVITE-COLLABORATORS": "Invite collaborators" "INVITE-COLLABORATORS": "Invite collaborators",
"INVITE-SHORT": "Invite"
}, },
"STATES": { "STATES": {
"EDITED": "Edited", "EDITED": "Edited",

3
dmp-frontend/src/assets/i18n/en.json
View File

@ -658,7 +658,8 @@
"NEW": "New Dataset", "NEW": "New Dataset",
"CREATE-NEW": "Create new Dataset", "CREATE-NEW": "Create new Dataset",
"EXPORT": "Export", "EXPORT": "Export",
"INVITE-COLLABORATORS": "Invite collaborators" "INVITE-COLLABORATORS": "Invite collaborators",
"INVITE-SHORT": "Invite"
}, },
"STATES": { "STATES": {
"EDITED": "Edited", "EDITED": "Edited",

3
dmp-frontend/src/assets/i18n/es.json
View File

@ -658,7 +658,8 @@
"NEW": "Nueva descripción del dataset", "NEW": "Nueva descripción del dataset",
"CREATE-NEW": "Crear una nueva descripción del dataset", "CREATE-NEW": "Crear una nueva descripción del dataset",
"EXPORT": "Exportar", "EXPORT": "Exportar",
"INVITE-COLLABORATORS": "Invitar colaboradores" "INVITE-COLLABORATORS": "Invitar colaboradores",
"INVITE-SHORT": "Invite"
}, },
"STATES": { "STATES": {
"EDITED": "Edited", "EDITED": "Edited",

3
dmp-frontend/src/assets/i18n/gr.json
View File

@ -658,7 +658,8 @@
"NEW": "Νέα Περιγραφή Συνόλου Δεδομένων", "NEW": "Νέα Περιγραφή Συνόλου Δεδομένων",
"CREATE-NEW": "Δημιουργία νέας Περιγραφής Συνόλου Δεδομένων", "CREATE-NEW": "Δημιουργία νέας Περιγραφής Συνόλου Δεδομένων",
"EXPORT": "Εξαγωγή", "EXPORT": "Εξαγωγή",
"INVITE-COLLABORATORS": "Προσκάλεσε συνεργάτες" "INVITE-COLLABORATORS": "Προσκάλεσε συνεργάτες",
"INVITE-SHORT": "Invite"
}, },
"STATES": { "STATES": {
"EDITED": "Σε επεξεργασία", "EDITED": "Σε επεξεργασία",

3
dmp-frontend/src/assets/i18n/sk.json
View File

@ -658,7 +658,8 @@
"NEW": "Nový súbor dát", "NEW": "Nový súbor dát",
"CREATE-NEW": "Vytvoriť nový súbor dát", "CREATE-NEW": "Vytvoriť nový súbor dát",
"EXPORT": "Exportovať", "EXPORT": "Exportovať",
"INVITE-COLLABORATORS": "Pozvať spolupracovníkov" "INVITE-COLLABORATORS": "Pozvať spolupracovníkov",
"INVITE-SHORT": "Invite"
}, },
"STATES": { "STATES": {
"EDITED": "Upravený", "EDITED": "Upravený",

3
dmp-frontend/src/assets/i18n/tr.json
View File

@ -658,7 +658,8 @@
"NEW": "Yeni Veri Seti Tanımı", "NEW": "Yeni Veri Seti Tanımı",
"CREATE-NEW": "Yeni Veri Seti Tanımı Oluştur", "CREATE-NEW": "Yeni Veri Seti Tanımı Oluştur",
"EXPORT": "Dışarı Aktar", "EXPORT": "Dışarı Aktar",
"INVITE-COLLABORATORS": "Çalışma Arkadaşlarını Dahil Et " "INVITE-COLLABORATORS": "Çalışma Arkadaşlarını Dahil Et ",
"INVITE-SHORT": "Invite"
}, },
"STATES": { "STATES": {
"EDITED": "Düzeltildi", "EDITED": "Düzeltildi",