Skip to content

Commit d0c963f

Browse files
bilalesibilalesi
committed
Merge branch 'develop' into entitycore-migration 16/06
2 parents 2fdba33 + 8b1ab52 commit d0c963f

File tree

100 files changed

+1097
-509
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1097
-509
lines changed

‎.deployment-envs/.env.production‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ NEXT_PUBLIC_SYNTHESIS_URL=https://synthesis.sbo.kcp.bbp.epfl.ch/synthesis-with-r
88
NEXT_PUBLIC_ME_MODEL_ANALYSIS_WS_URL=wss://yyuu69y9fk.execute-api.us-east-1.amazonaws.com/prod/ # TODO: check if correct
99
NEXT_PUBLIC_VIRTUAL_LAB_API_URL=https://www.openbraininstitute.org/api/virtual-lab-manager
1010
NEXT_PUBLIC_BBS_ML_BASE_URL=https://www.openbraininstitute.org/api/literature
11+
NEXT_PUBLIC_NOTEBOOK_SERVICE_BASE_URL=https://www.openbraininstitute.org/api/notebook_service
1112

1213
NEXT_PUBLIC_MATOMO_URL="https://openbraininstitute.matomo.cloud"
1314
NEXT_PUBLIC_MATOMO_CDN_URL="https://cdn.matomo.cloud/openbraininstitute.matomo.cloud"

‎.deployment-envs/.env.staging‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ NEXT_PUBLIC_SYNTHESIS_URL=https://synthesis.sbo.kcp.bbp.epfl.ch/synthesis-with-r
88
NEXT_PUBLIC_ME_MODEL_ANALYSIS_WS_URL=wss://8sjpv70kgl.execute-api.us-east-1.amazonaws.com/prod/
99
NEXT_PUBLIC_VIRTUAL_LAB_API_URL=https://staging.openbraininstitute.org/api/virtual-lab-manager
1010
NEXT_PUBLIC_BBS_ML_BASE_URL=https://staging.openbraininstitute.org/api/literature
11+
NEXT_PUBLIC_NOTEBOOK_SERVICE_BASE_URL=https://staging.openbraininstitute.org/api/notebook_service
12+
1113

1214
NEXT_PUBLIC_MATOMO_URL="https://openbraininstitute.matomo.cloud"
1315
NEXT_PUBLIC_MATOMO_CDN_URL="https://cdn.matomo.cloud/openbraininstitute.matomo.cloud"

‎.env.development‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ NEXT_PUBLIC_SYNTHESIS_URL=https://synthesis.sbo.kcp.bbp.epfl.ch/synthesis-with-r
1414
NEXT_PUBLIC_ME_MODEL_ANALYSIS_WS_URL=wss://8sjpv70kgl.execute-api.us-east-1.amazonaws.com/prod/
1515
NEXT_PUBLIC_VIRTUAL_LAB_API_URL=https://staging.openbraininstitute.org/api/virtual-lab-manager
1616
NEXT_PUBLIC_BBS_ML_BASE_URL=https://staging.openbraininstitute.org/api/literature
17+
NEXT_PUBLIC_NOTEBOOK_SERVICE_BASE_URL=https://staging.openbraininstitute.org/api/notebook_service
1718

1819
MAILCHIMP_API_KEY='dummy'
1920
MAILCHIMP_AUDIENCE_ID='dummy'
@@ -25,7 +26,9 @@ NEXT_PUBLIC_AI_AGENT_URL="https://staging.openbraininstitute.org/api/agent/"
2526
NEXT_PUBLIC_DEFAULT_BRAIN_REGION_HIERARCHY_ID="e3e70682-c209-4cac-a29f-6fbed82c07cd"
2627
NEXT_PUBLIC_DEFAULT_SELECTED_BRAIN_REGION_ID="4642cddb-4fbe-4aae-bbf7-0946d6ada066"
2728
NEXT_PUBLIC_BASIC_CELL_GROUPS_AND_REGIONS_BRAIN_REGION_ANNOTATION_VALUE=8
28-
NEXT_PUBLIC_DEFAULT_BRAIN_ATLAS_ID="a25231be-54c0-4a14-a89a-a1b1c7bd5837"
29-
NEXT_PUBLIC_ROOT_BRAIN_REGION_ID="f728b4fa-4248-4e3a-8a5d-2f346baa9455"
29+
NEXT_PUBLIC_DEFAULT_BRAIN_ATLAS_ID="55de9d7b-9796-41f9-b719-213c3305ffd7"
30+
NEXT_PUBLIC_ROOT_BRAIN_REGION_ID="eb1167b3-67a9-4378-bc65-c1e582e2e662"
3031
NEXT_PUBLIC_ROOT_BRAIN_REGION_ANNOTATION_VALUE=997
32+
3133
NEXT_PUBLIC_ENABLE_RUN_NOTEBOOK=True
34+
NEXT_PUBLIC_DEPLOYMENT_ENV="staging"

‎.env.development-next‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ NEXT_PUBLIC_ENTITY_CORE_PUBLIC_PROJECT_ID="0dbced5f-cc3d-488a-8c7f-cfb8ea039dc6"
3232
NEXT_PUBLIC_DEFAULT_BRAIN_REGION_HIERARCHY_ID="e3e70682-c209-4cac-a29f-6fbed82c07cd"
3333
NEXT_PUBLIC_DEFAULT_SELECTED_BRAIN_REGION_ID="4642cddb-4fbe-4aae-bbf7-0946d6ada066"
3434
NEXT_PUBLIC_BASIC_CELL_GROUPS_AND_REGIONS_BRAIN_REGION_ANNOTATION_VALUE=8
35-
NEXT_PUBLIC_DEFAULT_BRAIN_ATLAS_ID="a25231be-54c0-4a14-a89a-a1b1c7bd5837"
36-
NEXT_PUBLIC_ROOT_BRAIN_REGION_ANNOTATION_VALUE=997
35+
NEXT_PUBLIC_DEFAULT_BRAIN_ATLAS_ID="55de9d7b-9796-41f9-b719-213c3305ffd7"
3736
NEXT_PUBLIC_ROOT_BRAIN_REGION_ID="eb1167b3-67a9-4378-bc65-c1e582e2e662"
37+
NEXT_PUBLIC_ROOT_BRAIN_REGION_ANNOTATION_VALUE=997

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,14 @@
113113
"react-error-boundary": "^5.0.0",
114114
"react-intersection-observer": "^9.5.2",
115115
"react-ipynb-renderer": "^2.2.4",
116-
"react-markdown": "^9.0.3",
117116
"react-pdf": "^9.2.1",
117+
"react-markdown": "^9.1.0",
118118
"react-plotly.js": "^2.6.0",
119119
"react-resizable": "^3.0.5",
120120
"react-select": "^5.7.3",
121121
"react-syntax-highlighter": "^15.6.1",
122122
"sharp": "^0.34.1",
123+
"rehype-raw": "^7.0.0",
123124
"swiper": "^11.1.14",
124125
"tar-stream": "^3.1.7",
125126
"three": "^0.159.0",
@@ -181,4 +182,4 @@
181182
"@types/react": "19.1.0",
182183
"@types/react-dom": "19.1.1"
183184
}
184-
}
185+
}

‎pnpm-lock.yaml‎

Lines changed: 10 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/api/virtual-lab-svc/queries/bookmark.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,17 @@ export async function bookmarkToProjectLibrary(
2727
): Promise<AddBookmarkResponse> {
2828
const api = await virtualLabRootApi();
2929
const url = `${baseUri}/${virtualLabId}/projects/${projectId}/bookmarks`;
30+
3031
return await api.post<AddBookmarkResponse>(url, {
3132
body: {
3233
entity_id,
3334
resource_id,
3435
category,
3536
},
37+
headers: {
38+
'Content-Type': 'application/json',
39+
Accept: 'application/json',
40+
},
3641
});
3742
}
3843

‎src/app/app/documentation/ai-chat-tools/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default function ChatToolsPage() {
2121
<Link
2222
href={`/app/documentation/ai-chat-tools/${tool.id}`}
2323
key={tool.id}
24-
className="border-primary-6 bg-primary-9 hover:bg-primary-8 rounded-lg border border-solid px-5 py-4 text-white transition-colors duration-300 ease-in-out"
24+
className="rounded-lg border border-solid border-primary-6 bg-primary-9 px-5 py-4 text-white transition-colors duration-300 ease-in-out hover:bg-primary-8"
2525
>
2626
<h2 className="text-xl font-semibold">{tool.name}</h2>
2727
</Link>

‎src/app/app/documentation/features/page.tsx‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
export default function NewFeaturesPage() {
2+
return (
3+
<div className="flex h-full w-full flex-col items-center justify-center">
4+
<h1 className="text-2xl font-bold text-white">New Features</h1>
5+
<p className="mt-4 text-lg text-gray-300">
6+
Stay tuned for the latest updates and features coming soon!
7+
</p>
8+
</div>
9+
);
10+
}

‎src/app/app/documentation/glossary/page.tsx‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
'use client';
2+
3+
import { useState } from 'react';
4+
5+
import GlossaryContent from '@/components/documentation/glossary/glossary-content';
6+
import GlossaryTableOfContent from '@/components/documentation/glossary/glossary-table-of-content';
7+
import {
8+
ContentForGlossaryItem,
9+
useSanityContentForGlossary,
10+
} from '@/components/documentation/hooks/use-sanity-content-for-glossary';
11+
12+
export default function FullGlossaryPage() {
13+
const content = useSanityContentForGlossary();
14+
15+
const [activeItem, setActiveItem] = useState<ContentForGlossaryItem | null>(null);
16+
17+
return (
18+
<div className="flex w-full flex-row">
19+
<GlossaryTableOfContent
20+
content={content}
21+
activeItem={activeItem}
22+
setActiveItem={setActiveItem}
23+
/>
24+
25+
<div className="w-full">{activeItem && <GlossaryContent activeItem={activeItem} />}</div>
26+
</div>
27+
);
28+
}

0 commit comments

Comments
 (0)