Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Frontend update. #51

Merged
merged 74 commits into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
f10659e
NN-340 Implement new pathway menu according to frontend design
TripZz Aug 18, 2023
ef20c2d
NN-340 Implement a minimize function with a good looking animation fo…
TripZz Aug 20, 2023
9fea276
NN-340 Implemented the pathway table structure
TripZz Aug 29, 2023
fecf81e
NN-340 Improved the favourite system by removing bugs
TripZz Aug 30, 2023
0d071d9
NN-340 Implemented the bookmark button
TripZz Aug 30, 2023
8597dc6
NN-340 Added the layer visualization button
TripZz Aug 30, 2023
ae68879
NN-340 Implement Pathway search area with search function
TripZz Sep 1, 2023
68075cc
NN-340 Fixing bugs correlated to up/down scrolling with keyboard
TripZz Sep 1, 2023
c95fb9e
NN-340 Implemented the export function for pathways
TripZz Sep 1, 2023
e9e1e07
NN-340 Add the alphabetical sort of pathway names
TripZz Sep 4, 2023
844a3c5
NN-340 Added the category filtering to the pathway pane
TripZz Sep 5, 2023
6b7cb6b
NN-340 Added new functions to filter systems
TripZz Sep 5, 2023
6c4c401
NN-340 Adjusted the design and usability
TripZz Sep 5, 2023
cf5382d
NN-340 Smaller design adjustments
TripZz Sep 5, 2023
00c2aed
NN-340 Implemented the base construct of pathway graphs overview
TripZz Sep 13, 2023
b04148b
NN-340 Adjusted the selection of pathway graphs
TripZz Sep 13, 2023
e833663
NN-340 Implemented favourite tab system
TripZz Sep 13, 2023
590bb21
NN-340 Add the apply/revert function and adjusted some parts
TripZz Sep 15, 2023
f144673
NN-340 Add shown pathway numbers on pathways list
TripZz Sep 15, 2023
545a8c3
NN-358 Implemented a global search function for proteins
TripZz Sep 19, 2023
b1d7f75
NN-358 Fixed an error
TripZz Sep 20, 2023
7589e0d
NN-363 Complete implementation of individual dynamic pathway heatmap
TripZz Oct 6, 2023
7b1efc0
NN-363 Implement the UI for heatmap generation
TripZz Oct 11, 2023
9db1284
NN-363 Implement a splitscreen for heatmap
TripZz Oct 11, 2023
9bb5fce
NN-365 Implement a static heatmap for split screen
TripZz Oct 13, 2023
155ec60
NN-365 Implement a dynamic view for legend
TripZz Oct 13, 2023
88627e6
NN-365 Adjusted values of heatmap legend
TripZz Oct 13, 2023
d0e6d05
NN-363 Added an export the heatmap feature
TripZz Oct 13, 2023
1d1e1ec
NN-361 Implement the pathway graph generation for only visible pathways
TripZz Oct 16, 2023
4c78c20
NN-366 Redesign/implement & organize the concept maintoolbar
TripZz Oct 17, 2023
d96ecb5
NN-366 Adjusted the design and restructure protein list
TripZz Oct 19, 2023
2623f4f
NN-366 Implement checkboxes for menu window
TripZz Oct 19, 2023
8fc608c
NN-366 Implement edge opacity function & slider + label reset
TripZz Oct 19, 2023
b7a1101
NN-366 Implement de-value selection
TripZz Oct 20, 2023
926771f
NN-366 Implement export graph section of toolbar
TripZz Oct 22, 2023
f26cd8a
NN-366 Implemented new graph parameter selection window
TripZz Oct 23, 2023
a807fe9
Adjusted background color on 3d view
TripZz Oct 23, 2023
b3c58be
NN-368 Implemented a basic structure and design for pane system
TripZz Oct 23, 2023
753a57f
NN-368 Further advance the structure of the node pane
TripZz Oct 26, 2023
65f6648
NN-368 Implemented informations section for node pane
TripZz Oct 30, 2023
89ac0c5
NN-368 Implemented connected protein section
TripZz Oct 30, 2023
f062db1
NN-368 Removed unused logs
TripZz Oct 30, 2023
8414da3
NN-368 Implemented network statistics section
TripZz Oct 30, 2023
365a4a2
NN-368 Removed Chatbot & Implemented routing section
TripZz Nov 2, 2023
e5cc514
NN-378 Implemented pathways pane
TripZz Nov 2, 2023
a274b17
NN-378 Border correction
TripZz Nov 2, 2023
827f036
NN-378 corrected bugs correlated to issue
TripZz Nov 2, 2023
90874d8
NN-379 Implement subset pane with new structure & design
TripZz Nov 2, 2023
f0454f6
NN-382 Implement the difexp pane with new design
TripZz Nov 5, 2023
393f9ab
NN-382 Adjusted coloring difexp pane
TripZz Nov 6, 2023
aa00f00
NN-383 Implemented pathway layer pane
TripZz Nov 9, 2023
06b51ae
NN-383 Adjustments to visual
TripZz Nov 9, 2023
0b84002
Rewriting of Frontend, Backend and queries to use new DB
kataikko Sep 11, 2023
b22c5e0
NN-388 Rebased to master & changed diverged classes
TripZz Nov 12, 2023
7dd2cf9
NN-389 Implemented a global pathway application
TripZz Nov 13, 2023
081a079
NN-390 Added nodes/edges score to the graphical overview
TripZz Nov 13, 2023
f21a7bb
NN-392 Add the automatic generation of pathway graph
TripZz Nov 13, 2023
b1d7490
NN-389 Fixed the unwanted revertion of pathway set
TripZz Nov 13, 2023
caf1e9b
NN-389 Adjusted priority for global pathway generation
TripZz Nov 13, 2023
ebc502d
NN-391 Adjusted the pathway graph according to the gene graph
TripZz Nov 20, 2023
0c5d4d5
NN-391 Implement the hide function for subsets in pathway graph
TripZz Nov 20, 2023
2febc2f
NN-391 Implemented pathway list to pathway graph
TripZz Nov 23, 2023
16cfb3e
NN-391 Removed unnecessary code
TripZz Nov 23, 2023
e792f27
NN-391 Implement the graph/pathway selection menu
TripZz Nov 26, 2023
aee01a3
NN-395 Change the background color for pathway graph
TripZz Nov 26, 2023
c22e51d
NN-396 Fixed the rectangular select for pathway graph
TripZz Nov 26, 2023
31b9177
NN-397 Add loading symbol to pathway set generation
TripZz Nov 26, 2023
d63e573
NN-398 Enabled the multiple selection for pathway categories
TripZz Nov 27, 2023
e5f7a8b
NN-399 Added responsive design to toolbar
TripZz Nov 27, 2023
014cd9e
NN-395 Add indication for graph type
TripZz Nov 27, 2023
bdf03f2
Fixing some minor bugs
TripZz Nov 27, 2023
bf70b41
NN-400 Added cluster identification for module selection
TripZz Nov 27, 2023
a41d57b
Fixing rebase errors
TripZz Nov 30, 2023
d141c5f
NN-402 Added a function to window menu for exporting proteins as csv
TripZz Nov 30, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion backend/src/enrichment.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ def functional_enrichment(driver: neo4j.Driver, in_genes, species_id: Any):
csv.field_size_limit(sys.maxsize)

# Read Terms and put into Dataframe
df_terms = pd.DataFrame(queries.get_enrichment_terms(driver, species_id))
tot_tests = len(df_terms)

stopwatch.round("setup_enrichment")
Expand Down
2 changes: 2 additions & 0 deletions backend/src/enrichment_graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ def get_functional_graph(list_enrichment, species_id):
terms, source, target, score = queries.get_terms_connected_by_overlap(driver, list_term, species_id)

stopwatch.round("Neo4j")

if len(terms) == 0: return

nodes = pd.DataFrame(terms).rename(columns={"Term": "external_id"}).drop_duplicates(subset="external_id")

Expand Down
3 changes: 2 additions & 1 deletion backend/src/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import queries
import signal
from util.stopwatch import Stopwatch
import g4f, asyncio

app = Flask(__name__)

Expand Down Expand Up @@ -73,7 +74,6 @@ def proteins_enrichment():
json_str = json.dumps(list_enrichment.to_dict("records"), ensure_ascii=False, separators=(",", ":"))
return Response(json_str, mimetype="application/json")


# ====================== Subgraph API ======================
# request comes from home.js
# TODO Refactor this
Expand Down Expand Up @@ -110,6 +110,7 @@ def proteins_subgraph_api():
pd.DataFrame(proteins).rename(columns={"ENSEMBL_PROTEIN": "external_id"}).drop_duplicates(subset="external_id")
)


edges = pd.DataFrame({"source": source, "target": target, "score": score})
edges = edges.drop_duplicates(subset=["source", "target"])

Expand Down
1 change: 0 additions & 1 deletion backend/src/queries.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ def get_protein_associations(
result = session.run(query)
return _convert_to_connection_info_score(result=result, _int=True, protein=True)


def get_enrichment_terms(driver: neo4j.Driver, species_id: int) -> list[dict[str, Any]]:
if species_id == 10090:
species = "Mus_Musculus"
Expand Down
1,899 changes: 1,147 additions & 752 deletions frontend/package-lock.json

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@
"3d-force-graph": "^1.71.1",
"axios": "^1.3.2",
"core-js": "^3.8.3",
"d3": "^7.8.4",
"d3": "^7.8.5",
"file-saver": "^2.0.5",
"graphology": "^0.25.1",
"imports-loader": "^4.0.1",
"jquery": "^3.6.3",
"mitt": "^3.0.0",
"ml-hclust": "^3.1.0",
"random-color-rgb": "^1.1.1",
"sigma": "^1.2.2",
"smallest-enclosing-circle": "^1.0.2",
Expand All @@ -33,7 +34,7 @@
"@vue/cli-plugin-babel": "~5.0.0",
"@vue/cli-plugin-eslint": "~5.0.0",
"@vue/cli-plugin-router": "~5.0.0",
"@vue/cli-service": "~5.0.0",
"@vue/cli-service": "^5.0.8",
"eslint": "^7.32.0",
"eslint-plugin-vue": "^8.0.3",
"versions": "^10.4.1"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/App.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="container">
<div class="container" id="container">
<router-view v-slot="{ Component }">
<keep-alive exclude="HomeView">
<component :is="Component" />
Expand Down
Binary file added frontend/src/assets/pane/follow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/pane/invisible.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/src/assets/pane/visible.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/pathwaybar/active.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/pathwaybar/arrows.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/pathwaybar/background-dna.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/pathwaybar/cross.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/pathwaybar/delete.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/pathwaybar/favorite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/pathwaybar/pathway-button-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/pathwaybar/pathway-button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions frontend/src/assets/pathwaybar/star-solid-checked.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions frontend/src/assets/pathwaybar/star-solid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/toolbar/google-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/toolbar/logout.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/toolbar/proteinselect.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading