@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.28.8 → 4.29.0

package/dpr/routes/journeys/view-report/async/report/report-variants.cy.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../dpr/routes/journeys/view-report/async/report/report-variants.cy.ts"],
-  "sourcesContent": ["import { executeReportStubs, requestReportByNameAndDescription, stubBaseTasks } from 'cypress-tests/cypressUtils'\n\ncontext('Viewing a report', () => {\n  const path = '/embedded/platform/'\n\n  describe('report variants', () => {\n    before(() => {\n      stubBaseTasks()\n      executeReportStubs()\n    })\n\n    it('should display a list-section variant', () => {\n      cy.task('stubListSectionDefinitionRequest')\n      cy.task('stubResultSuccessResult')\n\n      cy.visit(path)\n      requestReportByNameAndDescription({ name: 'Successful Report', description: 'this will succeed' })\n      cy.findByRole('heading', { level: 1, name: /Sectioned/ }).should('be.visible')\n\n      cy.findAllByRole('heading', { name: /First.*Second/ }).should('have.length', 4)\n      cy.findByRole('heading', { name: /First: One, Second: A 4 results/ }).should('be.visible')\n      cy.findByRole('heading', { name: /First: One, Second: B 6 results/ }).should('be.visible')\n      cy.findByRole('heading', { name: /First: Two, Second: A 3 results/ }).should('be.visible')\n      cy.findByRole('heading', { name: /First: Two, Second: B 7 results/ }).should('be.visible')\n    })\n\n    it('should display a parent-child variant', () => {\n      cy.task('stubParentChildDefinitionRequest')\n      cy.task('stubResultSuccessResultDifferentValues')\n\n      cy.visit(path)\n      requestReportByNameAndDescription({ name: 'Successful Report', description: 'this will succeed' })\n      cy.findByRole('heading', { level: 1, name: /Parent Child Template/ }).should('be.visible')\n\n      cy.contains('table', 'val40').within(() => {\n        cy.findAllByRole('row').should('have.length', 8)\n        ;[40, 41, 42, 43, 44, 45, 46].forEach((num) => {\n          cy.findByRole('row', { name: new RegExp(`val${num}$`) }).should('be.visible')\n        })\n      })\n\n      cy.contains('table', 'val30').within(() => {\n        cy.findAllByRole('row').should('have.length', 14)\n        ;[...Array(10).keys()]\n          .map((i) => i + 30)\n          .forEach((num) => {\n            cy.findByRole('row', { name: new RegExp(`val${num}$`) }).should('be.visible')\n          })\n        cy.findByRole('row', { name: /val330/ }).should('be.visible')\n        cy.findByRole('row', { name: /val331/ }).should('be.visible')\n        cy.findByRole('row', { name: /val332/ }).should('be.visible')\n      })\n    })\n\n    it('should display a summary section variant', () => {\n      cy.task('stubSummarySectionDefinitionRequest')\n      cy.task('stubAsyncSummaryReport')\n      cy.task('stubResultSuccessResultDifferentValues')\n\n      cy.visit(path)\n      requestReportByNameAndDescription({ name: 'Successful Report', description: 'this will succeed' })\n      cy.findByRole('heading', { level: 1, name: /Sectioned Summaries template/ }).should('be.visible')\n\n      cy.findAllByRole('columnheader').should('have.length', 8 * 4)\n      cy.get('.report-template-container').within(() => {\n        cy.findAllByRole('row').should('have.length', 48)\n      })\n    })\n\n    it('should display a parent child section variant', () => {\n      cy.task('stubParentChildSectionDefinitionRequest')\n      cy.task('stubResultSuccessResultDifferentValues')\n\n      cy.visit(path)\n      requestReportByNameAndDescription({ name: 'Successful Report', description: 'this will succeed' })\n      cy.findByRole('heading', { level: 1, name: /Parent Child Section Template/ }).should('be.visible')\n\n      // First child table\n      cy.contains('table', 'val30').within(() => {\n        cy.findAllByRole('row').should('have.length', 21)\n      })\n      cy.findByRole('heading', { name: /Section 1: One, Section 2: A 5 results/ }).should('be.visible')\n      cy.findByRole('heading', { name: /Section 1: One, Section 2: B 2 results/ }).should('be.visible')\n      cy.findByRole('heading', { name: /Section 1: Two, Section 2: A 8 results/ }).should('be.visible')\n      cy.findByRole('heading', { name: /Section 1: Two, Section 2: B 5 results/ }).should('be.visible')\n      // This is the best we can do for now until this report type gets refactored\n      cy.findAllByRole('row', {\n        name: (textContent) => {\n          return textContent.includes('val')\n        },\n      })\n        .filter((_idx, el) => [...el.querySelectorAll('td')].length === 2)\n        .should('have.length', 100)\n    })\n  })\n})\n"],
-  "mappings": "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",
+  "sourcesContent": ["import {\n  executeReportStubs,\n  requestReportByNameAndDescription,\n  stubBaseTasks,\n  startReportRequest,\n} from 'cypress-tests/cypressUtils'\n\ncontext('Viewing a report', () => {\n  const path = '/embedded/platform/'\n\n  describe('report variants', () => {\n    before(() => {\n      stubBaseTasks()\n      executeReportStubs()\n    })\n\n    describe('list-section', () => {\n      const listSectionReport = {\n        name: 'List-section',\n        description: 'list-section template',\n      }\n\n      beforeEach(() => {\n        cy.task('stubListSectionDefinitionRequest')\n        cy.task('stubResultSuccessResult')\n      })\n\n      it('should display a list-section variant', () => {\n        cy.visit(path)\n        requestReportByNameAndDescription(listSectionReport)\n        cy.findByRole('heading', { level: 1, name: /List-section/ })\n        cy.findAllByRole('heading', { name: /First.*Second/ }).should('have.length', 4)\n\n        // Test headings exist\n        cy.findByRole('heading', { name: /First: One, Second: A 4 results/ })\n          .should('be.visible')\n          .scrollIntoView()\n        cy.findByRole('heading', { name: /First: One, Second: B 6 results/ })\n          .should('be.visible')\n          .scrollIntoView()\n        cy.findByRole('heading', { name: /First: Two, Second: A 3 results/ })\n          .should('be.visible')\n          .scrollIntoView()\n        cy.findByRole('heading', { name: /First: Two, Second: B 7 results/ })\n          .should('be.visible')\n          .scrollIntoView()\n\n        // Test they only include 1 table per section\n        cy.findAllByLabelText(/First: One, Second: A 4 results/)\n          .eq(1)\n          .within(() => {\n            cy.findAllByRole('table').should('have.length', 1)\n          })\n        cy.findAllByLabelText(/First: One, Second: B 6 results/)\n          .eq(1)\n          .within(() => {\n            cy.findAllByRole('table').should('have.length', 1)\n          })\n        cy.findAllByLabelText(/First: Two, Second: A 3 results/)\n          .eq(1)\n          .within(() => {\n            cy.findAllByRole('table').should('have.length', 1)\n          })\n        cy.findAllByLabelText(/First: Two, Second: B 7 results/)\n          .eq(1)\n          .within(() => {\n            cy.findAllByRole('table').should('have.length', 1)\n          })\n      })\n\n      it('should sort the sections correctly', () => {\n        cy.visit(path)\n        startReportRequest(listSectionReport)\n        cy.findByRole('group', { name: /Column/ })\n          .findByRole('radio', { name: 'Second' })\n          .check()\n        cy.findByRole('button', { name: /Request/ }).click()\n\n        cy.findByRole('heading', { level: 1, name: /List-section/ })\n        cy.findAllByRole('heading', { name: /First.*Second/ })\n          .should('have.length', 4)\n          .each((heading, index) => {\n            switch (index) {\n              case 0:\n                cy.wrap(heading).contains('First: One, Second: A 4 results')\n                break\n              case 1:\n                cy.wrap(heading).contains('First: Two, Second: A 3 results')\n                break\n              case 2:\n                cy.wrap(heading).contains('First: One, Second: B 6 results')\n                break\n              case 3:\n                cy.wrap(heading).contains('First: Two, Second: B 7 results')\n                break\n              default:\n                break\n            }\n          })\n      })\n    })\n\n    describe('summary-section', () => {\n      it('should display a summary section variant', () => {\n        cy.task('stubSummarySectionDefinitionRequest')\n        cy.task('stubAsyncSummaryReport')\n        cy.task('stubResultSuccessResultDifferentValues')\n\n        cy.visit(path)\n        requestReportByNameAndDescription({ name: 'Summary-section', description: 'Summary-section template' })\n        cy.findByRole('heading', { level: 1, name: /Summary-section/ }).should('be.visible')\n\n        cy.findAllByLabelText(/First: One, Second: A/)\n          .eq(0)\n          .within(() => {\n            cy.findAllByRole('table')\n              .should('have.length', 2)\n              .each((table) => {\n                cy.wrap(table).within(() => {\n                  cy.findAllByRole('row').should('have.length', 5)\n                })\n              })\n          })\n\n        cy.findAllByLabelText(/First: One, Second: B/)\n          .eq(0)\n          .within(() => {\n            cy.findAllByRole('table')\n              .should('have.length', 2)\n              .each((table) => {\n                cy.wrap(table).within(() => {\n                  cy.findAllByRole('row').should('have.length', 7)\n                })\n              })\n          })\n\n        cy.findAllByLabelText(/First: Two, Second: A/)\n          .eq(0)\n          .within(() => {\n            cy.findAllByRole('table')\n              .should('have.length', 2)\n              .each((table) => {\n                cy.wrap(table).within(() => {\n                  cy.findAllByRole('row').should('have.length', 4)\n                })\n              })\n          })\n\n        cy.findAllByLabelText(/First: Two, Second: B/)\n          .eq(0)\n          .within(() => {\n            cy.findAllByRole('table')\n              .should('have.length', 2)\n              .each((table) => {\n                cy.wrap(table).within(() => {\n                  cy.findAllByRole('row').should('have.length', 8)\n                })\n              })\n          })\n      })\n    })\n\n    describe('parent-child-section', () => {\n      const ParentChildSectionReport = {\n        name: 'Parent-child-section',\n        description: 'Parent-child-section template',\n      }\n\n      beforeEach(() => {\n        cy.task('stubParentChildSectionDefinitionRequest')\n        cy.task('stubResultSuccessResultDifferentValues')\n      })\n\n      it('should display a parent child section variant', () => {\n        cy.visit(path)\n        requestReportByNameAndDescription(ParentChildSectionReport)\n        cy.findByRole('heading', { level: 1, name: /Parent-child-section/ }).should('be.visible')\n\n        cy.findByRole('heading', { name: /Section 1: One, Section 2: A 5 results/ })\n          .scrollIntoView()\n          .should('be.visible')\n        cy.findByRole('heading', { name: /Section 1: One, Section 2: B 2 results/ })\n          .scrollIntoView()\n          .should('be.visible')\n        cy.findByRole('heading', { name: /Section 1: Two, Section 2: A 8 results/ })\n          .scrollIntoView()\n          .should('be.visible')\n        cy.findByRole('heading', { name: /Section 1: Two, Section 2: B 5 results/ })\n          .scrollIntoView()\n          .should('be.visible')\n\n        cy.findAllByLabelText('Section 1: One, Section 2: A 5 results')\n          .eq(1)\n          .within(() => {\n            cy.findAllByRole('table').should('have.length', 10)\n\n            cy.findAllByLabelText('Parent 1')\n              .eq(0)\n              .within(() => {\n                cy.findAllByRole('table').should('have.length', 2)\n\n                // parent\n                cy.findAllByLabelText('Parent 1')\n                  .eq(0)\n                  .within(() => {\n                    cy.findByRole('table').within(() => {\n                      cy.findAllByRole('row').should('have.length', 4)\n                    })\n                  })\n\n                // Child\n                cy.findAllByLabelText('Child Report')\n                  .eq(0)\n                  .within(() => {\n                    cy.findByRole('table').within(() => {\n                      cy.findAllByRole('row').should('have.length', 23)\n                    })\n                  })\n              })\n          })\n\n        cy.findAllByLabelText('Section 1: Two, Section 2: A 8 results')\n          .eq(1)\n          .within(() => {\n            cy.findAllByRole('table').should('have.length', 16)\n\n            cy.findAllByLabelText('Parent 1')\n              .eq(0)\n              .within(() => {\n                cy.findAllByRole('table').should('have.length', 2)\n\n                // parent\n                cy.findAllByLabelText('Parent 1')\n                  .eq(0)\n                  .within(() => {\n                    cy.findByRole('table').within(() => {\n                      cy.findAllByRole('row').should('have.length', 4)\n                    })\n                  })\n\n                // Child\n                cy.findAllByLabelText('Child Report')\n                  .eq(0)\n                  .within(() => {\n                    cy.findByRole('table').within(() => {\n                      cy.findAllByRole('row').should('have.length', 23)\n                    })\n                  })\n              })\n          })\n      })\n\n      it('should sort the sections correctly', () => {\n        cy.visit(path)\n        startReportRequest(ParentChildSectionReport)\n        cy.findByRole('group', { name: /Column/ })\n          .findByRole('radio', { name: 'Section 2' })\n          .check()\n        cy.findByRole('button', { name: /Request/ }).click()\n\n        cy.findByRole('heading', { level: 1, name: /Parent-child-section/ }).should('be.visible')\n\n        cy.findAllByRole('heading', { name: /Section 1.*Section 2/ })\n          .should('have.length', 4)\n          .each((heading, index) => {\n            switch (index) {\n              case 0:\n                cy.wrap(heading).contains('Section 1: One, Section 2: A 5 results')\n                break\n              case 1:\n                cy.wrap(heading).contains('Section 1: Two, Section 2: A 8 results')\n                break\n              case 2:\n                cy.wrap(heading).contains('Section 1: One, Section 2: B 2 results')\n                break\n              case 3:\n                cy.wrap(heading).contains('Section 1: Two, Section 2: B 5 results')\n                break\n              default:\n                break\n            }\n          })\n      })\n    })\n\n    describe('parent-child', () => {\n      it('should display a parent-child variant', () => {\n        cy.task('stubParentChildDefinitionRequest')\n        cy.task('stubResultSuccessResultDifferentValues')\n\n        cy.visit(path)\n        requestReportByNameAndDescription({ name: 'Parent-child', description: 'Parent-child template' })\n        cy.findByRole('heading', { level: 1, name: /Parent-child/ }).should('be.visible')\n\n        // Parent child group\n        cy.findAllByLabelText('Parent 1')\n          .eq(0)\n          .within(() => {\n            cy.findAllByRole('table').should('have.length', 3)\n\n            // parent\n            cy.findAllByLabelText('Parent 1')\n              .eq(0)\n              .within(() => {\n                cy.findByRole('table').within(() => {\n                  cy.findAllByRole('row').should('have.length', 4)\n                })\n              })\n\n            // child\n            cy.findAllByLabelText('Child Report')\n              .eq(0)\n              .within(() => {\n                cy.findByRole('table').within(() => {\n                  cy.findAllByRole('row').should('have.length', 10)\n                })\n              })\n\n            // child 2\n            cy.findAllByLabelText('Child Report 2')\n              .eq(0)\n              .within(() => {\n                cy.findByRole('table').within(() => {\n                  cy.findAllByRole('row').should('have.length', 10)\n                })\n              })\n          })\n\n        // Parent child group\n        cy.findAllByLabelText('Parent 8')\n          .eq(0)\n          .within(() => {\n            cy.findAllByRole('table').should('have.length', 3)\n\n            // parent\n            cy.findAllByLabelText('Parent 8')\n              .eq(0)\n              .within(() => {\n                cy.findByRole('table').within(() => {\n                  cy.findAllByRole('row').should('have.length', 4)\n                })\n              })\n\n            // child\n            cy.findAllByLabelText('Child Report')\n              .eq(0)\n              .within(() => {\n                cy.findByRole('table').within(() => {\n                  cy.findAllByRole('row').should('have.length', 16)\n                })\n              })\n\n            // child 2\n            cy.findAllByLabelText('Child Report 2')\n              .eq(0)\n              .within(() => {\n                cy.findByRole('table').within(() => {\n                  cy.findAllByRole('row').should('have.length', 16)\n                })\n              })\n          })\n      })\n    })\n  })\n})\n"],
+  "mappings": "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",
   "names": []
 }

package/dpr/routes/journeys/view-report/async/report/report-variants.cy.ts

@@ -1,4 +1,9 @@
-import { executeReportStubs, requestReportByNameAndDescription, stubBaseTasks } from 'cypress-tests/cypressUtils'
+import {
+  executeReportStubs,
+  requestReportByNameAndDescription,
+  stubBaseTasks,
+  startReportRequest,
+} from 'cypress-tests/cypressUtils'
 
 context('Viewing a report', () => {
   const path = '/embedded/platform/'
@@ -9,88 +14,352 @@ context('Viewing a report', () => {
       executeReportStubs()
     })
 
-    it('should display a list-section variant', () => {
-      cy.task('stubListSectionDefinitionRequest')
-      cy.task('stubResultSuccessResult')
+    describe('list-section', () => {
+      const listSectionReport = {
+        name: 'List-section',
+        description: 'list-section template',
+      }
 
-      cy.visit(path)
-      requestReportByNameAndDescription({ name: 'Successful Report', description: 'this will succeed' })
-      cy.findByRole('heading', { level: 1, name: /Sectioned/ }).should('be.visible')
-
-      cy.findAllByRole('heading', { name: /First.*Second/ }).should('have.length', 4)
-      cy.findByRole('heading', { name: /First: One, Second: A 4 results/ }).should('be.visible')
-      cy.findByRole('heading', { name: /First: One, Second: B 6 results/ }).should('be.visible')
-      cy.findByRole('heading', { name: /First: Two, Second: A 3 results/ }).should('be.visible')
-      cy.findByRole('heading', { name: /First: Two, Second: B 7 results/ }).should('be.visible')
-    })
+      beforeEach(() => {
+        cy.task('stubListSectionDefinitionRequest')
+        cy.task('stubResultSuccessResult')
+      })
 
-    it('should display a parent-child variant', () => {
-      cy.task('stubParentChildDefinitionRequest')
-      cy.task('stubResultSuccessResultDifferentValues')
+      it('should display a list-section variant', () => {
+        cy.visit(path)
+        requestReportByNameAndDescription(listSectionReport)
+        cy.findByRole('heading', { level: 1, name: /List-section/ })
+        cy.findAllByRole('heading', { name: /First.*Second/ }).should('have.length', 4)
 
-      cy.visit(path)
-      requestReportByNameAndDescription({ name: 'Successful Report', description: 'this will succeed' })
-      cy.findByRole('heading', { level: 1, name: /Parent Child Template/ }).should('be.visible')
+        // Test headings exist
+        cy.findByRole('heading', { name: /First: One, Second: A 4 results/ })
+          .should('be.visible')
+          .scrollIntoView()
+        cy.findByRole('heading', { name: /First: One, Second: B 6 results/ })
+          .should('be.visible')
+          .scrollIntoView()
+        cy.findByRole('heading', { name: /First: Two, Second: A 3 results/ })
+          .should('be.visible')
+          .scrollIntoView()
+        cy.findByRole('heading', { name: /First: Two, Second: B 7 results/ })
+          .should('be.visible')
+          .scrollIntoView()
 
-      cy.contains('table', 'val40').within(() => {
-        cy.findAllByRole('row').should('have.length', 8)
-        ;[40, 41, 42, 43, 44, 45, 46].forEach((num) => {
-          cy.findByRole('row', { name: new RegExp(`val${num}$`) }).should('be.visible')
-        })
+        // Test they only include 1 table per section
+        cy.findAllByLabelText(/First: One, Second: A 4 results/)
+          .eq(1)
+          .within(() => {
+            cy.findAllByRole('table').should('have.length', 1)
+          })
+        cy.findAllByLabelText(/First: One, Second: B 6 results/)
+          .eq(1)
+          .within(() => {
+            cy.findAllByRole('table').should('have.length', 1)
+          })
+        cy.findAllByLabelText(/First: Two, Second: A 3 results/)
+          .eq(1)
+          .within(() => {
+            cy.findAllByRole('table').should('have.length', 1)
+          })
+        cy.findAllByLabelText(/First: Two, Second: B 7 results/)
+          .eq(1)
+          .within(() => {
+            cy.findAllByRole('table').should('have.length', 1)
+          })
       })
 
-      cy.contains('table', 'val30').within(() => {
-        cy.findAllByRole('row').should('have.length', 14)
-        ;[...Array(10).keys()]
-          .map((i) => i + 30)
-          .forEach((num) => {
-            cy.findByRole('row', { name: new RegExp(`val${num}$`) }).should('be.visible')
+      it('should sort the sections correctly', () => {
+        cy.visit(path)
+        startReportRequest(listSectionReport)
+        cy.findByRole('group', { name: /Column/ })
+          .findByRole('radio', { name: 'Second' })
+          .check()
+        cy.findByRole('button', { name: /Request/ }).click()
+
+        cy.findByRole('heading', { level: 1, name: /List-section/ })
+        cy.findAllByRole('heading', { name: /First.*Second/ })
+          .should('have.length', 4)
+          .each((heading, index) => {
+            switch (index) {
+              case 0:
+                cy.wrap(heading).contains('First: One, Second: A 4 results')
+                break
+              case 1:
+                cy.wrap(heading).contains('First: Two, Second: A 3 results')
+                break
+              case 2:
+                cy.wrap(heading).contains('First: One, Second: B 6 results')
+                break
+              case 3:
+                cy.wrap(heading).contains('First: Two, Second: B 7 results')
+                break
+              default:
+                break
+            }
           })
-        cy.findByRole('row', { name: /val330/ }).should('be.visible')
-        cy.findByRole('row', { name: /val331/ }).should('be.visible')
-        cy.findByRole('row', { name: /val332/ }).should('be.visible')
       })
     })
 
-    it('should display a summary section variant', () => {
-      cy.task('stubSummarySectionDefinitionRequest')
-      cy.task('stubAsyncSummaryReport')
-      cy.task('stubResultSuccessResultDifferentValues')
+    describe('summary-section', () => {
+      it('should display a summary section variant', () => {
+        cy.task('stubSummarySectionDefinitionRequest')
+        cy.task('stubAsyncSummaryReport')
+        cy.task('stubResultSuccessResultDifferentValues')
+
+        cy.visit(path)
+        requestReportByNameAndDescription({ name: 'Summary-section', description: 'Summary-section template' })
+        cy.findByRole('heading', { level: 1, name: /Summary-section/ }).should('be.visible')
 
-      cy.visit(path)
-      requestReportByNameAndDescription({ name: 'Successful Report', description: 'this will succeed' })
-      cy.findByRole('heading', { level: 1, name: /Sectioned Summaries template/ }).should('be.visible')
+        cy.findAllByLabelText(/First: One, Second: A/)
+          .eq(0)
+          .within(() => {
+            cy.findAllByRole('table')
+              .should('have.length', 2)
+              .each((table) => {
+                cy.wrap(table).within(() => {
+                  cy.findAllByRole('row').should('have.length', 5)
+                })
+              })
+          })
+
+        cy.findAllByLabelText(/First: One, Second: B/)
+          .eq(0)
+          .within(() => {
+            cy.findAllByRole('table')
+              .should('have.length', 2)
+              .each((table) => {
+                cy.wrap(table).within(() => {
+                  cy.findAllByRole('row').should('have.length', 7)
+                })
+              })
+          })
 
-      cy.findAllByRole('columnheader').should('have.length', 8 * 4)
-      cy.get('.report-template-container').within(() => {
-        cy.findAllByRole('row').should('have.length', 48)
+        cy.findAllByLabelText(/First: Two, Second: A/)
+          .eq(0)
+          .within(() => {
+            cy.findAllByRole('table')
+              .should('have.length', 2)
+              .each((table) => {
+                cy.wrap(table).within(() => {
+                  cy.findAllByRole('row').should('have.length', 4)
+                })
+              })
+          })
+
+        cy.findAllByLabelText(/First: Two, Second: B/)
+          .eq(0)
+          .within(() => {
+            cy.findAllByRole('table')
+              .should('have.length', 2)
+              .each((table) => {
+                cy.wrap(table).within(() => {
+                  cy.findAllByRole('row').should('have.length', 8)
+                })
+              })
+          })
       })
     })
 
-    it('should display a parent child section variant', () => {
-      cy.task('stubParentChildSectionDefinitionRequest')
-      cy.task('stubResultSuccessResultDifferentValues')
+    describe('parent-child-section', () => {
+      const ParentChildSectionReport = {
+        name: 'Parent-child-section',
+        description: 'Parent-child-section template',
+      }
+
+      beforeEach(() => {
+        cy.task('stubParentChildSectionDefinitionRequest')
+        cy.task('stubResultSuccessResultDifferentValues')
+      })
+
+      it('should display a parent child section variant', () => {
+        cy.visit(path)
+        requestReportByNameAndDescription(ParentChildSectionReport)
+        cy.findByRole('heading', { level: 1, name: /Parent-child-section/ }).should('be.visible')
 
-      cy.visit(path)
-      requestReportByNameAndDescription({ name: 'Successful Report', description: 'this will succeed' })
-      cy.findByRole('heading', { level: 1, name: /Parent Child Section Template/ }).should('be.visible')
+        cy.findByRole('heading', { name: /Section 1: One, Section 2: A 5 results/ })
+          .scrollIntoView()
+          .should('be.visible')
+        cy.findByRole('heading', { name: /Section 1: One, Section 2: B 2 results/ })
+          .scrollIntoView()
+          .should('be.visible')
+        cy.findByRole('heading', { name: /Section 1: Two, Section 2: A 8 results/ })
+          .scrollIntoView()
+          .should('be.visible')
+        cy.findByRole('heading', { name: /Section 1: Two, Section 2: B 5 results/ })
+          .scrollIntoView()
+          .should('be.visible')
+
+        cy.findAllByLabelText('Section 1: One, Section 2: A 5 results')
+          .eq(1)
+          .within(() => {
+            cy.findAllByRole('table').should('have.length', 10)
+
+            cy.findAllByLabelText('Parent 1')
+              .eq(0)
+              .within(() => {
+                cy.findAllByRole('table').should('have.length', 2)
+
+                // parent
+                cy.findAllByLabelText('Parent 1')
+                  .eq(0)
+                  .within(() => {
+                    cy.findByRole('table').within(() => {
+                      cy.findAllByRole('row').should('have.length', 4)
+                    })
+                  })
+
+                // Child
+                cy.findAllByLabelText('Child Report')
+                  .eq(0)
+                  .within(() => {
+                    cy.findByRole('table').within(() => {
+                      cy.findAllByRole('row').should('have.length', 23)
+                    })
+                  })
+              })
+          })
 
-      // First child table
-      cy.contains('table', 'val30').within(() => {
-        cy.findAllByRole('row').should('have.length', 21)
+        cy.findAllByLabelText('Section 1: Two, Section 2: A 8 results')
+          .eq(1)
+          .within(() => {
+            cy.findAllByRole('table').should('have.length', 16)
+
+            cy.findAllByLabelText('Parent 1')
+              .eq(0)
+              .within(() => {
+                cy.findAllByRole('table').should('have.length', 2)
+
+                // parent
+                cy.findAllByLabelText('Parent 1')
+                  .eq(0)
+                  .within(() => {
+                    cy.findByRole('table').within(() => {
+                      cy.findAllByRole('row').should('have.length', 4)
+                    })
+                  })
+
+                // Child
+                cy.findAllByLabelText('Child Report')
+                  .eq(0)
+                  .within(() => {
+                    cy.findByRole('table').within(() => {
+                      cy.findAllByRole('row').should('have.length', 23)
+                    })
+                  })
+              })
+          })
       })
-      cy.findByRole('heading', { name: /Section 1: One, Section 2: A 5 results/ }).should('be.visible')
-      cy.findByRole('heading', { name: /Section 1: One, Section 2: B 2 results/ }).should('be.visible')
-      cy.findByRole('heading', { name: /Section 1: Two, Section 2: A 8 results/ }).should('be.visible')
-      cy.findByRole('heading', { name: /Section 1: Two, Section 2: B 5 results/ }).should('be.visible')
-      // This is the best we can do for now until this report type gets refactored
-      cy.findAllByRole('row', {
-        name: (textContent) => {
-          return textContent.includes('val')
-        },
+
+      it('should sort the sections correctly', () => {
+        cy.visit(path)
+        startReportRequest(ParentChildSectionReport)
+        cy.findByRole('group', { name: /Column/ })
+          .findByRole('radio', { name: 'Section 2' })
+          .check()
+        cy.findByRole('button', { name: /Request/ }).click()
+
+        cy.findByRole('heading', { level: 1, name: /Parent-child-section/ }).should('be.visible')
+
+        cy.findAllByRole('heading', { name: /Section 1.*Section 2/ })
+          .should('have.length', 4)
+          .each((heading, index) => {
+            switch (index) {
+              case 0:
+                cy.wrap(heading).contains('Section 1: One, Section 2: A 5 results')
+                break
+              case 1:
+                cy.wrap(heading).contains('Section 1: Two, Section 2: A 8 results')
+                break
+              case 2:
+                cy.wrap(heading).contains('Section 1: One, Section 2: B 2 results')
+                break
+              case 3:
+                cy.wrap(heading).contains('Section 1: Two, Section 2: B 5 results')
+                break
+              default:
+                break
+            }
+          })
+      })
+    })
+
+    describe('parent-child', () => {
+      it('should display a parent-child variant', () => {
+        cy.task('stubParentChildDefinitionRequest')
+        cy.task('stubResultSuccessResultDifferentValues')
+
+        cy.visit(path)
+        requestReportByNameAndDescription({ name: 'Parent-child', description: 'Parent-child template' })
+        cy.findByRole('heading', { level: 1, name: /Parent-child/ }).should('be.visible')
+
+        // Parent child group
+        cy.findAllByLabelText('Parent 1')
+          .eq(0)
+          .within(() => {
+            cy.findAllByRole('table').should('have.length', 3)
+
+            // parent
+            cy.findAllByLabelText('Parent 1')
+              .eq(0)
+              .within(() => {
+                cy.findByRole('table').within(() => {
+                  cy.findAllByRole('row').should('have.length', 4)
+                })
+              })
+
+            // child
+            cy.findAllByLabelText('Child Report')
+              .eq(0)
+              .within(() => {
+                cy.findByRole('table').within(() => {
+                  cy.findAllByRole('row').should('have.length', 10)
+                })
+              })
+
+            // child 2
+            cy.findAllByLabelText('Child Report 2')
+              .eq(0)
+              .within(() => {
+                cy.findByRole('table').within(() => {
+                  cy.findAllByRole('row').should('have.length', 10)
+                })
+              })
+          })
+
+        // Parent child group
+        cy.findAllByLabelText('Parent 8')
+          .eq(0)
+          .within(() => {
+            cy.findAllByRole('table').should('have.length', 3)
+
+            // parent
+            cy.findAllByLabelText('Parent 8')
+              .eq(0)
+              .within(() => {
+                cy.findByRole('table').within(() => {
+                  cy.findAllByRole('row').should('have.length', 4)
+                })
+              })
+
+            // child
+            cy.findAllByLabelText('Child Report')
+              .eq(0)
+              .within(() => {
+                cy.findByRole('table').within(() => {
+                  cy.findAllByRole('row').should('have.length', 16)
+                })
+              })
+
+            // child 2
+            cy.findAllByLabelText('Child Report 2')
+              .eq(0)
+              .within(() => {
+                cy.findByRole('table').within(() => {
+                  cy.findAllByRole('row').should('have.length', 16)
+                })
+              })
+          })
       })
-        .filter((_idx, el) => [...el.querySelectorAll('td')].length === 2)
-        .should('have.length', 100)
     })
   })
 })

package/dpr/routes/journeys/view-report/async/report/utils.js

@@ -40,15 +40,14 @@ var import_UserReports = require("../../../../../types/UserReports");
 var import_ReportQuery = __toESM(require("../../../../../types/ReportQuery"));
 var import_filtersTypeEnum = require("../../../../../components/_filters/filtersTypeEnum");
 var import_definitionUtils = __toESM(require("../../../../../utils/definitionUtils"));
-var import_utils = __toESM(require("../../../../../components/_reports/report-pagination/utils"));
-var import_utils2 = __toESM(require("../../../../../components/_reports/report-totals/utils"));
+var import_utils = __toESM(require("../../../../../components/_reports/report-page/report-template/report-pagination/utils"));
+var import_utils2 = __toESM(require("../../../../../components/_reports/report-page/report-template/report-totals/utils"));
 var import_utils3 = __toESM(require("../../../../../components/_filters/utils"));
-var import_utils4 = __toESM(require("../../../../../components/_reports/report-columns-form/utils"));
-var import_utils5 = __toESM(require("../../../../../components/_reports/report-actions/utils"));
+var import_utils4 = __toESM(require("../../../../../components/_reports/report-heading/report-columns/report-columns-form/utils"));
+var import_utils5 = __toESM(require("../../../../../components/_reports/report-heading/report-actions/utils"));
 var import_utils6 = __toESM(require("../../../../../components/user-reports/utils"));
 var import_localsHelper = __toESM(require("../../../../../utils/localsHelper"));
-var import_utils7 = __toESM(require("../../../../../components/_reports/report-data-table/utils"));
-var import_CollatedSummaryBuilder = __toESM(require("../../../../../utils/CollatedSummaryBuilder/CollatedSummaryBuilder"));
+var import_utils7 = __toESM(require("../../../../../components/_reports/report-page/report-template/utils"));
 const getData = async ({
   res,
   req,
@@ -198,7 +197,7 @@ const renderReport = async ({ req, res, services }) => {
     token,
     userId: dprUser.id
   });
-  const dataTable = import_utils7.default.createDataTable(
+  const dataTable = import_utils7.default.createReportTemplateData(
     definition,
     columns,
     reportData,
@@ -211,7 +210,6 @@ const renderReport = async ({ req, res, services }) => {
     res,
     services,
     definition,
-    summariesData,
     dataTable,
     columns,
     reportQuery,
@@ -232,7 +230,7 @@ const renderReport = async ({ req, res, services }) => {
   }
   return { renderData };
 };
-const getTemplateData = async (req, res, services, definition, summariesData, dataTable, columns, reportQuery, requestData) => {
+const getTemplateData = async (req, res, services, definition, dataTable, columns, reportQuery, requestData) => {
   const { nestedBaseUrl } = import_localsHelper.default.getValues(res);
   const url = (0, import_parseurl.default)(req);
   if (!url) {
@@ -252,17 +250,12 @@ const getTemplateData = async (req, res, services, definition, summariesData, da
   });
   const features = await setFeatures(services, res, req, columns, definitionData, requestedData, urls);
   const meta = setMetaData(res, req);
-  let reportSummaries;
-  if (summariesData.length) {
-    const collatedSummaryBuilder = new import_CollatedSummaryBuilder.default(specification, summariesData);
-    reportSummaries = collatedSummaryBuilder.collatePageSummaries();
-  }
   let pagination;
   let totals;
   if (definitionData.template === "list") {
     pagination = import_utils.default.getPaginationData(url, count, req);
     const { pageSize, currentPage, totalRows } = pagination;
-    totals = import_utils2.default.getTotals(pageSize, currentPage, totalRows, dataTable[0].rowCount);
+    totals = import_utils2.default.getTotals(pageSize, currentPage, totalRows, dataTable.rowCount);
   }
   return {
     ...showColumns(specification) && { columns },
@@ -275,8 +268,7 @@ const getTemplateData = async (req, res, services, definition, summariesData, da
     ...requestedData,
     ...urls,
     ...pagination && { pagination },
-    ...totals && { totals },
-    ...reportSummaries && { reportSummaries }
+    ...totals && { totals }
   };
 };
 const showColumns = (specification) => {