diff --git a/README.md b/README.md index 8d00a222..fcea22bf 100644 --- a/README.md +++ b/README.md @@ -35,10 +35,10 @@ Check out our [Next.js deployment documentation](https://nextjs.org/docs/deploym # CFDE-KX ## Install -helm install cfde-gse maayanlab/docker-compose -f <(docker-compose config) -n cfde-gse --create-namespace +helm install lncrnalyzr maayanlab/docker-compose -f <(docker-compose config) -n lncrnalyzr --create-namespace ## UPGRADE -helm upgrade cfde-gse maayanlab/docker-compose -f <(docker-compose config) -n cfde-gse +helm upgrade lncrnalyzr maayanlab/docker-compose -f <(docker-compose config) -n lncrnalyzr helm template cfde-gse maayanlab/docker-compose -f <(docker-compose config) -n cfde-gse diff --git a/app/api/enrichment/augment/route.ts b/app/api/enrichment/augment/route.ts index 3044b827..273b2b87 100644 --- a/app/api/enrichment/augment/route.ts +++ b/app/api/enrichment/augment/route.ts @@ -148,7 +148,7 @@ const enrichment = async ({ query_list.push(query_part) if (gene_links && gene_links.length > 0) { const geneLinksRelations = schema.edges.reduce((acc, i)=>{ - if (i.gene_link) return [...acc, ...i.match] + if (i.hidden) return [...acc, ...i.match] else return acc }, []) for (const i of geneLinksRelations) { @@ -174,7 +174,7 @@ const enrichment = async ({ } if (gene_links && gene_links.length > 0) { const geneLinksRelations = schema.edges.reduce((acc, i)=>{ - if (i.gene_link) return [...acc, ...i.match] + if (i.hidden) return [...acc, ...i.match] else return acc }, []) for (const i of geneLinksRelations) { diff --git a/app/api/schema/route.ts b/app/api/schema/route.ts index 093d0727..186e17e3 100644 --- a/app/api/schema/route.ts +++ b/app/api/schema/route.ts @@ -83,7 +83,7 @@ export interface UISchema { { component: string, props?: { - [key:string]: string|number + [key:string]: string|number|boolean } } >>, diff --git a/components/Enrichment/EnrichmentBar.tsx b/components/Enrichment/EnrichmentBar.tsx index f927d3e5..08d7fd93 100644 --- a/components/Enrichment/EnrichmentBar.tsx +++ b/components/Enrichment/EnrichmentBar.tsx @@ -40,10 +40,10 @@ const renderCustomizedLabel = (props) => { {enrichr_label} - p-value: {precise(pval)} - q-value: {precise(qval)} - z-score: {precise(zscore)} - combined score: {precise(combined_score)} + { pval && p-value: {precise(pval)}} + { qval && q-value: {precise(qval)}} + { zscore && z-score: {precise(zscore)}} + { combined_score && combined score: {precise(combined_score)}} ) diff --git a/components/Enrichment/form.tsx b/components/Enrichment/form.tsx index faecf0a7..6e762a47 100644 --- a/components/Enrichment/form.tsx +++ b/components/Enrichment/form.tsx @@ -528,9 +528,9 @@ const GeneSetForm = ({ { fullWidth && - + {/* - + */} Select libraries to include diff --git a/components/Footer/index.tsx b/components/Footer/index.tsx index 8fcd4d26..fba43dae 100644 --- a/components/Footer/index.tsx +++ b/components/Footer/index.tsx @@ -11,7 +11,7 @@ export default function Footer({style, layout, footer_text}: { { component: string, props?: { - [key:string]: string|number + [key:string]: string|number|boolean } } >>, diff --git a/docker-compose.yml b/docker-compose.yml index d473e672..80ef8464 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,15 +5,15 @@ services: context: . dockerfile: ./Dockerfile.next platform: linux/amd64 - image: maayanlab/enrichr-kg:2.3.6.1 + image: maayanlab/lncrnalyzr:2.3.8 x-kubernetes: imagePullPolicy: IfNotPresent annotations: - maayanlab.cloud/ingress: https://enrichr-kg-dev.maayanlab.cloud + maayanlab.cloud/ingress: https://lncrnalyzr.maayanlab.cloud ports: - 3000:3000 environment: - - NEXT_PUBLIC_NEO4J_URL=bolt://neo4j:7687 + - NEXT_PUBLIC_NEO4J_URL=bolt://neo4j-v5:7687 - NEXT_PUBLIC_ENRICHR_URL=https://maayanlab.cloud/Enrichr - NEXT_PUBLIC_GENESHOT_URL=https://maayanlab.cloud/geneshot - NEXT_PUBLIC_NEO4J_USER @@ -26,12 +26,12 @@ services: - NEXT_PUBLIC_TURL - NEXT_PUBLIC_TURL_URL - neo4j: - image: neo4j:4.4 + neo4j-v5: + image: neo4j:5.19 x-kubernetes: imagePullPolicy: IfNotPresent environment: - - NEO4JLABS_PLUGINS='["apoc", "n10s"]' + - NEO4J_PLUGINS=["apoc", "n10s"] - NEO4J_AUTH=${NEXT_PUBLIC_NEO4J_USER}/${NEXT_PUBLIC_NEO4J_PASSWORD} - NEO4J_dbms_memory_heap_max__size=8G - NEO4J_dbms_memory_heap_initial__size=2G @@ -40,14 +40,30 @@ services: - 7687:7687 - 7474:7474 volumes: - - enrichr-kg-neo4j:/data - + - lncrnalyzr-neo4j-v5:/data + + enrichment: + image: maayanlab/independent_enrichment:0.0.9 + ports: + - 5000:80 + x-kubernetes: + imagePullPolicy: IfNotPresent + annotations: + maayanlab.cloud/ingress: https://lncrnalyzr.maayanlab.cloud/enrichment + environment: + - PREFIX + - LIBRARY_DOMAIN + volumes: - enrichr-kg-neo4j: + lncrnalyzr-neo4j: + x-kubernetes: + size: 25Gi + class: gp2 + lncrnalyzr-neo4j-v5: x-kubernetes: size: 25Gi class: gp2 x-kubernetes: - name: enrichr-kg - namespace: enrichr-kg + name: lncrnalyzr + namespace: lncrnalyzr diff --git a/package-lock.json b/package-lock.json index eb575a51..87f1d6a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cfde-knowledge-exchange", - "version": "2.3.6", + "version": "2.3.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cfde-knowledge-exchange", - "version": "2.3.6", + "version": "2.3.7", "dependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", diff --git a/package.json b/package.json index 57ce493c..6b7729ae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cfde-knowledge-exchange", - "version": "2.3.6", + "version": "2.3.8", "private": true, "scripts": { "dev": "NODE_ENV=development next dev", diff --git a/utils/math.ts b/utils/math.ts index 3b382f09..a31c6ba5 100644 --- a/utils/math.ts +++ b/utils/math.ts @@ -30,9 +30,9 @@ export const precise = (value: number | string) => { else { return convert_float(value) } - } else { + } else if (value) { if (value.split(".").length === 1) return value const val = Number.parseFloat(value) return convert_float(val) - } + } else return '' } \ No newline at end of file