Skip to content

Actions on a submission #1801

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.

Sign up for GitHub

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

Merged
ryanwoldatwork merged 1 commit into from
Mar 4, 2025
Merged

Actions on a submission #1801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions app/views/admin/submissions/_archive.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<%= link_to unarchive_admin_form_submission_path(submission.form, submission),
<%= link_to archive_admin_form_submission_path(submission.form, submission),
id: "archive-submission-#{submission.id}",
class: "text-secondary ",
"aria-label" => "Un-archive submission #{submission.id}",
title: "Un-archive submission #{submission.id}",
class: "text-base",
"aria-label" => "Archive submission #{submission.id}",
title: "Archive submission #{submission.id}",
data: { confirm: 'Are you sure?' },
method: :post,
remote: true,
Expand Down
11 changes: 11 additions & 0 deletions app/views/admin/submissions/_archive_button.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<%= link_to archive_admin_form_submission_path(form, submission, context: :show),
id: "archive-submission-#{submission.id}",
class: "usa-button usa-button--outline",
"aria-label" => "Archive submission #{submission.id}",
title: "Archive submission #{submission.id}",
data: { confirm: 'Are you sure?' },
method: :post,
remote: true,
rel: "nofollow" do %>
<i class="fa fa-archive"></i>
<% end %>
8 changes: 4 additions & 4 deletions app/views/admin/submissions/_delete.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<%= link_to undelete_admin_form_submission_path(submission.form, submission),
<%= link_to delete_admin_form_submission_path(submission.form, submission),
id: "delete-submission-#{submission.id}",
class: "text-secondary ",
"aria-label" => "Un-delete submission #{submission.id}",
title: "Un-delete submission #{submission.id}",
class: "text-base",
"aria-label" => "Delete submission #{submission.id}",
title: "Delete submission #{submission.id}",
data: { confirm: 'Are you sure?' },
method: :post,
remote: true,
Expand Down
12 changes: 12 additions & 0 deletions app/views/admin/submissions/_delete_button.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<%= link_to admin_form_submission_path(form, submission, context: :show),
id: "delete-submission-#{submission.id}",
class: "usa-button usa-button--secondary",
"aria-label" => "Delete submission #{submission.id}",
title: "Delete submission #{submission.id}",
method: :delete,
remote: true,
data: { confirm: 'Are you sure?' },
rel: "nofollow" do %>
<i class="fas fa-trash"></i>
Delete
<% end %>
8 changes: 4 additions & 4 deletions app/views/admin/submissions/_flag.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<%= link_to unflag_admin_form_submission_path(submission.form, submission),
<%= link_to flag_admin_form_submission_path(submission.form, submission),
id: "flag-submission-#{submission.id}",
class: "text-secondary",
"aria-label" => "Un-flag submission #{submission.id}",
title: "Un-flag submission #{submission.id}",
class: "text-base",
"aria-label" => "Flag submission #{submission.id}",
title: "Flag submission #{submission.id}",
data: { confirm: 'Are you sure?' },
method: :post,
remote: true,
Expand Down
11 changes: 11 additions & 0 deletions app/views/admin/submissions/_flag_button.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<%= link_to flag_admin_form_submission_path(form, submission, context: context),
id: "flag-submission-#{submission.id}",
class: "usa-button usa-button--outline",
"aria-label" => "Flag submission #{submission.id}",
title: "Flag submission #{submission.id}",
method: :post,
remote: true,
data: { confirm: 'Are you sure?' },
rel: "nofollow" do %>
<i class="far fa-flag"></i>
<% end %>
8 changes: 4 additions & 4 deletions app/views/admin/submissions/_mark.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<%= link_to unmark_admin_form_submission_path(submission.form, submission),
<%= link_to mark_admin_form_submission_path(submission.form, submission),
id: "mark-submission-#{submission.id}",
class: "text-secondary ",
"aria-label" => "Un-mark submission #{submission.id} as spam",
title: "Un-mark submission #{submission.id} as spam",
class: "text-base",
"aria-label" => "Mark submission #{submission.id} as spam",
title: "Mark submission #{submission.id} as spam",
data: { confirm: 'Are you sure?' },
method: :post,
remote: true,
Expand Down
10 changes: 10 additions & 0 deletions app/views/admin/submissions/_mark_button.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<%= link_to mark_admin_form_submission_path(form, submission, context: context),
id: "mark-submission-#{submission.id}",
class: "usa-button usa-button--outline",
"aria-label" => "Mark submission #{submission.id} as spam",
title: "Mark submission #{submission.id} as spam",
method: :post,
remote: true, data: { confirm: 'Are you sure?' },
rel: "nofollow" do %>
<i class="fa fa-exclamation-triangle"></i>
<% end %>
16 changes: 8 additions & 8 deletions app/views/admin/submissions/_submissions.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,30 +139,30 @@ tr .actions a:hover {
<div class="actions">
<span class="flagged">
<%- if submission.flagged? %>
<%= render "admin/submissions/flag", { submission: submission } %>
<% else %>
<%= render "admin/submissions/unflag", { submission: submission } %>
<% else %>
<%= render "admin/submissions/flag", { submission: submission } %>
<% end %>
</span>
<span class="marked">
<%- if submission.spam? %>
<%= render "admin/submissions/mark", { submission: submission } %>
<% else %>
<%= render "admin/submissions/unmark", { submission: submission } %>
<% else %>
<%= render "admin/submissions/mark", { submission: submission } %>
<% end %>
</span>
<span class="archived">
<%- if submission.archived? %>
<%= render "admin/submissions/archive", { submission: submission } %>
<% else %>
<%= render "admin/submissions/unarchive", { submission: submission } %>
<% else %>
<%= render "admin/submissions/archive", { submission: submission } %>
<% end %>
</span>
<span class="deleted">
<%- if submission.deleted? %>
<%= render "admin/submissions/delete", { submission: submission } %>
<% else %>
<%= render "admin/submissions/undelete", { submission: submission } %>
<% else %>
<%= render "admin/submissions/delete", { submission: submission } %>
<% end %>
</span>
</div>
Expand Down
8 changes: 4 additions & 4 deletions app/views/admin/submissions/_unarchive.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<%= link_to archive_admin_form_submission_path(submission.form, submission),
<%= link_to unarchive_admin_form_submission_path(submission.form, submission),
id: "archive-submission-#{submission.id}",
class: "text-base",
"aria-label" => "Archive submission #{submission.id}",
title: "Archive submission #{submission.id}",
class: "text-secondary ",
"aria-label" => "Un-archive submission #{submission.id}",
title: "Un-archive submission #{submission.id}",
data: { confirm: 'Are you sure?' },
method: :post,
remote: true,
Expand Down
12 changes: 12 additions & 0 deletions app/views/admin/submissions/_unarchive_button.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<%= link_to unarchive_admin_form_submission_path(form, submission, context: :show),
id: "archive-submission-#{submission.id}",
class: "usa-button usa-button--base",
"aria-label" => "Un-archive submission #{submission.id}",
title: "Un-archive submission #{submission.id}",
data: { confirm: 'Are you sure?' },
method: :post,
remote: true,
rel: "nofollow" do %>
<i class="fa fa-archive"></i>
Un-archive
<% end %>
8 changes: 4 additions & 4 deletions app/views/admin/submissions/_undelete.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<%= link_to delete_admin_form_submission_path(submission.form, submission),
<%= link_to undelete_admin_form_submission_path(submission.form, submission),
id: "delete-submission-#{submission.id}",
class: "text-base",
"aria-label" => "Delete submission #{submission.id}",
title: "Delete submission #{submission.id}",
class: "text-secondary ",
"aria-label" => "Un-delete submission #{submission.id}",
title: "Un-delete submission #{submission.id}",
data: { confirm: 'Are you sure?' },
method: :post,
remote: true,
Expand Down
12 changes: 12 additions & 0 deletions app/views/admin/submissions/_undelete_button.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<%= link_to undelete_admin_form_submission_path(form, submission, context: :show),
id: "delete-submission-#{submission.id}",
class: "usa-button usa-button--base",
"aria-label" => "Restore submission #{submission.id}",
title: "Restore submission #{submission.id}",
method: :post,
remote: true,
data: { confirm: 'Are you sure?' },
rel: "nofollow" do %>
<i class="fas fa-trash"></i>
Restore
<% end %>
8 changes: 4 additions & 4 deletions app/views/admin/submissions/_unflag.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<%= link_to flag_admin_form_submission_path(submission.form, submission),
<%= link_to unflag_admin_form_submission_path(submission.form, submission),
id: "flag-submission-#{submission.id}",
class: "text-base",
"aria-label" => "Flag submission #{submission.id}",
title: "Flag submission #{submission.id}",
class: "text-secondary",
"aria-label" => "Un-flag submission #{submission.id}",
title: "Un-flag submission #{submission.id}",
data: { confirm: 'Are you sure?' },
method: :post,
remote: true,
Expand Down
12 changes: 12 additions & 0 deletions app/views/admin/submissions/_unflag_button.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<%= link_to unflag_admin_form_submission_path(form, submission, context: context),
id: "flag-submission-#{submission.id}",
class: "usa-button usa-button--base",
"aria-label" => "Un-flag submission #{submission.id}",
title: "Un-flag submission #{submission.id}",
method: :post,
remote: true,
data: { confirm: 'Are you sure?' },
rel: "nofollow" do %>
<i class="far fa-flag"></i>
Unflag
<% end %>
8 changes: 4 additions & 4 deletions app/views/admin/submissions/_unmark.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<%= link_to mark_admin_form_submission_path(submission.form, submission),
<%= link_to unmark_admin_form_submission_path(submission.form, submission),
id: "mark-submission-#{submission.id}",
class: "text-base",
"aria-label" => "Mark submission #{submission.id} as spam",
title: "Mark submission #{submission.id} as spam",
class: "text-secondary ",
"aria-label" => "Un-mark submission #{submission.id} as spam",
title: "Un-mark submission #{submission.id} as spam",
data: { confirm: 'Are you sure?' },
method: :post,
remote: true,
Expand Down
11 changes: 11 additions & 0 deletions app/views/admin/submissions/_unmark_button.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<%= link_to unmark_admin_form_submission_path(form, submission, context: context),
id: "mark-submission-#{submission.id}",
class: "usa-button usa-button--base",
"aria-label" => "Un-mark submission #{submission.id} as spam",
title: "Un-mark submission #{submission.id} as spam",
method: :post,
remote: true, data: { confirm: 'Are you sure?' },
rel: "nofollow" do %>
<i class="fa fa-exclamation-triangle"></i>
Unmark as spam
<% end %>
4 changes: 4 additions & 0 deletions app/views/admin/submissions/archive.js.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
<% if params[:context] == "show" %>
$(".response[data-id='<%= @submission.uuid %>'] .archived").html("<%= j(render 'unarchive_button', form: @form, submission: @submission, context: :show) %>")
<% else %>
$(".response[data-id='<%= @submission.uuid %>']").remove();
<% end %>
6 changes: 5 additions & 1 deletion app/views/admin/submissions/flag.js.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
$(".response[data-id='<%= @submission.uuid %>'] .flagged").html("<%= j(render 'flag', submission: @submission) %>")
<% if params[:context] == "show" %>
$(".response[data-id='<%= @submission.uuid %>'] .flagged").html("<%= j(render 'unflag_button', form: @form, submission: @submission, context: :show) %>")
<% else %>
$(".response[data-id='<%= @submission.uuid %>'] .flagged").html("<%= j(render 'unflag', submission: @submission) %>")
<% end %>
6 changes: 5 additions & 1 deletion app/views/admin/submissions/mark.js.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
$(".response[data-id='<%= @submission.uuid %>'] .marked").html("<%= j(render 'mark', submission: @submission) %>")
<% if params[:context] == "show" %>
$(".response[data-id='<%= @submission.uuid %>'] .marked").html("<%= j(render 'unmark_button', form: @form, submission: @submission, context: :show) %>")
<% else %>
$(".response[data-id='<%= @submission.uuid %>'] .marked").html("<%= j(render 'unmark', submission: @submission) %>")
<% end %>
49 changes: 32 additions & 17 deletions app/views/admin/submissions/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,26 +235,41 @@
</div>

<%- if form_permissions?(form: @form) %>
<p>
<%= link_to admin_form_submission_path(@form, @submission), class: "usa-button usa-button--secondary", method: :delete, remote: true, data: { confirm: 'Are you sure?' } do %>
<i class="fas fa-trash"></i>
&nbsp;
Delete this response
<% end %>
<p
class="response"
data-id="<%= @submission.uuid %>">

<span class="flagged">
<%- if @submission.flagged? %>
<%= render "admin/submissions/unflag_button", form: @form, submission: @submission, context: :show %>
<% else %>
<%= render "admin/submissions/flag_button", form: @form, submission: @submission, context: :show %>
<% end %>
</span>

<span class="marked">
<%- if @submission.spam? %>
<%= render "admin/submissions/unmark_button", form: @form, submission: @submission, context: :show %>
<% else %>
<%= render "admin/submissions/mark_button", form: @form, submission: @submission, context: :show %>
<% end %>
</span>

<span class="archived">
<%- if @submission.archived? %>
<%= link_to unarchive_admin_form_submission_path(@form, @submission), class: "usa-button usa-button--outline", method: :post, remote: true, data: { confirm: 'Are you sure?' } do %>
<i class="fa fa-inbox"></i>
&nbsp;
Unarchive response
<% end %>
<%= render "admin/submissions/unarchive_button", form: @form, submission: @submission, context: :show %>
<% else %>
<%= link_to archive_admin_form_submission_path(@form, @submission), class: "usa-button usa-button--outline", method: :post, remote: true, data: { confirm: 'Are you sure?' } do %>
<i class="fa fa-inbox"></i>
&nbsp;
Archive response
<% end %>
<%= render "admin/submissions/archive_button", form: @form, submission: @submission, context: :show %>
<% end %>
</span>

</p>
<span class="deleted">
<%- if @submission.deleted? %>
<%= render "admin/submissions/undelete_button", { form: @form, submission: @submission, context: :show } %>
<% else %>
<%= render "admin/submissions/delete_button", { form: @form, submission: @submission, context: :show } %>
<% end %>
</span>

</p>
<% end %>
7 changes: 6 additions & 1 deletion app/views/admin/submissions/unarchive.js.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
$(".response[data-id='<%= @submission.uuid %>'] .archived").html("<%= j(render 'unarchive', submission: @submission) %>")

<% if params[:context] == "show" %>
$(".response[data-id='<%= @submission.uuid %>'] .archived").html("<%= j(render 'archive_button', form: @form, submission: @submission, context: :show) %>")
<% else %>
$(".response[data-id='<%= @submission.uuid %>'] .archived").html("<%= j(render 'archive', submission: @submission) %>")
<% end %>
6 changes: 5 additions & 1 deletion app/views/admin/submissions/undelete.js.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
$(".response[data-id='<%= @submission.uuid %>'] .deleted").html("<%= j(render 'undeleted', submission: @submission) %>")
<% if params[:context] == "show" %>
$(".response[data-id='<%= @submission.uuid %>'] .deleted").html("<%= j(render 'delete_button', form: @form, submission: @submission, context: :show) %>")
<% else %>
$(".response[data-id='<%= @submission.uuid %>'] .deleted").html("<%= j(render 'delete', submission: @submission) %>")
<% end %>
6 changes: 5 additions & 1 deletion app/views/admin/submissions/unflag.js.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
$(".response[data-id='<%= @submission.uuid %>'] .flagged").html("<%= j(render 'unflag', submission: @submission) %>")
<% if params[:context] == "show" %>
$(".response[data-id='<%= @submission.uuid %>'] .flagged").html("<%= j(render 'flag_button', form: @form, submission: @submission, context: :show) %>")
<% else %>
$(".response[data-id='<%= @submission.uuid %>'] .flagged").html("<%= j(render 'flag', submission: @submission) %>")
<% end %>
6 changes: 5 additions & 1 deletion app/views/admin/submissions/unmark.js.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
$(".response[data-id='<%= @submission.uuid %>'] .marked").html("<%= j(render 'unmark', submission: @submission) %>")
<% if params[:context] == "show" %>
$(".response[data-id='<%= @submission.uuid %>'] .marked").html("<%= j(render 'mark_button', form: @form, submission: @submission, context: :show) %>")
<% else %>
$(".response[data-id='<%= @submission.uuid %>'] .marked").html("<%= j(render 'mark', submission: @submission) %>")
<% end %>
28 changes: 0 additions & 28 deletions db/migrate/20250226221548_versions_json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,8 @@
class SafeYAML
def self.load(string)
return {} if string.nil?

YAML.safe_load(
string,
permitted_classes: [
Time,
Date,
ActiveSupport::TimeWithZone,
ActiveSupport::TimeZone
],
aliases: true
)
end
end

class VersionsJson < ActiveRecord::Migration[8.0]
def change
rename_column :versions, :object, :old_object
rename_column :versions, :object_changes, :old_object_changes
add_column :versions, :object, :jsonb
add_column :versions, :object_changes, :jsonb

PaperTrail::Version.where.not(old_object: nil).in_batches(of: 500, start: 1) do |batch|
batch.each do |version|
version.update_columns(
object: SafeYAML.load(version.old_object),
old_object: nil,
object_changes: SafeYAML.load(version.old_object_changes),
old_object_changes: nil,
)
end
end
end
end
Loading