Merge pull request #784 from citizensadvice/CP-1298-remove-FF_NEW_CSR_DATA-code

chore/Remove FF_NEW_CSR_DATA code

Author: KPobeeNorris

.github/resources/preview-overrides.yaml

@@ -22,4 +22,3 @@ envVars:
   RAILS_ENV: production
   USE_TEST_SUPPLIERS: ${{ vars.USE_TEST_SUPPLIERS }}
   FF_SMALL_SUPPLIER_STARS: ${{ vars.FF_SMALL_SUPPLIER_STARS }}
-  FF_NEW_CSR_DATA: ${{ vars.FF_NEW_CSR_DATA }}"

app/components/csr_table/other_scores_component.html.haml

@@ -16,11 +16,10 @@
       %p.score-summary__text
         Contact waiting time
       = render CsrTable::ScoreComponent.new(score: supplier.contact_rating)
-    - if Feature.enabled? "FF_NEW_CSR_DATA"
-      %li.score-summary__item
-        %p.score-summary__text
-          Billing and metering
-        = render CsrTable::ScoreComponent.new(score: supplier.bill_accuracy_and_metering_rating)
+    %li.score-summary__item
+      %p.score-summary__text
+        Billing and metering
+      = render CsrTable::ScoreComponent.new(score: supplier.bill_accuracy_and_metering_rating)
     %li.score-summary__item
       %p.score-summary__text
         Customer commitments

app/components/csr_table/other_scores_component.rb

@@ -18,10 +18,9 @@
           %th.supplier-table__response{ scope: "col" }
             .cads-table__content
               Contact waiting time
-          -if Feature.enabled?("FF_NEW_CSR_DATA")
-            %th.supplier-table__billing{ scope: "col" }
-              .cads-table__content
-                Billing and metering
+          %th.supplier-table__billing{ scope: "col" }
+            .cads-table__content
+              Billing and metering
           %th.supplier-table__guarantee{ scope: "col" }
             .cads-table__content
               Customer commitments

app/components/csr_table/score_summary_component.html.haml

@@ -14,10 +14,9 @@
   %td.supplier-table__response
     .cads-table__content
       = render CsrTable::ScoreComponent.new(score: supplier.contact_rating)
-  - if Feature.enabled? "FF_NEW_CSR_DATA"
-    %td.supplier-table__billing
-      .cads-table__content
-        = render CsrTable::ScoreComponent.new(score: supplier.bill_accuracy_and_metering_rating)
+  %td.supplier-table__billing
+    .cads-table__content
+      = render CsrTable::ScoreComponent.new(score: supplier.bill_accuracy_and_metering_rating)
   %td.supplier-table__guarantee
     .cads-table__content
       = render CsrTable::ScoreComponent.new(score: supplier.guarantee_rating)

app/components/csr_table/supplier_table_component.html.haml

@@ -14,11 +14,10 @@
       %p.stars-summary__text
         Contact waiting time
       = render CsrTable::ScoreComponent.new(score: supplier.contact_rating)
-    -if Feature.enabled?("FF_NEW_CSR_DATA")
-      %li.stars-summary__item
-        %p.stars-summary__text
-          Billing and metering
-        = render CsrTable::ScoreComponent.new(score: supplier.bill_accuracy_and_metering_rating)
+    %li.stars-summary__item
+      %p.stars-summary__text
+        Billing and metering
+      = render CsrTable::ScoreComponent.new(score: supplier.bill_accuracy_and_metering_rating)
     %li.stars-summary__item
       %p.stars-summary__text
         Customer commitments

app/components/csr_table/supplier_table_row_component.html.haml

@@ -21,12 +21,10 @@ module Queries
         },
         slug,
         rank,
-        complaintsRating,
         complaintsRatingScore,
         complaintsNumber,
         contactEmail,
         contactRating,
-        contactSocialMedia,
         contactTime,
         contactWebchatSync,
         contactWebchatAsync,

app/components/csr_table/unranked_suppliers/stars_summary_component.html.haml

@@ -17,12 +17,10 @@ module Queries
         },
         slug,
         rank,
-        complaintsRating,
         complaintsRatingScore,
         complaintsNumber,
         contactEmail,
         contactRating,
-        contactSocialMedia,
         contactTime,
         guaranteeRating,
         overallRating,

app/controllers/queries/supplier_detail.rb

@@ -7,9 +7,9 @@ class Supplier
 
   delegate :name, :whitelabel_supplier, :slug, :rank,
            :complaints_number, :contact_email, :contact_rating,
-           :contact_social_media, :contact_time, :contact_info,
-           :other_contact_info, :billing_info, :guarantee_rating,
-           :guarantee_list, :overall_rating, :data_available, :fuel_mix,
+           :contact_time, :contact_info, :other_contact_info,
+           :billing_info, :guarantee_rating, :guarantee_list,
+           :overall_rating, :data_available, :fuel_mix,
            :opening_hours, :bill_accuracy_and_metering_rating,
            :bills_accuracy_smart, :bills_accuracy_traditional,
            :smart_operating, :contact_webchat_sync, :contact_webchat_async,
@@ -54,6 +54,6 @@ def top_three?
   end
 
   def complaints_rating
-    Feature.enabled?("FF_NEW_CSR_DATA") ? data.complaints_rating_score : data.complaints_rating
+    data.complaints_rating_score
   end
 end