Add Pricing Plans to Organization Page #6602

hotzenklotz · 2022-11-02T14:49:23Z

This PR overhauls the organization page to include more infos on the current number of users, storage quota, and the selected webKnossos plan.

Changes:

Redesigned Organization Page
Enforced Limits for User Invites
Warning for exceeding your plan limits soon on the dashboard
several modals to upgrade plan, users, storage and time that can be re-used all over the place

PR does NOT yet enforce any webKnossos annotation features / tools depending on your plan. This will come in a follow-up PR.

ToDo:

send emails on upgrade

URL of deployed dev instance (used for testing):

https://pricing.webknossos.xyz

Steps to test:

Extensively monkey test the orga page
Make sure to try all sorts of the combinations of Plans, custom storage and user quota etc in the DB

Issues:

contributes to Implement Pricing Concept #6509

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

Updated (unreleased) changelog
Updated (unreleased) migration guide if applicable
Updated documentation if applicable
Adapted wk-connect if datastore API changes
Adapted wk-libs python client if relevant API parts change
Needs datastore update after deployment
Ready for review

…icing * 'pricing' of github.com:scalableminds/webknossos: Add pricing plan schema

…icing * 'pricing' of github.com:scalableminds/webknossos: Pass incudedStorage in MB Assert user count does not exceed includedUsers when joining org Add new model fields Use default user/storage values for different plans

…icing

…icing * 'pricing' of github.com:scalableminds/webknossos: adapt enum in scala

… No overload matches this call.

…cing * 'master' of github.com:scalableminds/webknossos: Fix getNullBucket crash and remove dead code (#6603) Hotfix Dataset View Mode

…icing * 'pricing' of github.com:scalableminds/webknossos: Insert new fields into organization table

philippotto

I left some comments. overall, looks pretty good 👍 will test in a bit.

philippotto · 2022-12-15T12:26:04Z

frontend/javascripts/dashboard/dashboard_view.tsx

+          {/* {pricingPlanWarnings}
+          {pricingPlanErrors} */}


Mhmm, the components are intentionally commented out/disabled. We will need to re-enable them once the pricing goes live early next year. This is what the comment in line 294 is referring to.

ah, I see. I couldn't make that connection across that many lines 😝

philippotto · 2022-12-15T12:26:21Z

frontend/javascripts/dashboard/dashboard_view.tsx


+    // ToDo enable components below once pricing goes live


is there a (follow-up) issue which could be linked here in the comment?

app/views/mail/upgradePricingPlanRequest.scala.html

philippotto · 2022-12-15T12:33:52Z

frontend/javascripts/admin/organization/organization_edit_view.tsx

-    );
+    const [organization, users] = await Promise.all([
+      getOrganization(this.props.organizationName),
+      getUsers(),


getPricingPlanStatus is incorporated now, but getUsers().length is still effectively used. This means non-admins might see something like "your plan is exceeded, because 2 of 10 users" are registered? or can't this happen?

frontend/javascripts/admin/organization/upgrade_plan_modal.tsx

philippotto · 2022-12-15T12:37:36Z

frontend/javascripts/admin/organization/organization_cards.tsx

+        >
+          <ul>
+            {teamPlanFeatures.map((feature) => (
+              <li key={feature.slice(0, 10)}>{feature}</li>


why the slicing? do we have that many features? and is it ok to crop them without having the chance to click sth like "show more"?

if you want to keep it, i'd suggest to extract the 10 to a constant. I think, it's used at least at 3 locations.

I don't remember the reason. Maybe because we had some mock data at some point. Will remove.

Ah... I think I wanted to have "short", unique keys. The slicing is called on a string, not an array.

ah, I read that wrong then. ok, I think, strings are pooled in most interpreters anyway, so there shouldn't be a benefit in trimming the key, but I can understand that this is more when debugging things.

Co-authored-by: Philipp Otto <[email protected]>

…icing * 'pricing' of github.com:scalableminds/webknossos: Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx

…cing * 'master' of github.com:scalableminds/webknossos: Disable compression for development proxy (#6699)

philippotto · 2022-12-15T14:19:22Z

Testing went smooth mostly. However, I've got the following things:

when upgrading from basic to team or from team to power, there is no "An email with your request has been send to the webKnossos team." toast. this is confusing as one thinks, nothing happened. the other upgrades show the toast.
The PR description says "PR does NOT yet enforce any webKnossos annotation features / tools depending on your plan". However, the invite functionality is blocked when the user limit is reached. Is this on purpose? Maybe just remove the "disabled" prop, but leave the warning for the invite functionality?
When commenting in the warning/error components in the dashboard and logging in as non-admin, I get
"Your organization is using more users or storage space than included in your current plan. Upgrade now to avoid your account from being blocked." in the dashboard
- However, the "upgrade" button does nothing.
- probably adapt it to say "contact your admin" and remove the button ?

…cing * 'master' of github.com:scalableminds/webknossos: Automatically open (and close) quick select settings when labeling in… (#6706) Add Terms of Service Acceptance Concept (#6632) Fix crash in publication page and add error boundaries (#6700) temporarily disable vx related polling (#6702) add protected and private modifiers to DAO hierarchy (#6698)

…cing * 'master' of github.com:scalableminds/webknossos: Revert "temporarily disable vx related polling (#6702)" (#6710)

…cing * 'master' of github.com:scalableminds/webknossos: Replace babel with esbuild for tests and for webpack (#6527) Use less ram when initializing data textures (#6711) Composable sql interpolation (#6718) Release 23.01.0 (#6717) add license checker (#6715) Fix brush performance for coarse mags & avoid some unnecessary re-renders (#6708) Change backend format command (#6697) Improve layout of terms of services check (#6712)

@ts-expect-error

…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

@ts-expect-error

…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

@ts-expect-error

…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

@ts-expect-error

…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

first draft for new organization page

f4c2bac

hotzenklotz self-assigned this Nov 2, 2022

hotzenklotz and others added 2 commits November 2, 2022 16:27

enable access to orga page in navbar avatar menu

4b7d509

Add pricing plan schema

ecf7944

frcroth self-assigned this Nov 2, 2022

hotzenklotz and others added 25 commits November 2, 2022 16:50

fix navbar links to orga page

2369483

more pricing stuff

f8c34b2

Merge branch 'pricing' of github.com:scalableminds/webknossos into pr…

061dc69

…icing * 'pricing' of github.com:scalableminds/webknossos: Add pricing plan schema

orga page refactoring

bdf7474

Use default user/storage values for different plans

fd138fc

Add new model fields

f2a6b76

Assert user count does not exceed includedUsers when joining org

ef4a854

Pass incudedStorage in MB

9ddcaf5

fix deprecation warning

2a8fa90

refactor orga view into sub-components

3c6f47d

adapt enum in scala

83fc747

Merge branch 'pricing' of github.com:scalableminds/webknossos into pr…

ca20599

…icing

Merge branch 'pricing' of github.com:scalableminds/webknossos into pr…

27855ff

…icing * 'pricing' of github.com:scalableminds/webknossos: adapt enum in scala

many tweaks to orga view

74b5951

added modals for extending pricing plans

aae2bf7

added actual user count to orga page limits

1524d31

Insert new fields into organization table

e42416e

REVIEW fixed some TS errors: @ts-expect-error ts-migrate(2769) FIXME:…

44b5fbb

… No overload matches this call.

Merge branch 'master' of github.com:scalableminds/webknossos into pri…

2307b59

…cing * 'master' of github.com:scalableminds/webknossos: Fix getNullBucket crash and remove dead code (#6603) Hotfix Dataset View Mode

enforce user quota for email invites

1e4a5ba

Merge branch 'pricing' of github.com:scalableminds/webknossos into pr…

e3c0f2f

…icing * 'pricing' of github.com:scalableminds/webknossos: Insert new fields into organization table

map null value to max int

998b3a7

handle infinite orga storage

31c24e6

small re-phrasing

88f9647

hotzenklotz added 2 commits December 15, 2022 11:19

fix default orga DB

52b9221

fixed typescript typing errors

92b0378

hotzenklotz marked this pull request as ready for review December 15, 2022 12:19

philippotto reviewed Dec 15, 2022

View reviewed changes

hotzenklotz and others added 3 commits December 15, 2022 13:43

Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx

6c4dc97

Co-authored-by: Philipp Otto <[email protected]>

applied PR feedback

96998a8

Merge branch 'pricing' of github.com:scalableminds/webknossos into pr…

22954d3

…icing * 'pricing' of github.com:scalableminds/webknossos: Update frontend/javascripts/admin/organization/upgrade_plan_modal.tsx

philippotto changed the title ~~WIP: webKnossos Pricing Plans~~ webKnossos Pricing Plans Dec 15, 2022

philippotto changed the title ~~webKnossos Pricing Plans~~ Add Pricing Plans to Organization Page Dec 15, 2022

Merge branch 'master' of github.com:scalableminds/webknossos into pri…

067cf5a

…cing * 'master' of github.com:scalableminds/webknossos: Disable compression for development proxy (#6699)

hotzenklotz and others added 12 commits December 20, 2022 10:25

update schema version to 94

fb1ff2a

fix CI?

8ec9f3b

prevent prcing plan alarms from showing actions for unauthorized people

bade5ea

Merge branch 'master' of github.com:scalableminds/webknossos into pri…

b0196c9

…cing * 'master' of github.com:scalableminds/webknossos: Revert "temporarily disable vx related polling (#6702)" (#6710)

added owner check for warnings

0b50790

added confirmation toasts on sucessful upgrade requests

bb1f52f

fix toast messages

416a061

Merge branch 'master' into pricing

e753818

migration guide

ffa7430

Merge branch 'master' into pricing

d2a72aa

hotzenklotz enabled auto-merge (squash) January 5, 2023 12:52

hotzenklotz merged commit 14dbb47 into master Jan 5, 2023

hotzenklotz deleted the pricing branch January 5, 2023 12:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Pricing Plans to Organization Page #6602

Add Pricing Plans to Organization Page #6602

hotzenklotz commented Nov 2, 2022 •

edited by philippotto

Loading

philippotto left a comment

philippotto Dec 15, 2022

hotzenklotz Dec 15, 2022

philippotto Dec 15, 2022

philippotto Dec 15, 2022

hotzenklotz Dec 15, 2022

philippotto Dec 15, 2022

philippotto Dec 15, 2022

philippotto Dec 15, 2022

hotzenklotz Dec 15, 2022

hotzenklotz Dec 15, 2022

philippotto Dec 15, 2022

philippotto commented Dec 15, 2022 •

edited by hotzenklotz

Loading

Add Pricing Plans to Organization Page #6602

Add Pricing Plans to Organization Page #6602

Conversation

hotzenklotz commented Nov 2, 2022 • edited by philippotto Loading

URL of deployed dev instance (used for testing):

Steps to test:

Issues:

philippotto left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

philippotto commented Dec 15, 2022 • edited by hotzenklotz Loading

hotzenklotz commented Nov 2, 2022 •

edited by philippotto

Loading

philippotto commented Dec 15, 2022 •

edited by hotzenklotz

Loading