diff --git a/Dockerfile b/Dockerfile index dc1e572b2642d6d5a07a353ed7f81f4a496fe87e..a6277e7b767875f2530227bd79483a8ca1bd89f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,7 +74,7 @@ COPY --from=builder /iv/common /common # Copy the express server COPY --from=builder /iv/deploy . -# Copy built interactive viewer +# Copy built siibra explorer COPY --from=compressor /iv ./public RUN chown -R node:node /iv-app diff --git a/README.md b/README.md index 8fa559fc7b14673c1e0376be1c7d77ec5e51bd84..f07b241af7fde04ae316ee9219eab02c432e413b 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [](https://siibra-explorer.readthedocs.io/) [](https://opensource.org/licenses/Apache-2.0) -# siibra-explorer - Interactive viewer for multilevel brain atlases +# siibra-explorer - Interactive atlas viewer for multilevel brain atlases *Authors: Big Data Analytics Group, Institute of Neuroscience and Medicine (INM-1), Forschungszentrum Jülich GmbH* @@ -14,11 +14,11 @@ Copyright 2020-2021, Forschungszentrum Jülich GmbH ## Getting Started -A live version of the Interactive Atlas Viewer is available at [https://atlases.ebrains.eu/viewer/](https://atlases.ebrains.eu/viewer/). This section is useful for developers who would like to develop this project. +A live version of the siibra explorer is available at [https://atlases.ebrains.eu/viewer/](https://atlases.ebrains.eu/viewer/). This section is useful for developers who would like to develop this project. ### General information -Interactive atlas viewer is built with [Angular (v13.0)](https://angular.io/), [Bootstrap (v4)](http://getbootstrap.com/), and [fontawesome icons](https://fontawesome.com/). Some other notable packages used are [ngrx/store](https://github.com/ngrx/platform) for state management. +Siibra explorer is built with [Angular (v14.0)](https://angular.io/), [Bootstrap (v4)](http://getbootstrap.com/), and [fontawesome icons](https://fontawesome.com/). Some other notable packages used are [ngrx/store](https://github.com/ngrx/platform) for state management. Releases newer than [v0.2.9](https://github.com/HumanBrainProject/interactive-viewer/tree/v0.2.9) also uses a nodejs backend, which uses [passportjs](http://www.passportjs.org/) for user authentication, [express](https://expressjs.com/) as a http framework. diff --git a/build_env.md b/build_env.md index 81833e992e2dd7b5e484e0593cee4409e128c603..caaf0ecff1aeafe37746ee88345ada3a06479a39 100644 --- a/build_env.md +++ b/build_env.md @@ -1,6 +1,6 @@ # Build-time environment variables -As interactive atlas viewer uses [webpack define plugin](https://webpack.js.org/plugins/define-plugin/), where necessary, the environmental variables are `JSON.stringify`'ed and directly replaced in the code. +As siibra-explorer uses [webpack define plugin](https://webpack.js.org/plugins/define-plugin/), where necessary, the environmental variables are `JSON.stringify`'ed and directly replaced in the code. | name | description | default | example | | --- | --- | --- | --- | diff --git a/common/constants.js b/common/constants.js index be7e879b735c2d8b7719401e6679f5a748816264..0b92fb901782e568b9c8f2db52f9f7c9a79156b3 100644 --- a/common/constants.js +++ b/common/constants.js @@ -90,7 +90,7 @@ } exports.CONST = { - KG_TOS: `The interactive viewer queries HBP Knowledge Graph Data Platform ("KG") for published datasets. + KG_TOS: `Siibra explorer queries EBRAINS Knowledge Graph Data Platform ("KG") for published datasets. Access to the data and metadata provided through KG requires that you cite and acknowledge said data and metadata according to the Terms and Conditions of the Platform. diff --git a/deploy/README.md b/deploy/README.md index d049b659ca8aa92ad3942d89caeca5e7f3e70f70..0985ca15d1858657f9f1f050dfa60ce5c1cd12b5 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -1,13 +1,13 @@ # Deployment -Latest stable version of interactive atlas viewer is continously deployed to the following URL: +Latest stable version of siibra explorer is continously deployed to the following URL: - <https://interactive-viewer.apps.hbp.eu/> - <https://atlases.ebrains.eu/viewer/> ## Dependency monitoring -Interactive atlas viewer interacts with a number of other ebrains services. Monitoring these services contributes to the stability of the webapplication. +Siibra explorer interacts with a number of other ebrains services. Monitoring these services contributes to the stability of the webapplication. ### Probability & continuous maps availability diff --git a/deploy/quickstart/index.js b/deploy/quickstart/index.js index 07b5f1bb7eb3bf5cca7e84bf465ea1fee1cb02a1..efe8aa944725b5539c63458f0887de93a33c2e56 100644 --- a/deploy/quickstart/index.js +++ b/deploy/quickstart/index.js @@ -26,7 +26,7 @@ const getQuickStartMdPr = (async () => { <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous"> <script src="https://unpkg.com/dompurify@latest/dist/purify.min.js"></script> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <title>Interactive Atlas Viewer Quickstart</title> + <title>Siibra Explorer Quickstart</title> <style> .padded { padding: 1.5rem; } </style> diff --git a/docs/index.md b/docs/index.md index e6cf9cd5001c9ab26c54b88c6d6a27f02d2d80eb..693b2b4f938bed1981cd399e45011cdf7e405f37 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,6 +1,6 @@ -# Interactive Atlas Viewer +# Siibra Explorer -The interactive atlas viewer is a browser based viewer of brain atlases. Tight integration with the ebrains Knowledge Graph allows seamless querying of semantically and spatially anchored datasets. +The siibra explorer is a browser based viewer of brain atlases. Tight integration with the ebrains Knowledge Graph allows seamless querying of semantically and spatially anchored datasets.  diff --git a/docs/requirements.md b/docs/requirements.md index 0f4e9dfa8141eaff688aa8f1c3a4817f3b1b36ba..ea2fa5860bc27be4881fcaf9b9e301166f4859c3 100644 --- a/docs/requirements.md +++ b/docs/requirements.md @@ -1,6 +1,6 @@ # System requirements -Interactive atlas viewer relies on [WebGL2.0](https://en.wikipedia.org/wiki/WebGL). +Siibra exporer relies on [WebGL2.0](https://en.wikipedia.org/wiki/WebGL). !!! info To check if your device and browser combination support webgl 2.0, visit <https://get.webgl.org/webgl2/>. diff --git a/docs/usage/connectivity.md b/docs/usage/connectivity.md index 8deed5c6b80b54521731ee0d53dbdeed313d8636..be029e3337b725eafcb71dabca56d6747b3a18e5 100644 --- a/docs/usage/connectivity.md +++ b/docs/usage/connectivity.md @@ -1,6 +1,6 @@ # Exploring a connectivity matrix for the selected brain parcellation -Via the <https://github.com/FZJ-INM1-BDA/HBP-connectivity-component>, the interactive atlas viewer allows interactive exploration of a connectivity matrix, that is defined for the currently selected brain parcellation and available from the HBP Knowledge Graph. As of now, this function is only available for the `JuBrain Cytoarchitectonic Atlas. +Via the <https://github.com/FZJ-INM1-BDA/HBP-connectivity-component>, the siibra explorer allows interactive exploration of a connectivity matrix, that is defined for the currently selected brain parcellation and available from the HBP Knowledge Graph. As of now, this function is only available for the `JuBrain Cytoarchitectonic Atlas. ## Launching the connectivity browser diff --git a/docs/usage/navigating.md b/docs/usage/navigating.md index 4f812f362d9a02d27d464d1fe6cc1f118f0ee2b7..1bd9d67e0d37f07c80ef487abd0c1194235cf9f1 100644 --- a/docs/usage/navigating.md +++ b/docs/usage/navigating.md @@ -2,7 +2,7 @@ ## Navigating the viewer -The interactive atlas viewer can be accessed from either a desktop or an Android mobile device. The navigation scheme vary slightly between the two platforms. +The siibra explorer can be accessed from either a desktop or an Android mobile device. The navigation scheme vary slightly between the two platforms. | | Desktop | Mobile | | --- | --- | --- | @@ -41,6 +41,6 @@ From here, `click` on `Navigate`. ## Navigation status panel -You can find the navigation status in the lower left corner of the interactive atlas viewer. You can reset the `position`, `rotation` and/or `zoom`, as well as toggling the units between `physical` (mm) and `voxel`. +You can find the navigation status in the lower left corner of the siibra explorer. You can reset the `position`, `rotation` and/or `zoom`, as well as toggling the units between `physical` (mm) and `voxel`. [](images/navigation_status.png) diff --git a/docs/usage/search.md b/docs/usage/search.md index 3a68bed78d7fa9c18285a97876df1d87a90b505a..93b10396fb1fcca89c40f490401448f4338f488a 100644 --- a/docs/usage/search.md +++ b/docs/usage/search.md @@ -1,6 +1,6 @@ # Searching -The interactive viewer fetches datasets semantically linked to [selected regions](selecting.md#selecting-deselecting-regions). If no regions are selected, all datasets associated with a parcellation will be returned. +Siibra explorer fetches datasets semantically linked to [selected regions](selecting.md#selecting-deselecting-regions). If no regions are selected, all datasets associated with a parcellation will be returned. [](images/bigbrain_search_interface.png) diff --git a/docs/usage/selecting.md b/docs/usage/selecting.md index 54f298de0ae18d08254db4ecddf7f2caf0209111..3a7370608db1c471227d35a5049a2cba9d7e4ef9 100644 --- a/docs/usage/selecting.md +++ b/docs/usage/selecting.md @@ -2,7 +2,7 @@ ## Selecting a template / atlas -The interactive atlas viewer supports a number of atlases. +The siibra explorer supports a number of atlases. ### From homepage @@ -10,7 +10,7 @@ On the home page, the atlases are categorised under their respective template sp [](images/home.png) -Select any of the parcellations listed, the interactive atlas viewer will load the parcellation in the corresponding template space. +Select any of the parcellations listed, the siibra explorer will load the parcellation in the corresponding template space. Clicking on the template card will load the template and the first of the listed parcellation under the template space. @@ -30,7 +30,7 @@ Information on the selected template or parcellation can be revealed by `hoverin ## Browsing regions -There exist several ways of browsing the parcellated regions in a selected parcellation in the interactive atlas viewer. +There exist several ways of browsing the parcellated regions in a selected parcellation in the siibra explorer. ### From the viewer diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts index e2067301c80904efaafbc25527a5e58773ce9558..e35595846f1af90cf3e5a678bbd454da789556bc 100644 --- a/src/auth/auth.service.ts +++ b/src/auth/auth.service.ts @@ -27,11 +27,8 @@ export class AuthService implements OnDestroy { public user$: Observable<any> public logoutHref: string = 'logout' - /** - * TODO build it dynamically, or at least possible to configure via env var - */ public loginMethods: IAuthMethod[] = [{ - name: 'HBP OIDC v2', + name: 'EBRAINS OIDC v2', href: 'hbp-oidc-v2/auth' }] diff --git a/src/messaging/service.spec.ts b/src/messaging/service.spec.ts index 2ba18423e3617ed2c3016bc9467083fc49576ff9..8ba8cad4e3cdaf0d776fd5ff2f1e1cc0958c8b08 100644 --- a/src/messaging/service.spec.ts +++ b/src/messaging/service.spec.ts @@ -229,7 +229,7 @@ describe('> service.ts', () => { { data: { title: 'Cross tab messaging', - message: `${origin} would like to send data to interactive atlas viewer`, + message: `${origin} would like to send data to siibra explorer`, okBtnText: `Allow`, } } diff --git a/src/messaging/service.ts b/src/messaging/service.ts index d810a7fce7c330809be7154671389d090ef18bca..365a2d1880bd4513bb088b49ff0b761faa30b36c 100644 --- a/src/messaging/service.ts +++ b/src/messaging/service.ts @@ -223,7 +223,7 @@ export class MessagingService { { data: { title: `Cross tab messaging`, - message: `${origin} would like to send data to interactive atlas viewer`, + message: `${origin} would like to send data to siibra explorer`, okBtnText: `Allow` } } diff --git a/src/ui/cookieAgreement/cookieAgreement/cookieAgreement.template.html b/src/ui/cookieAgreement/cookieAgreement/cookieAgreement.template.html index 1b85496e96fb7b2200ed0dbbcabf008a8009e807..41703a1028af7c0dde04921a6ce7c4b7a584e0c2 100644 --- a/src/ui/cookieAgreement/cookieAgreement/cookieAgreement.template.html +++ b/src/ui/cookieAgreement/cookieAgreement/cookieAgreement.template.html @@ -9,7 +9,7 @@ <mat-expansion-panel-header> <mat-panel-title> - About IAV + About siibra explorer </mat-panel-title> <mat-panel-description> More details diff --git a/src/ui/cookieAgreement/data/aboutMatomo.md b/src/ui/cookieAgreement/data/aboutMatomo.md index 502b845a046adef8d0a3c8d97a78e65c987d7438..dc4e2a56d64ed736decb68ce68f6d2e758dbedae 100644 --- a/src/ui/cookieAgreement/data/aboutMatomo.md +++ b/src/ui/cookieAgreement/data/aboutMatomo.md @@ -1,4 +1,4 @@ -Interactive atlas viewer uses opensource <https://matomo.org/> hosted on HBP infrastructure to track usage statistics. +Siibra explorer uses the opensource <https://matomo.org/> hosted on EBRAINS infrastructure to track usage statistics. **do not track**: if you enable [do not track](https://en.wikipedia.org/wiki/Do_Not_Track), matomo is configured to not track you on this site. diff --git a/src/ui/cookieAgreement/data/info.md b/src/ui/cookieAgreement/data/info.md index 51623e9b4e8a9ea1cdf3b4fb2d3b1620142484d8..cccca52957b44c5614d6c413396e512fc6d629ac 100644 --- a/src/ui/cookieAgreement/data/info.md +++ b/src/ui/cookieAgreement/data/info.md @@ -1,6 +1,6 @@ -The HBP Interactive Atlas Viewer (IAV) uses ‘cookies’ (text files placed on your computer) to verify login details, remember user choices and preferences, and in some instances determine site permissions. Cookies also provide, in anonymous form, the number of visitors accessing the HBP Public Website, features users access during website visits, and the general location of the user based on IP address. +Siibra explorer uses 'cookies' (text files placed on your computer) to verify login details, remember user choices and preferences, and in some instances determine site permissions. Cookies also provide, in anonymous form, the number of visitors accessing the EBRAINS Public Website, features users access during website visits, and the general location of the user based on IP address. -HBP Atlas Viewer uses at least the following cookies: +Siibra explorer uses at least the following cookies: - **connect.sid** verify login details diff --git a/src/ui/cookieAgreement/data/readmore.md b/src/ui/cookieAgreement/data/readmore.md index 6692141e5199aa2c7270c70e1ba7dce9f302ea2b..b946076b534306ba60d9cc7cad24e93d46cbb5e8 100644 --- a/src/ui/cookieAgreement/data/readmore.md +++ b/src/ui/cookieAgreement/data/readmore.md @@ -1,12 +1,12 @@ -**Data controller(s)**: HBP Atlas Viewer is the data controller for your login information. -**List of partners responsible**: HBP Atlas Viewer is the data controller for your login information. -**HBP Data Protection Officer (HBP DPO)**: <data.protection@humanbrainproject.eu> -**Legal basis for data processing**: You can find out about HBP Data Protection policies here: <https://www.humanbrainproject.eu/en/social-ethical-reflective/ethics-support/data-protection/> and you can contact HBP Data Protection Officer at <data.protection@humanbrainproject.eu> +**Data controller(s)**: siibra explorer is the data controller for your login information. +**List of partners responsible**: siibra explorer is the data controller for your login information. +**EBRAINS Data Protection Officer (EBRAINS DPO)**: <data.protection@ebrains.eu> +**Legal basis for data processing**: You can find out about EBRAINS Data Protection policies here: <https://www.ebrains.eu/page/terms-and-policies> and you can contact HBP Data Protection Officer at <data.protection@ebrains.eu> **General categories of personal data collected**: consent -**Data shared within the HBP Consortium**: Name, ORC ID, JWT ID Token -**Data Shared with Third Parties**: JWT ID Token is shared with ChunMa (Chunk Master), enabling upload and retrieval of user uploaded data. +**Data shared within the EBRAINS Consortium**: Name, ORC ID, JWT ID Token +**Data Shared with Third Parties**: None **Transfer of any personal data to third countries**: None **Retention periods**: 24 hours -**Lodging a complaint**: The HBP DPO and HBP partners will make every reasonable effort to address your data protection concerns. However, you have a right to lodge a complaint with a data protection authority. Contact information for the European Data Protection Board and EU DPAs are available here: +**Lodging a complaint**: The EBRAINS DPO and EBRAINS partners will make every reasonable effort to address your data protection concerns. However, you have a right to lodge a complaint with a data protection authority. Contact information for the European Data Protection Board and EU DPAs are available here: - <http://ec.europa.eu/newsroom/article29/item-detail.cfm?item_id=612080> -- <https://edpb.europa.eu/about-edpb/board/members_en> \ No newline at end of file +- <https://edpb.europa.eu/about-edpb/board/members_en> diff --git a/src/ui/kgtos/kgtos/kgtos.template.html b/src/ui/kgtos/kgtos/kgtos.template.html index f0eee2bb6cba0905078ea3331eeb3f3faac9ff83..d9682ed28bbc1fee72b41476d2a6b1338cd3164d 100644 --- a/src/ui/kgtos/kgtos/kgtos.template.html +++ b/src/ui/kgtos/kgtos/kgtos.template.html @@ -6,7 +6,7 @@ <ng-template #backup> <div> <p> - The interactive viewer queries HBP Knowledge Graph Data Platform ("KG") for published datasets. + Siibra explorer queries EBRAINS Knowledge Graph Data Platform ("KG") for published datasets. </p> <p> Access to the data and metadata provided through KG requires that you cite and acknowledge said data and metadata according to the Terms and Conditions of the Platform. diff --git a/src/ui/topMenu/topMenuCmp/topMenu.template.html b/src/ui/topMenu/topMenuCmp/topMenu.template.html index 319528dc8c3dae585c36cef03ab3a908c2b1a720..78db317048cea8f9b155c898a2a5e865e665b61a 100644 --- a/src/ui/topMenu/topMenuCmp/topMenu.template.html +++ b/src/ui/topMenu/topMenuCmp/topMenu.template.html @@ -206,7 +206,7 @@ </mat-menu> <ng-template #aboutComponent> - <h2 mat-dialog-title>About Interactive Viewer</h2> + <h2 mat-dialog-title>About siibra explorer</h2> <mat-dialog-content> <mat-tab-group> <mat-tab label="About"> diff --git a/src/util/constants.ts b/src/util/constants.ts index 0d59813ab8108fca1a349f86045c5f70930dd58e..001b1283945568cc84378cc55b4f06a41f02f866 100644 --- a/src/util/constants.ts +++ b/src/util/constants.ts @@ -25,7 +25,7 @@ export const BACKENDURL = (() => { })() export const MIN_REQ_EXPLAINER = ` -- Interactive atlas viewer requires **webgl2.0**, and the \`EXT_color_buffer_float\` extension enabled. +- Siibra explorer requires **webgl2.0**, and the \`EXT_color_buffer_float\` extension enabled. - You can check browsers' support of webgl2.0 by visiting <https://caniuse.com/#feat=webgl2> - Unfortunately, Safari and iOS devices currently do not support **webgl2.0**: <https://webkit.org/status/#specification-webgl-2> ` diff --git a/third_party/catchSyntaxError.js b/third_party/catchSyntaxError.js index 09218b04f306b7584e57d8342c106100ea372432..4a1f30f660dbbf6c0517947a124e4448803dcbc8 100644 --- a/third_party/catchSyntaxError.js +++ b/third_party/catchSyntaxError.js @@ -3,7 +3,7 @@ if (/^SyntaxError/.test(e) || /^Syntax\serror/.test(e)) { console.log('Caught SyntaxError') - const warning = 'Your browser cannot display the interactive viewer. Please use either Chrome >= 56 and/or Firefox >= 51' + const warning = 'Your browser cannot display siibra explorer. Please use either Chrome >= 56 and/or Firefox >= 51' console.log(warning) const warningEl = document.createElement('h4')