chore/rebase on develop 03-06 #408
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
disbale auto-deploy for staging
fix show create subscription in home page splash screen
fix loading in simulate listing table
Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com>
* Fixed the error with reading length of null * Ran prettier * Use header.id for map item index * Used simple variable addition assignment for total count data --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com>
* Added the page Financing * Removed console log --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com>
Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com>
Co-authored-by: Jean-Denis Courcol <courcol@mac.home>
* Added the two apis route for both circuit count and data * Ran prettier and linter * Corrected the typo with journal and minifed the json file --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com>
* Created the single circuit page based on the key * Corrected typo in the fetching useEffect function * Ran linter and prettier * Copy and paste again the minified version of ALL_CIRCUITS.json * Added public to gitignore and ran prettier --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com>
…ers (#306) Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com>
* Added component to MainDetailView * Updated CircuitSchemaProps and corrected subcircuits for plural in the minified json --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com>
* Removed currency dropdown * Fixed import in price list --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com>
* Added the component CircuitTable * Added columns and installed react-resizable * Added subcircuit, button and resizable columns * Added utils to filter * Added use-filtered-data * Added the filter for circuits * Style for the circuit table * Corrected the api path with circuits plural * Remove console log * Integrated the CircuitTable component in list view * Ran linter and prettier * Component for circuit page in both free and paid account + fixed some feedbacks from Pavlo --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com>
) * Added component to MainDetailView * Updated CircuitSchemaProps and corrected subcircuits for plural in the minified json * Fixed the path of the placeholder image * Fixed the typo circuit with an s to fetch correctly the circuit * Resolved conflict with the image placeholder url --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com>
Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com>
* Hide side bar and navigation top bar in detail view * Added the four sections * Provenance section - added a conditional rendering to publication link if undefined * Ran prettier and linter * Fixed the component of circuit table to render correctly * First feedback implementation from Pavlo * Changed the parent, derived and subcircuit fetching logic --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com>
Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com>
* Fix detailed view scroll and top level layout * Move detailed page logic to a separate component, use in vlab explore
* Added reset search input when closing search bar * Ran linter and prettier --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com>
Sim filter.
All the lint errors have been fixed. We should now prevent Github from merging if the linter has not been successful.
* Added check on the user profile update form * Added email verification on virtual lab creation * Fix linting issue * PR feedbacks
* New format for user journey used in suggestions * New format for user journey used in suggestions
* Removed the component of search bar and filter options * Added a side navigation to select the different tables * E-model table component with columns and placeholder content * Added ME-model columns and table * Hooked the correct data with the e-model, me-model and synaptome models * Fixed the download and links artifacts --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com>
* New format for user journey used in suggestions * New format for user journey used in suggestions * Fix error with localStorage and SSR
* Removed the component of search bar and filter options * Added object of interest, scale and authors in addition to the readme in a dropdown * Refine H1, H2 and H3 of the readMe * Corrected import order --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com>
* New format for user journey used in suggestions * New format for user journey used in suggestions * Fix issue for new user
bilalesi
force-pushed
the
feat/atlas-viewer
branch
from
6688e46 to
8bd5017
Compare
bilalesi
force-pushed
the
feat/atlas-viewer
branch
from
8bd5017 to
614d490
Compare
|
This is the rebase on the latest develop for entitycore, I fixed all issues regarding breaking changes ( |
pgetta
approved these changes
Jun 6, 2025
This was referenced Jun 13, 2025
Merged
bilalesi
added a commit
that referenced
this pull request
Jun 16, 2025
* change ion to comming soon disbale auto-deploy for staging * fix filter panel in build fix show create subscription in home page splash screen * fix spinner in ai assitant * fix fixed btns in simulate page fix loading in simulate listing table * fix sticky btn in experiment/simulate listing page * Corrected the appostrophe s for project creation (#277) Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Public project: fixed error (ticket #183) (#270) * Fixed the error with reading length of null * Ran prettier * Use header.id for map item index * Used simple variable addition assignment for total count data --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Added the page Financing (#279) * Added the page Financing * Removed console log --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Added a -s to public project (#284) Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * enable auto deployement * delete accept terms modal due moving the logic to KC * Reset page and previous results on filter apply (#282) * Morph viewer: correct setting opacity used to control neurite visibility (#291) * rename footer for financing policy (#298) Co-authored-by: Jean-Denis Courcol <courcol@mac.home> * Explore circuits - json and api (#297) * Added the two apis route for both circuit count and data * Ran prettier and linter * Corrected the typo with journal and minifed the json file --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Creation of single circuit page base (#304) * Created the single circuit page based on the key * Corrected typo in the fetching useEffect function * Ran linter and prettier * Copy and paste again the minified version of ALL_CIRCUITS.json * Added public to gitignore and ran prettier --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Added the header content of the detail view with metadata and parameters (#306) Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Circuit detail view hero image preview section (#307) * Added component to MainDetailView * Updated CircuitSchemaProps and corrected subcircuits for plural in the minified json --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Removed currency dropdown (#287) * Removed currency dropdown * Fixed import in price list --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Componisation of circuit table (#308) * Added the component CircuitTable * Added columns and installed react-resizable * Added subcircuit, button and resizable columns * Added utils to filter * Added use-filtered-data * Added the filter for circuits * Style for the circuit table * Corrected the api path with circuits plural * Remove console log * Integrated the CircuitTable component in list view * Ran linter and prettier * Component for circuit page in both free and paid account + fixed some feedbacks from Pavlo --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Circuit detail view fixed the typo in fetching individual circuits (#310) * Added component to MainDetailView * Updated CircuitSchemaProps and corrected subcircuits for plural in the minified json * Fixed the path of the placeholder image * Fixed the typo circuit with an s to fetch correctly the circuit * Resolved conflict with the image placeholder url --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Changed the name of the api circuit for explore-circuits (#312) Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Circuit detail view bottom sections (#311) * Hide side bar and navigation top bar in detail view * Added the four sections * Provenance section - added a conditional rendering to publication link if undefined * Ran prettier and linter * Fixed the component of circuit table to render correctly * First feedback implementation from Pavlo * Changed the parent, derived and subcircuit fetching logic --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Fixed the circuit count (#315) Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Fix circuit layout (#317) * Fix detailed view scroll and top level layout (#318) * Fix detailed view scroll and top level layout * Move detailed page logic to a separate component, use in vlab explore * Added reset search input when closing search bar (#321) * Added reset search input when closing search bar * Ran linter and prettier --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Fix simulate page filter (#323) Sim filter. * Fix all lint issues (#324) All the lint errors have been fixed. We should now prevent Github from merging if the linter has not been successful. * 189/prevent emails not approved by insurance (#326) * Added check on the user profile update form * Added email verification on virtual lab creation * Fix linting issue * PR feedbacks * Removed the component of search bar and filter options (#325) * Removed the component of search bar and filter options * Removed the file filtering-circuits * Fix simulate page filter (#323) Sim filter. * Fix all lint issues (#324) All the lint errors have been fixed. We should now prevent Github from merging if the linter has not been successful. * Removed the component of search bar and filter options * Removed the component of search bar and filter options * Fixed multiples times import issue --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> Co-authored-by: g-bar <gilarturo.barriosdelvillar@openbraininstitute.org> Co-authored-by: Tolokoban <contact@tolokoban.org> * remove redandunt imports * Subcircuit issue with download (#327) * Removed the component of search bar and filter options * Removed the file filtering-circuits * Harmonised Subcircuit component props with the ones of CircuitTable * Added the props to SubcircuitTable imported component --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Fix subcircuit url in two cases (#332) * Removed the component of search bar and filter options * Removed the file filtering-circuits * Fixed typescript error with onHeaderCell --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Fix download for 3rd depth level subcircuits (#333) * Removed the component of search bar and filter options * Removed the file filtering-circuits * Created a function to find circuits everywhere it is in the tree * Ran prettier --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Use both @id and @id.keyword fields for query (#331) * Literature search tool has a new output format now (#337) * Get the searchParams when changing route to a new URL (#320) * Removed the component of search bar and filter options * Get the searchParams when changing route to a new URL * Fixed rebase, lint and prettier * Changed for Bilal solution with nuqs * Removed push and parameter set --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * allow user to accept invites without active paid subscription * remove checking for pro subscription when invite to vlab * Fix type validation with public project artifact table type (#341) * Removed the component of search bar and filter options * Literature search tool has a new output format now (#337) * Get the searchParams when changing route to a new URL (#320) * Removed the component of search bar and filter options * Get the searchParams when changing route to a new URL * Fixed rebase, lint and prettier * Changed for Bilal solution with nuqs * Removed push and parameter set --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * allow user to accept invites without active paid subscription * remove checking for pro subscription when invite to vlab * Fix the type error with different new property in artifact table --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> Co-authored-by: Tolokoban <contact@tolokoban.org> Co-authored-by: bilalesi <b_meddah@esi.dz> * add commit hooks using lefthook * Download options for circuits (#347) * Removed the component of search bar and filter options * Added the Download container and modified the download item schema * Cleaned the CircuitTable file by removing merged columns and resize logic * Added the four different types of filetype * Refine the layout in css * Added the animation for the download modal * Modify style of full circuit download * Added total number of files at top * Added new JSON from Daniela * Added the full circuit data --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Removed deleted and reserved countries. Sort by name (#345) * Removed deleted and reserved countries. Sort by name * fix prettier --------- Co-authored-by: Jean-Denis Courcol <courcol@mac.lan> * Add filter to circuit tables (#349) * Removed the component of search bar and filter options * Added the circuit back and the display when filtered * Removed unused variable dependencies * Correctly rename kebab-case the files --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Circuit detail active link licence parent circuit (#351) * Removed the component of search bar and filter options * Added link for parent region and license --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Search bar for circuits (#350) * Removed the component of search bar and filter options * Reinstate the search function matching the logic of filters --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Circuit table add published in column (#355) * Removed the component of search bar and filter options * Added publishedIn column to circuit table --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Circuit table hierarchical and flat list views (#354) * Removed the component of search bar and filter options * Created the switch component * Added the flatten hierarchical logic --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Circuit detail view greyed out disabled button icon (#356) * Removed the component of search bar and filter options * Lower opacity of disabled element and used a gray for those too --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Circuits format number with comma (#353) * Removed the component of search bar and filter options * Formatted numbers in detail view and table --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Circuit detail view download panel (#352) * Removed the component of search bar and filter options * Hook the download button of circuit detail page to the download side panel * fixed merging conflict --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * 62/ai more suggestions (#359) * Added thread_id for suggestions * merging issues * Prevent suggestions queries to go in parallel * Filter circuits by brain region * Section not set (#362) * fix sanity dataset env * Ciruit table hide non matching filtered circuits (#365) * Removed the component of search bar and filter options * Fixed the changes of views with filter activated --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * rename literature search to AI Assistant (#358) Co-authored-by: Jean-Denis Courcol <courcol@mac.home> * change launch to launch price in the subscription pill (#361) * change launch to launch price in the subscription pill * fix prettier --------- Co-authored-by: Jean-Denis Courcol <courcol@mac.home> * fix user journey order and unwanted reset of current session * limit the number of entries to store in indexdb, less then the default will be deleted * Circuit metada update contributor published in registration date (#367) * Removed the component of search bar and filter options * 62/ai more suggestions (#359) * Added thread_id for suggestions * merging issues * Prevent suggestions queries to go in parallel * Filter circuits by brain region * Section not set (#362) * fix sanity dataset env * Ciruit table hide non matching filtered circuits (#365) * Removed the component of search bar and filter options * Fixed the changes of views with filter activated --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Removed doubled import in main-detail-view-core * Capitalized download files and increase font size for download items * Added published in to the detail view * Added all the metadata in detail view * Remove conditional test * fix user journey order and unwanted reset of current session * limit the number of entries to store in indexdb, less then the default will be deleted * Manually fixed linter and prettier * Ran prettier write --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> Co-authored-by: Tolokoban <contact@tolokoban.org> Co-authored-by: g-bar <gilarturo.barriosdelvillar@openbraininstitute.org> Co-authored-by: bilalesi <b_meddah@esi.dz> * Handle view all for contributors and institutions (#368) * Circuit list remove contributor capitalize published in (#370) * Removed the component of search bar and filter options * Removed contributor columns from table and put an uppercase to Published In --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * replace mailto support by url to support page (#373) Co-authored-by: Jean-Denis Courcol <courcol@mac.lan> * Implement back to list in circuit detail (#372) * Removed the component of search bar and filter options * Added the side bar back to list and fixed some styling * Fixed the linting error --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Reduce the journey size from 10 to 3 (#374) * Reduce the journey size from 10 to 3, ans fix a bug in a hardcoded suggestion * Fix upsidedown title * rename Assistance to Assistant (#375) Co-authored-by: Jean-Denis Courcol <courcol@mac.lan> * Circuits detail text corrections (#378) * Removed the component of search bar and filter options * Fixed spacing problem in contributors name and added s to institution --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Add notebook subtype for accounting * Add button to run a notebook, for now only enabled in staging, and only for the regular (not uploaded by a user) notebooks * All circuits update json and contributors (#386) * Removed the component of search bar and filter options * Replace single string for contributors and organization by a list of items * Added condition for view more if list is bigger than the slicing --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Circuit detail view fix z index position of sections tabs (#382) * Removed the component of search bar and filter options * Removed sticky to the tab to avoid bug with download container * Add button to run a notebook, for now only enabled in staging, and only for the regular (not uploaded by a user) notebooks * All circuits update json and contributors (#386) * Removed the component of search bar and filter options * Replace single string for contributors and organization by a list of items * Added condition for view more if list is bigger than the slicing --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Removed sticky to the tab to avoid bug with download container * Fixed duplication of ContributingInstitution type --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> Co-authored-by: Dries Verachtert <dries.verachtert@dries.eu> * Added carrousel with tutorial videos (#389) * Replace svg icons within notebooks table with svg components, move the icons within the buttons so users can click on them * Adding tutorials on gomepage for non-new users (#391) * add logic to send brain region with ancestors in list query * use atom for entities counts instead of promise * add new version of brain regions tree * dynamically render explore listing view * add cell-composition to explore interactive * use mtype etype alt_label on tree item * clean unneeded files for v2/brain-region-tree * remove unnecessary pages * Fix back to list button for circuit (#395) * Removed the component of search bar and filter options * Use margin left to make some space with back to list side bar --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * Fixed contributor modal metadata (#396) * Removed the component of search bar and filter options * Init * Fixed the contributor list when trimmed * Replace JSON with correct contributors list - without duplication --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * pass workspace context to synapses places and simulations (#397) * use brain atlas to calculate density and count using volume * 110/change user journey format (#402) * New format for user journey used in suggestions * New format for user journey used in suggestions * Public project artifact tabs system (#403) * Removed the component of search bar and filter options * Added a side navigation to select the different tables * E-model table component with columns and placeholder content * Added ME-model columns and table * Hooked the correct data with the e-model, me-model and synaptome models * Fixed the download and links artifacts --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * update error message for vlab exist on creation (#399) * fix notification to use the App context (#400) * 110/change user journey format 2 (#406) * New format for user journey used in suggestions * New format for user journey used in suggestions * Fix error with localStorage and SSR * Public project notebook update complete metadata (#405) * Removed the component of search bar and filter options * Added object of interest, scale and authors in addition to the readme in a dropdown * Refine H1, H2 and H3 of the readMe * Corrected import order --------- Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> * use entitycore for meshes and point cloud * 110/change user journey format 3 (#407) * New format for user journey used in suggestions * New format for user journey used in suggestions * Fix issue for new user * fix merge to develop --------- Co-authored-by: loris-olivier-obi <olivier.loris@openbraininstitute.org> Co-authored-by: Loris Olivier <53363974+loris-maru@users.noreply.github.com> Co-authored-by: Pavlo Getta <pavlo.getta@openbraininstitute.org> Co-authored-by: jdcourcol <jean-denis.courcol@openbraininstitute.org> Co-authored-by: Jean-Denis Courcol <courcol@mac.home> Co-authored-by: g-bar <gilarturo.barriosdelvillar@openbraininstitute.org> Co-authored-by: Tolokoban <contact@tolokoban.org> Co-authored-by: Jean-Denis Courcol <courcol@mac.lan> Co-authored-by: Dries Verachtert <dries.verachtert@dries.eu>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.