From 8ad4dc52e5559fdcf40ed15c45f17a98d07777eb Mon Sep 17 00:00:00 2001 From: TripZz Date: Thu, 7 Dec 2023 15:32:40 +0100 Subject: [PATCH 1/6] NN-410 Bug fixes (Chrome compability) -Toolbar is not correctly displayed for large resolution. (Space between main/sub element) -Dropdown menu of search field is not correctly displayed. (Chrome compatibility) -Save graph sub window is not correctly aligned. --- .../src/components/interface/SearchField.vue | 20 ++++++++++++++----- .../pane/modules/node/NetworkStatistics.vue | 4 ++-- .../components/toolbar/windows/MenuWindow.vue | 15 ++++++++++++-- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/interface/SearchField.vue b/frontend/src/components/interface/SearchField.vue index 675be801..20b4ba65 100644 --- a/frontend/src/components/interface/SearchField.vue +++ b/frontend/src/components/interface/SearchField.vue @@ -66,11 +66,21 @@ export default { height: 3.98%; display: flex; position: absolute; - backdrop-filter: blur(7.5px); align-content: center; justify-content: center; } +#search-menu:after { + content:""; + position:absolute; + z-index: 1; + top:0; + left:0; + width:100%; + height:100%; + backdrop-filter: blur(7.5px); +} + .search-field{ width: 100%; height: 100%; @@ -113,10 +123,10 @@ opacity: 70%; } #search-menu .results { - position: fixed; - width: 19.84%; - max-height: 20%; - top: 5.78%; + position: absolute; + width: 100%; + left: 0%; + top: 100%; padding: 0.3% 0 0.3% 0; border-radius: 0 0 5px 5px; background: rgba(222, 222, 222, 0.3); diff --git a/frontend/src/components/pane/modules/node/NetworkStatistics.vue b/frontend/src/components/pane/modules/node/NetworkStatistics.vue index f0f38b17..6a16f82b 100644 --- a/frontend/src/components/pane/modules/node/NetworkStatistics.vue +++ b/frontend/src/components/pane/modules/node/NetworkStatistics.vue @@ -80,8 +80,8 @@ export default { } .pane_values{ - position: fixed; - left: 90.5%; + position: absolute; + left: 68.5%; } .statistics-attr{ diff --git a/frontend/src/components/toolbar/windows/MenuWindow.vue b/frontend/src/components/toolbar/windows/MenuWindow.vue index 939e784c..d86c7359 100644 --- a/frontend/src/components/toolbar/windows/MenuWindow.vue +++ b/frontend/src/components/toolbar/windows/MenuWindow.vue @@ -91,11 +91,10 @@ export default { left: 3.515%; height: fit-content; width: 22%; - top: 5.78%; + top: 4.98%; padding: 0.3% 0 0.3% 0; border-radius: 0 0 5px 5px; background: rgba(222, 222, 222, 0.61); - backdrop-filter: blur(7.5px); overflow-y: scroll; overflow-x: hidden; color: white; @@ -103,6 +102,18 @@ export default { border-top-width: 1px; border-top-style: solid; cursor: default; + z-index: 1; +} + +.menu-window:after { + content:""; + position:absolute; + z-index: -1; + top:0; + left:0; + width:100%; + height:100%; + backdrop-filter: blur(7.5px); } .menu-items { From 5145def2b76f90d9cc5db46026e4abe8c7ec4a49 Mon Sep 17 00:00:00 2001 From: TripZz Date: Sat, 9 Dec 2023 13:51:38 +0100 Subject: [PATCH 2/6] NN-415 Grid view for term graph section - fix resolution problems with snapshot of graph --- frontend/src/components/enrichment/graph/SnapshotGraph.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/components/enrichment/graph/SnapshotGraph.vue b/frontend/src/components/enrichment/graph/SnapshotGraph.vue index 9821c149..b2ff1d83 100644 --- a/frontend/src/components/enrichment/graph/SnapshotGraph.vue +++ b/frontend/src/components/enrichment/graph/SnapshotGraph.vue @@ -69,5 +69,6 @@ export default { width: 100%; position: absolute; overflow: scroll; + object-fit: scale-down; } \ No newline at end of file From e23546944183c8c6b00ed0655535ead9fb194901 Mon Sep 17 00:00:00 2001 From: TripZz Date: Sat, 9 Dec 2023 14:13:32 +0100 Subject: [PATCH 3/6] NN-415 Grid view for term graph section - permanently show graph names --- frontend/src/components/enrichment/graph/PathwayGraph.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/enrichment/graph/PathwayGraph.vue b/frontend/src/components/enrichment/graph/PathwayGraph.vue index cd3991a3..51eb32a3 100644 --- a/frontend/src/components/enrichment/graph/PathwayGraph.vue +++ b/frontend/src/components/enrichment/graph/PathwayGraph.vue @@ -2,9 +2,9 @@
-
-
- +
+
+
From a8350904eef10c065118e145253ebba80e637588 Mon Sep 17 00:00:00 2001 From: TripZz Date: Sat, 9 Dec 2023 18:25:25 +0100 Subject: [PATCH 4/6] NN-415 Grid view for term graph section - implement a grid view of the generated term graphs --- .../components/enrichment/graph/PathwayGraph.vue | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/frontend/src/components/enrichment/graph/PathwayGraph.vue b/frontend/src/components/enrichment/graph/PathwayGraph.vue index 51eb32a3..4c77b900 100644 --- a/frontend/src/components/enrichment/graph/PathwayGraph.vue +++ b/frontend/src/components/enrichment/graph/PathwayGraph.vue @@ -156,11 +156,12 @@ export default { .graph-section .slider { position: absolute; - width: 90.78%; + width: 100%; height: 100%; display: flex; - align-items: center; - overflow-x: scroll; + padding: 1%; + flex-wrap: wrap; + overflow-y: scroll; scroll-behavior: smooth; scroll-snap-type: x mandatory; @@ -179,11 +180,9 @@ export default { .graph-section .slider .graph{ position: relative; - width: 31.4%; - height: 71.71%; + width: 20%; + height: 50%; flex-shrink: 0; - margin: 0% 1% 0% 1%; - border-radius: 5px; border: 1px solid #FFF; background: rgba(217, 217, 217, 0.12); transform-origin: center center; From 5df0514435d644367b438de0fdca745495fb2071 Mon Sep 17 00:00:00 2001 From: TripZz Date: Sat, 9 Dec 2023 19:17:28 +0100 Subject: [PATCH 5/6] NN-418 Add more attributes to the pane --- .../src/components/pane/modules/node/NetworkStatistics.vue | 7 ++++--- frontend/src/components/pane/modules/node/NodePane.vue | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/pane/modules/node/NetworkStatistics.vue b/frontend/src/components/pane/modules/node/NetworkStatistics.vue index 6a16f82b..9c140c24 100644 --- a/frontend/src/components/pane/modules/node/NetworkStatistics.vue +++ b/frontend/src/components/pane/modules/node/NetworkStatistics.vue @@ -28,7 +28,7 @@ export default { name: 'NetworkStatistics', - props: ['active_node'], + props: ['active_node','mode'], data() { return { statistics: {} @@ -42,8 +42,9 @@ export default { return; } - const { Degree, "Ensembl ID": EnsemblID } = com.active_node.attributes; - com.statistics = { Degree, EnsemblID } + const { Degree, "Ensembl ID": EnsemblID, "Betweenness Centrality": BetweenesCentrality, "Modularity Class": Cluster, PageRank, Category, FDR} = com.active_node.attributes; + if (this.mode == "protein") com.statistics = { Cluster, Degree, EnsemblID, BetweenesCentrality, PageRank } + else com.statistics = { Cluster, Degree, EnsemblID,Category, BetweenesCentrality, PageRank, FDR } if(com.$store.state.dcoloumns != null) { com.$store.state.dcoloumns.forEach(dcoloumn => { com.statistics[dcoloumn] = com.active_node.attributes[dcoloumn] diff --git a/frontend/src/components/pane/modules/node/NodePane.vue b/frontend/src/components/pane/modules/node/NodePane.vue index 49e7fa4d..46a07cbc 100644 --- a/frontend/src/components/pane/modules/node/NodePane.vue +++ b/frontend/src/components/pane/modules/node/NodePane.vue @@ -19,6 +19,7 @@
From 9f4a39701479cb36ea0d8865aa523006afa70f4a Mon Sep 17 00:00:00 2001 From: TripZz Date: Sat, 9 Dec 2023 19:18:57 +0100 Subject: [PATCH 6/6] NN-418 Add more attributes to pane --- frontend/src/components/pane/modules/pathway/PathwayPane.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/components/pane/modules/pathway/PathwayPane.vue b/frontend/src/components/pane/modules/pathway/PathwayPane.vue index b06cbd02..2536dd58 100644 --- a/frontend/src/components/pane/modules/pathway/PathwayPane.vue +++ b/frontend/src/components/pane/modules/pathway/PathwayPane.vue @@ -23,6 +23,7 @@