🔖(chore) bump to version 2.21.0

Added
- Add CourseAddToWishlist button to add/remove a course from users wishlist
- Added Enrollment's pagination in the dashboard
- Allow multiple web analytics providers at the same time.
- Display `localizedMessage` on Course Enrollment when backend has
  `localizedMessage` on the 400 error payload

Fixed
- Fix form styles to suffix input label with "*" when a select,
  radio or checkbox input is required
- Button can be use with a className prop

Changed
- Rename web analytics providers, from `google_analytics` to
  `google_universal_analytics`. The `google_tag_manager`
  now uses the correct `gtm.js` and the `google_tag` uses the `gtag.js`.
  Replace the multiple web analytics settings with a single
  `WEB_ANALYTICS` dict setting.
  The location logic of web analytics js code has been moved to be
  inside the `web_analytics.html` template.
- For performance reasons the default location for the web analytics js code
  have been changed from `head` to `footer`.
- Rename product.certificate to certificate_definition due to Joanie API update.
- Rework frontend file architecture
- Hide unenroll button on CourseProductItem widget

Author: jbpenrath

CHANGELOG.md

@@ -8,6 +8,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unrealeased]
 
+## [2.21.0] - 2023-03-21
+
 ### Added
 
 - Add CourseAddToWishlist button to add/remove a course from users wishlist
@@ -1824,7 +1826,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.20.1...master
+[unreleased]: https://github.com/openfun/richie/compare/v2.21.0...master
+[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
 [2.20.0]: https://github.com/openfun/richie/compare/v2.19.0...2.20.0
 [2.19.0]: https://github.com/openfun/richie/compare/v2.18.0...2.19.0

UPGRADE.md

@@ -16,6 +16,8 @@ $ make migrate
 
 ## Unreleased
 
+## 2.20.1 to 2.21.0
+
 - Frontend folder architecture has been totally reworked. If you have overridden
   any frontend components, you should have to update your overrides.json file to match new paths. In
   the same way, you should also check sass import paths in your custom scss files.

cookiecutter/{{cookiecutter.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.20.1
+richie==2.21.0
 sentry-sdk==1.5.5

cookiecutter/{{cookiecutter.organization}}-richie-site-factory/template/{{cookiecutter.site}}/src/frontend/package.json

@@ -20,7 +20,7 @@
     "CMS"
   ],
   "dependencies": {
-    "richie-education": "2.20.1"
+    "richie-education": "2.21.0"
   },
   "devDependencies": {
     "@formatjs/cli": "4.8.2",

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.20.1
+cookiecutter gh:openfun/richie --directory cookiecutter  --checkout v2.21.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.20.1
+fundocker/cookiecutter gh:openfun/richie --directory cookiecutter --checkout v2.21.0
 ```
 
 The `--directory` option is to indicate that our Cookiecutter template is in

setup.cfg

@@ -3,7 +3,7 @@
 ;;
 [metadata]
 name = richie
-version = 2.20.1
+version = 2.21.0
 description = A CMS to build learning portals for open education
 long_description = file:README.md
 long_description_content_type = text/markdown

src/frontend/i18n/locales/ar-SA.json

@@ -123,6 +123,22 @@
     "description": "Error message displayed when a field value is too short.",
     "message": "The minimum length is {min} {min, plural, one {char} other {chars}}."
   },
+  "components.CourseAddToWishlist.labelAdd": {
+    "description": "Label to proceed to add a course to user wishlist.",
+    "message": "Notify me"
+  },
+  "components.CourseAddToWishlist.labelRemove": {
+    "description": "Label to proceed to remove a course to user wishlist.",
+    "message": "Do not notify me anymore"
+  },
+  "components.CourseAddToWishlist.loading": {
+    "description": "Accessible message displayed while loading wishlist",
+    "message": "Loading your wishlist..."
+  },
+  "components.CourseAddToWishlist.logMe": {
+    "description": "Label to proceed to login page before being adding a course to user wishlist.",
+    "message": "Log in to be notified"
+  },
   "components.CourseGlimpse.categoryLabel": {
     "description": "Category label text for screen reader users",
     "message": "Category"
@@ -167,10 +183,6 @@
     "description": "Accessible label displayed while certificate is being generated.",
     "message": "Certificate is being generated..."
   },
-  "components.CourseProductItem.enrolled": {
-    "description": "Message displayed when authenticated user owned the product",
-    "message": "Enrolled"
-  },
   "components.CourseProductItem.loadingInitial": {
     "description": "Accessible text for the initial loading spinner displayed when product is fetching",
     "message": "Loading product information..."
@@ -179,6 +191,10 @@
     "description": "Message displayed when authenticated user has purchased the product but order is still pending",
     "message": "Pending"
   },
+  "components.CourseProductItem.purchased": {
+    "description": "Message displayed when authenticated user owned the product",
+    "message": "Purchased"
+  },
   "components.CourseProductsList.end": {
     "description": "End label displayed in the header of course run dates section",
     "message": "End"
@@ -341,7 +357,7 @@
   },
   "components.DashboardCourses.loading": {
     "description": "Message displayed while loading orders and enrollments",
-    "message": "Loading ..."
+    "message": "Loading orders and enrollments..."
   },
   "components.DashboardCreateAddressForm.header": {
     "description": "Title of the dashboard address creation form",
@@ -906,5 +922,21 @@
   "hooks.useResources.errorUpdate": {
     "description": "Error message shown to the user when resource update request fails.",
     "message": "An error occurred while updating a resource. Please retry later."
+  },
+  "hooks.useWishlist.errorCreate": {
+    "description": "Error message shown to the user when wishlist creation request fails.",
+    "message": "An error occurred when adding this course to your wishlist. Please retry later."
+  },
+  "hooks.useWishlist.errorDelete": {
+    "description": "Error message shown to the user when wishlist deletion request fails.",
+    "message": "An error occurred when removing this course from your wishlist. Please retry later."
+  },
+  "hooks.useWishlist.errorGet": {
+    "description": "Error message shown to the user when wishlist fetch request fails.",
+    "message": "An error occurred while fetching wishlist. Please retry later."
+  },
+  "hooks.useWishlist.errorNotFound": {
+    "description": "Error message shown to the user when no wishlist matches.",
+    "message": "Cannot find the wishlist."
   }
 }

src/frontend/i18n/locales/es-ES.json

@@ -123,6 +123,22 @@
     "description": "Error message displayed when a field value is too short.",
     "message": "The minimum length is {min} {min, plural, one {char} other {chars}}."
   },
+  "components.CourseAddToWishlist.labelAdd": {
+    "description": "Label to proceed to add a course to user wishlist.",
+    "message": "Notify me"
+  },
+  "components.CourseAddToWishlist.labelRemove": {
+    "description": "Label to proceed to remove a course to user wishlist.",
+    "message": "Do not notify me anymore"
+  },
+  "components.CourseAddToWishlist.loading": {
+    "description": "Accessible message displayed while loading wishlist",
+    "message": "Loading your wishlist..."
+  },
+  "components.CourseAddToWishlist.logMe": {
+    "description": "Label to proceed to login page before being adding a course to user wishlist.",
+    "message": "Log in to be notified"
+  },
   "components.CourseGlimpse.categoryLabel": {
     "description": "Category label text for screen reader users",
     "message": "Categoría"
@@ -167,10 +183,6 @@
     "description": "Accessible label displayed while certificate is being generated.",
     "message": "Certificate is being generated..."
   },
-  "components.CourseProductItem.enrolled": {
-    "description": "Message displayed when authenticated user owned the product",
-    "message": "Inscrito"
-  },
   "components.CourseProductItem.loadingInitial": {
     "description": "Accessible text for the initial loading spinner displayed when product is fetching",
     "message": "Loading product information..."
@@ -179,6 +191,10 @@
     "description": "Message displayed when authenticated user has purchased the product but order is still pending",
     "message": "Pending"
   },
+  "components.CourseProductItem.purchased": {
+    "description": "Message displayed when authenticated user owned the product",
+    "message": "Purchased"
+  },
   "components.CourseProductsList.end": {
     "description": "End label displayed in the header of course run dates section",
     "message": "Fin"
@@ -341,7 +357,7 @@
   },
   "components.DashboardCourses.loading": {
     "description": "Message displayed while loading orders and enrollments",
-    "message": "Loading ..."
+    "message": "Loading orders and enrollments..."
   },
   "components.DashboardCreateAddressForm.header": {
     "description": "Title of the dashboard address creation form",
@@ -906,5 +922,21 @@
   "hooks.useResources.errorUpdate": {
     "description": "Error message shown to the user when resource update request fails.",
     "message": "An error occurred while updating a resource. Please retry later."
+  },
+  "hooks.useWishlist.errorCreate": {
+    "description": "Error message shown to the user when wishlist creation request fails.",
+    "message": "An error occurred when adding this course to your wishlist. Please retry later."
+  },
+  "hooks.useWishlist.errorDelete": {
+    "description": "Error message shown to the user when wishlist deletion request fails.",
+    "message": "An error occurred when removing this course from your wishlist. Please retry later."
+  },
+  "hooks.useWishlist.errorGet": {
+    "description": "Error message shown to the user when wishlist fetch request fails.",
+    "message": "An error occurred while fetching wishlist. Please retry later."
+  },
+  "hooks.useWishlist.errorNotFound": {
+    "description": "Error message shown to the user when no wishlist matches.",
+    "message": "Cannot find the wishlist."
   }
 }

src/frontend/i18n/locales/fa-IR.json

@@ -123,6 +123,22 @@
     "description": "Error message displayed when a field value is too short.",
     "message": "The minimum length is {min} {min, plural, one {char} other {chars}}."
   },
+  "components.CourseAddToWishlist.labelAdd": {
+    "description": "Label to proceed to add a course to user wishlist.",
+    "message": "Notify me"
+  },
+  "components.CourseAddToWishlist.labelRemove": {
+    "description": "Label to proceed to remove a course to user wishlist.",
+    "message": "Do not notify me anymore"
+  },
+  "components.CourseAddToWishlist.loading": {
+    "description": "Accessible message displayed while loading wishlist",
+    "message": "Loading your wishlist..."
+  },
+  "components.CourseAddToWishlist.logMe": {
+    "description": "Label to proceed to login page before being adding a course to user wishlist.",
+    "message": "Log in to be notified"
+  },
   "components.CourseGlimpse.categoryLabel": {
     "description": "Category label text for screen reader users",
     "message": "Category"
@@ -167,10 +183,6 @@
     "description": "Accessible label displayed while certificate is being generated.",
     "message": "Certificate is being generated..."
   },
-  "components.CourseProductItem.enrolled": {
-    "description": "Message displayed when authenticated user owned the product",
-    "message": "Enrolled"
-  },
   "components.CourseProductItem.loadingInitial": {
     "description": "Accessible text for the initial loading spinner displayed when product is fetching",
     "message": "Loading product information..."
@@ -179,6 +191,10 @@
     "description": "Message displayed when authenticated user has purchased the product but order is still pending",
     "message": "Pending"
   },
+  "components.CourseProductItem.purchased": {
+    "description": "Message displayed when authenticated user owned the product",
+    "message": "Purchased"
+  },
   "components.CourseProductsList.end": {
     "description": "End label displayed in the header of course run dates section",
     "message": "End"
@@ -341,7 +357,7 @@
   },
   "components.DashboardCourses.loading": {
     "description": "Message displayed while loading orders and enrollments",
-    "message": "Loading ..."
+    "message": "Loading orders and enrollments..."
   },
   "components.DashboardCreateAddressForm.header": {
     "description": "Title of the dashboard address creation form",
@@ -906,5 +922,21 @@
   "hooks.useResources.errorUpdate": {
     "description": "Error message shown to the user when resource update request fails.",
     "message": "An error occurred while updating a resource. Please retry later."
+  },
+  "hooks.useWishlist.errorCreate": {
+    "description": "Error message shown to the user when wishlist creation request fails.",
+    "message": "An error occurred when adding this course to your wishlist. Please retry later."
+  },
+  "hooks.useWishlist.errorDelete": {
+    "description": "Error message shown to the user when wishlist deletion request fails.",
+    "message": "An error occurred when removing this course from your wishlist. Please retry later."
+  },
+  "hooks.useWishlist.errorGet": {
+    "description": "Error message shown to the user when wishlist fetch request fails.",
+    "message": "An error occurred while fetching wishlist. Please retry later."
+  },
+  "hooks.useWishlist.errorNotFound": {
+    "description": "Error message shown to the user when no wishlist matches.",
+    "message": "Cannot find the wishlist."
   }
 }

src/frontend/i18n/locales/fr-CA.json

@@ -123,6 +123,22 @@
     "description": "Error message displayed when a field value is too short.",
     "message": "La longueur minimale est {min} {min, plural, one {caractère} other {caractères}}."
   },
+  "components.CourseAddToWishlist.labelAdd": {
+    "description": "Label to proceed to add a course to user wishlist.",
+    "message": "Notify me"
+  },
+  "components.CourseAddToWishlist.labelRemove": {
+    "description": "Label to proceed to remove a course to user wishlist.",
+    "message": "Do not notify me anymore"
+  },
+  "components.CourseAddToWishlist.loading": {
+    "description": "Accessible message displayed while loading wishlist",
+    "message": "Loading your wishlist..."
+  },
+  "components.CourseAddToWishlist.logMe": {
+    "description": "Label to proceed to login page before being adding a course to user wishlist.",
+    "message": "Log in to be notified"
+  },
   "components.CourseGlimpse.categoryLabel": {
     "description": "Category label text for screen reader users",
     "message": "Catégorie"
@@ -167,10 +183,6 @@
     "description": "Accessible label displayed while certificate is being generated.",
     "message": "Certificat en cours de génération..."
   },
-  "components.CourseProductItem.enrolled": {
-    "description": "Message displayed when authenticated user owned the product",
-    "message": "Inscrit"
-  },
   "components.CourseProductItem.loadingInitial": {
     "description": "Accessible text for the initial loading spinner displayed when product is fetching",
     "message": "Chargement des informations du produit..."
@@ -179,6 +191,10 @@
     "description": "Message displayed when authenticated user has purchased the product but order is still pending",
     "message": "Pending"
   },
+  "components.CourseProductItem.purchased": {
+    "description": "Message displayed when authenticated user owned the product",
+    "message": "Purchased"
+  },
   "components.CourseProductsList.end": {
     "description": "End label displayed in the header of course run dates section",
     "message": "Fin"
@@ -341,7 +357,7 @@
   },
   "components.DashboardCourses.loading": {
     "description": "Message displayed while loading orders and enrollments",
-    "message": "Loading ..."
+    "message": "Loading orders and enrollments..."
   },
   "components.DashboardCreateAddressForm.header": {
     "description": "Title of the dashboard address creation form",
@@ -906,5 +922,21 @@
   "hooks.useResources.errorUpdate": {
     "description": "Error message shown to the user when resource update request fails.",
     "message": "An error occurred while updating a resource. Please retry later."
+  },
+  "hooks.useWishlist.errorCreate": {
+    "description": "Error message shown to the user when wishlist creation request fails.",
+    "message": "An error occurred when adding this course to your wishlist. Please retry later."
+  },
+  "hooks.useWishlist.errorDelete": {
+    "description": "Error message shown to the user when wishlist deletion request fails.",
+    "message": "An error occurred when removing this course from your wishlist. Please retry later."
+  },
+  "hooks.useWishlist.errorGet": {
+    "description": "Error message shown to the user when wishlist fetch request fails.",
+    "message": "An error occurred while fetching wishlist. Please retry later."
+  },
+  "hooks.useWishlist.errorNotFound": {
+    "description": "Error message shown to the user when no wishlist matches.",
+    "message": "Cannot find the wishlist."
   }
 }