fix: Correctly display expired sidebar card and subscription expiration modal #1074
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1074 +/- ##
==========================================
- Coverage 84.79% 84.70% -0.09%
==========================================
Files 393 393
Lines 8076 8109 +33
Branches 1934 1948 +14
==========================================
+ Hits 6848 6869 +21
- Misses 1171 1180 +9
- Partials 57 60 +3 ☔ View full report in Codecov by Sentry. |
…-portal-enterprise into hu/ent-8609
adamstankiewicz
approved these changes
May 9, 2024
brobro10000
commented
May 13, 2024
Comment on lines
14
to
17
| const hasUnexpiredPolicies = unexpiredPolicies.length > 0; | ||
| if (hasUnexpiredPolicies) { | ||
| return unexpiredPolicies.sort((a, b) => new Date(a.subsidyExpirationDate) - new Date(b.subsidyExpirationDate))[0]; | ||
| } |
There was a problem hiding this comment.
If there exists some unexpired policies, we return the soonest expiring policy metadata.
brobro10000
commented
May 13, 2024
| if (hasUnexpiredPolicies) { | ||
| return unexpiredPolicies.sort((a, b) => new Date(a.subsidyExpirationDate) - new Date(b.subsidyExpirationDate))[0]; | ||
| } | ||
| return expiredPolicies.sort((a, b) => new Date(b.subsidyExpirationDate) - new Date(a.subsidyExpirationDate))[0]; |
There was a problem hiding this comment.
Otherwise we display the last expired budget.
adamstankiewicz
approved these changes
May 13, 2024
adamstankiewicz
approved these changes
May 13, 2024
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.
Updates the API call to the
learner-licensesendpoint include the query parametercurrent_plans_only=falseto properly display an expired subscription license.Also reintroduces the use of
hasValidStartExpirationDateswhen determining is a subscriptionisCurrent. This reintroduction handle zero date validation where the day of expiration is also accounted for whendaysUntilExpirationordaysUntilExpirationIncludingRenewalsis zero but is within a 24 hour period before expiration.Following up with Joe, language updatedx for expired and expiring courses to the following.
Expired:
We also update the expiry modal to adequately handle singular and plural days/hours/minutes when the current subscription is expiring.
Day and Days:
Hours and Hour:
Minutes and Minute:
984c-15dc0c92fe64)
For all changes
Only if submitting a visual change