inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-05-12 17:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

reload active doclist via NgRx actions (#978)

Browse Source 
* doclist reload action and effect

* deprecate folderEdited event

* deprecate "favoriteToggle" event

* deprecate "favoriteRemoved" event

* update docs

* unified reload function

* deprecate "nodesRestored" event

* deprecate "nodesPurged" event

* test fixes

* deprecate "nodesMoved" event

* reduce the use of "nodesDeleted"
This commit is contained in:
Denys Vuika 2019-02-27 13:45:55 +00:00 committed by GitHub
parent 0b5555d2fc
commit a25385049d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 89 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/extending/application-actions.md
View File

@ -117,3 +117,4 @@ Below is the list of public actions types you can use in the plugin definitions
| PRINT_FILE | MinimalNodeEntity | Print the file opened in the Viewer (or selected). |
| FULLSCREEN_VIEWER | n/a | Enters fullscreen mode to view the file opened in the Viewer. |
| LOGOUT | n/a | Log out and redirect to Login screen. |
| RELOAD_DOCUMENT_LIST | n/a | Reload active document list |

39
src/app/components/favorites/favorites.component.spec.ts
View File

@ -35,7 +35,6 @@ import {
AppConfigPipe
} from '@alfresco/adf-core';
import { DocumentListComponent } from '@alfresco/adf-content-services';
import { ContentManagementService } from '../../services/content-management.service';
import { of } from 'rxjs';
import { FavoritesComponent } from './favorites.component';
import { AppTestingModule } from '../../testing/app-testing.module';
@ -45,7 +44,6 @@ describe('FavoritesComponent', () => {
let fixture: ComponentFixture<FavoritesComponent>;
let component: FavoritesComponent;
let alfrescoApi: AlfrescoApiService;
let contentService: ContentManagementService;
let contentApi: ContentApiService;
let router: Router;
let page;
@ -97,42 +95,9 @@ describe('FavoritesComponent', () => {
);
contentApi = TestBed.get(ContentApiService);
contentService = TestBed.get(ContentManagementService);
router = TestBed.get(Router);
});
describe('Events', () => {
beforeEach(() => {
spyOn(component, 'reload');
fixture.detectChanges();
});
it('should refresh on editing folder event', () => {
contentService.folderEdited.next(null);
expect(component.reload).toHaveBeenCalled();
});
it('should refresh on move node event', () => {
contentService.nodesMoved.next(null);
expect(component.reload).toHaveBeenCalled();
});
it('should refresh on node deleted event', () => {
contentService.nodesDeleted.next(null);
expect(component.reload).toHaveBeenCalled();
});
it('should refresh on node restore event', () => {
contentService.nodesRestored.next(null);
expect(component.reload).toHaveBeenCalled();
});
});
describe('Node navigation', () => {
beforeEach(() => {
spyOn(contentApi, 'getNode').and.returnValue(of({ entry: node }));
@ -173,12 +138,12 @@ describe('FavoritesComponent', () => {
describe('refresh', () => {
it('should call document list reload', () => {
spyOn(component.documentList, 'reload');
spyOn(component, 'reload');
fixture.detectChanges();
component.reload();
expect(component.documentList.reload).toHaveBeenCalled();
expect(component.reload).toHaveBeenCalled();
});
});
});

9
src/app/components/favorites/favorites.component.ts
View File

@ -65,13 +65,6 @@ export class FavoritesComponent extends PageComponent implements OnInit {
super.ngOnInit();
this.subscriptions = this.subscriptions.concat([
this.content.nodesDeleted.subscribe(() => this.reload()),
this.content.nodesRestored.subscribe(() => this.reload()),
this.content.folderEdited.subscribe(() => this.reload()),
this.content.nodesMoved.subscribe(() => this.reload()),
this.content.favoriteRemoved.subscribe(() => this.reload()),
this.content.favoriteToggle.subscribe(() => this.reload()),
this.content.favoriteToggle.subscribe(() => this.reload()),
this.uploadService.fileUploadComplete
.pipe(debounceTime(300))
.subscribe(file => this.onFileUploadedEvent(file)),
@ -125,6 +118,6 @@ export class FavoritesComponent extends PageComponent implements OnInit {
}
private onFileUploadedEvent(event: FileUploadEvent) {
this.documentList.reload();
this.reload();
}
}

47
src/app/components/files/files.component.spec.ts
View File

@ -41,7 +41,6 @@ import {
AppConfigPipe
} from '@alfresco/adf-core';
import { DocumentListComponent } from '@alfresco/adf-content-services';
import { ContentManagementService } from '../../services/content-management.service';
import { NodeActionsService } from '../../services/node-actions.service';
import { FilesComponent } from './files.component';
import { AppTestingModule } from '../../testing/app-testing.module';
@ -52,7 +51,6 @@ describe('FilesComponent', () => {
let node;
let fixture: ComponentFixture<FilesComponent>;
let component: FilesComponent;
let contentManagementService: ContentManagementService;
let uploadService: UploadService;
let router: Router;
let nodeActionsService: NodeActionsService;
@ -86,7 +84,6 @@ describe('FilesComponent', () => {
fixture = TestBed.createComponent(FilesComponent);
component = fixture.componentInstance;
contentManagementService = TestBed.get(ContentManagementService);
uploadService = TestBed.get(UploadService);
router = TestBed.get(Router);
nodeActionsService = TestBed.get(NodeActionsService);
@ -145,7 +142,7 @@ describe('FilesComponent', () => {
describe('refresh on events', () => {
beforeEach(() => {
spyOn(contentApi, 'getNode').and.returnValue(of({ entry: node }));
spyOn(component.documentList, 'reload');
spyOn(component, 'reload');
fixture.detectChanges();
});
@ -160,7 +157,7 @@ describe('FilesComponent', () => {
nodeActionsService.contentCopied.next(nodes);
expect(component.documentList.reload).toHaveBeenCalled();
expect(component.reload).toHaveBeenCalled();
});
it('should not call refresh onContentCopied event when parent mismatch', () => {
@ -173,37 +170,7 @@ describe('FilesComponent', () => {
nodeActionsService.contentCopied.next(nodes);
expect(component.documentList.reload).not.toHaveBeenCalled();
});
it('should call refresh onCreateFolder event', () => {
contentManagementService.folderCreated.next();
expect(component.documentList.reload).toHaveBeenCalled();
});
it('should call refresh editFolder event', () => {
contentManagementService.folderEdited.next();
expect(component.documentList.reload).toHaveBeenCalled();
});
it('should call refresh deleteNode event', () => {
contentManagementService.nodesDeleted.next();
expect(component.documentList.reload).toHaveBeenCalled();
});
it('should call refresh moveNode event', () => {
contentManagementService.nodesMoved.next();
expect(component.documentList.reload).toHaveBeenCalled();
});
it('should call refresh restoreNode event', () => {
contentManagementService.nodesRestored.next();
expect(component.documentList.reload).toHaveBeenCalled();
expect(component.reload).not.toHaveBeenCalled();
});
it('should call refresh on fileUploadComplete event if parent node match', fakeAsync(() => {
@ -214,7 +181,7 @@ describe('FilesComponent', () => {
tick(500);
expect(component.documentList.reload).toHaveBeenCalled();
expect(component.reload).toHaveBeenCalled();
}));
it('should not call refresh on fileUploadComplete event if parent mismatch', fakeAsync(() => {
@ -225,7 +192,7 @@ describe('FilesComponent', () => {
tick(500);
expect(component.documentList.reload).not.toHaveBeenCalled();
expect(component.reload).not.toHaveBeenCalled();
}));
it('should call refresh on fileUploadDeleted event if parent node match', fakeAsync(() => {
@ -236,7 +203,7 @@ describe('FilesComponent', () => {
tick(500);
expect(component.documentList.reload).toHaveBeenCalled();
expect(component.reload).toHaveBeenCalled();
}));
it('should not call refresh on fileUploadDeleted event if parent mismatch', fakeAsync(() => {
@ -247,7 +214,7 @@ describe('FilesComponent', () => {
tick(500);
expect(component.documentList.reload).not.toHaveBeenCalled();
expect(component.reload).not.toHaveBeenCalled();
}));
});

13
src/app/components/files/files.component.ts
View File

@ -73,7 +73,7 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
ngOnInit() {
super.ngOnInit();
const { route, content, nodeActionsService, uploadService } = this;
const { route, nodeActionsService, uploadService } = this;
const { data } = route.snapshot;
this.title = data.title;
@ -101,11 +101,6 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
nodeActionsService.contentCopied.subscribe(nodes =>
this.onContentCopied(nodes)
),
content.folderCreated.subscribe(() => this.documentList.reload()),
content.folderEdited.subscribe(() => this.documentList.reload()),
content.nodesDeleted.subscribe(() => this.documentList.reload()),
content.nodesMoved.subscribe(() => this.documentList.reload()),
content.nodesRestored.subscribe(() => this.documentList.reload()),
uploadService.fileUploadComplete
.pipe(debounceTime(300))
.subscribe(file => this.onFileUploadedEvent(file)),
@ -178,7 +173,7 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
// check root and child nodes
if (node && node.entry && node.entry.parentId === this.getParentNodeId()) {
this.documentList.reload();
this.reload();
return;
}
@ -215,7 +210,7 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
if (alreadyDisplayedParentFolder) {
return;
}
this.documentList.reload();
this.reload();
}
onContentCopied(nodes: MinimalNodeEntity[]) {
@ -225,7 +220,7 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
);
});
if (newNode) {
this.documentList.reload();
this.reload();
}
}

8
src/app/components/page.component.ts
View File

@ -35,7 +35,7 @@ import { Observable, Subject, Subscription } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import { AppExtensionService } from '../extensions/extension.service';
import { ContentManagementService } from '../services/content-management.service';
import { SetSelectedNodesAction, ViewFileAction } from '../store/actions';
import { ViewFileAction, ReloadDocumentListAction } from '../store/actions';
import {
appSelection,
currentFolder,
@ -128,11 +128,7 @@ export abstract class PageComponent implements OnInit, OnDestroy {
}
reload(): void {
if (this.documentList) {
this.documentList.resetSelection();
this.store.dispatch(new SetSelectedNodesAction([]));
this.documentList.reload();
}
this.store.dispatch(new ReloadDocumentListAction());
}
trackByActionId(index: number, action: ContentActionRef) {

38
src/app/components/recent-files/recent-files.component.spec.ts
View File

@ -34,8 +34,6 @@ import {
AppConfigPipe
} from '@alfresco/adf-core';
import { DocumentListComponent } from '@alfresco/adf-content-services';
import { ContentManagementService } from '../../services/content-management.service';
import { RecentFilesComponent } from './recent-files.component';
import { AppTestingModule } from '../../testing/app-testing.module';
@ -43,7 +41,6 @@ describe('RecentFilesComponent', () => {
let fixture: ComponentFixture<RecentFilesComponent>;
let component: RecentFilesComponent;
let alfrescoApi: AlfrescoApiService;
let contentService: ContentManagementService;
let page;
beforeEach(() => {
@ -73,7 +70,6 @@ describe('RecentFilesComponent', () => {
fixture = TestBed.createComponent(RecentFilesComponent);
component = fixture.componentInstance;
contentService = TestBed.get(ContentManagementService);
alfrescoApi = TestBed.get(AlfrescoApiService);
alfrescoApi.reset();
@ -88,44 +84,14 @@ describe('RecentFilesComponent', () => {
);
});
describe('OnInit()', () => {
beforeEach(() => {
spyOn(component, 'reload').and.stub();
});
it('should reload nodes on onDeleteNode event', () => {
fixture.detectChanges();
contentService.nodesDeleted.next();
expect(component.reload).toHaveBeenCalled();
});
it('should reload on onRestoreNode event', () => {
fixture.detectChanges();
contentService.nodesRestored.next();
expect(component.reload).toHaveBeenCalled();
});
it('should reload on move node event', () => {
fixture.detectChanges();
contentService.nodesMoved.next();
expect(component.reload).toHaveBeenCalled();
});
});
describe('refresh', () => {
it('should call document list reload', () => {
spyOn(component.documentList, 'reload');
spyOn(component, 'reload');
fixture.detectChanges();
component.reload();
expect(component.documentList.reload).toHaveBeenCalled();
expect(component.reload).toHaveBeenCalled();
});
});
});

14
src/app/components/recent-files/recent-files.component.ts
View File

@ -31,7 +31,7 @@ import { PageComponent } from '../page.component';
import { Store } from '@ngrx/store';
import { AppStore } from '../../store/states/app.state';
import { AppExtensionService } from '../../extensions/extension.service';
import { FileUploadEvent, UploadService } from '@alfresco/adf-core';
import { UploadService } from '@alfresco/adf-core';
import { debounceTime } from 'rxjs/operators';
@Component({
@ -56,16 +56,12 @@ export class RecentFilesComponent extends PageComponent implements OnInit {
super.ngOnInit();
this.subscriptions = this.subscriptions.concat([
this.content.nodesDeleted.subscribe(() => this.reload()),
this.content.nodesMoved.subscribe(() => this.reload()),
this.content.nodesRestored.subscribe(() => this.reload()),
this.uploadService.fileUploadComplete
.pipe(debounceTime(300))
.subscribe(file => this.onFileUploadedEvent(file)),
.subscribe(() => this.onFileUploadedEvent()),
this.uploadService.fileUploadDeleted
.pipe(debounceTime(300))
.subscribe(file => this.onFileUploadedEvent(file)),
.subscribe(() => this.onFileUploadedEvent()),
this.breakpointObserver
.observe([Breakpoints.HandsetPortrait, Breakpoints.HandsetLandscape])
@ -83,7 +79,7 @@ export class RecentFilesComponent extends PageComponent implements OnInit {
}
}
private onFileUploadedEvent(event: FileUploadEvent) {
this.documentList.reload();
private onFileUploadedEvent() {
this.reload();
}
}

37
src/app/components/shared-files/shared-files.component.spec.ts
View File

@ -34,14 +34,12 @@ import {
AppConfigPipe
} from '@alfresco/adf-core';
import { DocumentListComponent } from '@alfresco/adf-content-services';
import { ContentManagementService } from '../../services/content-management.service';
import { SharedFilesComponent } from './shared-files.component';
import { AppTestingModule } from '../../testing/app-testing.module';
describe('SharedFilesComponent', () => {
let fixture: ComponentFixture<SharedFilesComponent>;
let component: SharedFilesComponent;
let contentService: ContentManagementService;
let alfrescoApi: AlfrescoApiService;
let page;
@ -72,7 +70,6 @@ describe('SharedFilesComponent', () => {
fixture = TestBed.createComponent(SharedFilesComponent);
component = fixture.componentInstance;
contentService = TestBed.get(ContentManagementService);
alfrescoApi = TestBed.get(AlfrescoApiService);
alfrescoApi.reset();
@ -81,44 +78,14 @@ describe('SharedFilesComponent', () => {
);
});
describe('OnInit', () => {
beforeEach(() => {
spyOn(component, 'reload').and.callFake(val => val);
});
it('should refresh on deleteNode event', () => {
fixture.detectChanges();
contentService.nodesDeleted.next();
expect(component.reload).toHaveBeenCalled();
});
it('should refresh on restoreNode event', () => {
fixture.detectChanges();
contentService.nodesRestored.next();
expect(component.reload).toHaveBeenCalled();
});
it('should reload on move node event', () => {
fixture.detectChanges();
contentService.nodesMoved.next();
expect(component.reload).toHaveBeenCalled();
});
});
describe('refresh', () => {
it('should call document list reload', () => {
spyOn(component.documentList, 'reload');
spyOn(component, 'reload');
fixture.detectChanges();
component.reload();
expect(component.documentList.reload).toHaveBeenCalled();
expect(component.reload).toHaveBeenCalled();
});
});
});

3
src/app/components/shared-files/shared-files.component.ts
View File

@ -55,9 +55,6 @@ export class SharedFilesComponent extends PageComponent implements OnInit {
super.ngOnInit();
this.subscriptions = this.subscriptions.concat([
this.content.nodesDeleted.subscribe(() => this.reload()),
this.content.nodesMoved.subscribe(() => this.reload()),
this.content.nodesRestored.subscribe(() => this.reload()),
this.content.linksUnshared
.pipe(debounceTime(300))
.subscribe(() => this.reload()),

9
src/app/components/toolbar/toggle-favorite/toggle-favorite.component.ts
View File

@ -29,7 +29,7 @@ import { AppStore } from '../../../store/states';
import { appSelection } from '../../../store/selectors/app.selectors';
import { Observable } from 'rxjs';
import { SelectionState } from '@alfresco/adf-extensions';
import { ContentManagementService } from '../../../services/content-management.service';
import { ReloadDocumentListAction } from '../../../store/actions';
@Component({
selector: 'app-toggle-favorite',
@ -51,14 +51,11 @@ import { ContentManagementService } from '../../../services/content-management.s
export class ToggleFavoriteComponent {
selection$: Observable<SelectionState>;
constructor(
private store: Store<AppStore>,
private content: ContentManagementService
) {
constructor(private store: Store<AppStore>) {
this.selection$ = this.store.select(appSelection);
}
onToggleEvent() {
this.content.favoriteToggle.next();
this.store.dispatch(new ReloadDocumentListAction());
}
}

33
src/app/components/trashcan/trashcan.component.spec.ts
View File

@ -33,7 +33,6 @@ import {
AppConfigPipe
} from '@alfresco/adf-core';
import { DocumentListComponent } from '@alfresco/adf-content-services';
import { ContentManagementService } from '../../services/content-management.service';
import { TrashcanComponent } from './trashcan.component';
import { AppTestingModule } from '../../testing/app-testing.module';
@ -41,7 +40,6 @@ describe('TrashcanComponent', () => {
let fixture: ComponentFixture<TrashcanComponent>;
let component: TrashcanComponent;
let alfrescoApi: AlfrescoApiService;
let contentService: ContentManagementService;
let page;
beforeEach(() => {
@ -73,7 +71,6 @@ describe('TrashcanComponent', () => {
alfrescoApi = TestBed.get(AlfrescoApiService);
alfrescoApi.reset();
contentService = TestBed.get(ContentManagementService);
component.documentList = <any>{
reload: jasmine.createSpy('reload'),
@ -86,34 +83,4 @@ describe('TrashcanComponent', () => {
Promise.resolve(page)
);
});
it('should reload on nodes purged', () => {
component.ngOnInit();
spyOn(component, 'reload').and.stub();
contentService.nodesPurged.next({});
expect(component.reload).toHaveBeenCalled();
});
describe('onRestoreNode()', () => {
it('should call refresh()', () => {
spyOn(component, 'reload');
fixture.detectChanges();
contentService.nodesRestored.next();
expect(component.reload).toHaveBeenCalled();
});
});
describe('refresh()', () => {
it('calls child component to reload', () => {
component.reload();
expect(component.documentList.reload).toHaveBeenCalled();
});
it('calls child component to reset selection', () => {
component.reload();
expect(component.documentList.resetSelection).toHaveBeenCalled();
});
});
});

3
src/app/components/trashcan/trashcan.component.ts
View File

@ -57,9 +57,6 @@ export class TrashcanComponent extends PageComponent implements OnInit {
super.ngOnInit();
this.subscriptions.push(
this.content.nodesRestored.subscribe(() => this.reload()),
this.content.nodesPurged.subscribe(() => this.reload()),
this.breakpointObserver
.observe([Breakpoints.HandsetPortrait, Breakpoints.HandsetLandscape])
.subscribe(result => {

28
src/app/directives/document-list.directive.ts
View File

@ -27,23 +27,27 @@ import { Directive, OnDestroy, OnInit, HostListener } from '@angular/core';
import { DocumentListComponent } from '@alfresco/adf-content-services';
import { ActivatedRoute, Router } from '@angular/router';
import { UserPreferencesService } from '@alfresco/adf-core';
import { Subscription } from 'rxjs';
import { Subject } from 'rxjs';
import { Store } from '@ngrx/store';
import { SetSelectedNodesAction } from '../store/actions';
import { takeUntil } from 'rxjs/operators';
import { ContentManagementService } from '../services/content-management.service';
@Directive({
selector: '[acaDocumentList]'
})
export class DocumentListDirective implements OnInit, OnDestroy {
private subscriptions: Subscription[] = [];
private isLibrary = false;
onDestroy$ = new Subject<boolean>();
get sortingPreferenceKey(): string {
return this.route.snapshot.data.sortingPreferenceKey;
}
constructor(
private store: Store<any>,
private content: ContentManagementService,
private documentList: DocumentListComponent,
private preferences: UserPreferencesService,
private route: ActivatedRoute,
@ -75,14 +79,18 @@ export class DocumentListDirective implements OnInit, OnDestroy {
this.documentList.data.setSorting({ key, direction });
}
this.subscriptions.push(
this.documentList.ready.subscribe(() => this.onReady())
);
this.documentList.ready
.pipe(takeUntil(this.onDestroy$))
.subscribe(() => this.onReady());
this.content.reload.pipe(takeUntil(this.onDestroy$)).subscribe(() => {
this.reload();
});
}
ngOnDestroy() {
this.subscriptions.forEach(subscription => subscription.unsubscribe());
this.subscriptions = [];
this.onDestroy$.next(true);
this.onDestroy$.complete();
}
@HostListener('sorting-changed', ['$event'])
@ -123,4 +131,10 @@ export class DocumentListDirective implements OnInit, OnDestroy {
this.store.dispatch(new SetSelectedNodesAction(selection));
}
private reload() {
this.documentList.resetSelection();
this.store.dispatch(new SetSelectedNodesAction([]));
this.documentList.reload();
}
}

33
src/app/services/content-management.service.spec.ts
View File

@ -1265,39 +1265,6 @@ describe('ContentManagementService', () => {
).toBe(true);
}));
describe('refresh()', () => {
it('dispatch event on finish', fakeAsync(done => {
spyOn(contentApi, 'restoreNode').and.returnValue(of({}));
spyOn(contentApi, 'getDeletedNodes').and.returnValue(
of({
list: { entries: [] }
})
);
const path = {
elements: [
{
id: '1-1',
name: 'somewhere-over-the-rainbow'
}
]
};
const selection = [
<any>{
entry: {
id: '1',
path
}
}
];
store.dispatch(new RestoreDeletedNodesAction(selection));
contentManagementService.nodesRestored.subscribe(() => done());
}));
});
describe('notification', () => {
beforeEach(() => {
spyOn(contentApi, 'getDeletedNodes').and.returnValue(

38
src/app/services/content-management.service.ts
View File

@ -40,7 +40,8 @@ import {
NavigateToParentFolder,
SnackbarUserAction,
UndoDeleteNodesAction,
SetSelectedNodesAction
SetSelectedNodesAction,
ReloadDocumentListAction
} from '../store/actions';
import { Store } from '@ngrx/store';
import { AppStore } from '../store/states';
@ -76,12 +77,8 @@ interface RestoredNode {
providedIn: 'root'
})
export class ContentManagementService {
nodesMoved = new Subject<any>();
reload = new Subject<any>();
nodesDeleted = new Subject<any>();
nodesPurged = new Subject<any>();
nodesRestored = new Subject<any>();
folderEdited = new Subject<any>();
folderCreated = new Subject<any>();
libraryDeleted = new Subject<string>();
libraryCreated = new Subject<SiteEntry>();
libraryUpdated = new Subject<SiteEntry>();
@ -90,9 +87,6 @@ export class ContentManagementService {
library400Error = new Subject<any>();
joinLibraryToggle = new Subject<string>();
linksUnshared = new Subject<any>();
favoriteAdded = new Subject<Array<MinimalNodeEntity>>();
favoriteRemoved = new Subject<Array<MinimalNodeEntity>>();
favoriteToggle = new Subject<Array<MinimalNodeEntity>>();
favoriteLibraryToggle = new Subject<any>();
constructor(
@ -113,8 +107,7 @@ export class ContentManagementService {
node.entry.isFavorite = true;
});
this.store.dispatch(new SetSelectedNodesAction(nodes));
this.favoriteAdded.next(nodes);
this.favoriteToggle.next(nodes);
this.store.dispatch(new ReloadDocumentListAction());
});
}
}
@ -126,8 +119,7 @@ export class ContentManagementService {
node.entry.isFavorite = false;
});
this.store.dispatch(new SetSelectedNodesAction(nodes));
this.favoriteRemoved.next(nodes);
this.favoriteToggle.next(nodes);
this.store.dispatch(new ReloadDocumentListAction());
});
}
}
@ -246,7 +238,7 @@ export class ContentManagementService {
dialogInstance.afterClosed().subscribe(node => {
if (node) {
this.folderCreated.next(node);
this.store.dispatch(new ReloadDocumentListAction());
}
});
}
@ -267,9 +259,9 @@ export class ContentManagementService {
this.store.dispatch(new SnackbarErrorAction(message));
});
dialog.afterClosed().subscribe((node: MinimalNodeEntryEntity) => {
dialog.afterClosed().subscribe(node => {
if (node) {
this.folderEdited.next(node);
this.store.dispatch(new ReloadDocumentListAction());
}
});
}
@ -420,7 +412,7 @@ export class ContentManagementService {
const failedStatus = this.processStatus([]);
failedStatus.fail.push(...selection);
this.showRestoreNotification(failedStatus);
this.nodesRestored.next();
this.store.dispatch(new ReloadDocumentListAction());
return;
}
@ -439,7 +431,7 @@ export class ContentManagementService {
if (!remainingNodes.length) {
this.showRestoreNotification(status);
this.nodesRestored.next();
this.store.dispatch(new ReloadDocumentListAction());
} else {
this.restoreDeletedNodes(remainingNodes);
}
@ -531,6 +523,7 @@ export class ContentManagementService {
forkJoin(...batch).subscribe(
() => {
this.nodesDeleted.next(null);
this.store.dispatch(new ReloadDocumentListAction());
},
error => {
let i18nMessageString = 'APP.MESSAGES.ERRORS.GENERIC';
@ -564,7 +557,7 @@ export class ContentManagementService {
const [operationResult, moveResponse] = result;
this.showMoveMessage(nodes, operationResult, moveResponse);
this.nodesMoved.next(null);
this.store.dispatch(new ReloadDocumentListAction());
},
error => {
this.showMoveMessage(nodes, error);
@ -619,7 +612,7 @@ export class ContentManagementService {
)
.subscribe(
() => {
this.nodesMoved.next(null);
this.store.dispatch(new ReloadDocumentListAction());
},
error => {
let message = 'APP.MESSAGES.ERRORS.GENERIC';
@ -665,6 +658,7 @@ export class ContentManagementService {
if (status.someSucceeded) {
this.nodesDeleted.next();
this.store.dispatch(new ReloadDocumentListAction());
}
});
}
@ -685,7 +679,7 @@ export class ContentManagementService {
}
if (processedData.someSucceeded) {
this.nodesRestored.next();
this.store.dispatch(new ReloadDocumentListAction());
}
});
}
@ -759,7 +753,7 @@ export class ContentManagementService {
const status = this.processStatus(purgedNodes);
if (status.success.length) {
this.nodesPurged.next();
this.store.dispatch(new ReloadDocumentListAction());
}
const message = this.getPurgeMessage(status);
if (message) {

6
src/app/store/actions/app.actions.ts
View File

@ -35,6 +35,7 @@ export const SET_USER_PROFILE = 'SET_USER_PROFILE';
export const TOGGLE_INFO_DRAWER = 'TOGGLE_INFO_DRAWER';
export const TOGGLE_DOCUMENT_DISPLAY_MODE = 'TOGGLE_DOCUMENT_DISPLAY_MODE';
export const LOGOUT = 'LOGOUT';
export const RELOAD_DOCUMENT_LIST = 'RELOAD_DOCUMENT_LIST';
export class SetInitialStateAction implements Action {
readonly type = SET_INITIAL_STATE;
@ -75,3 +76,8 @@ export class LogoutAction implements Action {
readonly type = LOGOUT;
constructor(public payload?: any) {}
}
export class ReloadDocumentListAction implements Action {
readonly type = RELOAD_DOCUMENT_LIST;
constructor(public payload?: any) {}
}

19
src/app/store/effects/app.effects.ts
View File

@ -26,18 +26,33 @@
import { Effect, Actions, ofType } from '@ngrx/effects';
import { Injectable } from '@angular/core';
import { map } from 'rxjs/operators';
import { LogoutAction, LOGOUT } from '../actions/app.actions';
import {
LogoutAction,
LOGOUT,
ReloadDocumentListAction,
RELOAD_DOCUMENT_LIST
} from '../actions/app.actions';
import { AuthenticationService } from '@alfresco/adf-core';
import { Router } from '@angular/router';
import { ContentManagementService } from '../../services/content-management.service';
@Injectable()
export class AppEffects {
constructor(
private actions$: Actions,
private auth: AuthenticationService,
private router: Router
private router: Router,
private content: ContentManagementService
) {}
@Effect({ dispatch: false })
reload = this.actions$.pipe(
ofType<ReloadDocumentListAction>(RELOAD_DOCUMENT_LIST),
map(action => {
this.content.reload.next(action);
})
);
@Effect({ dispatch: false })
logout$ = this.actions$.pipe(
ofType<LogoutAction>(LOGOUT),