Skip to content

fix(scully-routes.service): fix missing return type #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aaronfrost merged 2 commits into from
Jan 10, 2020
Merged

fix(scully-routes.service): fix missing return type #172

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ffccaf
fix(scully-routes.service): fix missing return type
SanderElias Jan 10, 2020
be9089e
Adding extra types to this file.
aaronfrost Jan 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions projects/scullyio/ng-lib/src/lib/route-service/scully-routes.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import {HttpClient} from '@angular/common/http';
import {Injectable} from '@angular/core';
import {of, ReplaySubject} from 'rxjs';
import {of, ReplaySubject, Observable} from 'rxjs';
import {catchError, shareReplay, switchMap, map, tap} from 'rxjs/operators';
import {HandledRoute} from 'dist/scully';

export interface ScullyRoute {
route: string;
Expand All @@ -18,9 +19,7 @@ export class ScullyRoutesService {
available$ = this.refresh.pipe(
switchMap(() => this.http.get<ScullyRoute[]>('/assets/scully-routes.json')),
catchError(() => {
console.warn(
'Scully routes file not found, are you running the in static version of your site?'
);
console.warn('Scully routes file not found, are you running the in static version of your site?');
return of([] as ScullyRoute[]);
}),
shareReplay({refCount: false, bufferSize: 1})
Expand All @@ -36,10 +35,10 @@ export class ScullyRoutesService {
this.reload();
}

getCurrent() {
getCurrent(): Observable<ScullyRoute> {
if (!location) {
/** probably not in a browser, no current location available */
return of([]);
return of();
}
const curLocation = location.pathname;
return this.available$.pipe(
Expand Down