From 68d333b58f8676d5ff44f2076f1375c1efdb1efd Mon Sep 17 00:00:00 2001 From: Chris Preisinger Date: Sun, 16 Jun 2024 12:53:42 -0400 Subject: [PATCH] 1335 Resolve compiler warnings --- .travis/test.extra.exs | 2 +- DEVCONFIG.md | 4 ++-- config/config.exs | 2 +- config/dev.exs | 2 +- config/prod.exs | 2 +- config/test.circleci.exs | 2 +- config/test.drone.exs | 2 +- config/test.exs | 4 ++-- lib/challenge_gov/certification_logs.ex | 2 +- lib/challenge_gov/gov_delivery.ex | 2 +- lib/challenge_gov/recaptcha.ex | 2 +- lib/challenge_gov/submission_documents.ex | 12 ++++++------ lib/challenge_gov/submissions/submission.ex | 4 ++-- lib/web/endpoint.ex | 4 ++-- .../templates/challenge/show/_button_bar.html.eex | 2 +- lib/web/templates/challenge/wizard.html.eex | 2 +- lib/web/views/challenge_view.ex | 6 +++--- lib/web/views/submission_view.ex | 2 +- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.travis/test.extra.exs b/.travis/test.extra.exs index 4c4cc128d..0e0eb43dc 100644 --- a/.travis/test.extra.exs +++ b/.travis/test.extra.exs @@ -1,4 +1,4 @@ -use Mix.Config +import Config config :challenge_gov, ChallengeGov.Repo, username: "challenge_gov", diff --git a/DEVCONFIG.md b/DEVCONFIG.md index a4b5dd905..b88dd0735 100644 --- a/DEVCONFIG.md +++ b/DEVCONFIG.md @@ -60,7 +60,7 @@ Create the file `config/dev.local.exs` and set a secret key base, and if needed, It will look something like (replacing with your local configuration): ```elixir -use Mix.Config +import Config config :challenge_gov, Web.Endpoint, secret_key_base: "" @@ -77,7 +77,7 @@ Create the file `config/test.local.exs` and set a secret key base, and if needed It will look something like (replacing with your local configuration): ```elixir -use Mix.Config +import Config config :challenge_gov, Web.Endpoint, secret_key_base: "" diff --git a/config/config.exs b/config/config.exs index ad0b59567..bfb348816 100644 --- a/config/config.exs +++ b/config/config.exs @@ -5,7 +5,7 @@ # is restricted to this project. # General application configuration -use Mix.Config +import Config config :challenge_gov, namespace: Web, diff --git a/config/dev.exs b/config/dev.exs index 6607e6a38..d4efa6477 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -1,4 +1,4 @@ -use Mix.Config +import Config # For development, we disable any cache and enable # debugging and code reloading. diff --git a/config/prod.exs b/config/prod.exs index 4f2849e7c..875f8c192 100644 --- a/config/prod.exs +++ b/config/prod.exs @@ -1,4 +1,4 @@ -use Mix.Config +import Config # For production, don't forget to configure the url host # to something meaningful, Phoenix uses this information diff --git a/config/test.circleci.exs b/config/test.circleci.exs index 98e7f500c..05b74b37b 100644 --- a/config/test.circleci.exs +++ b/config/test.circleci.exs @@ -1,4 +1,4 @@ -use Mix.Config +import Config config :challenge_gov, Web.Endpoint, secret_key_base: System.get_env("SECRET_KEY_BASE") diff --git a/config/test.drone.exs b/config/test.drone.exs index 2e135dd17..d36a499ad 100644 --- a/config/test.drone.exs +++ b/config/test.drone.exs @@ -1,4 +1,4 @@ -use Mix.Config +import Config config :challenge_gov, Web.Endpoint, secret_key_base: System.get_env("SECRET_KEY_BASE") diff --git a/config/test.exs b/config/test.exs index 5a41bcf77..491752a38 100644 --- a/config/test.exs +++ b/config/test.exs @@ -1,4 +1,4 @@ -use Mix.Config +import Config # We don't run a server during test. If one is required, # you can enable the server option below. @@ -7,7 +7,7 @@ config :challenge_gov, Web.Endpoint, server: false # Print only warnings and errors during test -config :logger, level: :warn +config :logger, level: :warning # Configure your database config :challenge_gov, ChallengeGov.Repo, diff --git a/lib/challenge_gov/certification_logs.ex b/lib/challenge_gov/certification_logs.ex index 4aa6fc42b..fb4563882 100644 --- a/lib/challenge_gov/certification_logs.ex +++ b/lib/challenge_gov/certification_logs.ex @@ -114,7 +114,7 @@ defmodule ChallengeGov.CertificationLogs do defp maybe_send_email(%{renewal_request: "certification"}, _days), do: :noop defp maybe_send_email(user, days) do - Logger.warn("Decertify #{days} day notice [user_id: #{user.id}]") + Logger.warning("Decertify #{days} day notice [user_id: #{user.id}]") send_email(user, days) end diff --git a/lib/challenge_gov/gov_delivery.ex b/lib/challenge_gov/gov_delivery.ex index 764233c12..9db0fa577 100644 --- a/lib/challenge_gov/gov_delivery.ex +++ b/lib/challenge_gov/gov_delivery.ex @@ -16,7 +16,7 @@ defmodule ChallengeGov.GovDelivery do @callback send_bulletin(challenge(), binary(), binary()) :: tuple() @callback get_topic_subscribe_count(challenge()) :: tuple() - @module Application.get_env(:challenge_gov, :gov_delivery)[:module] + @module Application.compile_env(:challenge_gov, [:gov_delivery, :module]) @doc """ Get the username for GovDelivery diff --git a/lib/challenge_gov/recaptcha.ex b/lib/challenge_gov/recaptcha.ex index 191676718..09936f810 100644 --- a/lib/challenge_gov/recaptcha.ex +++ b/lib/challenge_gov/recaptcha.ex @@ -7,7 +7,7 @@ defmodule ChallengeGov.Recaptcha do @callback valid_token?(token()) :: tuple() - @module Application.get_env(:challenge_gov, :recaptcha)[:module] + @module Application.compile_env(:challenge_gov, [:recaptcha, :module]) @doc """ Get the site key for recaptcha diff --git a/lib/challenge_gov/submission_documents.ex b/lib/challenge_gov/submission_documents.ex index 94445fa8b..2993a2c8f 100644 --- a/lib/challenge_gov/submission_documents.ex +++ b/lib/challenge_gov/submission_documents.ex @@ -67,12 +67,6 @@ defmodule ChallengeGov.SubmissionDocuments do end end - defp not_valid_characters(input_string) do - # characters to replace - to_replace = ~w"/ \\ | # % @ ^ : ? ! & % * $ = < > { }" - String.replace(input_string, to_replace, fn _ -> "-" end) - end - def upload(user, _) do user |> Ecto.build_assoc(:submission_documents) @@ -81,6 +75,12 @@ defmodule ChallengeGov.SubmissionDocuments do |> Ecto.Changeset.apply_action(:insert) end + defp not_valid_characters(input_string) do + # characters to replace + to_replace = ~w"/ \\ | # % @ ^ : ? ! & % * $ = < > { }" + String.replace(input_string, to_replace, fn _ -> "-" end) + end + @doc """ Delete a document diff --git a/lib/challenge_gov/submissions/submission.ex b/lib/challenge_gov/submissions/submission.ex index 474f175cc..ace39368a 100644 --- a/lib/challenge_gov/submissions/submission.ex +++ b/lib/challenge_gov/submissions/submission.ex @@ -126,7 +126,7 @@ defmodule ChallengeGov.Submissions.Submission do |> validate_file_upload(challenge, params) end - def update_draft_changeset(struct, params, challenge) do + def update_draft_changeset(struct, params, _challenge) do struct |> changeset(params) |> put_change(:status, "draft") @@ -149,7 +149,7 @@ defmodule ChallengeGov.Submissions.Submission do |> validate_review_verify(params) |> validate_terms(params) |> validate_required([:title, :brief_description, :description]) - # Validate file upload on update review. + # Validate file upload on update review. |> validate_file_upload(challenge, params) end diff --git a/lib/web/endpoint.ex b/lib/web/endpoint.ex index 4f5652ef1..054409564 100644 --- a/lib/web/endpoint.ex +++ b/lib/web/endpoint.ex @@ -4,7 +4,7 @@ defmodule Web.Endpoint do plug RemoteIp plug CORSPlug - if Application.get_env(:challenge_gov, :sql_sandbox) do + if Application.compile_env(:challenge_gov, :sql_sandbox) do plug Phoenix.Ecto.SQL.Sandbox end @@ -31,7 +31,7 @@ defmodule Web.Endpoint do only: ~w(css fonts images js favicon.ico robots.txt pdfs assets) # Serve local assets via URLs generated by Waffle.Actions.Url - if Application.get_env(:challenge_gov, :serve_static_waffle_assets) do + if Application.compile_env(:challenge_gov, :serve_static_waffle_assets) do plug Plug.Static, at: "/waffle", from: Path.expand("../../priv/waffle/uploads", __DIR__), diff --git a/lib/web/templates/challenge/show/_button_bar.html.eex b/lib/web/templates/challenge/show/_button_bar.html.eex index 1555151b2..e55cec5e5 100644 --- a/lib/web/templates/challenge/show/_button_bar.html.eex +++ b/lib/web/templates/challenge/show/_button_bar.html.eex @@ -13,7 +13,7 @@ <%= link("Request Edits", to: "#announcement-modal", class: "usa-button usa-button--secondary", "data-open-modal": "true", "aria-controls": "announcement-modal") %> <% end %> <%#= if Challenges.can_post_announcement?(@challenge, @user) do %> - <%= link("Add/Edit Update", to: "#", class: "usa-button", ) %> + <%= link("Add/Edit Update", to: "#", class: "usa-button" ) %> <%# end %> <%= if Challenges.is_submittable?(@challenge, @user) do %> <%= link("Submit", to: Routes.challenge_path(@conn, :submit, @challenge.id), method: :post, class: "usa-button", data: [confirm: "Are you sure you want to submit this challenge for approval?"]) %> diff --git a/lib/web/templates/challenge/wizard.html.eex b/lib/web/templates/challenge/wizard.html.eex index 07b34d465..59dc99e1b 100644 --- a/lib/web/templates/challenge/wizard.html.eex +++ b/lib/web/templates/challenge/wizard.html.eex @@ -39,7 +39,7 @@
<%= hidden_input f, :section, value: @section %> <%= hidden_input f, :user_id, value: @user.id %> - <%= hidden_input f, :challenge_id, value: if @challenge, do: @challenge.id, else: nil %> + <%= hidden_input f, :challenge_id, value: (if @challenge, do: @challenge.id, else: nil) %> <%= hidden_input f, :local_timezone, id: "local-timezone-input" %>
diff --git a/lib/web/views/challenge_view.ex b/lib/web/views/challenge_view.ex index 67e78ab47..88a561add 100644 --- a/lib/web/views/challenge_view.ex +++ b/lib/web/views/challenge_view.ex @@ -460,9 +460,9 @@ defmodule Web.ChallengeView do sections = Challenges.sections() current_section_index = Challenges.section_index(current_section) - progressbar_width = current_section_index / length(sections) * 110 + _progressbar_width = current_section_index / length(sections) * 110 - base_classes = "" + _base_classes = "" content_tag :div, class: " usa-step-indicator usa-step-indicator--counters", @@ -470,7 +470,7 @@ defmodule Web.ChallengeView do aria: [label: "progress"] do content_tag :ol, class: "usa-step-indicator__segments" do [ - Enum.map(Enum.with_index(sections), fn {section, index} -> + Enum.map(Enum.with_index(sections), fn {section, _index} -> [ cond do section.id == current_section -> diff --git a/lib/web/views/submission_view.ex b/lib/web/views/submission_view.ex index 321095112..900b498e6 100644 --- a/lib/web/views/submission_view.ex +++ b/lib/web/views/submission_view.ex @@ -233,7 +233,7 @@ defmodule Web.SubmissionView do end end - def cancel_button(conn, action, challenge, phase, user, opts \\ []) do + def cancel_button(conn, action, challenge, phase, user, _opts \\ []) do route = cond do Accounts.has_admin_access?(user) ->