Fix JS assets not loading

ministryofjustice · Feb 13, 2025 · 0b81c03 · 0b81c03
1 parent ae36a54
commit 0b81c03
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 128 deletions.
diff --git a/assets/js/establishment-roll.js b/assets/js/establishment-roll.js
@@ -1,9 +1,9 @@
-const landingRows = document.querySelectorAll('.establishment-roll__table__landing-row')
-const spurRows = document.querySelectorAll('.establishment-roll__table__spur-row')
-const wingRows = document.querySelectorAll('.establishment-roll__table__wing-row')
-const totalsRow = document.querySelector('#roll-table-totals-row')
+module.exports = () => {
+  const landingRows = document.querySelectorAll('.establishment-roll__table__landing-row')
+  const spurRows = document.querySelectorAll('.establishment-roll__table__spur-row')
+  const wingRows = document.querySelectorAll('.establishment-roll__table__wing-row')
+  const totalsRow = document.querySelector('#roll-table-totals-row')
 
-function init() {
   ;[...landingRows, ...spurRows].forEach(row => {
     row.setAttribute('hidden', 'hidden')
   })
@@ -45,5 +45,3 @@ function init() {
     wingNameCell.replaceChildren(wingLink)
   })
 }
-
-init()
diff --git a/assets/js/govukFrontendInit.js b/assets/js/govukFrontendInit.js
diff --git a/assets/js/index.js b/assets/js/index.js
@@ -1,12 +1,10 @@
 import * as govukFrontend from 'govuk-frontend'
 import * as mojFrontend from '@ministryofjustice/frontend'
 import establishmentRoll from './establishment-roll'
-import initMoj from './initMoj'
 import printPage from './printPage'
 
 govukFrontend.initAll()
 mojFrontend.initAll()
 establishmentRoll()
 printPage()
-initMoj()
 
diff --git a/assets/js/initMoj.js b/assets/js/initMoj.js
diff --git a/assets/js/printPage.js b/assets/js/printPage.js
@@ -1,10 +1,12 @@
-const printLinks = document.querySelectorAll('.print-link')
+module.exports = () => {
+  const printLinks = document.querySelectorAll('.print-link')
 
-if (printLinks?.length) {
-  printLinks.forEach(el =>
-    el.addEventListener('click', evt => {
-      evt.preventDefault()
-      window.print()
-    }),
-  )
+  if (printLinks?.length) {
+    printLinks.forEach(el =>
+      el.addEventListener('click', evt => {
+        evt.preventDefault()
+        window.print()
+      }),
+    )
+  }
 }
diff --git a/esbuild/esbuild.config.js b/esbuild/esbuild.config.js
@@ -30,7 +30,10 @@ const buildConfig = {
 
   assets: {
     outDir: path.join(cwd, 'dist/assets'),
-    entryPoints: glob.sync([path.join(cwd, 'assets/js/index.js'), path.join(cwd, 'assets/scss/application.scss')]),
+    entryPoints: glob.sync([
+      path.join(cwd, 'assets/js/index.js'),
+      path.join(cwd, 'assets/scss/application.scss')
+    ]),
     copy: [
       {
         from: path.join(cwd, 'assets/images/**/*'),

diff --git a/server/views/macros/hmppsPagedListFooter.njk b/server/views/macros/hmppsPagedListFooter.njk
diff --git a/server/views/macros/hmppsPagedListHeader.njk b/server/views/macros/hmppsPagedListHeader.njk
diff --git a/server/views/macros/hmppsPagination.njk b/server/views/macros/hmppsPagination.njk
diff --git a/server/views/macros/hmppsSortSelector.njk b/server/views/macros/hmppsSortSelector.njk
diff --git a/server/views/pages/establishmentRoll.njk b/server/views/pages/establishmentRoll.njk
@@ -171,7 +171,3 @@
     </table>
 </div>
 {% endblock %}
-
-{% block pageScripts %}
-    <script src="/assets/establishment-roll.js"></script>
-{% endblock %}
diff --git a/server/views/partials/layout.njk b/server/views/partials/layout.njk
@@ -48,10 +48,7 @@
 {% endblock %}
 
 {% block bodyEnd %}
-   <script type="module" src="/assets/govukFrontendInit.js"></script>
-   <script src="/assets/moj/all.js"></script>
-   <script src="/assets/printPage.js"></script>
-   <script src="/assets/initMoj.js"></script>
+   <script type="module" src="{{ '/assets/js/app.js' | assetMap }}"></script>
 
   {% block pageScripts %}
   {% endblock %}