From 1222bf7411804db7cc051b477085b3db8411c6a3 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Thu, 25 Jul 2024 12:21:46 -0400 Subject: [PATCH] Remove dialog effects (#3972) * remove dialog effects * remove dialog effects --- karma.conf.js | 2 +- .../src/lib/services/app.service.ts | 13 ++---- .../store/src/actions/app.actions.ts | 4 -- .../store/src/effects/dialog.effects.ts | 44 ------------------- projects/aca-shared/store/src/public-api.ts | 1 - projects/aca-shared/store/src/store.module.ts | 3 +- 6 files changed, 6 insertions(+), 61 deletions(-) delete mode 100644 projects/aca-shared/store/src/effects/dialog.effects.ts diff --git a/karma.conf.js b/karma.conf.js index 99002e4f87..3c66cb3d86 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -59,7 +59,7 @@ module.exports = () => { global: { statements: 75, branches: 65, - functions: 71, + functions: 70, lines: 74 } } diff --git a/projects/aca-shared/src/lib/services/app.service.ts b/projects/aca-shared/src/lib/services/app.service.ts index b2eeecebd0..23141e94aa 100644 --- a/projects/aca-shared/src/lib/services/app.service.ts +++ b/projects/aca-shared/src/lib/services/app.service.ts @@ -36,14 +36,7 @@ import { SearchQueryBuilderService, SharedLinksApiService, UploadService, FileUp import { OverlayContainer } from '@angular/cdk/overlay'; import { ActivatedRoute, ActivationEnd, NavigationStart, Router } from '@angular/router'; import { filter, map } from 'rxjs/operators'; -import { - AppStore, - CloseModalDialogsAction, - SetCurrentUrlAction, - SetRepositoryInfoAction, - SetUserProfileAction, - ResetSelectionAction -} from '@alfresco/aca-shared/store'; +import { AppStore, SetCurrentUrlAction, SetRepositoryInfoAction, SetUserProfileAction, ResetSelectionAction } from '@alfresco/aca-shared/store'; import { ContentApiService } from './content-api.service'; import { RouterExtensionService } from './router.extension.service'; import { Store } from '@ngrx/store'; @@ -52,6 +45,7 @@ import { AcaMobileAppSwitcherService } from './aca-mobile-app-switcher.service'; import { ShellAppService } from '@alfresco/adf-core/shell'; import { AppSettingsService } from './app-settings.service'; import { UserProfileService } from './user-profile.service'; +import { MatDialog } from '@angular/material/dialog'; @Injectable({ providedIn: 'root' @@ -59,6 +53,7 @@ import { UserProfileService } from './user-profile.service'; // After moving shell to ADF to core, AppService will implement ShellAppService export class AppService implements ShellAppService, OnDestroy { private notificationService = inject(NotificationService); + private matDialog = inject(MatDialog); private ready: BehaviorSubject; ready$: Observable; @@ -136,7 +131,7 @@ export class AppService implements ShellAppService, OnDestroy { this.alfrescoApiService.getInstance().on('error', (error: { status: number; response: any }) => { if (error.status === 401 && !this.alfrescoApiService.isExcludedErrorListener(error?.response?.req?.url)) { if (!this.authenticationService.isLoggedIn()) { - this.store.dispatch(new CloseModalDialogsAction()); + this.matDialog.closeAll(); let redirectUrl = this.activatedRoute.snapshot.queryParams['redirectUrl']; if (!redirectUrl) { diff --git a/projects/aca-shared/store/src/actions/app.actions.ts b/projects/aca-shared/store/src/actions/app.actions.ts index 22cc211a92..7a2c73f5e1 100644 --- a/projects/aca-shared/store/src/actions/app.actions.ts +++ b/projects/aca-shared/store/src/actions/app.actions.ts @@ -77,10 +77,6 @@ export class SetInfoDrawerStateAction implements Action { constructor(public payload: boolean) {} } -export class CloseModalDialogsAction implements Action { - readonly type = AppActionTypes.CloseModalDialogs; -} - export class SetRepositoryInfoAction implements Action { readonly type = AppActionTypes.SetRepositoryInfo; diff --git a/projects/aca-shared/store/src/effects/dialog.effects.ts b/projects/aca-shared/store/src/effects/dialog.effects.ts deleted file mode 100644 index 1af7169a66..0000000000 --- a/projects/aca-shared/store/src/effects/dialog.effects.ts +++ /dev/null @@ -1,44 +0,0 @@ -/*! - * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved. - * - * Alfresco Example Content Application - * - * This file is part of the Alfresco Example Content Application. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * The Alfresco Example Content Application is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * The Alfresco Example Content Application is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * from Hyland Software. If not, see . - */ - -import { Actions, ofType, createEffect } from '@ngrx/effects'; -import { Injectable } from '@angular/core'; -import { map } from 'rxjs/operators'; -import { MatDialog } from '@angular/material/dialog'; -import { CloseModalDialogsAction } from '../actions/app.actions'; -import { AppActionTypes } from '../actions/app-action-types'; - -@Injectable() -export class DialogEffects { - constructor(private actions$: Actions, private matDialog: MatDialog) {} - - closeAll$ = createEffect( - () => - this.actions$.pipe( - ofType(AppActionTypes.CloseModalDialogs), - map(() => this.matDialog.closeAll()) - ), - { dispatch: false } - ); -} diff --git a/projects/aca-shared/store/src/public-api.ts b/projects/aca-shared/store/src/public-api.ts index aab93f1ca5..98961ec534 100644 --- a/projects/aca-shared/store/src/public-api.ts +++ b/projects/aca-shared/store/src/public-api.ts @@ -38,7 +38,6 @@ export * from './actions/metadata-aspect.actions'; export * from './actions/template.actions'; export * from './actions/contextmenu.actions'; -export * from './effects/dialog.effects'; export * from './effects/router.effects'; export * from './effects/snackbar.effects'; diff --git a/projects/aca-shared/store/src/store.module.ts b/projects/aca-shared/store/src/store.module.ts index 169269f9b6..dcc3e9ed17 100644 --- a/projects/aca-shared/store/src/store.module.ts +++ b/projects/aca-shared/store/src/store.module.ts @@ -25,10 +25,9 @@ import { NgModule } from '@angular/core'; import { EffectsModule } from '@ngrx/effects'; import { SnackbarEffects } from './effects/snackbar.effects'; -import { DialogEffects } from './effects/dialog.effects'; import { RouterEffects } from './effects/router.effects'; @NgModule({ - imports: [EffectsModule.forFeature([SnackbarEffects, DialogEffects, RouterEffects])] + imports: [EffectsModule.forFeature([SnackbarEffects, RouterEffects])] }) export class SharedStoreModule {}