From d3f4d9948e9ebb213a80adbbdf54144cc7d35da7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Cirio?= Date: Mon, 2 Dec 2024 11:36:37 -0300 Subject: [PATCH 1/6] [FEATURE] [MER-3961] Remove Admin `Browse collab spaces` (#5276) https://eliterate.atlassian.net/browse/MER-3961 --- lib/oli_web/live/admin/admin_view.ex | 5 - .../live/collaboration_live/index_view.ex | 87 +++------ lib/oli_web/live/sections/overview_view.ex | 2 +- lib/oli_web/router.ex | 5 +- test/oli_web/live/admin_live_test.exs | 12 -- test/oli_web/live/collaboration_live_test.exs | 166 +----------------- 6 files changed, 36 insertions(+), 241 deletions(-) diff --git a/lib/oli_web/live/admin/admin_view.ex b/lib/oli_web/live/admin/admin_view.ex index 2dc20f5cb32..d56f76b6846 100644 --- a/lib/oli_web/live/admin/admin_view.ex +++ b/lib/oli_web/live/admin/admin_view.ex @@ -81,11 +81,6 @@ defmodule OliWeb.Admin.AdminView do Browse all Course Sections -
  • - - Browse all Collaborative Spaces - -
  • Ingest Project
    • diff --git a/lib/oli_web/live/collaboration_live/index_view.ex b/lib/oli_web/live/collaboration_live/index_view.ex index 2ff5bdf7436..26ca94e6b9f 100644 --- a/lib/oli_web/live/collaboration_live/index_view.ex +++ b/lib/oli_web/live/collaboration_live/index_view.ex @@ -3,10 +3,8 @@ defmodule OliWeb.CollaborationLive.IndexView do use OliWeb.Common.SortableTable.TableHandlers alias Oli.Resources.Collaboration - alias OliWeb.Admin.AdminView alias OliWeb.Common.{Breadcrumb, Filter, Listing, SessionContext} - alias OliWeb.CollaborationLive.{AdminTableModel, InstructorTableModel} - alias OliWeb.Router.Helpers, as: Routes + alias OliWeb.CollaborationLive.InstructorTableModel alias alias OliWeb.Sections.Mount @title "Collaborative Spaces" @@ -18,75 +16,49 @@ defmodule OliWeb.CollaborationLive.IndexView do query_str = String.downcase(query) Enum.filter(socket.assigns.collab_spaces, fn cs -> - String.contains?(String.downcase(cs.page.title), query_str) or - (socket.assigns.live_action == :admin and - String.contains?(String.downcase(cs.project.title), query_str)) + String.contains?(String.downcase(cs.page.title), query_str) end) end - def live_path(%{assigns: %{live_action: :admin}} = socket, params), - do: Routes.collab_spaces_index_path(socket, :admin, params) - def live_path( - %{assigns: %{live_action: :instructor, section_slug: section_slug}} = socket, + %{assigns: %{section_slug: section_slug}} = _socket, params ), - do: Routes.collab_spaces_index_path(socket, :instructor, section_slug, params) + do: ~p"/sections/#{section_slug}/collaborative_spaces?#{params}" - def breadcrumb(:admin, _) do - AdminView.breadcrumb() ++ - [ - Breadcrumb.new(%{ - full_title: @title, - link: Routes.collab_spaces_index_path(OliWeb.Endpoint, :admin) - }) - ] - end - - def breadcrumb(:instructor, section) do + def breadcrumb(section) do OliWeb.Sections.OverviewView.set_breadcrumbs(:instructor, section) ++ [ Breadcrumb.new(%{ full_title: @title, - link: Routes.collab_spaces_index_path(OliWeb.Endpoint, :instructor, section.slug) + link: ~p"/sections/#{section.slug}/collaborative_spaces" }) ] end def mount(params, session, socket) do - live_action = socket.assigns.live_action ctx = SessionContext.init(socket, session) section_slug = params["section_slug"] - do_mount = fn -> - {collab_spaces, table_model} = - get_collab_spaces_and_table_model(live_action, ctx, section_slug) - - {:ok, - assign(socket, - breadcrumbs: breadcrumb(live_action, socket.assigns[:section]), - section_slug: section_slug, - collab_spaces: collab_spaces, - table_model: table_model, - total_count: length(collab_spaces), - limit: 20, - offset: 0, - query: "" - )} - end - - case live_action do - :instructor -> - case Mount.for(section_slug, session) do - {:error, e} -> - Mount.handle_error(socket, {:error, e}) - - {_type, _user, _section} -> - do_mount.() - end - - :admin -> - do_mount.() + case Mount.for(section_slug, session) do + {:error, e} -> + Mount.handle_error(socket, {:error, e}) + + {_type, _user, _section} -> + {collab_spaces, table_model} = + get_collab_spaces_and_table_model(ctx, section_slug) + + {:ok, + assign(socket, + breadcrumbs: breadcrumb(socket.assigns[:section]), + section_slug: section_slug, + collab_spaces: collab_spaces, + table_model: table_model, + total_count: length(collab_spaces), + limit: 20, + offset: 0, + query: "" + )} end end @@ -118,14 +90,7 @@ defmodule OliWeb.CollaborationLive.IndexView do """ end - defp get_collab_spaces_and_table_model(:admin, ctx, _) do - collab_spaces = Collaboration.list_collaborative_spaces() - {:ok, table_model} = AdminTableModel.new(collab_spaces, ctx) - - {collab_spaces, table_model} - end - - defp get_collab_spaces_and_table_model(:instructor, ctx, section_slug) do + defp get_collab_spaces_and_table_model(ctx, section_slug) do {_, collab_spaces} = Collaboration.list_collaborative_spaces_in_section(section_slug) {:ok, table_model} = InstructorTableModel.new(collab_spaces, ctx) diff --git a/lib/oli_web/live/sections/overview_view.ex b/lib/oli_web/live/sections/overview_view.ex index 51f825964d9..44a90071a08 100644 --- a/lib/oli_web/live/sections/overview_view.ex +++ b/lib/oli_web/live/sections/overview_view.ex @@ -252,7 +252,7 @@ defmodule OliWeb.Sections.OverviewView do
  • Browse Collaborative Spaces diff --git a/lib/oli_web/router.ex b/lib/oli_web/router.ex index caec0c2eb48..6f3f3f0159d 100644 --- a/lib/oli_web/router.ex +++ b/lib/oli_web/router.ex @@ -1238,9 +1238,7 @@ defmodule OliWeb.Router do Sections.GatingAndScheduling ) - live("/collaborative_spaces", CollaborationLive.IndexView, :instructor, - as: :collab_spaces_index - ) + live("/collaborative_spaces", CollaborationLive.IndexView, as: :collab_spaces_index) live( "/assessment_settings/:active_tab/:assessment_id", @@ -1358,7 +1356,6 @@ defmodule OliWeb.Router do live("/products", Products.ProductsView) live("/products/:product_id/discounts", Products.Payments.Discounts.ProductsIndexView) - live("/collaborative_spaces", CollaborationLive.IndexView, :admin, as: :collab_spaces_index) live( "/products/:product_id/discounts/new", diff --git a/test/oli_web/live/admin_live_test.exs b/test/oli_web/live/admin_live_test.exs index 591b42aaa4a..6c86f6356ed 100644 --- a/test/oli_web/live/admin_live_test.exs +++ b/test/oli_web/live/admin_live_test.exs @@ -281,12 +281,6 @@ defmodule OliWeb.AdminLiveTest do "Browse all Course Sections" ) - assert has_element?( - view, - "a[href=\"#{~p"/admin/collaborative_spaces"}\"]", - "Browse all Collaborative Spaces" - ) - assert has_element?( view, "a[href=\"#{Routes.live_path(OliWeb.Endpoint, OliWeb.Admin.Ingest)}\"]", @@ -425,12 +419,6 @@ defmodule OliWeb.AdminLiveTest do "Browse all Course Sections" ) - assert has_element?( - view, - "a[href=\"#{~p"/admin/collaborative_spaces"}\"]", - "Browse all Collaborative Spaces" - ) - assert has_element?( view, "a[href=\"#{Routes.live_path(OliWeb.Endpoint, OliWeb.Admin.Ingest)}\"]", diff --git a/test/oli_web/live/collaboration_live_test.exs b/test/oli_web/live/collaboration_live_test.exs index 42b1a5319ec..99dde434ee1 100644 --- a/test/oli_web/live/collaboration_live_test.exs +++ b/test/oli_web/live/collaboration_live_test.exs @@ -19,8 +19,8 @@ defmodule OliWeb.CollaborationLiveTest do do: Routes.page_delivery_path(OliWeb.Endpoint, :page_preview, section_slug, page_revision_slug) - defp live_view_collab_space_index(type, section_slug \\ []), - do: Routes.collab_spaces_index_path(OliWeb.Endpoint, type, section_slug) + defp live_view_collab_space_index(section_slug), + do: ~p"/sections/#{section_slug}/collaborative_spaces" defp live_view_student_page(section_slug, page_revision_slug), do: Routes.page_delivery_path(OliWeb.Endpoint, :page, section_slug, page_revision_slug) @@ -182,21 +182,12 @@ defmodule OliWeb.CollaborationLiveTest do |> html_response(403) end - test "redirects to new session when accessing the admin index view", %{ - conn: conn - } do - assert conn - |> get(live_view_collab_space_index(:admin)) - |> html_response(302) =~ - "You are being redirected" - end - test "redirects to new session when accessing the instructor index view", %{ conn: conn, section: section } do assert conn - |> get(live_view_collab_space_index(:instructor, section.slug)) + |> get(live_view_collab_space_index(section.slug)) |> html_response(302) =~ "You are being redirected" end @@ -241,15 +232,6 @@ defmodule OliWeb.CollaborationLiveTest do "You are being get(live_view_collab_space_index(:admin)) - |> html_response(302) =~ - "You are being redirected" - end - test "redirects to unauthorized when accessing the instructor index view", %{ conn: conn, section: section, @@ -258,7 +240,7 @@ defmodule OliWeb.CollaborationLiveTest do enroll_user_to_section(user, section, :context_learner) assert conn - |> get(live_view_collab_space_index(:instructor, section.slug)) + |> get(live_view_collab_space_index(section.slug)) |> html_response(302) =~ "You are being redirected" end @@ -276,30 +258,6 @@ defmodule OliWeb.CollaborationLiveTest do end end - describe "user cannot access when is logged in as an author but is not a system admin or author of the project" do - setup [:author_conn, :create_project_and_section] - - test "redirects to projects when accessing the admin index view", %{ - conn: conn - } do - assert conn - |> get(live_view_collab_space_index(:admin)) - |> response(403) =~ - "Forbidden" - end - - test "redirects to projects when accessing the author edit page view", %{ - conn: conn, - project: project, - page_revision: page_revision - } do - assert conn - |> get(live_view_author_edit(project.slug, page_revision.slug)) - |> html_response(302) =~ - "You are being redirected" - end - end - describe "user can access when is logged in as an author, is not a system admin but is author of the project" do setup [:create_project_and_section] @@ -698,114 +656,6 @@ defmodule OliWeb.CollaborationLiveTest do end end - describe "admin - index view" do - setup [:admin_conn, :create_project_and_section] - - test "loads correctly", %{ - conn: conn, - page_revision: page_revision, - page_revision_cs: page_revision_cs, - project: project - } do - {:ok, view, _html} = live(conn, live_view_collab_space_index(:admin)) - - assert has_element?(view, "#collaborative-spaces-table") - assert has_element?(view, "td", "#{project.title}") - assert has_element?(view, "td", "#{page_revision_cs.title}") - assert has_element?(view, "td", "2") - assert has_element?(view, "td", "#{page_revision.title}") - end - - test "applies searching", %{ - conn: conn, - page_revision: page_revision, - page_revision_cs: page_revision_cs - } do - {:ok, view, _html} = live(conn, live_view_collab_space_index(:admin)) - - view - |> element("input[phx-blur=\"change_search\"]") - |> render_blur(%{value: "other revision A"}) - - view - |> element("button[phx-click=\"apply_search\"]") - |> render_click() - - refute has_element?(view, "td", "#{page_revision_cs.title}") - assert has_element?(view, "td", "#{page_revision.title}") - - view - |> element("button[phx-click=\"reset_search\"]") - |> render_click() - - assert has_element?(view, "td", "#{page_revision_cs.title}") - assert has_element?(view, "td", "#{page_revision.title}") - end - - test "applies sorting", %{ - conn: conn - } do - {:ok, view, _html} = live(conn, live_view_collab_space_index(:admin)) - - view - |> element("th[phx-click=\"sort\"]:first-of-type") - |> render_click(%{sort_by: "page_title"}) - - assert view - |> element("tr:first-child > td:nth-child(2)") - |> render() =~ - "Other revision A" - - view - |> element("th[phx-click=\"sort\"]:first-of-type") - |> render_click(%{sort_by: "page_title"}) - - assert view - |> element("tr:first-child > td:nth-child(2)") - |> render() =~ - "Other revision B" - end - - test "applies paging", %{ - conn: conn, - project: project, - publication: publication, - author: author - } do - for i <- 0..20 do - create_for_paging(project.id, publication, author, "Page #{i}") - end - - {:ok, view, _html} = live(conn, live_view_collab_space_index(:admin)) - - view - |> element("th[phx-click=sort][phx-value-sort_by=page_title]") - |> render_click() - - assert view - |> element("tr:first-child > td:nth-child(2)") - |> render() =~ - "Other revision A" - - assert view - |> element("tr:nth-child(2) > td:nth-child(2)") - |> render() =~ - "Other revision B" - end - - test "renders datetimes using the local timezone", context = %{second_post: second_post} do - {:ok, conn: conn, ctx: session_context} = set_timezone(context) - - {:ok, view, _html} = live(conn, live_view_collab_space_index(:admin)) - - assert has_element?( - view, - "tr", - OliWeb.Common.Utils.render_date(second_post, :inserted_at, session_context) - ) - end - end - describe "instructor - index view" do setup [:user_conn, :create_project_and_section] @@ -818,7 +668,7 @@ defmodule OliWeb.CollaborationLiveTest do } do enroll_user_to_section(user, section, :context_instructor) - {:ok, view, _html} = live(conn, live_view_collab_space_index(:instructor, section.slug)) + {:ok, view, _html} = live(conn, live_view_collab_space_index(section.slug)) assert has_element?(view, "#collaborative-spaces-table") assert has_element?(view, "td", "#{page_revision_cs.title}") @@ -834,7 +684,7 @@ defmodule OliWeb.CollaborationLiveTest do user: user } do enroll_user_to_section(user, section, :context_instructor) - {:ok, view, _html} = live(conn, live_view_collab_space_index(:instructor, section.slug)) + {:ok, view, _html} = live(conn, live_view_collab_space_index(section.slug)) view |> element("input[phx-blur=\"change_search\"]") @@ -861,7 +711,7 @@ defmodule OliWeb.CollaborationLiveTest do user: user } do enroll_user_to_section(user, section, :context_instructor) - {:ok, view, _html} = live(conn, live_view_collab_space_index(:instructor, section.slug)) + {:ok, view, _html} = live(conn, live_view_collab_space_index(section.slug)) view |> element("th[phx-click=sort][phx-value-sort_by=page_title]") @@ -899,7 +749,7 @@ defmodule OliWeb.CollaborationLiveTest do {:ok, _sr} = Sections.create_section_resources(section, publication) enroll_user_to_section(user, section, :context_instructor) - {:ok, view, _html} = live(conn, live_view_collab_space_index(:instructor, section.slug)) + {:ok, view, _html} = live(conn, live_view_collab_space_index(section.slug)) view |> element("th[phx-click=sort][phx-value-sort_by=page_title]") From c5e86cb768fa49aef850c200e9ab52ff81d5199f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Cirio?= Date: Mon, 2 Dec 2024 16:18:26 -0300 Subject: [PATCH 2/6] [FEATURE] [MER-4016] Add more parameters to assignment launch page (#5277) * add page termos on prologue page * fix spacing between elements to match figma desing * fix warning * consider default scoring strategy * add tests --- .../live/delivery/student/prologue_live.ex | 5 +- .../live/delivery/student/review_live.ex | 2 +- lib/oli_web/live/delivery/student/utils.ex | 218 +++++++++++++++++- .../delivery/student/prologue_live_test.exs | 83 +++++++ .../live/delivery/student/utils_test.exs | 11 + 5 files changed, 315 insertions(+), 4 deletions(-) diff --git a/lib/oli_web/live/delivery/student/prologue_live.ex b/lib/oli_web/live/delivery/student/prologue_live.ex index 7ab38545c4b..72e9ff3d6ef 100644 --- a/lib/oli_web/live/delivery/student/prologue_live.ex +++ b/lib/oli_web/live/delivery/student/prologue_live.ex @@ -2,7 +2,7 @@ defmodule OliWeb.Delivery.Student.PrologueLive do use OliWeb, :live_view import OliWeb.Delivery.Student.Utils, - only: [page_header: 1] + only: [page_header: 1, page_terms: 1] alias Oli.Accounts.User alias Oli.Delivery.Attempts.Core.ResourceAttempt @@ -97,8 +97,9 @@ defmodule OliWeb.Delivery.Student.PrologueLive do index={@current_page["index"]} container_label={Utils.get_container_label(@current_page["id"], @section)} /> -
    +
    + <.page_terms effective_settings={@page_context.effective_settings} ctx={@ctx} /> <.attempts_summary page_context={@page_context} attempt_message={@attempt_message} diff --git a/lib/oli_web/live/delivery/student/review_live.ex b/lib/oli_web/live/delivery/student/review_live.ex index af291494716..40cbc7c72e8 100644 --- a/lib/oli_web/live/delivery/student/review_live.ex +++ b/lib/oli_web/live/delivery/student/review_live.ex @@ -167,7 +167,7 @@ defmodule OliWeb.Delivery.Student.ReviewLive do objectives={@objectives} container_label={Utils.get_container_label(@current_page["id"], @section)} /> -
    +
    <%= raw(@html) %>
    <.link diff --git a/lib/oli_web/live/delivery/student/utils.ex b/lib/oli_web/live/delivery/student/utils.ex index fde7e8d3df3..395a3ba693d 100644 --- a/lib/oli_web/live/delivery/student/utils.ex +++ b/lib/oli_web/live/delivery/student/utils.ex @@ -27,7 +27,7 @@ defmodule OliWeb.Delivery.Student.Utils do def page_header(assigns) do ~H""" -
    +
    @@ -173,6 +173,222 @@ defmodule OliWeb.Delivery.Student.Utils do """ end + attr :effective_settings, Oli.Delivery.Settings.Combined + attr :ctx, SessionContext + + def page_terms(assigns) do + ~H""" +
    + + TERMS + +
      +
    • + <.page_due_term effective_settings={@effective_settings} ctx={@ctx} /> +
      • +
    • + <.page_submission_term effective_settings={@effective_settings} ctx={@ctx} /> +
      • +
    • + <%= page_scoring_term(@effective_settings.scoring_strategy_id) %> +
      • +
    +
    + """ + end + + attr :effective_settings, Oli.Delivery.Settings.Combined + attr :ctx, SessionContext + + defp page_due_term(%{effective_settings: %{end_date: end_date}} = assigns) + when not is_nil(end_date) do + ~H""" +
    + + <%= "This assignment is #{scheduling_type(@effective_settings.scheduling_type)}" %> + + + <%= FormatDateTime.to_formatted_datetime( + @effective_settings.end_date, + @ctx, + "{WDshort} {Mshort} {D}, {YYYY} by {h12}:{m}{am}." + ) %> + +
    + """ + end + + defp page_due_term(%{effective_settings: %{end_date: nil}} = assigns) do + ~H""" +
    + + <%= "This assignment is" %> + + + not yet scheduled. + +
    + """ + end + + defp scheduling_type(:due_by), do: "due on" + defp scheduling_type(_scheduling_type), do: "suggested by" + + defp page_submission_term(%{effective_settings: %{time_limit: 0, grace_period: 0}} = assigns) do + ~H""" +
    + + Your work will automatically be submitted at + + + <%= FormatDateTime.to_formatted_datetime( + @effective_settings.end_date, + @ctx, + "{h12}:{m}{am} on {WDshort} {Mshort} {D}, {YYYY}." + ) %> + +
    + """ + end + + defp page_submission_term( + %{effective_settings: %{time_limit: 0, grace_period: grace_period}} = assigns + ) + when grace_period > 0 do + ~H""" +
    + + Your work will automatically be submitted at + + + <%= Timex.shift(@effective_settings.end_date, minutes: @effective_settings.grace_period) + |> FormatDateTime.to_formatted_datetime( + @ctx, + "{h12}:{m}{am} on {WDshort} {Mshort} {D}, {YYYY}." + ) %> + +
    + """ + end + + defp page_submission_term( + %{effective_settings: %{time_limit: time_limit, grace_period: 0}} = assigns + ) + when time_limit > 0 do + ~H""" +
    + + Your work will automatically be submitted + + + <%= parse_minutes(@effective_settings.time_limit) %> + + + after you click the Begin button + +
    + """ + end + + defp page_submission_term( + %{ + effective_settings: %{ + time_limit: time_limit, + grace_period: grace_period, + end_date: end_date + } + } = assigns + ) + when time_limit > 0 and grace_period > 0 do + # when we have both time limit and grace period, + # the end date time that comes first is the one that should be considered. + # For calculating the start_date_with_time_limit we assume the student is about to begin the attempt + now = Oli.DateTime.utc_now() + start_date_with_time_limit = Timex.shift(now, minutes: time_limit) + end_date_with_grace_period = Timex.shift(end_date, minutes: grace_period) + + if DateTime.compare(start_date_with_time_limit, end_date_with_grace_period) == :lt do + ~H""" +
    + + Your work will automatically be submitted + + + <%= parse_minutes(@effective_settings.time_limit) %> + + + after you click the Begin button + +
    + """ + else + ~H""" +
    + + Your work will automatically be submitted at + + + <%= Timex.shift(@effective_settings.end_date, minutes: @effective_settings.grace_period) + |> FormatDateTime.to_formatted_datetime( + @ctx, + "{h12}:{m}{am} on {WDshort} {Mshort} {D}, {YYYY}." + ) %> + +
    + """ + end + end + + @doc """ + Parses the minutes into a human-readable format. + + iex> parse_minutes(1) + "1 minute" + + iex> parse_minutes(60) + "1 hour" + + iex> parse_minutes(61) + "1 hour and 1 minute" + + iex> parse_minutes(120) + "2 hours" + + iex> parse_minutes(125) + "2 hours and 5 minutes" + """ + def parse_minutes(minutes) when minutes <= 60, do: to_minutes(minutes) + + def parse_minutes(minutes) when minutes > 60 do + hours = div(minutes, 60) + minutes = rem(minutes, 60) + + if minutes != 0, + do: "#{to_hours(hours)} and #{to_minutes(minutes)}", + else: "#{to_hours(hours)}" + end + + defp to_minutes(1), do: "1 minute" + defp to_minutes(minutes), do: "#{minutes} minutes" + defp to_hours(1), do: "1 hour" + defp to_hours(hours), do: "#{hours} hours" + + defp page_scoring_term(1 = _scoring_strategy_id), + do: "Your overall score for this assignment will be the average score of your attempts." + + defp page_scoring_term(3 = _scoring_strategy_id), + do: "Your overall score for this assignment will be the score of your last attempt." + + defp page_scoring_term(4 = _scoring_strategy_id), + do: "Your overall score for this assignment will be the total sum of your attempts." + + # scoring strategy 2 is the default scoring strategy + defp page_scoring_term(_scoring_strategy_id), + do: "Your overall score for this assignment will be the score of your best attempt." + @doc """ Returns the scheduling type label for the container. When all the contained resources are of :read_by type, then diff --git a/test/oli_web/live/delivery/student/prologue_live_test.exs b/test/oli_web/live/delivery/student/prologue_live_test.exs index 5c6544d18a0..2b9972e4ffb 100644 --- a/test/oli_web/live/delivery/student/prologue_live_test.exs +++ b/test/oli_web/live/delivery/student/prologue_live_test.exs @@ -1053,6 +1053,89 @@ defmodule OliWeb.Delivery.Student.PrologueLiveTest do assert href == "/sections/#{section.slug}/learn?target_resource_id=#{graded_adaptive_page_revision.resource_id}" end + + test "page terms are shown correctly when page is not yet scheduled", + %{ + conn: conn, + user: user, + section: section, + page_5: page_5 + } do + Sections.enroll(user.id, section.id, [ContextRoles.get_role(:context_learner)]) + Sections.mark_section_visited_for_student(section, user) + + {:ok, view, _html} = live(conn, Utils.prologue_live_path(section.slug, page_5.slug)) + + assert view + |> element("#page_terms") + |> render() =~ "not yet scheduled." + end + + test "page terms are shown correctly when page is scheduled", + %{ + conn: conn, + user: user, + section: section, + page_2: page_2 + } do + Sections.enroll(user.id, section.id, [ContextRoles.get_role(:context_learner)]) + Sections.mark_section_visited_for_student(section, user) + + {:ok, view, _html} = live(conn, Utils.prologue_live_path(section.slug, page_2.slug)) + + assert view + |> element("#page_due_terms") + |> render() =~ + "This assignment is suggested by" + + assert view + |> element("#page_due_terms") + |> render() =~ + "Tue Nov 14, 2023 by 8:00pm." + + assert view + |> element("#page_submission_terms") + |> render() =~ + "Your work will automatically be submitted at" + + assert view + |> element("#page_submission_terms") + |> render() =~ + "8:00pm on Tue Nov 14, 2023" + + assert view + |> element("#page_scoring_terms") + |> render() =~ + "Your overall score for this assignment will be the score of your best attempt." + + Sections.get_section_resource(section.id, page_2.resource_id) + |> Sections.update_section_resource(%{ + scoring_strategy_id: 1, + time_limit: 90 + }) + + {:ok, view, _html} = live(conn, Utils.prologue_live_path(section.slug, page_2.slug)) + + assert view + |> element("#page_submission_terms") + |> render() =~ + "Your work will automatically be submitted" + + assert view + |> element("#page_submission_terms") + |> render() =~ + "1 hour and 30 minutes" + + assert view + |> element("#page_submission_terms") + |> render() =~ + "after you click the Begin button" + + assert view + |> element("#page_scoring_terms") + |> render() =~ + "Your overall score for this assignment will be the average score of your attempts." + end end describe "offline detector" do diff --git a/test/oli_web/live/delivery/student/utils_test.exs b/test/oli_web/live/delivery/student/utils_test.exs index b6769a57a3c..2e4c6dbd34d 100644 --- a/test/oli_web/live/delivery/student/utils_test.exs +++ b/test/oli_web/live/delivery/student/utils_test.exs @@ -212,4 +212,15 @@ defmodule OliWeb.Delivery.Student.UtilsTest do assert Utils.format_time_remaining(~U[2024-05-10 11:30:20Z]) == "00:00:00" end end + + describe "parse_minutes/1" do + test "parses the minutes into a human-readable format" do + assert Utils.parse_minutes(1) == "1 minute" + assert Utils.parse_minutes(5) == "5 minutes" + assert Utils.parse_minutes(60) == "60 minutes" + assert Utils.parse_minutes(90) == "1 hour and 30 minutes" + assert Utils.parse_minutes(120) == "2 hours" + assert Utils.parse_minutes(125) == "2 hours and 5 minutes" + end + end end From 9ed5e475b780cf08b37dc2897e33f334a3520442 Mon Sep 17 00:00:00 2001 From: Eli Knebel Date: Mon, 2 Dec 2024 17:23:06 -0500 Subject: [PATCH 3/6] debug auto deploy --- .github/workflows/auto-deploy.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/auto-deploy.yml b/.github/workflows/auto-deploy.yml index bc5baa87d58..0ce9a54d25c 100644 --- a/.github/workflows/auto-deploy.yml +++ b/.github/workflows/auto-deploy.yml @@ -7,6 +7,23 @@ on: types: [completed] jobs: + debug-auto-deploy: + name: Debug Auto Deploy + runs-on: ubuntu-latest + environment: + name: ${{ vars.AUTO_DEPLOY_TARGET }} + url: https://${{ vars.AUTO_DEPLOY_TARGET }} + + steps: + - name: Debug + id: info + run: | + echo "${{ vars.AUTO_DEPLOY_TARGET }}" + echo "${{ vars.AUTO_DEPLOY_ENABLED }}" + echo "${{ vars.AUTO_DEPLOY_REF }}" + echo "${{ github.event.workflow_run.conclusion }}" + echo "${{ github.event.workflow_run.head_branch }}" + auto-deploy: name: Auto Deploy if: vars.AUTO_DEPLOY_ENABLED == 'TRUE' && github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == vars.AUTO_DEPLOY_REF From 195a8968c9e773bc7269c81e9d74ffed4231dfd5 Mon Sep 17 00:00:00 2001 From: Eli Knebel Date: Mon, 2 Dec 2024 17:53:36 -0500 Subject: [PATCH 4/6] auto deploy debug --- .github/workflows/auto-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/auto-deploy.yml b/.github/workflows/auto-deploy.yml index 0ce9a54d25c..f9d2ac5c470 100644 --- a/.github/workflows/auto-deploy.yml +++ b/.github/workflows/auto-deploy.yml @@ -23,6 +23,7 @@ jobs: echo "${{ vars.AUTO_DEPLOY_REF }}" echo "${{ github.event.workflow_run.conclusion }}" echo "${{ github.event.workflow_run.head_branch }}" + echo "${{ vars.AUTO_DEPLOY_ENABLED == 'TRUE' && github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == vars.AUTO_DEPLOY_REF }}" auto-deploy: name: Auto Deploy From 98085718b13904f6fe625035996693f6b92142a4 Mon Sep 17 00:00:00 2001 From: Eli Knebel Date: Tue, 3 Dec 2024 10:41:31 -0500 Subject: [PATCH 5/6] debug auto deploy use always() --- .github/workflows/auto-deploy.yml | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/.github/workflows/auto-deploy.yml b/.github/workflows/auto-deploy.yml index f9d2ac5c470..c4d18c8856a 100644 --- a/.github/workflows/auto-deploy.yml +++ b/.github/workflows/auto-deploy.yml @@ -7,27 +7,10 @@ on: types: [completed] jobs: - debug-auto-deploy: - name: Debug Auto Deploy - runs-on: ubuntu-latest - environment: - name: ${{ vars.AUTO_DEPLOY_TARGET }} - url: https://${{ vars.AUTO_DEPLOY_TARGET }} - - steps: - - name: Debug - id: info - run: | - echo "${{ vars.AUTO_DEPLOY_TARGET }}" - echo "${{ vars.AUTO_DEPLOY_ENABLED }}" - echo "${{ vars.AUTO_DEPLOY_REF }}" - echo "${{ github.event.workflow_run.conclusion }}" - echo "${{ github.event.workflow_run.head_branch }}" - echo "${{ vars.AUTO_DEPLOY_ENABLED == 'TRUE' && github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == vars.AUTO_DEPLOY_REF }}" - auto-deploy: name: Auto Deploy - if: vars.AUTO_DEPLOY_ENABLED == 'TRUE' && github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == vars.AUTO_DEPLOY_REF + # always() is required here due to a strange bug in GitHub Actions https://github.com/actions/runner/issues/2205#issuecomment-1534430719 + if: always() && (vars.AUTO_DEPLOY_ENABLED == 'TRUE' && github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == vars.AUTO_DEPLOY_REF) runs-on: ubuntu-latest environment: name: ${{ vars.AUTO_DEPLOY_TARGET }} From fd4b703304e11b5269fd9f6da834abc4739bf87b Mon Sep 17 00:00:00 2001 From: Devesh Tiwari <70621864+dtiwarATS@users.noreply.github.com> Date: Tue, 3 Dec 2024 21:58:35 +0530 Subject: [PATCH 6/6] [BUG FIX] [MER-4051] Delete Component window pops up with backspace (#5280) --- assets/src/apps/authoring/components/ScreenList/ScreenList.tsx | 1 + .../apps/authoring/components/SequenceEditor/SequenceEditor.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/src/apps/authoring/components/ScreenList/ScreenList.tsx b/assets/src/apps/authoring/components/ScreenList/ScreenList.tsx index e46ca5dce00..6b0d816a8da 100644 --- a/assets/src/apps/authoring/components/ScreenList/ScreenList.tsx +++ b/assets/src/apps/authoring/components/ScreenList/ScreenList.tsx @@ -118,6 +118,7 @@ export const ScreenList: React.FC = ({ onFlowchartMode }) => { const onSelectScreen = useCallback( (screenResourceId: EntityId) => { + dispatch(setCurrentPartPropertyFocus({ focus: false })); dispatch(setCurrentActivityId({ activityId: screenResourceId })); }, [dispatch], diff --git a/assets/src/apps/authoring/components/SequenceEditor/SequenceEditor.tsx b/assets/src/apps/authoring/components/SequenceEditor/SequenceEditor.tsx index 28aa2b1058e..169fdd866ce 100644 --- a/assets/src/apps/authoring/components/SequenceEditor/SequenceEditor.tsx +++ b/assets/src/apps/authoring/components/SequenceEditor/SequenceEditor.tsx @@ -90,7 +90,7 @@ const SequenceEditor: React.FC = (props: any) => { const handleItemClick = (e: any, entry: SequenceEntry) => { e.stopPropagation(); - dispatch(setCurrentPartPropertyFocus({ focus: true })); + dispatch(setCurrentPartPropertyFocus({ focus: false })); dispatch(setCurrentActivityFromSequence(entry.custom.sequenceId)); dispatch( setRightPanelActiveTab({