Skip to content

Commit

Permalink
fix(rxjs): RxJS version 6 API updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jkuri authored and irmana committed Jun 3, 2018
1 parent d643e65 commit daaccad
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions src/api/server-routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import * as docker from './docker';
import * as system from './system';
import * as utils from './utils';
import { resolve, extname, relative } from 'path';
import { Observable, merge } from 'rxjs';
import { Observable, merge, concat } from 'rxjs';
import { fromPromise } from 'rxjs/observable/fromPromise';
import { concat, toArray } from 'rxjs/operators';
import { toArray } from 'rxjs/operators';
import { exists } from './fs';
import { readFile } from 'fs-extra';
import { reinitializeDatabase } from './db/migrations';
Expand Down Expand Up @@ -677,12 +677,11 @@ export function setupRoutes(): express.Router {
});

router.get('/status', (req: express.Request, res: express.Response) => {
const obs: any = concat(...[
concat(...[
system.isGitInstalled(),
system.isSQLiteInstalled(),
docker.isDockerInstalled()
]);
obs
])
.pipe(toArray())
.subscribe(data => {
if (data[2]) {
Expand Down

0 comments on commit daaccad

Please # to comment.