Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix occasional broken node selection #6724

Merged
merged 2 commits into from
Jan 9, 2023
Merged

Fix occasional broken node selection #6724

merged 2 commits into from
Jan 9, 2023

Conversation

philippotto
Copy link
Member

@philippotto philippotto commented Jan 5, 2023

In addition to the incorrect base, I adapted the context menu so that it won't crash in such a case. Also, I removed some Maybe wrappers as I don't see a benefit in it anymore, since we have a good typechecker.

URL of deployed dev instance (used for testing):

  • https://___.webknossos.xyz

Steps to test:

  • download repro zip (contact me for that)
  • import the NML from the zip
  • activate the node id 4878140 via the status bar
  • right click the centered node (on master, this fails)

Issues:


(Please delete unneeded items, merge only when none are left open)

@philippotto philippotto self-assigned this Jan 5, 2023
@philippotto philippotto requested a review from daniel-wer January 5, 2023 16:32
Copy link
Member

@daniel-wer daniel-wer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome find! 🎉 LGTM 👍

@philippotto philippotto enabled auto-merge (squash) January 9, 2023 09:27
@philippotto philippotto disabled auto-merge January 9, 2023 10:05
@philippotto philippotto force-pushed the fix-broken-node branch 2 times, most recently from 991b50d to 1e69b55 Compare January 9, 2023 10:28
…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 philippotto enabled auto-merge (squash) January 9, 2023 11:02
@philippotto philippotto merged commit a5b6576 into master Jan 9, 2023
@philippotto philippotto deleted the fix-broken-node branch January 9, 2023 11:04
@philippotto philippotto mentioned this pull request Jan 10, 2023
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants