Merged PR 922: update copy on notice banner and blob debug info

update copy on notice banner and blob debug info

Related work items: #7941

actions/azurestorage.js

@@ -270,7 +270,9 @@ export const downloadAllProgressFiles = async (
     containerName,
     progressBlobObj
 ) => {
-    //console.log(progressBlobObj);
+    console.log(
+        "/////////////////////////\n downloading files: " + progressBlobObj
+    );
     const creds = new DefaultAzureCredential();
 
     const containerClient = new ContainerClient(
@@ -286,7 +288,7 @@ export const downloadAllProgressFiles = async (
     let blobCount = 0;
 
     for (const prop in progressBlobObj) {
-        //console.log(`${prop}: ${progressBlobObj[prop].path}`);
+        console.log(`Progress - ${prop}: ${progressBlobObj[prop].path}`);
         blobClient = containerClient.getBlobClient(progressBlobObj[prop].path);
         downloadedBlob = await blobClient.download(0);
         downloaded =
@@ -299,7 +301,7 @@ export const downloadAllProgressFiles = async (
     downloaded = downloaded.substring(0, downloaded.length - 1);
 
     for (const prop in progressBlobObj) {
-        //console.log(`${prop}: ${progressBlobObj[prop].caseObj}`);
+        console.log(`Cases - ${prop}: ${progressBlobObj[prop].caseObj}`);
         blobClient = containerClient.getBlobClient(
             progressBlobObj[prop].caseObj
         );
@@ -312,14 +314,14 @@ export const downloadAllProgressFiles = async (
 
     caseDownloaded = caseDownloaded.substring(0, caseDownloaded.length - 1);
 
-    return (
+    return JSON.parse(
         '{ "@odata.count": ' +
-        blobCount +
+            blobCount +
-        ',"value": [' +
+            ',"value": [' +
-        downloaded +
+            downloaded +
-        '],"case":[' +
+            '],"case":[' +
-        caseDownloaded +
+            caseDownloaded +
-        "]}"
+            "]}"
     );
 };
 
@@ -457,7 +459,7 @@ export const getAllProgressBlobs = async (containerName) => {
         blobCount++;
     }
 
-    //console.log("this is the caasefolder:", caseReference, blobCount);
+    console.log("this is the caasefolder:", blobCount);
 
     let blobObj = [];
     for await (const blob of containerClient.listBlobsFlat({
@@ -493,7 +495,7 @@ export const getAllProgressBlobs = async (containerName) => {
             });
     }
 
-    //console.log("blobObj:", blobObj);
+    console.log("blobObj:", blobObj);
 
     return blobObj;
 };

actions/index.js

@@ -759,6 +759,10 @@ export const getAwaitingSubmission = (loggedInUserId) => {
 };
 
 export const getAwaitingSubmissionFromBlob = (containerName) => {
+    console.log(
+        "///////////////////////\ngetAwaitingSubmissionFromBlob: " +
+            containerName
+    );
     return axios
         .get(
             BASE_URL +

components/noticebanner.js

@@ -53,7 +53,7 @@ export default function NoticeBanner(props) {
                                 hideNotice();
                             }}
                         >
-                            Hide
+                            {t("common:hide-banner-label")}
                         </span>
                     </div>
                 </div>

locales/cy/common.json

@@ -69,5 +69,6 @@
   "next-link-button": "nesaf ›",
   "pages-label": "Tudalen",
   "of-label": "o",
-  "change-link-label": "Newid"
+  "change-link-label": "Newid",
+  "hide-banner-label": "Cuddio"
 }

locales/en/common.json

@@ -69,5 +69,6 @@
   "next-link-button": "next ›",
   "pages-label": "Page",
   "of-label": "of",
-  "change-link-label": "Change"
+  "change-link-label": "Change",
+  "hide-banner-label": "Hide"
 }

pages/api/auth/[...nextauth].js

@@ -51,7 +51,7 @@ export default NextAuth({
                         reference: reference,
                         // emailReplyToId: emailReplyToId,
                     })
-                    .then((response) => console.log(response))
+                    //.then((response) => console.log(response))
                     .catch((err) => consoleLogger(err));
             },
         }),
@@ -73,7 +73,7 @@ export default NextAuth({
     },
     callbacks: {
         session: async (session, user) => {
-            console.log(user);
+            //console.log(user);
             return Promise.resolve(session);
         },
     },

pages/api/file/getawaitingsubmissionfromblob.js

@@ -17,7 +17,7 @@ ApiProxy.get(async (req, res) => {
     var checkquerypath =
         "/api/file/getawaitingsubmissionfromblob?container=" + containerName;
 
-    // console.log(req.url);
+    console.log("///////////\ngetawaitingsubmissionblob url :", req.url);
     // console.log(hashAPIPath(checkquerypath), checkHash);
     // console.log(hashAPIPath(checkquerypath) == "&hash=" + checkHash);
 

pages/api/notices/index.js

@@ -4,9 +4,9 @@ const ApiResponse = (req, res) => {
         "value": [
             {
                 "notice_en":
-                    "An update has been made, if you experience problems,refresh your cache,lorem ipsum doooo orem ipsum doooo orem ipsum doooo orem ipsum doooo dah",
+                    "An update has been made to the portal. If you experience problems, try pressing CTRL, Shift and R in your browser (or CMD and R on a Mac), this should force a refresh of your cache.",
                 "notice_cy":
-                    "Mae diweddariad wedi'i wneud, os ydych chi'n cael problemau, adnewyddwch eich storfa, lorem ipsum doooo orem ipsum doooo orem ipsum doooo orem ipsum doooo dah",
+                    "Mae diweddariad wedi'i wneud i'r porth. Os ydych chi'n cael problemau, ceisiwch wasgu CTRL, Shift ac R yn eich porwr (neu CMD ac R ar Mac), dylai hyn orfodi adnewyddiad o'ch storfa.",
 
                 "dateFrom": "20/09/2022",
                 "dateTo": "20/09/2023",

styles/sass/welshgov/_application.scss

@@ -2250,7 +2250,7 @@ fade {
 //notice banner
 
 .noticebanner {
-    background: $lightgrey_semi;
+    background: $lightgrey_offwhite;
     border-left: 10px solid $blue;
     color: $black;
     display: flex;