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.

Sign up for GitHub

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

Jump to bottom

Enforce Pricing for Task/Project Management Features #6767

Merged
merged 16 commits into from
Jan 23, 2023
Merged

Enforce Pricing for Task/Project Management Features #6767

merged 16 commits into from
Jan 23, 2023

Conversation

hotzenklotz
Copy link
Member

@hotzenklotz hotzenklotz commented Jan 19, 2023 •
edited
Loading

This PR adds restrictions to the availability of certain features depending on your organization's plan. In particular, it prevents unauthorized access to Task & Projects etc.

Changes:

  • Added current orga to wk store, including Redux actions/reducers/...
  • Enforce pricing in navbar links
  • Enforce pricing in router
  • Added a small new page when you are not authorized to access a feature
  • Enforce "Add Folder" in dashboard

URL of deployed dev instance (used for testing):

  • https://___.webknossos.xyz

Steps to test:

  • Check that the correct features were restricted and with the right plan
  • Change your orgas plan to Basic/Team/Power... in the DB and check if the restrictions apply

Issues:

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

@hotzenklotz
enforce pricing plan for features (WIP)
ff0aed9
@hotzenklotz
enforce pricing for navbar links
5b40477
@hotzenklotz
Merge branch 'master' of github.com:scalableminds/webknossos into enf…
b480e3f 
…orce_plan

* 'master' of github.com:scalableminds/webknossos:
  Update VoxelyticsDAO.scala
  Show voxel size in details sidebar in new datasets tab (#6755)
  Fix font import (#6754)
  Fix breadcrumbs (II) (#6753)
@hotzenklotz
add organization to store
1c87eb6
@hotzenklotz
fix type errors for activeOrganization
5c2e558
@hotzenklotz
Merge branch 'master' of github.com:scalableminds/webknossos into enf…
b627c5b 
…orce_plan

* 'master' of github.com:scalableminds/webknossos:
  Make voxelytics sql queries compatible with postgres 10 (#6763)
  Adapt viewport and crosshair colors to new color scheme (#6760)
  minor logo fix (#6762)
  Fix superuser organization switching (#6756)
@hotzenklotz
naming stuff is hard
560907b
@hotzenklotz
Merge branch 'master' of github.com:scalableminds/webknossos into enf…
dc3a7d3 
…orce_plan

* 'master' of github.com:scalableminds/webknossos:
  Fix antd deprecation warning for <Modal open/visible> (#6765)
  Fix exploring remote datasets with no credentials (#6764)
@hotzenklotz hotzenklotz self-assigned this Jan 19, 2023
@hotzenklotz hotzenklotz mentioned this pull request Jan 19, 2023
Closed
17 tasks
@hotzenklotz hotzenklotz changed the title Enforce Pricing for Advanced Features Enforce Pricing for Task/Project Management Features Jan 19, 2023
@hotzenklotz hotzenklotz requested review from philippotto and fm3 and removed request for fm3 January 20, 2023 08:59
philippotto
philippotto requested changes Jan 20, 2023
View reviewed changes
Copy link
Member

@philippotto philippotto left a comment

Choose a reason for hiding this comment

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

looks very solid already 👍 I've left some minor comments. after these, I'll test the pr.

frontend/javascripts/messages.tsx Outdated Show resolved Hide resolved
frontend/javascripts/main.tsx Outdated Show resolved Hide resolved
frontend/javascripts/main.tsx Outdated Show resolved Hide resolved
frontend/javascripts/components/secured_route.tsx Outdated Show resolved Hide resolved
frontend/javascripts/components/secured_route.tsx Outdated Show resolved Hide resolved
frontend/javascripts/admin/organization/organization_edit_view.tsx Outdated Show resolved Hide resolved
frontend/javascripts/admin/organization/organization_edit_view.tsx Outdated Show resolved Hide resolved
frontend/javascripts/components/pricing_enforcers.tsx Outdated Show resolved Hide resolved
frontend/javascripts/components/pricing_enforcers.tsx Outdated Show resolved Hide resolved
frontend/javascripts/components/pricing_enforcers.tsx Outdated Show resolved Hide resolved
@hotzenklotz
Copy link
Member Author

@philippotto I considered you suggesting and implemented the feedback. Please re-review. Thanks.

philippotto
philippotto approved these changes Jan 23, 2023
View reviewed changes
Copy link
Member

@philippotto philippotto left a comment

Choose a reason for hiding this comment

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

Nice, works very well 👍

@bulldozer-boy bulldozer-boy bot merged commit d195800 into master Jan 23, 2023
@bulldozer-boy bulldozer-boy bot deleted the enforce_plan branch January 23, 2023 12:51
@philippotto philippotto mentioned this pull request Jan 26, 2023
Merged
7 tasks
@philippotto philippotto mentioned this pull request Feb 3, 2023
Merged
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@philippotto philippotto philippotto approved these changes

Assignees

@hotzenklotz hotzenklotz

Labels
automerge frontend
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@hotzenklotz @philippotto