🔖(chore) bump to version 2.22.0

Added - Add head_js block into base html template - list teacher's organizations in the teacher dashboard sidebar. - Added Certificates in the dashboard - Dashboard infinite scroll of orders and enrollments Fixed - Fix error `MultipleObjectsReturned` during synchronization due to missing `distinct`. - Fix images sizes for course detail cover and organization banner
openfun · Apr 21, 2023 · c126d19 · c126d19
1 parent 69c9b51
commit c126d19
Show file tree

Hide file tree

Showing 63 changed files with 3,036 additions and 203 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unrealeased]
 
+## [2.22.0] - 2023-04-20
+
 ### Added
 
 - Add head_js block into base html template
@@ -1846,7 +1848,8 @@ us:
 - finish integrating the missing pages and improve the sandbox environment;
 - test and polish the use of richie as a django app / node dependency.
 
-[unreleased]: https://github.com/openfun/richie/compare/v2.21.1...master
+[unreleased]: https://github.com/openfun/richie/compare/v2.22.0...master
+[2.22.0]: https://github.com/openfun/richie/compare/v2.21.1...2.22.0
 [2.21.1]: https://github.com/openfun/richie/compare/v2.21.0...2.21.1
 [2.21.0]: https://github.com/openfun/richie/compare/v2.20.1...2.21.0
 [2.20.1]: https://github.com/openfun/richie/compare/v2.20.0...2.20.1

diff --git a/...r.organization}}-richie-site-factory/template/{{cookiecutter.site}}/requirements/base.txt b/...r.organization}}-richie-site-factory/template/{{cookiecutter.site}}/requirements/base.txt
@@ -5,5 +5,5 @@ django-storages==1.11.1
 dockerflow==2022.1.0
 gunicorn==20.1.0
 psycopg2-binary==2.9.3
-richie==2.21.1
+richie==2.22.0
 sentry-sdk==1.14.0
diff --git a/...ganization}}-richie-site-factory/template/{{cookiecutter.site}}/src/frontend/package.json b/...ganization}}-richie-site-factory/template/{{cookiecutter.site}}/src/frontend/package.json
@@ -20,7 +20,7 @@
     "CMS"
   ],
   "dependencies": {
-    "richie-education": "2.21.1"
+    "richie-education": "2.22.0"
   },
   "devDependencies": {
     "babel-loader": "9.1.2",

diff --git a/docs/cookiecutter.md b/docs/cookiecutter.md
@@ -25,15 +25,15 @@ If you chose to install Cookiecutter, you can now run it against our
 [template][2] as follows:
 
 ```bash
-cookiecutter gh:openfun/richie --directory cookiecutter  --checkout v2.21.1
+cookiecutter gh:openfun/richie --directory cookiecutter  --checkout v2.22.0
 ```
 
 If you didn't want to install it on your machine, we provide a Docker image
 built with our [own repository][4] that you can use as follows:
 
 ```bash
 docker run --rm -it -u $(id -u):$(id -g) -v $PWD:/app \
-fundocker/cookiecutter gh:openfun/richie --directory cookiecutter --checkout v2.21.1
+fundocker/cookiecutter gh:openfun/richie --directory cookiecutter --checkout v2.22.0
 ```
 
 The `--directory` option is to indicate that our Cookiecutter template is in

diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@
 ;;
 [metadata]
 name = richie
-version = 2.21.1
+version = 2.22.0
 description = A CMS to build learning portals for open education
 long_description = file:README.md
 long_description_content_type = text/markdown

diff --git a/src/frontend/i18n/locales/ar-SA.json b/src/frontend/i18n/locales/ar-SA.json
@@ -263,6 +263,14 @@
     "description": "Help text below the \"Unenroll now\" CTA when an enrollment attempt has already failed.",
     "message": "Unenroll from this course"
   },
+  "components.Dashboard.DashboardRoutes.certificates.label": {
+    "description": "Label of the certificates view used in navigation components.",
+    "message": "My certificates"
+  },
+  "components.Dashboard.DashboardRoutes.certificates.path": {
+    "description": "The path to display the certificates view.",
+    "message": "/certificates"
+  },
   "components.Dashboard.DashboardRoutes.course.path": {
     "description": "The path to display a course detail view.",
     "message": "/courses/{code}"
@@ -355,6 +363,42 @@
     "description": "The dashboard's breadcrumb back button's label",
     "message": "Back"
   },
+  "components.DashboardCertificate.details": {
+    "description": "Label for the details button of a certificate",
+    "message": "Details"
+  },
+  "components.DashboardCertificate.download": {
+    "description": "Label for the download button of a certificate",
+    "message": "Download"
+  },
+  "components.DashboardCertificate.generatingCertificate": {
+    "description": "Accessible label displayed while certificate is being generated on the dashboard.",
+    "message": "Certificate is being generated..."
+  },
+  "components.DashboardCertificate.issuedOn": {
+    "description": "Label for the date of issue of a certificate",
+    "message": "Issued on {date}"
+  },
+  "components.DashboardCertificate.noCertificate": {
+    "description": "Label displayed when no certificate is available",
+    "message": "When all your courses will be passed, you will be able to download your certificate here."
+  },
+  "components.DashboardCertificates.empty": {
+    "description": "Message displayed when there are no certificates",
+    "message": "You have no certificates yet."
+  },
+  "components.DashboardCertificates.loading": {
+    "description": "Message displayed while loading certificates",
+    "message": "Loading certificates..."
+  },
+  "components.DashboardCourses.emptyList": {
+    "description": "Empty placeholder of the dashboard's list of orders and enrollments",
+    "message": "You have no enrollments nor orders yet."
+  },
+  "components.DashboardCourses.loadMoreResults": {
+    "description": "Button to manually load more orders and enrollments",
+    "message": "Load more"
+  },
   "components.DashboardCourses.loading": {
     "description": "Message displayed while loading orders and enrollments",
     "message": "Loading orders and enrollments..."
@@ -888,7 +932,7 @@
     "message": "/teacher"
   },
   "components.TeacherOrganizationCourseDashboardLoader.loading": {
-    "description": "Message displayed while loading an organization",
+    "description": "Message displayed while loading courses on the teacher's dashboard'",
     "message": "Loading organization ..."
   },
   "components.TeacherOrganizationDashboardSidebar.header": {
@@ -899,9 +943,13 @@
     "description": "Sub title of the organization dashboard sidebar",
     "message": "You are on the organization dashboard"
   },
-  "components.TeacherProfileDashboardLoader.loading": {
-    "description": "Message displayed while loading profile",
-    "message": "Loading profile ..."
+  "components.TeacherProfileDashboardSidebar.OrganizationLinks.organizationLinkTitle": {
+    "description": "Organization link title",
+    "message": "Link to organization \"{organizationTitle}\""
+  },
+  "components.TeacherProfileDashboardSidebar.OrganizationLinks.organizationsTitle": {
+    "description": "Title of the organizations section",
+    "message": "My universities"
   },
   "components.TeacherProfileDashboardSidebar.header": {
     "description": "Title of the dashboard sidebar",
@@ -971,6 +1019,14 @@
     "description": "Error shown if a user tries to remove a main address",
     "message": "Cannot remove main address."
   },
+  "hooks.useCertificates.errorGet": {
+    "description": "Error message shown to the user when certificates fetch request fails.",
+    "message": "An error occurred while fetching certificates. Please retry later."
+  },
+  "hooks.useCertificates.errorNotFound": {
+    "description": "Error message shown to the user when no certificate matches.",
+    "message": "Cannot find the certificate"
+  },
   "hooks.useCreditCards.errorCreate": {
     "description": "Error message shown to the user when credit card creation request fails.",
     "message": "An error occurred while creating the credit card. Please retry later."
@@ -1031,6 +1087,18 @@
     "description": "Error message shown to the user when no orders matches.",
     "message": "Cannot find the orders."
   },
+  "hooks.useOrdersEnrollments.errorGet": {
+    "description": "Error message shown to the user when orders or enrollments fetch request fails.",
+    "message": "An error occurred while fetching orders and enrollments. Please retry later."
+  },
+  "hooks.useOrganizations.errorNotFound": {
+    "description": "Error message shown to the user when no organizations matches.",
+    "message": "Cannot find the organization"
+  },
+  "hooks.useOrganizations.errorSelect": {
+    "description": "Error message shown to the user when organizations fetch request fails.",
+    "message": "An error occurred while fetching organizations. Please retry later."
+  },
   "hooks.useProduct.errorGet": {
     "description": "Error message shown to the user when product fetch request fails.",
     "message": "An error occurred while fetching product. Please retry later."

diff --git a/src/frontend/i18n/locales/es-ES.json b/src/frontend/i18n/locales/es-ES.json
@@ -263,6 +263,14 @@
     "description": "Help text below the \"Unenroll now\" CTA when an enrollment attempt has already failed.",
     "message": "Unenroll from this course"
   },
+  "components.Dashboard.DashboardRoutes.certificates.label": {
+    "description": "Label of the certificates view used in navigation components.",
+    "message": "My certificates"
+  },
+  "components.Dashboard.DashboardRoutes.certificates.path": {
+    "description": "The path to display the certificates view.",
+    "message": "/certificates"
+  },
   "components.Dashboard.DashboardRoutes.course.path": {
     "description": "The path to display a course detail view.",
     "message": "/courses/{code}"
@@ -355,6 +363,42 @@
     "description": "The dashboard's breadcrumb back button's label",
     "message": "Back"
   },
+  "components.DashboardCertificate.details": {
+    "description": "Label for the details button of a certificate",
+    "message": "Details"
+  },
+  "components.DashboardCertificate.download": {
+    "description": "Label for the download button of a certificate",
+    "message": "Download"
+  },
+  "components.DashboardCertificate.generatingCertificate": {
+    "description": "Accessible label displayed while certificate is being generated on the dashboard.",
+    "message": "Certificate is being generated..."
+  },
+  "components.DashboardCertificate.issuedOn": {
+    "description": "Label for the date of issue of a certificate",
+    "message": "Issued on {date}"
+  },
+  "components.DashboardCertificate.noCertificate": {
+    "description": "Label displayed when no certificate is available",
+    "message": "When all your courses will be passed, you will be able to download your certificate here."
+  },
+  "components.DashboardCertificates.empty": {
+    "description": "Message displayed when there are no certificates",
+    "message": "You have no certificates yet."
+  },
+  "components.DashboardCertificates.loading": {
+    "description": "Message displayed while loading certificates",
+    "message": "Loading certificates..."
+  },
+  "components.DashboardCourses.emptyList": {
+    "description": "Empty placeholder of the dashboard's list of orders and enrollments",
+    "message": "You have no enrollments nor orders yet."
+  },
+  "components.DashboardCourses.loadMoreResults": {
+    "description": "Button to manually load more orders and enrollments",
+    "message": "Load more"
+  },
   "components.DashboardCourses.loading": {
     "description": "Message displayed while loading orders and enrollments",
     "message": "Loading orders and enrollments..."
@@ -888,7 +932,7 @@
     "message": "/teacher"
   },
   "components.TeacherOrganizationCourseDashboardLoader.loading": {
-    "description": "Message displayed while loading an organization",
+    "description": "Message displayed while loading courses on the teacher's dashboard'",
     "message": "Loading organization ..."
   },
   "components.TeacherOrganizationDashboardSidebar.header": {
@@ -899,9 +943,13 @@
     "description": "Sub title of the organization dashboard sidebar",
     "message": "You are on the organization dashboard"
   },
-  "components.TeacherProfileDashboardLoader.loading": {
-    "description": "Message displayed while loading profile",
-    "message": "Loading profile ..."
+  "components.TeacherProfileDashboardSidebar.OrganizationLinks.organizationLinkTitle": {
+    "description": "Organization link title",
+    "message": "Link to organization \"{organizationTitle}\""
+  },
+  "components.TeacherProfileDashboardSidebar.OrganizationLinks.organizationsTitle": {
+    "description": "Title of the organizations section",
+    "message": "My universities"
   },
   "components.TeacherProfileDashboardSidebar.header": {
     "description": "Title of the dashboard sidebar",
@@ -971,6 +1019,14 @@
     "description": "Error shown if a user tries to remove a main address",
     "message": "Cannot remove main address."
   },
+  "hooks.useCertificates.errorGet": {
+    "description": "Error message shown to the user when certificates fetch request fails.",
+    "message": "An error occurred while fetching certificates. Please retry later."
+  },
+  "hooks.useCertificates.errorNotFound": {
+    "description": "Error message shown to the user when no certificate matches.",
+    "message": "Cannot find the certificate"
+  },
   "hooks.useCreditCards.errorCreate": {
     "description": "Error message shown to the user when credit card creation request fails.",
     "message": "An error occurred while creating the credit card. Please retry later."
@@ -1031,6 +1087,18 @@
     "description": "Error message shown to the user when no orders matches.",
     "message": "Cannot find the orders."
   },
+  "hooks.useOrdersEnrollments.errorGet": {
+    "description": "Error message shown to the user when orders or enrollments fetch request fails.",
+    "message": "An error occurred while fetching orders and enrollments. Please retry later."
+  },
+  "hooks.useOrganizations.errorNotFound": {
+    "description": "Error message shown to the user when no organizations matches.",
+    "message": "Cannot find the organization"
+  },
+  "hooks.useOrganizations.errorSelect": {
+    "description": "Error message shown to the user when organizations fetch request fails.",
+    "message": "An error occurred while fetching organizations. Please retry later."
+  },
   "hooks.useProduct.errorGet": {
     "description": "Error message shown to the user when product fetch request fails.",
     "message": "An error occurred while fetching product. Please retry later."