From b2c95659f8654eef30c2979949ce36b63d4f47e3 Mon Sep 17 00:00:00 2001
From: AndiMajore <andi.majore@googlemail.com>
Date: Tue, 28 Sep 2021 14:34:34 +0200
Subject: [PATCH] version fix
---
package-lock.json | 2 +-
package.json | 3 ++-
src/app/pages/explorer-page/explorer-page.component.ts | 8 +++++---
src/index.html | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 17d601db..b386c8d9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "netex",
- "version": "0.8.9-rc1",
+ "version": "0.9.0-rc5",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 1a3a605e..6ccc9d77 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"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",
diff --git a/src/app/pages/explorer-page/explorer-page.component.ts b/src/app/pages/explorer-page/explorer-page.component.ts
index df6bbd28..e3cd0f78 100644
--- a/src/app/pages/explorer-page/explorer-page.component.ts
+++ b/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;
@@ -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();
}
diff --git a/src/index.html b/src/index.html
index 81b9ff5d..d02acab4 100644
--- a/src/index.html
+++ b/src/index.html
@@ -44,7 +44,7 @@
<network-expander id="netexp1"
pluginId="2"
- network='{"nodes":[{"id": "PTEN"}]}'></network-expander>
+ network='{nodes:[{id: "PTEN"}]}'></network-expander>
</div>
<!--<div >-->
--
GitLab