diff --git a/src/app/components/query-tile/query-tile.component.ts b/src/app/components/query-tile/query-tile.component.ts
index 95dd8a1c037cc80cc0ab5b6e8a9248090791837b..62f952f34ba3046a2290c91975575a63627b5480 100644
--- a/src/app/components/query-tile/query-tile.component.ts
+++ b/src/app/components/query-tile/query-tile.component.ts
@@ -14,15 +14,9 @@ export class QueryTileComponent {
querySearch(term: string, item: Wrapper) {
term = term.toLowerCase();
- if (item.type === 'host') {
- const data = item.data as Protein;
- return data.name.toLowerCase().indexOf(term) > -1 || data.proteinName.toLowerCase().indexOf(term) > -1 ||
- item.type.toLowerCase().indexOf(term) > -1;
- } else {
- const data = item.data as ViralProtein;
- return data.effectName.toLowerCase().indexOf(term) > -1 || data.virusName.toLowerCase().indexOf(term) > -1 ||
- item.type.toLowerCase().indexOf(term) > -1;
- }
+ const data = item.data as Protein;
+ return data.name.toLowerCase().indexOf(term) > -1 || data.proteinName.toLowerCase().indexOf(term) > -1 ||
+ item.type.toLowerCase().indexOf(term) > -1;
}
select(item) {
diff --git a/src/app/config.ts b/src/app/config.ts
index 87869da8981b080e7597f5c6f37406ca68073ab3..2eef1e920427f09983113c2c5dc847bb8a2471b9 100644
--- a/src/app/config.ts
+++ b/src/app/config.ts
@@ -2,6 +2,7 @@ export interface IConfig {
legendUrl: string;
legendClass: string;
taskName: string;
+ showLeftSidebar: boolean;
showOverview: boolean;
showQuery: boolean;
showFilter: boolean;
@@ -15,13 +16,14 @@ export interface IConfig {
export const defaultConfig: IConfig = {
legendUrl: 'https://exbio.wzw.tum.de/covex/assets/leg1.png',
- taskName: 'Run Task X',
legendClass: 'legend',
+ taskName: 'Run Task X',
+ showLeftSidebar: true,
showOverview: true,
showQuery: true,
showFilter: true,
showItemSelector: true,
- showSimpleAnalysis:false,
+ showSimpleAnalysis: false,
showAdvAnalysis: true,
showSelection: true,
showTasks: false,
diff --git a/src/app/dialogs/launch-analysis/launch-analysis.component.ts b/src/app/dialogs/launch-analysis/launch-analysis.component.ts
index 8fe85ae83b818f478a30bb7f24d9223ce0ab08f7..077516b76de0e1894f1fee0009df9b1a186e1e88 100644
--- a/src/app/dialogs/launch-analysis/launch-analysis.component.ts
+++ b/src/app/dialogs/launch-analysis/launch-analysis.component.ts
@@ -22,8 +22,6 @@ export class LaunchAnalysisComponent implements OnInit, OnChanges {
public show = false;
@Input()
public target: 'drug' | 'drug-target';
- @Input()
- public dataset: Dataset;
@Output()
public showChange = new EventEmitter<boolean>();
@@ -110,8 +108,7 @@ export class LaunchAnalysisComponent implements OnInit, OnChanges {
seeds: this.analysis.getSelection().map((item) => item.backendId),
};
- parameters.strain_or_drugs = this.target === 'drug' ? 'drugs' : this.dataset.backendId;
- parameters.bait_datasets = this.dataset.data;
+ parameters.target_or_drugs = this.target === 'drug' ? 'drugs' : 'PPI';
if (this.algorithm === 'trustrank') {
parameters.damping_factor = this.trustrankDampingFactor;
diff --git a/src/app/pages/explorer-page/explorer-page.component.html b/src/app/pages/explorer-page/explorer-page.component.html
index ae75a29246c2db8089ee0a53e17c349e9f3ed565..659a682fde6fbd92400da1764e5672c3d2a1a2dd 100644
--- a/src/app/pages/explorer-page/explorer-page.component.html
+++ b/src/app/pages/explorer-page/explorer-page.component.html
@@ -203,8 +203,8 @@
</div>
</div>
- <div *ngIf="myConfig.showItemSelector" class="covex sidebar bar-right">
- <div class="card bar-large">
+ <div *ngIf="myConfig.showLeftSidebar" class="covex sidebar bar-right">
+ <div *ngIf="myConfig.showItemSelector" class="card bar-large">
<header class="card-header">
<p class="card-header-title">
<span class="icon">
diff --git a/src/app/pages/explorer-page/explorer-page.component.ts b/src/app/pages/explorer-page/explorer-page.component.ts
index 65eddc20762c38e951af45cfdb31467e9330a2ad..1d41f1c30d7e6b0a67f279912538e9ace5b84422 100644
--- a/src/app/pages/explorer-page/explorer-page.component.ts
+++ b/src/app/pages/explorer-page/explorer-page.component.ts
@@ -38,7 +38,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
private networkJSON = '{"nodes": [], "edges": []}';
- public myConfig: IConfig = defaultConfig;
+ public myConfig: IConfig = JSON.parse(JSON.stringify(defaultConfig));
@Input()
public onload: undefined | string;
@@ -50,7 +50,6 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
}
const configObj = JSON.parse(config);
- this.myConfig = JSON.parse(JSON.stringify(defaultConfig));
for (const key of Object.keys(configObj)) {
this.myConfig[key] = configObj[key];
}
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index d8d9528af2e0e1ba4e45a1d5b86cfd72a4e15ba7..bb4892770cb650bf8f867689a7ed6f886098e911 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,7 +4,7 @@
export const environment = {
production: false,
- backend: 'http://localhost:8000/',
+ backend: 'https://exbio.wzw.tum.de/netex_dev/api/',
};
/*
diff --git a/src/index.html b/src/index.html
index f370246174455ea9bf965ba6d155d5183517b102..d2831825101c723d2ef1b42c0c3b12dcb16b2e4e 100644
--- a/src/index.html
+++ b/src/index.html
@@ -23,12 +23,18 @@
</head>
<body>
-<button onclick="setNetwork('netexp1')">Set Network 1</button>
-<button onclick="setNetwork('netexp2')">Set Network 2</button>
+<input type="checkbox" onclick=changeConfigStr('{"showOverview":'+this.checked+'}') checked /> Show overview<br>
+<input type="checkbox" onclick=changeConfigStr('{"showQuery":'+this.checked+'}') /> Show query<br>
+<input type="checkbox" onclick=changeConfigStr('{"showFilter":'+this.checked+'}') /> Show filter<br>
+<input type="checkbox" onclick=changeConfigStr('{"showLeftSidebar":'+this.checked+'}') checked /> Show sidebar<br>
+
+<br>
+
<button onclick="changeConfig()">Hide sidebar</button>
+<button onclick="setNetwork('netexp1')">Add proteins</button>
<div style="border: 3px solid red">
- <network-expander id="netexp1" config='{"legendClass": "my-legend-1"}' onload="init1()"></network-expander>
+ <network-expander id="netexp1" config='{"legendClass": "my-legend-1", "showQuery": false, "showFilter": false}' onload="init1()" style="height: 100vh"></network-expander>
</div>
<!--
@@ -49,6 +55,12 @@
netexp.setAttribute('config', '{"showLeftSidebar": false}');
}
+ function changeConfigStr(config) {
+ console.log(config);
+ const netexp = document.getElementById('netexp1');
+ netexp.setAttribute('config', config);
+ }
+
function setNetwork(nw) {
const netexp = document.getElementById(nw);