Remove documents from store on collection deletion #LMR-793

src/app/core/store/collections/collections.effects.ts

@@ -39,6 +39,7 @@ import {AppState} from "../app.state";
 import {HttpErrorResponse} from "@angular/common/http";
 import {RouterAction} from "../router/router.action";
 import {selectOrganizationByWorkspace} from "../organizations/organizations.state";
+import {DocumentsAction} from '../documents/documents.action';
 
 @Injectable()
 export class CollectionsEffects {
@@ -112,18 +113,19 @@ export class CollectionsEffects {
     ofType<CollectionsAction.CreateFailure>(CollectionsActionType.CREATE_FAILURE),
     tap(action => console.error(action.payload.error)),
     withLatestFrom(this.store$.select(selectOrganizationByWorkspace)),
-    map( ([action, organization]) => {
+    map(([action, organization]) => {
       if (action.payload.error instanceof HttpErrorResponse && action.payload.error.status == 402) {
-        const title = this.i18n({ id: 'serviceLimits.trial', value: 'Trial Service' });
+        const title = this.i18n({id: 'serviceLimits.trial', value: 'Trial Service'});
         const message = this.i18n({
           id: 'collection.create.serviceLimits',
-          value: 'You are currently on the Trial plan which allows you to have only limited number of files. Do you want to upgrade to Business now?' });
+          value: 'You are currently on the Trial plan which allows you to have only limited number of files. Do you want to upgrade to Business now?'
+        });
         return new NotificationsAction.Confirm({
           title,
           message,
           action: new RouterAction.Go({
             path: ['/organization', organization.code, 'detail'],
-            extras: { fragment: 'orderService' }
+            extras: {fragment: 'orderService'}
           })
         });
       }
@@ -151,16 +153,17 @@ export class CollectionsEffects {
     withLatestFrom(this.store$.select(selectOrganizationByWorkspace)),
     map(([action, organization]) => {
       if (action.payload.error instanceof HttpErrorResponse && action.payload.error.status == 402) {
-        const title = this.i18n({ id: 'serviceLimits.trial', value: 'Trial Service' });
+        const title = this.i18n({id: 'serviceLimits.trial', value: 'Trial Service'});
         const message = this.i18n({
           id: 'collection.create.serviceLimits',
-          value: 'You are currently on the Trial plan which allows you to have only limited number of files. Do you want to upgrade to Business now?' });
+          value: 'You are currently on the Trial plan which allows you to have only limited number of files. Do you want to upgrade to Business now?'
+        });
         return new NotificationsAction.Confirm({
           title,
           message,
           action: new RouterAction.Go({
             path: ['/organization', organization.code, 'detail'],
-            extras: { fragment: 'orderService' }
+            extras: {fragment: 'orderService'}
           })
         });
       }
@@ -197,7 +200,9 @@ export class CollectionsEffects {
   public delete$: Observable<Action> = this.actions$.pipe(
     ofType<CollectionsAction.Delete>(CollectionsActionType.DELETE),
     mergeMap(action => this.collectionService.removeCollection(action.payload.collectionId).pipe(
-      map(collectionId => new CollectionsAction.DeleteSuccess({collectionId})),
+      flatMap(collectionId => [new CollectionsAction.DeleteSuccess({collectionId}),
+        new DocumentsAction.ClearByCollection({collectionId})
+      ]),
       catchError((error) => Observable.of(new CollectionsAction.DeleteFailure({error: error})))
     ))
   );

src/app/core/store/documents/documents.action.ts

@@ -43,7 +43,8 @@ export enum DocumentsActionType {
   DELETE_SUCCESS = '[Documents] Delete :: Success',
   DELETE_FAILURE = '[Documents] Delete :: Failure',
 
-  CLEAR = '[Documents] Clear'
+  CLEAR = '[Documents] Clear',
+  CLEAR_BY_COLLECTION = '[Documents] Clear by collection'
 
 }
 
@@ -161,10 +162,17 @@ export namespace DocumentsAction {
     }
   }
 
+  export class ClearByCollection implements Action {
+    public readonly type = DocumentsActionType.CLEAR_BY_COLLECTION;
+
+    public constructor(public payload: { collectionId: string }) {
+    }
+  }
+
   export type All =
     Get | GetSuccess | GetFailure |
     Create | CreateSuccess | CreateFailure |
     Update | UpdateData | PatchData | UpdateSuccess | UpdateFailure |
     Delete | DeleteSuccess | DeleteFailure | DeleteConfirm |
-    Clear;
+    Clear | ClearByCollection;
 }

src/app/core/store/documents/documents.reducer.ts

@@ -30,9 +30,19 @@ export function documentsReducer(state: DocumentsState = initialDocumentsState,
       return documentsAdapter.updateOne({id: action.payload.document.id, changes: action.payload.document}, state);
     case DocumentsActionType.DELETE_SUCCESS:
       return documentsAdapter.removeOne(action.payload.documentId, state);
+    case DocumentsActionType.CLEAR_BY_COLLECTION:
+      return documentsAdapter.removeMany(findCollectionDocumentIds(state, action.payload.collectionId), state);
     case DocumentsActionType.CLEAR:
       return initialDocumentsState;
     default:
       return state;
   }
 }
+
+function findCollectionDocumentIds(state: DocumentsState, collectionId: string): string[] {
+  const ids: string[] = state.ids as string[];
+  const entities = state.entities;
+  return ids.map((id: string) => entities[id])
+    .filter(document => document.collectionId === collectionId)
+    .map(document => document.id);
+}

src/app/core/store/documents/documents.state.ts

@@ -33,7 +33,7 @@ export interface DocumentsState extends EntityState<DocumentModel> {
   queries: QueryModel[];
 }
 
-export const documentsAdapter = createEntityAdapter<DocumentModel>();
+export const documentsAdapter = createEntityAdapter<DocumentModel>({selectId: document => document.id});
 
 export const initialDocumentsState: DocumentsState = documentsAdapter.getInitialState({
   queries: []