diff --git a/package-lock.json b/package-lock.json index 17d601db4bc818da2b723ef75a4e2509af6e6786..b386c8d9a54a54e11c2d65e728d952bb8be77c37 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 1a3a605e97929259ff1bd4ffb7f5b02fa47dbbc1..6ccc9d77e1d7d86889fb357da8d3423f1e391718 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 df6bbd289eb0fb6002a5bb9a6f9a3f1f13e48431..e3cd0f786157086889828ad768f878050a32a5fa 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 81b9ff5d6af69fafb2005534609cd545c9446fb7..d02acab4f796abe758edaf90f46374bcf2a58bc6 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 >-->