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

fixed automatic adjacent nodes loading issue; fixed reactiveness of extendnetworkmenu param

parent 04718ff5
No related branches found
No related tags found
No related merge requests found
......@@ -20,7 +20,7 @@
id="{{ 'controls-' + buttonId }}"
role="menu"
[ngClass]="{
'inner-dropdown': !networkHandler.activeNetwork.networkSidebarOpen
'inner-dropdown': !networkHandler.networkSidebarOpen
}"
>
<div class="dropdown-content">
......
<div
class="network-footer-toolbar drgstn-box-shadow"
[ngClass]="
networkHandler.activeNetwork.networkSidebarOpen ? 'opened' : 'closed'
networkHandler.networkSidebarOpen ? 'opened' : 'closed'
"
[class.no-header]="networkHandler.activeNetwork.networkType === 'analysis'"
[class.small-sidebar]="drugstoneConfig.smallStyle"
......@@ -9,7 +9,7 @@
<a
(click)="networkHandler.activeNetwork.toggleNetworkSidebar()"
class="button is-small is-primary network-toolbar-toggle"
[ngClass]="{ 'rotated': !networkHandler.activeNetwork.networkSidebarOpen }"
[ngClass]="{ 'rotated': !networkHandler.networkSidebarOpen }"
>
<app-fa-solid-icon
icon="angle-left"
......@@ -88,7 +88,7 @@
class="dropdown network-footer-toolbar-element"
[class.is-active]="networkHandler.activeNetwork.expressionExpanded"
[ngClass]="{
'inner-dropdown': !networkHandler.activeNetwork.networkSidebarOpen
'inner-dropdown': !networkHandler.networkSidebarOpen
}"
>
<div class="dropdown-trigger">
......
......@@ -20,7 +20,7 @@
id="{{ 'controls-' + buttonId }}"
role="menu"
[ngClass]="{
'inner-dropdown': !networkHandler.activeNetwork.networkSidebarOpen
'inner-dropdown': !networkHandler.networkSidebarOpen
}"
>
<div class="dropdown-content">
......
<div
class="network-footer-toolbar drgstn-box-shadow"
[ngClass]="
networkHandler.activeNetwork.networkSidebarOpen ? 'opened' : 'closed'
networkHandler.networkSidebarOpen ? 'opened' : 'closed'
"
[class.no-header]="networkHandler.activeNetwork.networkType === 'analysis'"
[class.small-sidebar]="drugstoneConfig.smallStyle"
......@@ -9,7 +9,7 @@
<a
(click)="networkHandler.activeNetwork.toggleNetworkSidebar()"
class="button is-small is-primary network-toolbar-toggle"
[ngClass]="{ 'rotated': networkHandler.activeNetwork.networkSidebarOpen }"
[ngClass]="{ 'rotated': networkHandler.networkSidebarOpen }"
>
<app-fa-solid-icon
icon="angle-left"
......@@ -85,7 +85,7 @@
class="dropdown network-footer-toolbar-element"
[class.is-active]="networkHandler.activeNetwork.expressionExpanded"
[ngClass]="{
'inner-dropdown': !networkHandler.activeNetwork.networkSidebarOpen
'inner-dropdown': !networkHandler.networkSidebarOpen
}"
>
<div class="dropdown-trigger">
......
......@@ -64,7 +64,7 @@ export class NetworkComponent implements OnInit {
public selectedTissue: Tissue | null = null;
// change this to true to have sidebar open per default
public networkSidebarOpen = false;
// public networkSidebarOpen = false;
public queryItems: Wrapper[] = [];
......@@ -84,7 +84,6 @@ export class NetworkComponent implements OnInit {
public loading = false;
constructor(
public configService: DrugstoneConfigService,
public legendService: LegendService,
public networkHandler: NetworkHandlerService,
public analysis: AnalysisService,
......@@ -96,7 +95,6 @@ export class NetworkComponent implements OnInit {
ngOnInit(): void {
this.networkHandler.networks[this.networkType] = this;
this.networkSidebarOpen = this.configService.config.expandNetworkMenu || false;
}
setLoading(bool: boolean): void {
......@@ -363,7 +361,7 @@ export class NetworkComponent implements OnInit {
}
toggleNetworkSidebar() {
this.networkSidebarOpen = !this.networkSidebarOpen;
this.networkHandler.networkSidebarOpen = !this.networkHandler.networkSidebarOpen;
}
public selectTissue(tissue: Tissue | null) {
......
......@@ -210,6 +210,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
this.networkHandler.activeNetwork.getInteractions(configObj[key]);
}
}
this.networkHandler.networkSidebarOpen = this.drugstoneConfig.config.expandNetworkMenu;
// trigger updates on config e.g. in legend
if (this.drugstoneConfig.analysisConfig) {
this.drugstoneConfig.analysisConfig = {...this.drugstoneConfig.analysisConfig};
......
......@@ -18,9 +18,9 @@ export class NetworkHandlerService {
}
private change = new Subject<any>();
public networkSidebarOpen = this.drugstoneConfig.config.expandNetworkMenu || false;
public networks: { NetworkType: NetworkComponent } | {} = {};
public activeNetwork: NetworkComponent = new NetworkComponent(this.drugstoneConfig, this.legendService, this.networkHandler, this.analysis, this.drugstoneConfig, this.netex, this.omnipath, this.loadingScreen);
public activeNetwork: NetworkComponent = new NetworkComponent(this.legendService, this.networkHandler, this.analysis, this.drugstoneConfig, this.netex, this.omnipath, this.loadingScreen);
public setActiveNetwork(network: NetworkType) {
this.triggerChange();
......
......@@ -26,6 +26,7 @@ Analysis<br>
Screenshot button<br>
<input type="checkbox" onclick=changeConfigStr('{"showNetworkMenuButtonExportGraphml":'+this.checked+'}') checked/> Show
Export As Graphml Button<br>
<input type="checkbox" onclick=changeConfigStr('{"expandNetworkMenu":'+this.checked+'}') checked/> Expand network menu<br>
<input id="new_color" type="text"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment