Skip to content
Snippets Groups Projects
Commit b2c95659 authored by AndiMajore's avatar AndiMajore
Browse files

version fix

parent d3388b74
No related branches found
No related tags found
No related merge requests found
{
"name": "netex",
"version": "0.8.9-rc1",
"version": "0.9.0-rc5",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......
{
"name": "netex",
"version": "0.9.0-rc5",
"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",
......
......@@ -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;
......@@ -62,7 +63,8 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
this.config = config;
}, 200);
// add settings to config
const configObj = typeof config === 'object' ? config : JSON.parse(config);
const configObj = JSON.stringify(typeof config === 'string' ? JSON5.parse(config) : config);
this.myConfig = merge(this.myConfig, configObj);
// update Drugst.One according to the settings
......@@ -112,7 +114,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
if (network == null) {
return;
}
this.networkJSON = typeof network === 'object' ? JSON.stringify(network) : network;
this.networkJSON = JSON.stringify(typeof network === 'string' ? JSON5.parse(network) : network);
this.createNetwork();
}
......
......@@ -44,7 +44,7 @@
<network-expander id="netexp1"
pluginId="2"
network='{"nodes":[{"id": "PTEN"}]}'></network-expander>
network='{nodes:[{id: "PTEN"}]}'></network-expander>
</div>
<!--<div >-->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment