diff --git a/package-lock.json b/package-lock.json
index 590d8325c0e7b0f6a8a4d12cda535b7cfc9be314..d6109a9090dfbdf72cfd5be71c1f583f3903aa7d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "netex",
- "version": "0.7.1",
+ "version": "0.8.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -770,11 +770,11 @@
}
},
"@angular/material": {
- "version": "12.1.2",
- "resolved": "https://registry.npmjs.org/@angular/material/-/material-12.1.2.tgz",
- "integrity": "sha512-DpqnvwnVqaudFRXTNyJR8r/gbKG4RtE3RGc6q4FgdN9SOfRh/q/yYyNnOUnbCwPgLTmkfGz+bj7++GA8gzhSkg==",
+ "version": "12.0.4",
+ "resolved": "https://registry.npmjs.org/@angular/material/-/material-12.0.4.tgz",
+ "integrity": "sha512-pvfYEeUCLR7EmA6R/kkXz5jfl+RHwh3AS9X9kWARWIOzA7p0hG9ApoFT5KCofTBNp0nukau1QoGR4WGla6wWvQ==",
"requires": {
- "tslib": "^2.2.0"
+ "tslib": "^2.1.0"
}
},
"@angular/platform-browser": {
diff --git a/package.json b/package.json
index aa806d9c03e7bd79291b2d25581bb2fe4e7a0b26..977fe00e518449e6f3ce58b978d62e14c153b4ac 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
"@angular/elements": "^12.0.3",
"@angular/forms": "~12.0.3",
"@angular/localize": "^12.0.3",
- "@angular/material": "^12.1.2",
+ "@angular/material": "^12.0.4",
"@angular/platform-browser": "~12.0.3",
"@angular/platform-browser-dynamic": "~12.0.3",
"@angular/router": "~12.0.3",
diff --git a/src/app/components/task-list/task-list.component.scss b/src/app/components/task-list/task-list.component.scss
index a1a6763541076292f5c6c81c2ed8360103a91c5e..81b579eb2752bd0a5f73efb6907beda18f6f7cd3 100644
--- a/src/app/components/task-list/task-list.component.scss
+++ b/src/app/components/task-list/task-list.component.scss
@@ -23,5 +23,5 @@
.small-box {
margin: 0.5rem;
padding: 0.5rem;
- background-color: var(--drgstn-panel-secondary);
+ background-color: var(--drgstn-panel-secondary) !important;
}
diff --git a/src/app/pages/explorer-page/explorer-page.component.html b/src/app/pages/explorer-page/explorer-page.component.html
index e66960cef4fa7368a6e8ca3cac6488db6cd92e94..44a1fd5552e2661cf735b3abec3b9deaf56a166a 100644
--- a/src/app/pages/explorer-page/explorer-page.component.html
+++ b/src/app/pages/explorer-page/explorer-page.component.html
@@ -73,7 +73,7 @@
<div>
<p class="heading">Nodes</p>
<p class="title">
- {{ currentViewNodes.length }}
+ {{ currentViewNodes != null ? currentViewNodes.length :0 }}
</p>
</div>
</div>
@@ -81,7 +81,7 @@
<div>
<p class="heading">Interactions</p>
<p class="title">
- {{ currentViewEdges.length }}
+ {{ currentViewEdges!=null ? currentViewEdges.length :0 }}
</p>
</div>
</div>
@@ -599,7 +599,7 @@
<span class="icon">
<i class="fas fa-tasks" aria-hidden="true"></i>
</span>
- Tasks ({{ analysis.tasks.length }})
+ Tasks ({{ analysis.tasks != null ? analysis.tasks.length : 0 }})
</p>
<a
(click)="collapseTask = !collapseTask"
diff --git a/src/app/pages/explorer-page/explorer-page.component.ts b/src/app/pages/explorer-page/explorer-page.component.ts
index b8536b59aa7a6295c596f2397b08d75c2da1212b..1009341cda87cf7dc5d5407d3f0b92977d3382e4 100644
--- a/src/app/pages/explorer-page/explorer-page.component.ts
+++ b/src/app/pages/explorer-page/explorer-page.component.ts
@@ -158,8 +158,8 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
public selectedAnalysisToken: string | null = null;
@Input() set taskId(token: string | null) {
- if(token ==null || token.length==0)
- this.selectedAnalysisToken=null
+ if (token == null || token.length === 0)
+ this.selectedAnalysisToken = null
this.selectedAnalysisToken = token;
}
@@ -198,7 +198,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
return;
}
if (selected !== null) {
- if (items.length === 0) {
+ if (items == null || items.length === 0) {
return;
}
const updatedNodes = [];
@@ -275,7 +275,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
const network = JSON.parse(this.networkJSON);
// map data to nodes in backend
- if (network.nodes.length) {
+ if (network.nodes != null && network.nodes.length) {
network.nodes = await this.netex.mapNodes(network.nodes, this.myConfig.identifier);
}
@@ -376,11 +376,8 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
const {nodes, edges} = this.proteinData.mapDataToNetworkInput(this.myConfig);
- console.log('nodes', nodes)
- console.log('edges', edges)
if (this.myConfig.autofillEdges && nodes.length) {
const netexEdges = await this.netex.fetchEdges(nodes, this.myConfig.interactionProteinProtein);
- console.log(netexEdges.map(netexEdge => mapNetexEdge(netexEdge, this.myConfig)))
edges.push(...netexEdges.map(netexEdge => mapNetexEdge(netexEdge, this.myConfig)))
}
@@ -393,7 +390,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
this.networkInternal.on('doubleClick', (properties) => {
const nodeIds: Array<string> = properties.nodes;
- if (nodeIds.length > 0) {
+ if (nodeIds != null && nodeIds.length > 0) {
const nodeId = nodeIds[0];
const node = this.nodeData.nodes.get(nodeId);
if (node.netexId === undefined || !node.netexId.startsWith('p')) {
@@ -411,7 +408,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
this.networkInternal.on('click', (properties) => {
const nodeIds: Array<string> = properties.nodes;
- if (nodeIds.length > 0) {
+ if (nodeIds != null && nodeIds.length > 0) {
const nodeId = nodeIds[0];
const node = this.nodeData.nodes.get(nodeId);
const wrapper = getWrapperFromNode(node);
diff --git a/src/app/services/analysis/analysis.service.ts b/src/app/services/analysis/analysis.service.ts
index 86b584b1a3efaa7d5e7aeeafd542f6b562e002b9..85e375f1304da72051d00284101eabcf9c27cc4d 100644
--- a/src/app/services/analysis/analysis.service.ts
+++ b/src/app/services/analysis/analysis.service.ts
@@ -224,7 +224,8 @@ export class AnalysisService {
}
getSelection(): Wrapper[] {
- return Array.from(this.selectedItems.values());
+ const out = Array.from(this.selectedItems.values());
+ return out != null ? out : [];
}
getCount(): number {
diff --git a/src/stylesheets/styles.scss b/src/stylesheets/styles.scss
index 4f118ead46459a8ca5e4a1e35b0fe8b215dcc18e..7249708febfb74ed842b6c67ed92d9030b4d1c61 100644
--- a/src/stylesheets/styles.scss
+++ b/src/stylesheets/styles.scss
@@ -6,6 +6,11 @@
@import "variables";
#appWindow {
+ @import '~@ng-select/ng-select/themes/default.theme';
+
+ .ng-dropdown-panel .ng-dropdown-panel-items {
+ max-height: 150px !important;
+ }
.fullheight {
diff --git a/src/stylesheets/theme-styles.scss b/src/stylesheets/theme-styles.scss
index 2548f0979e16759b03a4b97bab11bd63682a2b52..85a906fd88c0275ee195413ddc552fbfd3bc9812 100644
--- a/src/stylesheets/theme-styles.scss
+++ b/src/stylesheets/theme-styles.scss
@@ -5,13 +5,13 @@
--drgstn-warning: #ffdd00;
--drgstn-danger: #c527ff;
--drgstn-background: #ffffff;
- --drgstn-panel: #f8f8f8;
+ --drgstn-panel: #f7f7f7;
--drgstn-info: #61c43d;
--drgstn-text-primary: #020202;
--drgstn-text-secondary: #eeeeee;
--drgstn-border: rgba(0, 0, 0, 0.2);
--drgstn-tooltip: rgba(74, 74, 74, 0.9);
- --drgstn-panel-secondary: #ffffff
+ --drgstn-panel-secondary: #fafafa
}
#appWindow {
@@ -77,20 +77,24 @@
color: var(--drgstn-text-primary) !important;
}
+ .modal-card-head, .modal-card-foot {
+ background-color: var(--drgstn-border) !important;
+ }
+
.modal-card-body {
.label {
color: var(--drgstn-text-primary) !important;
}
.input, .select select, .textarea, .box {
- background-color: var(--drgstn-panel) !important;
+ background-color: var(--drgstn-panel-secondary) !important;
border-color: var(--drgstn-border) !important;
color: var(--drgstn-text-primary) !important;
}
}
.input, .select select, .textarea, .box {
- background-color: var(--drgstn-panel) !important;
+ background-color: var(--drgstn-panel-secondary) !important;
border-color: var(--drgstn-border) !important;
}
@@ -270,7 +274,7 @@
// scrolllbar styles
network-expander {
--thumbBG: var(--drgstn-primary) !important;
- --scrollbarBG: var(--drgstn-background) !important;
+ --scrollbarBG: var(--drgstn-panel) !important;
scrollbar-width: thin !important;
scrollbar-color: var(--thumbBG) var(--scrollbarBG) !important;