CCM-12397: resolve sonar maintainability issues (#56)

Author: lapenna-bjss

docs/_includes/head_custom.html

@@ -4,9 +4,9 @@
 
 
 <script type="module">
-    await window.nhsce.UseMermaid(document);
+    await globalThis.nhsce.UseMermaid(document);
     $(document).ready(function() {
-        window.nhsce.hookFullScreen();
+        globalThis.nhsce.hookFullScreen();
     });
 </script>
 <link rel="stylesheet" href="{{ '/assets-webpack/css/main.css' | relative_url }}">

docs/_sass/swagger-ui.scss

@@ -104,8 +104,6 @@
 .swagger-ui svg:not(:root) {
   overflow: hidden;
 }
-.swagger-ui button,
-.swagger-ui input,
 .swagger-ui optgroup,
 .swagger-ui select,
 .swagger-ui button,

docs/assets/js/imageopen.js

@@ -1,17 +1,12 @@
-window.onload = function() {
+window.onload = function () {
     const gallery = document.querySelectorAll("img")
-    gallery.forEach(image =>
-        {
-            let src = image.getAttribute('src')
-
-            image.addEventListener('click', function ()
-            {
-                window.open(src)
-            } )
-
-            image.addEventListener('mouseover', (event) =>
-            {
-                event.target.style.cursor = "pointer";
-            });
-        })
+    for (const image of gallery) {
+        const src = image.getAttribute('src');
+        image.addEventListener('click', function () {
+            window.open(src);
+        });
+        image.addEventListener('mouseover', (event) => {
+            event.target.style.cursor = "pointer";
+        });
+    }
 };

docs/assets/js/nhs-notify.js

@@ -25,9 +25,9 @@ function nhsNotifyDefaults() {
 function tempViewFullScreen() {
   viewFullScreen();
   let buttons = document.getElementsByName(nhsNotify.buttonName);
-  buttons.forEach((item) => {
+  for (const item of buttons) {
     item.style.display = "none";
-  });
+  }
 }
 
 function viewFullScreen() {
@@ -74,9 +74,9 @@ function afterChange(currentStatus, newStatus) {
   let buttons = document.getElementsByName(buttonName);
   localStorage.setItem(storageName, newStatus);
 
-  buttons.forEach((item) => {
+  for ( const item of buttons ) {
     item.textContent = currentStatus + " View";
-  });
+  }
 }
 
 function fullScreenToggle() {

docs/src/index.js

@@ -1,24 +1,21 @@
 import { Canvg, presets } from "canvg";
 import Reveal from "reveal.js";
 import RevealMarkdown from "reveal.js/plugin/markdown/markdown.esm.js";
-import Markdown from "reveal.js/plugin/markdown/markdown.esm.js";
+import RevealMenu from "reveal.js-menu/menu.esm.js";
 import "reveal.js/dist/reveal.css";
 import "reveal.js/dist/theme/black.css";
 import "@fontsource/source-sans-pro";
-import RevealMenu from "reveal.js-menu/menu.esm.js";
 import "reveal.js-menu/menu.css";
 import mermaid from "mermaid";
-import mermaidAPI from "mermaid";
-import RevealNotes from "reveal.js";
+import RevealNotes from "reveal.js/plugin/notes/notes.esm.js";
+
 
 const preset = presets.offscreen();
 
 let x = RevealMarkdown;
 let $ = require("jquery");
-global.jQuery = $;
-global.$ = $;
-window.jQuery = $;
-window.$ = $;
+globalThis.jQuery = $;
+globalThis.$ = $;
 
 mermaid.startOnLoad = false;
 
@@ -51,13 +48,6 @@ function LoadUpReveal(
   pluginsToLoad.push(RevealMarkdown);
   if (showMenu) pluginsToLoad.push(RevealMenu);
   pluginsToLoad.push(RevealNotes);
-  let sleepTime = 100;
-  let selectorToUse =
-    "div." +
-    deckid +
-    " > div.slides > section.present > div.mermaid, div." +
-    deckid +
-    " > div.slides > section.present > pre > code.mermaid";
   let selectorToUseOnSlideChange = "div.mermaid, code.mermaid";
   let deck1 = new Reveal(document.querySelector("div." + deckid), {
     embedded: embed,
@@ -110,13 +100,11 @@ function LoadUpReveal(
       if (useMermaid) {
         currentSlide = deck1.getCurrentSlide();
       }
-      let notes = deck1.getSlideNotes(currentSlide);
       UseMermaidNow(currentSlide, selectorToUseOnSlideChange);
     });
 
   deck1.on("slidechanged", (event) => {
     if (useMermaid) {
-      let notes = deck1.getSlideNotes(event.currentSlide);
       RemoveProcessed(event.previousSlide);
       UseMermaidNow(event.currentSlide, selectorToUseOnSlideChange);
     }
@@ -136,18 +124,17 @@ function RemoveProcessed(slideToRemoveFrom) {
   let selectorToUse =
     "div.mermaid[data-processed], code.mermaid[data-processed]";
   let toRender = slideToRemoveFrom.querySelectorAll(selectorToUse);
-  toRender.forEach((item) => {
+  for ( const item of toRender ) {
     if (item.hasAttribute(processedAttribName)) {
       while (item.firstChild) {
-        item.removeChild(item.firstChild);
+        item.firstChild.remove();
       }
       item.removeAttribute(processedAttribName);
 
       let rawCode = item.rawCode;
       item.innerHTML = rawCode;
     }
-  });
-  let toRenderCheck = slideToRemoveFrom.querySelectorAll(selectorToUse);
+  }
 }
 
 function mermaidCb(id, addlinks) {
@@ -198,31 +185,20 @@ export async function UseMermaidNow(
 ) {
   let toRender = useMermaidOn.querySelectorAll(selector);
   if (toRender.length > 0) {
-    toRender.forEach((item) => {
+    for ( const item of toRender) {
       if (!item.hasOwnProperty("rawCode")) item.rawCode = item.innerHTML;
-    });
-
-    //await mermaid.run();
-
-    //await mermaid.run(undefined, toRender, (id) => {
-    //  mermaidCb(id, addlinks);
-    //});
+    }
 
     mermaid.init(undefined, toRender, (id) => {
       mermaidCb(id, addlinks);
     });
-    let afterRender = useMermaidOn.querySelectorAll(selector);
-    afterRender.forEach((item) => {
-      let x = 1;
-    });
   }
 }
 
 export async function UseMermaid(
   document,
   addlinks = true,
   selector = ".language-mermaid",
-  excludeSelector = "div.slides > section"
 ) {
   $(async function () {
     MermaidInit(addlinks);
@@ -291,7 +267,7 @@ function addLinks(id) {
 function drawCanvas(id, callback) {
   let svg = document.getElementById(id);
   let { width, height } = svg.getBoundingClientRect();
-  let pixelRatio = 2; //window.devicePixelRatio || 1;
+  let pixelRatio = 2;
 
   // lets scale the canvas and change its CSS width/height to make it high res.
   //  canvas.style.width = canvas.width +'px';
@@ -301,9 +277,6 @@ function drawCanvas(id, callback) {
   let canvas = (canvas = new OffscreenCanvas(newWidth, newHeight)); // document.createElement('canvas'); // Create a Canvas element.
   let ctx = canvas.getContext("2d"); // For Canvas returns 2D graphic.
 
-  // ctx.fillStyle = 'white'; // background color for the canvas
-  // ctx.fillRect(0, 0, width, height); // fill the color on the canvas
-
   // Now that its high res we need to compensate so our images can be drawn as
   //normal, by scaling everything up by the pixelRatio.
   //  ctx.setTransform(pixelRatio,0,0,pixelRatio,0,0);
@@ -321,7 +294,6 @@ function drawCanvas(id, callback) {
         callback(img);
       });
 
-      //img.style.width = width +'px';
     });
   });
 }
@@ -331,8 +303,7 @@ export function hookFullScreen() {
   cb.checked = localStorage.getItem("cb-checked") === "true";
 
   fullScreen();
-  cb.onchange = function (evt) {
-    let x = 1;
+  cb.onchange = function () {
     fullScreen();
   };
 }

docs/webpack.config.js

@@ -2,7 +2,7 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const CopyPlugin = require("copy-webpack-plugin");
 const devMode = process.env.NODE_ENV !== "production";
 
-const path = require('path');
+const path = require('node:path');
 
 module.exports = {
   entry: './src/index.js',
@@ -28,22 +28,22 @@ module.exports = {
       },
     ],
   },
-  plugins: [].concat(
+  plugins:
     [
       new MiniCssExtractPlugin(
-      {
-        // Options similar to the same options in webpackOptions.output
-        // all options are optional
-        filename: "css/[name].css",
-        chunkFilename: "[id].css",
-        ignoreOrder: false, // Enable to remove warnings about conflicting order
-      }),
+        {
+          // Options similar to the same options in webpackOptions.output
+          // all options are optional
+          filename: "css/[name].css",
+          chunkFilename: "[id].css",
+          ignoreOrder: false, // Enable to remove warnings about conflicting order
+        }),
       new CopyPlugin({
         patterns: [
           { from: "node_modules/reveal.js-menu/", to: "reveal.js-menu/" },
           //{ from: "node_modules/reveal.js-menu/font-awesome/", to: "reveal.js-menu/font-awesome/" },
           //{ from: "node_modules/reveal.js-menu/menu.css", to: "reveal.js-menu/menu.css" },
         ],
       }),
-    ]),
+    ],
 };