Merge pull request #8100 from ministryofjustice/CTSKF-1041-smart_survey

Replace feedback form with Smart Survey

.k8s/live/api-sandbox/app-config.yaml

@@ -18,6 +18,5 @@ data:
   SETTINGS__AWS__POLL_MESSAGE_COUNT: '10'
   SETTINGS__AWS__POLL_MESSAGE_WAIT_TIME: '0'
   SETTINGS__AWS__S3__REGION: 'eu-west-2'
-  SURVEY_MONKEY_COLLECTOR_ID: '330288407'
   LAA_FEE_CALCULATOR_HOST: https://laa-fee-calculator.service.justice.gov.uk/api/v1
   ALLOW_FUTURE_DATES: 'true'

.k8s/live/production/app-config.yaml

@@ -19,7 +19,6 @@ data:
   SETTINGS__AWS__POLL_MESSAGE_COUNT: '10'
   SETTINGS__AWS__POLL_MESSAGE_WAIT_TIME: '0'
   SETTINGS__AWS__S3__REGION: 'eu-west-2'
-  SURVEY_MONKEY_COLLECTOR_ID: '330288407'
   SURVEY_MONKEY_COURT_DATA_COLLECTOR_ID: '330346602'
   LAA_FEE_CALCULATOR_HOST: https://laa-fee-calculator.service.justice.gov.uk/api/v1
   ALLOW_FUTURE_DATES: 'false'

.k8s/live/staging/app-config.yaml

@@ -19,7 +19,6 @@ data:
   SETTINGS__AWS__POLL_MESSAGE_COUNT: '10'
   SETTINGS__AWS__POLL_MESSAGE_WAIT_TIME: '0'
   SETTINGS__AWS__S3__REGION: 'eu-west-2'
-  SURVEY_MONKEY_COLLECTOR_ID: '330289923'
   SURVEY_MONKEY_COURT_DATA_COLLECTOR_ID: '330346602'
   LAA_FEE_CALCULATOR_HOST: https://staging.laa-fee-calculator.service.justice.gov.uk/api/v1
   ALLOW_FUTURE_DATES: 'false'

app/controllers/feedback_controller.rb

@@ -1,7 +1,6 @@
 class FeedbackController < ApplicationController
   skip_load_and_authorize_resource only: %i[new create]
   before_action :suppress_hotline_link
-  before_action :setup_page
 
   def new
     @feedback = Feedback.new(type:, referrer: referrer_path)
@@ -21,13 +20,7 @@ def create
 
   private
 
-  def sender
-    if params['feedback']['type'] == 'feedback' && !Settings.zendesk_feedback_enabled?
-      SurveyMonkeySender::Feedback
-    else
-      ZendeskSender
-    end
-  end
+  def sender = ZendeskSender
 
   def type
     %w[feedback bug_report].include?(params[:type]) ? params[:type] : 'feedback'
@@ -70,8 +63,4 @@ def feedback_params
       reason: []
     )
   end
-
-  def setup_page
-    @feedback_form = FeedbackForm.new if type == 'feedback'
-  end
 end

app/models/feedback.rb

@@ -3,10 +3,9 @@ class Feedback
   include ActiveModel::Validations
 
   attr_accessor :email, :referrer, :user_agent, :type,
-                :event, :outcome, :case_number,
-                :task, :rating, :comment, :reason, :other_reason, :response_message
+                :event, :outcome, :case_number, :response_message
 
-  validates :type, inclusion: { in: %w[feedback bug_report] }
+  validates :type, inclusion: { in: %w[bug_report] }
   validates :event, :outcome, presence: true, if: -> { is?(:bug_report) }
 
   def initialize(attributes = {})

app/views/feedback/feedback.html.haml

@@ -1,46 +1,16 @@
 = content_for :page_title, flush: true do
   = t('.page_title')
 
-= render partial: 'layouts/header', locals: { page_heading: t('.page_heading') }
-
-.govuk-grid-row
-  .govuk-grid-column-two-thirds
-    = form_for @feedback, url: feedback_index_path(email: params[:email]), html: { novalidate: 'novalidate' } do |f|
-      = f.hidden_field :type
-      = f.hidden_field :referrer
-      = hidden_field_tag 'ga_client_id', '', class: 'ga-client-id'
-
-      = f.govuk_error_summary
-
-      = govuk_inset_text do
-        %p
-          = t('.callout')
-          = render partial: 'feedback/claim_edit_alert' if referrer_is_claim?(@feedback.referrer)
-
-      = f.govuk_radio_buttons_fieldset :task, legend: { text: t('.task_legend'), size: 'm' } do
-        - @feedback_form.tasks.answers.map do |task|
-          = f.govuk_radio_button :task, task.key, label: { text: task.label } do
-            - if task.label.eql?('No') || task.label.eql?('Partially')
-              %p.govuk-body{class: 'govuk-!-margin-bottom-6'}
-                = t('.report_fault_html', bug_report_link: new_feedback_path(type: 'bug_report'))
-
-      = f.govuk_collection_radio_buttons :rating,
-        @feedback_form.ratings.answers, :key, :label,
-        legend: { text: t('.rating') }
-
-      = f.govuk_text_area :comment,
-        label: { text: t('.comment'), size: 'm' },
-        hint: { text: t('.comment_hint') }
-
-      = f.govuk_check_boxes_fieldset :reason, legend: { text: t('.reason'), size: "m" } do
-
-        - @feedback_form.reasons.answers.map do |reason|
-          = f.govuk_check_box :reason,
-            reason.key,
-            label: { text: reason.label } do
-
-            - if reason.other
-              = f.govuk_text_field :other_reason,
-                label: { text: t('.reason_other') }
-
-      = f.govuk_submit(t('.send'))
+- title(t('.page_heading')) unless content_for?(:page_title)
+
+= javascript_tag nonce: true, id: 'ss-embed-2909982' do
+  :plain
+    (function(d,w){
+      var s,ss;
+      ss=d.createElement('script');
+      ss.type='text/javascript';
+      ss.async=true;
+      ss.src=('https:'==d.location.protocol?'https://':'http://')+'www.smartsurvey.co.uk/s/embed/2909982/js/';
+      s=d.getElementsByTagName('script')[0];
+      s.parentNode.insertBefore(ss, s);
+    })(document,window);

config/initializers/survey_monkey.rb

@@ -5,11 +5,8 @@
     config.logger = Rails.logger
     config.verbose_logging = true
 
-    config.register_collector(:feedback, id: ENV['SURVEY_MONKEY_COLLECTOR_ID'])
     config.register_collector(:court_data, id: ENV['SURVEY_MONKEY_COURT_DATA_COLLECTOR_ID'])
 
-    feedback_page = FeedbackForm.new
-    config.register_page(feedback_page.name, id: feedback_page.id, collector: feedback_page.collector, questions: feedback_page.template)
     court_data_page = CourtDataForm.new
     config.register_page(court_data_page.name, id: court_data_page.id, collector: court_data_page.collector, questions: court_data_page.template)
   end