Removes auto open of autocomplete panel on invitation dialog open, replace 'invite collaborators" with "invite
This commit is contained in:
parent
2f28e0c8ac
commit
a926d933e3
|
@ -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>
|
||||||
|
|
|
@ -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,
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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,
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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,
|
||||||
|
|
|
@ -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,
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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,
|
||||||
|
|
|
@ -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,
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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">
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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,
|
||||||
|
|
|
@ -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,
|
||||||
|
|
Loading…
Reference in New Issue