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

Argo improvements #557

Merged
merged 5 commits into from
Feb 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 0 deletions screen2.0/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"@emotion/cache": "^11.13.1",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@hello-pangea/dnd": "^18.0.1",
"@mui/icons-material": "^6.1.5",
"@mui/lab": "6.0.0-beta.13",
"@mui/material": "^6.1.5",
Expand Down
9 changes: 0 additions & 9 deletions screen2.0/public/ArgoExample.bed

This file was deleted.

16 changes: 8 additions & 8 deletions screen2.0/public/ArgoExample.tsv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#Chromosome Start End Ref
chr12 53380319 53380320 AG
chr12 53380531 53380540 CGCCCCCTGC
chr12 53387214 53387220 GTGCTGG
chr12 53893108 53893120 AAGGCATGCATGT
chr12 53338940 53338943 CAGT
chr12 53409374 53409376 TCC
chr12 53386621 53386625 AGCTG
chr12 54212227 54212234 CTTTCATC
chr12 53380319 53380320 G
chr12 53380531 53380540 GCCCCCTGC
chr12 53387214 53387220 TGCTGG
chr12 53893108 53893120 AGGCATGCATGT
chr12 53338940 53338943 AGT
chr12 53409374 53409376 CC
chr12 53386621 53386625 GCTG
chr12 54212227 54212234 TTTCATC
2 changes: 1 addition & 1 deletion screen2.0/src/app/applets/argo/argoUpload.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ const ArgoUpload: React.FC<UploadProps> = ({
url: "https://downloads.wenglab.org/hg38.2bit",
regions: [{
chr1: region.chr,
start: region.start,
start: region.start + 1, // Start is not included when gathering the allele positions
end: region.end,
}],
},
Expand Down
9 changes: 5 additions & 4 deletions screen2.0/src/app/applets/argo/elements/elementTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { DataTable, DataTableColumn } from "@weng-lab/psychscreen-ui-components"
const ElementTable: React.FC<ElementTableProps> = ({
elementFilterVariables,
SubTableTitle,
elementRows
elementRows,
isolatedRows
}) => {
//handle column changes for the Element rank table
const elementColumns: DataTableColumn<ElementTableRow>[] = useMemo(() => {
Expand Down Expand Up @@ -38,11 +39,11 @@ const ElementTable: React.FC<ElementTableProps> = ({
<DataTable
key={Math.random()}
columns={elementColumns}
rows={elementRows === null ? [] : elementRows}
rows={elementRows === null ? [] : isolatedRows ? isolatedRows.element : elementRows}
sortDescending
itemsPerPage={10}
itemsPerPage={5}
searchable
tableTitle={<SubTableTitle title="Element Details (Overlapping cCREs)" />}
tableTitle={<SubTableTitle title="Element Details (Overlapping cCREs)" table="elements" />}
onRowClick={handlecCREClick}
/>
)
Expand Down
9 changes: 5 additions & 4 deletions screen2.0/src/app/applets/argo/genes/geneTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { DataTable, DataTableColumn } from "@weng-lab/psychscreen-ui-components"
const GeneTable: React.FC<GeneTableProps> = ({
geneFilterVariables,
SubTableTitle,
geneRows
geneRows,
isolatedRows
}) => {
//handle column changes for the Gene rank table
const geneColumns: DataTableColumn<GeneTableRow>[] = useMemo(() => {
Expand All @@ -32,11 +33,11 @@ const GeneTable: React.FC<GeneTableProps> = ({
<DataTable
key={Math.random()}
columns={geneColumns}
rows={geneRows === null ? [] : geneRows}
rows={geneRows === null ? [] : isolatedRows ? isolatedRows.gene : geneRows}
sortDescending
itemsPerPage={10}
itemsPerPage={5}
searchable
tableTitle={<SubTableTitle title="Gene Details" />}
tableTitle={<SubTableTitle title="Gene Details" table="genes" />}
onRowClick={handleRowClick}
/>
)
Expand Down
Loading