[Issue #230] Remove the obsolete display comics command.

comixed · Jun 21, 2020 · f3b5412 · f3b5412
1 parent ecb4f54
commit f3b5412
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 116 deletions.
diff --git a/comixed-frontend/src/app/library/actions/library.actions.ts b/comixed-frontend/src/app/library/actions/library.actions.ts
@@ -36,8 +36,7 @@ export enum LibraryActionTypes {
   ConvertComicsFailed = '[LIBRARY] Failed to convert comics',
   Consolidate = '[LIBRARY] Consolidate the library',
   Consolidated = '[LIBRARY] Library is consolidated',
-  ConsolidateFailed = '[LIBRARY] Failed to consolidate library',
-  DisplayComics = '[LIBRARY] Set the list of comics to be displayed'
+  ConsolidateFailed = '[LIBRARY] Failed to consolidate library'
 }
 
 export class LibraryReset implements Action {
@@ -159,12 +158,6 @@ export class LibraryConsolidateFailed implements Action {
   constructor() {}
 }
 
-export class LibraryDisplayComics implements Action {
-  readonly type = LibraryActionTypes.DisplayComics;
-
-  constructor(public payload: { title: string; comics: Comic[] }) {}
-}
-
 export type LibraryActions =
   | LibraryReset
   | LibraryGetUpdates
@@ -181,5 +174,4 @@ export type LibraryActions =
   | LibraryConvertComicsFailed
   | LibraryConsolidate
   | LibraryConsolidated
-  | LibraryConsolidateFailed
-  | LibraryDisplayComics;
+  | LibraryConsolidateFailed;
diff --git a/comixed-frontend/src/app/library/adaptors/library.adaptor.spec.ts b/comixed-frontend/src/app/library/adaptors/library.adaptor.spec.ts
@@ -50,7 +50,6 @@ import {
   LibraryConsolidateFailed,
   LibraryConvertComics,
   LibraryConvertComicsFailed,
-  LibraryDisplayComics,
   LibraryGetUpdates,
   LibraryUpdatesReceived
 } from '../actions/library.actions';
@@ -69,7 +68,6 @@ describe('LibraryAdaptor', () => {
   const IDS = [7, 17, 65, 1, 29, 71];
   const ARCHIVE_TYPE = 'CBZ';
   const RENAME_PAGES = true;
-  const TITLE = 'The Title';
 
   let adaptor: LibraryAdaptor;
   let store: Store<AppState>;
@@ -394,28 +392,4 @@ describe('LibraryAdaptor', () => {
       });
     });
   });
-
-  describe('setting the list of comics to display', () => {
-    beforeEach(() => {
-      adaptor.displayComics(COMICS, TITLE);
-    });
-
-    it('fires an action', () => {
-      expect(store.dispatch).toHaveBeenCalledWith(
-        new LibraryDisplayComics({ title: TITLE, comics: COMICS })
-      );
-    });
-
-    it('provides updates on the display title', () => {
-      adaptor.displayTitle$.subscribe(response =>
-        expect(response).toEqual(TITLE)
-      );
-    });
-
-    it('provides updates on the display comics', () => {
-      adaptor.displayComics$.subscribe(response =>
-        expect(response).toEqual(COMICS)
-      );
-    });
-  });
 });
diff --git a/comixed-frontend/src/app/library/adaptors/library.adaptor.ts b/comixed-frontend/src/app/library/adaptors/library.adaptor.ts
@@ -33,7 +33,6 @@ import {
   LibraryConsolidate,
   LibraryConvertComics,
   LibraryDeleteMultipleComics,
-  LibraryDisplayComics,
   LibraryGetUpdates,
   LibraryReset,
   LibraryStartRescan
@@ -64,8 +63,6 @@ export class LibraryAdaptor {
   private _maximum = 100;
   private _converting$ = new BehaviorSubject<boolean>(false);
   private _consolidating$ = new BehaviorSubject<boolean>(false);
-  private _displayTitle$ = new BehaviorSubject<string>('');
-  private _displayComics$ = new BehaviorSubject<Comic[]>(null);
 
   constructor(
     private store: Store<AppState>,
@@ -144,12 +141,6 @@ export class LibraryAdaptor {
         if (state.consolidating !== this._consolidating$.getValue()) {
           this._consolidating$.next(state.consolidating);
         }
-        if (state.displayTitle !== this._displayTitle$.getValue()) {
-          this._displayTitle$.next(state.displayTitle);
-        }
-        if (!_.isEqual(state.displayComics, this._displayComics$.getValue())) {
-          this._displayComics$.next(state.displayComics);
-        }
       });
   }
 
@@ -286,23 +277,4 @@ export class LibraryAdaptor {
   get consolidating$(): Observable<boolean> {
     return this._consolidating$.asObservable();
   }
-
-  displayComics(comics: Comic[], title: string) {
-    this.logger.debug(
-      'firing action to update displayed comics:',
-      comics,
-      title
-    );
-    this.store.dispatch(
-      new LibraryDisplayComics({ comics: comics, title: title })
-    );
-  }
-
-  get displayTitle$(): Observable<string> {
-    return this._displayTitle$.asObservable();
-  }
-
-  get displayComics$(): Observable<Comic[]> {
-    return this._displayComics$.asObservable();
-  }
 }
diff --git a/...d/src/app/library/components/library-navigation-tree/library-navigation-tree.component.ts b/...d/src/app/library/components/library-navigation-tree/library-navigation-tree.component.ts
@@ -257,8 +257,8 @@ export class LibraryNavigationTreeComponent implements OnInit, OnDestroy {
           ),
           key: list.name,
           data: {
-            title: list.name,
-            comics: list.entries.map(entry => entry.comic)
+            type: CollectionType.READING_LISTS,
+            name: list.name
           } as NavigationDataPayload,
           icon: 'pi pi-list',
           expanded: false,

diff --git a/comixed-frontend/src/app/library/models/collection-type.enum.ts b/comixed-frontend/src/app/library/models/collection-type.enum.ts
@@ -18,6 +18,7 @@
 
 export enum CollectionType {
   ALL_COMICS = 'allcomics',
+  READING_LISTS = 'lists',
   PUBLISHERS = 'publishers',
   SERIES = 'series',
   CHARACTERS = 'characters',

diff --git a/comixed-frontend/src/app/library/pages/library-page/library-page.component.ts b/comixed-frontend/src/app/library/pages/library-page/library-page.component.ts
@@ -41,8 +41,6 @@ export class LibraryPageComponent implements OnInit, OnDestroy {
   authSubscription: Subscription;
   user: User;
   comicsSubscription: Subscription;
-  displayComicsSubscription: Subscription;
-  displayTitleSubscription: Subscription;
   comics: Comic[] = [];
   selectedComicsSubscription: Subscription;
   selectedComics: Comic[] = [];
@@ -72,14 +70,6 @@ export class LibraryPageComponent implements OnInit, OnDestroy {
     this.authSubscription = this.authenticationAdaptor.user$.subscribe(
       user => (this.user = user)
     );
-    this.displayComicsSubscription = this.libraryAdaptor.displayComics$
-      .pipe(filter(comics => !!comics))
-      .subscribe(comics => {
-        this.comics = comics;
-      });
-    this.displayTitleSubscription = this.libraryAdaptor.displayTitle$
-      .pipe(filter(title => !!title && title.length > 0))
-      .subscribe(title => (this.title = title));
     this.selectedComicsSubscription = this.selectionAdaptor.comicSelection$.subscribe(
       selected_comics => (this.selectedComics = selected_comics)
     );
@@ -173,8 +163,6 @@ export class LibraryPageComponent implements OnInit, OnDestroy {
   ngOnDestroy() {
     this.authSubscription.unsubscribe();
     this.comicsSubscription.unsubscribe();
-    this.displayComicsSubscription.unsubscribe();
-    this.displayTitleSubscription.unsubscribe();
     this.selectedComicsSubscription.unsubscribe();
     this.importCountSubscription.unsubscribe();
   }

diff --git a/comixed-frontend/src/app/library/reducers/library.reducer.spec.ts b/comixed-frontend/src/app/library/reducers/library.reducer.spec.ts
@@ -32,7 +32,6 @@ import {
   LibraryConvertComicsFailed,
   LibraryDeleteMultipleComics,
   LibraryDeleteMultipleComicsFailed,
-  LibraryDisplayComics,
   LibraryGetUpdates,
   LibraryGetUpdatesFailed,
   LibraryMultipleComicsDeleted,
@@ -57,7 +56,6 @@ describe('Library Reducer', () => {
   const ASCENDING = true;
   const COMIC_COUNT = 2372;
   const LATEST_UPDATED_DATE = new Date();
-  const TITLE = 'The Display Title';
 
   let state: LibraryState;
 
@@ -78,14 +76,6 @@ describe('Library Reducer', () => {
       expect(state.comics).toEqual([]);
     });
 
-    it('has no display comics', () => {
-      expect(state.displayComics).toBeNull();
-    });
-
-    it('has no display title', () => {
-      expect(state.displayTitle).toEqual('');
-    });
-
     it('has a zero last comic id', () => {
       expect(state.lastComicId).toEqual(0);
     });
@@ -398,21 +388,4 @@ describe('Library Reducer', () => {
       expect(state.consolidating).toBeFalsy();
     });
   });
-
-  describe('setting the comics to display', () => {
-    beforeEach(() => {
-      state = reducer(
-        { ...state, displayComics: null },
-        new LibraryDisplayComics({ title: TITLE, comics: COMICS })
-      );
-    });
-
-    it('updates the set of display comics', () => {
-      expect(state.displayComics).toEqual(COMICS);
-    });
-
-    it('updates the display title', () => {
-      expect(state.displayTitle).toEqual(TITLE);
-    });
-  });
 });
diff --git a/comixed-frontend/src/app/library/reducers/library.reducer.ts b/comixed-frontend/src/app/library/reducers/library.reducer.ts
@@ -26,8 +26,6 @@ export const LIBRARY_FEATURE_KEY = 'library_state';
 export interface LibraryState {
   fetchingUpdates: boolean;
   comics: Comic[];
-  displayComics: Comic[];
-  displayTitle: string;
   lastComicId: number;
   moreUpdates: boolean;
   updatedIds: number[];
@@ -44,8 +42,6 @@ export interface LibraryState {
 export const initialState: LibraryState = {
   fetchingUpdates: false,
   comics: [],
-  displayComics: null,
-  displayTitle: '',
   lastComicId: 0,
   moreUpdates: false,
   updatedIds: [],
@@ -130,13 +126,6 @@ export function reducer(
     case LibraryActionTypes.ConsolidateFailed:
       return { ...state, consolidating: false };
 
-    case LibraryActionTypes.DisplayComics:
-      return {
-        ...state,
-        displayComics: action.payload.comics,
-        displayTitle: action.payload.title
-      };
-
     default:
       return state;
   }