feat: cherry-pick edx-enterprise customizations to Palm [BB-7878] #10
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
0x29a
force-pushed
the
0x29a/bb7878/cherry-pick-edx-enterprise-customizations-to-palm
branch
7 times, most recently
from
6ed0fe2
to
e67d545
Compare
Co-authored-by: Maxim Beder <[email protected]> test: EnterpriseCourseEnrollmentFilterBackend Co-authored-by: Maxim Beder <[email protected]> feat: add additional fields to EnterpriseCourseEnrollmentViewSet Created new manager and serializer for EnterpriseCourseEnrollment model, which add additional fields to the model, which allow to reduce the number of requests to the API by providing the necessary data in the feilds along side the model. Use the new manager and serializer in EnterpriseCourseEnrollmentViewSet. Co-authored-by: Maxim Beder <[email protected]>
When creating pending enrollments for non-existant users, we also check to see if the course is "invite_only". If the course is invite only, then we create corresponding CourseEnrollmentAllowed objects. This fixes the issue when the enterprise creates pending enrollment, but the user cannot enroll to the course as platform rejects the enrollment request due to missing CEA for the user. (cherry picked from commit 0e06d74)
This adds a new attribute `hide_course_price_when_zero` to the EnterpriseCustomer model, which will hide the pricing information from the enrollment page when the final price of a premium course mode is Zero. fix: removed unused variable from template context fix: quality issue and add the new attribute to test fix: update the help text in the db migration feat: adds final price to logging fix: change the attribute in the utils test causing test failure refactor: renamed the migration file
temp: add utility function to add CEA objects feat: adds allow invite only enrollment flag feat: adds allow invite only enrollment flag feat: create cea only when customer has invite-only enrollments enabled fix: simplify the cea creation logic, update tests fix: remove a stray empty line feat: adds the invite-only flag to customer admin fix: typo in the fuction docstring Co-authored-by: Piotr Surowiec <[email protected]> refactor: convert the user consent flow handler method to static fix: move migrations to avoid conflicts feat: add typing to the ensure cea utility method Revert "feat: add typing to the ensure cea utility method" This reverts commit b6b2f25. refactor: rename the migration with a custom name instead of the auto one
This commit contains renamed migrations that were extracted from other pull requests. We do this because upstream PRs depend on migrations that don't exist in v3.61.11 IMPORTANT: if you've previously had `opencraft-release/nutmeg.2` installed, you'll have to fake all migrations from this commit, as changes are mostly likely already applied to your DB. See this and further comments for details: https://tasks.opencraft.com/browse/BB-7619?focusedCommentId=274168&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-274168
Also adds a workaround for astral-sh/rye#368
0x29a
force-pushed
the
0x29a/bb7878/cherry-pick-edx-enterprise-customizations-to-palm
branch
from
e67d545
to
fcd515b
Compare
0x29a
changed the title
0x29a
changed the title
Agrendalath
approved these changes
Nov 7, 2023
There was a problem hiding this comment.
@0x29a, thank you for the very detailed description of all the changes! Great job.
👍
- I tested this: checked that the diffs match the PRs (one nit: the
codecovversion bump was included in 762faa9 instead of 3534251, but it's not a big deal) - I read through the code
- I checked for accessibility issues: n/a
- Includes documentation: n/a
- I made sure any change in configuration variables is reflected in the corresponding client's
configuration-securerepository: I bumped the version; it will be included in the next deployment
Agrendalath
deleted the
0x29a/bb7878/cherry-pick-edx-enterprise-customizations-to-palm
branch
0x29a
changed the title
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.
Description
Nutmeg uses
3.42.5: https://github.com/openedx/edx-platform/blob/open-release/nutmeg.3/requirements/constraints.txt#L34Diff between
opencraft-release/nutmeg.2and3.42.5: https://github.com/openedx/edx-enterprise/compare/3.42.5...open-craft:edx-enterprise:opencraft-release/nutmeg.2?expand=1:Testing notes:
Testing this was extremely tedious, so I'm not providing exact steps that I performed to make the devstack and all enterprise-related services work together (I'll post them somewhere after I compile my notes). But, I successfully followed all testing steps for the following pull requests: