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.

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

Remove partner FAQs - Part 1 #4912

Merged
merged 10 commits into from
Jan 16, 2025
Merged

Remove partner FAQs - Part 1 #4912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d38b09f
Don't display FAQ on partners/help page
jp524 Jan 4, 2025
7f5741c
Replace partners/helps system test by request test
jp524 Jan 4, 2025
f7ea191
Only show bank Q&A in admin/questions (no partner Q&A)
jp524 Jan 4, 2025
2c93dd6
Remove references to 'for_banks' & 'for_partners' from Questions
jp524 Jan 4, 2025
5f8302c
Show all bank FAQ on one page
jp524 Jan 6, 2025
2c22609
Lint
jp524 Jan 7, 2025
08106d5
partners_help system spec: specify name and email for factory
jp524 Jan 10, 2025
127f506
Merge branch 'main' into 4546-remove-partner-faq
jp524 Jan 10, 2025
bbaa6e0
Update partners_help request spec
jp524 Jan 12, 2025
fe1183b
Merge branch 'main' into 4546-remove-partner-faq
jp524 Jan 12, 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
5 changes: 2 additions & 3 deletions app/controllers/admin/questions_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
class Admin::QuestionsController < AdminController
def index
@bank_questions = Question.for_banks
@partner_questions = Question.for_partners
@bank_questions = Question.all
end

def new
Expand Down Expand Up @@ -45,6 +44,6 @@ def current_question
end

def question_params
params.require(:question).permit(:title, :for_partners, :for_banks, :answer)
params.require(:question).permit(:title, :answer)
end
end
4 changes: 2 additions & 2 deletions app/controllers/help_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
class HelpController < ApplicationController
def show
@filterrific = initialize_filterrific(
Question.for_banks,
Question.all,
params[:filterrific]
) || return

@bank_questions = @filterrific.find.page(params[:page])
@bank_questions = @filterrific.find

respond_to do |format|
format.html
Expand Down
12 changes: 1 addition & 11 deletions app/controllers/partners/helps_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,7 @@ class HelpsController < BaseController
layout 'partners/application'

def show
@filterrific = initialize_filterrific(
Question.for_partners,
params[:filterrific]
) || return

@partner_questions = @filterrific.find.page(params[:page])

respond_to do |format|
format.html
format.js
end
@bank = current_partner.organization
end
end
end
18 changes: 3 additions & 15 deletions app/models/question.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,14 @@ class Question < ApplicationRecord
has_rich_text :answer
validates :answer, presence: true
validates :title, presence: true
validates :for_banks, acceptance: {message: "and for partners can't both be unchecked"}, unless: :for_partners
validates :for_partners, acceptance: {message: "and for banks can't both be unchecked"}, unless: :for_banks
scope :for_banks, -> { where(for_banks: true) }
scope :for_partners, -> { where(for_partners: true) }
scope :search_title, ->(query) { where("title ilike ?", "%#{query}%").includes([:rich_text_answer]) }

# TODO: remove this line once migration `20250104193318_remove_for_banks_and_for_partners_from_questions` has been run in production
self.ignored_columns += ["for_banks", "for_partners"]

filterrific(
available_filters: [
:search_title
]
)

def punctuate(errors)
remove_redundant_error(errors).map { |error| error + ". " }.join("")
end

def remove_redundant_error(errors)
if errors.include?("For banks and for partners can't both be unchecked")
errors.delete("For banks and for partners can't both be unchecked")
end
errors
end
end
2 changes: 0 additions & 2 deletions app/views/admin/questions/_question_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
<div class="card-body">
<div class="form-inputs">
<%= f.input :title %>
<%= f.input :for_partners, as: :boolean %>
<%= f.input :for_banks, as: :boolean %>
<div class="font-bold mb-2">Answer</div>
<%= f.rich_text_area :answer %>
</div>
Expand Down
30 changes: 2 additions & 28 deletions app/views/admin/questions/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
<!-- Default box -->
<div class="card card-info mt-2">
<div class="card-header">
<h2 class="card-title">Frequently Asked Questions</h2>
<h2 class="card-title">Frequently Asked Questions for Banks</h2>
</div>
<div class="card-body p-4">
<ul class="list-inside my-2 list-decimal space-y-5">
<%= new_button_to new_admin_question_path, { text: "Write A New Question And Answer" } %>
<%= new_button_to new_admin_question_path, { text: "Write A New Question And Answer", class: "mb-3" } %>

<div class='text-2xl font-bold'>Questions For Banks</div>
<% @bank_questions.each do |bank_question| %>
<div class="accordion" id="accordion">
<div class="card">
Expand All @@ -34,31 +33,6 @@
</div>
</div>
<% end %>

<div class='text-2xl font-bold'>Questions For Partners</div>
<% @partner_questions.each do |partner_question| %>
<div class="accordion" id="accordion">
<div class="card">
<div class="card-header" id="heading">
<h2 class="mb-0">
<button class="text-left text-2xl" type="button" data-bs-toggle="collapse" data-bs-target="#collapse<%= -partner_question.id %>" aria-expanded="false" aria-controls="collapse<%= -partner_question.id %>">
<%= partner_question.title %>
</button>
<div class="mt-2">
<%= edit_button_to edit_admin_question_path(partner_question) %>
<%= delete_button_to admin_question_path(partner_question) %>
</div>
</h2>
</div>
<div id="collapse<%= -partner_question.id %>" class="collapse" aria-labelledby="heading" data-parent="#accordion">
<div class="card-body">
<%= partner_question.answer %>
</div>
</div>
</div>
</div>
<% end %>

</ul>
</div>
</div>
Expand Down
116 changes: 59 additions & 57 deletions app/views/help/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,71 +6,73 @@
list-style: inside;
}
</style>
<section class="content">
<div class="row">
<div class="col-12">
<div class="card card-primary mt-2">
<div class="card-header">
<h2 class="card-title">Frequently Asked Questions</h2>
</div>
<div class="card-body p-4">
<ul class="list-inside my-2 list-decimal space-y-5">
<%= form_for_filterrific @filterrific, remote: true do |f| %>
<div class="row flex-row justify-content-between align-items-center">
<div class='col-3'>
<%= f.label :search_title, "Search By Question" %>
<%= f.text_field(:search_title, class: 'filterrific-periodically-observed form-control') %>
</div>
<div class="col-3">
<%= render_filterrific_spinner %>
<div class="container-fluid">
<section class="content">
<div class="row">
<div class="col-12">
<div class="card card-primary mt-2">
<div class="card-header">
<h2 class="card-title">Frequently Asked Questions</h2>
</div>
<div class="card-body p-4">
<ul class="list-inside my-2 list-decimal space-y-5">
<%= form_for_filterrific @filterrific, remote: true do |f| %>
<div class="row flex-row justify-content-between align-items-center">
<div class='col-3'>
<%= f.label :search_title, "Search By Question" %>
<%= f.text_field(:search_title, class: 'filterrific-periodically-observed form-control') %>
</div>
<div class="col-3">
<%= render_filterrific_spinner %>
</div>
</div>
</div>
<% end %>
</ul>
<% end %>
</ul>
</div>
</div>
</div>
</div>
</div>
</section>
</section>

<section class="content">
<div class="row">
<div class="col-12" id="accordion">
<div id="filterrific_results">
<%= render(partial: 'bank_questions', locals: { bank_questions: @bank_questions }) %>
<section class="content">
<div class="row">
<div class="col-12" id="accordion">
<div id="filterrific_results">
<%= render(partial: 'bank_questions', locals: { bank_questions: @bank_questions }) %>
</div>
</div>
</div>
</div>
</section>
</section>

<section class="content">
<div class="row">
<div class="col-12">
<div class="card card-primary mt-2">
<div class="col-12 mt-3 text-center">
<p class="lead">
Have suggestions to help improve the app or other questions about the app? Please
<a href="https://human-essential.slack.com/archives/CG1NL2MRC"><u>reach out on Slack.</u></a>
</p>
</div>
<div class="col-12 mt-3 text-center">
<p class="lead">
Not a member of the Human Essentials Slack group?
<a href="https://join.slack.com/t/human-essential/shared_invite/zt-bfa8tymd-d8Ks3Mq000COcRe~nfs~zg"><u>Request
a
login.</u></a>
</p>
</div>
<div class="col-12 mt-3 text-center">
<p class="lead">
Still need help? Submit a support ticket
<u><%= link_to 'here', support_ticket_form_url, target: '_blank' %></u>
and we will do our best to follow up with you via email. Please note that our team meets and triages email
on
Sundays.
</p>
<section class="content">
<div class="row">
<div class="col-12">
<div class="card card-primary mt-2">
<div class="col-12 mt-3 text-center">
<p class="lead">
Have suggestions to help improve the app or other questions about the app? Please
<a href="https://human-essential.slack.com/archives/CG1NL2MRC"><u>reach out on Slack.</u></a>
</p>
</div>
<div class="col-12 mt-3 text-center">
<p class="lead">
Not a member of the Human Essentials Slack group?
<a href="https://join.slack.com/t/human-essential/shared_invite/zt-bfa8tymd-d8Ks3Mq000COcRe~nfs~zg"><u>Request
a
login.</u></a>
</p>
</div>
<div class="col-12 mt-3 text-center">
<p class="lead">
Still need help? Submit a support ticket
<u><%= link_to 'here', support_ticket_form_url, target: '_blank' %></u>
and we will do our best to follow up with you via email. Please note that our team meets and triages email
on
Sundays.
</p>
</div>
</div>
</div>
</div>
</div>
</section>
</section>
</div>
16 changes: 0 additions & 16 deletions app/views/partners/helps/_partner_questions.html.erb
View file
Open in desktop

This file was deleted.

66 changes: 7 additions & 59 deletions app/views/partners/helps/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,59 +1,7 @@
<style>
.trix-content, ol {
list-style: auto;
}
.trix-content, ul {
list-style: inside;
}
</style>
<section class="content">
<div class="row">
<div class="col-12">
<!-- Default box -->
<div class="card card-primary mt-2">
<div class="card-header">
<h2 class="card-title">Frequently Asked Questions</h2>
</div>
<div class="card-body p-4">
<ul class="list-inside my-2 list-decimal space-y-5">
<%= form_for_filterrific @filterrific, remote: true do |f| %>
<div class="row flex-row justify-content-between align-items-center">
<div class='col-3'>
<%= f.label :search_title, "Search By Question" %>
<%= f.text_field(:search_title, class: 'filterrific-periodically-observed form-control') %>
</div>
<div class="col-3">
<%= render_filterrific_spinner %>
</div>
</div>
<% end %>
</ul>
</div>
</div>
</div>
</div>
</section>

<section class="content">
<div class="row">
<div class="col-12" id="accordion">
<div id="filterrific_results">
<%= render(partial: 'partner_questions', locals: { partner_questions: @partner_questions }) %>
</div>
</div>
</div>
</section>

<section class="content">
<div class="row">
<div class="col-12">
<div class="card card-primary mt-2">
<div class="col-12 mt-3 text-center">
<p class="lead">
Still need help? Reach out to your sponsoring bank with any unanswered questions.
</p>
</div>
</div>
</div>
</div>
</section>
<div class="text-center p-3">
<h1>Need Help?</h1>
<p>
Please contact your essentials bank, <%= @bank.name %>, if you need further assistance.<br>
Our email on record for them is: <%= mail_to @bank.email %>
</p>
</div>
4 changes: 0 additions & 4 deletions app/views/partners/helps/show.js.erb
View file
Open in desktop

This file was deleted.

18 changes: 2 additions & 16 deletions db/seeds.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,22 +903,8 @@ def seed_quantity(item_name, organization, storage_location, quantity)

5.times do
Question.create(
title: "Question for banks. #{titles.sample}",
for_banks: true,
for_partners: false,
answer: "Answer for banks. #{answers.sample}"
)
Question.create(
title: "Question for both. #{titles.sample}",
for_banks: true,
for_partners: true,
answer: "Answer for both. #{answers.sample}"
)
Question.create(
title: "Question for partners. #{titles.sample}",
for_banks: false,
for_partners: true,
answer: "Answer for partners. #{answers.sample}"
title: titles.sample,
answer: answers.sample
)
end

Expand Down
2 changes: 0 additions & 2 deletions spec/factories/questions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
FactoryBot.define do
factory :question do
title { "question" }
for_banks { true }
for_partners { false }
answer { "content" }
end
end
Loading
Loading