Merge pull request #21 from RatioPBC/min_version_bump

version bump

.github/workflows/main.yml

@@ -17,10 +17,14 @@ jobs:
 
     env:
       MIX_ENV: test
+
+    strategy:
+      matrix:
+        postgres-version: [16.4-alpine]
 
     services:
       postgres:
-        image: postgres:12.5-alpine
+        image: postgres:${{ matrix.postgres-version }}
         env:
           POSTGRES_PASSWORD: postgres
         options: >-
@@ -37,9 +41,8 @@ jobs:
            fetch-depth: 0
       - uses: erlef/setup-beam@v1
         with:
-          otp-version: '25.3.1'
-          elixir-version: '1.14.5'
-
+          version-file: .tool-versions
+          version-type: strict
       - name: Install dependencies
         run: |
           npm install --prefix assets

.gitignore

@@ -27,4 +27,6 @@ logfile
 /.direnv/
 .envrc.private
 /.nix-mix/
-/scripts/
+/scripts/
+/.elixir_ls/
+/.erlang-history/

.tool-versions

@@ -1,4 +1,4 @@
-elixir 1.14.5-otp-25
-erlang 25.3.1
+elixir 1.17.2-otp-27
+erlang 27.0.1
 nodejs 18.18.2
-postgres 15.2
+postgres 16.4

config/dev.exs

@@ -72,7 +72,7 @@ config :epicenter, EpicenterWeb.Endpoint,
 config :epicenter, mfa_issuer: System.fetch_env!("CANONICAL_HOST")
 
 # Do not include metadata nor timestamps in development logs
-config :logger, :console, format: "[$level] $message\n", level: :warn
+config :logger, :console, format: "[$level] $message\n", level: :warning
 
 # Set a higher stacktrace during development. Avoid configuring such
 # in production as building large stacktraces may be expensive.

config/test.exs

@@ -37,7 +37,7 @@ config :epicenter,
   phi_logger: Epicenter.Test.PhiLoggerMock
 
 # Print only warnings and errors during test
-config :logger, level: :warn, metadata: :all
+config :logger, level: :warning, metadata: :all
 
 config :phoenix_integration,
   endpoint: EpicenterWeb.Endpoint

flake.nix

@@ -21,7 +21,7 @@
         # erlang = pkgs.beam.interpreters.erlang;
 
         # use latest version of Erlang 27
-        erlang = final.beam.interpreters.erlang_25;
+        erlang = final.beam.interpreters.erlang_27;
 
         # specify exact version of Erlang OTP
         # erlang = pkgs.beam.interpreters.erlang.override {
@@ -40,7 +40,7 @@
         # elixir = pkgs-beam.elixir;
 
         # use latest version of Elixir 1.17
-        elixir = pkgs-beam.elixir_1_14;
+        elixir = pkgs-beam.elixir_1_17;
 
         # specify exact version of Elixir
         # elixir = pkgs-beam.elixir.override {
@@ -55,7 +55,7 @@
             # use the Elixr/OTP versions defined above; will also install OTP, mix, hex, rebar3
             elixir
 
-            postgresql_15
+            postgresql_16
 
             # mix needs it for downloading dependencies
             git

lib/epicenter/csv.ex

@@ -52,6 +52,6 @@ defmodule Epicenter.Csv do
   rescue
     e ->
       hint = "make sure there are no spaces between the field separators (commas) and the quotes around field contents"
-      {:invalid_csv, "#{e.message} (#{hint})"}
+      {:invalid_csv, "#{Exception.message(e)} (#{hint})"}
   end
 end

lib/epicenter_web.ex

@@ -44,8 +44,10 @@ defmodule EpicenterWeb do
 
   def live_view do
     quote do
-      use Phoenix.HTML
-      use Phoenix.LiveView, layout: {EpicenterWeb.LayoutView, "live.html"}
+      import Phoenix.HTML
+      import Phoenix.HTML.Form
+      use PhoenixHTMLHelpers
+      use Phoenix.LiveView, layout: {EpicenterWeb.LayoutView, :live}
       use EpicenterWeb.SearchHandling
 
       unquote(view_helpers())
@@ -82,11 +84,13 @@ defmodule EpicenterWeb do
   defp view_helpers do
     quote do
       # Use all HTML functionality (forms, tags, etc)
-      use Phoenix.HTML
+      import Phoenix.HTML
+      import Phoenix.HTML.Form
+      use PhoenixHTMLHelpers
 
       # Import LiveView helpers (live_render, component, live_patch, etc)
       import Phoenix.LiveView.Helpers
-      import EpicenterWeb.LiveComponent.Helpers
+      import Phoenix.Component
 
       # Import basic rendering functionality (render, render_layout, etc)
       import Phoenix.View

lib/epicenter_web/format.ex

@@ -68,7 +68,7 @@ defmodule EpicenterWeb.Format do
     do: string |> Number.Phone.number_to_phone(area_code: true)
 
   defp reformat_phone(string) when byte_size(string) == 11,
-    do: string |> String.slice(1..-1) |> Number.Phone.number_to_phone(area_code: true, country_code: String.at(string, 0))
+    do: string |> String.slice(1..-1//1) |> Number.Phone.number_to_phone(area_code: true, country_code: String.at(string, 0))
 
   defp reformat_phone(string),
     do: string

lib/epicenter_web/live/add_visit_live.ex

@@ -56,7 +56,7 @@ defmodule EpicenterWeb.AddVisitLive do
          data = data |> Map.put(:place_id, socket.assigns.place.id),
          {:save, {:ok, _visit}} <- {:save, Cases.create_visit({data, audit_meta_create_visit(socket)})} do
       socket
-      |> push_redirect(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.case_investigation.person)}#case-investigations")
+      |> push_navigate(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.case_investigation.person)}#case-investigations")
       |> noreply()
     else
       {:data, {:error, %Ecto.Changeset{} = form_changeset}} ->

lib/epicenter_web/live/add_visit_live.html.heex

@@ -6,9 +6,8 @@
 >
   <section>
     <header id="subnav">
-      <%= live_redirect to: Routes.place_search_path(EpicenterWeb.Endpoint, EpicenterWeb.PlaceSearchLive, @case_investigation), data: [role: "back-link"] do %>
-        <%= back_icon() %><span>Back</span>
-      <% end %>
+      <.link navigate={Routes.place_search_path(EpicenterWeb.Endpoint, EpicenterWeb.PlaceSearchLive, @case_investigation)}
+       data-role="back-link"><%= back_icon() %><span>Back</span></.link>
     </header>
   </section>
   <section>

lib/epicenter_web/live/case_investigation_clinical_details_live.ex

@@ -132,7 +132,7 @@ defmodule EpicenterWeb.CaseInvestigationClinicalDetailsLive do
          {:form, {:ok, case_investigation_attrs}} <- {:form, ClinicalDetailsForm.case_investigation_attrs(form_changeset)},
          {:case_investigation, {:ok, _case_investigation}} <- {:case_investigation, update_case_investigation(socket, case_investigation_attrs)} do
       socket
-      |> push_redirect(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.case_investigation.person)}#case-investigations")
+      |> push_navigate(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.case_investigation.person)}#case-investigations")
       |> noreply()
     else
       {:form, {:error, form_changeset}} ->

lib/epicenter_web/live/case_investigation_clinical_details_live.html.heex

@@ -5,9 +5,8 @@
 >
   <section>
     <header id="subnav">
-      <%= live_redirect to: Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @case_investigation.person), data: [role: "back-link"] do %>
-        <%= back_icon() %><span>Back</span>
-      <% end %>
+      <.link navigate={Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @case_investigation.person)}
+             data-role="back-link"><%= back_icon() %><span>Back</span></.link>
     </header>
   </section>
   <section id="case-investigation-clinical-details">

lib/epicenter_web/live/case_investigation_conclude_isolation_monitoring_live.ex

@@ -80,7 +80,7 @@ defmodule EpicenterWeb.CaseInvestigationConcludeIsolationMonitoringLive do
                }}
             )} do
       socket
-      |> push_redirect(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.case_investigation.person)}#case-investigations")
+      |> push_navigate(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.case_investigation.person)}#case-investigations")
       |> noreply()
     else
       {:form, {:error, %Ecto.Changeset{valid?: false} = form_changeset}} ->

lib/epicenter_web/live/case_investigation_conclude_isolation_monitoring_live.html.heex

@@ -5,9 +5,8 @@
 >
   <section>
     <header id="subnav">
-      <%= live_redirect to: Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @case_investigation.person), data: [role: "back-link"] do %>
-        <%= back_icon() %><span>Back</span>
-      <% end %>
+      <.link navigate={Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @case_investigation.person)}
+             data-role="back-link"><%= back_icon() %><span>Back</span></.link>
     </header>
   </section>
   <section id="case-investigation-conclude-isolation-monitoring">

lib/epicenter_web/live/case_investigation_contact_live.ex

@@ -201,7 +201,7 @@ defmodule EpicenterWeb.CaseInvestigationContactLive do
          data = data |> Map.put(:exposing_case_id, socket.assigns.case_investigation.id),
          {:created, {:ok, _}} <- {:created, create_or_update_contact_investigation(contact_investigation, data, socket.assigns.current_user)} do
       socket
-      |> push_redirect(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.case_investigation.person)}#case-investigations")
+      |> push_navigate(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.case_investigation.person)}#case-investigations")
       |> noreply()
     else
       {:form, {:error, changeset}} ->

lib/epicenter_web/live/case_investigation_contact_live.html.heex

@@ -5,9 +5,8 @@
 >
   <section>
     <header id="subnav">
-      <%= live_redirect to: Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @case_investigation.person), data: [role: "back-link"] do %>
-        <%= back_icon() %><span>Back</span>
-      <% end %>
+      <.link navigate={Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @case_investigation.person)}
+             data-role="back-link"><%= back_icon() %><span>Back</span></.link>
     </header>
   </section>
   <section id="case-investigation-contact">

lib/epicenter_web/live/case_investigation_discontinue_live.ex

@@ -48,7 +48,7 @@ defmodule EpicenterWeb.CaseInvestigationDiscontinueLive do
               }}
            ) do
       socket
-      |> push_redirect(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.case_investigation.person)}#case-investigations")
+      |> push_navigate(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.case_investigation.person)}#case-investigations")
       |> noreply()
     else
       {:error, changeset} ->

lib/epicenter_web/live/case_investigation_discontinue_live.html.heex

@@ -6,9 +6,8 @@
 >
   <section>
     <header id="subnav">
-      <%= live_redirect to: Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @case_investigation.person), data: [role: "back-link"] do %>
-        <%= back_icon() %><span>Back</span>
-      <% end %>
+      <.link navigate={Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @case_investigation.person)}
+             data-role="back-link"><%= back_icon() %><span>Back</span></.link>
     </header>
   </section>
   <section id="case-investigation-discontinue">

lib/epicenter_web/live/case_investigation_isolation_monitoring_live.ex

@@ -87,7 +87,7 @@ defmodule EpicenterWeb.CaseInvestigationIsolationMonitoringLive do
          {:form, {:ok, model_attrs}} <- {:form, IsolationMonitoringForm.form_changeset_to_model_attrs(form_changeset)},
          {:case_investigation, {:ok, _case_investigation}} <- {:case_investigation, update_case_investigation(socket, model_attrs)} do
       socket
-      |> push_redirect(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.case_investigation.person)}#case-investigations")
+      |> push_navigate(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.case_investigation.person)}#case-investigations")
       |> noreply()
     else
       {:form, {:error, %Ecto.Changeset{valid?: false} = form_changeset}} ->

lib/epicenter_web/live/case_investigation_isolation_monitoring_live.html.heex

@@ -5,9 +5,8 @@
 >
   <section>
     <header id="subnav">
-      <%= live_redirect to: Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @case_investigation.person), data: [role: "back-link"] do %>
-        <%= back_icon() %><span>Back</span>
-      <% end %>
+      <.link navigate={Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @case_investigation.person)}
+             data-role="back-link"><%= back_icon() %><span>Back</span></.link>
     </header>
   </section>
   <section id="case-investigation-isolation-monitoring">

lib/epicenter_web/live/case_investigation_isolation_order_live.ex

@@ -62,7 +62,7 @@ defmodule EpicenterWeb.CaseInvestigationIsolationOrderLive do
          {:form, {:ok, model_attrs}} <- {:form, IsolationOrderForm.form_changeset_to_model_attrs(form_changeset)},
          {:case_investigation, {:ok, _case_investigation}} <- {:case_investigation, update_case_investigation(socket, model_attrs)} do
       socket
-      |> push_redirect(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.case_investigation.person)}#case-investigations")
+      |> push_navigate(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.case_investigation.person)}#case-investigations")
       |> noreply()
     else
       {:form, {:error, %Ecto.Changeset{valid?: false} = form_changeset}} ->

lib/epicenter_web/live/case_investigation_isolation_order_live.html.heex

@@ -5,9 +5,8 @@
 >
   <section>
     <header id="subnav">
-      <%= live_redirect to: Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @case_investigation.person), data: [role: "back-link"] do %>
-        <%= back_icon() %><span>Back</span>
-      <% end %>
+      <.link navigate={Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @case_investigation.person)}
+             data-role="back-link"><%= back_icon() %><span>Back</span></.link>
     </header>
   </section>
   <section id="case-investigation-isolation-order">

lib/epicenter_web/live/case_investigation_start_interview_live.ex

@@ -43,7 +43,7 @@ defmodule EpicenterWeb.CaseInvestigationStartInterviewLive do
          {:form, {:ok, cast_investigation_attrs}} <- {:form, StartInterviewForm.investigation_attrs(form_changeset)},
          {:case_investigation, {:ok, _case_investigation}} <- {:case_investigation, update_case_investigation(socket, cast_investigation_attrs)} do
       socket
-      |> push_redirect(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.case_investigation.person)}#case-investigations")
+      |> push_navigate(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.case_investigation.person)}#case-investigations")
       |> noreply()
     else
       {:form, {:error, %Ecto.Changeset{valid?: false} = form_changeset}} ->

lib/epicenter_web/live/case_investigation_start_interview_live.html.heex

@@ -6,9 +6,8 @@
 >
   <section>
     <header id="subnav">
-      <%= live_redirect to: Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @case_investigation.person), data: [role: "back-link"] do %>
-        <%= back_icon() %><span>Back</span>
-      <% end %>
+      <.link navigate={Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @case_investigation.person)}
+             data-role="back-link"><%= back_icon() %><span>Back</span></.link>
     </header>
   </section>
   <section id="case-investigation-start-interview">

lib/epicenter_web/live/contact_investigation_clinical_details_live.ex

@@ -120,7 +120,7 @@ defmodule EpicenterWeb.ContactInvestigationClinicalDetailsLive do
       person = socket.assigns.contact_investigation.exposed_person
 
       socket
-      |> push_redirect(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, person)}#contact-investigations")
+      |> push_navigate(to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, person)}#contact-investigations")
       |> noreply()
     else
       {:form, {:error, form_changeset}} ->

lib/epicenter_web/live/contact_investigation_clinical_details_live.html.heex

@@ -4,9 +4,8 @@
 >
   <section>
     <header id="subnav">
-      <%= live_redirect to: Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @contact_investigation.exposed_person), data: [role: "back-link"] do %>
-        <%= back_icon() %><span>Back</span>
-      <% end %>
+      <.link navigate={Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @contact_investigation.exposed_person)}
+             data-role="back-link"><%= back_icon() %><span>Back</span></.link>
     </header>
   </section>
   <section id="contact-investigation-clinical-details">

lib/epicenter_web/live/contact_investigation_conclude_quarantine_monitoring_live.ex

@@ -79,7 +79,7 @@ defmodule EpicenterWeb.ContactInvestigationConcludeQuarantineMonitoringLive do
                }}
             )} do
       socket
-      |> push_redirect(
+      |> push_navigate(
         to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.contact_investigation.exposed_person)}#contact-investigations"
       )
       |> noreply()

lib/epicenter_web/live/contact_investigation_conclude_quarantine_monitoring_live.html.heex

@@ -5,9 +5,8 @@
 >
   <section>
     <header id="subnav">
-      <%= live_redirect to: Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @contact_investigation.exposed_person), data: [role: "back-link"] do %>
-        <%= back_icon() %><span>Back</span>
-      <% end %>
+            <.link navigate={Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @contact_investigation.exposed_person)}
+             data-role="back-link"><%= back_icon() %><span>Back</span></.link>
     </header>
   </section>
   <section id="contact-investigation-conclude-quarantine-monitoring">

lib/epicenter_web/live/contact_investigation_discontinue_live.ex

@@ -52,7 +52,7 @@ defmodule EpicenterWeb.ContactInvestigationDiscontinueLive do
       )
 
       socket
-      |> push_redirect(
+      |> push_navigate(
         to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.contact_investigation.exposed_person)}#contact-investigations"
       )
       |> noreply()

lib/epicenter_web/live/contact_investigation_discontinue_live.html.heex

@@ -6,9 +6,8 @@
 >
   <section>
     <header id="subnav">
-      <%= live_redirect to: Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @contact_investigation.exposed_person), data: [role: "back-link"] do %>
-        <%= back_icon() %><span>Back</span>
-      <% end %>
+            <.link navigate={Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @contact_investigation.exposed_person)}
+             data-role="back-link"><%= back_icon() %><span>Back</span></.link>
     </header>
   </section>
   <div class="InvestigationDiscontinueForm">

lib/epicenter_web/live/contact_investigation_quarantine_monitoring_live.ex

@@ -96,7 +96,7 @@ defmodule EpicenterWeb.ContactInvestigationQuarantineMonitoringLive do
          {:form, {:ok, model_attrs}} <- {:form, QuarantineMonitoringForm.form_changeset_to_model_attrs(form_changeset)},
          {:contact_investigation, {:ok, _contact_investigation}} <- {:contact_investigation, update_contact_investigation(socket, model_attrs)} do
       socket
-      |> push_redirect(
+      |> push_navigate(
         to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.contact_investigation.exposed_person)}#case-investigations"
       )
       |> noreply()

lib/epicenter_web/live/contact_investigation_quarantine_monitoring_live.html.heex

@@ -5,9 +5,8 @@
 >
   <section>
     <header id="subnav">
-      <%= live_redirect to: Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @contact_investigation.exposed_person), data: [role: "back-link"] do %>
-        <%= back_icon() %><span>Back</span>
-      <% end %>
+            <.link navigate={Routes.profile_path(EpicenterWeb.Endpoint, EpicenterWeb.ProfileLive, @contact_investigation.exposed_person)}
+             data-role="back-link"><%= back_icon() %><span>Back</span></.link>
     </header>
   </section>
   <section id="contact-investigation-quarantine-monitoring">

lib/epicenter_web/live/contact_investigation_start_interview_live.ex

@@ -44,7 +44,7 @@ defmodule EpicenterWeb.ContactInvestigationStartInterviewLive do
          {:contact_investigation, {:ok, _contact_investigation}} <-
            {:contact_investigation, update_contact_investigation(socket, cast_investigation_attrs)} do
       socket
-      |> push_redirect(
+      |> push_navigate(
         to: "#{Routes.profile_path(socket, EpicenterWeb.ProfileLive, socket.assigns.contact_investigation.exposed_person)}#contact-investigations"
       )
       |> noreply()