mirror of
https://github.com/Alfresco/alfresco-content-app.git
synced 2025-05-12 17:04:46 +00:00
Remove dialog effects (#3972)
* remove dialog effects * remove dialog effects
This commit is contained in:
parent
d9a0ce7964
commit
1222bf7411
@ -59,7 +59,7 @@ module.exports = () => {
|
|||||||
global: {
|
global: {
|
||||||
statements: 75,
|
statements: 75,
|
||||||
branches: 65,
|
branches: 65,
|
||||||
functions: 71,
|
functions: 70,
|
||||||
lines: 74
|
lines: 74
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -36,14 +36,7 @@ import { SearchQueryBuilderService, SharedLinksApiService, UploadService, FileUp
|
|||||||
import { OverlayContainer } from '@angular/cdk/overlay';
|
import { OverlayContainer } from '@angular/cdk/overlay';
|
||||||
import { ActivatedRoute, ActivationEnd, NavigationStart, Router } from '@angular/router';
|
import { ActivatedRoute, ActivationEnd, NavigationStart, Router } from '@angular/router';
|
||||||
import { filter, map } from 'rxjs/operators';
|
import { filter, map } from 'rxjs/operators';
|
||||||
import {
|
import { AppStore, SetCurrentUrlAction, SetRepositoryInfoAction, SetUserProfileAction, ResetSelectionAction } from '@alfresco/aca-shared/store';
|
||||||
AppStore,
|
|
||||||
CloseModalDialogsAction,
|
|
||||||
SetCurrentUrlAction,
|
|
||||||
SetRepositoryInfoAction,
|
|
||||||
SetUserProfileAction,
|
|
||||||
ResetSelectionAction
|
|
||||||
} from '@alfresco/aca-shared/store';
|
|
||||||
import { ContentApiService } from './content-api.service';
|
import { ContentApiService } from './content-api.service';
|
||||||
import { RouterExtensionService } from './router.extension.service';
|
import { RouterExtensionService } from './router.extension.service';
|
||||||
import { Store } from '@ngrx/store';
|
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 { ShellAppService } from '@alfresco/adf-core/shell';
|
||||||
import { AppSettingsService } from './app-settings.service';
|
import { AppSettingsService } from './app-settings.service';
|
||||||
import { UserProfileService } from './user-profile.service';
|
import { UserProfileService } from './user-profile.service';
|
||||||
|
import { MatDialog } from '@angular/material/dialog';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
@ -59,6 +53,7 @@ import { UserProfileService } from './user-profile.service';
|
|||||||
// After moving shell to ADF to core, AppService will implement ShellAppService
|
// After moving shell to ADF to core, AppService will implement ShellAppService
|
||||||
export class AppService implements ShellAppService, OnDestroy {
|
export class AppService implements ShellAppService, OnDestroy {
|
||||||
private notificationService = inject(NotificationService);
|
private notificationService = inject(NotificationService);
|
||||||
|
private matDialog = inject(MatDialog);
|
||||||
private ready: BehaviorSubject<boolean>;
|
private ready: BehaviorSubject<boolean>;
|
||||||
|
|
||||||
ready$: Observable<boolean>;
|
ready$: Observable<boolean>;
|
||||||
@ -136,7 +131,7 @@ export class AppService implements ShellAppService, OnDestroy {
|
|||||||
this.alfrescoApiService.getInstance().on('error', (error: { status: number; response: any }) => {
|
this.alfrescoApiService.getInstance().on('error', (error: { status: number; response: any }) => {
|
||||||
if (error.status === 401 && !this.alfrescoApiService.isExcludedErrorListener(error?.response?.req?.url)) {
|
if (error.status === 401 && !this.alfrescoApiService.isExcludedErrorListener(error?.response?.req?.url)) {
|
||||||
if (!this.authenticationService.isLoggedIn()) {
|
if (!this.authenticationService.isLoggedIn()) {
|
||||||
this.store.dispatch(new CloseModalDialogsAction());
|
this.matDialog.closeAll();
|
||||||
|
|
||||||
let redirectUrl = this.activatedRoute.snapshot.queryParams['redirectUrl'];
|
let redirectUrl = this.activatedRoute.snapshot.queryParams['redirectUrl'];
|
||||||
if (!redirectUrl) {
|
if (!redirectUrl) {
|
||||||
|
@ -77,10 +77,6 @@ export class SetInfoDrawerStateAction implements Action {
|
|||||||
constructor(public payload: boolean) {}
|
constructor(public payload: boolean) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class CloseModalDialogsAction implements Action {
|
|
||||||
readonly type = AppActionTypes.CloseModalDialogs;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class SetRepositoryInfoAction implements Action {
|
export class SetRepositoryInfoAction implements Action {
|
||||||
readonly type = AppActionTypes.SetRepositoryInfo;
|
readonly type = AppActionTypes.SetRepositoryInfo;
|
||||||
|
|
||||||
|
@ -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 <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
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<CloseModalDialogsAction>(AppActionTypes.CloseModalDialogs),
|
|
||||||
map(() => this.matDialog.closeAll())
|
|
||||||
),
|
|
||||||
{ dispatch: false }
|
|
||||||
);
|
|
||||||
}
|
|
@ -38,7 +38,6 @@ export * from './actions/metadata-aspect.actions';
|
|||||||
export * from './actions/template.actions';
|
export * from './actions/template.actions';
|
||||||
export * from './actions/contextmenu.actions';
|
export * from './actions/contextmenu.actions';
|
||||||
|
|
||||||
export * from './effects/dialog.effects';
|
|
||||||
export * from './effects/router.effects';
|
export * from './effects/router.effects';
|
||||||
export * from './effects/snackbar.effects';
|
export * from './effects/snackbar.effects';
|
||||||
|
|
||||||
|
@ -25,10 +25,9 @@
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { EffectsModule } from '@ngrx/effects';
|
import { EffectsModule } from '@ngrx/effects';
|
||||||
import { SnackbarEffects } from './effects/snackbar.effects';
|
import { SnackbarEffects } from './effects/snackbar.effects';
|
||||||
import { DialogEffects } from './effects/dialog.effects';
|
|
||||||
import { RouterEffects } from './effects/router.effects';
|
import { RouterEffects } from './effects/router.effects';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [EffectsModule.forFeature([SnackbarEffects, DialogEffects, RouterEffects])]
|
imports: [EffectsModule.forFeature([SnackbarEffects, RouterEffects])]
|
||||||
})
|
})
|
||||||
export class SharedStoreModule {}
|
export class SharedStoreModule {}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user