Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging to Production #1456

Merged
merged 39 commits into from
Nov 4, 2024
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
88b971c
phases start & end
jdonis Aug 9, 2024
82b060e
Dependencies: row 5 #1358
kkrug Aug 8, 2024
6a9d5d8
yarn update assets
jdonis Aug 9, 2024
1b0007f
Non gov-mil users
jdonis Aug 13, 2024
ff54f74
Merge branch 'production' into staging
kkrug Aug 13, 2024
e59c7ac
Update jquery to 3.7.1
kkrug Aug 21, 2024
7caac94
Merge branch 'staging' into 1359-update-jquery
kkrug Aug 21, 2024
c22b5bf
Merge branch '1359-update-jquery' of github.com:GSA/Challenge_gov int…
jdonis Aug 22, 2024
cb8c3ad
Update jquery to 3.7.1
kkrug Aug 21, 2024
0a78939
Revert "Update jquery to 3.7.1"
kkrug Aug 22, 2024
ad88c57
Merge pull request #1415 from GSA/revert-1412-1359-update-jquery
kkrug Aug 22, 2024
22821b5
New yarn.lock
jdonis Aug 23, 2024
1f9bc0b
remove code non-gov
jdonis Aug 23, 2024
bf5a77a
Merge branch 'staging' into 1359-update-jquery
jdonis Aug 23, 2024
f4eea8a
Merge pull request #1416 from GSA/1359-update-jquery
kkrug Aug 23, 2024
c2cfc4d
dependency diverge 3.4 -> 3.9.2
jdonis Aug 23, 2024
8e3a605
non-gov validation, logs and testing
jdonis Aug 26, 2024
f018f25
fix testing
jdonis Aug 26, 2024
2a8c25e
Merge branch 'staging' into jdonis/1390-non-gov-access
jdonis Aug 26, 2024
8feb930
closing if
jdonis Aug 26, 2024
1c9c1b7
merge if/end issues
jdonis Aug 26, 2024
bd0257a
Merge pull request #1419 from GSA/jdonis/1390-non-gov-access
kkrug Aug 27, 2024
f22338d
NG can't submit or create new Challenges
jdonis Sep 10, 2024
bc5d034
NG can't submit or create new Challenges
jdonis Sep 10, 2024
6b48e4d
Code scanning - DOM text reinterpreted as HTML #1427
kkrug Sep 16, 2024
e963b8b
Code scanning - DOM text reinterpreted as HTML #1427
kkrug Sep 17, 2024
aeee333
Code scanning - DOM text reinterpreted as HTML #1427
kkrug Sep 17, 2024
cc1fa08
Code scanning - DOM text reinterpreted as HTML #1427
kkrug Sep 18, 2024
6bb10fa
javascript console errors - challenge.gov #1434
kkrug Sep 23, 2024
3c139a6
Revert "javascript console errors - challenge.gov #1434"
jdonis Oct 14, 2024
27ae7cd
Merge pull request #1446 from GSA/revert-1436-1434-js-console-errors
jdonis Oct 14, 2024
dbf7bbc
Validation access non-gov
jdonis Oct 14, 2024
ffa569f
Merge branch 'staging' into jdonis/1390-non-gov-access
jdonis Oct 14, 2024
83ac80f
Merge pull request #1447 from GSA/jdonis/1390-non-gov-access
kkrug Oct 15, 2024
c1999e9
Footer for logged in users only - V1
jairoanaya Oct 21, 2024
1a5f7e7
Merge branch 'staging' into 1363-challenge-portal-footer
kkrug Oct 22, 2024
cb468ea
Merge pull request #1450 from GSA/1363-challenge-portal-footer
kkrug Oct 22, 2024
fd5a8b5
Revert "1363 challenge portal footer"
kkrug Oct 23, 2024
90729e6
Merge pull request #1455 from GSA/revert-1450-1363-challenge-portal-f…
kkrug Oct 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Non gov-mil users
jdonis committed Aug 13, 2024
commit 1b0007fb96e96bc3c135ce62965dd29a12681da6
15 changes: 15 additions & 0 deletions lib/challenge_gov/challenges.ex
Original file line number Diff line number Diff line change
@@ -755,6 +755,21 @@ defmodule ChallengeGov.Challenges do
end
end

defp validate_gov_mil(email) do
String.ends_with?(email, [".gov", ".mil"])
end

def allowed_to_view_submission(user = %{role: "challenge_manager"}, challenge) do
if validate_gov_mil(user.email) do
{:ok, challenge}
else
{:error, :not_permitted}
end
end

def allowed_to_view_submission?(user = %{role: "challenge_manager"}),
do: validate_gov_mil(user.email)

def allowed_to_submit?(%{role: "super_admin"}), do: true

def allowed_to_submit?(%{role: "admin"}), do: true
1 change: 1 addition & 0 deletions lib/web/controllers/phase_controller.ex
Original file line number Diff line number Diff line change
@@ -54,6 +54,7 @@ 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, %{
2 changes: 2 additions & 0 deletions lib/web/templates/challenge/show/_other_actions.html.eex
Original file line number Diff line number Diff line change
@@ -2,9 +2,11 @@
<div class="usa-card__body">
<h4>Other actions</h4>
<ul class="usa-button-group">
<%= if Challenges.allowed_to_view_submission?(@user) do %>
<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" %>
2 changes: 2 additions & 0 deletions lib/web/templates/challenge/table/_content.html.eex
Original file line number Diff line number Diff line change
@@ -27,7 +27,9 @@
<span class="dropdown">
<button class="usa-button">More Options</button>
<div class="dropdown-content">
<%= if Challenges.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>