Skip to content

Interactions view #153

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

Open
wants to merge 23 commits into
base: staging
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
fdec01f
transfered changes of InteractionsView from repos branch to main repo…
y330 Aug 8, 2024
5c1da39
Added topbar, added functionality for showing query gene when no gene…
y330 Aug 21, 2024
5b235f9
topbar modified
y330 Aug 26, 2024
56378cc
Added Legend, Added proper icons for topbar, as per design in eplant v2,
y330 Sep 15, 2024
8e11d0f
1. Tried to add load gene button to node popup, came to the conclusio…
y330 Sep 22, 2024
9759b93
Added more logic to filter, created FilterDialog.tsx
y330 Sep 30, 2024
492634b
nothing is working
y330 Oct 10, 2024
8855fd3
Updated filter dialog to actually contain all the neccesary elements …
y330 Oct 21, 2024
3f7ff85
Filters for interactions view are now functional! also made some twea…
y330 Oct 23, 2024
1947cbb
Cleaned up all errors, merged FilterDialog with Topbar for added func…
y330 Oct 29, 2024
a9951a4
added progress for load gene button
y330 Nov 12, 2024
df8c561
Merge branch 'staging' into yonah-InteractionsView
mwkyuen Dec 18, 2024
65c5184
Merge branch 'staging' into yonah-InteractionsView
mwkyuen Dec 18, 2024
e93004c
Fixed error where dashed PPI edges were not being drawn, also added c…
y330 Jan 2, 2025
e534524
converted async awaits to .then, cleaned up sublocalization fetch fun…
y330 Jan 16, 2025
c65f05f
Added snackbar alert for protein localization colour error. Interacti…
y330 Jan 30, 2025
eef5f25
Fixed loading error. Interactons view ready to merge
y330 Jan 30, 2025
c47f4fe
changes: Added jsdoc to all functions, changed colors of apply filter…
y330 Feb 25, 2025
6575026
removed unnessecary positionQueryBack function i added
y330 Feb 25, 2025
7b151ee
removed usless imports
y330 Feb 25, 2025
079ad90
lint:fix
y330 Feb 25, 2025
68b24ab
Merge remote-tracking branch 'master/staging' into test-interactions-…
bdls-jamal May 8, 2025
850a873
Revert "Merge remote-tracking branch 'master/staging' into test-inter…
bdls-jamal May 8, 2025
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
9 changes: 2 additions & 7 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module.exports = {
'react/react-in-jsx-scope': 'off',
'react/jsx-uses-react': 'off',
'simple-import-sort/imports': 'error',
'simple-import-sort/exports': 'error',
'simple-import-sort/exports': 'error'
},
'overrides': [
{
Expand Down Expand Up @@ -55,10 +55,5 @@ module.exports = {
]
}
}
],
"settings": {
"react": {
"version": "detect"
}
}
]
}
7 changes: 3 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@ jobs:
contents: read
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Use Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v3
with:
node-version: '22.x'
node-version: '20.x'
- run: npm ci
- run: npm run build
env:
BASE_URL: '/ePlant'
VITE_MAPS_API_KEY: ${{ secrets.VITE_MAPS_API_KEY }}
11 changes: 6 additions & 5 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,22 @@ jobs:
contents: read
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Use Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v3
with:
node-version: '22.x'
node-version: '20.x'
- run: npm ci
- run: npm run build
env:
BASE_URL: '/ePlant'
VITE_MAPS_API_KEY: ${{ secrets.VITE_MAPS_API_KEY }}
VITE_MAPS_ID: ${{ secrets.VITE_MAPS_ID }}
- run: mv dist _site
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
uses: actions/upload-pages-artifact@v2
deploy:
environment:
name: github-pages
Expand All @@ -41,4 +42,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
uses: actions/deploy-pages@v2
4 changes: 2 additions & 2 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v2

- name: Setup Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v3
with:
node-version: '20.x'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
Expand Down
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,11 @@ dist

# notes files
*-notes.md
.DS_Store
.DS_Store


# Docker (yonah)
.dockerignore
Dockerfile
Dockerfile.develop
docker-compose.yml
6 changes: 2 additions & 4 deletions Eplant/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ import ExperimentEFP from './views/ExperimentEFP'
import FallbackView from './views/FallbackView'
import GeneInfoView from './views/GeneInfoView'
import GetStartedView from './views/GetStartedView'
import NavigatorView from './views/NavigatorViewer'
import InteractionsViewer from './views/InteractionsViewer'
import PlantEFP from './views/PlantEFP'
import PublicationViewer from './views/PublicationViewer'
import WorldEFP from './views/WorldEFP'
import { type View } from './View'

export type EplantConfig = {
Expand All @@ -34,9 +33,8 @@ const userViews = [
PlantEFP,
CellEFP,
ExperimentEFP,
WorldEFP,
ChromosomeViewer,
NavigatorView,
InteractionsViewer,
]

// List of views that are used to lookup a view by id
Expand Down
2 changes: 1 addition & 1 deletion Eplant/state/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export function atomWithStorage<T>(

// TODO: This should probably be removed
// Atom with storage that doesn't persist when persistAtom is set to false
export function atomWithOptionalStorage<T>(
function atomWithOptionalStorage<T>(
key: string,
initialValue: T,
serialize: (value: T) => string = JSON.stringify,
Expand Down
Loading