Fix some failing validations of neuroglancer URLs #6722
Merged
Conversation
This file contains 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
…and improve validation in general
normanrz
approved these changes
Jan 5, 2023
philippotto
added a commit
that referenced
this pull request
Jan 9, 2023
…rashing whole page); remove maybe container from findTreeById remove maybe container from findTreeByName; remove dead REMOVE_AGGLOMERATE_SKELETON action code fix incorrect encoding/decoding of node ids between webGL and JS update changelog Update config.yml Fix some failing validations of neuroglancer URLs (#6722) * make neuroglancer import compatible with URLs that encode subsources and improve validation in general * update changelog Add Pricing Plans to Organization Page (#6602) * first draft for new organization page * enable access to orga page in navbar avatar menu * Add pricing plan schema * fix navbar links to orga page * more pricing stuff * orga page refactoring * Use default user/storage values for different plans * Add new model fields * Assert user count does not exceed includedUsers when joining org * Pass incudedStorage in MB * fix deprecation warning * refactor orga view into sub-components * adapt enum in scala * many tweaks to orga view * added modals for extending pricing plans * added actual user count to orga page limits * Insert new fields into organization table * REVIEW fixed some TS errors: @ts-expect-error ts-migrate(2769) FIXME: No overload matches this call. * enforce user quota for email invites * map null value to max int * handle infinite orga storage * small re-phrasing * enforce user limit on email invites * pretty + lint * Update conf/evolutions/091-pricing-plans.sql Co-authored-by: Florian M <[email protected]> * added background images for pricing plan modals * added alert when plans is about to exceed * show a plan expriation warning diectly on the dashboard * fix content for upgrade plan modal * prettier * updated changelog * adapt test db * added backend routes for send out pricing plan uprgade emails * backend formatting * connect frontend and backend prciing email routes * stuff * Update frontend/javascripts/admin/admin_rest_api.ts Co-authored-by: Philipp Otto <[email protected]> * Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx Co-authored-by: Philipp Otto <[email protected]> * Update conf/messages Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/upgradePricingPlanUsers.scala.html Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/upgradePricingPlanToTeam.scala.html Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/upgradePricingPlanToPower.scala.html Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/upgradePricingPlanStorage.scala.html Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/extendPricingPlan.scala.html Co-authored-by: Philipp Otto <[email protected]> * applied PR feedback and switch background images to JPEGs * applied PR feedback #2 * PR feedback #3 / fix upgrade modals * Update frontend/javascripts/admin/onboarding.tsx Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/organization/organization_cards.tsx Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/organization/pricing_plan_utils.ts Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/organization/organization_cards.tsx Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/organization/pricing_plan_utils.ts Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/admin_rest_api.ts Co-authored-by: Philipp Otto <[email protected]> * PR feedback #4 * pretty * PR feedback #5 * refactored pricing upgrade emails to be a confirmation to the user * formatting * fixed warning "plan is about to expire" when it already has expired * fix evolution schema versioning * rephrase all reference to "Free" plan to "Basic" * Add route /pricing/status * redesigned upgrade modal to show both team power plans * integrated pricing plan status API * fix evolutions * also respect paidUntil in exceeded checks * disable pricing plan warnings on dashboard for now * make linter happy * linting & formatting * fix default orga DB * fixed typescript typing errors * Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx Co-authored-by: Philipp Otto <[email protected]> * applied PR feedback * update schema version to 94 * fix CI? * prevent prcing plan alarms from showing actions for unauthorized people * added owner check for warnings * added confirmation toasts on sucessful upgrade requests * fix toast messages * migration guide Co-authored-by: frcroth <[email protected]> Co-authored-by: Florian M <[email protected]> Co-authored-by: Florian M <[email protected]> Co-authored-by: Philipp Otto <[email protected]> Co-authored-by: Norman Rzepka <[email protected]> fixed unreleased changelog fix changelog typo disabled "about to exceed storage space" warning
philippotto
added a commit
that referenced
this pull request
Jan 9, 2023
…rashing whole page); remove maybe container from findTreeById remove maybe container from findTreeByName; remove dead REMOVE_AGGLOMERATE_SKELETON action code fix incorrect encoding/decoding of node ids between webGL and JS update changelog Update config.yml show error in context menu if clicked node wasn't found (instead of crashing whole page); remove maybe container from findTreeById remove maybe container from findTreeByName; remove dead REMOVE_AGGLOMERATE_SKELETON action code fix incorrect encoding/decoding of node ids between webGL and JS update changelog Update config.yml Fix some failing validations of neuroglancer URLs (#6722) * make neuroglancer import compatible with URLs that encode subsources and improve validation in general * update changelog Add Pricing Plans to Organization Page (#6602) * first draft for new organization page * enable access to orga page in navbar avatar menu * Add pricing plan schema * fix navbar links to orga page * more pricing stuff * orga page refactoring * Use default user/storage values for different plans * Add new model fields * Assert user count does not exceed includedUsers when joining org * Pass incudedStorage in MB * fix deprecation warning * refactor orga view into sub-components * adapt enum in scala * many tweaks to orga view * added modals for extending pricing plans * added actual user count to orga page limits * Insert new fields into organization table * REVIEW fixed some TS errors: @ts-expect-error ts-migrate(2769) FIXME: No overload matches this call. * enforce user quota for email invites * map null value to max int * handle infinite orga storage * small re-phrasing * enforce user limit on email invites * pretty + lint * Update conf/evolutions/091-pricing-plans.sql Co-authored-by: Florian M <[email protected]> * added background images for pricing plan modals * added alert when plans is about to exceed * show a plan expriation warning diectly on the dashboard * fix content for upgrade plan modal * prettier * updated changelog * adapt test db * added backend routes for send out pricing plan uprgade emails * backend formatting * connect frontend and backend prciing email routes * stuff * Update frontend/javascripts/admin/admin_rest_api.ts Co-authored-by: Philipp Otto <[email protected]> * Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx Co-authored-by: Philipp Otto <[email protected]> * Update conf/messages Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/upgradePricingPlanUsers.scala.html Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/upgradePricingPlanToTeam.scala.html Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/upgradePricingPlanToPower.scala.html Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/upgradePricingPlanStorage.scala.html Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/extendPricingPlan.scala.html Co-authored-by: Philipp Otto <[email protected]> * applied PR feedback and switch background images to JPEGs * applied PR feedback #2 * PR feedback #3 / fix upgrade modals * Update frontend/javascripts/admin/onboarding.tsx Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/organization/organization_cards.tsx Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/organization/pricing_plan_utils.ts Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/organization/organization_cards.tsx Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/organization/pricing_plan_utils.ts Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/admin_rest_api.ts Co-authored-by: Philipp Otto <[email protected]> * PR feedback #4 * pretty * PR feedback #5 * refactored pricing upgrade emails to be a confirmation to the user * formatting * fixed warning "plan is about to expire" when it already has expired * fix evolution schema versioning * rephrase all reference to "Free" plan to "Basic" * Add route /pricing/status * redesigned upgrade modal to show both team power plans * integrated pricing plan status API * fix evolutions * also respect paidUntil in exceeded checks * disable pricing plan warnings on dashboard for now * make linter happy * linting & formatting * fix default orga DB * fixed typescript typing errors * Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx Co-authored-by: Philipp Otto <[email protected]> * applied PR feedback * update schema version to 94 * fix CI? * prevent prcing plan alarms from showing actions for unauthorized people * added owner check for warnings * added confirmation toasts on sucessful upgrade requests * fix toast messages * migration guide Co-authored-by: frcroth <[email protected]> Co-authored-by: Florian M <[email protected]> Co-authored-by: Florian M <[email protected]> Co-authored-by: Philipp Otto <[email protected]> Co-authored-by: Norman Rzepka <[email protected]> fixed unreleased changelog fix changelog typo disabled "about to exceed storage space" warning
philippotto
added a commit
that referenced
this pull request
Jan 9, 2023
…rashing whole page); remove maybe container from findTreeById remove maybe container from findTreeByName; remove dead REMOVE_AGGLOMERATE_SKELETON action code fix incorrect encoding/decoding of node ids between webGL and JS update changelog Update config.yml show error in context menu if clicked node wasn't found (instead of crashing whole page); remove maybe container from findTreeById remove maybe container from findTreeByName; remove dead REMOVE_AGGLOMERATE_SKELETON action code fix incorrect encoding/decoding of node ids between webGL and JS update changelog Update config.yml Fix some failing validations of neuroglancer URLs (#6722) * make neuroglancer import compatible with URLs that encode subsources and improve validation in general * update changelog Add Pricing Plans to Organization Page (#6602) * first draft for new organization page * enable access to orga page in navbar avatar menu * Add pricing plan schema * fix navbar links to orga page * more pricing stuff * orga page refactoring * Use default user/storage values for different plans * Add new model fields * Assert user count does not exceed includedUsers when joining org * Pass incudedStorage in MB * fix deprecation warning * refactor orga view into sub-components * adapt enum in scala * many tweaks to orga view * added modals for extending pricing plans * added actual user count to orga page limits * Insert new fields into organization table * REVIEW fixed some TS errors: @ts-expect-error ts-migrate(2769) FIXME: No overload matches this call. * enforce user quota for email invites * map null value to max int * handle infinite orga storage * small re-phrasing * enforce user limit on email invites * pretty + lint * Update conf/evolutions/091-pricing-plans.sql Co-authored-by: Florian M <[email protected]> * added background images for pricing plan modals * added alert when plans is about to exceed * show a plan expriation warning diectly on the dashboard * fix content for upgrade plan modal * prettier * updated changelog * adapt test db * added backend routes for send out pricing plan uprgade emails * backend formatting * connect frontend and backend prciing email routes * stuff * Update frontend/javascripts/admin/admin_rest_api.ts Co-authored-by: Philipp Otto <[email protected]> * Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx Co-authored-by: Philipp Otto <[email protected]> * Update conf/messages Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/upgradePricingPlanUsers.scala.html Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/upgradePricingPlanToTeam.scala.html Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/upgradePricingPlanToPower.scala.html Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/upgradePricingPlanStorage.scala.html Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/extendPricingPlan.scala.html Co-authored-by: Philipp Otto <[email protected]> * applied PR feedback and switch background images to JPEGs * applied PR feedback #2 * PR feedback #3 / fix upgrade modals * Update frontend/javascripts/admin/onboarding.tsx Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/organization/organization_cards.tsx Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/organization/pricing_plan_utils.ts Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/organization/organization_cards.tsx Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/organization/pricing_plan_utils.ts Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/admin_rest_api.ts Co-authored-by: Philipp Otto <[email protected]> * PR feedback #4 * pretty * PR feedback #5 * refactored pricing upgrade emails to be a confirmation to the user * formatting * fixed warning "plan is about to expire" when it already has expired * fix evolution schema versioning * rephrase all reference to "Free" plan to "Basic" * Add route /pricing/status * redesigned upgrade modal to show both team power plans * integrated pricing plan status API * fix evolutions * also respect paidUntil in exceeded checks * disable pricing plan warnings on dashboard for now * make linter happy * linting & formatting * fix default orga DB * fixed typescript typing errors * Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx Co-authored-by: Philipp Otto <[email protected]> * applied PR feedback * update schema version to 94 * fix CI? * prevent prcing plan alarms from showing actions for unauthorized people * added owner check for warnings * added confirmation toasts on sucessful upgrade requests * fix toast messages * migration guide Co-authored-by: frcroth <[email protected]> Co-authored-by: Florian M <[email protected]> Co-authored-by: Florian M <[email protected]> Co-authored-by: Philipp Otto <[email protected]> Co-authored-by: Norman Rzepka <[email protected]> fixed unreleased changelog fix changelog typo disabled "about to exceed storage space" warning
philippotto
added a commit
that referenced
this pull request
Jan 9, 2023
…rashing whole page); remove maybe container from findTreeById (#6724) remove maybe container from findTreeByName; remove dead REMOVE_AGGLOMERATE_SKELETON action code fix incorrect encoding/decoding of node ids between webGL and JS update changelog Update config.yml show error in context menu if clicked node wasn't found (instead of crashing whole page); remove maybe container from findTreeById remove maybe container from findTreeByName; remove dead REMOVE_AGGLOMERATE_SKELETON action code fix incorrect encoding/decoding of node ids between webGL and JS update changelog Update config.yml Fix some failing validations of neuroglancer URLs (#6722) * make neuroglancer import compatible with URLs that encode subsources and improve validation in general * update changelog Add Pricing Plans to Organization Page (#6602) * first draft for new organization page * enable access to orga page in navbar avatar menu * Add pricing plan schema * fix navbar links to orga page * more pricing stuff * orga page refactoring * Use default user/storage values for different plans * Add new model fields * Assert user count does not exceed includedUsers when joining org * Pass incudedStorage in MB * fix deprecation warning * refactor orga view into sub-components * adapt enum in scala * many tweaks to orga view * added modals for extending pricing plans * added actual user count to orga page limits * Insert new fields into organization table * REVIEW fixed some TS errors: @ts-expect-error ts-migrate(2769) FIXME: No overload matches this call. * enforce user quota for email invites * map null value to max int * handle infinite orga storage * small re-phrasing * enforce user limit on email invites * pretty + lint * Update conf/evolutions/091-pricing-plans.sql Co-authored-by: Florian M <[email protected]> * added background images for pricing plan modals * added alert when plans is about to exceed * show a plan expriation warning diectly on the dashboard * fix content for upgrade plan modal * prettier * updated changelog * adapt test db * added backend routes for send out pricing plan uprgade emails * backend formatting * connect frontend and backend prciing email routes * stuff * Update frontend/javascripts/admin/admin_rest_api.ts Co-authored-by: Philipp Otto <[email protected]> * Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx Co-authored-by: Philipp Otto <[email protected]> * Update conf/messages Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/upgradePricingPlanUsers.scala.html Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/upgradePricingPlanToTeam.scala.html Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/upgradePricingPlanToPower.scala.html Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/upgradePricingPlanStorage.scala.html Co-authored-by: Philipp Otto <[email protected]> * Update app/views/mail/extendPricingPlan.scala.html Co-authored-by: Philipp Otto <[email protected]> * applied PR feedback and switch background images to JPEGs * applied PR feedback #2 * PR feedback #3 / fix upgrade modals * Update frontend/javascripts/admin/onboarding.tsx Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/organization/organization_cards.tsx Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/organization/pricing_plan_utils.ts Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/organization/organization_cards.tsx Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/organization/pricing_plan_utils.ts Co-authored-by: Norman Rzepka <[email protected]> * Update frontend/javascripts/admin/admin_rest_api.ts Co-authored-by: Philipp Otto <[email protected]> * PR feedback #4 * pretty * PR feedback #5 * refactored pricing upgrade emails to be a confirmation to the user * formatting * fixed warning "plan is about to expire" when it already has expired * fix evolution schema versioning * rephrase all reference to "Free" plan to "Basic" * Add route /pricing/status * redesigned upgrade modal to show both team power plans * integrated pricing plan status API * fix evolutions * also respect paidUntil in exceeded checks * disable pricing plan warnings on dashboard for now * make linter happy * linting & formatting * fix default orga DB * fixed typescript typing errors * Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx Co-authored-by: Philipp Otto <[email protected]> * applied PR feedback * update schema version to 94 * fix CI? * prevent prcing plan alarms from showing actions for unauthorized people * added owner check for warnings * added confirmation toasts on sucessful upgrade requests * fix toast messages * migration guide Co-authored-by: frcroth <[email protected]> Co-authored-by: Florian M <[email protected]> Co-authored-by: Florian M <[email protected]> Co-authored-by: Philipp Otto <[email protected]> Co-authored-by: Norman Rzepka <[email protected]> fixed unreleased changelog fix changelog typo disabled "about to exceed storage space" warning
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.
…and improve validation in general
URL of deployed dev instance (used for testing):
Steps to test:
Issues:
(Please delete unneeded items, merge only when none are left open)