From 586e6c2f6454988e65c61e1647b1ff982862f23b Mon Sep 17 00:00:00 2001 From: apapachristou Date: Fri, 27 Sep 2019 11:09:29 +0300 Subject: [PATCH] Removes focus of button that opens dialog after close it. --- .../dataset-profile-editor.component.ts | 1 + .../criteria/dataset-profile.component.ts | 1 + .../dmp-profile-criteria.component.ts | 1 + .../recent-edited-activity.component.ts | 1 + .../dataset-create-wizard.component.ts | 1 + .../dataset-wizard.component.ts | 4 ++++ ...et-external-references-editor.component.ts | 20 ++++++++----------- .../app/ui/dmp/editor/dmp-editor.component.ts | 3 +++ .../dmp-listing-item.component.ts | 1 + .../ui/dmp/overview/dmp-overview.component.ts | 4 +++- .../ui/grant/editor/grant-editor.component.ts | 1 + .../quick-wizard-editor.component.ts | 2 ++ 12 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts index 00840c555..2683c5384 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts @@ -248,6 +248,7 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn public delete(): void { if (this.datasetProfileId && !this.isNew) { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts index 162937600..ff1ffd11b 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts @@ -49,6 +49,7 @@ export class DatasetProfileCriteriaComponent extends BaseCriteriaComponent imple openDialog(): void { const dialogRef = this.dialog.open(DialodConfirmationUploadDatasetProfiles, { + restoreFocus: false, data: { message: this.language.instant('DATASET-WIZARD.UPLOAD.UPLOAD-XML-FILE-TITLE'), confirmButton: this.language.instant('DATASET-WIZARD.UPLOAD.UPLOAD-XML'), diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts index ee81e6432..def43eae6 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts @@ -55,6 +55,7 @@ export class DmpProfileCriteriaComponent extends BaseCriteriaComponent implement openDialog(): void { const dialogRef = this.dialog.open(DialodConfirmationUploadDmpProfiles, { + restoreFocus: false, data: { message: this.language.instant('DMP-PROFILE-LISTING.UPLOAD.UPLOAD-XML-FILE-TITLE'), confirmButton: this.language.instant('DMP-PROFILE-LISTING.UPLOAD.UPLOAD-XML'), diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts index 0f53c85a7..c50e079d4 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts @@ -67,6 +67,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn deleteClicked(dmp: DmpListingModel) { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '300px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.DELETE'), diff --git a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts index fb2d1dd29..8a233b321 100644 --- a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts @@ -82,6 +82,7 @@ export class DatasetCreateWizard extends CheckDeactivateBaseComponent implements saveFinalize() { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '300px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.FINALIZE-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts index 51d46b635..2001fab15 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts @@ -457,6 +457,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr saveFinalize() { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.FINALIZE-ITEM'), confirmButton: this.language.instant('QUICKWIZARD.SAVE-DIALOG.ACTIONS.AFFIRMATIVE'), @@ -599,6 +600,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr openConfirm(dmpLabel, id): void { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '300px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.DELETE'), @@ -621,6 +623,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr openDmpSearchDialogue() { const formControl = new FormControl(); const dialogRef = this.dialog.open(DatasetCopyDialogueComponent, { + restoreFocus: false, data: { formControl: formControl, datasetId: this.formGroup.value.id, @@ -652,6 +655,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr openUpdateDatasetProfileDialogue() { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { + restoreFocus: false, data: { message: this.language.instant('DATASET-EDITOR.VERSION-DIALOG.QUESTION'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts index a3c3f31c9..c4be05b57 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts @@ -142,9 +142,8 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl addDataRepository() { const dialogRef = this.dialog.open(DatasetExternalDataRepositoryDialogEditorComponent, { - data: { - - } + restoreFocus: false, + data: {} }); dialogRef.afterClosed() .pipe(takeUntil(this._destroyed)) @@ -157,9 +156,8 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl addRegistry() { const dialogRef = this.dialog.open(DatasetExternalRegistryDialogEditorComponent, { - data: { - - } + restoreFocus: false, + data: {} }); dialogRef.afterClosed() .pipe(takeUntil(this._destroyed)) @@ -172,9 +170,8 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl addExternalDataset() { const dialogRef = this.dialog.open(DatasetExternalDatasetDialogEditorComponent, { - data: { - - } + restoreFocus: false, + data: {} }); dialogRef.afterClosed() .pipe(takeUntil(this._destroyed)) @@ -187,9 +184,8 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl addService() { const dialogRef = this.dialog.open(DatasetExternalServiceDialogEditorComponent, { - data: { - - } + restoreFocus: false, + data: {} }); dialogRef.afterClosed() .pipe(takeUntil(this._destroyed)) diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts index b82dc6e9e..a02769c44 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts @@ -291,6 +291,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC public delete(): void { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '300px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.DELETE'), @@ -424,6 +425,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC addDatasetOpenDialog(id: String) { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '500px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ADD-DATASET'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), @@ -452,6 +454,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC const dialogRef = this.dialog.open(DmpFinalizeDialogComponent, { maxWidth: '500px', + restoreFocus: false, data: { dialogInputModel: dialogInputModel, message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.FINALIZE-ITEM'), diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts index d0bd76246..ebcda0318 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts @@ -57,6 +57,7 @@ export class DmpListingItemComponent implements OnInit { const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { // height: '250px', // width: '700px', + restoreFocus: false, data: { dmpId: rowId, dmpName: rowName diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts index 703c8e437..2f8f48f1c 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts @@ -17,7 +17,6 @@ import { AuthService } from '../../../core/services/auth/auth.service'; import { DmpService } from '../../../core/services/dmp/dmp.service'; import { SnackBarNotificationLevel, UiNotificationService } from '../../../core/services/notification/ui-notification-service'; import { ConfirmationDialogComponent } from '../../../library/confirmation-dialog/confirmation-dialog.component'; -import { ExportMethodDialogComponent } from '../../../library/export-method-dialog/export-method-dialog.component'; import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item'; import { DmpFinalizeDialogComponent, DmpFinalizeDialogInput, DmpFinalizeDialogOutput } from '../editor/dmp-finalize-dialog/dmp-finalize-dialog.component'; import { DatasetsToBeFinalized } from '../../../core/model/dataset/datasets-toBeFinalized'; @@ -253,6 +252,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { getDoi(dmp: DmpOverviewModel) { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '600px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ZENODO-DOI'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), @@ -289,6 +289,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { publish(dmpId: String) { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '300px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.PUBLISH-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), @@ -317,6 +318,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { const dialogRef = this.dialog.open(DmpFinalizeDialogComponent, { maxWidth: '500px', + restoreFocus: false, data: { dialogInputModel: dialogInputModel, message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.FINALIZE-ITEM'), diff --git a/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts b/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts index 04358f8b7..baaafb63d 100644 --- a/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts +++ b/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts @@ -142,6 +142,7 @@ export class GrantEditorComponent extends BaseComponent implements OnInit, IBrea public delete(): void { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '300px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts index e686e9644..8c755bb9d 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts @@ -108,6 +108,7 @@ export class QuickWizardEditorComponent extends CheckDeactivateBaseComponent imp const dialogRef = this.dialog.open(DmpFinalizeDialogComponent, { maxWidth: '500px', + restoreFocus: false, data: { dialogInputModel: dialogInputModel, confirmButton: this.language.instant('DMP-FINALISE-DIALOG.SUBMIT'), @@ -162,6 +163,7 @@ export class QuickWizardEditorComponent extends CheckDeactivateBaseComponent imp onSubmitSave(): void { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { + restoreFocus: false, data: { message: this.language.instant('QUICKWIZARD.SAVE-DIALOG.TITLE'), confirmButton: this.language.instant('QUICKWIZARD.SAVE-DIALOG.ACTIONS.AFFIRMATIVE'),