Merge branch 'staging' into jdonis/1390-non-gov-access

.tool-versions

@@ -1,4 +1,4 @@
 elixir 1.12.3
 erlang 23.3.2
 nodejs 18.17.1
-yarn 1.22.5
+yarn 1.22.19

assets/package.json

@@ -19,7 +19,7 @@
     "create-react-app": "^5.0.1",
     "file-loader": "^6.2.0",
     "inputmask": "^5.0.5",
-    "jquery": "^3.3.1",
+    "jquery": "^3.7.1",
     "moment": "^2.27.0",
     "moment-timezone": "^0.5.31",
     "node-quill-converter": "^0.3.3",
@@ -42,7 +42,7 @@
     "string-strip-html": "^8.3.0",
     "url-loader": "^4.1.1",
     "uswds": "2.14.0",
-    "yarn": "^1.13.0"
+    "yarn": "^1.22.19"
   },
   "devDependencies": {
     "@babel/core": "^7.24.3",
@@ -59,4 +59,4 @@
     "webpack": "^5.76.0",
     "webpack-cli": "^4.7.0"
   }
-}
+}

lib/web/controllers/phase_controller.ex

@@ -54,7 +54,6 @@ defmodule Web.PhaseController do
 
     with {:ok, challenge} <- Challenges.get(challenge_id),
          {:ok, challenge} <- Challenges.allowed_to_edit(user, challenge),
-         {:ok, challenge} <- Challenges.allowed_to_view_submission(user, challenge),
          {:ok, phase} <- Phases.get(id) do
       submissions_filter =
         Map.merge(filter, %{

lib/web/templates/challenge/show/_other_actions.html.eex

@@ -6,7 +6,6 @@
      <li class="usa-button-group__item">
       <%= challenge_submissions_link(@conn, @challenge, @user, label: "View submissions", class: "usa-button") %>
      </li>
-      <% end %>
       <%= if Accounts.has_admin_access?(@user) or !(Challenges.is_archived?(@challenge) or Challenges.is_archived_new?(@challenge)) do %>
        <li class="usa-button-group__item">
         <%= link "Preview", to: Routes.public_preview_path(@conn, :index, challenge: @challenge.uuid), target: "_blank", class: "usa-button" %>

lib/web/templates/challenge/table/_content.html.eex

@@ -29,7 +29,6 @@
               <div class="dropdown-content">
                 <%= if Challenges.is_allowed_to_view_submission?(@user) do %>
                 <%= challenge_submissions_link(@conn, challenge, @user, class: "usa-button usa-button--unstyled") %>
-                <% end %>
                 <div><%= link "Preview", to: Routes.public_preview_path(@conn, :index, challenge: challenge.uuid), target: "_blank", class: "usa-button usa-button--unstyled" %></div>
                 <div><%= link "Print", to: Routes.public_preview_path(@conn, :index, challenge: challenge.uuid, print: true), target: "_blank", class: "usa-button usa-button--unstyled" %></div>
                 <div><%= link "Download JSON", to: Routes.export_path(@conn, :export_challenge, challenge.id, "json"), target: "_blank", class: "usa-button usa-button--unstyled" %></div>

mix.exs

@@ -50,7 +50,7 @@ defmodule ChallengeGov.MixProject do
       {:credo_envvar, "~> 0.1", only: [:dev, :test], runtime: false},
       {:credo_naming, "~> 2.0", only: [:dev, :test], runtime: false},
       {:earmark, "~> 1.4.3"},
-      {:ecto_sql, "~> 3.4"},
+      {:ecto_sql, "~> 3.9.2"},
       {:elixir_uuid, "~> 1.2"},
       {:ex_check, "~> 0.12", only: [:dev, :test], runtime: true},
       {:export, "~> 0.1.1"},