Development

src/Dfe.ContentSupport.Web/Views/Shared/_CookieConsent.cshtml

@@ -1,9 +1,13 @@
 @using Microsoft.AspNetCore.Http.Features
 
 @{
-    var consentFeature = Context.Features.Get<ITrackingConsentFeature>();
-    var cookieString = consentFeature?.CreateConsentCookie();
-    var showBanner = Context.Request.Cookies[".AspNet.Consent"] is null;
+var consentFeature = Context.Features.Get<ITrackingConsentFeature>();
+var cookieString = consentFeature?.CreateConsentCookie();
+
+var csCookieNotSet = Context.Request.Cookies[".AspNet.Consent"] is null;
+var ptCookieNotSet = Context.Request.Cookies["user_cookies_preferences"] is null;
+
+var showBanner = csCookieNotSet && ptCookieNotSet;
 }
 
 @if (showBanner)
@@ -37,7 +41,7 @@
             </div>
         </div>
     </region>
-    <script>
+    <script nonce="@Context.Items["nonce"]">
     (function () {
         const buttons = document.querySelectorAll("#cookieConsent button[data-cookie-string]");
         buttons.forEach(function (button) {
@@ -50,4 +54,4 @@
         });
     })();
 </script>
-}
+}

src/Dfe.ContentSupport.Web/Views/Shared/_Feedback.cshtml

@@ -1,36 +1,59 @@
+@using Newtonsoft.Json.Linq
 @{
-    var consentCookie = Context.Request.Cookies[".AspNet.Consent"];
-    var track = consentCookie == "true";
+    var csTrack = Context.Request.Cookies[".AspNet.Consent"] is "yes" or "true";
+    bool ptTrack = false;
+    var ptCookiePreferences = Context.Request.Cookies["user_cookies_preferences"];
+    if (ptCookiePreferences is not null)
+    {
+        var ptTracking = JObject.Parse(ptCookiePreferences)["UserAcceptsCookies"];
+        if (ptTracking != null)
+        {
+            bool.TryParse(ptTracking.ToString(), out ptTrack);
+        }
+    }
+
+    var track = csTrack || ptTrack;
 }
 
 @if (track)
 {
-<div class="dfe-feedback-banner govuk-!-margin-top-9">
-    <div class="dfe-feedback-banner--content">
-        <form id="feedbackForm">
-            <div class="dfe-feedback-banner--content-questions">
-                <div class="dfe-feedback-banner--content-question" id="questionForm">
-                    <h2 class="govuk-heading-s dfe-feedback-banner--content-question-text">Is this page
-                        useful?</h2>
-                    <div class="govuk-button-group">
-                        <button type="button" class="govuk-button govuk-button--secondary" value="Yes"
-                            data-module="govuk-button" onclick="handleFeedback('Yes')">Yes</button>
-                        <button type="button" class="govuk-button govuk-button--secondary" value="No"
-                            data-module="govuk-button" onclick="handleFeedback('No')">No</button>
+    <div class="dfe-feedback-banner govuk-!-margin-top-9">
+        <div class="dfe-feedback-banner--content">
+            <form id="feedbackForm">
+                <div class="dfe-feedback-banner--content-questions">
+                    <div class="dfe-feedback-banner--content-question" id="questionForm">
+                        <h2 class="govuk-heading-s dfe-feedback-banner--content-question-text">
+                            Is this page
+                            useful?
+                        </h2>
+                        <div class="govuk-button-group">
+                            <button id="feedbackYes" type="button" class="govuk-button govuk-button--secondary" value="Yes"
+                                    data-module="govuk-button">
+                                Yes
+                            </button>
+                            <button id="feedbackNo" type="button" class="govuk-button govuk-button--secondary" value="No"
+                                    data-module="govuk-button">
+                                No
+                            </button>
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div id="feedbackMessage" class="govuk-body govuk-!-margin-bottom-0" style="display: none;">
-                Thank you for your feedback.
-            </div>
-        </form>
+                <div id="feedbackMessage" class="govuk-body govuk-!-margin-bottom-0">
+                    Thank you for your feedback.
+                </div>
+            </form>
+        </div>
     </div>
-</div>
 
-<script>
-    function handleFeedback(value) {
+    <script nonce="@Context.Items["nonce"]">
+    function onAction (){
         document.getElementById('questionForm').style.display = 'none';
         document.getElementById('feedbackMessage').style.display = 'block';
     }
+
+    const YesBtn = document.getElementById('feedbackYes')
+    const NoBtn = document.getElementById('feedbackNo')
+    YesBtn.addEventListener('click', ()=>onAction());
+    NoBtn.addEventListener('click', ()=>onAction());
 </script>
-}
+}