refactor(example-app): remove store generic (#2994)

ngrx · Apr 12, 2021 · cdb5bd5 · cdb5bd5
1 parent d39b862
commit cdb5bd5
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 21 deletions.
diff --git a/projects/example-app/src/app/auth/containers/login-page.component.ts b/projects/example-app/src/app/auth/containers/login-page.component.ts
@@ -20,7 +20,7 @@ export class LoginPageComponent implements OnInit {
   pending$ = this.store.select(fromAuth.selectLoginPagePending);
   error$ = this.store.select(fromAuth.selectLoginPageError);
 
-  constructor(private store: Store<fromAuth.State>) {}
+  constructor(private store: Store) {}
 
   ngOnInit() {}
 

diff --git a/projects/example-app/src/app/auth/reducers/index.ts b/projects/example-app/src/app/auth/reducers/index.ts
@@ -26,9 +26,7 @@ export function reducers(state: AuthState | undefined, action: Action) {
   })(state, action);
 }
 
-export const selectAuthState = createFeatureSelector<State, AuthState>(
-  authFeatureKey
-);
+export const selectAuthState = createFeatureSelector<AuthState>(authFeatureKey);
 
 export const selectAuthStatusState = createSelector(
   selectAuthState,

diff --git a/projects/example-app/src/app/auth/services/auth-guard.service.ts b/projects/example-app/src/app/auth/services/auth-guard.service.ts
@@ -10,7 +10,7 @@ import * as fromAuth from '@example-app/auth/reducers';
   providedIn: 'root',
 })
 export class AuthGuard implements CanActivate {
-  constructor(private store: Store<fromAuth.State>) {}
+  constructor(private store: Store) {}
 
   canActivate(): Observable<boolean> {
     return this.store.select(fromAuth.selectLoggedIn).pipe(

diff --git a/projects/example-app/src/app/books/containers/collection-page.component.ts b/projects/example-app/src/app/books/containers/collection-page.component.ts
@@ -35,7 +35,7 @@ import * as fromBooks from '@example-app/books/reducers';
 export class CollectionPageComponent implements OnInit {
   books$: Observable<Book[]>;
 
-  constructor(private store: Store<fromBooks.State>) {
+  constructor(private store: Store) {
     this.books$ = store.select(fromBooks.selectBookCollection);
   }
 

diff --git a/projects/example-app/src/app/books/containers/find-book-page.component.ts b/projects/example-app/src/app/books/containers/find-book-page.component.ts
@@ -28,7 +28,7 @@ export class FindBookPageComponent {
   loading$: Observable<boolean>;
   error$: Observable<string>;
 
-  constructor(private store: Store<fromBooks.State>) {
+  constructor(private store: Store) {
     this.searchQuery$ = store.select(fromBooks.selectSearchQuery).pipe(take(1));
     this.books$ = store.select(fromBooks.selectSearchResults);
     this.loading$ = store.select(fromBooks.selectSearchLoading);

diff --git a/projects/example-app/src/app/books/containers/selected-book-page.component.ts b/projects/example-app/src/app/books/containers/selected-book-page.component.ts
@@ -24,7 +24,7 @@ export class SelectedBookPageComponent {
   book$: Observable<Book>;
   isSelectedBookInCollection$: Observable<boolean>;
 
-  constructor(private store: Store<fromBooks.State>) {
+  constructor(private store: Store) {
     this.book$ = store.select(fromBooks.selectSelectedBook) as Observable<Book>;
     this.isSelectedBookInCollection$ = store.select(
       fromBooks.isSelectedBookInCollection

diff --git a/projects/example-app/src/app/books/containers/view-book-page.component.ts b/projects/example-app/src/app/books/containers/view-book-page.component.ts
@@ -25,7 +25,7 @@ import { ViewBookPageActions } from '@example-app/books/actions';
 export class ViewBookPageComponent implements OnDestroy {
   actionsSubscription: Subscription;
 
-  constructor(store: Store<fromBooks.State>, route: ActivatedRoute) {
+  constructor(store: Store, route: ActivatedRoute) {
     this.actionsSubscription = route.params
       .pipe(map((params) => ViewBookPageActions.selectBook({ id: params.id })))
       .subscribe((action) => store.dispatch(action));

diff --git a/projects/example-app/src/app/books/guards/book-exists.guard.ts b/projects/example-app/src/app/books/guards/book-exists.guard.ts
@@ -18,7 +18,7 @@ import * as fromBooks from '@example-app/books/reducers';
 })
 export class BookExistsGuard implements CanActivate {
   constructor(
-    private store: Store<fromBooks.State>,
+    private store: Store,
     private googleBooks: GoogleBooksService,
     private router: Router
   ) {}

diff --git a/projects/example-app/src/app/books/reducers/index.ts b/projects/example-app/src/app/books/reducers/index.ts
@@ -51,7 +51,7 @@ export function reducers(state: BooksState | undefined, action: Action) {
  * The createFeatureSelector function selects a piece of state from the root of the state object.
  * This is used for selecting feature states that are loaded eagerly or lazily.
  */
-export const selectBooksState = createFeatureSelector<State, BooksState>(
+export const selectBooksState = createFeatureSelector<BooksState>(
   booksFeatureKey
 );
 

diff --git a/projects/example-app/src/app/core/containers/app.component.ts b/projects/example-app/src/app/core/containers/app.component.ts
@@ -38,9 +38,7 @@ import { LayoutActions } from '@example-app/core/actions';
           Sign Out
         </bc-nav-item>
       </bc-sidenav>
-      <bc-toolbar (openMenu)="openSidenav()">
-        Book Collection
-      </bc-toolbar>
+      <bc-toolbar (openMenu)="openSidenav()"> Book Collection </bc-toolbar>
 
       <router-outlet></router-outlet>
     </bc-layout>
@@ -50,7 +48,7 @@ export class AppComponent {
   showSidenav$: Observable<boolean>;
   loggedIn$: Observable<boolean>;
 
-  constructor(private store: Store<fromRoot.State & fromAuth.State>) {
+  constructor(private store: Store) {
     /**
      * Selectors can be applied with the `select` operator which passes the state
      * tree to the provided selector

diff --git a/projects/example-app/src/app/core/effects/router.effects.ts b/projects/example-app/src/app/core/effects/router.effects.ts
@@ -26,7 +26,7 @@ export class RouterEffects {
 
   constructor(
     private actions$: Actions,
-    private store: Store<fromRoot.State>,
+    private store: Store,
     private titleService: Title
   ) {}
 }
diff --git a/projects/example-app/src/app/reducers/index.ts b/projects/example-app/src/app/reducers/index.ts
@@ -68,7 +68,7 @@ export const metaReducers: MetaReducer<State>[] = !environment.production
 /**
  * Layout Selectors
  */
-export const selectLayoutState = createFeatureSelector<State, fromLayout.State>(
+export const selectLayoutState = createFeatureSelector<fromLayout.State>(
   fromLayout.layoutFeatureKey
 );
 
@@ -80,9 +80,8 @@ export const selectShowSidenav = createSelector(
 /**
  * Router Selectors
  */
-export const selectRouter = createFeatureSelector<
-  State,
-  fromRouter.RouterReducerState
->('router');
+export const selectRouter = createFeatureSelector<fromRouter.RouterReducerState>(
+  'router'
+);
 
 export const { selectRouteData } = fromRouter.getSelectors(selectRouter);