diff --git a/RELEASE.rst b/RELEASE.rst index 75fbe66d7e..47ed6fa867 100644 --- a/RELEASE.rst +++ b/RELEASE.rst @@ -1,6 +1,17 @@ Release Notes ============= +Version 0.99.0 +-------------- + +- Revert "Update nginx Docker tag to v1.27" (#2352) +- Add Go To Course button (#2349) +- Add availability to Courses API endpoint (#2308) +- Generate certificates twice a day (#2348) +- Add time_commitment and durations to the courses api (#2334) +- Update dependency django-anymail to v11 (#2341) +- Update redis Docker tag to v6.2.14 (#2346) + Version 0.98.14 (Released August 15, 2024) --------------- diff --git a/courses/serializers/v2/courses.py b/courses/serializers/v2/courses.py index 6ea3ddf47c..5816fd9d67 100644 --- a/courses/serializers/v2/courses.py +++ b/courses/serializers/v2/courses.py @@ -16,6 +16,7 @@ ProductRelatedField, ) from courses.serializers.v1.departments import DepartmentSerializer +from courses.utils import get_archived_courseruns from flexiblepricing.api import is_courseware_flexible_price_approved from main import features from openedx.constants import EDX_ENROLLMENT_AUDIT_MODE, EDX_ENROLLMENT_VERIFIED_MODE @@ -32,7 +33,10 @@ class CourseSerializer(BaseCourseSerializer): programs = serializers.SerializerMethodField() topics = serializers.SerializerMethodField() certificate_type = serializers.SerializerMethodField() + availability = serializers.SerializerMethodField() required_prerequisites = serializers.SerializerMethodField() + duration = serializers.SerializerMethodField() + time_commitment = serializers.SerializerMethodField() def get_required_prerequisites(self, instance): """ @@ -46,6 +50,24 @@ def get_required_prerequisites(self, instance): and instance.page.prerequisites != "" ) + def get_duration(self, instance): + """ + Get the duration of the course from the course page CMS. + """ + if hasattr(instance, "page") and hasattr(instance.page, "length"): + return instance.page.length + + return None + + def get_time_commitment(self, instance): + """ + Get the time commitment of the course from the course page CMS. + """ + if hasattr(instance, "page") and hasattr(instance.page, "effort"): + return instance.page.effort + + return None + def get_next_run_id(self, instance): """Get next run id""" run = instance.first_unexpired_run @@ -75,6 +97,15 @@ def get_certificate_type(self, instance): return "MicroMasters Credential" return "Certificate of Completion" + def get_availability(self, instance): + """Get course availability""" + archived_course_runs = get_archived_courseruns( + instance.courseruns.filter(is_self_paced=False) + ) + if archived_course_runs.count() == 0: + return "dated" + return "anytime" + class Meta: model = models.Course fields = [ @@ -88,6 +119,9 @@ class Meta: "topics", "certificate_type", "required_prerequisites", + "duration", + "time_commitment", + "availability", ] diff --git a/courses/serializers/v2/courses_test.py b/courses/serializers/v2/courses_test.py index d5530e0a38..5958df3ad3 100644 --- a/courses/serializers/v2/courses_test.py +++ b/courses/serializers/v2/courses_test.py @@ -66,8 +66,11 @@ def test_serialize_course( "departments": [{"name": department}], "page": CoursePageSerializer(course.page).data, "certificate_type": certificate_type, + "availability": "dated", "topics": [{"name": topic.name} for topic in topics], "required_prerequisites": True, + "duration": course.page.length, + "time_commitment": course.page.effort, "programs": BaseProgramSerializer(course.programs, many=True).data if all_runs else None, @@ -103,7 +106,10 @@ def test_serialize_course_required_prerequisites( "page": CoursePageSerializer(course.page).data, "certificate_type": "Certificate of Completion", "topics": [], + "availability": "dated", "required_prerequisites": expected_required_prerequisites, + "duration": course.page.length, + "time_commitment": course.page.effort, "programs": None, }, ) diff --git a/courses/utils.py b/courses/utils.py index 8ea1f7d432..3a8d15c8f4 100644 --- a/courses/utils.py +++ b/courses/utils.py @@ -173,3 +173,21 @@ def get_unenrollable_courses(queryset): .filter(courseruns__id__in=courseruns_qs.values_list("id", flat=True)) .distinct() ) + + +def get_archived_courseruns(queryset): + """ + Returns course runs that are archived. This is defined as: + - The course run end date has passed + - The course run enrollment end date is in the future or None. + This logic is set to match the logic found in frontend/public/src/lib/courseApi.js isRunArchived + + Args: + queryset: Queryset of CourseRun objects + """ + now = now_in_utc() + return queryset.filter( + get_enrollable_course_run_filter(now) + & Q(end_date__lt=now) + & (Q(enrollment_end__isnull=True) | Q(enrollment_end__gt=now)) + ) diff --git a/docker-compose.yml b/docker-compose.yml index 294e18937d..56099bcdf6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,7 +34,7 @@ services: - db-data:/var/lib/postgresql/data redis: - image: redis:6.0.5 + image: redis:6.2.14 ports: - "6379" diff --git a/frontend/public/scss/dashboard.scss b/frontend/public/scss/dashboard.scss index 9e8dffad1f..d670b3add5 100644 --- a/frontend/public/scss/dashboard.scss +++ b/frontend/public/scss/dashboard.scss @@ -74,7 +74,7 @@ $enrolled-passed-fg: #ffffff; div.row { margin: 0 !important; - padding: 20px; + padding: 20px 30px; height: 100%; } @@ -108,6 +108,7 @@ $enrolled-passed-fg: #ffffff; } .course-card-text-details { + padding: 0 0 0 20px; @include media-breakpoint-down(sm) { padding: 15px 0px 15px 0px; @@ -147,8 +148,7 @@ $enrolled-passed-fg: #ffffff; } button.dot-menu { - // Setting height so the button element doesn't expand to cover the full height of the row - height: $material-icon-height; + vertical-align: -webkit-baseline-middle; } .certificate-container { @@ -200,7 +200,7 @@ $enrolled-passed-fg: #ffffff; .upgrade-item-description { width: 100%; flex-direction: row !important; - padding: 25px 30px; + padding: 15px 30px; border-top: $home-page-border-grey; background: $home-page-grey-lite; @@ -209,6 +209,7 @@ $enrolled-passed-fg: #ffffff; } div.certificate-upgrade-message { + padding-left: 30px; width: 80%; font-size: 16px; line-height: 30px; @@ -270,9 +271,13 @@ $enrolled-passed-fg: #ffffff; } } } - - .get-cert-button-container button, .finaid-link-container { - font-size: 14px !important; + .goto-course-wrapper { + a { + width: fit-content; + } + } + .get-cert-button-container button, .finaid-link-container, a.btn-primary { + font-size: 14px; @include media-breakpoint-down(sm) { width: 100%; diff --git a/frontend/public/src/components/EnrolledItemCard.js b/frontend/public/src/components/EnrolledItemCard.js index cbc19c6d69..59b0b6caa9 100644 --- a/frontend/public/src/components/EnrolledItemCard.js +++ b/frontend/public/src/components/EnrolledItemCard.js @@ -1,7 +1,11 @@ /* global SETTINGS:false */ import React from "react" import moment from "moment" -import { parseDateString, formatPrettyDateTimeAmPmTz } from "../lib/util" +import { + parseDateString, + formatPrettyDateTimeAmPmTz, + formatPrettyMonthDate +} from "../lib/util" import { Formik, Form, Field } from "formik" import { Dropdown, @@ -402,21 +406,6 @@ export class EnrolledItemCard extends React.Component< const { menuVisibility } = this.state - const title = isLinkableCourseRun(enrollment.run, currentUser) ? ( - - redirectToCourseHomepage(enrollment.run.courseware_url, ev) - } - target="_blank" - rel="noopener noreferrer" - > - {enrollment.run.course.title} - - ) : ( - enrollment.run.course.title - ) - const financialAssistanceLink = isFinancialAssistanceAvailable(enrollment.run) && !enrollment.approved_flexible_price_exists ? ( @@ -430,30 +419,31 @@ export class EnrolledItemCard extends React.Component< const certificateLinksStyles = isProgramCard ? "upgrade-item-description d-md-flex align-items-start justify-content-between flex-column" : - "upgrade-item-description d-md-flex align-items-start justify-content-between" + "upgrade-item-description d-md-flex" const certificateLinksIntStyles = isProgramCard ? "d-flex d-md-flex flex-column align-items-start justify-content-center" : - "d-flex d-md-flex flex-column align-items-start justify-content-center" + "d-flex d-md-flex flex-column justify-content-center" const certificateLinks = enrollment.run.products.length > 0 && enrollment.enrollment_mode === "audit" && enrollment.run.is_upgradable ? (
-
-

- Upgrade today and, upon passing, receive your - certificate signed by MIT faculty to highlight the knowledge and - skills you've gained from this MITx course. -

-
-
- {financialAssistanceLink} -
+
+
+ Upgrade today and, upon passing, receive your + certificate signed by MIT faculty to highlight the knowledge and + skills you've gained from this MITx course.{" "} + + Upgrade expires:{" "} + {formatPrettyDateTimeAmPmTz( + parseDateString(enrollment.run.upgrade_deadline) + )} +
) : null @@ -492,8 +482,8 @@ export class EnrolledItemCard extends React.Component< )}
-
-
+
+
{enrollment.certificate ? ( @@ -509,7 +499,35 @@ export class EnrolledItemCard extends React.Component< ) : null}
-

{title}

+

{enrollment.run.course.title}

+
+
+ {isLinkableCourseRun(enrollment.run, currentUser) ? ( + + redirectToCourseHomepage( + enrollment.run.courseware_url, + ev + ) + } + className="btn btn-primary btn-gradient-red-to-blue" + target="_blank" + rel="noopener noreferrer" + > + Go to Course + + ) : ( + + Starts{" "} + {formatPrettyMonthDate( + parseDateString(enrollment.run.start_date) + )} + + )}
{ let helper, @@ -23,7 +22,6 @@ describe("EnrolledItemCard", () => { userEnrollment, currentUser, enrollmentCardProps, - isFinancialAssistanceAvailableStub, toggleProgramDrawer, redirectToCourseHomepage @@ -48,10 +46,6 @@ describe("EnrolledItemCard", () => { .returns(Promise), addUserNotification: helper.sandbox.stub().returns(Function) } - isFinancialAssistanceAvailableStub = helper.sandbox.stub( - courseApi, - "isFinancialAssistanceAvailable" - ) toggleProgramDrawer = helper.sandbox.stub().returns(Function) redirectToCourseHomepage = helper.sandbox.stub().returns(Function) @@ -251,25 +245,6 @@ describe("EnrolledItemCard", () => { assert.isTrue(verifiedUnenrollmodal.exists()) }) }) - ;[[true], [false]].forEach(([approvedFlexiblePrice]) => { - it("renders the financial assistance link", async () => { - isFinancialAssistanceAvailableStub.returns(true) - userEnrollment = makeCourseRunEnrollmentWithProduct() - userEnrollment["enrollment_mode"] = "audit" - userEnrollment["approved_flexible_price_exists"] = approvedFlexiblePrice - enrollmentCardProps.enrollment = userEnrollment - const inner = await renderedCard() - const extraLinks = inner.find(".finaid-link") - if (approvedFlexiblePrice) { - const text = extraLinks.find("a").at(0) - assert.isFalse(text.exists()) - } else { - const text = extraLinks.find("a").at(0).text() - assert.equal(text, "Financial assistance?") - } - }) - }) - it("renders the program unenrollment verification modal", async () => { enrollmentCardProps.enrollment = makeProgramEnrollment() diff --git a/frontend/public/src/components/Loader.js b/frontend/public/src/components/Loader.js index ffc690487f..0b965ebdd3 100644 --- a/frontend/public/src/components/Loader.js +++ b/frontend/public/src/components/Loader.js @@ -24,7 +24,7 @@ const Loader = (props: LoaderProps) => { notNil(delayMs) ? delayMs : defaultLoaderDelayMs ) return () => clearTimeout(timer) - }, []) + }, [isLoading, delayMs]) if (!isLoading) { return children diff --git a/frontend/public/src/lib/util.js b/frontend/public/src/lib/util.js index 334c5f3d31..f9ccd96a4e 100644 --- a/frontend/public/src/lib/util.js +++ b/frontend/public/src/lib/util.js @@ -152,6 +152,9 @@ export const formatPrettyDate = (momentDate: Moment) => export const formatPrettyShortDate = (momentDate: Moment) => momentDate.format("MMM D, YYYY") +export const formatPrettyMonthDate = (momentDate: Moment) => + momentDate.format("MMMM D") + export const formatPrettyDateUtc = (momentDate: Moment) => momentDate.tz("UTC").format("MMMM D, YYYY") diff --git a/main/settings.py b/main/settings.py index 4a6ee54634..77df7dc1ab 100644 --- a/main/settings.py +++ b/main/settings.py @@ -29,7 +29,7 @@ from main.celery_utils import OffsettingSchedule from main.sentry import init_sentry -VERSION = "0.98.14" +VERSION = "0.99.0" log = logging.getLogger() @@ -786,7 +786,7 @@ ) CRON_COURSE_CERTIFICATES_HOURS = get_string( name="CRON_COURSE_CERTIFICATES_HOURS", - default=0, + default="0,12", description="'hours' value for the 'generate-course-certificate' scheduled task (defaults to midnight)", ) CRON_COURSE_CERTIFICATES_DAYS = get_string( diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 51e3fd8756..2c67e9d747 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -2,7 +2,7 @@ # it's primary purpose is to emulate heroku-buildpack-nginx's # functionality that compiles config/nginx.conf.erb # See https://github.com/heroku/heroku-buildpack-nginx/blob/fefac6c569f28182b3459cb8e34b8ccafc403fde/bin/start-nginx -FROM nginx:1.27 +FROM nginx:1.21 # Logs are configured to a relatic path under /etc/nginx # but the container expects /var/log diff --git a/poetry.lock b/poetry.lock index bfad69f660..939a17491c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -963,23 +963,24 @@ bcrypt = ["bcrypt"] [[package]] name = "django-anymail" -version = "8.6" -description = "Django email backends and webhooks for Amazon SES, Mailgun, Mailjet, Mandrill, Postal, Postmark, SendGrid, SendinBlue, and SparkPost" +version = "11.1" +description = "Django email backends and webhooks for Amazon SES, Brevo, MailerSend, Mailgun, Mailjet, Mandrill, Postal, Postmark, Resend, SendGrid, SparkPost and Unisender Go (EmailBackend, transactional email tracking and inbound email signals)" optional = false -python-versions = ">=3.5" +python-versions = ">=3.7" files = [ - {file = "django-anymail-8.6.tar.gz", hash = "sha256:783342d49dd07d68778b81dd12a94c86e1d217463a68a85450a0513fabe31345"}, - {file = "django_anymail-8.6-py3-none-any.whl", hash = "sha256:49d83d7c16316ca86a624097496881d59b7d71b16bf1c5211cffa5b19ef98d0c"}, + {file = "django_anymail-11.1-py3-none-any.whl", hash = "sha256:f1a5b2de713f46fbdf311f875a9546511e4aa9bfa1c3f8350d21b43e75579acc"}, + {file = "django_anymail-11.1.tar.gz", hash = "sha256:ec373c0a2d79f5e6a3ecda819c8087af0b0e114e4ec1d8576dea4c786f9b2a59"}, ] [package.dependencies] django = ">=2.0" requests = ">=2.4.3" +urllib3 = ">=1.25.0" [package.extras] -amazon-ses = ["boto3"] -dev = ["flake8", "sphinx", "sphinx-rtd-theme", "tox", "twine", "wheel"] +amazon-ses = ["boto3 (>=1.10.17)"] postal = ["cryptography"] +resend = ["svix"] [[package]] name = "django-compat" @@ -4246,4 +4247,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" python-versions = "3.9.18" -content-hash = "d60649a132bca316a4246da510a9fb918bb2015209070da8ca411564eaaca2f1" +content-hash = "2bbcbb61e331734585677e08ab0bb998c292ef2d7ea51f06e567a6a9f18f0307" diff --git a/pyproject.toml b/pyproject.toml index e6c9ccd5cd..dc8ca8f399 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ celery-redbeat = "^2.0.0" deepdiff = "^6.6.1" dj-database-url = "^0.5.0" django = "^3.2.18" -django-anymail = {extras = ["mailgun"], version = "^8.4"} +django-anymail = {extras = ["mailgun"], version = "^11.1"} django-cors-headers = "^3.11.0" django-countries = "^7.2.1" django-filter = "^2.4.0"