Merge branch 'Simon-Initiative:master' into master

dtiwarATS · Sep 9, 2024 · 79584ec · 79584ec
2 parents 907b3a1 + 9d2ee1e
commit 79584ec
Show file tree

Hide file tree

Showing 34 changed files with 6,837 additions and 336 deletions.
diff --git a/assets/package.json b/assets/package.json
@@ -190,7 +190,7 @@
     "ts-loader": "^9.2.1",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
     "type-coverage": "^2.18.0",
-    "webpack": "^5.76.0",
+    "webpack": "^5.94.0",
     "webpack-bundle-analyzer": "^4.7.0",
     "webpack-cli": "^4.7.0",
     "webpack-license-plugin": "^4.2.2"

diff --git a/assets/yarn.lock b/assets/yarn.lock
diff --git a/lib/oli/resources/activity_browse.ex b/lib/oli/resources/activity_browse.ex
@@ -32,10 +32,10 @@ defmodule Oli.Resources.ActivityBrowse do
           |> Enum.join(" & ")
 
         dynamic(
-          [rev, _, _, _],
+          [rev, ar, _, _, _],
           fragment(
             "to_tsvector('simple', ?) @@ to_tsquery('simple', ?)",
-            rev.title,
+            ar.petite_label,
             ^search_term
           )
         )
@@ -59,15 +59,20 @@ defmodule Oli.Resources.ActivityBrowse do
 
     query =
       Revision
-      |> join(:left, [rev], pr in Oli.Publishing.PublishedResource, on: pr.revision_id == rev.id)
-      |> join(:left, [_, pr], pub in Oli.Publishing.Publications.Publication,
+      |> join(:left, [rev], ar in Oli.Activities.ActivityRegistration,
+        on: ar.id == rev.activity_type_id
+      )
+      |> join(:left, [rev, _ar], pr in Oli.Publishing.PublishedResource,
+        on: pr.revision_id == rev.id
+      )
+      |> join(:left, [_, _, pr], pub in Oli.Publishing.Publications.Publication,
         on: pr.publication_id == pub.id
       )
-      |> join(:left, [_, _, pub], proj in Oli.Authoring.Course.Project,
+      |> join(:left, [_, _, _, pub], proj in Oli.Authoring.Course.Project,
         on: pub.project_id == proj.id
       )
       |> where(
-        [rev, _, pub, proj],
+        [rev, _, _, pub, proj],
         proj.id == ^project_id and is_nil(pub.published) and
           rev.resource_type_id == ^activity_resource_type_id
       )

diff --git a/lib/oli_web/icons.ex b/lib/oli_web/icons.ex
@@ -28,6 +28,17 @@ defmodule OliWeb.Icons do
     """
   end
 
+  def finish_quiz_flag(assigns) do
+    ~H"""
+    <svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M10.7601 2C11.0051 2.00003 11.2415 2.08996 11.4245 2.25272C11.6075 2.41547 11.7245 2.63975 11.7531 2.883L11.7601 3V3.35L20.1661 7.086C20.9181 7.421 20.9561 8.451 20.2791 8.856L20.1661 8.914L11.7601 12.649V20H12.7601C13.015 20.0003 13.2602 20.0979 13.4455 20.2728C13.6308 20.4478 13.7424 20.687 13.7573 20.9414C13.7722 21.1958 13.6894 21.4464 13.5259 21.6418C13.3623 21.8373 13.1302 21.9629 12.8771 21.993L12.7601 22H8.76012C8.50524 21.9997 8.26009 21.9021 8.07475 21.7272C7.88942 21.5522 7.77789 21.313 7.76295 21.0586C7.74801 20.8042 7.8308 20.5536 7.99439 20.3582C8.15798 20.1627 8.39003 20.0371 8.64312 20.007L8.76012 20H9.76012V3C9.76012 2.73478 9.86548 2.48043 10.053 2.29289C10.2406 2.10536 10.4949 2 10.7601 2Z"
+        fill="#0080FF"
+      />
+    </svg>
+    """
+  end
+
   attr :class, :string, default: ""
 
   def transparent_flag(assigns) do