Skip to content

Refactor org_admin/conditions/_form.html.erb #3502

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
aaronskiba merged 11 commits into from
Apr 9, 2025
Merged

Refactor org_admin/conditions/_form.html.erb #3502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0c2e2d2
Document callers of conditions/form partial
aaronskiba Apr 7, 2025
97677d4
Remove commented-out code
aaronskiba Apr 7, 2025
c7abc11
Remove unused variable from conditions/form
aaronskiba Apr 7, 2025
b2eaac4
Replace `condition_exists` w/ `condition.present?`
aaronskiba Apr 7, 2025
e651186
Remove redundant `type_default` variable
aaronskiba Apr 7, 2025
dc04625
Remove redundant conditional check
aaronskiba Apr 7, 2025
5d0ec1e
Remove redundant conditional check
aaronskiba Apr 8, 2025
3a11067
Refactor: Split conditions/_form into two
aaronskiba Apr 8, 2025
4724bc7
Cleanup after `condtions/_form` refactor
aaronskiba Apr 8, 2025
8f952be
Update CHANGELOG.md
aaronskiba Apr 9, 2025
ae5786e
Merge branch 'johnpinto1-updated-port-of-dmptool-conditional-question…
aaronskiba Apr 9, 2025
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- Lower PostgreSQL GitHub Action Chrome Version to Address Breaking Changes Between Latest Chrome Version (134) and `/features` Tests [#3491](https://github.com/DMPRoadmap/roadmap/pull/3491)
- Bumped dependencies via `bundle update && yarn upgrade` [#3483](https://github.com/DMPRoadmap/roadmap/pull/3483)
- Fixed issues with Conditional Question serialization offered by @briri from PR https://github.com/CDLUC3/dmptool/pull/667 for DMPTool. There is a migration file with code for MySQL and Postgres to update the Conditions table to convert JSON Arrays in string format records in the conditions table so that they are JSON Arrays.
- Refactor `org_admin/conditions/_form.html.erb` [#3502](https://github.com/DMPRoadmap/roadmap/pull/3502)
- Refactor `Question.save_condition` [#3501](https://github.com/DMPRoadmap/roadmap/pull/3501)

## v4.2.0
Expand Down
39 changes: 39 additions & 0 deletions app/views/org_admin/conditions/_existing_condition_display.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<%
qopt = condition[:question_option_id].any? ? QuestionOption.find_by(id: condition[:question_option_id].first): nil
rquesArray = condition[:remove_question_id].any? ? Question.where(id: condition[:remove_question_id]) : nil
view_email_content_info = _("Hover over the email address to view email content. To change email details you need to remove and add the condition again.")
%>
<div class="col-md-3 pe-2">
<%= qopt[:text]&.slice(0, 25) %>
<%= hidden_field_tag(name_start + "[question_option][]", condition[:question_option_id]) %>
</div>
<div class="col-md-3 pe-2">
<%= condition[:action_type] == 'remove' ? 'Remove' : 'Email' %>
<%= hidden_field_tag(name_start + "[action_type]", condition[:action_type]) %>
</div>
<div class="col-md-3 pe-2">
<% if !rquesArray.nil? %>
<% rquesArray.each do |rques| %>
Question <%= rques[:number] %>: <%= rques.text.gsub(%r{</?p>}, '').slice(0, 50) %>
<%= '...' if rques.text.gsub(%r{</?p>}, '').length > 50 %>
<br>
<% end %>
<%= hidden_field_tag(name_start + "[remove_question_id][]", condition[:remove_question_id]) %>
<% else %>
<%
hook_tip = "Name: #{condition[:webhook_data]['name']}\nEmail: #{condition[:webhook_data]['email']}\n"
hook_tip += "Subject: #{condition[:webhook_data]['subject']}\nMessage: #{condition[:webhook_data]['message']}"
%>
<span title="<%= hook_tip %>"><%= condition[:webhook_data]['email'] %></span>
<br>(<%= view_email_content_info %>)

<%= hidden_field_tag(name_start + "[webhook-email]", condition[:webhook_data]['email']) %>
<%= hidden_field_tag(name_start + "[webhook-name]", condition[:webhook_data]['name']) %>
<%= hidden_field_tag(name_start + "[webhook-subject]", condition[:webhook_data]['subject']) %>
<%= hidden_field_tag(name_start + "[webhook-message]", condition[:webhook_data]['message']) %>
<% end %>
<%= hidden_field_tag(name_start + "[number]", condition_no) %>
</div>
<div class="col-md-3">
<a href="#anotherurl" class="delete-condition"><%= _('Remove') %></a>
</div>
95 changes: 19 additions & 76 deletions app/views/org_admin/conditions/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,88 +1,31 @@
<% condition ||= nil %>
<%# This partial is called from the following files:
- app/controllers/org_admin/conditions_controller.rb
- app/views/org_admin/conditions/_container.html.erb
%>

<div class="row condition-partial mb-3">
<%
action_type_arr = [["removes", :remove], ["adds notification", :add_webhook]]
# name_start = "conditions[]condition_" + condition_no.to_s
condition ||= nil
name_start = "conditions[#{condition_no.to_s}]"
remove_question_collection = later_question_list(question)
condition_exists = local_assigns.has_key? :condition
type_default = condition_exists ? (condition[:action_type] == "remove" ? :remove : :add_webhook) : :remove
remove_question_group = condition_exists ?
grouped_options_for_select(remove_question_collection, condition[:remove_question_id]) :
grouped_options_for_select(remove_question_collection)
multiple = (question.question_format.multiselectbox? || question.question_format.checkbox?)
view_email_content_info = _("Hover over the email address to view email content. To change email details you need to remove and add the condition again.")
%>

<%# If this is a new condition then display the interactive controls. otherwise just display the logic %>
<% if condition.nil? %>
<div class="form-label bold">Add condition</div>
<div class="row mb-3">
<div class="col-md-9 pe-2">
<div class="form-label bold"><%= _('Option') %></div>
<%= select_tag(:question_option, options_from_collection_for_select(question.question_options.sort_by(&:number), "id", "text",
condition_exists ? condition[:question_option_id] : question.question_options.sort_by(&:number)[0]), {class: 'form-select regular', 'data-bs-style': 'dropdown-toggle bg-white px-4 py-3', name: name_start + "[question_option][]"}) %>
</div>
<div class="col-md-3 pe-2">
<div class="form-label bold"><%= _('Action') %></div>
<%= select_tag(:action_type, options_for_select(action_type_arr, type_default), {name: name_start + "[action_type]", class: 'action-type form-select narrow', 'data-bs-style': 'dropdown-toggle bg-white px-4 py-3'}) %>
</div>
</div>
<div class="row d-flex mb-3">
<div class="col-md-10 pe-2">
<div class="form-label bold display-if-action-remove"><%= _('Target') %></div>
<div class="remove-dropdown">
<%= select_tag(:remove_question_id, remove_question_group, {name: name_start + "[remove_question_id][]", class: 'form-select regular', multiple: true, 'data-bs-style': 'dropdown-toggle bg-white px-4 py-3'}) %>
</div>
<div class="webhook-replacement display-off my-auto text-center">
<%= link_to _('Edit email'), '#' %>
</div>
<%= hidden_field_tag(name_start + "[number]", condition_no) %>
</div>
<div class="col-md-2 align-self-center">
<a href="#anotherurl" class="delete-condition btn btn-primary"><%= _('Remove') %></a>
</div>
<%= render partial: 'org_admin/conditions/webhook_form', locals: {name_start: name_start, condition_no: condition_no} %>
</div>
<%= render partial: 'org_admin/conditions/new_condition_form',
locals: { condition_no: condition_no,
name_start: name_start,
question: question
}
%>

<% else %>
<%
qopt = condition[:question_option_id].any? ? QuestionOption.find_by(id: condition[:question_option_id].first): nil
rquesArray = condition[:remove_question_id].any? ? Question.where(id: condition[:remove_question_id]) : nil
%>
<div class="col-md-3 pe-2">
<%= qopt[:text]&.slice(0, 25) %>
<%= hidden_field_tag(name_start + "[question_option][]", condition[:question_option_id]) %>
</div>
<div class="col-md-3 pe-2">
<%= condition[:action_type] == 'remove' ? 'Remove' : 'Email' %>
<%= hidden_field_tag(name_start + "[action_type]", condition[:action_type]) %>
</div>
<div class="col-md-3 pe-2">
<% if !rquesArray.nil? %>
<% rquesArray.each do |rques| %>
Question <%= rques[:number] %>: <%= rques.text.gsub(%r{</?p>}, '').slice(0, 50) %>
<%= '...' if rques.text.gsub(%r{</?p>}, '').length > 50 %>
<br>
<% end %>
<%= hidden_field_tag(name_start + "[remove_question_id][]", condition[:remove_question_id]) %>
<% else %>
<%
hook_tip = "Name: #{condition[:webhook_data]['name']}\nEmail: #{condition[:webhook_data]['email']}\n"
hook_tip += "Subject: #{condition[:webhook_data]['subject']}\nMessage: #{condition[:webhook_data]['message']}"
%>
<span title="<%= hook_tip %>"><%= condition[:webhook_data]['email'] %></span>
<br>(<%= view_email_content_info %>)
<%= render partial: 'org_admin/conditions/existing_condition_display',
locals: { condition: condition,
condition_no: condition_no,
name_start: name_start,
question: question
}
%>

<%= hidden_field_tag(name_start + "[webhook-email]", condition[:webhook_data]['email']) %>
<%= hidden_field_tag(name_start + "[webhook-name]", condition[:webhook_data]['name']) %>
<%= hidden_field_tag(name_start + "[webhook-subject]", condition[:webhook_data]['subject']) %>
<%= hidden_field_tag(name_start + "[webhook-message]", condition[:webhook_data]['message']) %>
<% end %>
<%= hidden_field_tag(name_start + "[number]", condition_no) %>
</div>
<div class="col-md-3">
<a href="#anotherurl" class="delete-condition"><%= _('Remove') %></a>
</div>
<% end %>
</div>
34 changes: 34 additions & 0 deletions app/views/org_admin/conditions/_new_condition_form.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<%
action_type_arr = [["removes", :remove], ["adds notification", :add_webhook]]
remove_question_collection = later_question_list(question)
remove_question_group = grouped_options_for_select(remove_question_collection)
%>

<div class="form-label bold">Add condition</div>
<div class="row mb-3">
<div class="col-md-9 pe-2">
<div class="form-label bold"><%= _('Option') %></div>
<%= select_tag(:question_option, options_from_collection_for_select(question.question_options.sort_by(&:number), "id", "text",
question.question_options.sort_by(&:number)[0]), {class: 'form-select regular', 'data-bs-style': 'dropdown-toggle bg-white px-4 py-3', name: name_start + "[question_option][]"}) %>
</div>
<div class="col-md-3 pe-2">
<div class="form-label bold"><%= _('Action') %></div>
<%= select_tag(:action_type, options_for_select(action_type_arr, :remove), {name: name_start + "[action_type]", class: 'action-type form-select narrow', 'data-bs-style': 'dropdown-toggle bg-white px-4 py-3'}) %>
</div>
</div>
<div class="row d-flex mb-3">
<div class="col-md-10 pe-2">
<div class="form-label bold display-if-action-remove"><%= _('Target') %></div>
<div class="remove-dropdown">
<%= select_tag(:remove_question_id, remove_question_group, {name: name_start + "[remove_question_id][]", class: 'form-select regular', multiple: true, 'data-bs-style': 'dropdown-toggle bg-white px-4 py-3'}) %>
</div>
<div class="webhook-replacement display-off my-auto text-center">
<%= link_to _('Edit email'), '#' %>
</div>
<%= hidden_field_tag(name_start + "[number]", condition_no) %>
</div>
<div class="col-md-2 align-self-center">
<a href="#anotherurl" class="delete-condition btn btn-primary"><%= _('Remove') %></a>
</div>
<%= render partial: 'org_admin/conditions/webhook_form', locals: {name_start: name_start, condition_no: condition_no} %>
</div>