Merged PR 1713: updated welsh path to cas summary include case ref

updated welsh path to cas summary include case ref

Related work items: #17392

components/myportal/viewall.js

@@ -192,8 +192,12 @@ const ViewAllResults = (props) => {
                                                   currentView.viewKey
                                             : router.locale == "cy"
                                             ? myportal == true
-                                                ? "/fymhorth/achos"
+                                                ? "/fymhorth/achos" +
-                                                : "/achos"
+                                                  resultsArr[key].ticketnumber +
+                                                  "?key=" +
+                                                  currentView.viewKey
+                                                : "/achos" +
+                                                  resultsArr[key].ticketnumber
                                             : myportal == true
                                             ? "/myportal/case/" +
                                               resultsArr[key].ticketnumber +

components/search/searchresults.js

@@ -261,15 +261,15 @@ const SearchResults = (props) => {
                                         <div></div>
                                         <Link
                                             href={
-                                                router.locale == "cy"
+                                                (router.locale == "cy"
                                                     ? myportal == true
                                                         ? "/fymhorth/achos"
                                                         : "/achos"
                                                     : myportal == true
-                                                    ? "/myportal/case/" +
+                                                    ? "/myportal/case"
-                                                      item.ticketnumber
+                                                    : "/case") +
-                                                    : "/case/" +
+                                                "/" +
-                                                      item.ticketnumber
+                                                item.ticketnumber
                                             }
                                             className="govuk-link--no-underline"
                                             onClick={() => {

next.config.js

@@ -146,17 +146,21 @@ module.exports = {
                 destination: "/case",
             },
             {
-                source: "/achos/id/:slug",
+                source: "/achos/:slug",
-                destination: "/case/id/:slug",
+                destination: "/case/:slug",
             },
+            // {
+            //     source: "/achos/id/:slug",
+            //     destination: "/case/id/:slug",
+            // },
             {
                 source: "/fymhorth/achos",
                 destination: "/myportal/case",
             },
-            {
+            // {
-                source: "/fymhorth/achos/id/:slug",
+            //     source: "/fymhorth/achos/id/:slug",
-                destination: "/myportal/case/id/:slug",
+            //     destination: "/myportal/case/id/:slug",
-            },
+            // },
             {
                 source: "/fymhorth/achos/:slug",
                 destination: "/myportal/case/:slug",

pages/_document.js

@@ -23,7 +23,7 @@ class MyDocument extends Document {
 
         const cookieObj = ctx.req.cookies.CookiePolicy || {};
 
-        console.log("useGATracking: ", useGATracking);
+        //console.log("useGATracking: ", useGATracking);
         setCookie(ctx, "pedw_locale", ctx.locale, {
             path: "/",
         });
@@ -41,7 +41,7 @@ class MyDocument extends Document {
         //const generatedNonce = nanoid();
         const generatedNonce = this.props.generatedNonce;
 
-        console.log("this is the nonce:", generatedNonce);
+        //console.log("this is the nonce:", generatedNonce);
 
         let csp = ``;
         csp += `base-uri 'self';`;