add placeholder strategy for geneLinks

src/app/core/models/index.ts

@@ -1,6 +1,6 @@
 import { AppConfig, Brand, Communication, DashboardView, Dashboard,
   Miscellaneous, Tour } from './app-config.model';
-import { OrganismPlaceholders } from './placeholders.model';
+import { OrganismPlaceholders, GenePlaceholders } from './placeholders.model';
 import { Script, isScript } from './script.model';
 import { GET, POST, Request, Server } from './server.model';
 
@@ -14,6 +14,7 @@ export const models: any[] = [
   Miscellaneous,
   Tour,
   OrganismPlaceholders,
+  GenePlaceholders,
   GET,
   POST,
   Request,

src/app/core/models/placeholders.model.ts

@@ -3,3 +3,8 @@ export enum OrganismPlaceholders {
   Species = 'SPECIES',
   Chromosome = 'CHROMOSOME',
 }
+export enum GenePlaceholders {
+  GeneID = 'GENE_ID',
+  Species = 'SPECIES',
+  Chromosome = 'CHROMOSOME',
+}

src/app/gene/services/gene.service.ts

@@ -9,9 +9,10 @@ import * as geneActions from '@gcv/gene/store/actions/gene.actions';
 import * as fromRoot from '@gcv/store/reducers';
 import * as fromGene from '@gcv/gene/store/selectors/gene/';
 // app
-import { AppConfig, ConfigError, GET, POST, GRPC } from '@gcv/core/models';
+import { AppConfig, GenePlaceholders, ConfigError, GET, POST, GRPC } from '@gcv/core/models';
 import { HttpService } from '@gcv/core/services/http.service';
 import { Gene, Track } from '@gcv/gene/models';
+import { placeholderReplace } from '@gcv/core/utils';
 // api
 import { GenesGetReply, GenesGetRequest, GenesPromiseClient }
   from 'legumeinfo-microservices/dist/genes_service/v1';
@@ -74,11 +75,20 @@ export class GeneService extends HttpService {
     return this._store.select(fromGene.getSelectedGenes);
   }
 
+  //fill in templated geneLinksURL
+  //TODO: should different servers be able to specify their own geneLinks?
+  export function geneToGeneLinksURL(gene) {
+    let name = AppConfig.geneLinks.url;
+    const placeholders = {};
+    placeholders[GenePlaceholders.GeneID] = gene;
+    return placeholderReplace(name, placeholders);
+  };
+
   // fetches source specific details for the given gene
   getGeneDetails(gene: string, source: string): Observable<any> {
     const request = this._appConfig.getServerRequest(source, 'geneLinks');
     //TODO: make this more configurable via template substitution
-    const makeUrl = (url: string) => url + gene;
+    const makeUrl = (url: string) => geneToGeneLinksURL(gene);
     return this._makeHttpRequest<any>(request, {}, makeUrl);
   }
 

src/config/config.json

@@ -56,7 +56,11 @@
       },
       "geneLinks": {
         "type": "GET",
-        "url": "https://legumeinfo.org/gene_links/"
+        "url": "https://services.lis.ncgr.org/gene_linkouts?genes={GENE_ID}"
+      },
+      "regionLinks": {
+        "type": "GET",
+        "url": "https://services.lis.ncgr.org/linkouts/genomic_region_linkouts?"
       },
       "familyTreeLink": {
         "type": "GET",