#834 Clicking on a leaderboard results in Internal Server Error 500

eyra · Jun 7, 2024 · 8caa8b8 · 8caa8b8
1 parent 75fc5c5
commit 8caa8b8
Show file tree

Hide file tree

Showing 14 changed files with 59 additions and 118 deletions.
diff --git a/core/systems/advert/content_page.ex b/core/systems/advert/content_page.ex
@@ -42,13 +42,12 @@ defmodule Systems.Advert.ContentPage do
     ~H"""
       <.management_page
         title={@vm.title}
-        show_errors={@vm.show_errors}
         tabs={@vm.tabs}
+        show_errors={@vm.show_errors}
         menus={@menus}
         modal={@modal}
         popup={@popup}
         dialog={@dialog}
-
         tabbar_id={@tabbar_id}
         initial_tab={@initial_tab}
         tabbar_size={@tabbar_size}

diff --git a/core/systems/alliance/content_page.ex b/core/systems/alliance/content_page.ex
@@ -39,16 +39,16 @@ defmodule Systems.Alliance.ContentPage do
     ~H"""
       <.management_page
         title={@vm.title}
+        tabs={@vm.tabs}
+        show_errors={@vm.show_errors}
         menus={@menus}
         modal={@modal}
         popup={@popup}
         dialog={@dialog}
-        tabs={@vm.tabs}
         tabbar_id={@tabbar_id}
         initial_tab={@initial_tab}
         tabbar_size={@tabbar_size}
-        show_errors={@show_errors}
-        actions={@vm.actions}
+        actions={@actions}
       />
     """
   end

diff --git a/core/systems/assignment/content_page.ex b/core/systems/assignment/content_page.ex
@@ -49,8 +49,8 @@ defmodule Systems.Assignment.ContentPage do
     ~H"""
       <.management_page
         title={@vm.title}
-        show_errors={@vm.show_errors}
         tabs={@vm.tabs}
+        show_errors={@vm.show_errors}
         actions={@actions}
         tabbar_id={@tabbar_id}
         initial_tab={@initial_tab}

diff --git a/core/systems/document/content_page.ex b/core/systems/document/content_page.ex
@@ -39,16 +39,16 @@ defmodule Systems.Document.ContentPage do
     ~H"""
       <.management_page
         title={@vm.title}
-        menus={@menus}
-        modal={@modal}
-        popup={@popup}
-        dialog={@dialog}
         tabs={@vm.tabs}
+        show_errors={@vm.show_errors}
+        actions={@actions}
         tabbar_id={@tabbar_id}
         initial_tab={@initial_tab}
         tabbar_size={@tabbar_size}
-        show_errors={@show_errors}
-        actions={@vm.actions}
+        menus={@menus}
+        modal={@modal}
+        popup={@popup}
+        dialog={@dialog}
       />
     """
   end

diff --git a/core/systems/feldspar/content_page.ex b/core/systems/feldspar/content_page.ex
@@ -39,16 +39,16 @@ defmodule Systems.Feldspar.ContentPage do
     ~H"""
       <.management_page
         title={@vm.title}
-        menus={@menus}
-        modal={@modal}
-        popup={@popup}
-        dialog={@dialog}
         tabs={@vm.tabs}
+        show_errors={@vm.show_errors}
+        actions={@actions}
         tabbar_id={@tabbar_id}
         initial_tab={@initial_tab}
         tabbar_size={@tabbar_size}
-        show_errors={@show_errors}
-        actions={@vm.actions}
+        menus={@menus}
+        modal={@modal}
+        popup={@popup}
+        dialog={@dialog}
       />
     """
   end

diff --git a/core/systems/graphite/leaderboard_content_page.ex b/core/systems/graphite/leaderboard_content_page.ex
@@ -42,16 +42,16 @@ defmodule Systems.Graphite.LeaderboardContentPage do
     ~H"""
       <.management_page
         title={@vm.title}
-        menus={@menus}
-        modal={@modal}
-        popup={@popup}
-        dialog={@dialog}
         tabs={@vm.tabs}
+        show_errors={@vm.show_errors}
+        actions={@actions}
         tabbar_id={@tabbar_id}
         initial_tab={@initial_tab}
         tabbar_size={@tabbar_size}
-        show_errors={@show_errors}
-        actions={@vm.actions}
+        menus={@menus}
+        modal={@modal}
+        popup={@popup}
+        dialog={@dialog}
       />
     """
   end

diff --git a/core/systems/graphite/leaderboard_content_page_builder.ex b/core/systems/graphite/leaderboard_content_page_builder.ex
@@ -12,6 +12,13 @@ defmodule Systems.Graphite.LeaderboardContentPageBuilder do
 
     tabs = create_tabs(leaderboard, false, assigns)
 
+    title =
+      if title do
+        title
+      else
+        ""
+      end
+
     %{
       id: id,
       title: title,
@@ -133,16 +140,10 @@ defmodule Systems.Graphite.LeaderboardContentPageBuilder do
     [:settings, :submissions, :scores]
   end
 
-  defp create_tab(:settings, leaderboard, show_errors, assigns) do
-    %{fabric: fabric, uri_origin: uri_origin, viewport: viewport, breakpoint: breakpoint} =
-      assigns
-
+  defp create_tab(:settings, leaderboard, show_errors, %{fabric: fabric}) do
     child =
       Fabric.prepare_child(fabric, :settings_form, Graphite.LeaderboardSettingsView, %{
-        entity: leaderboard,
-        uri_origin: uri_origin,
-        viewport: viewport,
-        breakpoint: breakpoint
+        entity: leaderboard
       })
 
     %{
@@ -156,17 +157,11 @@ defmodule Systems.Graphite.LeaderboardContentPageBuilder do
     }
   end
 
-  defp create_tab(:submissions, leaderboard, show_errors, assigns) do
-    %{fabric: fabric, uri_origin: uri_origin, viewport: viewport, breakpoint: breakpoint} =
-      assigns
-
+  defp create_tab(:submissions, leaderboard, show_errors, %{fabric: fabric}) do
     child =
       Fabric.prepare_child(fabric, :submissions_form, Graphite.LeaderboardSubmissionsView, %{
         entity: leaderboard,
-        submissions: Graphite.Public.list_submissions(leaderboard),
-        uri_origin: uri_origin,
-        viewport: viewport,
-        breakpoint: breakpoint
+        submissions: Graphite.Public.list_submissions(leaderboard)
       })
 
     %{
@@ -180,16 +175,10 @@ defmodule Systems.Graphite.LeaderboardContentPageBuilder do
     }
   end
 
-  defp create_tab(:scores, leaderboard, show_errors, assigns) do
-    %{fabric: fabric, uri_origin: uri_origin, viewport: viewport, breakpoint: breakpoint} =
-      assigns
-
+  defp create_tab(:scores, leaderboard, show_errors, %{fabric: fabric}) do
     child =
       Fabric.prepare_child(fabric, :scores_form, Graphite.LeaderboardScoresView, %{
-        entity: leaderboard,
-        uri_origin: uri_origin,
-        viewport: viewport,
-        breakpoint: breakpoint
+        entity: leaderboard
       })
 
     %{

diff --git a/core/systems/graphite/leaderboard_scores_form.ex b/core/systems/graphite/leaderboard_scores_form.ex
@@ -12,10 +12,7 @@ defmodule Systems.Graphite.LeaderboardScoresForm do
   def update(
         %{
           id: id,
-          leaderboard: leaderboard,
-          uri_origin: uri_origin,
-          viewport: viewport,
-          breakpoint: breakpoint
+          leaderboard: leaderboard
         },
         socket
       ) do
@@ -28,9 +25,6 @@ defmodule Systems.Graphite.LeaderboardScoresForm do
         id: id,
         headers: headers,
         leaderboard: leaderboard,
-        uri_origin: uri_origin,
-        viewport: viewport,
-        breakpoint: breakpoint,
         placeholder: dgettext("eyra-graphite", "label.upload_file"),
         select_button: dgettext("eyra-graphite", "label.select"),
         replace_button: dgettext("eyra-graphite", "label.replace_file"),

diff --git a/core/systems/graphite/leaderboard_scores_view.ex b/core/systems/graphite/leaderboard_scores_view.ex
@@ -9,10 +9,7 @@ defmodule Systems.Graphite.LeaderboardScoresView do
   def update(
         %{
           id: id,
-          entity: leaderboard,
-          uri_origin: uri_origin,
-          viewport: viewport,
-          breakpoint: breakpoint
+          entity: leaderboard
         },
         socket
       ) do
@@ -21,29 +18,20 @@ defmodule Systems.Graphite.LeaderboardScoresView do
       socket
       |> assign(
         id: id,
-        leaderboard: leaderboard,
-        uri_origin: uri_origin,
-        viewport: viewport,
-        breakpoint: breakpoint
+        leaderboard: leaderboard
       )
       |> compose_child(:upload)
     }
   end
 
   @impl true
   def compose(:upload, %{
-        leaderboard: leaderboard,
-        uri_origin: uri_origin,
-        viewport: viewport,
-        breakpoint: breakpoint
+        leaderboard: leaderboard
       }) do
     %{
       module: Graphite.LeaderboardScoresForm,
       params: %{
         leaderboard: leaderboard,
-        uri_origin: uri_origin,
-        viewport: viewport,
-        breakpoint: breakpoint,
         page_key: :upload,
         opt_in?: false,
         on_text: "upload view on text",

diff --git a/core/systems/graphite/leaderboard_settings_view.ex b/core/systems/graphite/leaderboard_settings_view.ex
@@ -9,10 +9,7 @@ defmodule Systems.Graphite.LeaderboardSettingsView do
   def update(
         %{
           id: id,
-          entity: leaderboard,
-          uri_origin: uri_origin,
-          viewport: viewport,
-          breakpoint: breakpoint
+          entity: leaderboard
         },
         socket
       ) do
@@ -21,10 +18,7 @@ defmodule Systems.Graphite.LeaderboardSettingsView do
       socket
       |> assign(
         id: id,
-        entity: leaderboard,
-        uri_origin: uri_origin,
-        viewport: viewport,
-        breakpoint: breakpoint
+        entity: leaderboard
       )
       |> compose_child(:settings)
     }
@@ -49,12 +43,7 @@ defmodule Systems.Graphite.LeaderboardSettingsView do
     ~H"""
     <div>
       <Area.content>
-        <.child name={:settings} fabric={@fabric} >
-          <:header>
-          </:header>
-          <:footer>
-          </:footer>
-        </.child>
+        <.child name={:settings} fabric={@fabric} />
       </Area.content>
     </div>
     """

diff --git a/core/systems/graphite/leaderboard_submissions_form.ex b/core/systems/graphite/leaderboard_submissions_form.ex
@@ -8,10 +8,7 @@ defmodule Systems.Graphite.LeaderboardSubmissionsForm do
         %{
           id: id,
           leaderboard: leaderboard,
-          submissions: submissions,
-          uri_origin: uri_origin,
-          viewport: viewport,
-          breakpoint: breakpoint
+          submissions: submissions
         },
         socket
       ) do
@@ -21,10 +18,7 @@ defmodule Systems.Graphite.LeaderboardSubmissionsForm do
       |> assign(
         id: id,
         leaderboard: leaderboard,
-        submissions: submissions,
-        uri_origin: uri_origin,
-        viewport: viewport,
-        breakpoint: breakpoint
+        submissions: submissions
       )
       |> prepare_download_button()
     }

diff --git a/core/systems/graphite/leaderboard_submissions_view.ex b/core/systems/graphite/leaderboard_submissions_view.ex
@@ -8,9 +8,6 @@ defmodule Systems.Graphite.LeaderboardSubmissionsView do
         %{
           id: id,
           entity: leaderboard,
-          uri_origin: uri_origin,
-          viewport: viewport,
-          breakpoint: breakpoint,
           submissions: submissions
         },
         socket
@@ -21,10 +18,7 @@ defmodule Systems.Graphite.LeaderboardSubmissionsView do
       |> assign(
         id: id,
         leaderboard: leaderboard,
-        submissions: submissions,
-        uri_origin: uri_origin,
-        viewport: viewport,
-        breakpoint: breakpoint
+        submissions: submissions
       )
       |> compose_child(:download)
     }
@@ -33,19 +27,13 @@ defmodule Systems.Graphite.LeaderboardSubmissionsView do
   @impl true
   def compose(:download, %{
         leaderboard: leaderboard,
-        submissions: submissions,
-        uri_origin: uri_origin,
-        viewport: viewport,
-        breakpoint: breakpoint
+        submissions: submissions
       }) do
     %{
       module: Graphite.LeaderboardSubmissionsForm,
       params: %{
         leaderboard: leaderboard,
         submissions: submissions,
-        uri_origin: uri_origin,
-        viewport: viewport,
-        breakpoint: breakpoint,
         page_key: :upload,
         opt_in?: false,
         on_text: "download view on text",

diff --git a/core/systems/lab/content_page.ex b/core/systems/lab/content_page.ex
@@ -39,16 +39,16 @@ defmodule Systems.Lab.ContentPage do
     ~H"""
       <.management_page
         title={@vm.title}
-        menus={@menus}
-        modal={@modal}
-        popup={@popup}
-        dialog={@dialog}
         tabs={@vm.tabs}
+        show_errors={@vm.show_errors}
+        actions={@actions}
         tabbar_id={@tabbar_id}
         initial_tab={@initial_tab}
         tabbar_size={@tabbar_size}
-        show_errors={@show_errors}
-        actions={@vm.actions}
+        menus={@menus}
+        modal={@modal}
+        popup={@popup}
+        dialog={@dialog}
       />
     """
   end