From 64cdc754f1a6651b9622fc2c670fa1dd79f4a373 Mon Sep 17 00:00:00 2001
From: Shankar Ambady <shanbady@gmail.com>
Date: Mon, 5 Aug 2024 16:29:57 -0400
Subject: [PATCH 01/17] Subscription email template updates (#1311)

* adding resource type

* conditionalizing subject line

* limiting list of resources to 5

* adding images to email

* fixing f-string

* template style fixes

* fixing logo

* formatting changes and adding footer

* adding url context to email templates and some style changes

* adding test

* fixing button float and adding background

* cloning model method utilities

* inferring channel urls for groups

* initial changes to send individual emails

* fixing view more url and checking for null in resource.image

* fixing subject line

* fixing footer urls

* capping at 10 items

* fixing saved search label

* fixing saved search type

* fix spacing

* fixing tests

* adding short subject in template and some style fixes

* fixing method

* updating dashboard settings url to match upcoming changes in pr #1348
---
 .../public/images/mit-logo-transparent5.jpg   | Bin 0 -> 8081 bytes
 .../public/images/mit-logo-transparent5.png   | Bin 0 -> 564 bytes
 learning_resources_search/models.py           |  42 ++++----
 learning_resources_search/tasks.py            |  99 +++++++++++++++---
 learning_resources_search/tasks_test.py       |  47 +++++++++
 main/templates/email/email_base.html          |  64 +++++++++--
 .../email/subscribed_channel_digest.html      |  96 ++++++++---------
 profiles/utils.py                             |   3 +
 8 files changed, 257 insertions(+), 94 deletions(-)
 create mode 100644 frontends/mit-open/public/images/mit-logo-transparent5.jpg
 create mode 100644 frontends/mit-open/public/images/mit-logo-transparent5.png

diff --git a/frontends/mit-open/public/images/mit-logo-transparent5.jpg b/frontends/mit-open/public/images/mit-logo-transparent5.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fca614d62b24449e712425c50d04dac2f0a10d13
GIT binary patch
literal 8081
zcmeHMX;c))8m(pqnnfLlH7GEO2#6@MBp5<yL{SMEaDynuaYYdmBWge#Xq2$HMBI=>
z9t?^^B;v3sxX~ggQG&{*fQc{=)UZ5f0EdR@>3W4rmiH$l=jA+)W;ig_O?6e>+h2d*
zt=q63O2JLfu%JKy=FSB+002#(f$0JcYGLRHV55Ngvo-*J*yvx{%P{K~ebfL@)BCl5
zToB;C=#R#H_L=?S`1v=!9{?Pk;ZAXIus?u3Z)0j4koNMt{gf$b*smj|sl6N#o0P_R
z*#@a6G+y+1Hp$>0cprQLu>bc5{)pCS39kUYCP>95aWFnm<6|5?2FtMHh*0(C3w*h1
z1f8p{fop1M>x=|y7>A?A<*2K35s6sDAT3<Jy6#x}X&QR-R^aBF^c{8_IHozyBe%q0
zewEC^ab?I(Ep0=iw~R-Px3sdJVB_@mJI+(zb(ucHbLOnsULP!2xX91{qs2>BtzHwj
zc3sf=&0Ds99vZeSJo<~6*tqyzyAK{ZoOmSZtFMn9Pd}0I&B@GDS$X*dXU`QDoxgCk
zwCvjT^6zfktgfl8yL+#`p;6k>`cvD(M~{DQmv{H{K2`M5{R8Me{lfQiM8Cm<fMaT0
zE{BT`;=$BH(JzP3RUd1wp*w9JzG9P}xx)@keUAgja!a(vInI|EtPH8rHneb(j+YNY
zdWL9dfOh^RM85#~1rKZl!#EhaVH`dn0INYtE#yWj{H%l-B_!nofcTTg5CrjPbN!m7
zWQjS|oKo|Hw?&V)(uSG1&GPF;uhpxLc^=tjawPEm3f*;_r!G;1E7g2P_Xf`B7P8v2
zoE%&oJ(b##b={t}A6DHk*(Gx>S2uI^FgBg7zIe8c`<UGT0^KLHm#ZfP)4GBo&`4@x
zBBOYJ=?w8;yVTxFDlGNzvS0{VkVUtbn@LTG*T3h2aCJbsLLl4nw6apnjD$dOwy2;e
z_3joq-r1rX9JG4p!r@A9(fFA<7IV&AJe;_JpJ-t=!kWYE`?LHh9a*g#EyKfww6(BP
zpnu_k#3CfJL7dkcGIJoYH9ejAROXWB;&g4Xv6tU`%`we;eR1V3U(8+5b^`+ZVEe$?
z1jZoYimbl<=$HSpQaI7>4<`oPPY&B7-bIYwK~6U2hmOqBS!H2u8UsixvFu>j9yYr1
z9y{EQqE$ff2gl?RN){L>$!a1?{35NVN1SRm+Arz!l&_y=P}fyiw$hU>QNEv5v~RKL
z^q4^3E2}lenCQ6++V$KKf3Z!BK3?X+kcCNIXHCK%=9+9`?+FVInp<XsXU0>;u7O$c
z-%eSy$X6{BJxCmVtlN&UNHvEbO>q{2XzwR1;f}xZX9VyL1jGQa25D+hL}N0mxeWsA
z7zlQ5B^ypLHW1VdTZj#0xC>HHJoyXzJ$)E`G5h^2MJ@z&My*FtMDxR6T>hX*YR4Ru
z#F7f1OU4jnK1_Bui*^^>#u-x|G^&d#8-mUis$>YBe&eR=i}&lHNKgk6VhFg+5FCz+
zED<Zv{CSU936Fy!<?x-sNI8ijB?*F?iy0mSfvaTOA@K7r*9PpI$In)s{e*VZVdr0#
z&tktPTbkH2f`;}eqIP|hHd@>;g0{9|#FDOy5Uky%^n#$hO`ZWnacE+F@NE7UUnH#h
zhl=Nnkg)n6Dqd1i^Qu#kNS;ez_|sXf3<%V<=<}=O_Y~(<DQDblMDuGz2I(T#Jh`p#
zt;l!j;VWdZJ5F^Ry?!WzT**wO6Q!nV(}OeVLyN^--9K+U<)g?oxb{O%Kx4TkenTMF
zA()XAyEm^7RV{x-9t4jbp_Jxv8$GUe5Tx5)hM+7_b(-q$zk@+AG9Q8x9S9y**pc$_
zWUw6@xdnUrsB;nO?uQaeFj?XnY1>YjP^;}4T3V$(WvbvSja2C;-em`w<#bzXU6CyC
z;%PcmShppiQ@Bf@D-x!8e7bd`_B!Y3zR})$7DRpY)ubop=Pq1~{ft+Oau!E+sKtmG
zjh<=l68cmt1STS1c~d93Et_s_nYGt-Zflcq@I>W|$Xb`>b&P-O@b!IVZewe&C!Y|l
z%c<TXC%<iXPVy+9lbctQ%`Ns!%(z^z$s@{y{8JDCS!Rn;qXz^74i!y|m$0z{0&xoX
zU(ok=j*Y?ES3I!)J3;?GUF&18?iB|hI6|EhGKR^l7Al_H0Xlz`%u#Vkl`-oou{%5|
z+KG(!TV@DB%=_}b^3>4ir(NDlt9ny}%3x{I)!WAO=XPh?-A3QdW=ke#o1Mh#FLfka
zFE1)M@)_?C*<wx6V|`Qt2MAi6BI^YzUM&iid8EukJm9tlJ(ufLImCb<6IH<Y;}A5*
z5WON4m+@7~<zz46i{FJHH;yrkewj2RSt6clKM`av4{eFv(;N}dGV`Q#lZ<R_iYl&b
zzO3_+OtB-YgSb!V6&uoar8N;re)45If>bFRzxB?lR6yX?cs(E>pdmYon70n3@k;ID
z30Vlq@E1sh38Ia%(sJ>+-H(^OOK)mH$%N)z4;L_wRM*E@<f<^q)lrpC;x2h+kU{I3
z)Sj9O=CQZxdOIq73WJu!D3U{e>Q^`?y_4tZ7!@Lr>kFBYC)tFrN%<&Z1CNbs2gFdh
z;PiGVCa8+Z)f8==R4U+$R;%_!+Vb`i!<h-KmD8n1s22O?jl0}{692MS!lQ$)IS*JV
zW?d8DVOGm7bUO)*=+BkP4=TKis>iccN?YgdWlMwsjZqOXziJ5*B4*!MJ%zC;V%Zuy
zCf!I84?(_+j)vg0Qu($ot}y;BNB92W=npx1lXdw}<LFHm>_g?~O;++l<>-}{_<!Rb
zc&Ho=RV}`UToMfLTA;LHtI7Paav?J&S`kC@<*S;-jAiL`2);;W`8;}wnfg6fBM7vt
zWlahyjw+;bAUH=AP`OlLfw0RiKO#Zt@6%IUHxic%(C)$kd1hYI4xv^yIbi!t*cc<X
z<wP1XlH&a+mEl4pfQB6)t9@4^`7=?-?y*7AKw~!bv$X@+VjzLQGZB#6&2;ZjQbU;}
zR^%|b_y^Z_rK-^$M#Vl2#SN+hCj){YSg$0Ki3YYxK|0^)dDvapAGskpbpME*QA8?_
zb`i6_Ta^J2)R!uqA?TPRvPk1~TO#j78z>1@s|11xBUI5uXAcBxZmX7=X{7P`CJb6D
z6+SEvZJG|}(*pMU^5#DFv}B(?#(a$&4rDe3G|2*un2hZ$397FkxJId#68Uw2%&Y_Y
z82c6}^Y!T`g!e<)TRjTIKwU-a2cUlhn$w!2dXH$nDeRwV*TqK$hg6P3u((gLK8@Gu
zF!=vLg9O<iLsZJYRor+F0)sC=zRL(Im{h(+211|;O8DY1#?Gi6+#3tlqW#`fqHSzb
z&RSI}*?As<Z%eP#Vr-ieK;90bvZM`y?js}zf`+dcGqmnR`PC@mkjvn*cpcl>VOJ3$
z645*)6$Er4x;#!1p2mARYLKr|9;>YdfmMg{Q*`-*$ZB%nyeP<BF!niNC)YB@-pEtB
zraDe^GHzqgy>MeI7h<Z|Uo9QMP_@|W278F|>UD!XM8)*F!5*Rrdfi}GvwEa-A$lD^
zItdxgVhGx{qW1w=gRfSIqjoG;NOoU9Z&ntWp&}u!M1@Apj_Usy`BydxeDe0gJrL|L
zYGTf$@f2vgywmEVxfv*7jVGE@FGQ5i>{-lK5ISQH9J8%5oU3hnc=CZ<;oR>|*8Ae^
zlYVC#3vNpo)6plEc2KezRAc#^g0OL^5u{>^b>DDv4=z!Vbah+uW>5WF4!Qe__A>Q2
zXFtZGy!BVsnTxjZDde!N9fOW`=fu!S5B66zvh^r=nts2>q%Y>?G<klBZjO6n_^Fjy
z9y@P3?#(f|gDW?ogeiD99Od%(u+e^U0b>wc;;e8UwZ&J`xmmWmKD)MXf+fw4V>X1i
z$5wA`*yWE$hVX7q{SNO&u7!4bnXsq-IGWnC4}yt<WjAJCi(NlcMas;T5F{eo;cBMb
zh+)@JG(Q4Wi*~@~P|ddloc3Z9L~N$$L#nu_CL;!dl?i(ck9{)!{5I}E(Z?$BPxEJ-
z+duhAPL73Jh`;vC*=XnwccY5Ncu*Uum;u$juKUXMKh6qGKOIV(m2{c9;HkY+y^8I_
zZh8(g@>w&?AZodB)caZp;|<|o;j{M=dQD@0>Amez32m9srM@O&(&@ZP<z|}wc}Z1U
nSlK5s9mQwy8jjOA_>VfeY6gw|4{x~x_G0GqnmSm+V8ed^vhvDN

literal 0
HcmV?d00001

diff --git a/frontends/mit-open/public/images/mit-logo-transparent5.png b/frontends/mit-open/public/images/mit-logo-transparent5.png
new file mode 100644
index 0000000000000000000000000000000000000000..91a9f6ab32f36ade8737aba2baa5f09b60e71d3b
GIT binary patch
literal 564
zcmeAS@N?(olHy`uVBq!ia0y~yVAKV&=W#Ft$pDcxn}JkpfKP}kkfss%|NsBaokov<
zrpuND`2{mDF|+Us2nq?yD=MoR7@C@yJ2<(zdw2y#KmGROfQYaXP$6TIx4Vm65to8C
zkR9Xc;uunK>+MZ<zC#8gt``{=vI<ohr~JR2!pQf_Nuaan-k($7X72L1c+U0svBYg}
zPpvXo{dooFVw3Z$V_zk@O257I^-bgq+1;B`XRQ64A?)^6X}w=A|6<o}G2N&w85b83
zWXNUko-SzKBQ@3b4fhtiOdNV%OK%O^UJx25`zY&Achug$KYfTXn}C|v8?Swl%JqMJ
zl?Z3zGwSc$u&%PY#bKiJ!kz~TyJgM`-@QX?{=WaRlRFX@ZqTVT1;xFmtDnm{r-UW|
D*R92k

literal 0
HcmV?d00001

diff --git a/learning_resources_search/models.py b/learning_resources_search/models.py
index 5a37efebc6..058381b2af 100644
--- a/learning_resources_search/models.py
+++ b/learning_resources_search/models.py
@@ -4,7 +4,6 @@
 from django.db import models
 from django.db.models import JSONField
 
-from channels.constants import ChannelType
 from channels.models import Channel
 from main.models import TimestampedModel
 
@@ -29,11 +28,25 @@ class PercolateQuery(TimestampedModel):
     )
     users = models.ManyToManyField(User, related_name="percolate_queries")
 
-    def __str__(self):
-        return f"Percolate query {self.id}: {self.query}"
+    def source_label(self):
+        source_channel = self.source_channel()
+        if source_channel:
+            return source_channel.channel_type
+        else:
+            return "saved_search"
 
-    class Meta:
-        unique_together = (("source_type", "original_query"),)
+    def source_description(self):
+        channel = self.source_channel()
+        if channel:
+            return channel.title
+        return self.original_url_params()
+
+    def source_channel(self):
+        original_query_params = self.original_url_params()
+        channels_filtered = Channel.objects.filter(search_filter=original_query_params)
+        if channels_filtered.exists():
+            return channels_filtered.first()
+        return None
 
     def original_url_params(self):
         ignore_params = ["endpoint"]
@@ -43,19 +56,8 @@ def original_url_params(self):
         }
         return urlencode(defined_params, doseq=True)
 
-    def source_label(self):
-        original_query_params = self.original_url_params()
-        channels_filtered = Channel.objects.filter(search_filter=original_query_params)
-        if channels_filtered.exists():
-            return channels_filtered.first().channel_type
-        else:
-            return "saved_search"
-
-    def source_description(self):
-        original_query_params = self.original_url_params()
-        source_label = self.source_label()
+    def __str__(self):
+        return f"Percolate query {self.id}: {self.query}"
 
-        if source_label in ChannelType:
-            channel = Channel.objects.get(search_filter=original_query_params)
-            return channel.title
-        return self.original_url_params()
+    class Meta:
+        unique_together = (("source_type", "original_query"),)
diff --git a/learning_resources_search/tasks.py b/learning_resources_search/tasks.py
index 1d94d7b935..f4344d7aa8 100644
--- a/learning_resources_search/tasks.py
+++ b/learning_resources_search/tasks.py
@@ -12,7 +12,9 @@
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.db.models import Q
+from django.template.defaultfilters import pluralize
 from opensearchpy.exceptions import NotFoundError, RequestError
+from requests.models import PreparedRequest
 
 from learning_resources.etl.constants import RESOURCE_FILE_ETL_SOURCES
 from learning_resources.models import (
@@ -120,6 +122,8 @@ def _infer_percolate_group(percolate_query):
     Infer the heading name for the percolate query to be
     grouped under in the email
     """
+    if percolate_query.source_label() != "saved_search":
+        return percolate_query.source_description()
     group_keys = ["department", "topic", "offered_by"]
     original_query = OrderedDict(percolate_query.original_query)
     for key, val in original_query.items():
@@ -132,10 +136,13 @@ def _infer_percolate_group(percolate_query):
     return None
 
 
-def _infer_search_url(percolate_query):
+def _infer_percolate_group_url(percolate_query):
     """
     Infer the search URL for the percolate query
     """
+    source_channel = percolate_query.source_channel()
+    if source_channel:
+        return frontend_absolute_url(source_channel.channel_url)
     original_query = OrderedDict(percolate_query.original_query)
     query_string_params = {k: v for k, v in original_query.items() if v}
     if "endpoint" in query_string_params:
@@ -178,14 +185,27 @@ def _get_percolated_rows(resources, subscription_type):
             percolated_users = set(percolated.values_list("users", flat=True))
             all_users.update(percolated_users)
             query = percolated.first()
+            search_url = _infer_percolate_group_url(query)
+            req = PreparedRequest()
+            req.prepare_url(search_url, {"resource": resource.id})
+            resource_url = req.url
+            source_channel = query.source_channel()
             rows.extend(
                 [
                     {
-                        "resource_url": resource.url,
+                        "resource_url": resource_url,
                         "resource_title": resource.title,
+                        "resource_image_url": resource.image.url
+                        if resource.image
+                        else "",
+                        "resource_type": resource.resource_type,
                         "user_id": user,
+                        "source_label": query.source_label(),
+                        "source_channel_type": source_channel.channel_type
+                        if source_channel
+                        else "saved_search",
                         "group": _infer_percolate_group(query),
-                        "search_url": _infer_search_url(query),
+                        "search_url": search_url,
                     }
                     for user in percolated_users
                 ]
@@ -209,7 +229,6 @@ def send_subscription_emails(self, subscription_type, period="daily"):
     )
     rows = _get_percolated_rows(new_learning_resources, subscription_type)
     template_data = _group_percolated_rows(rows)
-
     email_tasks = celery.group(
         [
             attempt_send_digest_email_batch.si(user_template_items)
@@ -816,6 +835,30 @@ def finish_recreate_index(results, backing_indices):
     log.info("recreate_index has finished successfully!")
 
 
+def _generate_subscription_digest_subject(
+    sample_course, source_name, unique_resource_types, total_count, shortform
+):
+    prefix = "" if shortform else "MIT Learn: "
+
+    if sample_course["source_channel_type"] == "saved_search":
+        return (
+            f"{prefix}New"
+            f' "{source_name}" '
+            f"{unique_resource_types.pop().capitalize()}{pluralize(total_count)}"
+        )
+    preposition = "from"
+    if sample_course["source_channel_type"] == "topic":
+        preposition = "in"
+
+    suffix = "" if shortform else f": {sample_course['resource_title']}"
+
+    return (
+        f"{prefix}New"
+        f" {unique_resource_types.pop().capitalize()}{pluralize(total_count)} "
+        f"{preposition} {source_name}{suffix}"
+    )
+
+
 @app.task(
     acks_late=True,
     reject_on_worker_lost=True,
@@ -824,16 +867,40 @@ def finish_recreate_index(results, backing_indices):
 def attempt_send_digest_email_batch(user_template_items):
     for user_id, template_data in user_template_items:
         log.info("Sending email to user %s", user_id)
+        if not user_id:
+            continue
         user = User.objects.get(id=user_id)
-        total_count = sum([len(template_data[group]) for group in template_data])
-        subject = f"{settings.MITOPEN_TITLE} New Learning Resources for You"
-        send_template_email(
-            [user.email],
-            subject,
-            "email/subscribed_channel_digest.html",
-            context={
-                "documents": template_data,
-                "total_count": total_count,
-                "subject": subject,
-            },
-        )
+
+        unique_resource_types = set()
+        for group in template_data:
+            total_count = len(template_data[group])
+            unique_resource_types.update(
+                [resource["resource_type"] for resource in template_data[group]]
+            )
+            subject = _generate_subscription_digest_subject(
+                template_data[group][0],
+                group,
+                list(unique_resource_types),
+                total_count,
+                shortform=False,
+            )
+            # generate a shorter subject for use in the template
+            short_subject = _generate_subscription_digest_subject(
+                template_data[group][0],
+                group,
+                list(unique_resource_types),
+                total_count,
+                shortform=True,
+            )
+            send_template_email(
+                [user.email],
+                subject,
+                "email/subscribed_channel_digest.html",
+                context={
+                    "documents": template_data[group],
+                    "total_count": total_count,
+                    "subject": subject,
+                    "resource_group": group,
+                    "short_subject": short_subject,
+                },
+            )
diff --git a/learning_resources_search/tasks_test.py b/learning_resources_search/tasks_test.py
index a65ac7d0e9..612e3d557b 100644
--- a/learning_resources_search/tasks_test.py
+++ b/learning_resources_search/tasks_test.py
@@ -35,6 +35,7 @@
     serialize_learning_resource_for_update,
 )
 from learning_resources_search.tasks import (
+    _generate_subscription_digest_subject,
     _get_percolated_rows,
     _group_percolated_rows,
     _infer_percolate_group,
@@ -929,3 +930,49 @@ def get_percolator(res):
     assert user.id == task_args[0]
     for topic in topics:
         assert topic in template_data
+
+
+def test_subscription_digest_subject():
+    """
+    Test that email generates a dynamic subject based
+    on the unique resource types included
+    """
+    resource_types = {"program"}
+    sample_course = {"source_channel_type": "topic", "resource_title": "robotics"}
+
+    subject_line = _generate_subscription_digest_subject(
+        sample_course,
+        "electronics",
+        resource_types,
+        total_count=1,
+        shortform=False,
+    )
+    assert subject_line == "MIT Learn: New Program in electronics: robotics"
+
+    sample_course = {"source_channel_type": "podcast", "resource_title": "robotics"}
+    resource_types = {"program"}
+
+    subject_line = _generate_subscription_digest_subject(
+        sample_course,
+        "xpro",
+        resource_types,
+        total_count=9,
+        shortform=False,
+    )
+    assert subject_line == "MIT Learn: New Programs from xpro: robotics"
+
+    resource_types = {"podcast"}
+    subject_line = _generate_subscription_digest_subject(
+        sample_course,
+        "engineering",
+        resource_types,
+        total_count=19,
+        shortform=False,
+    )
+    assert subject_line == "MIT Learn: New Podcasts from engineering: robotics"
+
+    resource_types = {"course"}
+    subject_line = _generate_subscription_digest_subject(
+        sample_course, "management", resource_types, 19, shortform=True
+    )
+    assert subject_line == "New Courses from management"
diff --git a/main/templates/email/email_base.html b/main/templates/email/email_base.html
index 623ab1978c..e3cbc446b0 100644
--- a/main/templates/email/email_base.html
+++ b/main/templates/email/email_base.html
@@ -167,7 +167,6 @@
       }
       .button-td-primary:hover,
       .button-a-primary:hover {
-        background: #ffffff !important;
         border-color: #a31f34 !important;
       }
 
@@ -231,17 +230,20 @@
       margin: 0;
       padding: 0 !important;
       mso-line-height-rule: exactly;
-      background-color: #ffffff;
+      background-color: #f3f4f8;
     "
   >
-    <center style="width: 100%; background-color: #ffffff">
+    <center style="background-color: #f3f4f8">
       <!--[if mso | IE]>
     <table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%" style="background-color: #ffffff;">
     <tr>
     <td>
     <![endif]-->
 
-      <div style="max-width: 680px; margin: 0 auto" class="email-container">
+      <div
+        style="max-width: 680px; background: #fff; margin: 0 auto"
+        class="email-container"
+      >
         <!--[if mso]>
             <table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" width="680">
             <tr>
@@ -261,9 +263,9 @@
           <tr>
             <td style="padding: 20px">
               {% block logo %}
-              <h1>
+              <h1 style="text-align: center">
                 <img
-                  src="https://mitopen.odl.mit.edu/static/images/mit-logo.jpg"
+                  src="{{STATIC_URL}}/static/images/mit-logo-transparent5.jpg"
                   width="113"
                   height="60"
                   alt="MIT-Open"
@@ -274,7 +276,9 @@ <h1>
                     font-family: sans-serif;
                     font-size: 15px;
                     line-height: 15px;
+                    display: block;
                     color: #a31f34;
+                    margin: 0 auto;
                     margin-bottom: -10px;
                   "
                 />
@@ -297,13 +301,53 @@ <h1>
             </td>
           </tr>
           <!-- Clear Spacer : END -->
-
-          <tr>
-            <td style="padding: 0 20px; text-align: left">--</td>
-          </tr>
         </table>
         <!-- Email Body : END -->
+        <!-- Email Footer : BEGIN -->
+        <table
+          role="presentation"
+          cellspacing="0"
+          cellpadding="0"
+          border="0"
+          width="100%"
+          style="font-size: 12px"
+        >
+          <tr>
+            <td
+              style="
+                padding: 20px;
+                font-family: sans-serif;
+                font-size: 12px;
+                line-height: 15px;
+                color: #000;
+                text-align: center;
+              "
+            >
+              {% block footer %}
 
+              If you don't want to receive these emails in the future, you can
+              <a
+                href="{{APP_BASE_URL}}/dashboard/settings"
+                style="text-decoration: underline"
+                >edit your settings</a
+              >
+              or
+              <a
+                href="{{APP_BASE_URL}}/dashboard/settings"
+                style="text-decoration: underline"
+                >unsubscribe</a
+              >. <br /><br />
+
+              {% endblock %}
+              {% block footer-address %}
+              <b>MIT Open Learning</b>&nbsp;&bull;&nbsp;600 Technology Square,
+              NE49-2000&nbsp;&bull;&nbsp;Cambridge, MA
+              02139&nbsp;&bull;&nbsp;USA
+              {% endblock %}
+            </td>
+          </tr>
+        </table>
+        <!-- Email Footer : END -->
         <!--[if mso]>
         </td>
         </tr>
diff --git a/main/templates/email/subscribed_channel_digest.html b/main/templates/email/subscribed_channel_digest.html
index 5c25c7bd08..19fbd35327 100644
--- a/main/templates/email/subscribed_channel_digest.html
+++ b/main/templates/email/subscribed_channel_digest.html
@@ -12,26 +12,22 @@
       font-family: sans-serif;
       font-size: 15px;
       line-height: 20px;
-      color: #555555;
+      color: #000;
     "
   >
     <h4
       style="
         margin: 0 0 10px;
-        font-size: 16px;
+        font-size: 24px;
         line-height: 20px;
-        color: #858080;
         font-weight: bold;
       "
     >
-      {{total_count}}
-      new course{{ total_count|pluralize:'s' }}
-      in MIT Open that match{{ total_count|pluralize:'es,' }}
-      your preferences
+      {{short_subject}}
     </h4>
   </td>
 </tr>
-{% for resource_group, items in documents.items %}
+
 <tr>
   <td style="background-color: #ffffff">
     <table
@@ -48,28 +44,16 @@
             font-family: sans-serif;
             font-size: 15px;
             line-height: 20px;
-            color: #555555;
+            color: #000;
           "
-        >
-          <h1
-            style="
-              margin: 0 0 10px;
-              font-size: 25px;
-              line-height: 30px;
-              color: #03152d;
-              font-weight: bold;
-            "
-          >
-            {{resource_group}}
-          </h1>
-        </td>
+        ></td>
       </tr>
     </table>
   </td>
 </tr>
 <!-- 1 Column Text : END -->
 
-{% for item in items %}
+{% for item in documents|slice:":10" %}
 
 <!-- 1 Column Text + Button : BEGIN -->
 <tr>
@@ -82,11 +66,26 @@
       width="100%"
     >
       <tr>
+        <td style="padding: 10px 20px; width: 113px; height: 60px">
+          <img
+            src="{{item.resource_image_url}}"
+            width="113"
+            alt="{{item.resource_title}}"
+            style="
+              width: 113px;
+              background: #ffffff;
+              font-family: sans-serif;
+              font-size: 15px;
+              line-height: 15px;
+              color: #a31f34;
+              margin-bottom: -10px;
+            "
+          />
+        </td>
         <td
           style="
-            padding: 10px 20px;
             font-family: sans-serif;
-            font-size: 15px;
+            font-size: 16px;
             line-height: 20px;
             color: #555555;
           "
@@ -95,26 +94,27 @@
             style="
               margin: 0 0 10px;
               font-family: sans-serif;
-              font-size: 25px;
+              font-size: 16px;
               line-height: 25px;
               color: #03152d;
-              font-weight: bold;
+              padding-right: 8px;
             "
           >
-            <a
-              href="{{item.resource_url}}"
-              style="
-                margin: 0 0 10px 0;
-                font-family: sans-serif;
-                font-size: 18px;
-                line-height: 22px;
-                color: #03152d;
-                font-weight: bold;
-              "
-            >
-              {{item.resource_title|safe}}
-            </a>
+            {{item.resource_title|safe}}
           </h2>
+          <a
+            href="{{item.resource_url}}"
+            style="
+              margin: 0 0 10px 0;
+              font-family: sans-serif;
+              font-size: 14px;
+              line-height: 22px;
+              color: #a31f34;
+            "
+          >
+            View
+            {{item.resource_type}}
+          </a>
           <p style="margin: 0 0 10px">
             <!--
             NOTE: this next line is intentionally long so it renders
@@ -137,25 +137,27 @@
       cellspacing="0"
       cellpadding="0"
       border="0"
-      style="margin: auto"
+      style="float: left"
     >
       <tr>
         <td
-          class="button-td button-td-primary"
-          style="border-radius: 4px; background: #a31f34"
+          align="left"
+          style="border-radius: 4px; background: #a31f34; text-align: left"
         >
           <a
             class="button-a button-a-primary"
-            href="{{ items.0.search_url }}"
+            href="{{ documents.0.search_url }}"
+            align="left"
             style="
-              background: #ffffff;
+              background: #a31f34;
               border: 1px solid #a31f34;
               font-family: sans-serif;
               font-size: 15px;
               line-height: 15px;
               text-decoration: none;
+              text-align: center;
               padding: 13px 17px;
-              color: #a31f34;
+              color: #fff;
               display: block;
               border-radius: 4px;
             "
@@ -173,6 +175,4 @@
   </td>
 </tr>
 
-{% endfor %}
-
 {% endblock %}
diff --git a/profiles/utils.py b/profiles/utils.py
index 5d31696bc0..e8517a9938 100644
--- a/profiles/utils.py
+++ b/profiles/utils.py
@@ -390,6 +390,8 @@ def send_template_email(recipients, subject, template, context):
     """
     if not context:
         context = {}
+    context["APP_BASE_URL"] = settings.APP_BASE_URL
+    context["STATIC_URL"] = settings.STATIC_URL
     html_content = render_to_string(template, context)
     return send_email(recipients, subject, html_content, text_only=False)
 
@@ -404,6 +406,7 @@ def send_email(recipients, subject, content, text_only):
         text_only(bool): If True html from the 'content' arg
         will be stripped and sent as plaint text
     """
+
     if text_only:
         text_content = content
     else:

From d08b2aef96b580eae327ba370b399b12115e9c16 Mon Sep 17 00:00:00 2001
From: Carey P Gumaer <gumaerc@mit.edu>
Date: Mon, 5 Aug 2024 19:58:46 -0400
Subject: [PATCH 02/17] user list UI updates (#1348)

* move create new list button to under the list of lists, remove the grid from the header

* move UserListCardTemplate to ol-components and rename it to UserListCardCondensed

* use routes instead of location hash for dashboard urls

* set up userlist detail route and list card href, remove standalone userlist page

* refactor active tab logic to match new route strategy

* fix typography import path on userlistcardcondensed

* default to dashboard home if tabValue ends up being something unexpected

* use proper syntax for checking the tabValue...

* get tests functioning again

* fix accessible title in UserListCardCondensed

* commit broken test

* make UserListCardCondensed the default export from that component

* fix link clicking test

* restyle dashboard user list view component

* Add button to go back to My Lists

* fix testing issues

* fix rebase issues with new settings tab

* hide UserListCardCondensed icon on mobile

* create new list button should be 100% width on mobile

* get rid of profile type check
---
 frontends/mit-open/src/common/urls.ts         |  15 +-
 .../src/page-components/Header/UserMenu.tsx   |   2 +-
 .../ItemsListing/ItemsListingComponent.tsx    | 142 ++++++---
 .../UserListCardCondensed.test.tsx}           |  15 +-
 .../UserListCard/UserListCardCondensed.tsx    |  75 +++++
 .../UserListCardTemplate.tsx                  |  69 -----
 .../pages/DashboardPage/Dashboard.test.tsx    |  15 +-
 .../src/pages/DashboardPage/DashboardPage.tsx | 293 +++++++++---------
 .../src/pages/HomePage/HomePage.test.tsx      |   2 +-
 .../src/pages/HomePage/PersonalizeSection.tsx |   4 +-
 .../ListDetailsPage/ListDetailsPage.test.ts   |   4 +-
 .../pages/ListDetailsPage/ListDetailsPage.tsx |  10 +-
 .../pages/OnboardingPage/OnboardingPage.tsx   |   4 +-
 .../UserListListingComponent.test.tsx         | 107 +++++++
 .../UserListListingComponent.tsx              |  75 +++++
 .../UserListListingPage.test.tsx              | 146 ---------
 .../UserListListingPage.tsx                   | 161 ----------
 frontends/mit-open/src/routes.tsx             |  26 +-
 frontends/ol-components/src/index.ts          |   1 +
 19 files changed, 559 insertions(+), 607 deletions(-)
 rename frontends/mit-open/src/page-components/{UserListCardTemplate/UserListCardTemplate.test.tsx => UserListCard/UserListCardCondensed.test.tsx} (58%)
 create mode 100644 frontends/mit-open/src/page-components/UserListCard/UserListCardCondensed.tsx
 delete mode 100644 frontends/mit-open/src/page-components/UserListCardTemplate/UserListCardTemplate.tsx
 create mode 100644 frontends/mit-open/src/pages/UserListListingComponent/UserListListingComponent.test.tsx
 create mode 100644 frontends/mit-open/src/pages/UserListListingComponent/UserListListingComponent.tsx
 delete mode 100644 frontends/mit-open/src/pages/UserListListingPage/UserListListingPage.test.tsx
 delete mode 100644 frontends/mit-open/src/pages/UserListListingPage/UserListListingPage.tsx

diff --git a/frontends/mit-open/src/common/urls.ts b/frontends/mit-open/src/common/urls.ts
index 51eaaa4076..be80a3b73e 100644
--- a/frontends/mit-open/src/common/urls.ts
+++ b/frontends/mit-open/src/common/urls.ts
@@ -8,10 +8,6 @@ export const LEARNINGPATH_LISTING = "/learningpaths/"
 export const LEARNINGPATH_VIEW = "/learningpaths/:id"
 export const learningPathsView = (id: number) =>
   generatePath(LEARNINGPATH_VIEW, { id: String(id) })
-export const USERLIST_LISTING = "/userlists/"
-export const USERLIST_VIEW = "/userlists/:id"
-export const userListView = (id: number) =>
-  generatePath(USERLIST_VIEW, { id: String(id) })
 export const PROGRAMLETTER_VIEW = "/program_letter/:id/view/"
 export const programLetterView = (id: string) =>
   generatePath(PROGRAMLETTER_VIEW, { id: String(id) })
@@ -70,7 +66,16 @@ export const login = ({
   return `${LOGIN}?next=${next}`
 }
 
-export const DASHBOARD = "/dashboard/"
+export const DASHBOARD_HOME = "/dashboard/"
+
+export const MY_LISTS = "/dashboard/my-lists/"
+export const USERLIST_VIEW = "/dashboard/my-lists/:id"
+export const userListView = (id: number) =>
+  generatePath(USERLIST_VIEW, { id: String(id) })
+
+export const PROFILE = "/dashboard/profile/"
+
+export const SETTINGS = "/dashboard/settings/"
 
 export const SEARCH = "/search/"
 
diff --git a/frontends/mit-open/src/page-components/Header/UserMenu.tsx b/frontends/mit-open/src/page-components/Header/UserMenu.tsx
index 2259371395..3c35c4395b 100644
--- a/frontends/mit-open/src/page-components/Header/UserMenu.tsx
+++ b/frontends/mit-open/src/page-components/Header/UserMenu.tsx
@@ -107,7 +107,7 @@ const UserMenu: React.FC<UserMenuProps> = ({ variant }) => {
       label: "Dashboard",
       key: "dashboard",
       allow: !!user?.is_authenticated,
-      href: urls.DASHBOARD,
+      href: urls.DASHBOARD_HOME,
     },
     {
       label: "Learning Paths",
diff --git a/frontends/mit-open/src/page-components/ItemsListing/ItemsListingComponent.tsx b/frontends/mit-open/src/page-components/ItemsListing/ItemsListingComponent.tsx
index b413343d01..13627b7bf0 100644
--- a/frontends/mit-open/src/page-components/ItemsListing/ItemsListingComponent.tsx
+++ b/frontends/mit-open/src/page-components/ItemsListing/ItemsListingComponent.tsx
@@ -1,20 +1,11 @@
 import React from "react"
-import { Grid, Button, Typography, styled } from "ol-components"
-import { RiPencilFill, RiArrowUpDownLine } from "@remixicon/react"
+import { Grid, Button, Typography, styled, Link } from "ol-components"
+import { RiArrowLeftLine, RiArrowUpDownLine } from "@remixicon/react"
 import { useToggle, pluralize } from "ol-utilities"
 import { GridColumn, GridContainer } from "@/components/GridLayout/GridLayout"
 import ItemsListing from "./ItemsListing"
 import type { LearningResourceListItem } from "./ItemsListing"
-
-const Container = styled(GridContainer)`
-  margin-top: 30px;
-  margin-bottom: 100px;
-`
-
-const TitleContainer = styled(Grid)`
-  margin-top: 10px;
-  margin-bottom: 20px;
-`
+import { MY_LISTS } from "@/common/urls"
 
 type OnEdit = () => void
 type ListData = {
@@ -35,6 +26,48 @@ type ItemsListingComponentProps = {
   condensed?: boolean
 }
 
+const HeaderText = styled.div(({ theme }) => ({
+  h3: {
+    ...theme.typography.h3,
+    [theme.breakpoints.down("sm")]: {
+      marginBottom: "24px",
+      ...theme.typography.h5,
+    },
+  },
+}))
+
+const DescriptionText = styled(Typography)(({ theme }) => ({
+  color: theme.custom.colors.silverGrayDark,
+  ...theme.typography.body1,
+  [theme.breakpoints.down("sm")]: {
+    display: "none",
+  },
+}))
+
+const HeaderGrid = styled(Grid)(({ theme }) => ({
+  gap: "24px",
+  [theme.breakpoints.down("sm")]: {
+    width: "100%",
+  },
+}))
+
+const EditButton = styled(Button)(({ theme }) => ({
+  [theme.breakpoints.down("sm")]: {
+    width: "100%",
+  },
+}))
+
+const ReorderGrid = styled(Grid)(({ theme }) => ({
+  [theme.breakpoints.down("sm")]: {
+    display: "none",
+  },
+}))
+
+const CountText = styled(Typography)(({ theme }) => ({
+  color: theme.custom.colors.silverGrayDark,
+  ...theme.typography.buttonSmall,
+}))
+
 const ItemsListingComponent: React.FC<ItemsListingComponentProps> = ({
   listType,
   list,
@@ -51,54 +84,71 @@ const ItemsListingComponent: React.FC<ItemsListingComponentProps> = ({
   const count = list?.item_count
 
   return (
-    <Container>
+    <GridContainer>
       <GridColumn variant="single-full">
         <Grid container>
-          <TitleContainer item xs={12}>
-            <Typography variant="h3" component="h1">
-              {list?.title}
-            </Typography>
-            {list?.description && <p>{list.description}</p>}
-          </TitleContainer>
           <Grid
             item
-            xs={6}
             container
             alignItems="center"
             justifyContent="space-between"
+            marginBottom="24px"
           >
-            {showSort && !!items.length && (
-              <Button
-                variant="text"
-                disabled={count === 0}
-                startIcon={isSorting ? undefined : <RiArrowUpDownLine />}
-                onClick={toggleIsSorting.toggle}
-              >
-                {isSorting ? "Done ordering" : "Reorder"}
-              </Button>
-            )}
-            {count !== undefined && count > 0
-              ? `${count} ${pluralize("item", count)}`
-              : null}
+            <Grid item>
+              <Link href={MY_LISTS}>
+                <Button variant="tertiary" startIcon={<RiArrowLeftLine />}>
+                  My Lists
+                </Button>
+              </Link>
+            </Grid>
           </Grid>
           <Grid
             item
-            xs={6}
             container
-            justifyContent="flex-end"
             alignItems="center"
-            display="flex"
+            justifyContent="space-between"
+            marginBottom="24px"
           >
-            {canEdit ? (
-              <Button
-                variant="text"
-                startIcon={<RiPencilFill />}
-                onClick={handleEdit}
-              >
-                Edit
-              </Button>
-            ) : null}
+            <HeaderGrid item>
+              <HeaderText>
+                <Typography component="h3">{list?.title}</Typography>
+              </HeaderText>
+              {list?.description && (
+                <DescriptionText>{list.description}</DescriptionText>
+              )}
+            </HeaderGrid>
+            <HeaderGrid item alignSelf="flex-start">
+              {canEdit ? (
+                <EditButton variant="primary" onClick={handleEdit}>
+                  Edit List
+                </EditButton>
+              ) : null}
+            </HeaderGrid>
           </Grid>
+          <ReorderGrid
+            item
+            container
+            alignItems="center"
+            justifyContent="space-between"
+          >
+            <Grid item>
+              {showSort && !!items.length && (
+                <Button
+                  variant="text"
+                  disabled={count === 0}
+                  startIcon={isSorting ? undefined : <RiArrowUpDownLine />}
+                  onClick={toggleIsSorting.toggle}
+                >
+                  {isSorting ? "Done ordering" : "Reorder"}
+                </Button>
+              )}
+            </Grid>
+            <Grid item>
+              {count !== undefined && count > 0 ? (
+                <CountText>{`${count} ${pluralize("item", count)}`}</CountText>
+              ) : null}
+            </Grid>
+          </ReorderGrid>
         </Grid>
         <ItemsListing
           listType={listType}
@@ -110,7 +160,7 @@ const ItemsListingComponent: React.FC<ItemsListingComponentProps> = ({
           condensed={condensed}
         />
       </GridColumn>
-    </Container>
+    </GridContainer>
   )
 }
 
diff --git a/frontends/mit-open/src/page-components/UserListCardTemplate/UserListCardTemplate.test.tsx b/frontends/mit-open/src/page-components/UserListCard/UserListCardCondensed.test.tsx
similarity index 58%
rename from frontends/mit-open/src/page-components/UserListCardTemplate/UserListCardTemplate.test.tsx
rename to frontends/mit-open/src/page-components/UserListCard/UserListCardCondensed.test.tsx
index 8af919565d..06168e2b31 100644
--- a/frontends/mit-open/src/page-components/UserListCardTemplate/UserListCardTemplate.test.tsx
+++ b/frontends/mit-open/src/page-components/UserListCard/UserListCardCondensed.test.tsx
@@ -1,20 +1,19 @@
 import React from "react"
-import { render, screen } from "@testing-library/react"
-import UserListCardTemplate from "./UserListCardTemplate"
+import { screen } from "@testing-library/react"
+import UserListCardCondensed from "./UserListCardCondensed"
 import * as factories from "api/test-utils/factories"
-import { makeImgConfig } from "ol-utilities/test-utils/factories"
+import { userListView } from "@/common/urls"
+import { renderWithProviders } from "@/test-utils"
 
 const userListFactory = factories.userLists
 
 describe("UserListCard", () => {
   it("renders title and cover image", () => {
     const userList = userListFactory.userList()
-    const imgConfig = makeImgConfig()
-    render(
-      <UserListCardTemplate
-        variant="column"
+    renderWithProviders(
+      <UserListCardCondensed
+        href={userListView(userList.id)}
         userList={userList}
-        imgConfig={imgConfig}
       />,
     )
     const heading = screen.getByRole("heading", { name: userList.title })
diff --git a/frontends/mit-open/src/page-components/UserListCard/UserListCardCondensed.tsx b/frontends/mit-open/src/page-components/UserListCard/UserListCardCondensed.tsx
new file mode 100644
index 0000000000..9fa5debd43
--- /dev/null
+++ b/frontends/mit-open/src/page-components/UserListCard/UserListCardCondensed.tsx
@@ -0,0 +1,75 @@
+import React from "react"
+import { UserList } from "api"
+import { pluralize } from "ol-utilities"
+import { RiListCheck3 } from "@remixicon/react"
+import { ListCardCondensed, styled, theme, Typography } from "ol-components"
+
+const StyledCard = styled(ListCardCondensed)({
+  display: "flex",
+  alignItems: "center",
+  padding: "16px",
+  margin: "0",
+  gap: "16px",
+  width: "100%",
+})
+
+const TextContainer = styled.div({
+  display: "flex",
+  flexDirection: "column",
+  alignItems: "flex-start",
+  gap: "8px",
+  flex: "1 0 0",
+})
+
+const ItemsText = styled(Typography)(({ theme }) => ({
+  color: theme.custom.colors.silverGrayDark,
+}))
+
+const IconContainer = styled.div(({ theme }) => ({
+  display: "flex",
+  alignItems: "center",
+  gap: "8px",
+  borderRadius: "4px",
+  color: theme.custom.colors.silverGrayDark,
+  background: theme.custom.colors.lightGray1,
+  [theme.breakpoints.down("sm")]: {
+    display: "none",
+  },
+}))
+
+type UserListCardCondensedProps<U extends UserList = UserList> = {
+  userList: U
+  href?: string
+  className?: string
+}
+
+const UserListCardCondensed = <U extends UserList>({
+  userList,
+  href,
+  className,
+}: UserListCardCondensedProps<U>) => {
+  return (
+    <StyledCard href={href} className={className}>
+      <ListCardCondensed.Content>
+        <TextContainer>
+          <Typography
+            variant="subtitle1"
+            color={theme.custom.colors.darkGray2}
+            component="h1"
+          >
+            {userList.title}
+          </Typography>
+          <ItemsText variant="body3">
+            {userList.item_count} {pluralize("item", userList.item_count)}
+          </ItemsText>
+        </TextContainer>
+        <IconContainer>
+          <RiListCheck3 size="48" />
+        </IconContainer>
+      </ListCardCondensed.Content>
+    </StyledCard>
+  )
+}
+
+export default UserListCardCondensed
+export type { UserListCardCondensedProps }
diff --git a/frontends/mit-open/src/page-components/UserListCardTemplate/UserListCardTemplate.tsx b/frontends/mit-open/src/page-components/UserListCardTemplate/UserListCardTemplate.tsx
deleted file mode 100644
index 91da95becc..0000000000
--- a/frontends/mit-open/src/page-components/UserListCardTemplate/UserListCardTemplate.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import React, { useCallback } from "react"
-import CardTemplate from "../CardTemplate/CardTemplate"
-import { UserList } from "api"
-import { EmbedlyConfig, pluralize } from "ol-utilities"
-import { styled } from "ol-components"
-
-const TypeRow = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-  min-height: 1.5em; /* ensure consistent height even if no certificate */
-`
-
-type CardVariant = "column" | "row" | "row-reverse"
-type OnActivateCard = (userList: UserList) => void
-type UserListCardTemplateProps<U extends UserList = UserList> = {
-  /**
-   * Whether the course picture and info display as a column or row.
-   */
-  variant: CardVariant
-  userList: U
-  sortable?: boolean
-  className?: string
-  imgConfig: EmbedlyConfig
-  onActivate?: OnActivateCard
-  footerActionSlot?: React.ReactNode
-}
-
-const UserListCardTemplate = <U extends UserList>({
-  variant,
-  userList,
-  className,
-  imgConfig,
-  sortable,
-  onActivate,
-  footerActionSlot,
-}: UserListCardTemplateProps<U>) => {
-  const handleActivate = useCallback(
-    () => onActivate?.(userList),
-    [userList, onActivate],
-  )
-  const extraDetails = (
-    <TypeRow>
-      <span>{userList.description}</span>
-    </TypeRow>
-  )
-  return (
-    <CardTemplate
-      variant={variant}
-      className={className}
-      imgUrl={userList.image?.url}
-      imgConfig={imgConfig}
-      title={userList.title}
-      extraDetails={extraDetails}
-      sortable={sortable}
-      handleActivate={handleActivate}
-      footerSlot={
-        <span>
-          {userList.item_count} {pluralize("item", userList.item_count)}
-        </span>
-      }
-      footerActionSlot={footerActionSlot}
-    ></CardTemplate>
-  )
-}
-
-export default UserListCardTemplate
-export type { UserListCardTemplateProps }
diff --git a/frontends/mit-open/src/pages/DashboardPage/Dashboard.test.tsx b/frontends/mit-open/src/pages/DashboardPage/Dashboard.test.tsx
index acc6a70d58..777aee60fb 100644
--- a/frontends/mit-open/src/pages/DashboardPage/Dashboard.test.tsx
+++ b/frontends/mit-open/src/pages/DashboardPage/Dashboard.test.tsx
@@ -7,7 +7,11 @@ import {
 } from "../../test-utils"
 import { factories, urls } from "api/test-utils"
 import { Permissions } from "@/common/permissions"
-import { DashboardPage, DashboardTabLabels } from "./DashboardPage"
+import {
+  DashboardPage,
+  DashboardTabKeys,
+  DashboardTabLabels,
+} from "./DashboardPage"
 import { faker } from "@faker-js/faker/locale/en"
 import {
   CourseResource,
@@ -16,6 +20,7 @@ import {
 } from "api"
 import { ControlledPromise } from "ol-test-utilities"
 import React from "react"
+import { DASHBOARD_HOME, MY_LISTS, PROFILE } from "@/common/urls"
 
 describe("DashboardPage", () => {
   const makeSearchResponse = (
@@ -244,13 +249,15 @@ describe("DashboardPage", () => {
   test("Renders the expected tab links", async () => {
     setupAPIs()
     renderWithProviders(<DashboardPage />)
-    Object.keys(DashboardTabLabels).forEach((key) => {
+    const urls = [DASHBOARD_HOME, MY_LISTS, PROFILE]
+    urls.forEach((url: string) => {
+      const key = DashboardTabKeys[url as keyof typeof DashboardTabKeys]
       const desktopTab = screen.getByTestId(`desktop-tab-${key}`)
       const mobileTab = screen.getByTestId(`mobile-tab-${key}`)
       expect(desktopTab).toBeInTheDocument()
       expect(mobileTab).toBeInTheDocument()
-      expect(desktopTab).toHaveAttribute("href", `/#${key}`)
-      expect(mobileTab).toHaveAttribute("href", `/#${key}`)
+      expect(desktopTab).toHaveAttribute("href", url)
+      expect(mobileTab).toHaveAttribute("href", url)
     })
   })
 
diff --git a/frontends/mit-open/src/pages/DashboardPage/DashboardPage.tsx b/frontends/mit-open/src/pages/DashboardPage/DashboardPage.tsx
index 002da268bd..930173ab59 100644
--- a/frontends/mit-open/src/pages/DashboardPage/DashboardPage.tsx
+++ b/frontends/mit-open/src/pages/DashboardPage/DashboardPage.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from "react"
+import React from "react"
 import {
   RiAccountCircleFill,
   RiDashboardLine,
@@ -23,9 +23,8 @@ import {
 import { MetaTags } from "ol-utilities"
 import { Link } from "react-router-dom"
 import { useUserMe } from "api/hooks/user"
-import { useLocation } from "react-router"
-import { UserListListingComponent } from "../UserListListingPage/UserListListingPage"
-import { UserList } from "api"
+import { useLocation, useParams } from "react-router"
+import UserListListingComponent from "../UserListListingComponent/UserListListingComponent"
 
 import { ProfileEditForm } from "./ProfileEditForm"
 import { useProfileMeQuery } from "api/hooks/profile"
@@ -40,6 +39,7 @@ import {
 import ResourceCarousel from "@/page-components/ResourceCarousel/ResourceCarousel"
 import UserListDetailsTab from "./UserListDetailsTab"
 import { SettingsPage } from "./SettingsPage"
+import { DASHBOARD_HOME, MY_LISTS, PROFILE, SETTINGS } from "@/common/urls"
 
 /**
  *
@@ -253,22 +253,37 @@ const StyledResourceCarousel = styled(ResourceCarousel)(({ theme }) => ({
   },
 }))
 
+const TabKeys = {
+  [DASHBOARD_HOME]: "home",
+  [MY_LISTS]: "my-lists",
+  [PROFILE]: "profile",
+  [SETTINGS]: "settings",
+}
+
+const TabLabels = {
+  [DASHBOARD_HOME]: "Home",
+  [MY_LISTS]: "My Lists",
+  [PROFILE]: "Profile",
+  [SETTINGS]: "Settings",
+}
+
 interface UserMenuTabProps {
   icon: React.ReactNode
   text: string
+  tabKey: string
   value: string
   currentValue: string
   onClick?: () => void
 }
 
 const UserMenuTab: React.FC<UserMenuTabProps> = (props) => {
-  const { icon, text, value, currentValue, onClick } = props
+  const { icon, text, tabKey, value, currentValue, onClick } = props
   const selected = value === currentValue
   return (
     <Tab
       component={Link}
-      to={`#${value}`}
-      data-testid={`desktop-tab-${value}`}
+      to={value}
+      data-testid={`desktop-tab-${tabKey}`}
       label={
         <TabContainer
           onClick={onClick}
@@ -284,41 +299,25 @@ const UserMenuTab: React.FC<UserMenuTabProps> = (props) => {
   )
 }
 
-enum TabValues {
-  HOME = "home",
-  MY_LISTS = "my-lists",
-  SETTINGS = "settings",
-  PROFILE = "profile",
-}
-
-const TabLabels = {
-  [TabValues.HOME]: "Home",
-  [TabValues.MY_LISTS]: "My Lists",
-  [TabValues.PROFILE]: "Profile",
-  [TabValues.SETTINGS]: "Settings",
-}
-const keyFromHash = (hash: string) => {
-  const keys = Object.values(TabValues)
-  const match = keys.find((key) => `#${key}` === hash)
-  return match ?? "home"
+type RouteParams = {
+  id: string
 }
 
 const DashboardPage: React.FC = () => {
   const { isLoading: isLoadingUser, data: user } = useUserMe()
   const { isLoading: isLoadingProfile, data: profile } = useProfileMeQuery()
-  const { hash } = useLocation()
-  const tabValue = keyFromHash(hash)
-  const [userListAction, setUserListAction] = useState("list")
-  const [userListId, setUserListId] = useState(0)
+  const { pathname } = useLocation()
+  const id = Number(useParams<RouteParams>().id) || -1
+  const showUserListDetail = pathname.includes(MY_LISTS) && id !== -1
+  const tabValue = showUserListDetail
+    ? MY_LISTS
+    : [DASHBOARD_HOME, MY_LISTS, PROFILE, SETTINGS].includes(pathname)
+      ? pathname
+      : DASHBOARD_HOME
 
   const topics = profile?.preference_search_filters.topic
   const certification = profile?.preference_search_filters.certification
 
-  const handleActivateUserList = useCallback((userList: UserList) => {
-    setUserListId(userList.id)
-    setUserListAction("detail")
-  }, [])
-
   const desktopMenu = (
     <ProfileSidebar>
       <Card.Content>
@@ -339,27 +338,30 @@ const DashboardPage: React.FC = () => {
         >
           <UserMenuTab
             icon={<RiDashboardLine />}
-            text={TabLabels[TabValues.HOME]}
-            value={TabValues.HOME}
+            text={TabLabels[DASHBOARD_HOME]}
+            tabKey={TabKeys[DASHBOARD_HOME]}
+            value={DASHBOARD_HOME}
             currentValue={tabValue}
           />
           <UserMenuTab
             icon={<RiBookmarkLine />}
-            text={TabLabels[TabValues.MY_LISTS]}
-            value={TabValues.MY_LISTS}
+            text={TabLabels[MY_LISTS]}
+            tabKey={TabKeys[MY_LISTS]}
+            value={MY_LISTS}
             currentValue={tabValue}
-            onClick={() => setUserListAction("list")}
           />
           <UserMenuTab
             icon={<RiEditLine />}
-            text={TabLabels[TabValues.PROFILE]}
-            value={TabValues.PROFILE}
+            text={TabLabels[PROFILE]}
+            tabKey={TabKeys[PROFILE]}
+            value={PROFILE}
             currentValue={tabValue}
           />
           <UserMenuTab
             icon={<RiNotificationLine />}
-            text={TabLabels[TabValues.SETTINGS]}
-            value={TabValues.SETTINGS}
+            text={TabLabels[SETTINGS]}
+            tabKey={TabKeys[SETTINGS]}
+            value={SETTINGS}
             currentValue={tabValue}
           />
         </TabsContainer>
@@ -370,28 +372,27 @@ const DashboardPage: React.FC = () => {
   const mobileMenu = (
     <TabButtonList data-testid="mobile-tab-list">
       <TabButtonLink
-        data-testid={`mobile-tab-${TabValues.HOME}`}
-        value={TabValues.HOME}
-        href={`#${TabValues.HOME}`}
+        data-testid={`mobile-tab-${TabKeys[DASHBOARD_HOME]}`}
+        value={DASHBOARD_HOME}
+        href={DASHBOARD_HOME}
         label="Home"
       />
       <TabButtonLink
-        data-testid={`mobile-tab-${TabValues.MY_LISTS}`}
-        value={TabValues.MY_LISTS}
-        href={`#${TabValues.MY_LISTS}`}
+        data-testid={`mobile-tab-${TabKeys[MY_LISTS]}`}
+        value={MY_LISTS}
+        href={MY_LISTS}
         label="My Lists"
-        onClick={() => setUserListAction("list")}
       />
       <TabButtonLink
-        data-testid={`mobile-tab-${TabValues.PROFILE}`}
-        value={TabValues.PROFILE}
-        href={`#${TabValues.PROFILE}`}
+        data-testid={`mobile-tab-${TabKeys[PROFILE]}`}
+        value={PROFILE}
+        href={PROFILE}
         label="Profile"
       />
       <TabButtonLink
-        data-testid={`mobile-tab-${TabValues.SETTINGS}`}
-        value={TabValues.SETTINGS}
-        href={`#${TabValues.SETTINGS}`}
+        data-testid={`mobile-tab-${TabKeys[SETTINGS]}`}
+        value={SETTINGS}
+        href={SETTINGS}
         label="Settings"
       />
     </TabButtonList>
@@ -408,108 +409,94 @@ const DashboardPage: React.FC = () => {
                 <MobileOnly>{mobileMenu}</MobileOnly>
                 <DesktopOnly>{desktopMenu}</DesktopOnly>
               </DashboardGridItem>
-              <DashboardGridItem>
-                <TabPanelStyled value={TabValues.HOME}>
-                  <HomeHeader>
-                    <HomeHeaderLeft>
-                      <TitleText role="heading">
-                        Your MIT Learning Journey
-                      </TitleText>
-                      <SubTitleText>
-                        A customized course list based on your preferences.
-                      </SubTitleText>
-                    </HomeHeaderLeft>
-                    <HomeHeaderRight>
-                      <ButtonLink
-                        variant="tertiary"
-                        href={`#${TabValues.PROFILE}`}
-                      >
-                        Edit Profile
-                      </ButtonLink>
-                    </HomeHeaderRight>
-                  </HomeHeader>
-                  <StyledResourceCarousel
-                    title="Top picks for you"
-                    isLoading={isLoadingProfile}
-                    config={TopPicksCarouselConfig(profile)}
-                    data-testid="top-picks-carousel"
-                  />
-                  {topics?.map((topic, index) => (
+              {showUserListDetail ? (
+                <DashboardGridItem>
+                  <UserListDetailsTab userListId={id} />
+                </DashboardGridItem>
+              ) : (
+                <DashboardGridItem>
+                  <TabPanelStyled value={DASHBOARD_HOME}>
+                    <HomeHeader>
+                      <HomeHeaderLeft>
+                        <TitleText role="heading">
+                          Your MIT Learning Journey
+                        </TitleText>
+                        <SubTitleText>
+                          A customized course list based on your preferences.
+                        </SubTitleText>
+                      </HomeHeaderLeft>
+                      <HomeHeaderRight>
+                        <ButtonLink variant="tertiary" href={PROFILE}>
+                          Edit Profile
+                        </ButtonLink>
+                      </HomeHeaderRight>
+                    </HomeHeader>
                     <StyledResourceCarousel
-                      key={index}
-                      title={`Popular courses in ${topic}`}
+                      title="Top picks for you"
                       isLoading={isLoadingProfile}
-                      config={TopicCarouselConfig(topic)}
-                      data-testid={`topic-carousel-${topic}`}
+                      config={TopPicksCarouselConfig(profile)}
+                      data-testid="top-picks-carousel"
                     />
-                  ))}
-                  {certification === true ? (
+                    {topics?.map((topic, index) => (
+                      <StyledResourceCarousel
+                        key={index}
+                        title={`Popular courses in ${topic}`}
+                        isLoading={isLoadingProfile}
+                        config={TopicCarouselConfig(topic)}
+                        data-testid={`topic-carousel-${topic}`}
+                      />
+                    ))}
+                    {certification === true ? (
+                      <StyledResourceCarousel
+                        title="Courses with Certificates"
+                        isLoading={isLoadingProfile}
+                        config={CERTIFICATE_COURSES_CAROUSEL}
+                        data-testid="certification-carousel"
+                      />
+                    ) : (
+                      <StyledResourceCarousel
+                        title="Free courses"
+                        isLoading={isLoadingProfile}
+                        config={FREE_COURSES_CAROUSEL}
+                        data-testid="free-carousel"
+                      />
+                    )}
                     <StyledResourceCarousel
-                      title="Courses with Certificates"
-                      isLoading={isLoadingProfile}
-                      config={CERTIFICATE_COURSES_CAROUSEL}
-                      data-testid="certification-carousel"
+                      title="New"
+                      config={NEW_LEARNING_RESOURCES_CAROUSEL}
+                      data-testid="new-learning-resources-carousel"
                     />
-                  ) : (
                     <StyledResourceCarousel
-                      title="Free courses"
-                      isLoading={isLoadingProfile}
-                      config={FREE_COURSES_CAROUSEL}
-                      data-testid="free-carousel"
+                      title="Popular"
+                      config={POPULAR_LEARNING_RESOURCES_CAROUSEL}
+                      data-testid="popular-learning-resources-carousel"
                     />
-                  )}
-                  <StyledResourceCarousel
-                    title="New"
-                    config={NEW_LEARNING_RESOURCES_CAROUSEL}
-                    data-testid="new-learning-resources-carousel"
-                  />
-                  <StyledResourceCarousel
-                    title="Popular"
-                    config={POPULAR_LEARNING_RESOURCES_CAROUSEL}
-                    data-testid="popular-learning-resources-carousel"
-                  />
-                </TabPanelStyled>
-                <TabPanelStyled value={TabValues.MY_LISTS}>
-                  {userListAction === "list" ? (
-                    <div id="user-list-listing">
-                      <UserListListingComponent
-                        title="My Lists"
-                        onActivate={handleActivateUserList}
-                      />
-                    </div>
-                  ) : (
-                    <div id="user-list-detail">
-                      <UserListDetailsTab userListId={userListId} />
-                    </div>
-                  )}
-                </TabPanelStyled>
-                <TabPanelStyled
-                  key={TabValues.PROFILE}
-                  value={TabValues.PROFILE}
-                >
-                  <TitleText role="heading">Profile</TitleText>
-                  {isLoadingProfile || typeof profile === "undefined" ? (
-                    <Skeleton variant="text" width={128} height={32} />
-                  ) : (
-                    <div id="user-profile-edit">
-                      <ProfileEditForm profile={profile} />
-                    </div>
-                  )}
-                </TabPanelStyled>
-                <TabPanelStyled
-                  key={TabValues.SETTINGS}
-                  value={TabValues.SETTINGS}
-                >
-                  <TitleText role="heading">Settings</TitleText>
-                  {isLoadingProfile || !profile ? (
-                    <Skeleton variant="text" width={128} height={32} />
-                  ) : (
-                    <div id="user-settings">
-                      <SettingsPage />
-                    </div>
-                  )}
-                </TabPanelStyled>
-              </DashboardGridItem>
+                  </TabPanelStyled>
+                  <TabPanelStyled value={MY_LISTS}>
+                    <UserListListingComponent title="My Lists" />
+                  </TabPanelStyled>
+                  <TabPanelStyled value={PROFILE}>
+                    <TitleText role="heading">Profile</TitleText>
+                    {isLoadingProfile || !profile ? (
+                      <Skeleton variant="text" width={128} height={32} />
+                    ) : (
+                      <div id="user-profile-edit">
+                        <ProfileEditForm profile={profile} />
+                      </div>
+                    )}
+                  </TabPanelStyled>
+                  <TabPanelStyled value={SETTINGS}>
+                    <TitleText role="heading">Settings</TitleText>
+                    {isLoadingProfile || !profile ? (
+                      <Skeleton variant="text" width={128} height={32} />
+                    ) : (
+                      <div id="user-settings">
+                        <SettingsPage />
+                      </div>
+                    )}
+                  </TabPanelStyled>
+                </DashboardGridItem>
+              )}
             </DashboardGrid>
           </TabContext>
         </DashboardContainer>
@@ -518,4 +505,8 @@ const DashboardPage: React.FC = () => {
   )
 }
 
-export { DashboardPage, TabLabels as DashboardTabLabels }
+export {
+  DashboardPage,
+  TabKeys as DashboardTabKeys,
+  TabLabels as DashboardTabLabels,
+}
diff --git a/frontends/mit-open/src/pages/HomePage/HomePage.test.tsx b/frontends/mit-open/src/pages/HomePage/HomePage.test.tsx
index d36f46d073..2c4e7e4651 100644
--- a/frontends/mit-open/src/pages/HomePage/HomePage.test.tsx
+++ b/frontends/mit-open/src/pages/HomePage/HomePage.test.tsx
@@ -293,7 +293,7 @@ describe("Home Page personalize section", () => {
     expect(link).toHaveAttribute(
       "href",
       routes.login({
-        pathname: routes.DASHBOARD,
+        pathname: routes.DASHBOARD_HOME,
       }),
     )
   })
diff --git a/frontends/mit-open/src/pages/HomePage/PersonalizeSection.tsx b/frontends/mit-open/src/pages/HomePage/PersonalizeSection.tsx
index 34f380e2cc..515edd1f41 100644
--- a/frontends/mit-open/src/pages/HomePage/PersonalizeSection.tsx
+++ b/frontends/mit-open/src/pages/HomePage/PersonalizeSection.tsx
@@ -65,7 +65,7 @@ const AUTH_TEXT_DATA = {
     text: "Ready to keep learning? Choose from your saved courses, find personalized recommendations, and see what's trending on your dashboard.",
     linkProps: {
       children: "My Dashboard",
-      href: urls.DASHBOARD,
+      href: urls.DASHBOARD_HOME,
     },
   },
   anonymous: {
@@ -75,7 +75,7 @@ const AUTH_TEXT_DATA = {
       children: "Sign Up for Free",
       reloadDocument: true,
       href: urls.login({
-        pathname: urls.DASHBOARD,
+        pathname: urls.DASHBOARD_HOME,
       }),
     },
   },
diff --git a/frontends/mit-open/src/pages/ListDetailsPage/ListDetailsPage.test.ts b/frontends/mit-open/src/pages/ListDetailsPage/ListDetailsPage.test.ts
index b8ac2ccee5..663a188f97 100644
--- a/frontends/mit-open/src/pages/ListDetailsPage/ListDetailsPage.test.ts
+++ b/frontends/mit-open/src/pages/ListDetailsPage/ListDetailsPage.test.ts
@@ -100,7 +100,7 @@ describe("ListDetailsPage", () => {
       setup({ path, userSettings })
       await screen.findByRole("heading", { name: path.title })
 
-      const editButton = screen.queryByRole("button", { name: "Edit" })
+      const editButton = screen.queryByRole("button", { name: "Edit List" })
       expect(!!editButton).toBe(canEdit)
     },
   )
@@ -168,7 +168,7 @@ describe("ListDetailsPage", () => {
   test("Edit buttons opens editing dialog", async () => {
     const path = factories.learningResources.learningPath()
     setup({ path, userSettings: { is_learning_path_editor: true } })
-    const editButton = await screen.findByRole("button", { name: "Edit" })
+    const editButton = await screen.findByRole("button", { name: "Edit List" })
 
     const editList = jest.spyOn(manageListDialogs, "upsertLearningPath")
     editList.mockImplementationOnce(jest.fn())
diff --git a/frontends/mit-open/src/pages/ListDetailsPage/ListDetailsPage.tsx b/frontends/mit-open/src/pages/ListDetailsPage/ListDetailsPage.tsx
index f0efbbcbeb..1764734acc 100644
--- a/frontends/mit-open/src/pages/ListDetailsPage/ListDetailsPage.tsx
+++ b/frontends/mit-open/src/pages/ListDetailsPage/ListDetailsPage.tsx
@@ -1,9 +1,13 @@
 import React from "react"
-import { Container, BannerPage } from "ol-components"
+import { Container, BannerPage, styled } from "ol-components"
 import { MetaTags } from "ol-utilities"
 import ItemsListingComponent from "@/page-components/ItemsListing/ItemsListingComponent"
 import type { ItemsListingComponentProps } from "@/page-components/ItemsListing/ItemsListingComponent"
 
+const StyledContainer = styled(Container)({
+  paddingTop: "24px",
+})
+
 const ListDetailsPage: React.FC<ItemsListingComponentProps> = ({
   listType,
   list,
@@ -20,7 +24,7 @@ const ListDetailsPage: React.FC<ItemsListingComponentProps> = ({
       className="learningpaths-page"
     >
       <MetaTags title={list?.title} />
-      <Container maxWidth="md">
+      <StyledContainer maxWidth="md">
         <ItemsListingComponent
           listType={listType}
           list={list}
@@ -31,7 +35,7 @@ const ListDetailsPage: React.FC<ItemsListingComponentProps> = ({
           isFetching={isFetching}
           handleEdit={handleEdit}
         />
-      </Container>
+      </StyledContainer>
     </BannerPage>
   )
 }
diff --git a/frontends/mit-open/src/pages/OnboardingPage/OnboardingPage.tsx b/frontends/mit-open/src/pages/OnboardingPage/OnboardingPage.tsx
index f0ccc2a73b..9dcdbf4e7b 100644
--- a/frontends/mit-open/src/pages/OnboardingPage/OnboardingPage.tsx
+++ b/frontends/mit-open/src/pages/OnboardingPage/OnboardingPage.tsx
@@ -20,7 +20,7 @@ import {
 import { MetaTags } from "ol-utilities"
 import { RiArrowRightLine, RiArrowLeftLine } from "@remixicon/react"
 import { useProfileMeMutation, useProfileMeQuery } from "api/hooks/profile"
-import { DASHBOARD } from "@/common/urls"
+import { DASHBOARD_HOME } from "@/common/urls"
 
 import { useFormik } from "formik"
 import { useLearningResourceTopics } from "api/hooks/learningResources"
@@ -168,7 +168,7 @@ const OnboardingPage: React.FC = () => {
       if (activeStep < NUM_STEPS - 1) {
         setActiveStep((prevActiveStep) => prevActiveStep + 1)
       } else {
-        navigate(DASHBOARD)
+        navigate(DASHBOARD_HOME)
       }
     },
     validateOnChange: false,
diff --git a/frontends/mit-open/src/pages/UserListListingComponent/UserListListingComponent.test.tsx b/frontends/mit-open/src/pages/UserListListingComponent/UserListListingComponent.test.tsx
new file mode 100644
index 0000000000..c35e645070
--- /dev/null
+++ b/frontends/mit-open/src/pages/UserListListingComponent/UserListListingComponent.test.tsx
@@ -0,0 +1,107 @@
+import React from "react"
+import { faker } from "@faker-js/faker/locale/en"
+import { factories, urls } from "api/test-utils"
+import {
+  screen,
+  renderWithProviders,
+  setMockResponse,
+  user,
+  expectProps,
+  within,
+} from "../../test-utils"
+import type { User } from "../../test-utils"
+
+import UserListListingComponent from "./UserListListingComponent"
+import { manageListDialogs } from "@/page-components/ManageListDialogs/ManageListDialogs"
+import UserListCardCondensed from "@/page-components/UserListCard/UserListCardCondensed"
+import { userListView } from "@/common/urls"
+
+jest.mock("../../page-components/UserListCard/UserListCardCondensed", () => {
+  const actual = jest.requireActual(
+    "../../page-components/UserListCard/UserListCardCondensed",
+  )
+  return {
+    __esModule: true,
+    ...actual,
+    default: jest.fn(actual.default),
+  }
+})
+const spyULCardCondensed = jest.mocked(UserListCardCondensed)
+
+/**
+ * Set up the mock API responses for lists pages.
+ */
+const setup = ({
+  listsCount = faker.number.int({ min: 2, max: 5 }),
+  user = { is_learning_path_editor: false },
+}: {
+  user?: Partial<User>
+  listsCount?: number
+} = {}) => {
+  const paths = factories.userLists.userLists({ count: listsCount })
+  setMockResponse.get(urls.userLists.list(), paths)
+
+  setMockResponse.get(urls.userSubscription.check(), factories.percolateQueries)
+
+  const { location } = renderWithProviders(
+    <UserListListingComponent title="My Lists" />,
+    {
+      user,
+    },
+  )
+
+  return { paths, location }
+}
+
+describe("UserListListingPage", () => {
+  it("Has heading 'User Lists' and correct page title", async () => {
+    setup()
+    screen.getByRole("heading", { name: "My Lists" })
+  })
+
+  it("Renders a card for each user list", async () => {
+    const { paths } = setup()
+    const titles = paths.results.map((userList) => userList.title)
+    const headings = await screen.findAllByRole("heading", {
+      name: (value) => titles.includes(value),
+    })
+
+    // for sanity
+    expect(headings.length).toBeGreaterThan(0)
+    expect(titles.length).toBe(headings.length)
+
+    paths.results.forEach((userList) => {
+      expectProps(spyULCardCondensed, {
+        href: userListView(userList.id),
+        userList: userList,
+      })
+    })
+  })
+
+  test("Clicking new list opens the creation dialog", async () => {
+    const createList = jest
+      .spyOn(manageListDialogs, "upsertUserList")
+      .mockImplementationOnce(jest.fn())
+    setup()
+    const newListButton = await screen.findByRole("button", {
+      name: "Create new list",
+    })
+
+    expect(createList).not.toHaveBeenCalled()
+    await user.click(newListButton)
+
+    // Check details of this dialog elsewhere
+    expect(createList).toHaveBeenCalledWith()
+  })
+
+  test("Clicking on the card shows the list detail view", async () => {
+    const { paths, location } = setup()
+    const card = await screen.findByTestId(
+      `user-list-card-condensed-${paths.results[0].id}`,
+    )
+    const cardLink = within(card).getByRole("link")
+
+    await user.click(cardLink)
+    expect(location.current.pathname).toBe(userListView(paths.results[0].id))
+  })
+})
diff --git a/frontends/mit-open/src/pages/UserListListingComponent/UserListListingComponent.tsx b/frontends/mit-open/src/pages/UserListListingComponent/UserListListingComponent.tsx
new file mode 100644
index 0000000000..aaa3daaef2
--- /dev/null
+++ b/frontends/mit-open/src/pages/UserListListingComponent/UserListListingComponent.tsx
@@ -0,0 +1,75 @@
+import React, { useCallback } from "react"
+import {
+  Button,
+  LoadingSpinner,
+  styled,
+  Typography,
+  PlainList,
+} from "ol-components"
+
+import { useUserListList } from "api/hooks/learningResources"
+
+import { GridColumn, GridContainer } from "@/components/GridLayout/GridLayout"
+
+import { manageListDialogs } from "@/page-components/ManageListDialogs/ManageListDialogs"
+import { userListView } from "@/common/urls"
+import UserListCardCondensed from "@/page-components/UserListCard/UserListCardCondensed"
+
+const Header = styled(Typography)({
+  marginBottom: "16px",
+})
+
+const NewListButton = styled(Button)(({ theme }) => ({
+  marginTop: "24px",
+  width: "200px",
+  [theme.breakpoints.down("sm")]: {
+    width: "100%",
+  },
+}))
+
+type UserListListingComponentProps = {
+  title?: string
+}
+
+const UserListListingComponent: React.FC<UserListListingComponentProps> = (
+  props,
+) => {
+  const { title } = props
+  const listingQuery = useUserListList()
+  const handleCreate = useCallback(() => {
+    manageListDialogs.upsertUserList()
+  }, [])
+
+  return (
+    <GridContainer>
+      <GridColumn variant="single-full">
+        <Header variant="h3">{title}</Header>
+        <section>
+          <LoadingSpinner loading={listingQuery.isLoading} />
+          {listingQuery.data && (
+            <PlainList itemSpacing={3}>
+              {listingQuery.data.results?.map((list) => {
+                return (
+                  <li
+                    key={list.id}
+                    data-testid={`user-list-card-condensed-${list.id}`}
+                  >
+                    <UserListCardCondensed
+                      href={userListView(list.id)}
+                      userList={list}
+                    />
+                  </li>
+                )
+              })}
+            </PlainList>
+          )}
+          <NewListButton variant="primary" onClick={handleCreate}>
+            Create new list
+          </NewListButton>
+        </section>
+      </GridColumn>
+    </GridContainer>
+  )
+}
+
+export default UserListListingComponent
diff --git a/frontends/mit-open/src/pages/UserListListingPage/UserListListingPage.test.tsx b/frontends/mit-open/src/pages/UserListListingPage/UserListListingPage.test.tsx
deleted file mode 100644
index 753b9e9c39..0000000000
--- a/frontends/mit-open/src/pages/UserListListingPage/UserListListingPage.test.tsx
+++ /dev/null
@@ -1,146 +0,0 @@
-import React from "react"
-import { faker } from "@faker-js/faker/locale/en"
-import { factories, urls } from "api/test-utils"
-import {
-  screen,
-  renderWithProviders,
-  setMockResponse,
-  user,
-  expectProps,
-  waitFor,
-} from "../../test-utils"
-import type { User } from "../../test-utils"
-
-import { UserListListingPage } from "./UserListListingPage"
-import UserListCardTemplate from "@/page-components/UserListCardTemplate/UserListCardTemplate"
-import { manageListDialogs } from "@/page-components/ManageListDialogs/ManageListDialogs"
-
-jest.mock(
-  "../../page-components/UserListCardTemplate/UserListCardTemplate",
-  () => {
-    const actual = jest.requireActual(
-      "../../page-components/UserListCardTemplate/UserListCardTemplate",
-    )
-    return {
-      __esModule: true,
-      ...actual,
-      default: jest.fn(actual.default),
-    }
-  },
-)
-const spyULCardTemplate = jest.mocked(UserListCardTemplate)
-
-/**
- * Set up the mock API responses for lists pages.
- */
-const setup = ({
-  listsCount = faker.number.int({ min: 2, max: 5 }),
-  user = { is_learning_path_editor: false },
-}: {
-  user?: Partial<User>
-  listsCount?: number
-} = {}) => {
-  const paths = factories.userLists.userLists({ count: listsCount })
-
-  setMockResponse.get(urls.userLists.list(), paths)
-
-  setMockResponse.get(urls.userSubscription.check(), factories.percolateQueries)
-
-  const { location } = renderWithProviders(<UserListListingPage />, {
-    user,
-  })
-
-  return { paths, location }
-}
-
-describe("UserListListingPage", () => {
-  it("Has heading 'User Lists' and correct page title", async () => {
-    setup()
-    screen.getByRole("heading", { name: "User Lists" })
-    await waitFor(() => expect(document.title).toBe("My Lists | MIT Open"))
-  })
-
-  it("Renders a card for each user list", async () => {
-    const { paths } = setup()
-    const titles = paths.results.map((userList) => userList.title)
-    const headings = await screen.findAllByRole("heading", {
-      name: (value) => titles.includes(value),
-    })
-
-    // for sanity
-    expect(headings.length).toBeGreaterThan(0)
-    expect(titles.length).toBe(headings.length)
-
-    paths.results.forEach((userList) => {
-      expectProps(spyULCardTemplate, { userList: userList })
-    })
-  })
-
-  test("Clicking edit -> Edit on opens the editing dialog", async () => {
-    const editList = jest
-      .spyOn(manageListDialogs, "upsertUserList")
-      .mockImplementationOnce(jest.fn())
-
-    const { paths } = setup()
-    const path = faker.helpers.arrayElement(paths.results)
-
-    const menuButton = await screen.findByRole("button", {
-      name: `Edit list ${path.title}`,
-    })
-    await user.click(menuButton)
-    const editButton = screen.getByRole("menuitem", { name: "Edit" })
-    await user.click(editButton)
-
-    expect(editList).toHaveBeenCalledWith(path)
-  })
-
-  test("Clicking edit -> Delete opens the deletion dialog", async () => {
-    const deleteList = jest
-      .spyOn(manageListDialogs, "destroyUserList")
-      .mockImplementationOnce(jest.fn())
-
-    const { paths } = setup()
-    const path = faker.helpers.arrayElement(paths.results)
-
-    const menuButton = await screen.findByRole("button", {
-      name: `Edit list ${path.title}`,
-    })
-    await user.click(menuButton)
-    const deleteButton = screen.getByRole("menuitem", { name: "Delete" })
-
-    await user.click(deleteButton)
-
-    // Check details of this dialog elsewhere
-    expect(deleteList).toHaveBeenCalledWith(path)
-  })
-
-  test("Clicking new list opens the creation dialog", async () => {
-    const createList = jest
-      .spyOn(manageListDialogs, "upsertUserList")
-      .mockImplementationOnce(jest.fn())
-    setup()
-    const newListButton = await screen.findByRole("button", {
-      name: "Create new list",
-    })
-
-    expect(createList).not.toHaveBeenCalled()
-    await user.click(newListButton)
-
-    // Check details of this dialog elsewhere
-    expect(createList).toHaveBeenCalledWith()
-  })
-
-  test("Clicking on list title navigates to list page", async () => {
-    const { location, paths } = setup()
-    const path = faker.helpers.arrayElement(paths.results)
-    const listTitle = await screen.findByRole("heading", { name: path.title })
-    await user.click(listTitle)
-    expect(location.current).toEqual(
-      expect.objectContaining({
-        pathname: `/userlists/${path.id}`,
-        search: "",
-        hash: "",
-      }),
-    )
-  })
-})
diff --git a/frontends/mit-open/src/pages/UserListListingPage/UserListListingPage.tsx b/frontends/mit-open/src/pages/UserListListingPage/UserListListingPage.tsx
deleted file mode 100644
index 1b5e85ddc9..0000000000
--- a/frontends/mit-open/src/pages/UserListListingPage/UserListListingPage.tsx
+++ /dev/null
@@ -1,161 +0,0 @@
-import React, { useCallback, useMemo } from "react"
-import {
-  Button,
-  Grid,
-  LoadingSpinner,
-  BannerPage,
-  Container,
-  styled,
-  SimpleMenuItem,
-  SimpleMenu,
-  ActionButton,
-  Typography,
-  PlainList,
-  imgConfigs,
-} from "ol-components"
-import { RiPencilFill, RiMore2Fill, RiDeleteBin7Fill } from "@remixicon/react"
-
-import { MetaTags } from "ol-utilities"
-import type { UserList } from "api"
-import { useUserListList } from "api/hooks/learningResources"
-
-import { GridColumn, GridContainer } from "@/components/GridLayout/GridLayout"
-
-import UserListCardTemplate from "@/page-components/UserListCardTemplate/UserListCardTemplate"
-import { useNavigate } from "react-router"
-import * as urls from "@/common/urls"
-import { manageListDialogs } from "@/page-components/ManageListDialogs/ManageListDialogs"
-
-const PageContainer = styled(Container)({
-  marginTop: "1rem",
-})
-
-const ListHeaderGrid = styled(Grid)({
-  marginBottom: "1rem",
-})
-
-type EditUserListMenuProps = {
-  userList: UserList
-}
-
-const EditUserListMenu: React.FC<EditUserListMenuProps> = ({ userList }) => {
-  const items: SimpleMenuItem[] = useMemo(
-    () => [
-      {
-        key: "edit",
-        label: "Edit",
-        icon: <RiPencilFill />,
-        onClick: () => manageListDialogs.upsertUserList(userList),
-      },
-      {
-        key: "delete",
-        label: "Delete",
-        icon: <RiDeleteBin7Fill />,
-        onClick: () => manageListDialogs.destroyUserList(userList),
-      },
-    ],
-    [userList],
-  )
-  return (
-    <SimpleMenu
-      trigger={
-        <ActionButton
-          variant="text"
-          color="secondary"
-          size="small"
-          aria-label={`Edit list ${userList.title}`}
-        >
-          <RiMore2Fill fontSize="inherit" />
-        </ActionButton>
-      }
-      items={items}
-    />
-  )
-}
-
-type UserListListingComponentProps = {
-  title?: string
-  onActivate: (userList: UserList) => void
-}
-
-const UserListListingComponent: React.FC<UserListListingComponentProps> = (
-  props,
-) => {
-  const { title, onActivate } = props
-  const listingQuery = useUserListList()
-  const handleCreate = useCallback(() => {
-    manageListDialogs.upsertUserList()
-  }, [])
-
-  return (
-    <GridContainer>
-      <GridColumn variant="single-full">
-        <ListHeaderGrid container justifyContent="space-between">
-          <Grid item>
-            <Typography variant="h3" component="h1">
-              {title}
-            </Typography>
-          </Grid>
-          <Grid
-            item
-            justifyContent="flex-end"
-            alignItems="center"
-            display="flex"
-          >
-            <Button variant="primary" onClick={handleCreate}>
-              Create new list
-            </Button>
-          </Grid>
-        </ListHeaderGrid>
-        <section>
-          <LoadingSpinner loading={listingQuery.isLoading} />
-          {listingQuery.data && (
-            <PlainList itemSpacing={3}>
-              {listingQuery.data.results?.map((list) => {
-                return (
-                  <li key={list.id}>
-                    <UserListCardTemplate
-                      variant="row-reverse"
-                      userList={list}
-                      className="ic-resource-card"
-                      imgConfig={imgConfigs["row-reverse-small"]}
-                      onActivate={onActivate}
-                      footerActionSlot={<EditUserListMenu userList={list} />}
-                    />
-                  </li>
-                )
-              })}
-            </PlainList>
-          )}
-        </section>
-      </GridColumn>
-    </GridContainer>
-  )
-}
-
-const UserListListingPage: React.FC = () => {
-  const navigate = useNavigate()
-  const handleActivate = useCallback(
-    (userList: UserList) => {
-      const path = urls.userListView(userList.id)
-      navigate(path)
-    },
-    [navigate],
-  )
-  return (
-    <BannerPage
-      src="/static/images/course_search_banner.png"
-      className="learningpaths-page"
-    >
-      <MetaTags title="My Lists" />
-      <PageContainer maxWidth="sm">
-        <UserListListingComponent
-          title="User Lists"
-          onActivate={handleActivate}
-        />
-      </PageContainer>
-    </BannerPage>
-  )
-}
-
-export { UserListListingComponent, UserListListingPage }
diff --git a/frontends/mit-open/src/routes.tsx b/frontends/mit-open/src/routes.tsx
index 626daad097..dd92134a55 100644
--- a/frontends/mit-open/src/routes.tsx
+++ b/frontends/mit-open/src/routes.tsx
@@ -7,7 +7,6 @@ import LearningPathListingPage from "@/pages/LearningPathListingPage/LearningPat
 import ChannelPage from "@/pages/ChannelPage/ChannelPage"
 import EditChannelPage from "@/pages/ChannelPage/EditChannelPage"
 
-import { UserListListingPage } from "./pages/UserListListingPage/UserListListingPage"
 import ArticleDetailsPage from "@/pages/ArticleDetailsPage/ArticleDetailsPage"
 import { ArticleCreatePage, ArticleEditPage } from "@/pages/ArticleUpsertPages"
 import ProgramLetterPage from "@/pages/ProgramLetterPage/ProgramLetterPage"
@@ -21,7 +20,6 @@ import Header from "@/page-components/Header/Header"
 import Footer from "@/page-components/Footer/Footer"
 import { Permissions } from "@/common/permissions"
 import SearchPage from "./pages/SearchPage/SearchPage"
-import UserListDetailsPage from "./pages/ListDetailsPage/UserListDetailsPage"
 import LearningPathDetailsPage from "./pages/ListDetailsPage/LearningPathDetailsPage"
 import LearningResourceDrawer from "./page-components/LearningResourceDrawer/LearningResourceDrawer"
 import DepartmentListingPage from "./pages/DepartmentListingPage/DepartmentListingPage"
@@ -84,10 +82,18 @@ const routes: RouteObject[] = [
         element: <LearningPathDetailsPage />,
       },
       {
-        path: urls.USERLIST_LISTING,
+        path: urls.DASHBOARD_HOME,
         element: (
           <RestrictedRoute requires={Permissions.Authenticated}>
-            <UserListListingPage />
+            <DashboardPage />
+          </RestrictedRoute>
+        ),
+      },
+      {
+        path: urls.MY_LISTS,
+        element: (
+          <RestrictedRoute requires={Permissions.Authenticated}>
+            <DashboardPage />
           </RestrictedRoute>
         ),
       },
@@ -95,12 +101,20 @@ const routes: RouteObject[] = [
         path: urls.USERLIST_VIEW,
         element: (
           <RestrictedRoute requires={Permissions.Authenticated}>
-            <UserListDetailsPage />
+            <DashboardPage />
+          </RestrictedRoute>
+        ),
+      },
+      {
+        path: urls.PROFILE,
+        element: (
+          <RestrictedRoute requires={Permissions.Authenticated}>
+            <DashboardPage />
           </RestrictedRoute>
         ),
       },
       {
-        path: urls.DASHBOARD,
+        path: urls.SETTINGS,
         element: (
           <RestrictedRoute requires={Permissions.Authenticated}>
             <DashboardPage />
diff --git a/frontends/ol-components/src/index.ts b/frontends/ol-components/src/index.ts
index da0757a32f..0ebac874ff 100644
--- a/frontends/ol-components/src/index.ts
+++ b/frontends/ol-components/src/index.ts
@@ -164,6 +164,7 @@ export * from "./components/Alert/Alert"
 export * from "./components/BannerPage/BannerPage"
 export * from "./components/Breadcrumbs/Breadcrumbs"
 export * from "./components/Card/Card"
+export * from "./components/Card/ListCardCondensed"
 export * from "./components/Carousel/Carousel"
 export * from "./components/Checkbox/Checkbox"
 export * from "./components/Checkbox/CheckboxChoiceField"

From d3a98113209bd8fbe7b6365027b306830a184212 Mon Sep 17 00:00:00 2001
From: Peter Pinch <pdpinch@mit.edu>
Date: Tue, 6 Aug 2024 08:53:04 -0400
Subject: [PATCH 03/17] add a bullet about collecting demographics to
 PrivacyPage.tsx (#1355)

---
 frontends/mit-open/src/pages/PrivacyPage/PrivacyPage.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontends/mit-open/src/pages/PrivacyPage/PrivacyPage.tsx b/frontends/mit-open/src/pages/PrivacyPage/PrivacyPage.tsx
index 0080d9aa38..f3eb87bc1d 100644
--- a/frontends/mit-open/src/pages/PrivacyPage/PrivacyPage.tsx
+++ b/frontends/mit-open/src/pages/PrivacyPage/PrivacyPage.tsx
@@ -87,6 +87,10 @@ const PrivacyPage: React.FC = () => {
               Biographic information – name, email address, education level and
               other demographic info
             </li>
+            <li>
+              Demographics and Interests - Affinity categories, Product Purchase
+              Interests, and Other Categories of interest
+            </li>
             <li>IP addresses</li>
             <li>Course progress and performance</li>
           </UnorderedList>

From 2465c64d4395da6a17b32ac72474cd5617bb1b4c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 09:36:13 -0400
Subject: [PATCH 04/17] Update dependency sentry-sdk to v2 [SECURITY] (#1366)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 poetry.lock    | 21 ++++++++++++---------
 pyproject.toml |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 3a7636411b..1ecdc4979b 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -3652,21 +3652,22 @@ doc = ["Sphinx", "sphinx-rtd-theme"]
 
 [[package]]
 name = "sentry-sdk"
-version = "1.45.1"
+version = "2.12.0"
 description = "Python client for Sentry (https://sentry.io)"
 optional = false
-python-versions = "*"
+python-versions = ">=3.6"
 files = [
-    {file = "sentry_sdk-1.45.1-py2.py3-none-any.whl", hash = "sha256:608887855ccfe39032bfd03936e3a1c4f4fc99b3a4ac49ced54a4220de61c9c1"},
-    {file = "sentry_sdk-1.45.1.tar.gz", hash = "sha256:a16c997c0f4e3df63c0fc5e4207ccb1ab37900433e0f72fef88315d317829a26"},
+    {file = "sentry_sdk-2.12.0-py2.py3-none-any.whl", hash = "sha256:7a8d5163d2ba5c5f4464628c6b68f85e86972f7c636acc78aed45c61b98b7a5e"},
+    {file = "sentry_sdk-2.12.0.tar.gz", hash = "sha256:8763840497b817d44c49b3fe3f5f7388d083f2337ffedf008b2cdb63b5c86dc6"},
 ]
 
 [package.dependencies]
 certifi = "*"
-urllib3 = {version = ">=1.26.11", markers = "python_version >= \"3.6\""}
+urllib3 = ">=1.26.11"
 
 [package.extras]
 aiohttp = ["aiohttp (>=3.5)"]
+anthropic = ["anthropic (>=0.16)"]
 arq = ["arq (>=0.23)"]
 asyncpg = ["asyncpg (>=0.23)"]
 beam = ["apache-beam (>=2.12)"]
@@ -3679,13 +3680,15 @@ django = ["django (>=1.8)"]
 falcon = ["falcon (>=1.4)"]
 fastapi = ["fastapi (>=0.79.0)"]
 flask = ["blinker (>=1.1)", "flask (>=0.11)", "markupsafe"]
-grpcio = ["grpcio (>=1.21.1)"]
+grpcio = ["grpcio (>=1.21.1)", "protobuf (>=3.8.0)"]
 httpx = ["httpx (>=0.16.0)"]
 huey = ["huey (>=2)"]
+huggingface-hub = ["huggingface-hub (>=0.22)"]
+langchain = ["langchain (>=0.0.210)"]
 loguru = ["loguru (>=0.5)"]
 openai = ["openai (>=1.0.0)", "tiktoken (>=0.3.0)"]
 opentelemetry = ["opentelemetry-distro (>=0.35b0)"]
-opentelemetry-experimental = ["opentelemetry-distro (>=0.40b0,<1.0)", "opentelemetry-instrumentation-aiohttp-client (>=0.40b0,<1.0)", "opentelemetry-instrumentation-django (>=0.40b0,<1.0)", "opentelemetry-instrumentation-fastapi (>=0.40b0,<1.0)", "opentelemetry-instrumentation-flask (>=0.40b0,<1.0)", "opentelemetry-instrumentation-requests (>=0.40b0,<1.0)", "opentelemetry-instrumentation-sqlite3 (>=0.40b0,<1.0)", "opentelemetry-instrumentation-urllib (>=0.40b0,<1.0)"]
+opentelemetry-experimental = ["opentelemetry-distro"]
 pure-eval = ["asttokens", "executing", "pure-eval"]
 pymongo = ["pymongo (>=3.1)"]
 pyspark = ["pyspark (>=2.4.4)"]
@@ -3695,7 +3698,7 @@ sanic = ["sanic (>=0.8)"]
 sqlalchemy = ["sqlalchemy (>=1.2)"]
 starlette = ["starlette (>=0.19.1)"]
 starlite = ["starlite (>=1.48)"]
-tornado = ["tornado (>=5)"]
+tornado = ["tornado (>=6)"]
 
 [[package]]
 name = "setuptools"
@@ -4251,4 +4254,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools",
 [metadata]
 lock-version = "2.0"
 python-versions = "3.12.4"
-content-hash = "5ebc43011f480317ecad1c132f568bb2a8a6793ab8240557f4664f9d66bbafd3"
+content-hash = "ec4224c6d1edce0866dfadfceb14347588d8dbc1d9416c6570941d57af1ac2cd"
diff --git a/pyproject.toml b/pyproject.toml
index b1af958e1c..49cbcd7a49 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -57,7 +57,7 @@ python-rapidjson = "^1.8"
 pyyaml = "^6.0.0"
 redis = "^4.5.5"
 requests = "^2.31.0"
-sentry-sdk = "^1.25.1"
+sentry-sdk = "^2.0.0"
 social-auth-app-django = "^5.2.0"
 static3 = "^0.7.0"
 tika = "^2.6.0"

From d0c2d9d4b8194f7ab04fe3a0b1c67c440a6196a4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 09:37:02 -0400
Subject: [PATCH 05/17] Migrate config renovate.json (#1367)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 renovate.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/renovate.json b/renovate.json
index dbdc7c5ee0..a4b6f06ba3 100644
--- a/renovate.json
+++ b/renovate.json
@@ -8,8 +8,8 @@
       "enabled": false
     },
     {
-      "matchSourceUrlPrefixes": ["https://github.com/ckeditor/ckeditor5/"],
-      "groupName": "ckeditor5"
+      "groupName": "ckeditor5",
+      "matchSourceUrls": ["https://github.com/ckeditor/ckeditor5/{/,}**"]
     }
   ]
 }

From 85616110a7756d1956b2abe2eaf043e8375cbe08 Mon Sep 17 00:00:00 2001
From: Chris Chudzicki <christopher.chudzicki@gmail.com>
Date: Tue, 6 Aug 2024 10:00:55 -0400
Subject: [PATCH 06/17] Fix frontend sentry configuration (#1362)

* replace frontend ENVIRONMENT var with SENTRY_ENV

* update github action workflows

* also set version for sentry

* allow undefined LOAD_ENV_FILES

* restore watch:docker

* remove erroneous node_env check

* fix webpack_analyze boolean
---
 .github/workflows/production.yml               |  5 +++++
 .github/workflows/release-candidate.yml        |  5 +++++
 frontends/mit-open/package.json                |  4 ++--
 frontends/mit-open/src/App.tsx                 |  2 +-
 frontends/mit-open/src/types/settings.d.ts     |  9 ---------
 frontends/mit-open/webpack.config.js           | 14 ++++++--------
 frontends/ol-utilities/src/types/settings.d.ts |  2 +-
 scripts/get_version.sh                         |  6 ++++++
 8 files changed, 26 insertions(+), 21 deletions(-)
 create mode 100755 scripts/get_version.sh

diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
index 40a20793bf..19ef0f23b3 100644
--- a/.github/workflows/production.yml
+++ b/.github/workflows/production.yml
@@ -31,6 +31,9 @@ jobs:
       - name: Install frontend dependencies
         run: yarn install --immutable
 
+      - name: Set VERSION
+        run: echo "VERSION=$(./scripts/get_version.sh)" >> $GITHUB_ENV
+
       - name: Build frontend
         run: NODE_ENV=production yarn build
         env:
@@ -40,6 +43,8 @@ jobs:
           POSTHOG_TIMEOUT_MS: 1000
           POSTHOG_PROJECT_ID: ${{ secrets.POSTHOG_PROJECT_ID_PROD }}
           POSTHOG_PROJECT_API_KEY: ${{ secrets.POSTHOG_PROJECT_API_KEY_PROD }}
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN_PROD }}
+          SENTRY_ENV: ${{ secrets.MITOPEN_ENV_PROD }}
           MITOPEN_AXIOS_WITH_CREDENTIALS: true
           MITOPEN_API_BASE_URL: https://api.mitopen.odl.mit.edu
           MITOPEN_SUPPORT_EMAIL: mitopen-support@mit.edu
diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
index 923d3e8cbf..572c957d38 100644
--- a/.github/workflows/release-candidate.yml
+++ b/.github/workflows/release-candidate.yml
@@ -31,6 +31,9 @@ jobs:
       - name: Install frontend dependencies
         run: yarn install --immutable
 
+      - name: Set VERSION
+        run: echo "VERSION=$(./scripts/get_version.sh)" >> $GITHUB_ENV
+
       - name: Build frontend
         run: NODE_ENV=production yarn build
         env:
@@ -40,6 +43,8 @@ jobs:
           POSTHOG_TIMEOUT_MS: 1000
           POSTHOG_PROJECT_ID: ${{ secrets.POSTHOG_PROJECT_ID_RC }}
           POSTHOG_PROJECT_API_KEY: ${{ secrets.POSTHOG_PROJECT_API_KEY_RC }}
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN_RC }}
+          SENTRY_ENV: ${{ secrets.MITOPEN_ENV_RC }}
           MITOPEN_AXIOS_WITH_CREDENTIALS: true
           MITOPEN_API_BASE_URL: https://api.mitopen-rc.odl.mit.edu
           MITOPEN_SUPPORT_EMAIL: odl-mitopen-rc-support@mit.edu
diff --git a/frontends/mit-open/package.json b/frontends/mit-open/package.json
index 5609eaf5e5..59112a5610 100644
--- a/frontends/mit-open/package.json
+++ b/frontends/mit-open/package.json
@@ -8,8 +8,8 @@
     "url": "https://github.com/mitodl/mit-open.git"
   },
   "scripts": {
-    "watch": "NODE_ENV=development ENVIRONMENT=local webpack serve",
-    "watch:docker": "NODE_ENV=development ENVIRONMENT=docker webpack serve",
+    "watch": "NODE_ENV=development LOAD_ENV_FILES=true webpack serve",
+    "watch:docker": "NODE_ENV=development webpack serve",
     "build": "webpack --config webpack.config.js --bail",
     "build-exports": "webpack --config webpack.exports.js --bail",
     "storybook": "storybook dev -p 6006",
diff --git a/frontends/mit-open/src/App.tsx b/frontends/mit-open/src/App.tsx
index 828a739c2d..11d4f43e26 100644
--- a/frontends/mit-open/src/App.tsx
+++ b/frontends/mit-open/src/App.tsx
@@ -10,7 +10,7 @@ import AppProviders from "./AppProviders"
 Sentry.init({
   dsn: APP_SETTINGS.SENTRY_DSN,
   release: APP_SETTINGS.VERSION,
-  environment: APP_SETTINGS.ENVIRONMENT,
+  environment: APP_SETTINGS.SENTRY_ENV,
 })
 
 const container = document.getElementById("app-container")
diff --git a/frontends/mit-open/src/types/settings.d.ts b/frontends/mit-open/src/types/settings.d.ts
index d5c99ea243..83da0d2a88 100644
--- a/frontends/mit-open/src/types/settings.d.ts
+++ b/frontends/mit-open/src/types/settings.d.ts
@@ -12,12 +12,3 @@ export type PostHogSettings = {
   timeout?: int
   bootstrap_flags?: Record<string, string | boolean>
 }
-
-export declare global {
-  const APP_SETTINGS: {
-    SENTRY_DSN?: string
-    VERSION?: string
-    ENVIRONMENT?: string
-    posthog?: PostHogSettings
-  }
-}
diff --git a/frontends/mit-open/webpack.config.js b/frontends/mit-open/webpack.config.js
index 63900495d2..3a1910404d 100644
--- a/frontends/mit-open/webpack.config.js
+++ b/frontends/mit-open/webpack.config.js
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 const path = require("path")
 
-if (process.env.ENVIRONMENT === "local") {
+if (process.env.LOAD_ENV_FILES?.toLowerCase() === "true") {
   console.info("Loading environment from .env files")
   require("dotenv").config({
     path: [
@@ -26,7 +26,6 @@ const ReactRefreshWebpackPlugin = require("@pmmmwh/react-refresh-webpack-plugin"
 const { cleanEnv, str, bool, port } = require("envalid")
 
 const {
-  ENVIRONMENT,
   NODE_ENV,
   PORT,
   VERSION,
@@ -41,10 +40,6 @@ const {
   CKEDITOR_UPLOAD_URL,
   SENTRY_DSN,
 } = cleanEnv(process.env, {
-  ENVIRONMENT: str({
-    choices: ["local", "docker", "production"],
-    default: "production",
-  }),
   NODE_ENV: str({
     choices: ["development", "production", "test"],
     default: "production",
@@ -94,6 +89,10 @@ const {
     desc: "Location of the CKEditor uploads handler",
     default: "",
   }),
+  SENTRY_ENV: str({
+    desc: "A label for the environment used for grouping errors in Sentry",
+    default: "",
+  }),
   SENTRY_DSN: str({
     desc: "Sentry Data Source Name",
     default: "",
@@ -216,7 +215,6 @@ module.exports = (env, argv) => {
           MITOPEN_API_BASE_URL: JSON.stringify(MITOPEN_API_BASE_URL),
           EMBEDLY_KEY: JSON.stringify(EMBEDLY_KEY),
           CKEDITOR_UPLOAD_URL: JSON.stringify(CKEDITOR_UPLOAD_URL),
-          ENVIRONMENT: JSON.stringify(ENVIRONMENT),
           VERSION: JSON.stringify(VERSION),
           SENTRY_DSN: JSON.stringify(SENTRY_DSN),
           POSTHOG: getPostHogSettings(),
@@ -238,7 +236,7 @@ module.exports = (env, argv) => {
           : [new ReactRefreshWebpackPlugin()],
       )
       .concat(
-        ENVIRONMENT !== "local" && WEBPACK_ANALYZE === "True"
+        WEBPACK_ANALYZE
           ? [
               new BundleAnalyzerPlugin({
                 analyzerMode: "static",
diff --git a/frontends/ol-utilities/src/types/settings.d.ts b/frontends/ol-utilities/src/types/settings.d.ts
index c07998375d..a5da5cd142 100644
--- a/frontends/ol-utilities/src/types/settings.d.ts
+++ b/frontends/ol-utilities/src/types/settings.d.ts
@@ -14,7 +14,7 @@ export declare global {
     CKEDITOR_UPLOAD_URL?: string
     SENTRY_DSN?: string
     VERSION?: string
-    ENVIRONMENT?: string
+    SENTRY_ENV?: string
     POSTHOG?: PostHogSettings
     SITE_NAME: string
     MITOPEN_SUPPORT_EMAIL: string
diff --git a/scripts/get_version.sh b/scripts/get_version.sh
new file mode 100755
index 0000000000..dae20c2e97
--- /dev/null
+++ b/scripts/get_version.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# Get VERSION from settings.py
+grep -Eo -m 1 'VERSION\s+= .*(\d+)\.\d+\.\d+.*' main/settings.py |
+	head -1 |
+	grep -Eo "\d+\.\d+\.\d+"

From fad72e6e80e1abe0020d7587a5558071976d2f99 Mon Sep 17 00:00:00 2001
From: James Kachel <james@jkachel.com>
Date: Tue, 6 Aug 2024 09:09:26 -0500
Subject: [PATCH 07/17] Update CI to check data migrations for conflicts
 (#1368)

---
 scripts/test/detect_missing_migrations.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/test/detect_missing_migrations.sh b/scripts/test/detect_missing_migrations.sh
index c1bc22bd1d..b1558047e9 100755
--- a/scripts/test/detect_missing_migrations.sh
+++ b/scripts/test/detect_missing_migrations.sh
@@ -9,7 +9,7 @@ fail() {
 	exit 1
 }
 
-poetry run python ./manage.py makemigrations --no-input --dry-run >&"$TMPFILE"
+RUN_DATA_MIGRATIONS=True poetry run python ./manage.py makemigrations --no-input --dry-run >&"$TMPFILE"
 if [[ $? -ne 0 ]]; then
 	# makemigrations has returned a non-zero for some reason, possibly
 	# because it needs input but --no-input is set

From 669199cad3ec2c28e6d31d726612d36bb78347ba Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 10:35:41 -0400
Subject: [PATCH 08/17] Update dependency django-anymail to v11 (#1207)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 poetry.lock    | 12 ++++++------
 pyproject.toml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 1ecdc4979b..3ad6d092ad 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -920,13 +920,13 @@ bcrypt = ["bcrypt"]
 
 [[package]]
 name = "django-anymail"
-version = "10.3"
-description = "Django email backends and webhooks for Amazon SES, Brevo (Sendinblue),     MailerSend, Mailgun, Mailjet, Mandrill, Postal, Postmark, Resend,     SendGrid, SparkPost and Unisender Go"
+version = "11.0.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.7"
 files = [
-    {file = "django_anymail-10.3-py3-none-any.whl", hash = "sha256:1e72f059e96930d3675d35fe4c61f82b138ae4a7fcb0337be39dcb4823f94a4f"},
-    {file = "django_anymail-10.3.tar.gz", hash = "sha256:35d8ec20b06000af3c1638492e32f416fd1a584f0a572cded03f1bc570169ed0"},
+    {file = "django_anymail-11.0.1-py3-none-any.whl", hash = "sha256:d8ebb641d304be873a5dcc3d5a6aa3ca1beb3a35a207d353cf24fd3c10ae57f2"},
+    {file = "django_anymail-11.0.1.tar.gz", hash = "sha256:eaa8a2166d173552607bb837ce3caaee827d1c68031e1245a5516e3b33baee71"},
 ]
 
 [package.dependencies]
@@ -935,7 +935,7 @@ requests = ">=2.4.3"
 urllib3 = ">=1.25.0"
 
 [package.extras]
-amazon-ses = ["boto3"]
+amazon-ses = ["boto3 (>=1.10.17)"]
 postal = ["cryptography"]
 resend = ["svix"]
 
@@ -4254,4 +4254,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools",
 [metadata]
 lock-version = "2.0"
 python-versions = "3.12.4"
-content-hash = "ec4224c6d1edce0866dfadfceb14347588d8dbc1d9416c6570941d57af1ac2cd"
+content-hash = "c42ce77de9f730dae95c37dbfd5a8e1f4f58a4354281bb2dd765814e63bb3355"
diff --git a/pyproject.toml b/pyproject.toml
index 49cbcd7a49..836234c492 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,7 +21,7 @@ cryptography = "^42.0.0"
 dj-database-url = "^2.0.0"
 dj-static = "^0.0.6"
 Django = "4.2.14"
-django-anymail = {extras = ["mailgun"], version = "^10.0"}
+django-anymail = {extras = ["mailgun"], version = "^11.0"}
 django-bitfield = "^2.2.0"
 django-cache-memoize = "^0.2.0"
 django-cors-headers = "^4.0.0"

From 1cafe674f1e43f7b83a65b1e5517681bbb2981eb Mon Sep 17 00:00:00 2001
From: Jon Kafton <939376+jonkafton@users.noreply.github.com>
Date: Tue, 6 Aug 2024 16:51:44 +0200
Subject: [PATCH 09/17] Fix issue with User List cards not updating on edit
 (#1361)

* Invalidate list query to update list view after mutation

* Cache invalidator for resources that belong to a user list

* Invalidate resource detail queries
---
 .../api/src/hooks/learningResources/index.ts  |  9 ++-
 .../src/hooks/learningResources/keyFactory.ts | 61 +++++++++++++++++++
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/frontends/api/src/hooks/learningResources/index.ts b/frontends/api/src/hooks/learningResources/index.ts
index 13b930754a..e2deba4a0c 100644
--- a/frontends/api/src/hooks/learningResources/index.ts
+++ b/frontends/api/src/hooks/learningResources/index.ts
@@ -32,6 +32,7 @@ import type {
 import learningResources, {
   invalidateResourceQueries,
   invalidateUserListQueries,
+  invalidateResourceWithUserListQueries,
   updateListParentsOnAdd,
   updateListParentsOnDestroy,
 } from "./keyFactory"
@@ -251,7 +252,10 @@ const useUserListUpdate = () => {
         PatchedUserListRequest: params,
       }),
     onSettled: (_data, _err, vars) => {
-      invalidateResourceQueries(queryClient, vars.id)
+      queryClient.invalidateQueries(learningResources.userlists._ctx.list._def)
+      queryClient.invalidateQueries(
+        learningResources.userlists._ctx.detail(vars.id).queryKey,
+      )
     },
   })
 }
@@ -262,7 +266,8 @@ const useUserListDestroy = () => {
     mutationFn: (params: ULDestroyRequest) =>
       userListsApi.userlistsDestroy(params),
     onSettled: (_data, _err, vars) => {
-      invalidateResourceQueries(queryClient, vars.id)
+      invalidateUserListQueries(queryClient, vars.id)
+      invalidateResourceWithUserListQueries(queryClient, vars.id)
     },
   })
 }
diff --git a/frontends/api/src/hooks/learningResources/keyFactory.ts b/frontends/api/src/hooks/learningResources/keyFactory.ts
index 774eb17f3e..d2fcf3f262 100644
--- a/frontends/api/src/hooks/learningResources/keyFactory.ts
+++ b/frontends/api/src/hooks/learningResources/keyFactory.ts
@@ -155,9 +155,35 @@ const listHasResource =
           (page: PaginatedLearningResourceList) => page.results,
         )
       : data.results
+
     return resources.some((res) => res.id === resourceId)
   }
 
+const resourcesHaveUserList =
+  (userListId: number) =>
+  (query: Query): boolean => {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const data = query.state.data as any
+    const resources: LearningResource[] = data.pages
+      ? data.pages.flatMap(
+          (page: PaginatedLearningResourceList) => page.results,
+        )
+      : data.results
+
+    return resources?.some((res) =>
+      res.user_list_parents?.some((userList) => userList.parent === userListId),
+    )
+  }
+
+const resourceHasUserList =
+  (userListId: number) =>
+  (query: Query): boolean => {
+    const data = query.state.data as LearningResource
+    return !!data.user_list_parents?.some(
+      (userList) => userList.parent === userListId,
+    )
+  }
+
 /**
  * Invalidate Resource queries that a specific resource appears in.
  *
@@ -202,6 +228,39 @@ const invalidateResourceQueries = (
   })
 }
 
+/**
+ * Invalidate Resource queries that a resource that belongs to user list appears in.
+ */
+const invalidateResourceWithUserListQueries = (
+  queryClient: QueryClient,
+  userListId: LearningResource["id"],
+) => {
+  /**
+   * Invalidate resource detail query for resource that is in the user list.
+   */
+  queryClient.invalidateQueries({
+    queryKey: learningResources.detail._def,
+    predicate: resourceHasUserList(userListId),
+  })
+
+  /**
+   * Invalidate lists with a resource that is in the user list.
+   */
+  const lists = [
+    learningResources.list._def,
+    learningResources.learningpaths._ctx.list._def,
+    learningResources.search._def,
+    learningResources.featured._def,
+  ]
+
+  lists.forEach((queryKey) => {
+    queryClient.invalidateQueries({
+      queryKey,
+      predicate: resourcesHaveUserList(userListId),
+    })
+  })
+}
+
 const invalidateUserListQueries = (
   queryClient: QueryClient,
   userListId: UserList["id"],
@@ -210,6 +269,7 @@ const invalidateUserListQueries = (
     learningResources.userlists._ctx.detail(userListId).queryKey,
   )
   const lists = [learningResources.userlists._ctx.list._def]
+
   lists.forEach((queryKey) => {
     queryClient.invalidateQueries({
       queryKey,
@@ -275,6 +335,7 @@ export default learningResources
 export {
   invalidateResourceQueries,
   invalidateUserListQueries,
+  invalidateResourceWithUserListQueries,
   updateListParentsOnAdd,
   updateListParentsOnDestroy,
 }

From 391e9ab99ed7b2abf6a54678c366cd6c918d10d2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 11:05:31 -0400
Subject: [PATCH 10/17] Update dependency opensearch-py to v2 (#1243)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 poetry.lock    | 38 ++++++++++++++++++++++++++------------
 pyproject.toml |  2 +-
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 3ad6d092ad..f7e236a08d 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1312,6 +1312,16 @@ uritemplate = ">=2.0.0"
 offline = ["drf-spectacular-sidecar"]
 sidecar = ["drf-spectacular-sidecar"]
 
+[[package]]
+name = "events"
+version = "0.5"
+description = "Bringing the elegance of C# EventHandler to Python"
+optional = false
+python-versions = "*"
+files = [
+    {file = "Events-0.5-py3-none-any.whl", hash = "sha256:a7286af378ba3e46640ac9825156c93bdba7502174dd696090fdfcd4d80a1abd"},
+]
+
 [[package]]
 name = "execnet"
 version = "2.1.1"
@@ -2282,24 +2292,28 @@ develop = ["coverage (<5.0.0)", "mock", "pytest (>=3.0.0)", "pytest-cov", "pytes
 
 [[package]]
 name = "opensearch-py"
-version = "1.1.0"
-description = "Python low-level client for OpenSearch"
+version = "2.6.0"
+description = "Python client for OpenSearch"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4"
+python-versions = "<4,>=3.8"
 files = [
-    {file = "opensearch-py-1.1.0.tar.gz", hash = "sha256:7d0c41cea61fedc34542be7fb9169931360134cf823c596f719106c3bd8466fe"},
-    {file = "opensearch_py-1.1.0-py2.py3-none-any.whl", hash = "sha256:cb573546fb373dac8091be9b8eac2ba8da277713eea4b50b4a49ccd30dec25f1"},
+    {file = "opensearch_py-2.6.0-py2.py3-none-any.whl", hash = "sha256:b6e78b685dd4e9c016d7a4299cf1de69e299c88322e3f81c716e6e23fe5683c1"},
+    {file = "opensearch_py-2.6.0.tar.gz", hash = "sha256:0b7c27e8ed84c03c99558406927b6161f186a72502ca6d0325413d8e5523ba96"},
 ]
 
 [package.dependencies]
-certifi = "*"
-urllib3 = ">=1.21.1,<2"
+certifi = ">=2022.12.07"
+Events = "*"
+python-dateutil = "*"
+requests = ">=2.4.0,<3.0.0"
+six = "*"
+urllib3 = {version = ">=1.26.18,<2.2.0 || >2.2.0,<3", markers = "python_version >= \"3.10\""}
 
 [package.extras]
-async = ["aiohttp (>=3,<4)"]
-develop = ["black", "botocore", "coverage", "jinja2", "mock", "myst-parser", "pytest", "pytest-cov", "pyyaml", "requests (>=2.0.0,<3.0.0)", "sphinx", "sphinx-copybutton", "sphinx-rtd-theme"]
-docs = ["myst-parser", "sphinx", "sphinx-copybutton", "sphinx-rtd-theme"]
-requests = ["requests (>=2.4.0,<3.0.0)"]
+async = ["aiohttp (>=3.9.4,<4)"]
+develop = ["black (>=24.3.0)", "botocore", "coverage (<8.0.0)", "jinja2", "mock", "myst-parser", "pytest (>=3.0.0)", "pytest-cov", "pytest-mock (<4.0.0)", "pytz", "pyyaml", "requests (>=2.0.0,<3.0.0)", "sphinx", "sphinx-copybutton", "sphinx-rtd-theme"]
+docs = ["aiohttp (>=3.9.4,<4)", "myst-parser", "sphinx", "sphinx-copybutton", "sphinx-rtd-theme"]
+kerberos = ["requests-kerberos"]
 
 [[package]]
 name = "packaging"
@@ -4254,4 +4268,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools",
 [metadata]
 lock-version = "2.0"
 python-versions = "3.12.4"
-content-hash = "c42ce77de9f730dae95c37dbfd5a8e1f4f58a4354281bb2dd765814e63bb3355"
+content-hash = "83c9b3192d97697f49a462dd31deb4589269b7001af791b4fd7a9682090b7889"
diff --git a/pyproject.toml b/pyproject.toml
index 836234c492..975b37f012 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -49,7 +49,7 @@ nested-lookup = "^0.2.25"
 newrelic = "^8.8.0"
 ocw-data-parser = "^0.35.1"
 opensearch-dsl = "^1.0.0"
-opensearch-py = "^1.0.0"
+opensearch-py = "^2.0.0"
 psycopg2 = "^2.9.6"
 pygithub = "^1.44.1"
 python-dateutil = "^2.8.2"

From 7aaaa4063fd7e0440e9387d73269922f318d9b3a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 11:29:23 -0400
Subject: [PATCH 11/17] Update dependency opensearch-dsl to v2 (#1242)

* Update dependency opensearch-dsl to v2

* updating poetry lock check command

* updating lockfile

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: shankar ambady <ambady@mit.edu>
---
 .github/workflows/ci.yml |   2 +-
 poetry.lock              | 320 +++++++++++++++++++++------------------
 pyproject.toml           |   2 +-
 3 files changed, 172 insertions(+), 152 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aa8e2b1cf7..b8a7f4df70 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,7 +62,7 @@ jobs:
           cache: "poetry"
 
       - name: Validate lockfile
-        run: poetry lock --check
+        run: poetry check --lock
 
       - name: Install dependencies
         run: poetry install --no-interaction
diff --git a/poetry.lock b/poetry.lock
index f7e236a08d..1b30d6b599 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -184,17 +184,17 @@ files = [
 
 [[package]]
 name = "boto3"
-version = "1.34.152"
+version = "1.34.154"
 description = "The AWS SDK for Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "boto3-1.34.152-py3-none-any.whl", hash = "sha256:92726a5be7083fd62585f8de251251ec7e53f4c7ee69c9c3168873fe979ec511"},
-    {file = "boto3-1.34.152.tar.gz", hash = "sha256:d34d7efe608b98cc10cfb43983bd2c511eb32efd5780ef72b171a3e3325462ff"},
+    {file = "boto3-1.34.154-py3-none-any.whl", hash = "sha256:7ca22adef4c77ee128e1e1dc7d48bc9512a87cc6fe3d771b3f913d5ecd41c057"},
+    {file = "boto3-1.34.154.tar.gz", hash = "sha256:864f06528c583dc7b02adf12db395ecfadbf9cb0da90e907e848ffb27128ce19"},
 ]
 
 [package.dependencies]
-botocore = ">=1.34.152,<1.35.0"
+botocore = ">=1.34.154,<1.35.0"
 jmespath = ">=0.7.1,<2.0.0"
 s3transfer = ">=0.10.0,<0.11.0"
 
@@ -203,13 +203,13 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]
 
 [[package]]
 name = "botocore"
-version = "1.34.152"
+version = "1.34.154"
 description = "Low-level, data-driven core of boto 3."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "botocore-1.34.152-py3-none-any.whl", hash = "sha256:e291e425e34e9fdcdf32d7c37fc099be057335b58cccabf5ee7c945322dbcd87"},
-    {file = "botocore-1.34.152.tar.gz", hash = "sha256:8531eb0f8d3b7913df8b32ca96d415d3187de8681e4ac908657803eacc87ac54"},
+    {file = "botocore-1.34.154-py3-none-any.whl", hash = "sha256:4eef4b1bb809b382ba9dc9c88f5fcc4a133f221a1acb693ee6bee4de9f325979"},
+    {file = "botocore-1.34.154.tar.gz", hash = "sha256:64d9b4c85a504d77cb56dabb2ad717cd8e1717424a88edb458b01d1e5797262a"},
 ]
 
 [package.dependencies]
@@ -603,63 +603,83 @@ files = [
 
 [[package]]
 name = "coverage"
-version = "7.6.0"
+version = "7.6.1"
 description = "Code coverage measurement for Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "coverage-7.6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:dff044f661f59dace805eedb4a7404c573b6ff0cdba4a524141bc63d7be5c7fd"},
-    {file = "coverage-7.6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a8659fd33ee9e6ca03950cfdcdf271d645cf681609153f218826dd9805ab585c"},
-    {file = "coverage-7.6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7792f0ab20df8071d669d929c75c97fecfa6bcab82c10ee4adb91c7a54055463"},
-    {file = "coverage-7.6.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d4b3cd1ca7cd73d229487fa5caca9e4bc1f0bca96526b922d61053ea751fe791"},
-    {file = "coverage-7.6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e7e128f85c0b419907d1f38e616c4f1e9f1d1b37a7949f44df9a73d5da5cd53c"},
-    {file = "coverage-7.6.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:a94925102c89247530ae1dab7dc02c690942566f22e189cbd53579b0693c0783"},
-    {file = "coverage-7.6.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:dcd070b5b585b50e6617e8972f3fbbee786afca71b1936ac06257f7e178f00f6"},
-    {file = "coverage-7.6.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:d50a252b23b9b4dfeefc1f663c568a221092cbaded20a05a11665d0dbec9b8fb"},
-    {file = "coverage-7.6.0-cp310-cp310-win32.whl", hash = "sha256:0e7b27d04131c46e6894f23a4ae186a6a2207209a05df5b6ad4caee6d54a222c"},
-    {file = "coverage-7.6.0-cp310-cp310-win_amd64.whl", hash = "sha256:54dece71673b3187c86226c3ca793c5f891f9fc3d8aa183f2e3653da18566169"},
-    {file = "coverage-7.6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c7b525ab52ce18c57ae232ba6f7010297a87ced82a2383b1afd238849c1ff933"},
-    {file = "coverage-7.6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4bea27c4269234e06f621f3fac3925f56ff34bc14521484b8f66a580aacc2e7d"},
-    {file = "coverage-7.6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ed8d1d1821ba5fc88d4a4f45387b65de52382fa3ef1f0115a4f7a20cdfab0e94"},
-    {file = "coverage-7.6.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:01c322ef2bbe15057bc4bf132b525b7e3f7206f071799eb8aa6ad1940bcf5fb1"},
-    {file = "coverage-7.6.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:03cafe82c1b32b770a29fd6de923625ccac3185a54a5e66606da26d105f37dac"},
-    {file = "coverage-7.6.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:0d1b923fc4a40c5832be4f35a5dab0e5ff89cddf83bb4174499e02ea089daf57"},
-    {file = "coverage-7.6.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:4b03741e70fb811d1a9a1d75355cf391f274ed85847f4b78e35459899f57af4d"},
-    {file = "coverage-7.6.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a73d18625f6a8a1cbb11eadc1d03929f9510f4131879288e3f7922097a429f63"},
-    {file = "coverage-7.6.0-cp311-cp311-win32.whl", hash = "sha256:65fa405b837060db569a61ec368b74688f429b32fa47a8929a7a2f9b47183713"},
-    {file = "coverage-7.6.0-cp311-cp311-win_amd64.whl", hash = "sha256:6379688fb4cfa921ae349c76eb1a9ab26b65f32b03d46bb0eed841fd4cb6afb1"},
-    {file = "coverage-7.6.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:f7db0b6ae1f96ae41afe626095149ecd1b212b424626175a6633c2999eaad45b"},
-    {file = "coverage-7.6.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:bbdf9a72403110a3bdae77948b8011f644571311c2fb35ee15f0f10a8fc082e8"},
-    {file = "coverage-7.6.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9cc44bf0315268e253bf563f3560e6c004efe38f76db03a1558274a6e04bf5d5"},
-    {file = "coverage-7.6.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:da8549d17489cd52f85a9829d0e1d91059359b3c54a26f28bec2c5d369524807"},
-    {file = "coverage-7.6.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0086cd4fc71b7d485ac93ca4239c8f75732c2ae3ba83f6be1c9be59d9e2c6382"},
-    {file = "coverage-7.6.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1fad32ee9b27350687035cb5fdf9145bc9cf0a094a9577d43e909948ebcfa27b"},
-    {file = "coverage-7.6.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:044a0985a4f25b335882b0966625270a8d9db3d3409ddc49a4eb00b0ef5e8cee"},
-    {file = "coverage-7.6.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:76d5f82213aa78098b9b964ea89de4617e70e0d43e97900c2778a50856dac605"},
-    {file = "coverage-7.6.0-cp312-cp312-win32.whl", hash = "sha256:3c59105f8d58ce500f348c5b56163a4113a440dad6daa2294b5052a10db866da"},
-    {file = "coverage-7.6.0-cp312-cp312-win_amd64.whl", hash = "sha256:ca5d79cfdae420a1d52bf177de4bc2289c321d6c961ae321503b2ca59c17ae67"},
-    {file = "coverage-7.6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d39bd10f0ae453554798b125d2f39884290c480f56e8a02ba7a6ed552005243b"},
-    {file = "coverage-7.6.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:beb08e8508e53a568811016e59f3234d29c2583f6b6e28572f0954a6b4f7e03d"},
-    {file = "coverage-7.6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b2e16f4cd2bc4d88ba30ca2d3bbf2f21f00f382cf4e1ce3b1ddc96c634bc48ca"},
-    {file = "coverage-7.6.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6616d1c9bf1e3faea78711ee42a8b972367d82ceae233ec0ac61cc7fec09fa6b"},
-    {file = "coverage-7.6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad4567d6c334c46046d1c4c20024de2a1c3abc626817ae21ae3da600f5779b44"},
-    {file = "coverage-7.6.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:d17c6a415d68cfe1091d3296ba5749d3d8696e42c37fca5d4860c5bf7b729f03"},
-    {file = "coverage-7.6.0-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:9146579352d7b5f6412735d0f203bbd8d00113a680b66565e205bc605ef81bc6"},
-    {file = "coverage-7.6.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:cdab02a0a941af190df8782aafc591ef3ad08824f97850b015c8c6a8b3877b0b"},
-    {file = "coverage-7.6.0-cp38-cp38-win32.whl", hash = "sha256:df423f351b162a702c053d5dddc0fc0ef9a9e27ea3f449781ace5f906b664428"},
-    {file = "coverage-7.6.0-cp38-cp38-win_amd64.whl", hash = "sha256:f2501d60d7497fd55e391f423f965bbe9e650e9ffc3c627d5f0ac516026000b8"},
-    {file = "coverage-7.6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7221f9ac9dad9492cecab6f676b3eaf9185141539d5c9689d13fd6b0d7de840c"},
-    {file = "coverage-7.6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ddaaa91bfc4477d2871442bbf30a125e8fe6b05da8a0015507bfbf4718228ab2"},
-    {file = "coverage-7.6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4cbe651f3904e28f3a55d6f371203049034b4ddbce65a54527a3f189ca3b390"},
-    {file = "coverage-7.6.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:831b476d79408ab6ccfadaaf199906c833f02fdb32c9ab907b1d4aa0713cfa3b"},
-    {file = "coverage-7.6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:46c3d091059ad0b9c59d1034de74a7f36dcfa7f6d3bde782c49deb42438f2450"},
-    {file = "coverage-7.6.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:4d5fae0a22dc86259dee66f2cc6c1d3e490c4a1214d7daa2a93d07491c5c04b6"},
-    {file = "coverage-7.6.0-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:07ed352205574aad067482e53dd606926afebcb5590653121063fbf4e2175166"},
-    {file = "coverage-7.6.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:49c76cdfa13015c4560702574bad67f0e15ca5a2872c6a125f6327ead2b731dd"},
-    {file = "coverage-7.6.0-cp39-cp39-win32.whl", hash = "sha256:482855914928c8175735a2a59c8dc5806cf7d8f032e4820d52e845d1f731dca2"},
-    {file = "coverage-7.6.0-cp39-cp39-win_amd64.whl", hash = "sha256:543ef9179bc55edfd895154a51792b01c017c87af0ebaae092720152e19e42ca"},
-    {file = "coverage-7.6.0-pp38.pp39.pp310-none-any.whl", hash = "sha256:6fe885135c8a479d3e37a7aae61cbd3a0fb2deccb4dda3c25f92a49189f766d6"},
-    {file = "coverage-7.6.0.tar.gz", hash = "sha256:289cc803fa1dc901f84701ac10c9ee873619320f2f9aff38794db4a4a0268d51"},
+    {file = "coverage-7.6.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b06079abebbc0e89e6163b8e8f0e16270124c154dc6e4a47b413dd538859af16"},
+    {file = "coverage-7.6.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:cf4b19715bccd7ee27b6b120e7e9dd56037b9c0681dcc1adc9ba9db3d417fa36"},
+    {file = "coverage-7.6.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e61c0abb4c85b095a784ef23fdd4aede7a2628478e7baba7c5e3deba61070a02"},
+    {file = "coverage-7.6.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fd21f6ae3f08b41004dfb433fa895d858f3f5979e7762d052b12aef444e29afc"},
+    {file = "coverage-7.6.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f59d57baca39b32db42b83b2a7ba6f47ad9c394ec2076b084c3f029b7afca23"},
+    {file = "coverage-7.6.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:a1ac0ae2b8bd743b88ed0502544847c3053d7171a3cff9228af618a068ed9c34"},
+    {file = "coverage-7.6.1-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:e6a08c0be454c3b3beb105c0596ebdc2371fab6bb90c0c0297f4e58fd7e1012c"},
+    {file = "coverage-7.6.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:f5796e664fe802da4f57a168c85359a8fbf3eab5e55cd4e4569fbacecc903959"},
+    {file = "coverage-7.6.1-cp310-cp310-win32.whl", hash = "sha256:7bb65125fcbef8d989fa1dd0e8a060999497629ca5b0efbca209588a73356232"},
+    {file = "coverage-7.6.1-cp310-cp310-win_amd64.whl", hash = "sha256:3115a95daa9bdba70aea750db7b96b37259a81a709223c8448fa97727d546fe0"},
+    {file = "coverage-7.6.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:7dea0889685db8550f839fa202744652e87c60015029ce3f60e006f8c4462c93"},
+    {file = "coverage-7.6.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ed37bd3c3b063412f7620464a9ac1314d33100329f39799255fb8d3027da50d3"},
+    {file = "coverage-7.6.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d85f5e9a5f8b73e2350097c3756ef7e785f55bd71205defa0bfdaf96c31616ff"},
+    {file = "coverage-7.6.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9bc572be474cafb617672c43fe989d6e48d3c83af02ce8de73fff1c6bb3c198d"},
+    {file = "coverage-7.6.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0c0420b573964c760df9e9e86d1a9a622d0d27f417e1a949a8a66dd7bcee7bc6"},
+    {file = "coverage-7.6.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:1f4aa8219db826ce6be7099d559f8ec311549bfc4046f7f9fe9b5cea5c581c56"},
+    {file = "coverage-7.6.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:fc5a77d0c516700ebad189b587de289a20a78324bc54baee03dd486f0855d234"},
+    {file = "coverage-7.6.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b48f312cca9621272ae49008c7f613337c53fadca647d6384cc129d2996d1133"},
+    {file = "coverage-7.6.1-cp311-cp311-win32.whl", hash = "sha256:1125ca0e5fd475cbbba3bb67ae20bd2c23a98fac4e32412883f9bcbaa81c314c"},
+    {file = "coverage-7.6.1-cp311-cp311-win_amd64.whl", hash = "sha256:8ae539519c4c040c5ffd0632784e21b2f03fc1340752af711f33e5be83a9d6c6"},
+    {file = "coverage-7.6.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:95cae0efeb032af8458fc27d191f85d1717b1d4e49f7cb226cf526ff28179778"},
+    {file = "coverage-7.6.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:5621a9175cf9d0b0c84c2ef2b12e9f5f5071357c4d2ea6ca1cf01814f45d2391"},
+    {file = "coverage-7.6.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:260933720fdcd75340e7dbe9060655aff3af1f0c5d20f46b57f262ab6c86a5e8"},
+    {file = "coverage-7.6.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:07e2ca0ad381b91350c0ed49d52699b625aab2b44b65e1b4e02fa9df0e92ad2d"},
+    {file = "coverage-7.6.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c44fee9975f04b33331cb8eb272827111efc8930cfd582e0320613263ca849ca"},
+    {file = "coverage-7.6.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:877abb17e6339d96bf08e7a622d05095e72b71f8afd8a9fefc82cf30ed944163"},
+    {file = "coverage-7.6.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:3e0cadcf6733c09154b461f1ca72d5416635e5e4ec4e536192180d34ec160f8a"},
+    {file = "coverage-7.6.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c3c02d12f837d9683e5ab2f3d9844dc57655b92c74e286c262e0fc54213c216d"},
+    {file = "coverage-7.6.1-cp312-cp312-win32.whl", hash = "sha256:e05882b70b87a18d937ca6768ff33cc3f72847cbc4de4491c8e73880766718e5"},
+    {file = "coverage-7.6.1-cp312-cp312-win_amd64.whl", hash = "sha256:b5d7b556859dd85f3a541db6a4e0167b86e7273e1cdc973e5b175166bb634fdb"},
+    {file = "coverage-7.6.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:a4acd025ecc06185ba2b801f2de85546e0b8ac787cf9d3b06e7e2a69f925b106"},
+    {file = "coverage-7.6.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a6d3adcf24b624a7b778533480e32434a39ad8fa30c315208f6d3e5542aeb6e9"},
+    {file = "coverage-7.6.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d0c212c49b6c10e6951362f7c6df3329f04c2b1c28499563d4035d964ab8e08c"},
+    {file = "coverage-7.6.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6e81d7a3e58882450ec4186ca59a3f20a5d4440f25b1cff6f0902ad890e6748a"},
+    {file = "coverage-7.6.1-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:78b260de9790fd81e69401c2dc8b17da47c8038176a79092a89cb2b7d945d060"},
+    {file = "coverage-7.6.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a78d169acd38300060b28d600344a803628c3fd585c912cacc9ea8790fe96862"},
+    {file = "coverage-7.6.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:2c09f4ce52cb99dd7505cd0fc8e0e37c77b87f46bc9c1eb03fe3bc9991085388"},
+    {file = "coverage-7.6.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6878ef48d4227aace338d88c48738a4258213cd7b74fd9a3d4d7582bb1d8a155"},
+    {file = "coverage-7.6.1-cp313-cp313-win32.whl", hash = "sha256:44df346d5215a8c0e360307d46ffaabe0f5d3502c8a1cefd700b34baf31d411a"},
+    {file = "coverage-7.6.1-cp313-cp313-win_amd64.whl", hash = "sha256:8284cf8c0dd272a247bc154eb6c95548722dce90d098c17a883ed36e67cdb129"},
+    {file = "coverage-7.6.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:d3296782ca4eab572a1a4eca686d8bfb00226300dcefdf43faa25b5242ab8a3e"},
+    {file = "coverage-7.6.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:502753043567491d3ff6d08629270127e0c31d4184c4c8d98f92c26f65019962"},
+    {file = "coverage-7.6.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6a89ecca80709d4076b95f89f308544ec8f7b4727e8a547913a35f16717856cb"},
+    {file = "coverage-7.6.1-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a318d68e92e80af8b00fa99609796fdbcdfef3629c77c6283566c6f02c6d6704"},
+    {file = "coverage-7.6.1-cp313-cp313t-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:13b0a73a0896988f053e4fbb7de6d93388e6dd292b0d87ee51d106f2c11b465b"},
+    {file = "coverage-7.6.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:4421712dbfc5562150f7554f13dde997a2e932a6b5f352edcce948a815efee6f"},
+    {file = "coverage-7.6.1-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:166811d20dfea725e2e4baa71fffd6c968a958577848d2131f39b60043400223"},
+    {file = "coverage-7.6.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:225667980479a17db1048cb2bf8bfb39b8e5be8f164b8f6628b64f78a72cf9d3"},
+    {file = "coverage-7.6.1-cp313-cp313t-win32.whl", hash = "sha256:170d444ab405852903b7d04ea9ae9b98f98ab6d7e63e1115e82620807519797f"},
+    {file = "coverage-7.6.1-cp313-cp313t-win_amd64.whl", hash = "sha256:b9f222de8cded79c49bf184bdbc06630d4c58eec9459b939b4a690c82ed05657"},
+    {file = "coverage-7.6.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6db04803b6c7291985a761004e9060b2bca08da6d04f26a7f2294b8623a0c1a0"},
+    {file = "coverage-7.6.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f1adfc8ac319e1a348af294106bc6a8458a0f1633cc62a1446aebc30c5fa186a"},
+    {file = "coverage-7.6.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a95324a9de9650a729239daea117df21f4b9868ce32e63f8b650ebe6cef5595b"},
+    {file = "coverage-7.6.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b43c03669dc4618ec25270b06ecd3ee4fa94c7f9b3c14bae6571ca00ef98b0d3"},
+    {file = "coverage-7.6.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8929543a7192c13d177b770008bc4e8119f2e1f881d563fc6b6305d2d0ebe9de"},
+    {file = "coverage-7.6.1-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:a09ece4a69cf399510c8ab25e0950d9cf2b42f7b3cb0374f95d2e2ff594478a6"},
+    {file = "coverage-7.6.1-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:9054a0754de38d9dbd01a46621636689124d666bad1936d76c0341f7d71bf569"},
+    {file = "coverage-7.6.1-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:0dbde0f4aa9a16fa4d754356a8f2e36296ff4d83994b2c9d8398aa32f222f989"},
+    {file = "coverage-7.6.1-cp38-cp38-win32.whl", hash = "sha256:da511e6ad4f7323ee5702e6633085fb76c2f893aaf8ce4c51a0ba4fc07580ea7"},
+    {file = "coverage-7.6.1-cp38-cp38-win_amd64.whl", hash = "sha256:3f1156e3e8f2872197af3840d8ad307a9dd18e615dc64d9ee41696f287c57ad8"},
+    {file = "coverage-7.6.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:abd5fd0db5f4dc9289408aaf34908072f805ff7792632250dcb36dc591d24255"},
+    {file = "coverage-7.6.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:547f45fa1a93154bd82050a7f3cddbc1a7a4dd2a9bf5cb7d06f4ae29fe94eaf8"},
+    {file = "coverage-7.6.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:645786266c8f18a931b65bfcefdbf6952dd0dea98feee39bd188607a9d307ed2"},
+    {file = "coverage-7.6.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9e0b2df163b8ed01d515807af24f63de04bebcecbd6c3bfeff88385789fdf75a"},
+    {file = "coverage-7.6.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:609b06f178fe8e9f89ef676532760ec0b4deea15e9969bf754b37f7c40326dbc"},
+    {file = "coverage-7.6.1-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:702855feff378050ae4f741045e19a32d57d19f3e0676d589df0575008ea5004"},
+    {file = "coverage-7.6.1-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:2bdb062ea438f22d99cba0d7829c2ef0af1d768d1e4a4f528087224c90b132cb"},
+    {file = "coverage-7.6.1-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:9c56863d44bd1c4fe2abb8a4d6f5371d197f1ac0ebdee542f07f35895fc07f36"},
+    {file = "coverage-7.6.1-cp39-cp39-win32.whl", hash = "sha256:6e2cd258d7d927d09493c8df1ce9174ad01b381d4729a9d8d4e38670ca24774c"},
+    {file = "coverage-7.6.1-cp39-cp39-win_amd64.whl", hash = "sha256:06a737c882bd26d0d6ee7269b20b12f14a8704807a01056c80bb881a4b2ce6ca"},
+    {file = "coverage-7.6.1-pp38.pp39.pp310-none-any.whl", hash = "sha256:e9a6e0eb86070e8ccaedfbd9d38fec54864f3125ab95419970575b42af7541df"},
+    {file = "coverage-7.6.1.tar.gz", hash = "sha256:953510dfb7b12ab69d20135a0662397f077c59b1e6379a768e97c59d852ee51d"},
 ]
 
 [package.extras]
@@ -1854,28 +1874,28 @@ typing-extensions = ">=4.5.0"
 
 [[package]]
 name = "kombu"
-version = "5.3.7"
+version = "5.4.0"
 description = "Messaging library for Python."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "kombu-5.3.7-py3-none-any.whl", hash = "sha256:5634c511926309c7f9789f1433e9ed402616b56836ef9878f01bd59267b4c7a9"},
-    {file = "kombu-5.3.7.tar.gz", hash = "sha256:011c4cd9a355c14a1de8d35d257314a1d2456d52b7140388561acac3cf1a97bf"},
+    {file = "kombu-5.4.0-py3-none-any.whl", hash = "sha256:c8dd99820467610b4febbc7a9e8a0d3d7da2d35116b67184418b51cc520ea6b6"},
+    {file = "kombu-5.4.0.tar.gz", hash = "sha256:ad200a8dbdaaa2bbc5f26d2ee7d707d9a1fded353a0f4bd751ce8c7d9f449c60"},
 ]
 
 [package.dependencies]
 amqp = ">=5.1.1,<6.0.0"
-vine = "*"
+vine = "5.1.0"
 
 [package.extras]
 azureservicebus = ["azure-servicebus (>=7.10.0)"]
 azurestoragequeues = ["azure-identity (>=1.12.0)", "azure-storage-queue (>=12.6.0)"]
 confluentkafka = ["confluent-kafka (>=2.2.0)"]
-consul = ["python-consul2"]
+consul = ["python-consul2 (==0.1.5)"]
 librabbitmq = ["librabbitmq (>=2.0.0)"]
 mongodb = ["pymongo (>=4.1.1)"]
-msgpack = ["msgpack"]
-pyro = ["pyro4"]
+msgpack = ["msgpack (==1.0.8)"]
+pyro = ["pyro4 (==4.82)"]
 qpid = ["qpid-python (>=0.26)", "qpid-tools (>=0.26)"]
 redis = ["redis (>=4.5.2,!=4.5.5,!=5.0.2)"]
 slmq = ["softlayer-messaging (>=1.0.3)"]
@@ -2273,22 +2293,22 @@ webvtt-py = "0.4.6"
 
 [[package]]
 name = "opensearch-dsl"
-version = "1.0.0"
+version = "2.1.0"
 description = "Python client for OpenSearch"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 files = [
-    {file = "opensearch-dsl-1.0.0.tar.gz", hash = "sha256:745fd4b05934b764f3ebca0dd9b1e7bd9b5934fcbb6c620d7087d24bcc8241c7"},
-    {file = "opensearch_dsl-1.0.0-py2.py3-none-any.whl", hash = "sha256:aee9199b3fee8a572bc476e22be44d8acafbef8f1b777a51fac898623f125b56"},
+    {file = "opensearch-dsl-2.1.0.tar.gz", hash = "sha256:e54ad0d754358233503e0c08e85b77dbe07d6c00babeae62c81d8cee11965ae6"},
+    {file = "opensearch_dsl-2.1.0-py2.py3-none-any.whl", hash = "sha256:31559b738b48ed5abe87b357205a040fa1dc64042a6454ad2d6854050d911ba0"},
 ]
 
 [package.dependencies]
-opensearch-py = ">=1.0.0"
+opensearch-py = ">=2.2.0"
 python-dateutil = "*"
 six = "*"
 
 [package.extras]
-develop = ["coverage (<5.0.0)", "mock", "pytest (>=3.0.0)", "pytest-cov", "pytest-mock (<3.0.0)", "pytz", "sphinx", "sphinx-rtd-theme"]
+develop = ["coverage (<7.0.0)", "mock", "pytest (>=3.0.0)", "pytest-cov", "pytest-mock (<4.0.0)", "pytz", "sphinx", "sphinx-rtd-theme"]
 
 [[package]]
 name = "opensearch-py"
@@ -2678,13 +2698,13 @@ pyasn1 = ">=0.4.6,<0.7.0"
 
 [[package]]
 name = "pycodestyle"
-version = "2.12.0"
+version = "2.12.1"
 description = "Python style guide checker"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pycodestyle-2.12.0-py2.py3-none-any.whl", hash = "sha256:949a39f6b86c3e1515ba1787c2022131d165a8ad271b11370a8819aa070269e4"},
-    {file = "pycodestyle-2.12.0.tar.gz", hash = "sha256:442f950141b4f43df752dd303511ffded3a04c2b6fb7f65980574f0c31e6e79c"},
+    {file = "pycodestyle-2.12.1-py2.py3-none-any.whl", hash = "sha256:46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3"},
+    {file = "pycodestyle-2.12.1.tar.gz", hash = "sha256:6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521"},
 ]
 
 [[package]]
@@ -2979,84 +2999,84 @@ dev = ["coverage[toml]", "coveralls (>=3.3,<4.0)", "ruff", "twine"]
 
 [[package]]
 name = "python-rapidjson"
-version = "1.19"
+version = "1.20"
 description = "Python wrapper around rapidjson"
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "python-rapidjson-1.19.tar.gz", hash = "sha256:81e7260f6297cad564389b700783c0a33de71310b9eb01fd013faec5e7ed4eff"},
-    {file = "python_rapidjson-1.19-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:502a75de40d1017b1186d053e578c14705779d45346384c6ce6e574b5ad902ff"},
-    {file = "python_rapidjson-1.19-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:1b127a32716b0c51832e6f6144d84cfccc92c52ef9ae135216e4e9c3a2441526"},
-    {file = "python_rapidjson-1.19-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7fcf32bee3e9398f993e02c7092a882901a45b3742047ae2d66c4351c17e6072"},
-    {file = "python_rapidjson-1.19-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:61fc606c9081221be80a764e039c4a656576ff1552bb66e5ee9e371ba0e9c3af"},
-    {file = "python_rapidjson-1.19-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dc4da66169d8bcc29b98018372f53897c9b29db839efeac309efd83a15648c06"},
-    {file = "python_rapidjson-1.19-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:55a3078a2e8bf6221b9a8534d7e9a2bbc26cbbaccf1abfd8d7f29cc858e3e4d1"},
-    {file = "python_rapidjson-1.19-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:99365e557acf7359e37dd24fde69a8875c1bb36c410768a4bb5cd91dc95de7d1"},
-    {file = "python_rapidjson-1.19-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:d93e27c076544f43a80477a544127a71973185ec3714b7e863e7ae026928098c"},
-    {file = "python_rapidjson-1.19-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:d5cdb5a5897f7530ec4913a7e8b9c9afbaba8f7b6b7c57d16cd4f0ec85b73144"},
-    {file = "python_rapidjson-1.19-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:aaf8191e462ea7b1d03ce92cb06e92aca6d528d2f086fe3608190479dc6fcbd3"},
-    {file = "python_rapidjson-1.19-cp310-cp310-win32.whl", hash = "sha256:b9e0c2a7f2ce6bde52506b5642409c80dbf23d1d72b038c2a0ac5bdd9238b285"},
-    {file = "python_rapidjson-1.19-cp310-cp310-win_amd64.whl", hash = "sha256:734700aff62cc44e0f021424701a21c4cf9015133fdff3235cad429bcfbdd91c"},
-    {file = "python_rapidjson-1.19-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:aca001bf35111fde8bd205b0fb34a7f3738e311e4e39d0f982712f2480e9562e"},
-    {file = "python_rapidjson-1.19-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b0752de4b7b910d0f27cff952d06819ce9701dd1fdbf87bc4c5d9375d4071350"},
-    {file = "python_rapidjson-1.19-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d43a2bf7d5c478370f80c6eb4b3f2c5ec290e7693721fb2111cb0c16fd541627"},
-    {file = "python_rapidjson-1.19-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a0cc082785fa75e16cceaa77ac1be9698b8cd52a99e41542ceee015a2789ddfd"},
-    {file = "python_rapidjson-1.19-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:527811d587e449fbc3e7f91f1915ccedf086d62c500b8f72798de6f0da09c519"},
-    {file = "python_rapidjson-1.19-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ad91f9a681273143ddf09c01c61d72d4e20bff5a01d6366a015c6127296e7ef0"},
-    {file = "python_rapidjson-1.19-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:ea4747e953dc01f6602cfa51904313eec989ffc833f6d00867049227d1682b29"},
-    {file = "python_rapidjson-1.19-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:de894855de115d7d62b678fcd2cdb8b0dc5c7eeee545771e61da94159d4ee28f"},
-    {file = "python_rapidjson-1.19-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:6613ce556beaa92a00ebd2c31aa0281311a75b311015efdde5078252f1cf410c"},
-    {file = "python_rapidjson-1.19-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:0896ea35c08a34e2c1876605875964a5c34a1a96349c3fd4eeae7b74bc77fee1"},
-    {file = "python_rapidjson-1.19-cp311-cp311-win32.whl", hash = "sha256:d9d7bfdeae37fc39effc6ecda47ef9fbd4dd3b36d4fb3bb99c095247ef74991c"},
-    {file = "python_rapidjson-1.19-cp311-cp311-win_amd64.whl", hash = "sha256:372dc9b7c7b4f88163e71d3aaa9cb641e4ef7e8014fd63d2996587045015d182"},
-    {file = "python_rapidjson-1.19-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:c4877a5a220b789918472cd1128863b71c4f261ccdb6799781252ae260a00907"},
-    {file = "python_rapidjson-1.19-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b19c116464d2d060ed0538f7b6d95e93bf193a0a8f3a6e936906763ac2369b25"},
-    {file = "python_rapidjson-1.19-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:251beaacff761972119804c782cdaa0066009c08afcaaea859a8a3787f66b96c"},
-    {file = "python_rapidjson-1.19-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:69782c98151e7ec41d7ac53e6b52202d1a83a058b7c9392f6452e384592a035f"},
-    {file = "python_rapidjson-1.19-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a87e94ec466fa1947fab743ae7382ac552b916b61a0975e2cc4342a7aa54d93c"},
-    {file = "python_rapidjson-1.19-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2de86e88ed1fd1e4e7b6d041d9528c520a19ff8b2d043e147b2259d37a734bac"},
-    {file = "python_rapidjson-1.19-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:6767c36981706de57d1ef631877978c83d8d4e360b4818d4be460bc01c861c49"},
-    {file = "python_rapidjson-1.19-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:6dcfa35562efe52e5a67889367efafc4788c9cbddd98e9d66d617ecf4258513b"},
-    {file = "python_rapidjson-1.19-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:9c93091602615b156d11abeb0afdbf97e085f158bc9bfad78eba4f4578258f64"},
-    {file = "python_rapidjson-1.19-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:a00e9d1acefc7ef81b736515565437c50e585924daa29ae93dc3f411d95459b5"},
-    {file = "python_rapidjson-1.19-cp312-cp312-win32.whl", hash = "sha256:667c476ab2d8687b8856002179d6cf1cd8b60d4bd72a1a1ea68a8abf1a54c2c3"},
-    {file = "python_rapidjson-1.19-cp312-cp312-win_amd64.whl", hash = "sha256:9ef8e63e29337aa9810c9c5a48998966b1c1fa3b80e22b1d6eb5eb4a204b1b35"},
-    {file = "python_rapidjson-1.19-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:5a3ec3ec21ef634224d7e9504434a6d38e060136ba2ddbb4b68fae2723839ae9"},
-    {file = "python_rapidjson-1.19-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:67bc34cd388e2eefac213107f886987b667522f786bfe5c36c0cb927531f5fe4"},
-    {file = "python_rapidjson-1.19-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22b5b5d81e496ce4d18f0f6338efce6e8f654a675078408072be381c67d88a13"},
-    {file = "python_rapidjson-1.19-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2762e75ab44276fc013cd7e17480c6f34f6f5c18f1b2d16d6988ede5aca07696"},
-    {file = "python_rapidjson-1.19-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:00d3dc74e9e3ff249606ec9b7f04f1af1dcb6f5ef4d750211a1f449e5b93f665"},
-    {file = "python_rapidjson-1.19-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:44eede32b8b0ac87d65998133b40df701c2fe0df87f9e48a781a5914e5bce084"},
-    {file = "python_rapidjson-1.19-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:39d74f406425809c9d2a5874f893c6f89eae22d9069ce78df48510094dff5bef"},
-    {file = "python_rapidjson-1.19-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:90cdca111664934bde5da1b52258a78f79371dfbc2bdb04424f65e50c0e54260"},
-    {file = "python_rapidjson-1.19-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:64d8299e1c240841c52b06d6f54b52dcf26f79d6d16dcca67b4967deeb9066fc"},
-    {file = "python_rapidjson-1.19-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:bb5c9346d08eac7dba62a77cfa732cc403ff8623a26c42c0d5ee65eb8b85172c"},
-    {file = "python_rapidjson-1.19-cp313-cp313-win32.whl", hash = "sha256:de9ca1dbb3becf8e6b86f475a0dcb109b84e6dd17574a96c11af0f0d02a926f1"},
-    {file = "python_rapidjson-1.19-cp313-cp313-win_amd64.whl", hash = "sha256:f03d637909b6de3b4b1a1eaa8129e677bfafa0a8266b69bf06c75b6ceb9dd0b9"},
-    {file = "python_rapidjson-1.19-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8f6fee549664b0dae09d04d186911b4e8b00b5654e2a98ceb21d253af88f1051"},
-    {file = "python_rapidjson-1.19-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:94f3ccfae2fef8237dfe907fee319c2ce13156a178c12ee3cd31420ffeb36dac"},
-    {file = "python_rapidjson-1.19-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:10e5571c6c72fe3a8021a3763c0bbc8ab576c04f0d90c4741dd7ca25cab82d97"},
-    {file = "python_rapidjson-1.19-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:59a7369a2710473228af495109fc15be2933ea10e8b8108ebda0d62ddc4db9b2"},
-    {file = "python_rapidjson-1.19-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9dd9904f1001581954b0c2fae3c3d9157ae42e17533f7574a902ba93a0b43420"},
-    {file = "python_rapidjson-1.19-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:33452cff20a8c3902ca6334c6d134346af394b554f206d6d0a9db869cece150c"},
-    {file = "python_rapidjson-1.19-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:d39d98014670c5ab5ebacca90d8adf5f36cfac661cda752bd2e50d3ab01918fe"},
-    {file = "python_rapidjson-1.19-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:c8492c0eb296981430ee7486fe3b76d672778f21f06b3e4aeb6b55ea6c42b04b"},
-    {file = "python_rapidjson-1.19-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:a2aff6b0df99d8132fb91f1b99dad701a95a939688441204789c310950ace288"},
-    {file = "python_rapidjson-1.19-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:38a3f6bb327b18da21261247f679d9e59d13de6b40001d7521bc5c04dd3ff9a5"},
-    {file = "python_rapidjson-1.19-cp38-cp38-win32.whl", hash = "sha256:0c7d371c43fdee9f1ff12403db5557ce5957531a85e5cde62f9bfea0b9d4e35a"},
-    {file = "python_rapidjson-1.19-cp38-cp38-win_amd64.whl", hash = "sha256:1e9cd1ad2fe48f09a12aa1b2e796180ce9facbca6aa2827834aff719cd59dade"},
-    {file = "python_rapidjson-1.19-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:37168a1b540ede9b4aa29210b38e792c453a62ecb95400330aa18c434ea7f619"},
-    {file = "python_rapidjson-1.19-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1836ab42e5ca6d406c0cbd91ce624b3c93fe0d928d601874e78509a9250765c2"},
-    {file = "python_rapidjson-1.19-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f0c87496896b7d17bc0124d06e2600c89fab73ac66da5dffb3734d1fef65227d"},
-    {file = "python_rapidjson-1.19-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a96bcb24efb302c0a014c443f639723c374c8c30fd34d77edca9b4727ed261e2"},
-    {file = "python_rapidjson-1.19-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:93b7b7867827f4fe09eb8d3fb579ed412c011ee513ddbe7406b7e40a783f5e9a"},
-    {file = "python_rapidjson-1.19-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f3d9219dbfb7eaf0ed5e7198f81301d3898554efe57424ae665e75ede1029e75"},
-    {file = "python_rapidjson-1.19-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:59a7a94128b8fbe668e10895aab19973e424e8a1cb09a383b728d9ac569a64fc"},
-    {file = "python_rapidjson-1.19-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:9a9d0d56135943891a8dc0043442166444989176c48e84bacd93feef6b1bd152"},
-    {file = "python_rapidjson-1.19-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:1940d51622ea462854d353ff6c2ea2cfd3307a750ca497113b1854200ed31f30"},
-    {file = "python_rapidjson-1.19-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:da0ed5bdab1dc34f4e08d1d66f672a845d3c0391073bfb3fe193430d3d406667"},
-    {file = "python_rapidjson-1.19-cp39-cp39-win32.whl", hash = "sha256:b9e336057fab9e51c28e94f332cbcddf5da3c31afa7dde01414612ebc758f61e"},
-    {file = "python_rapidjson-1.19-cp39-cp39-win_amd64.whl", hash = "sha256:839abf67a3649b386bbf5aeaa4268719be1844eafb016307163bfc9044dde55c"},
+    {file = "python_rapidjson-1.20-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:eeaa8487fdd8db409bd2e0c41c59cee3b9f1d08401fc75520f7d35c7a22d8789"},
+    {file = "python_rapidjson-1.20-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:425c2bb8e778a04497953482c251944b2736f61012d897f17b73da3eca060c27"},
+    {file = "python_rapidjson-1.20-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4f7cbbff9696ea01dd8a29502cb314471c9a5d4239f2f3b7e35b6adbde2cc620"},
+    {file = "python_rapidjson-1.20-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:83a48f96d0abb8349a4d42f029259b755d8c6fd347f5de2d640e164c3f45e63b"},
+    {file = "python_rapidjson-1.20-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6cb3ad353ec083a6dcf0552f1fce3c490f92e2fccf9a81eac42835297a8431a1"},
+    {file = "python_rapidjson-1.20-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7f7b6574887d8828f34eb3384092d6e6c290e8fbb12703c409dbdde814612657"},
+    {file = "python_rapidjson-1.20-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:403e4986484f01f79fdce00b48c12a1b39d16e822cd37c60843ab26455ab0680"},
+    {file = "python_rapidjson-1.20-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:e3f89a58d7709d5879586e9dbfd11be76a799e8fbdbb5eddaffaeba9b572fba3"},
+    {file = "python_rapidjson-1.20-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:b0d07d4f0ebbb2228d5140463f11ac519147b9d791f7e40b3edf518a806be3cc"},
+    {file = "python_rapidjson-1.20-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:a5fb413414b92763a54d53b732df3c9de1b114012c8881a3d1215a19b9fca494"},
+    {file = "python_rapidjson-1.20-cp310-cp310-win32.whl", hash = "sha256:9831430f17101a6a249e07db9c42d26c3263e6009450722cce0c14726421f434"},
+    {file = "python_rapidjson-1.20-cp310-cp310-win_amd64.whl", hash = "sha256:fbff5caf127c5bed4d6620f95a039dd9e293784d844af50782aaf278a743acb4"},
+    {file = "python_rapidjson-1.20-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:328095d6d558090c29d24d889482b10dcc3ade3b77c93a61ea86794623046628"},
+    {file = "python_rapidjson-1.20-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:fc7a095f77eb3bb6acff94acf868a100faaf06028c4b513428f161cd55030476"},
+    {file = "python_rapidjson-1.20-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ce4cee141c924300cbedba1e5bea05b13484598d1e550afc5b50209ba73c62f2"},
+    {file = "python_rapidjson-1.20-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4355bcfc8629d15f6246011b40e84cc368d842518a91adb15c5eba211305ee5b"},
+    {file = "python_rapidjson-1.20-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7dd9c5e661d17eafa44b2875f6ce55178cc87388575ce3cd3c606d5a33772b49"},
+    {file = "python_rapidjson-1.20-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bd978c7669cc844f669a48d2a6019fb9134a2385536f806fe265a1e374c3573a"},
+    {file = "python_rapidjson-1.20-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:8fc52405435ce875aa000afa2637ea267eb0d4ab9622f9b97c92d92cb1a9c440"},
+    {file = "python_rapidjson-1.20-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:bef1eca712fb9fd5d2edd724dd1dd8a608215d6afcaee4f351b3e99e3f73f720"},
+    {file = "python_rapidjson-1.20-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:6355cb690bf64629767206524d4d00da909970d46d8fc0b367f339975e4eb419"},
+    {file = "python_rapidjson-1.20-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f974c4e11be833221062fc4c3129bed172082792b33ef9fc1b8104f49c514f1d"},
+    {file = "python_rapidjson-1.20-cp311-cp311-win32.whl", hash = "sha256:06ee7bcf660ebbdf1953aa7bf74214b722d934928c7b9f2a23b12e0713b61fa4"},
+    {file = "python_rapidjson-1.20-cp311-cp311-win_amd64.whl", hash = "sha256:9df543521fa4b69589c42772b2f32a6c334b3b5fc612cd6dc3705136d0788da3"},
+    {file = "python_rapidjson-1.20-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:6056fcc8caeb9b04775bf655568bba362c7670ab792c1b438671bb056db954cd"},
+    {file = "python_rapidjson-1.20-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:225bd4cbabfe7910261cbcebb8b811d4ff98e90cdd17c233b916c6aa71a9553f"},
+    {file = "python_rapidjson-1.20-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:026077b663acf93a3f2b1adb87282e611a30214b8ae8001b7e4863a3b978e646"},
+    {file = "python_rapidjson-1.20-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:884e1dd4c0770ed424737941af4d5dc9014995f9c33595f151af13f83ce282c3"},
+    {file = "python_rapidjson-1.20-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5f55531c8197cb7a21a5ef0ffa46f2b8fc8c5fe7c6fd08bdbd2063ae65d2ff65"},
+    {file = "python_rapidjson-1.20-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c60121d155562dc694c05ed7df4e39e42ee1d3adff2a060c64a004498e6451f7"},
+    {file = "python_rapidjson-1.20-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3a6620eed0b04196f37fab7048c1d672d03391bb29d7f09ee8fee8dea33f11f4"},
+    {file = "python_rapidjson-1.20-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:ddb63eff401ce7cf20cdd5e21942fc23fbe0e1dc1d96d7ae838645fb1f74fb47"},
+    {file = "python_rapidjson-1.20-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:05e28c3dbb4a0d74ec13af9668ef2b9f302edf83cf7ce1d8316a95364720eec0"},
+    {file = "python_rapidjson-1.20-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b733978ecd84fc5df9a778ce821dc1f3113f7bfc2493cac0bb17efb4ae0bb8fa"},
+    {file = "python_rapidjson-1.20-cp312-cp312-win32.whl", hash = "sha256:d87041448cec00e2db5d858625a76dc1b59eef6691a039acff6d92ad8581cfc1"},
+    {file = "python_rapidjson-1.20-cp312-cp312-win_amd64.whl", hash = "sha256:5d3be149ce5475f9605f01240487541057792abad94d3fd0cd56af363cf5a4dc"},
+    {file = "python_rapidjson-1.20-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:daee815b4c20ca6e4dbc6bde373dd3f65b53813d775f1c94b765b33b402513a7"},
+    {file = "python_rapidjson-1.20-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:083df379c769b30f9bc40041c91fd9d8f7bb8ca2b3c7170258842aced2098e05"},
+    {file = "python_rapidjson-1.20-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9399ad75a2e3377f9e6208caabe73eb9354cd01b732407475ccadcd42c577df"},
+    {file = "python_rapidjson-1.20-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:599ab208ccf6172d6cfac1abe048c837e62612f91f97d198e32773c45346a0b4"},
+    {file = "python_rapidjson-1.20-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf3c0e2a5b97b0d07311f15f0dce4434e43dec865c3794ad1b10d968460fd665"},
+    {file = "python_rapidjson-1.20-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e8064b8edb57ddd9e3ffa539cf2ec2f03515751fb0698b40ba5cb66a2123af19"},
+    {file = "python_rapidjson-1.20-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:bc79d7f00f7538e027960ca6bcd1e03ed99fcf660d4d882d1c22f641155d0db0"},
+    {file = "python_rapidjson-1.20-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:87aa0b01b8c20984844f1440b8ff6bdb32de911a1750fed344b9daed33b4b52b"},
+    {file = "python_rapidjson-1.20-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:4099cb9eae8a0ce19c09e02729eb6d69d5180424f13a2641a6c407d053e47a82"},
+    {file = "python_rapidjson-1.20-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4c680cd2b4de760ff6875de71fe6a87bd610aa116593d62e4f81a563be86ae18"},
+    {file = "python_rapidjson-1.20-cp313-cp313-win32.whl", hash = "sha256:9e431a7afc77aa874fed537c9f6bf5fcecaef124ebeae2a2379d3b9e9adce74b"},
+    {file = "python_rapidjson-1.20-cp313-cp313-win_amd64.whl", hash = "sha256:7444bc7e6a04c03d6ed748b5dab0798fa2b3f2b303be8c38d3af405b2cac6d63"},
+    {file = "python_rapidjson-1.20-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:69e702fe74fe8c44c6253bb91364a270dc49f704920c90e01040155bd600a5fd"},
+    {file = "python_rapidjson-1.20-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b9496b1e9d6247e8802ac559b7eebb5f3cae426d1c1dbde4049c63dff0941370"},
+    {file = "python_rapidjson-1.20-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1446e902b6c781f271bf8556da636c1375cbb208e25f92e1af4cc2d92cf0cf15"},
+    {file = "python_rapidjson-1.20-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:368ecdf4031abbde9c94aac40981d9a1238e6bcfef9fbfee441047b4757d6033"},
+    {file = "python_rapidjson-1.20-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:924f9ea302494d4a4d540d3509f8f1f15622ea7d614c6f29df3188d52c6cb546"},
+    {file = "python_rapidjson-1.20-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:632acb2dfa29883723e24bb2ce47c726edd5f672341553a5184db68f78d3bd09"},
+    {file = "python_rapidjson-1.20-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:c2f85da53286e67778d4061ef32ff44ca9b5f945030463716e046ee8985319f8"},
+    {file = "python_rapidjson-1.20-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:c05c8602c019cc0db19601fdc4927755a9d33f21d01beb3d5767313d7a81360d"},
+    {file = "python_rapidjson-1.20-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:7d36aab758bfb1b59e0a849cd20e971eda951a04d3586bb5f6cb460bfc7c103d"},
+    {file = "python_rapidjson-1.20-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:e5774c905034362298312116f9b58c181e91a09800e4e5cede7b3d460a6a9fde"},
+    {file = "python_rapidjson-1.20-cp38-cp38-win32.whl", hash = "sha256:488d0c6155004b5177225eaf331bb1838616da05ae966dd24a7d442751c1d193"},
+    {file = "python_rapidjson-1.20-cp38-cp38-win_amd64.whl", hash = "sha256:00183c4938cd491b98b1a43626bc5a381842ceba87644cb91b25555f3fc3c0bf"},
+    {file = "python_rapidjson-1.20-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f510ffe32fec319699f0c1ea9cee5bde47c33202b034b85c5d1b9ace682aa96a"},
+    {file = "python_rapidjson-1.20-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a2b624b3613fb7b8dfef4adc709bf39489be8c655cd9d24dc4e2cc16fc5def83"},
+    {file = "python_rapidjson-1.20-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c9f813a37d1f708a221f1f7d8c97c437d10597261810c1d3b52cf8f248d66c0"},
+    {file = "python_rapidjson-1.20-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0c3f7085c52259c56af72462df7620c3b8bb95575fd9b8c3a073728855e93269"},
+    {file = "python_rapidjson-1.20-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:871f2eeb0907f3d7ab09efe04c5b5e2886c275ea568f7867c97468ae14cdd52f"},
+    {file = "python_rapidjson-1.20-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7c0408e7f52f32cf4bdd5aa305f005914b0143cac69d42575e2d40e8678cd72"},
+    {file = "python_rapidjson-1.20-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:ec17a18df700e1f956fc5a0c41cbb3cc746c44c0fef38988efba9b2cb607ecfa"},
+    {file = "python_rapidjson-1.20-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:1c0303bd445312a78485a9adba06dfdb84561c5157a9cda7999fefb36df4c6cc"},
+    {file = "python_rapidjson-1.20-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:303b079ef268a996242be51ae80c8b563ee2d73489ab4f16199fef2216e80765"},
+    {file = "python_rapidjson-1.20-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:5adcef7a27abafbb2b3d0b02c822dfd9b4b329769cb97810b7f9733e1fda0498"},
+    {file = "python_rapidjson-1.20-cp39-cp39-win32.whl", hash = "sha256:3e963e78fff6ab5ab2ae847b65683774c48b9b192307380f2175540d6423fd73"},
+    {file = "python_rapidjson-1.20-cp39-cp39-win_amd64.whl", hash = "sha256:1fc3bba6632ecffeb1897fdf98858dc50a677237f4241853444c70a041158a90"},
+    {file = "python_rapidjson-1.20.tar.gz", hash = "sha256:115f08c86d2df7543c02605e77c84727cdabc4b08310d2f097e953efeaaa73eb"},
 ]
 
 [[package]]
@@ -4268,4 +4288,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools",
 [metadata]
 lock-version = "2.0"
 python-versions = "3.12.4"
-content-hash = "83c9b3192d97697f49a462dd31deb4589269b7001af791b4fd7a9682090b7889"
+content-hash = "8f39ba1d5b71fac8024762d21dc054395d2bf3532e27d870ef8f5527f1145a52"
diff --git a/pyproject.toml b/pyproject.toml
index 975b37f012..e08b49bd3b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,7 +48,7 @@ markdown2 = "^2.4.8"
 nested-lookup = "^0.2.25"
 newrelic = "^8.8.0"
 ocw-data-parser = "^0.35.1"
-opensearch-dsl = "^1.0.0"
+opensearch-dsl = "^2.0.0"
 opensearch-py = "^2.0.0"
 psycopg2 = "^2.9.6"
 pygithub = "^1.44.1"

From 5ef894593b19c432802ebb00cdad3deb65dd34f8 Mon Sep 17 00:00:00 2001
From: Chris Chudzicki <christopher.chudzicki@gmail.com>
Date: Tue, 6 Aug 2024 12:00:21 -0400
Subject: [PATCH 12/17] Publish topic channels based on resource count (#1349)

* add channel published field

* perform deletion during resource_delete_actions

* make channel_url null if not published

* fix bad rebase :(

* add a data migration

* return 404 for unpublished channels

* add another test

* fix typo (haha pun)

* rename migration function

* bump migration number

* bump migration
---
 channels/factories.py                         | 10 +++
 channels/migrations/0015_channel_published.py | 17 ++++
 channels/models.py                            | 27 ++++--
 channels/models_test.py                       | 39 +++++++++
 channels/plugins.py                           | 49 +++++++++++
 channels/plugins_test.py                      | 87 ++++++++++++++++++-
 channels/serializers.py                       |  2 +-
 channels/views.py                             |  4 +-
 channels/views_test.py                        | 33 ++++---
 .../0008_unpublish_empty_topic_channels.py    | 36 ++++++++
 frontends/api/src/generated/v0/api.ts         |  2 +-
 frontends/api/src/generated/v1/api.ts         |  2 +-
 .../TopicListingPage/TopicsListingPage.tsx    |  6 +-
 learning_resources/hooks.py                   |  4 +-
 learning_resources/serializers.py             |  2 +-
 learning_resources/utils.py                   |  3 +-
 learning_resources/utils_test.py              |  6 +-
 learning_resources/views_test.py              | 22 ++++-
 learning_resources_search/plugins.py          |  3 +-
 learning_resources_search/plugins_test.py     | 10 +--
 openapi/specs/v0.yaml                         |  1 +
 openapi/specs/v1.yaml                         |  1 +
 22 files changed, 324 insertions(+), 42 deletions(-)
 create mode 100644 channels/migrations/0015_channel_published.py
 create mode 100644 channels/models_test.py
 create mode 100644 data_fixtures/migrations/0008_unpublish_empty_topic_channels.py

diff --git a/channels/factories.py b/channels/factories.py
index c9c6302e85..77330d7d36 100644
--- a/channels/factories.py
+++ b/channels/factories.py
@@ -26,6 +26,7 @@ class ChannelFactory(DjangoModelFactory):
 
     name = factory.fuzzy.FuzzyText(length=21)
     title = factory.Faker("text", max_nb_chars=50)
+    published = True
     public_description = factory.Faker("text", max_nb_chars=50)
     channel_type = factory.fuzzy.FuzzyChoice(ChannelType.names())
 
@@ -116,6 +117,9 @@ class ChannelTopicDetailFactory(DjangoModelFactory):
     class Meta:
         model = ChannelTopicDetail
 
+    class Params:
+        is_unpublished = factory.Trait(channel__published=False)
+
 
 class ChannelDepartmentDetailFactory(DjangoModelFactory):
     """Factory for a channels.models.ChannelDepartmentDetail object"""
@@ -128,6 +132,9 @@ class ChannelDepartmentDetailFactory(DjangoModelFactory):
     class Meta:
         model = ChannelDepartmentDetail
 
+    class Params:
+        is_unpublished = factory.Trait(channel__published=False)
+
 
 class ChannelUnitDetailFactory(DjangoModelFactory):
     """Factory for a channels.models.ChannelUnitDetail object"""
@@ -138,6 +145,9 @@ class ChannelUnitDetailFactory(DjangoModelFactory):
     class Meta:
         model = ChannelUnitDetail
 
+    class Params:
+        is_unpublished = factory.Trait(channel__published=False)
+
 
 class ChannelPathwayDetailFactory(DjangoModelFactory):
     """Factory for a channels.models.ChannelPathwayDetail object"""
diff --git a/channels/migrations/0015_channel_published.py b/channels/migrations/0015_channel_published.py
new file mode 100644
index 0000000000..55d43a1062
--- /dev/null
+++ b/channels/migrations/0015_channel_published.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.14 on 2024-08-06 14:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("channels", "0014_dept_detail_related_name"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="channel",
+            name="published",
+            field=models.BooleanField(db_index=True, default=True),
+        ),
+    ]
diff --git a/channels/models.py b/channels/models.py
index 75a20b2e09..06d76cf27e 100644
--- a/channels/models.py
+++ b/channels/models.py
@@ -5,7 +5,7 @@
 from django.contrib.auth.models import Group
 from django.core.validators import RegexValidator
 from django.db import models
-from django.db.models import JSONField, deletion
+from django.db.models import Case, JSONField, When, deletion
 from django.db.models.functions import Concat
 from imagekit.models import ImageSpecField, ProcessedImageField
 from imagekit.processors import ResizeToFit
@@ -32,12 +32,18 @@ class ChannelQuerySet(TimestampedModelQuerySet):
     def annotate_channel_url(self):
         """Annotate the channel for serialization"""
         return self.annotate(
-            channel_url=Concat(
-                models.Value(frontend_absolute_url("/c/")),
-                "channel_type",
-                models.Value("/"),
-                "name",
-                models.Value("/"),
+            channel_url=Case(
+                When(
+                    published=True,
+                    then=Concat(
+                        models.Value(frontend_absolute_url("/c/")),
+                        "channel_type",
+                        models.Value("/"),
+                        "name",
+                        models.Value("/"),
+                    ),
+                ),
+                default=None,
             )
         )
 
@@ -95,6 +101,7 @@ class Channel(TimestampedModel):
     configuration = models.JSONField(null=True, default=dict, blank=True)
     search_filter = models.CharField(max_length=2048, blank=True, default="")
     public_description = models.TextField(blank=True, default="")
+    published = models.BooleanField(default=True, db_index=True)
 
     featured_list = models.ForeignKey(
         LearningResource, null=True, blank=True, on_delete=deletion.SET_NULL
@@ -115,9 +122,11 @@ def __str__(self):
         return self.title
 
     @cached_property
-    def channel_url(self) -> str:
+    def channel_url(self) -> str | None:
         """Return the channel url"""
-        return frontend_absolute_url(f"/c/{self.channel_type}/{self.name}/")
+        if self.published:
+            return frontend_absolute_url(f"/c/{self.channel_type}/{self.name}/")
+        return None
 
     class Meta:
         unique_together = ("name", "channel_type")
diff --git a/channels/models_test.py b/channels/models_test.py
new file mode 100644
index 0000000000..a95b0a8f45
--- /dev/null
+++ b/channels/models_test.py
@@ -0,0 +1,39 @@
+from urllib.parse import urlparse
+
+import pytest
+
+from channels.constants import ChannelType
+from channels.factories import (
+    ChannelDepartmentDetailFactory,
+    ChannelTopicDetailFactory,
+    ChannelUnitDetailFactory,
+)
+
+pytestmark = [pytest.mark.django_db]
+
+
+@pytest.mark.parametrize("published", [True, False])
+@pytest.mark.parametrize(
+    (
+        "channel_type",
+        "detail_factory",
+    ),
+    [
+        (ChannelType.department, ChannelDepartmentDetailFactory),
+        (ChannelType.topic, ChannelTopicDetailFactory),
+        (ChannelType.unit, ChannelUnitDetailFactory),
+    ],
+)
+def test_channel_url_for_departments(published, channel_type, detail_factory):
+    """Test that the channel URL is correct for department channels"""
+    channel = detail_factory.create(
+        channel__published=published,
+    ).channel
+
+    if published:
+        assert (
+            urlparse(channel.channel_url).path
+            == f"/c/{channel_type.name}/{channel.name}/"
+        )
+    else:
+        assert channel.channel_url is None
diff --git a/channels/plugins.py b/channels/plugins.py
index d971c451d2..9b27037005 100644
--- a/channels/plugins.py
+++ b/channels/plugins.py
@@ -12,6 +12,29 @@
     ChannelTopicDetail,
     ChannelUnitDetail,
 )
+from learning_resources.models import LearningResource
+
+
+def unpublish_topics_for_resource(resource):
+    """
+    Unpublish channels for topics that are used exclusively by the resource
+
+    Args:
+        resource(LearningResource): The resource that was unpublished
+    """
+    other_published = LearningResource.objects.filter(
+        published=True,
+    ).exclude(id=resource.id)
+
+    channels = Channel.objects.filter(
+        topic_detail__topic__in=resource.topics.all(),
+        channel_type=ChannelType.topic.name,  # Redundant, but left for clarity
+        published=True,
+    ).exclude(topic_detail__topic__learningresource__in=other_published)
+
+    for channel in channels:
+        channel.published = False
+        channel.save()
 
 
 class ChannelPlugin:
@@ -140,3 +163,29 @@ def offeror_delete(self, offeror):
         """
         Channel.objects.filter(unit_detail__unit=offeror).delete()
         offeror.delete()
+
+    @hookimpl
+    def resource_upserted(self, resource, percolate):  # noqa: ARG002
+        """
+        Publish channels for the resource's topics
+        """
+        channels = Channel.objects.filter(
+            topic_detail__topic__in=resource.topics.all(), published=False
+        )
+        for channel in channels:
+            channel.published = True
+            channel.save()
+
+    @hookimpl
+    def resource_before_delete(self, resource):
+        """
+        Unpublish channels for the resource's topics
+        """
+        unpublish_topics_for_resource(resource)
+
+    @hookimpl
+    def resource_unpublished(self, resource):
+        """
+        Unpublish channels for the resource's topics
+        """
+        unpublish_topics_for_resource(resource)
diff --git a/channels/plugins_test.py b/channels/plugins_test.py
index faa64c62dd..8163565474 100644
--- a/channels/plugins_test.py
+++ b/channels/plugins_test.py
@@ -3,11 +3,16 @@
 import pytest
 
 from channels.constants import ChannelType
-from channels.factories import ChannelDepartmentDetailFactory, ChannelFactory
+from channels.factories import (
+    ChannelDepartmentDetailFactory,
+    ChannelFactory,
+    ChannelTopicDetailFactory,
+)
 from channels.models import Channel
 from channels.plugins import ChannelPlugin
 from learning_resources.factories import (
     LearningResourceDepartmentFactory,
+    LearningResourceFactory,
     LearningResourceOfferorFactory,
     LearningResourceSchoolFactory,
     LearningResourceTopicFactory,
@@ -140,3 +145,83 @@ def test_search_index_plugin_offeror_delete():
     ChannelPlugin().offeror_delete(offeror)
     assert Channel.objects.filter(id=channel.id).exists() is False
     assert LearningResourceOfferor.objects.filter(code=offeror.code).exists() is False
+
+
+@pytest.mark.parametrize("action", ["delete", "unpublish"])
+@pytest.mark.parametrize(
+    ("published_resources", "to_remove", "expect_channel_published"),
+    [
+        (2, 0, True),  # 2 published resources remain
+        (2, 1, True),  # 1 published resources remain
+        (2, 2, False),  # 0 published resource remains
+    ],
+)
+@pytest.mark.django_db()
+def test_resource_before_delete_and_resource_unpublish(
+    action, published_resources, to_remove, expect_channel_published
+):
+    """
+    Test that topic channels are unpublished when they no longer have any resources
+    remaining.
+    """
+    topic1 = LearningResourceTopicFactory.create()  # for to-be-deleted resources
+    topic2 = LearningResourceTopicFactory.create()  # for to-be-deleted & others
+    topic3 = LearningResourceTopicFactory.create()  # for to-be-deleted resources
+    detail1 = ChannelTopicDetailFactory.create(topic=topic1)
+    detail2 = ChannelTopicDetailFactory.create(topic=topic2)
+    detail3 = ChannelTopicDetailFactory.create(topic=topic3)
+    channel1, channel2, channel3 = detail1.channel, detail2.channel, detail3.channel
+
+    resources_in_play = LearningResourceFactory.create_batch(
+        published_resources,
+        topics=[topic1, topic2, topic3],
+    )
+
+    # Create extra published + unpublished resources to ensure topic2 sticks around
+    LearningResourceFactory.create(topics=[topic2])  # extra resources
+
+    assert channel1.published
+    assert channel2.published
+    assert channel3.published
+
+    for resource in resources_in_play[:to_remove]:
+        if action == "delete":
+            ChannelPlugin().resource_before_delete(resource)
+            resource.delete()
+        elif action == "unpublish":
+            resource.published = False
+            resource.save()
+            ChannelPlugin().resource_unpublished(resource)
+        else:
+            msg = ValueError(f"Invalid action {action}")
+            raise msg
+
+    channel1.refresh_from_db()
+    channel2.refresh_from_db()
+    channel3.refresh_from_db()
+    assert channel1.published is expect_channel_published
+    assert channel2.published is True
+    assert channel3.published is expect_channel_published
+
+
+@pytest.mark.django_db()
+def test_resource_upserted():
+    """
+    Test that channels are published when a resource is created or updated
+    """
+    channel1 = ChannelFactory.create(is_topic=True, published=False)
+    channel2 = ChannelFactory.create(is_topic=True, published=False)
+    channel3 = ChannelFactory.create(is_topic=True, published=False)
+
+    resource = LearningResourceFactory.create(
+        topics=[channel1.topic_detail.topic, channel2.topic_detail.topic]
+    )
+    ChannelPlugin().resource_upserted(resource, None)
+
+    channel1.refresh_from_db()
+    channel2.refresh_from_db()
+    channel3.refresh_from_db()
+
+    assert channel1.published is True
+    assert channel2.published is True
+    assert channel3.published is False
diff --git a/channels/serializers.py b/channels/serializers.py
index 2fd8c92037..cf5757cebe 100644
--- a/channels/serializers.py
+++ b/channels/serializers.py
@@ -157,7 +157,7 @@ def get_channel_url(self, instance) -> str:
 
     class Meta:
         model = Channel
-        exclude = []
+        exclude = ["published"]
 
 
 class ChannelTopicDetailSerializer(serializers.ModelSerializer):
diff --git a/channels/views.py b/channels/views.py
index 92d6a32a0c..18df82d3a1 100644
--- a/channels/views.py
+++ b/channels/views.py
@@ -88,7 +88,8 @@ def get_serializer_context(self):
     def get_queryset(self):
         """Return a queryset"""
         return (
-            Channel.objects.prefetch_related(
+            Channel.objects.filter(published=True)
+            .prefetch_related(
                 Prefetch(
                     "lists",
                     queryset=ChannelList.objects.prefetch_related(
@@ -144,6 +145,7 @@ def get_object(self):
             Channel,
             channel_type=self.kwargs["channel_type"],
             name=self.kwargs["name"],
+            published=True,
         )
 
 
diff --git a/channels/views_test.py b/channels/views_test.py
index c7b0851b9d..4a60bd9922 100644
--- a/channels/views_test.py
+++ b/channels/views_test.py
@@ -28,11 +28,14 @@
 
 def test_list_channels(user_client):
     """Test that all channels are returned"""
-    channels = sorted(ChannelFactory.create_batch(10), key=lambda f: f.id)
+    ChannelFactory.create_batch(2, published=False)  # should be filtered out
+    channels = sorted(ChannelFactory.create_batch(3), key=lambda f: f.id)
+    ChannelFactory.create_batch(2, published=False)  # should be filtered out
+
     url = reverse("channels:v0:channels_api-list")
     channel_list = sorted(user_client.get(url).json()["results"], key=lambda f: f["id"])
-    assert len(channel_list) == 10
-    for idx, channel in enumerate(channels[:10]):
+    assert len(channel_list) == 3
+    for idx, channel in enumerate(channels[:3]):
         assert channel_list[idx] == ChannelSerializer(instance=channel).data
 
 
@@ -206,20 +209,26 @@ def test_patch_channel_image(client, channel, attribute):
             assert len(size_image.read()) > 0
 
 
-def test_channel_by_type_name_detail(user_client):
+@pytest.mark.parametrize(
+    ("published", "requested_type", "response_status"),
+    [
+        (True, ChannelType.topic, 200),
+        (False, ChannelType.topic, 404),
+        (True, ChannelType.department, 404),
+        (False, ChannelType.department, 404),
+    ],
+)
+def test_channel_by_type_name_detail(
+    user_client, published, requested_type, response_status
+):
     """ChannelByTypeNameDetailView should return expected result"""
-    channel = ChannelFactory.create(is_topic=True)
+    channel = ChannelFactory.create(is_topic=True, published=published)
     url = reverse(
         "channels:v0:channel_by_type_name_api-detail",
-        kwargs={"channel_type": ChannelType.topic.name, "name": channel.name},
-    )
-    response = user_client.get(url)
-    assert response.json() == ChannelSerializer(instance=channel).data
-    Channel.objects.filter(id=channel.id).update(
-        channel_type=ChannelType.department.name
+        kwargs={"channel_type": requested_type.name, "name": channel.name},
     )
     response = user_client.get(url)
-    assert response.status_code == 404
+    assert response.status_code == response_status
 
 
 def test_update_channel_forbidden(channel, user_client):
diff --git a/data_fixtures/migrations/0008_unpublish_empty_topic_channels.py b/data_fixtures/migrations/0008_unpublish_empty_topic_channels.py
new file mode 100644
index 0000000000..67f0ea80c7
--- /dev/null
+++ b/data_fixtures/migrations/0008_unpublish_empty_topic_channels.py
@@ -0,0 +1,36 @@
+# Generated by Django 4.2.14 on 2024-08-01 20:31
+
+from django.db import migrations
+
+
+def unpublish_empty_topic_channels(apps, schema_editor):
+    """
+    Set a topic channel to unpublished if it has no published learning resources.
+    """
+    Channel = apps.get_model("channels", "Channel")
+    LearningResource = apps.get_model("learning_resources", "LearningResource")
+
+    published_resources = LearningResource.objects.filter(
+        published=True,
+    )
+
+    channels = Channel.objects.filter(published=True, channel_type="topic").exclude(
+        topic_detail__topic__learningresource__in=published_resources
+    )
+
+    for channel in channels:
+        channel.published = False
+        channel.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        (
+            "data_fixtures",
+            "0007_topic_mappings_edx_add_programming_coding_to_computer_science",
+        ),
+    ]
+
+    operations = [
+        migrations.RunPython(unpublish_empty_topic_channels, migrations.RunPython.noop),
+    ]
diff --git a/frontends/api/src/generated/v0/api.ts b/frontends/api/src/generated/v0/api.ts
index 1b7392b9cd..1ef2105f74 100644
--- a/frontends/api/src/generated/v0/api.ts
+++ b/frontends/api/src/generated/v0/api.ts
@@ -1208,7 +1208,7 @@ export interface LearningResourceTopic {
    * @type {string}
    * @memberof LearningResourceTopic
    */
-  channel_url: string
+  channel_url: string | null
 }
 /**
  * Serializer for News FeedItem
diff --git a/frontends/api/src/generated/v1/api.ts b/frontends/api/src/generated/v1/api.ts
index 3d10b40d30..e979df95b3 100644
--- a/frontends/api/src/generated/v1/api.ts
+++ b/frontends/api/src/generated/v1/api.ts
@@ -2334,7 +2334,7 @@ export interface LearningResourceTopic {
    * @type {string}
    * @memberof LearningResourceTopic
    */
-  channel_url: string
+  channel_url: string | null
 }
 /**
  * SearchResponseSerializer with OpenAPI annotations for Learning Resources search
diff --git a/frontends/mit-open/src/pages/TopicListingPage/TopicsListingPage.tsx b/frontends/mit-open/src/pages/TopicListingPage/TopicsListingPage.tsx
index 3195c10087..69fda23a92 100644
--- a/frontends/mit-open/src/pages/TopicListingPage/TopicsListingPage.tsx
+++ b/frontends/mit-open/src/pages/TopicListingPage/TopicsListingPage.tsx
@@ -12,7 +12,7 @@ import {
   Breadcrumbs,
 } from "ol-components"
 import { Link } from "react-router-dom"
-import { MetaTags } from "ol-utilities"
+import { MetaTags, propsNotNil } from "ol-utilities"
 
 import {
   useLearningResourceTopics,
@@ -204,7 +204,7 @@ const groupTopics = (
   courseCounts: Record<string, number>,
   programCounts: Record<string, number>,
 ): TopicGroup[] => {
-  const sorted = topics.sort((a, b) => {
+  const sorted = topics.filter(propsNotNil(["channel_url"])).sort((a, b) => {
     return a.name.localeCompare(b.name)
   })
   const groups: Record<number, TopicGroup> = Object.fromEntries(
@@ -218,7 +218,7 @@ const groupTopics = (
           courses: courseCounts[topic.name],
           programs: programCounts[topic.name],
           title: topic.name,
-          href: topic.channel_url || undefined,
+          href: topic.channel_url,
         },
       ]),
   )
diff --git a/learning_resources/hooks.py b/learning_resources/hooks.py
index 56865f798b..b588f3a05f 100644
--- a/learning_resources/hooks.py
+++ b/learning_resources/hooks.py
@@ -45,8 +45,8 @@ def bulk_resources_unpublished(self, resource_ids, resource_type):
         """Trigger actions after multiple learning resources are unpublished"""
 
     @hookspec
-    def resource_delete(self, resource):
-        """Trigger actions to remove a learning resource"""
+    def resource_before_delete(self, resource):
+        """Trigger actions before removing a learning resource"""
 
     @hookspec
     def resource_run_upserted(self, run):
diff --git a/learning_resources/serializers.py b/learning_resources/serializers.py
index 8f447729a0..0e7c2c9875 100644
--- a/learning_resources/serializers.py
+++ b/learning_resources/serializers.py
@@ -40,7 +40,7 @@ class LearningResourceTopicSerializer(serializers.ModelSerializer):
     Serializer for LearningResourceTopic model
     """
 
-    channel_url = serializers.CharField(read_only=True)
+    channel_url = serializers.CharField(read_only=True, allow_null=True)
 
     class Meta:
         """Meta options for the serializer."""
diff --git a/learning_resources/utils.py b/learning_resources/utils.py
index 4a697a3eab..8f99d45055 100644
--- a/learning_resources/utils.py
+++ b/learning_resources/utils.py
@@ -376,7 +376,8 @@ def resource_delete_actions(resource: LearningResource):
     """
     pm = get_plugin_manager()
     hook = pm.hook
-    hook.resource_delete(resource=resource)
+    hook.resource_before_delete(resource=resource)
+    resource.delete()
 
 
 def bulk_resources_unpublished_actions(resource_ids: list[int], resource_type: str):
diff --git a/learning_resources/utils_test.py b/learning_resources/utils_test.py
index 34c748aad4..692b3b4be2 100644
--- a/learning_resources/utils_test.py
+++ b/learning_resources/utils_test.py
@@ -233,7 +233,11 @@ def test_resource_delete_actions(mock_plugin_manager, fixture_resource):
     resource_delete_actions function should trigger plugin hook's resource_deleted function
     """
     utils.resource_delete_actions(fixture_resource)
-    mock_plugin_manager.hook.resource_delete.assert_called_once_with(
+
+    with pytest.raises(LearningResource.DoesNotExist):
+        fixture_resource.refresh_from_db()
+
+    mock_plugin_manager.hook.resource_before_delete.assert_called_once_with(
         resource=fixture_resource
     )
 
diff --git a/learning_resources/views_test.py b/learning_resources/views_test.py
index 9c17a9848e..32a98768f1 100644
--- a/learning_resources/views_test.py
+++ b/learning_resources/views_test.py
@@ -8,7 +8,7 @@
 from django.utils import timezone
 from rest_framework.reverse import reverse
 
-from channels.factories import ChannelUnitDetailFactory
+from channels.factories import ChannelTopicDetailFactory, ChannelUnitDetailFactory
 from channels.models import Channel
 from learning_resources.constants import (
     LearningResourceRelationTypes,
@@ -598,6 +598,26 @@ def test_topics_detail_endpoint(client):
     assert resp.data == LearningResourceTopicSerializer(instance=topic).data
 
 
+@pytest.mark.parametrize("published", [True, False])
+def test_topic_channel_url(client, published):
+    """
+    Check that the topic API returns 'None' for channel_url of unpublished channels.
+
+    Note: The channel_url being None is also tested on the Channel model itself,
+    but the API may generate the channel_url in a slightly different manner (for
+    example, queryset annotation)
+    """
+    topic = LearningResourceTopicFactory.create()
+    channel = ChannelTopicDetailFactory.create(
+        topic=topic, is_unpublished=not published
+    ).channel
+    resp = client.get(reverse("lr:v1:topics_api-detail", args=[topic.pk]))
+
+    assert resp.data["channel_url"] == channel.channel_url
+    if not published:
+        assert resp.data["channel_url"] is None
+
+
 def test_departments_list_endpoint(client):
     """Test departments list endpoint"""
     departments = sorted(
diff --git a/learning_resources_search/plugins.py b/learning_resources_search/plugins.py
index 0312accdd1..e8980d2fbf 100644
--- a/learning_resources_search/plugins.py
+++ b/learning_resources_search/plugins.py
@@ -140,12 +140,11 @@ def bulk_resources_unpublished(self, resource_ids, resource_type):
             )
 
     @hookimpl
-    def resource_delete(self, resource):
+    def resource_before_delete(self, resource):
         """
         Remove a resource from the search index and then delete the object
         """
         self.resource_unpublished(resource)
-        resource.delete()
 
     @hookimpl
     def resource_run_upserted(self, run):
diff --git a/learning_resources_search/plugins_test.py b/learning_resources_search/plugins_test.py
index 4a0d50ed72..70ab7f8879 100644
--- a/learning_resources_search/plugins_test.py
+++ b/learning_resources_search/plugins_test.py
@@ -8,7 +8,7 @@
     LearningResourceFactory,
     LearningResourceRunFactory,
 )
-from learning_resources.models import LearningResource, LearningResourceRun
+from learning_resources.models import LearningResourceRun
 from learning_resources_search.constants import COURSE_TYPE, PROGRAM_TYPE
 from learning_resources_search.plugins import SearchIndexPlugin
 
@@ -74,18 +74,18 @@ def test_search_index_plugin_resource_unpublished(
 
 @pytest.mark.django_db()
 @pytest.mark.parametrize("resource_type", [COURSE_TYPE, PROGRAM_TYPE])
-def test_search_index_plugin_resource_delete(mock_search_index_helpers, resource_type):
+def test_search_index_plugin_resource_before_delete(
+    mock_search_index_helpers, resource_type
+):
     """The plugin function should remove a resource from the search index then delete the resource"""
     resource = LearningResourceFactory.create(resource_type=resource_type)
     resource_id = resource.id
-    SearchIndexPlugin().resource_delete(resource)
+    SearchIndexPlugin().resource_before_delete(resource)
 
     mock_search_index_helpers.mock_remove_learning_resource.assert_called_once_with(
         resource_id, resource.resource_type
     )
 
-    assert LearningResource.objects.filter(id=resource.id).exists() is False
-
 
 @pytest.mark.django_db()
 def test_search_index_plugin_resource_run_upserted(mock_search_index_helpers):
diff --git a/openapi/specs/v0.yaml b/openapi/specs/v0.yaml
index 7d7f5c231b..eb574f037c 100644
--- a/openapi/specs/v0.yaml
+++ b/openapi/specs/v0.yaml
@@ -1611,6 +1611,7 @@ components:
         channel_url:
           type: string
           readOnly: true
+          nullable: true
       required:
       - channel_url
       - id
diff --git a/openapi/specs/v1.yaml b/openapi/specs/v1.yaml
index 24fdebfe14..dbc63e0a56 100644
--- a/openapi/specs/v1.yaml
+++ b/openapi/specs/v1.yaml
@@ -8770,6 +8770,7 @@ components:
         channel_url:
           type: string
           readOnly: true
+          nullable: true
       required:
       - channel_url
       - id

From 42e8c59e4f1cf00be2f6e07119ab8bdf92504a9d Mon Sep 17 00:00:00 2001
From: James Kachel <james@jkachel.com>
Date: Tue, 6 Aug 2024 11:58:41 -0500
Subject: [PATCH 13/17] Add Manufacturing topic; update upserter to make adding
 child topics easier (#1364)

* Add Manufacturing topic; update upserter to make adding child topics easier

* Updating the rollback to match on the topic's own uuid
---
 ...cs_update_engineering_add_manufacturing.py | 59 +++++++++++
 learning_resources/data/README-topics.md      |  9 +-
 learning_resources/utils.py                   | 17 ++++
 learning_resources/utils_test.py              | 97 +++++++++++++++++++
 4 files changed, 181 insertions(+), 1 deletion(-)
 create mode 100644 data_fixtures/migrations/0008_topics_update_engineering_add_manufacturing.py

diff --git a/data_fixtures/migrations/0008_topics_update_engineering_add_manufacturing.py b/data_fixtures/migrations/0008_topics_update_engineering_add_manufacturing.py
new file mode 100644
index 0000000000..dc6680d720
--- /dev/null
+++ b/data_fixtures/migrations/0008_topics_update_engineering_add_manufacturing.py
@@ -0,0 +1,59 @@
+"""
+Update the topics; add Manufacturing under Engineering
+This is intended to fix https://github.com/mitodl/hq/issues/5076 - no additional
+mappings since the topics for Principals of Manufacturing include "Manufacturing"
+so it should match on name directly.
+"""
+
+from django.db import migrations
+
+from channels.constants import ChannelType
+from learning_resources.utils import upsert_topic_data_string
+
+map_changes = """
+---
+topics:
+    - icon:
+      id: 4176e385-92c5-4e02-b3cc-4f34d9a4bf40
+      mappings: []
+      name: Manufacturing
+      children: []
+      parent: 952604ab-ae23-45b3-a040-0e5f26fe42df
+"""
+
+
+def add_new_mapping(apps, schema_editor):
+    """Upsert the map_changes data above."""
+
+    upsert_topic_data_string(map_changes)
+
+
+def rollback_new_mapping(apps, schema_editor):
+    """Remove the Manufacturing topic."""
+
+    LearningResourceTopic = apps.get_model(
+        "learning_resources", "LearningResourceTopic"
+    )
+    Channel = apps.get_model("channels", "Channel")
+
+    topic = LearningResourceTopic.objects.filter(
+        topic_uuid="4176e385-92c5-4e02-b3cc-4f34d9a4bf40",
+    ).get()
+
+    Channel.objects.filter(
+        channel_type=ChannelType.topic.name,
+        topic_detail__topic=topic,
+    ).all().delete()
+
+    topic.delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        (
+            "data_fixtures",
+            "0007_topic_mappings_edx_add_programming_coding_to_computer_science",
+        ),
+    ]
+
+    operations = [migrations.RunPython(add_new_mapping, rollback_new_mapping)]
diff --git a/learning_resources/data/README-topics.md b/learning_resources/data/README-topics.md
index e8a354c897..1b73b287fd 100644
--- a/learning_resources/data/README-topics.md
+++ b/learning_resources/data/README-topics.md
@@ -29,9 +29,16 @@ topics:
             - offeror topic
             - other offeror topic
         children: []
+	parent: optional ID for the parent (read the Updating section before using this)
 ```
 
-Children use the same format as the items under `topics`.
+Children use the same format as the items under `topics`. Topic IDs are UUIDs.
+
+## Updating topics (and the `parent` element)
+
+A given topic's parent/child relationship is usually defined by their position in the yaml file. Children are in the parent's `children` list and the upsert function uses this when it creates the topics in the database.
+
+There is a slight problem with this - if you want to _modify_ a topic, you now have to specify the whole tree, or the upsert code won't know what they belong to. This is where the `parent` element comes in. You can set this to the UUID of the parent that it should have, and the upserter will load that topic and use it as the parent so you don't have to specify the whole tree.
 
 ## Transforming topic maps
 
diff --git a/learning_resources/utils.py b/learning_resources/utils.py
index 8f99d45055..0174b3d263 100644
--- a/learning_resources/utils.py
+++ b/learning_resources/utils.py
@@ -487,6 +487,7 @@ def _walk_topic_map(topics: list, parent: None | LearningResourceTopic = None) -
     - icon - the icon we should display for the topic (a Remixicon, generally)
     - mappings - mappings for topics found in offeror data
     - children - child topics (records in this same format)
+    - parent - specific parent for the topic
     A more detailed definition of this is in data/README-topics.md.
 
     Args:
@@ -503,6 +504,22 @@ def _walk_topic_map(topics: list, parent: None | LearningResourceTopic = None) -
             "icon": topic["icon"] or "",
         }
 
+        if not parent and "parent" in topic:
+            # Topic specifies a parent, so let's try to grab it.
+            try:
+                defaults["parent"] = LearningResourceTopic.objects.filter(
+                    topic_uuid=topic["parent"]
+                ).get()
+            except LearningResourceTopic.DoesNotExist:
+                log.warning(
+                    (
+                        "_walk_topic_map: topic %s specified a parent %s but"
+                        " the parent did not exist"
+                    ),
+                    topic["name"],
+                    topic["parent"],
+                )
+
         if topic["id"]:
             defaults["topic_uuid"] = topic["id"]
 
diff --git a/learning_resources/utils_test.py b/learning_resources/utils_test.py
index 692b3b4be2..abbc9d4a30 100644
--- a/learning_resources/utils_test.py
+++ b/learning_resources/utils_test.py
@@ -388,6 +388,103 @@ def test_modify_topic_data_string(mocker):
     )
 
 
+def test_modify_topic_with_parent(mocker):
+    """Test that the parent option is processed correctly when upserting topics"""
+
+    mock_pluggy = mocker.patch("learning_resources.utils.topic_upserted_actions")
+
+    base_topic_file = """
+---
+topics:
+    - icon: RiRobot2Line
+      id: c06109bf-cff8-4873-b04b-f5e66e3e1764
+      mappings:
+        mitx:
+          - Electronics
+        ocw:
+          - Technology
+      name: Data Science, Analytics & Computer Technology
+      children:
+      - children: []
+        icon: RiRobot2Line
+        id: 4cd6156e-51a0-4da4-add4-6f81e106cd43
+        mappings:
+          ocw:
+            - Programming Languages
+            - Software Design and Engineering
+          mitx:
+            - Computer Science
+        name: Programming & Coding
+"""
+
+    new_topic_file = """
+---
+topics:
+    - children: []
+      icon: RiRobot2Line
+      id: d335c250-1292-4391-a7cb-3181f803e0f3
+      mappings: []
+      name: Debugging
+      parent: 4cd6156e-51a0-4da4-add4-6f81e106cd43
+"""
+
+    new_topic_nested_parent_file = """
+topics:
+    - icon: RiRobot2Line
+      id: c06109bf-cff8-4873-b04b-f5e66e3e1764
+      mappings:
+        mitx:
+          - Electronics
+        ocw:
+          - Technology
+      name: Data Science, Analytics & Computer Technology
+      children:
+      - children: []
+        icon: RiRobot2Line
+        id: ea647bfc-cc83-42c7-b685-b5c2088b30af
+        mappings: []
+        name: Google Analytics
+"""
+
+    upsert_topic_data_string(base_topic_file)
+
+    assert mock_pluggy.called
+
+    main_topic = LearningResourceTopic.objects.filter(
+        topic_uuid="c06109bf-cff8-4873-b04b-f5e66e3e1764"
+    )
+
+    assert main_topic.exists()
+    main_topic = main_topic.get()
+
+    sub_topic = LearningResourceTopic.objects.filter(parent=main_topic)
+
+    assert sub_topic.exists()
+    sub_topic = sub_topic.get()
+
+    upsert_topic_data_string(new_topic_file)
+
+    new_topic = LearningResourceTopic.objects.filter(
+        topic_uuid="d335c250-1292-4391-a7cb-3181f803e0f3"
+    )
+
+    assert new_topic.exists()
+    assert new_topic.get().parent == sub_topic
+
+    upsert_topic_data_string(new_topic_nested_parent_file)
+
+    main_topic.refresh_from_db()
+
+    sub_topic = LearningResourceTopic.objects.filter(parent=main_topic)
+    assert sub_topic.count() == 2
+
+    for topic in sub_topic.all():
+        assert str(topic.topic_uuid) in [
+            "ea647bfc-cc83-42c7-b685-b5c2088b30af",
+            "4cd6156e-51a0-4da4-add4-6f81e106cd43",
+        ]
+
+
 def test_add_parent_topics_to_learning_resource(fixture_resource):
     """Ensure the parent topics get added to the resource."""
 

From 69ea9a5986f81831df262b779d3b0c5abfa62e6b Mon Sep 17 00:00:00 2001
From: James Kachel <james@jkachel.com>
Date: Tue, 6 Aug 2024 12:13:12 -0500
Subject: [PATCH 14/17] Rename my 0008 to 0009 to prevent conflict (#1374)

---
 ...g.py => 0009_topics_update_engineering_add_manufacturing.py} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename data_fixtures/migrations/{0008_topics_update_engineering_add_manufacturing.py => 0009_topics_update_engineering_add_manufacturing.py} (94%)

diff --git a/data_fixtures/migrations/0008_topics_update_engineering_add_manufacturing.py b/data_fixtures/migrations/0009_topics_update_engineering_add_manufacturing.py
similarity index 94%
rename from data_fixtures/migrations/0008_topics_update_engineering_add_manufacturing.py
rename to data_fixtures/migrations/0009_topics_update_engineering_add_manufacturing.py
index dc6680d720..bb3e385db7 100644
--- a/data_fixtures/migrations/0008_topics_update_engineering_add_manufacturing.py
+++ b/data_fixtures/migrations/0009_topics_update_engineering_add_manufacturing.py
@@ -52,7 +52,7 @@ class Migration(migrations.Migration):
     dependencies = [
         (
             "data_fixtures",
-            "0007_topic_mappings_edx_add_programming_coding_to_computer_science",
+            "0008_unpublish_empty_topic_channels",
         ),
     ]
 

From 9a182814289f0201b12293dba7f7c1462ee8ea13 Mon Sep 17 00:00:00 2001
From: Chris Chudzicki <christopher.chudzicki@gmail.com>
Date: Tue, 6 Aug 2024 13:31:57 -0400
Subject: [PATCH 15/17] sort before comparing (#1372)

---
 learning_resources_search/serializers_test.py | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/learning_resources_search/serializers_test.py b/learning_resources_search/serializers_test.py
index 254217d6aa..8ce934e30f 100644
--- a/learning_resources_search/serializers_test.py
+++ b/learning_resources_search/serializers_test.py
@@ -557,19 +557,19 @@ def test_serialize_bulk_learning_resources(mocker):
     every existing learning resource
     """
     # NOTE: explicitly creating a fixed number per type for a deterministic query count
-    resources = [
-        *factories.LearningResourceFactory.create_batch(5, is_course=True),
-        *factories.LearningResourceFactory.create_batch(5, is_program=True),
-        *factories.LearningResourceFactory.create_batch(5, is_podcast=True),
-        *factories.LearningResourceFactory.create_batch(5, is_podcast_episode=True),
-        *factories.LearningResourceFactory.create_batch(5, is_video=True),
-        *factories.LearningResourceFactory.create_batch(5, is_video_playlist=True),
-    ]
-    resources = LearningResource.objects.for_serialization()
-    results = list(
+    factories.LearningResourceFactory.create_batch(5, is_course=True)
+    factories.LearningResourceFactory.create_batch(5, is_program=True)
+    factories.LearningResourceFactory.create_batch(5, is_podcast=True)
+    factories.LearningResourceFactory.create_batch(5, is_podcast_episode=True)
+    factories.LearningResourceFactory.create_batch(5, is_video=True)
+    factories.LearningResourceFactory.create_batch(5, is_video_playlist=True)
+
+    resources = LearningResource.objects.order_by("id").for_serialization()
+    results = sorted(
         serializers.serialize_bulk_learning_resources(
             [resource.id for resource in resources]
-        )
+        ),
+        key=lambda x: x["id"],
     )
 
     expected = []

From b76bd2a3b188a9a63796d84f37043bf7a2f30a4e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 14:35:25 -0400
Subject: [PATCH 16/17] Update dependency redis to v5 (#1244)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 1b30d6b599..36079ba963 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -3181,17 +3181,17 @@ files = [
 
 [[package]]
 name = "redis"
-version = "4.6.0"
+version = "5.0.8"
 description = "Python client for Redis database and key-value store"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "redis-4.6.0-py3-none-any.whl", hash = "sha256:e2b03db868160ee4591de3cb90d40ebb50a90dd302138775937f6a42b7ed183c"},
-    {file = "redis-4.6.0.tar.gz", hash = "sha256:585dc516b9eb042a619ef0a39c3d7d55fe81bdb4df09a52c9cdde0d07bf1aa7d"},
+    {file = "redis-5.0.8-py3-none-any.whl", hash = "sha256:56134ee08ea909106090934adc36f65c9bcbbaecea5b21ba704ba6fb561f8eb4"},
+    {file = "redis-5.0.8.tar.gz", hash = "sha256:0c5b10d387568dfe0698c6fad6615750c24170e548ca2deac10c649d463e9870"},
 ]
 
 [package.extras]
-hiredis = ["hiredis (>=1.0.0)"]
+hiredis = ["hiredis (>1.0.0)"]
 ocsp = ["cryptography (>=36.0.1)", "pyopenssl (==20.0.1)", "requests (>=2.26.0)"]
 
 [[package]]
@@ -4288,4 +4288,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools",
 [metadata]
 lock-version = "2.0"
 python-versions = "3.12.4"
-content-hash = "8f39ba1d5b71fac8024762d21dc054395d2bf3532e27d870ef8f5527f1145a52"
+content-hash = "755736644d67abf96717b92215eceb9f07803a3853ff9570244fe2c9b7e37d20"
diff --git a/pyproject.toml b/pyproject.toml
index e08b49bd3b..37367bb051 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -55,7 +55,7 @@ pygithub = "^1.44.1"
 python-dateutil = "^2.8.2"
 python-rapidjson = "^1.8"
 pyyaml = "^6.0.0"
-redis = "^4.5.5"
+redis = "^5.0.0"
 requests = "^2.31.0"
 sentry-sdk = "^2.0.0"
 social-auth-app-django = "^5.2.0"

From 05b5b49e2d6c6550df870f347edff89d55d361a6 Mon Sep 17 00:00:00 2001
From: Doof <mitx-devops@mit.edu>
Date: Tue, 6 Aug 2024 18:45:37 +0000
Subject: [PATCH 17/17] Release 0.15.1

---
 RELEASE.rst      | 20 ++++++++++++++++++++
 main/settings.py |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/RELEASE.rst b/RELEASE.rst
index 66f5c7305d..370ef5ef0b 100644
--- a/RELEASE.rst
+++ b/RELEASE.rst
@@ -1,6 +1,26 @@
 Release Notes
 =============
 
+Version 0.15.1
+--------------
+
+- Update dependency redis to v5 (#1244)
+- sort before comparing (#1372)
+- Rename my 0008 to 0009 to prevent conflict (#1374)
+- Add Manufacturing topic; update upserter to make adding child topics easier (#1364)
+- Publish topic channels based on resource count (#1349)
+- Update dependency opensearch-dsl to v2 (#1242)
+- Update dependency opensearch-py to v2 (#1243)
+- Fix issue with User List cards not updating on edit (#1361)
+- Update dependency django-anymail to v11 (#1207)
+- Update CI to check data migrations for conflicts (#1368)
+- Fix frontend sentry configuration (#1362)
+- Migrate config renovate.json (#1367)
+- Update dependency sentry-sdk to v2 [SECURITY] (#1366)
+- add a bullet about collecting demographics to PrivacyPage.tsx (#1355)
+- user list UI updates (#1348)
+- Subscription email template updates (#1311)
+
 Version 0.15.0 (Released August 05, 2024)
 --------------
 
diff --git a/main/settings.py b/main/settings.py
index b5a6dbce1b..bd66e52f93 100644
--- a/main/settings.py
+++ b/main/settings.py
@@ -33,7 +33,7 @@
 from main.settings_pluggy import *  # noqa: F403
 from openapi.settings_spectacular import open_spectacular_settings
 
-VERSION = "0.15.0"
+VERSION = "0.15.1"
 
 log = logging.getLogger()