Merge pull request #6720 from guardian/no-index-in-code

Add a noindex tag to pages in CODE
guardian · Jan 23, 2025 · 83b2819 · 83b2819
2 parents d101363 + 525de87
commit 83b2819
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 53 deletions.
diff --git a/support-frontend/app/controllers/Application.scala b/support-frontend/app/controllers/Application.scala
@@ -9,6 +9,7 @@ import com.gu.i18n.CountryGroup
 import com.gu.i18n.CountryGroup._
 import com.gu.identity.model.{User => IdUser}
 import com.gu.support.catalog.{SupporterPlus, TierThree}
+import com.gu.support.config.Stages.PROD
 import com.gu.support.config._
 import com.gu.support.encoding.InternationalisationCodecs
 import com.typesafe.scalalogging.StrictLogging
@@ -301,6 +302,7 @@ class Application(
         views.EmptyDiv("down-for-maintenance-page"),
         RefPath("downForMaintenancePage.js"),
         Some(RefPath("downForMaintenancePage.css")),
+        noindex = stage != PROD,
       )()(assets, request, settingsProvider.getAllSettings()),
     ).withSettingsSurrogateKey
   }
@@ -349,7 +351,6 @@ class Application(
       id = s"contributions-landing-page-$countryCode",
       mainElement = mainElement,
       js = RefPath("supporterPlusLandingPage.js"),
-      css = None,
       description = stringsConfig.contributionsLandingDescription,
       paymentMethodConfigs = PaymentMethodConfigs(
         oneOffDefaultStripeConfig = oneOffStripeConfigProvider.get(false),
@@ -371,6 +372,7 @@ class Application(
       serversideTests = serversideTests,
       allProductPrices = AllProductPrices(supporterPlusProductPrices, tierThreeProductPrices),
       productCatalog = productCatalog,
+      noIndex = stage != PROD,
     )
   }
 
@@ -390,6 +392,7 @@ class Application(
         shareImageUrl = Some(
           ausMomentMapSocialImageUrl,
         ),
+        noindex = stage != PROD,
       )(),
     ).withSettingsSurrogateKey
   }

diff --git a/support-frontend/app/controllers/DigitalSubscriptionController.scala b/support-frontend/app/controllers/DigitalSubscriptionController.scala
@@ -4,6 +4,7 @@ import actions.CustomActionBuilders
 import admin.settings.{AllSettings, AllSettingsProvider, On, SettingsSurrogateKeySyntax}
 import assets.{AssetsResolver, RefPath, StyleContent}
 import com.gu.support.catalog.DigitalPack
+import com.gu.support.config.Stages.PROD
 import com.gu.support.config.{PayPalConfigProvider, Stage, StripePublicConfigProvider}
 import com.gu.support.encoding.CustomCodecs._
 import services.pricing.{PriceSummaryServiceProvider, ProductPrices}
@@ -83,23 +84,25 @@ class DigitalSubscriptionController(
 
         Ok(
           views.html.subscriptionCheckout(
-            title,
-            mainElement,
-            js,
-            css,
-            Some(csrf),
-            request.user,
-            testMode,
-            priceSummaryServiceProvider.forUser(testMode).getPrices(DigitalPack, promoCodes, readerType),
-            maybePromotionCopy,
-            stripeConfigProvider.get(),
-            stripeConfigProvider.get(true),
-            payPalConfigProvider.get(),
-            payPalConfigProvider.get(true),
-            v2recaptchaConfigPublicKey,
-            orderIsAGift,
-            None,
-            productCatalog,
+            title = title,
+            mainElement = mainElement,
+            js = js,
+            css = css,
+            csrf = Some(csrf),
+            idUser = request.user,
+            testMode = testMode,
+            productPrices =
+              priceSummaryServiceProvider.forUser(testMode).getPrices(DigitalPack, promoCodes, readerType),
+            maybePromotionCopy = maybePromotionCopy,
+            defaultStripeConfig = stripeConfigProvider.get(),
+            testStripeConfig = stripeConfigProvider.get(true),
+            defaultPayPalConfig = payPalConfigProvider.get(),
+            testPayPalConfig = payPalConfigProvider.get(true),
+            v2recaptchaConfigPublicKey = v2recaptchaConfigPublicKey,
+            orderIsAGift = orderIsAGift,
+            homeDeliveryPostcodes = None,
+            productCatalog = productCatalog,
+            noIndex = stage != PROD,
           ),
         )
       }

diff --git a/support-frontend/app/controllers/DigitalSubscriptionFormController.scala b/support-frontend/app/controllers/DigitalSubscriptionFormController.scala
@@ -5,6 +5,7 @@ import admin.settings.{AllSettings, AllSettingsProvider, SettingsSurrogateKeySyn
 import assets.{AssetsResolver, RefPath}
 import com.gu.identity.model.{User => IdUser}
 import com.gu.support.catalog.DigitalPack
+import com.gu.support.config.Stages.PROD
 import com.gu.support.config.{PayPalConfigProvider, Stage, StripePublicConfigProvider}
 import services.pricing.PriceSummaryServiceProvider
 import com.gu.support.zuora.api.ReaderType.{Direct, Gift}
@@ -67,23 +68,24 @@ class DigitalSubscriptionFormController(
     val productCatalog = cachedProductCatalogServiceProvider.fromStage(stage, isTestUser).get()
 
     subscriptionCheckout(
-      title,
-      id,
-      js,
-      css,
-      Some(csrf),
-      maybeIdUser,
-      testMode,
-      priceSummaryServiceProvider.forUser(testMode).getPrices(DigitalPack, promoCodes, readerType),
+      title = title,
+      mainElement = id,
+      js = js,
+      css = css,
+      csrf = Some(csrf),
+      idUser = maybeIdUser,
+      testMode = testMode,
+      productPrices = priceSummaryServiceProvider.forUser(testMode).getPrices(DigitalPack, promoCodes, readerType),
       maybePromotionCopy = None,
-      stripeConfigProvider.get(),
-      stripeConfigProvider.get(true),
-      payPalConfigProvider.get(),
-      payPalConfigProvider.get(true),
-      v2recaptchaConfigPublicKey,
-      orderIsAGift,
-      None,
-      productCatalog,
+      defaultStripeConfig = stripeConfigProvider.get(),
+      testStripeConfig = stripeConfigProvider.get(true),
+      defaultPayPalConfig = payPalConfigProvider.get(),
+      testPayPalConfig = payPalConfigProvider.get(true),
+      v2recaptchaConfigPublicKey = v2recaptchaConfigPublicKey,
+      orderIsAGift = orderIsAGift,
+      homeDeliveryPostcodes = None,
+      productCatalog = productCatalog,
+      noIndex = stage != PROD,
     )
   }
 }
diff --git a/support-frontend/app/controllers/PaperSubscriptionController.scala b/support-frontend/app/controllers/PaperSubscriptionController.scala
@@ -5,6 +5,8 @@ import admin.settings.{AllSettings, AllSettingsProvider, SettingsSurrogateKeySyn
 import assets.{AssetsResolver, RefPath, StyleContent}
 import com.gu.i18n.Country.UK
 import com.gu.support.catalog.Paper
+import com.gu.support.config.Stage
+import com.gu.support.config.Stages.PROD
 import com.gu.support.encoding.CustomCodecs._
 import services.pricing.PriceSummaryServiceProvider
 import com.gu.support.promotions.DefaultPromotions
@@ -25,6 +27,7 @@ class PaperSubscriptionController(
     stringsConfig: StringsConfig,
     settingsProvider: AllSettingsProvider,
     val supportUrl: String,
+    stage: Stage,
 )(implicit val ec: ExecutionContext)
     extends AbstractController(components)
     with GeoRedirect
@@ -54,6 +57,7 @@ class PaperSubscriptionController(
             "?width=1200&height=1200&quality=85&auto=format&fit=crop&s=c6c7f5b373a1ae54bc66c876a9a60031",
         ),
         shareUrl = canonicalLink,
+        noindex = stage != PROD,
       ) {
         val maybePromotionCopy =
           landingCopyProvider.promotionCopy(queryPromos ++ defaultPromos, Paper, "uk")

diff --git a/support-frontend/app/controllers/PaperSubscriptionFormController.scala b/support-frontend/app/controllers/PaperSubscriptionFormController.scala
@@ -5,6 +5,7 @@ import admin.settings.{AllSettings, AllSettingsProvider, SettingsSurrogateKeySyn
 import assets.AssetsResolver
 import com.gu.identity.model.{User => IdUser}
 import com.gu.support.catalog.Paper
+import com.gu.support.config.Stages.PROD
 import com.gu.support.config.{PayPalConfigProvider, Stage, StripePublicConfigProvider}
 import services.pricing.PriceSummaryServiceProvider
 import config.RecaptchaConfigProvider
@@ -78,6 +79,7 @@ class PaperSubscriptionFormController(
       orderIsAGift = false,
       Some(PaperValidation.M25_POSTCODE_PREFIXES),
       productCatalog,
+      stage != PROD,
     )
   }
 

diff --git a/support-frontend/app/controllers/SubscriptionsController.scala b/support-frontend/app/controllers/SubscriptionsController.scala
@@ -6,6 +6,8 @@ import assets.{AssetsResolver, RefPath}
 import com.gu.i18n.CountryGroup
 import com.gu.i18n.Currency.GBP
 import com.gu.support.catalog._
+import com.gu.support.config.Stage
+import com.gu.support.config.Stages.PROD
 import com.gu.support.encoding.Codec.deriveCodec
 import com.gu.support.workers.Monthly
 import config.StringsConfig
@@ -26,6 +28,7 @@ class SubscriptionsController(
     stringsConfig: StringsConfig,
     settingsProvider: AllSettingsProvider,
     val supportUrl: String,
+    stage: Stage,
 )(implicit val ec: ExecutionContext)
     extends AbstractController(components)
     with GeoRedirect
@@ -102,6 +105,7 @@ class SubscriptionsController(
         RefPath(js),
         Some(RefPath("subscriptionsLandingPage.css")),
         description = stringsConfig.subscriptionsLandingDescription,
+        noindex = stage != PROD,
       ) {
         Html(s"""<script type="text/javascript">
               window.guardian.pricingCopy = ${outputJson(pricingCopy)}

diff --git a/support-frontend/app/controllers/WeeklySubscriptionController.scala b/support-frontend/app/controllers/WeeklySubscriptionController.scala
@@ -4,6 +4,8 @@ import actions.CustomActionBuilders
 import admin.settings.{AllSettings, AllSettingsProvider, SettingsSurrogateKeySyntax}
 import assets.{AssetsResolver, RefPath, StyleContent}
 import com.gu.support.catalog.GuardianWeekly
+import com.gu.support.config.Stage
+import com.gu.support.config.Stages.PROD
 import com.gu.support.encoding.CustomCodecs._
 import services.pricing.PriceSummaryServiceProvider
 import com.gu.support.zuora.api.ReaderType.{Direct, Gift}
@@ -24,6 +26,7 @@ class WeeklySubscriptionController(
     stringsConfig: StringsConfig,
     settingsProvider: AllSettingsProvider,
     val supportUrl: String,
+    stage: Stage,
 )(implicit val ec: ExecutionContext)
     extends AbstractController(components)
     with GeoRedirect
@@ -66,6 +69,7 @@ class WeeklySubscriptionController(
             "?width=1200&height=1200&quality=85&auto=format&fit=crop&s=0034a6a7408ca4d162620f2c8b6bf2b9",
         ),
         shareUrl = canonicalLink,
+        noindex = stage != PROD,
       ) {
         Html(s"""<script type="text/javascript">
               window.guardian.productPrices = ${outputJson(productPrices(queryPromos, orderIsAGift))}

diff --git a/support-frontend/app/controllers/WeeklySubscriptionFormController.scala b/support-frontend/app/controllers/WeeklySubscriptionFormController.scala
@@ -5,6 +5,7 @@ import admin.settings.{AllSettings, AllSettingsProvider, SettingsSurrogateKeySyn
 import assets.AssetsResolver
 import com.gu.identity.model.{User => IdUser}
 import com.gu.support.catalog.GuardianWeekly
+import com.gu.support.config.Stages.PROD
 import com.gu.support.config.{PayPalConfigProvider, Stage, StripePublicConfigProvider}
 import services.pricing.PriceSummaryServiceProvider
 import com.gu.support.promotions.DefaultPromotions
@@ -63,23 +64,24 @@ class WeeklySubscriptionFormController(
     val productCatalog = cachedProductCatalogServiceProvider.fromStage(stage, isTestUser).get()
 
     subscriptionCheckout(
-      title,
-      id,
-      js,
-      css,
-      Some(csrf),
-      maybeIdUser,
-      testMode,
-      priceSummaryServiceProvider.forUser(testMode).getPrices(GuardianWeekly, promoCodes, readerType),
+      title = title,
+      mainElement = id,
+      js = js,
+      css = css,
+      csrf = Some(csrf),
+      idUser = maybeIdUser,
+      testMode = testMode,
+      productPrices = priceSummaryServiceProvider.forUser(testMode).getPrices(GuardianWeekly, promoCodes, readerType),
       maybePromotionCopy = None,
-      stripeConfigProvider.get(),
-      stripeConfigProvider.get(true),
-      payPalConfigProvider.get(),
-      payPalConfigProvider.get(true),
-      v2recaptchaConfigPublicKey,
-      orderIsAGift,
-      None,
-      productCatalog,
+      defaultStripeConfig = stripeConfigProvider.get(),
+      testStripeConfig = stripeConfigProvider.get(true),
+      defaultPayPalConfig = payPalConfigProvider.get(),
+      testPayPalConfig = payPalConfigProvider.get(true),
+      v2recaptchaConfigPublicKey = v2recaptchaConfigPublicKey,
+      orderIsAGift = orderIsAGift,
+      homeDeliveryPostcodes = None,
+      productCatalog = productCatalog,
+      noIndex = stage != PROD,
     )
   }
 

diff --git a/support-frontend/app/views/contributions.scala.html b/support-frontend/app/views/contributions.scala.html
@@ -14,7 +14,6 @@
   id: String,
   mainElement: ReactDiv,
   js: RefPath,
-  css: Option[RefPath],
   description: Option[String],
   paymentMethodConfigs: PaymentMethodConfigs,
   paymentApiUrl: String,
@@ -29,9 +28,10 @@
   serversideTests: Map[String, Participation] = Map(),
   allProductPrices: AllProductPrices,
   productCatalog: JsonObject,
+  noIndex: Boolean,
 )(implicit assets: AssetsResolver, request: RequestHeader, settings: AllSettings)
 
-@main(title = title, mainJsBundle = js, description = description, mainElement = mainElement, mainStyleBundle = css, shareImageUrl = Some(shareImageUrl), shareUrl = Some(shareUrl), serversideTests = serversideTests) {
+@main(title = title, mainJsBundle = js, description = description, mainElement = mainElement, mainStyleBundle = None, shareImageUrl = Some(shareImageUrl), shareUrl = Some(shareUrl), serversideTests = serversideTests, noindex = noIndex) {
   <script type="text/javascript">
     window.guardian = window.guardian || {};
     @idUser.map { user =>

diff --git a/support-frontend/app/views/subscriptionCheckout.scala.html b/support-frontend/app/views/subscriptionCheckout.scala.html
@@ -29,9 +29,10 @@
   orderIsAGift: Boolean = false,
   homeDeliveryPostcodes: Option[List[String]] = None,
   productCatalog: JsonObject,
+  noIndex: Boolean,
 )(implicit assets: AssetsResolver, requestHeader: RequestHeader, settings: AllSettings)
 
-  @main(title = title, mainJsBundle = RefPath(js), mainElement = mainElement, mainStyleBundle = Some(RefPath(css)), csrf = csrf) {
+  @main(title = title, mainJsBundle = RefPath(js), mainElement = mainElement, mainStyleBundle = Some(RefPath(css)), csrf = csrf, noindex = noIndex) {
     <script type="text/javascript">
       window.guardian = window.guardian || {};
 

diff --git a/support-frontend/app/wiring/Controllers.scala b/support-frontend/app/wiring/Controllers.scala
@@ -61,6 +61,7 @@ trait Controllers {
     stringsConfig,
     allSettingsProvider,
     appConfig.supportUrl,
+    appConfig.stage,
   )
 
   lazy val redemptionController = new RedemptionController(
@@ -103,6 +104,7 @@ trait Controllers {
     stringsConfig,
     allSettingsProvider,
     appConfig.supportUrl,
+    appConfig.stage,
   )
 
   lazy val weeklyController = new WeeklySubscriptionController(
@@ -114,6 +116,7 @@ trait Controllers {
     stringsConfig,
     allSettingsProvider,
     appConfig.supportUrl,
+    appConfig.stage,
   )
 
   lazy val digitalPackFormController = new DigitalSubscriptionFormController(