Fixed more sonar issues

Author: rhyscoxnhs

.github/scripts/dispatch_internal_repo_workflow.sh

@@ -34,6 +34,9 @@
 
 set -e
 
+readonly GH_ACCEPT_HEADER="Accept: application/vnd.github+json"
+readonly GH_API_VERSION_HEADER="X-GitHub-Api-Version: 2022-11-28"
+
 usage() {
   cat >&2 <<'EOF'
 Usage:
@@ -171,16 +174,16 @@ signature=$(
 JWT="${header_payload}"."${signature}"
 
 INSTALLATION_ID=$(curl -X GET \
-    -H "Accept: application/vnd.github+json" \
+    -H "${GH_ACCEPT_HEADER}" \
     -H "Authorization: Bearer ${JWT}" \
-    -H "X-GitHub-Api-Version: 2022-11-28" \
+    -H "${GH_API_VERSION_HEADER}" \
     --url "https://api.github.com/app/installations" | jq -r '.[0].id')
 
 PR_TRIGGER_PAT=$(curl --request POST \
   --url "https://api.github.com/app/installations/${INSTALLATION_ID}/access_tokens" \
-  -H "Accept: application/vnd.github+json" \
+  -H "${GH_ACCEPT_HEADER}" \
   -H "Authorization: Bearer ${JWT}" \
-  -H "X-GitHub-Api-Version: 2022-11-28" | jq -r '.token')
+  -H "${GH_API_VERSION_HEADER}" | jq -r '.token')
 
 # Set default values if not provided
 if [[ -z "$PR_TRIGGER_PAT" ]]; then
@@ -243,9 +246,9 @@ echo "[INFO] Triggering workflow '$targetWorkflow' in nhs-notify-internal..."
 trigger_response=$(curl -s -L \
   --fail \
   -X POST \
-  -H "Accept: application/vnd.github+json" \
+  -H "${GH_ACCEPT_HEADER}" \
   -H "Authorization: Bearer ${PR_TRIGGER_PAT}" \
-  -H "X-GitHub-Api-Version: 2022-11-28" \
+  -H "${GH_API_VERSION_HEADER}" \
   "https://api.github.com/repos/NHSDigital/nhs-notify-internal/actions/workflows/$targetWorkflow/dispatches" \
   -d "$DISPATCH_EVENT" 2>&1)
 
@@ -264,9 +267,9 @@ workflow_run_url=""
 for _ in {1..18}; do
 
   response=$(curl -s -L \
-    -H "Accept: application/vnd.github+json" \
+    -H "${GH_ACCEPT_HEADER}" \
     -H "Authorization: Bearer ${PR_TRIGGER_PAT}" \
-    -H "X-GitHub-Api-Version: 2022-11-28" \
+    -H "${GH_API_VERSION_HEADER}" \
     "https://api.github.com/repos/NHSDigital/nhs-notify-internal/actions/runs?event=workflow_dispatch")
 
   if ! echo "$response" | jq empty 2>/dev/null; then
@@ -318,7 +321,7 @@ while true; do
   sleep 10
   response=$(curl -s -L \
     -H "Authorization: Bearer ${PR_TRIGGER_PAT}" \
-    -H "Accept: application/vnd.github+json" \
+    -H "${GH_ACCEPT_HEADER}" \
     "$workflow_run_url")
 
   status=$(echo "$response" | jq -r '.status')

.github/workflows/cicd-3-deploy.yaml

@@ -18,8 +18,6 @@ on:
 run-name: "Include prerelease: ${{ inputs.include_prereleases }} Version: ${{ inputs.version }} by @${{ github.actor }}"
 permissions:
   contents: read
-  pages: write
-  id-token: write
 
 jobs:
   metadata:
@@ -66,6 +64,10 @@ jobs:
           make list-variables
 
   deploy-jekyll:
+    permissions:
+      contents: read
+      pages: write
+      id-token: write
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}

docs/assets/js/nhs-notify.js

@@ -1,20 +1,20 @@
 // Quick poc for view full screen
 
-window.addEventListener("load", (event) => {
-  var fullScreenParamName = "fullscreen";
-  var urlParams = new URLSearchParams(document.location.search);
-  var param = urlParams.get(fullScreenParamName);
+window.addEventListener("load", () => {
+  const fullScreenParamName = "fullscreen";
+  const urlParams = new URLSearchParams(document.location.search);
+  const param = urlParams.get(fullScreenParamName);
   if (param) {
     tempViewFullScreen();
   } else {
     setViewAtStart();
   }
 });
 
-let nhsNotify = nhsNotifyDefaults();
+const nhsNotify = nhsNotifyDefaults();
 
 function nhsNotifyDefaults() {
-  var defaults = {};
+  const defaults = {};
   defaults.storageName = "cb-checked";
   defaults.buttonName = "fullScreenButton";
   defaults.standard = "Standard";
@@ -24,16 +24,16 @@ function nhsNotifyDefaults() {
 
 function tempViewFullScreen() {
   viewFullScreen();
-  var buttons = document.getElementsByName(nhsNotify.buttonName);
+  const buttons = document.getElementsByName(nhsNotify.buttonName);
   buttons.forEach((item) => {
     item.style.display = "none";
   });
 }
 
 function viewFullScreen() {
-  var sideBar = document.getElementsByClassName("side-bar")[0];
-  var main = document.getElementsByClassName("main")[0];
-  var pageInfo = document.getElementsByClassName("page-info")[0];
+  const sideBar = document.getElementsByClassName("side-bar")[0];
+  const main = document.getElementsByClassName("main")[0];
+  const pageInfo = document.getElementsByClassName("page-info")[0];
   sideBar.style.display = "none";
   main.style.maxWidth = "100%";
   main.style.marginLeft = "0px";
@@ -45,9 +45,9 @@ function setFullScreen() {
 }
 
 function setStandard() {
-  var sideBar = document.getElementsByClassName("side-bar")[0];
-  var main = document.getElementsByClassName("main")[0];
-  var pageInfo = document.getElementsByClassName("page-info")[0];
+  const sideBar = document.getElementsByClassName("side-bar")[0];
+  const main = document.getElementsByClassName("main")[0];
+  const pageInfo = document.getElementsByClassName("page-info")[0];
   sideBar.style.display = "";
   main.style.maxWidth = "";
   main.style.marginLeft = "";
@@ -56,7 +56,7 @@ function setStandard() {
 }
 
 function setViewAtStart() {
-  var currentStatus = localStorage.getItem(nhsNotify.storageName);
+  const currentStatus = localStorage.getItem(nhsNotify.storageName);
   if (currentStatus == nhsNotify.fullScreen) makeChange(currentStatus);
 }
 
@@ -69,41 +69,27 @@ function makeChange(newStatus) {
 }
 
 function afterChange(currentStatus, newStatus) {
-  var storageName = nhsNotify.storageName;
-  var buttonName = nhsNotify.buttonName;
-  var buttons = document.getElementsByName(buttonName);
-  localStorage.setItem(storageName, newStatus);
+  const buttons = document.getElementsByName(nhsNotify.buttonName);
+  localStorage.setItem(nhsNotify.storageName, newStatus);
 
   buttons.forEach((item) => {
     item.textContent = currentStatus + " View";
   });
 }
 
 function fullScreenToggle() {
-  var standard = nhsNotify.standard;
-  var fullScreen = nhsNotify.fullScreen;
-  var storageName = nhsNotify.storageName;
-  var currentStatus = "";
-  var newStatus = "";
-
-  currentStatus = localStorage.getItem(storageName);
+  const { standard, fullScreen, storageName } = nhsNotify;
+  let currentStatus = localStorage.getItem(storageName);
 
   if (
     currentStatus == "false" ||
     currentStatus == "undefined" ||
     currentStatus == null
   ) {
     currentStatus = standard;
-    newStatus = fullScreen;
   }
 
-  if (currentStatus == standard) {
-    newStatus = fullScreen;
-    currentStatus = standard;
-  } else {
-    newStatus = standard;
-    currentStatus = fullScreen;
-  }
+  const newStatus = currentStatus == standard ? fullScreen : standard;
 
   makeChange(newStatus);
 }