Added getDefaultServer static method to AppCconfig and updated the ap…

…plication to use it. This includes introducing a new route guard on search routes that contain a gene but no server. For now, the method returns the first server in the list of servers in the config file.

client/src/app/app-routing.module.ts

@@ -3,7 +3,7 @@ import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 // app
 import { InstructionsComponent, MultiComponent, SearchComponent } from "./components";
-import { MultiGuard, SearchGuard } from "./guards";
+import { DefaultSearchGuard, MultiGuard, SearchGuard } from "./guards";
 
 const routes: Routes = [
   {
@@ -27,11 +27,10 @@ const routes: Routes = [
     path: "instructions",
   },
   {
+    canActivate: [DefaultSearchGuard],  // use guard to redirect to default server in AppConfig
     path: "search/:gene",
     pathMatch: "full",
-    // TODO: update to use first source from config
-    // redirectTo: "search/" + DefaultQueryParams.DEFAULT_SOURCE + "/:gene",
-    redirectTo: "/instructions",
+    component: SearchComponent,
   },
   {
     canActivate: [SearchGuard],

client/src/app/app.config.ts

@@ -4,8 +4,8 @@ import { Inject, Injectable } from "@angular/core";
 import { Observable } from "rxjs";
 import { concatMap, tap } from "rxjs/operators";
 // app
-import { Server } from "./models";
-import { Brand, Config, Dashboard, Miscellaneous } from "./models/config.model";  // avoid circular dependencies
+import { Server } from "./models/server.model";  // avoid circular dependencies
+import { Brand, Config, Dashboard, Miscellaneous } from "./models/config.model";  // ditto
 
 declare var document: any;
 
@@ -20,6 +20,13 @@ export class AppConfig {
 
   constructor(private http: HttpClient) {}
 
+  public static getDefaultServer(): Server {
+    if (AppConfig.SERVERS.length > 0) {
+      return AppConfig.SERVERS[0];
+    }
+    return new Server();
+  }
+
   public static getServer(id: string): Server {
     let server;
     AppConfig.SERVERS.forEach((s) => {

client/src/app/guards/default-search.guard.ts

@@ -0,0 +1,25 @@
+// Angular
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot} from '@angular/router';
+// store
+import { Store } from "@ngrx/store";
+import * as routerActions from "../store/actions/router.actions";
+import * as fromRoot from "../store/reducers";
+// app
+import { AppConfig } from "../app.config";
+
+@Injectable()
+export class DefaultSearchGuard implements CanActivate {
+
+  constructor(private router: Router, private store: Store<fromRoot.State>) { }
+
+  // this guard is only triggered when no server is provided, which Search needs,
+  // so instead of activating it always redirects to the default server
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
+    const url = "/search" +
+                "/" + AppConfig.getDefaultServer().id +
+                "/" + route.params.gene;
+    this.store.dispatch(new routerActions.Go({path: [url, {routeParam: 1}]}));
+    return false;
+  }
+}

client/src/app/guards/index.ts

@@ -1,10 +1,13 @@
+import { DefaultSearchGuard } from "./default-search.guard";
 import { MultiGuard } from "./multi.guard";
 import { SearchGuard } from "./search.guard";
 
 export const guards: any[] = [
+  DefaultSearchGuard,
   MultiGuard,
   SearchGuard,
 ];
 
+export * from "./default-search.guard";
 export * from "./multi.guard";
 export * from "./search.guard";

client/src/app/models/query-params.model.ts

@@ -9,8 +9,7 @@ export class QueryParams {
 
   constructor(
     public neighbors: number = 10,
-    // TODO: update to be first source from config
-    public sources: string[] = ["lis"],  // Server IDs
+    public sources: string[] = [AppConfig.getDefaultServer().id],
     public matched: number = 4,
     public intermediate: number = 5,
   ) { }

client/src/app/models/server.model.ts

@@ -2,7 +2,7 @@ export const GET = "GET";
 export const POST = "POST";
 
 export class Request {
-  type: "GET" | "POST";  // GET or POST
+  type: "GET" | "POST";
   url: string;
 }