Merge branch 'master' of gitlab.lrz.de:netex/frontend

package-lock.json

 {
   "name": "netex",
-  "version": "0.8.9-rc1",
+  "version": "0.9.0-rc5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

 {
   "name": "netex",
-  "version": "0.8.9-rc1",
+  "version": "0.9.0-rc6",
   "scripts": {
     "ng": "ng",
     "start:local": "ng serve --configuration=local",
@@ -53,6 +53,7 @@
     "bulma-tooltip": "^3.0.2",
     "document-register-element": "^1.7.2",
     "dom-to-image": "^2.6.0",
+    "json5": "^2.2.0",
     "lodash.merge": "^4.6.2",
     "primeicons": "^4.1.0",
     "primeng": "^12.0.1",

src/app/dialogs/launch-analysis/launch-analysis.component.ts

@@ -120,9 +120,9 @@ export class LaunchAnalysisComponent implements OnInit, OnChanges {
     parameters.target = this.target === 'drug' ? 'drug' : 'drug-target';
     // pass network data to reconstruct network in analysis result to connect non-proteins to results
     // drop interactions in nodes beforehand to no cause cyclic error, information is contained in edges
-    // this.inputNetwork.nodes.forEach(node => {
-    //   delete node.interactions
-    // });
+    this.inputNetwork.nodes.forEach(node => {
+      delete node.interactions
+    });
 
     if (this.algorithm === 'trustrank') {
       parameters.damping_factor = this.trustrankDampingFactor;

src/app/pages/explorer-page/explorer-page.component.ts

@@ -26,9 +26,10 @@ import domtoimage from 'dom-to-image';
 import {NetworkSettings} from '../../network-settings';
 import {defaultConfig, EdgeGroup, IConfig, InteractionDatabase, NodeGroup} from '../../config';
 import {NetexControllerService} from 'src/app/services/netex-controller/netex-controller.service';
-import {downLoadFile, removeDuplicateObjectsFromList} from '../../utils'
+import {removeDuplicateObjectsFromList} from '../../utils';
 import * as merge from 'lodash/fp/merge';
 import {AnalysisPanelComponent} from 'src/app/components/analysis-panel/analysis-panel.component';
+import * as JSON5 from 'json5';
 
 declare var vis: any;
 
@@ -54,7 +55,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
 
   @Input()
   public set config(config: string | undefined) {
-    if (typeof config === 'undefined') {
+    if (config == null) {
       return;
     }
     if (this.id == null)
@@ -62,7 +63,8 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
         this.config = config;
       }, 200);
     // add settings to config
-    const configObj = JSON.parse(config);
+
+    const configObj = typeof config === 'string' ? config.length === 0 ? {}: JSON5.parse(config) : config;
     this.myConfig = merge(this.myConfig, configObj);
 
     // update Drugst.One according to the settings
@@ -93,11 +95,10 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
 
   @Input()
   public set network(network: string | undefined) {
-    if (typeof network === 'undefined') {
+    if (network == null) {
       return;
     }
-
-    this.networkJSON = network;
+    this.networkJSON = JSON.stringify(typeof network === 'string' ? JSON5.parse(network) : network);
     this.createNetwork();
   }
 
@@ -274,12 +275,12 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
   private async getNetwork() {
 
     const network = JSON.parse(this.networkJSON);
-
     if (this.myConfig.identifier === 'ensg') {
       // @ts-ignore
       network.nodes.forEach(node => {
         node.id = this.removeEnsemblVersion(node.id);
       });
+      if (network.edges != null)
         // @ts-ignore
         network.edges.forEach(edge => {
           edge.from = this.removeEnsemblVersion(edge.from);
@@ -300,7 +301,6 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
     // at this point, we have nodes synched with the backend
     // use netexIds where posssible, but use original id as node name if no label given
     const nodeIdMap = {};
-
     network.nodes.forEach((node) => {
       // set node label to original id before node id will be set to netex id
       node.label = node.label ? node.label : node.id;
@@ -311,6 +311,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
 
     // adjust edge labels accordingly and filter
     const edges = new Array();
+    if (network.edges != null)
       network.edges.forEach(edge => {
         edge.from = nodeIdMap[edge.from];
         edge.to = nodeIdMap[edge.to];

src/environments/environment.prod.dock1.ts

 export const environment = {
   production: true,
-  backend: 'http://cosy-test.zbh.uni-hamburg.de/drugstone_api/',
+  backend: 'https://drugst.one/drugstone_api/',
 };