diff --git a/src/app/components/analysis-panel/analysis-panel.component.ts b/src/app/components/analysis-panel/analysis-panel.component.ts index bf12f851ab7e1c5e77c160f0391a6f041ad5f8e2..0fc231594aa278d94ce27ae4f371c15129277fb3 100644 --- a/src/app/components/analysis-panel/analysis-panel.component.ts +++ b/src/app/components/analysis-panel/analysis-panel.component.ts @@ -123,6 +123,8 @@ export class AnalysisPanelComponent implements OnInit, OnChanges, AfterViewInit public reset() { this.resetEmitter.emit(true); + this.networkHandler.activeNetwork.selectedTissue = null; + this.networkHandler.activeNetwork.expressionExpanded = false; this.close(); } diff --git a/src/app/components/network/network.component.ts b/src/app/components/network/network.component.ts index 739d0ecb9190b277698fab20e5b33a53d2946952..47754e9ec0761a52dc863f3e4f141038ba9b7da7 100644 --- a/src/app/components/network/network.component.ts +++ b/src/app/components/network/network.component.ts @@ -116,6 +116,8 @@ export class NetworkComponent implements OnInit { @Output() resetEmitter: EventEmitter<boolean> = new EventEmitter(); public reset() { + this.nodeGroupsWithExpression = new Set(); + this.nodeRenderer = null; this.resetEmitter.emit(true); } @@ -130,6 +132,16 @@ export class NetworkComponent implements OnInit { return {edges: this.inputNetwork.edges, nodes}; } + resetInputNetwork(){ + const nodes = this.inputNetwork.nodes; + nodes.forEach(n => { + if (n._group) { + n.group = n._group; + delete n._group; + } + }); + } + setLoading(bool: boolean): void { this.loading = bool; } diff --git a/src/app/pages/explorer-page/explorer-page.component.ts b/src/app/pages/explorer-page/explorer-page.component.ts index c616916e1b1fab985a6dee64a0576b14cae7bd38..d6da6cf58107acb48ee0e5c8ba7c44ec387dc372 100644 --- a/src/app/pages/explorer-page/explorer-page.component.ts +++ b/src/app/pages/explorer-page/explorer-page.component.ts @@ -48,6 +48,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { public reset() { + this.networkHandler.activeNetwork.selectTissue(null); this.config = this.config; this.network = this.network; this.groups = this.groups; @@ -181,7 +182,6 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { } - public bind(f: (token: (string | null)) => void) { return f.bind(this); }