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

package/dpr/components/_reports/report-page/report-template/report-section/view.njk

@@ -0,0 +1,58 @@
+{% from "govuk/components/table/macro.njk" import govukTable %}
+{% from "../report-summary-table/view.njk" import dprReportSummary %}
+
+{% from "./report-data-table/view.njk" import dprDataTable %}
+{% from "./parent-child-template/view.njk" import dprParentChildTemplate %}
+
+{% macro dprReportSection(renderData, template, classification) %}
+  {% set sections = renderData.sections %}
+
+  <div id="dpr-report-sections">
+    {% for section in sections %}
+      {% set sectionTitle = section.title %}
+      {% set sectionCount = section.count %}
+      {% set data = section.data %}
+      {% set summaries = section.summaries %}
+      {% if sectionTitle %}
+        {% set sectionLabelId = "section-title-" + loop.index %}
+      {% endif %}
+
+      <div 
+        id="dpr-{{ template }}-section-{{ loop.index }}" 
+        class="dpr-{{ template }}-section dpr-report-section"  
+        {% if sectionLabelId %} aria-labelledby="{{ sectionLabelId }}" {% endif %}
+      >
+      
+        {% if sectionTitle %}
+        <div class="dpr-report-section__title">
+          <h2 id="{{ sectionLabelId }}" class="govuk-heading-m">{{ sectionTitle }}
+            {% if template !== 'summary-section' %}
+            <span class="govuk-caption-m">{{ sectionCount }} results</span>
+            {% endif %}
+          </h2>
+        </div>
+        {% endif %}
+
+        {# section header summary tables #}
+        {{ dprReportSummary(summaries, 'section-header') }}
+
+        {# report template #}
+        {% if template === 'parent-child' or template === 'parent-child-section' %}
+
+          {{ dprParentChildTemplate(data, classification, template, sectionLabelId or 'dpr-report-name') }}
+
+        {% elif template !== 'summary-section' %}
+
+          <div id="dpr-{{ template }}-section-data-{{ loop.index }}" class="dpr-{{ template }}-section__data">
+            {{ dprDataTable(data, classification, template, sectionLabelId or 'dpr-report-name', loop.index) }}
+          </div>
+
+        {% endif %}
+
+        {# section footer summary tables #}
+        {{ dprReportSummary(summaries, 'section-footer') }} 
+
+      </div>
+    {% endfor %}
+  </div>
+{% endmacro %}

package/dpr/components/_reports/{report-summary-table → report-page/report-template/report-summary-table}/styles.scss

@@ -3,20 +3,22 @@
   position: relative;
   row-gap: 15px;
   flex-flow: column wrap;
+  margin-top: govuk-spacing(6);
 
   .dpr-summary-container {
     min-width: 200px;
     width: fit-content;
 
     .govuk-table {
-      border: solid 1px govuk-colour("mid-grey");
+      border: solid 1px govuk-colour('mid-grey');
       margin-bottom: 0;
 
-      th, td {
+      th,
+      td {
         padding: 10px;
       }
       th {
-        background-color: govuk-colour("light-grey");
+        background-color: govuk-colour('light-grey');
         border-bottom: 0px;
       }
     }
@@ -36,4 +38,19 @@
   margin-bottom: 30px;
 }
 
-
+@media print {
+  .dpr-summary-container-group {
+    .dpr-summary-container {
+      .govuk-table {
+        th,
+        td {
+          padding: govuk-spacing(1);
+        }
+        th {
+          background-color: govuk-colour('light-grey');
+          border-bottom: 0px;
+        }
+      }
+    }
+  }
+}

package/dpr/components/_reports/{report-totals → report-page/report-template/report-totals}/utils.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
-  "sources": ["../../../../dpr/components/_reports/report-totals/utils.ts"],
+  "sources": ["../../../../../../dpr/components/_reports/report-page/report-template/report-totals/utils.ts"],
   "sourcesContent": ["export const getTotals = (pageSize: number, currentPage: number, totalRows: number, rowCount: number): string => {\n  let totals = ''\n\n  const currentRangeStart = (currentPage - 1) * pageSize\n  const currentRangeEnd = currentRangeStart + rowCount\n\n  if (currentRangeStart === 0 && totalRows === currentRangeEnd) {\n    totals = totalRows === 1 ? `${totalRows} total result` : `${totalRows} total results`\n  } else {\n    totals =\n      totalRows > 0\n        ? `Showing <strong>${\n            currentRangeStart + 1\n          }</strong> to <strong>${currentRangeEnd}</strong> of <strong>${totalRows}</strong> results`\n        : `0-0 of 0`\n  }\n\n  return totals\n}\n\nexport default {\n  getTotals,\n}\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,YAAY,CAAC,UAAkB,aAAqB,WAAmB,aAA6B;AAC/G,MAAI,SAAS;AAEb,QAAM,qBAAqB,cAAc,KAAK;AAC9C,QAAM,kBAAkB,oBAAoB;AAE5C,MAAI,sBAAsB,KAAK,cAAc,iBAAiB;AAC5D,aAAS,cAAc,IAAI,GAAG,SAAS,kBAAkB,GAAG,SAAS;AAAA,EACvE,OAAO;AACL,aACE,YAAY,IACR,mBACE,oBAAoB,CACtB,wBAAwB,eAAe,wBAAwB,SAAS,sBACxE;AAAA,EACR;AAEA,SAAO;AACT;AAEA,IAAO,gBAAQ;AAAA,EACb;AACF;",
   "names": []

package/dpr/components/_reports/report-page/report-template/styles.scss

@@ -0,0 +1,5 @@
+.dpr-report-template-container {
+  .dpr-report-template__page-totals--footer {
+    margin-bottom: govuk-spacing(6);
+  }
+}

package/dpr/components/_reports/report-page/report-template/template-config.js

@@ -0,0 +1,66 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var template_config_exports = {};
+__export(template_config_exports, {
+  templateConfig: () => templateConfig
+});
+module.exports = __toCommonJS(template_config_exports);
+const templateConfig = {
+  list: {
+    pagination: true,
+    sort: true,
+    print: true,
+    totals: true
+  },
+  "list-section": {
+    pagination: true,
+    sort: true,
+    print: true,
+    totals: true
+  },
+  "parent-child": {
+    pagination: true,
+    sort: true,
+    print: true,
+    totals: true
+  },
+  "parent-child-section": {
+    pagination: true,
+    sort: true,
+    print: true,
+    totals: true
+  },
+  "summary-section": {
+    pagination: true,
+    sort: true,
+    print: true,
+    totals: true
+  },
+  summary: {
+    pagination: true,
+    sort: true,
+    print: true,
+    totals: true
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  templateConfig
+});
+//# sourceMappingURL=template-config.js.map

package/dpr/components/_reports/report-page/report-template/template-config.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../dpr/components/_reports/report-page/report-template/template-config.ts"],
+  "sourcesContent": ["export interface TemplateConfig {\n  pagination: boolean\n  sort: boolean\n  print: boolean\n  totals: boolean\n}\n\nexport const templateConfig: Record<string, TemplateConfig> = {\n  list: {\n    pagination: true,\n    sort: true,\n    print: true,\n    totals: true,\n  },\n  'list-section': {\n    pagination: true,\n    sort: true,\n    print: true,\n    totals: true,\n  },\n  'parent-child': {\n    pagination: true,\n    sort: true,\n    print: true,\n    totals: true,\n  },\n  'parent-child-section': {\n    pagination: true,\n    sort: true,\n    print: true,\n    totals: true,\n  },\n  'summary-section': {\n    pagination: true,\n    sort: true,\n    print: true,\n    totals: true,\n  },\n  summary: {\n    pagination: true,\n    sort: true,\n    print: true,\n    totals: true,\n  },\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAOO,MAAM,iBAAiD;AAAA,EAC5D,MAAM;AAAA,IACJ,YAAY;AAAA,IACZ,MAAM;AAAA,IACN,OAAO;AAAA,IACP,QAAQ;AAAA,EACV;AAAA,EACA,gBAAgB;AAAA,IACd,YAAY;AAAA,IACZ,MAAM;AAAA,IACN,OAAO;AAAA,IACP,QAAQ;AAAA,EACV;AAAA,EACA,gBAAgB;AAAA,IACd,YAAY;AAAA,IACZ,MAAM;AAAA,IACN,OAAO;AAAA,IACP,QAAQ;AAAA,EACV;AAAA,EACA,wBAAwB;AAAA,IACtB,YAAY;AAAA,IACZ,MAAM;AAAA,IACN,OAAO;AAAA,IACP,QAAQ;AAAA,EACV;AAAA,EACA,mBAAmB;AAAA,IACjB,YAAY;AAAA,IACZ,MAAM;AAAA,IACN,OAAO;AAAA,IACP,QAAQ;AAAA,EACV;AAAA,EACA,SAAS;AAAA,IACP,YAAY;AAAA,IACZ,MAAM;AAAA,IACN,OAAO;AAAA,IACP,QAAQ;AAAA,EACV;AACF;",
+  "names": []
+}

package/dpr/components/_reports/report-page/report-template/template-config.ts

@@ -0,0 +1,45 @@
+export interface TemplateConfig {
+  pagination: boolean
+  sort: boolean
+  print: boolean
+  totals: boolean
+}
+
+export const templateConfig: Record<string, TemplateConfig> = {
+  list: {
+    pagination: true,
+    sort: true,
+    print: true,
+    totals: true,
+  },
+  'list-section': {
+    pagination: true,
+    sort: true,
+    print: true,
+    totals: true,
+  },
+  'parent-child': {
+    pagination: true,
+    sort: true,
+    print: true,
+    totals: true,
+  },
+  'parent-child-section': {
+    pagination: true,
+    sort: true,
+    print: true,
+    totals: true,
+  },
+  'summary-section': {
+    pagination: true,
+    sort: true,
+    print: true,
+    totals: true,
+  },
+  summary: {
+    pagination: true,
+    sort: true,
+    print: true,
+    totals: true,
+  },
+}

package/dpr/components/_reports/report-page/report-template/utils.js

@@ -0,0 +1,82 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+__export(utils_exports, {
+  createReportTemplateData: () => createReportTemplateData,
+  default: () => utils_default
+});
+module.exports = __toCommonJS(utils_exports);
+var import_SummaryDataHelper = require("../../../../utils/TemplateBuilder/SummaryDataHelper/SummaryDataHelper");
+var import_DataTableBuilder = __toESM(require("../../../../utils/DataTableBuilder/DataTableBuilder"));
+var import_ReportBuilder = require("../../../../utils/TemplateBuilder/ReportBuilder/ReportBuilder");
+var import_ParentChildDataBuilder = require("../../../../utils/TemplateBuilder/ParentChildDataBuilder/ParentChildDataBuilder");
+var import_definitionUtils = require("../../../../utils/definitionUtils");
+const buildListTable = (definition, columns, reportData, summariesData, reportQuery) => {
+  const { variant, specification } = (0, import_definitionUtils.validateDefinition)(definition);
+  const { interactive } = variant;
+  const collatedSummarries = new import_SummaryDataHelper.CollatedSummaryBuilder(specification, summariesData).collateDataTableSummaries();
+  return new import_DataTableBuilder.default(specification.fields).withSummaries(collatedSummarries).withHeaderOptions({
+    columns: columns.value,
+    reportQuery,
+    interactive: Boolean(interactive)
+  }).buildTable(reportData);
+};
+const buildReport = (definition, columns, reportData, summariesData, reportQuery) => {
+  return new import_ReportBuilder.ReportBuilder(definition.variant).withData(reportData).withSummaries(summariesData).withColumns(columns.value).withQuery(reportQuery).build();
+};
+const buildParentChildReport = (definition, columns, reportData, childData, reportQuery) => {
+  return new import_ParentChildDataBuilder.ParentChildDataBuilder(definition.variant).withData(reportData).withColumns(columns.value).withChildColumns([]).withChildData(childData).withQuery(reportQuery).build();
+};
+const createReportTemplateData = (definition, columns, reportData, childData, summariesData, reportQuery) => {
+  const { specification } = (0, import_definitionUtils.validateDefinition)(definition);
+  const { template } = specification;
+  switch (template) {
+    case "list":
+    case "summary-section":
+    case "summary":
+    case "list-section": {
+      return buildReport(definition, columns, reportData, summariesData, reportQuery);
+    }
+    case "parent-child":
+    case "parent-child-section": {
+      return buildParentChildReport(definition, columns, reportData, childData, reportQuery);
+    }
+    default: {
+      return buildListTable(definition, columns, reportData, summariesData, reportQuery);
+    }
+  }
+};
+var utils_default = {
+  createReportTemplateData
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createReportTemplateData
+});
+//# sourceMappingURL=utils.js.map

package/dpr/components/_reports/report-page/report-template/utils.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../dpr/components/_reports/report-page/report-template/utils.ts"],
+  "sourcesContent": ["import { components } from '../../../../types/api'\nimport Dict = NodeJS.Dict\nimport ReportQuery from '../../../../types/ReportQuery'\nimport { AsyncSummary } from '../../../../types/UserReports'\nimport { CollatedSummaryBuilder } from '../../../../utils/TemplateBuilder/SummaryDataHelper/SummaryDataHelper'\nimport DataTableBuilder from '../../../../utils/DataTableBuilder/DataTableBuilder'\nimport { Columns } from '../../report-heading/report-columns/report-columns-form/types'\nimport { ChildData } from '../../../../utils/TemplateBuilder/ParentChildDataBuilder/types'\nimport { DataTable } from '../../../../utils/DataTableBuilder/types'\nimport type { Template } from '../../../../types/Templates'\nimport { ReportTemplateData } from '../../../../utils/TemplateBuilder/SectionedDataHelper/types'\nimport { ReportBuilder } from '../../../../utils/TemplateBuilder/ReportBuilder/ReportBuilder'\nimport { ParentChildDataBuilder } from '../../../../utils/TemplateBuilder/ParentChildDataBuilder/ParentChildDataBuilder'\nimport { validateDefinition } from '../../../../utils/definitionUtils'\n\nconst buildListTable = (\n  definition: components['schemas']['SingleVariantReportDefinition'],\n  columns: Columns,\n  reportData: Dict<string>[],\n  summariesData: AsyncSummary[],\n  reportQuery: ReportQuery,\n): DataTable => {\n  const { variant, specification } = validateDefinition(definition)\n  const { interactive } = variant\n\n  const collatedSummarries = new CollatedSummaryBuilder(specification, summariesData).collateDataTableSummaries()\n  return new DataTableBuilder(specification.fields)\n    .withSummaries(collatedSummarries)\n    .withHeaderOptions({\n      columns: columns.value,\n      reportQuery,\n      interactive: Boolean(interactive),\n    })\n    .buildTable(reportData)\n}\n\nconst buildReport = (\n  definition: components['schemas']['SingleVariantReportDefinition'],\n  columns: Columns,\n  reportData: Record<string, string>[],\n  summariesData: AsyncSummary[],\n  reportQuery: ReportQuery,\n): ReportTemplateData => {\n  return new ReportBuilder(definition.variant)\n    .withData(reportData)\n    .withSummaries(summariesData)\n    .withColumns(columns.value)\n    .withQuery(reportQuery)\n    .build()\n}\n\nconst buildParentChildReport = (\n  definition: components['schemas']['SingleVariantReportDefinition'],\n  columns: Columns,\n  reportData: Record<string, string>[],\n  childData: ChildData[],\n  reportQuery: ReportQuery,\n): ReportTemplateData => {\n  return new ParentChildDataBuilder(definition.variant)\n    .withData(reportData)\n    .withColumns(columns.value)\n    .withChildColumns([])\n    .withChildData(childData)\n    .withQuery(reportQuery)\n    .build()\n}\n\nexport const createReportTemplateData = (\n  definition: components['schemas']['SingleVariantReportDefinition'],\n  columns: Columns,\n  reportData: Dict<string>[],\n  childData: ChildData[],\n  summariesData: AsyncSummary[],\n  reportQuery: ReportQuery,\n): DataTable | ReportTemplateData => {\n  const { specification } = validateDefinition(definition)\n  const { template } = specification\n\n  switch (template as Template) {\n    case 'list':\n    case 'summary-section':\n    case 'summary':\n    case 'list-section': {\n      return buildReport(definition, columns, reportData as Record<string, string>[], summariesData, reportQuery)\n    }\n\n    case 'parent-child':\n    case 'parent-child-section': {\n      return buildParentChildReport(definition, columns, reportData as Record<string, string>[], childData, reportQuery)\n    }\n\n    default: {\n      return buildListTable(definition, columns, reportData, summariesData, reportQuery)\n    }\n  }\n}\n\nexport default {\n  createReportTemplateData,\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA,+BAAuC;AACvC,8BAA6B;AAM7B,2BAA8B;AAC9B,oCAAuC;AACvC,6BAAmC;AAEnC,MAAM,iBAAiB,CACrB,YACA,SACA,YACA,eACA,gBACc;AACd,QAAM,EAAE,SAAS,cAAc,QAAI,2CAAmB,UAAU;AAChE,QAAM,EAAE,YAAY,IAAI;AAExB,QAAM,qBAAqB,IAAI,gDAAuB,eAAe,aAAa,EAAE,0BAA0B;AAC9G,SAAO,IAAI,wBAAAA,QAAiB,cAAc,MAAM,EAC7C,cAAc,kBAAkB,EAChC,kBAAkB;AAAA,IACjB,SAAS,QAAQ;AAAA,IACjB;AAAA,IACA,aAAa,QAAQ,WAAW;AAAA,EAClC,CAAC,EACA,WAAW,UAAU;AAC1B;AAEA,MAAM,cAAc,CAClB,YACA,SACA,YACA,eACA,gBACuB;AACvB,SAAO,IAAI,mCAAc,WAAW,OAAO,EACxC,SAAS,UAAU,EACnB,cAAc,aAAa,EAC3B,YAAY,QAAQ,KAAK,EACzB,UAAU,WAAW,EACrB,MAAM;AACX;AAEA,MAAM,yBAAyB,CAC7B,YACA,SACA,YACA,WACA,gBACuB;AACvB,SAAO,IAAI,qDAAuB,WAAW,OAAO,EACjD,SAAS,UAAU,EACnB,YAAY,QAAQ,KAAK,EACzB,iBAAiB,CAAC,CAAC,EACnB,cAAc,SAAS,EACvB,UAAU,WAAW,EACrB,MAAM;AACX;AAEO,MAAM,2BAA2B,CACtC,YACA,SACA,YACA,WACA,eACA,gBACmC;AACnC,QAAM,EAAE,cAAc,QAAI,2CAAmB,UAAU;AACvD,QAAM,EAAE,SAAS,IAAI;AAErB,UAAQ,UAAsB;AAAA,IAC5B,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK,gBAAgB;AACnB,aAAO,YAAY,YAAY,SAAS,YAAwC,eAAe,WAAW;AAAA,IAC5G;AAAA,IAEA,KAAK;AAAA,IACL,KAAK,wBAAwB;AAC3B,aAAO,uBAAuB,YAAY,SAAS,YAAwC,WAAW,WAAW;AAAA,IACnH;AAAA,IAEA,SAAS;AACP,aAAO,eAAe,YAAY,SAAS,YAAY,eAAe,WAAW;AAAA,IACnF;AAAA,EACF;AACF;AAEA,IAAO,gBAAQ;AAAA,EACb;AACF;",
+  "names": ["DataTableBuilder"]
+}

package/dpr/components/_reports/report-page/report-template/utils.ts

@@ -0,0 +1,100 @@
+import { components } from '../../../../types/api'
+import Dict = NodeJS.Dict
+import ReportQuery from '../../../../types/ReportQuery'
+import { AsyncSummary } from '../../../../types/UserReports'
+import { CollatedSummaryBuilder } from '../../../../utils/TemplateBuilder/SummaryDataHelper/SummaryDataHelper'
+import DataTableBuilder from '../../../../utils/DataTableBuilder/DataTableBuilder'
+import { Columns } from '../../report-heading/report-columns/report-columns-form/types'
+import { ChildData } from '../../../../utils/TemplateBuilder/ParentChildDataBuilder/types'
+import { DataTable } from '../../../../utils/DataTableBuilder/types'
+import type { Template } from '../../../../types/Templates'
+import { ReportTemplateData } from '../../../../utils/TemplateBuilder/SectionedDataHelper/types'
+import { ReportBuilder } from '../../../../utils/TemplateBuilder/ReportBuilder/ReportBuilder'
+import { ParentChildDataBuilder } from '../../../../utils/TemplateBuilder/ParentChildDataBuilder/ParentChildDataBuilder'
+import { validateDefinition } from '../../../../utils/definitionUtils'
+
+const buildListTable = (
+  definition: components['schemas']['SingleVariantReportDefinition'],
+  columns: Columns,
+  reportData: Dict<string>[],
+  summariesData: AsyncSummary[],
+  reportQuery: ReportQuery,
+): DataTable => {
+  const { variant, specification } = validateDefinition(definition)
+  const { interactive } = variant
+
+  const collatedSummarries = new CollatedSummaryBuilder(specification, summariesData).collateDataTableSummaries()
+  return new DataTableBuilder(specification.fields)
+    .withSummaries(collatedSummarries)
+    .withHeaderOptions({
+      columns: columns.value,
+      reportQuery,
+      interactive: Boolean(interactive),
+    })
+    .buildTable(reportData)
+}
+
+const buildReport = (
+  definition: components['schemas']['SingleVariantReportDefinition'],
+  columns: Columns,
+  reportData: Record<string, string>[],
+  summariesData: AsyncSummary[],
+  reportQuery: ReportQuery,
+): ReportTemplateData => {
+  return new ReportBuilder(definition.variant)
+    .withData(reportData)
+    .withSummaries(summariesData)
+    .withColumns(columns.value)
+    .withQuery(reportQuery)
+    .build()
+}
+
+const buildParentChildReport = (
+  definition: components['schemas']['SingleVariantReportDefinition'],
+  columns: Columns,
+  reportData: Record<string, string>[],
+  childData: ChildData[],
+  reportQuery: ReportQuery,
+): ReportTemplateData => {
+  return new ParentChildDataBuilder(definition.variant)
+    .withData(reportData)
+    .withColumns(columns.value)
+    .withChildColumns([])
+    .withChildData(childData)
+    .withQuery(reportQuery)
+    .build()
+}
+
+export const createReportTemplateData = (
+  definition: components['schemas']['SingleVariantReportDefinition'],
+  columns: Columns,
+  reportData: Dict<string>[],
+  childData: ChildData[],
+  summariesData: AsyncSummary[],
+  reportQuery: ReportQuery,
+): DataTable | ReportTemplateData => {
+  const { specification } = validateDefinition(definition)
+  const { template } = specification
+
+  switch (template as Template) {
+    case 'list':
+    case 'summary-section':
+    case 'summary':
+    case 'list-section': {
+      return buildReport(definition, columns, reportData as Record<string, string>[], summariesData, reportQuery)
+    }
+
+    case 'parent-child':
+    case 'parent-child-section': {
+      return buildParentChildReport(definition, columns, reportData as Record<string, string>[], childData, reportQuery)
+    }
+
+    default: {
+      return buildListTable(definition, columns, reportData, summariesData, reportQuery)
+    }
+  }
+}
+
+export default {
+  createReportTemplateData,
+}

package/dpr/components/_reports/report-page/report-template/view.njk

@@ -0,0 +1,61 @@
+{% from "../../../code-block/view.njk" import dprCodeBlock %}
+
+{% from "./report-totals/view.njk" import dprReportTotals %}
+{% from "./report-summary-table/view.njk" import dprReportSummary %}
+{% from "./report-section/view.njk" import dprReportSection %}
+{% from "./report-no-data-message/view.njk" import dprReportNoDataMessage %}
+{% from "./report-pagination/view.njk" import dprReportPagination %}
+
+{% macro dprReportTemplate(renderData) %}
+  {% set pagination = renderData.pagination %}
+  {% set classification = renderData.classification %}
+  {% set template = renderData.template %}
+  {% set totals = renderData.totals %}
+  {% set dataTable = renderData.dataTable %}
+  {% set summaries = dataTable.summaries %}
+  {% set count = renderData.count %}
+
+  {% if not count or count === 0 %}
+    
+    <div class="dpr-report-template-container dpr-report-template-container--no-data">
+      {{ dprReportNoDataMessage(renderData.requestUrl.fullUrl) }}
+    </div>
+
+  {% else %}
+
+    <div class="dpr-report-template-container {% if (printable == false) %}print-hide{% endif %}">
+      {# Header summaries #}
+      <div class="dpr-report-template__page-summaries dpr-report-template__page-summaries--header">
+        {{ dprReportSummary(summaries, 'page-header') }}
+      </div>
+
+      {# header totals #}
+      <div class="dpr-report-template__page-totals dpr-report-template__page-totals--header">
+        {{ dprReportTotals(totals) }}
+      </div>
+      
+      {# sections #}
+      <div class='dpr-report-template__sections dpr-report-template__sections--{{ template }}'>
+        {{ dprReportSection(dataTable, template, classification) }}
+      </div>
+
+      {# footer totals #}
+      <div class="dpr-report-template__page-totals dpr-report-template__page-totals--footer">
+        {{ dprReportTotals(totals) }}
+      </div>
+
+      {# footer summaries #}
+      <div class="dpr-report-template__page-summaries dpr-report-template__page-summaries--footer">
+        {{ dprReportSummary(summaries, 'page-footer') }}
+      </div>
+
+      {# pagination #}
+      {% if template === 'list' and count and count > 0 %}
+      <div class="dpr-report-template__pagination">
+        {{ dprReportPagination(pagination) }}
+      </div>
+      {% endif %}
+    </div>
+  
+  {% endif %}
+{% endmacro %}

package/dpr/components/_reports/{report-wrapper → report-page}/styles.scss

@@ -1,7 +1,9 @@
-.dpr-reports-heading-container {
-  position: relative;
-  margin-top: govuk-spacing(5);
-  margin-bottom: govuk-spacing(5);
+.dpr-report-page {
+  .dpr-report-page__heading-container {
+    position: relative;
+    margin-top: govuk-spacing(5);
+    margin-bottom: govuk-spacing(5);
+  }
 }
 
 .dpr-columns-section-wrapper {
@@ -15,7 +17,7 @@
     display: none;
   }
 
-  .dpr-reports-heading-container {
+  .dpr-report-page__heading-container {
     h1.govuk-heading-l {
       font-size: 20px;
     }

package/dpr/components/_reports/report-page/view.njk

@@ -0,0 +1,26 @@
+{% from "../report-heading/view.njk" import dprReportHeading %}
+
+{% from "./report-print-message/view.njk" import dprReportPrintMessage %}
+{% from "./report-template/view.njk" import dprReportTemplate %}
+
+{% macro dprReportPage(renderData) %}
+  {% set printable = renderData.printable %}
+  <div class="govuk-width-container">
+    <div class="dpr-report-page govuk-width-container report-list-container">
+
+      <div class="dpr-report-print-message-container">
+        {{ dprReportPrintMessage(printable) }}
+      </div>
+      
+      <div class="dpr-report-page__heading-container">
+        {{ dprReportHeading(renderData) }}
+      </div>
+
+      <div class="dpr-report-page__template-container">
+        {{ dprReportTemplate(renderData)}}
+      </div>
+
+    </div>
+  </div>
+
+{% endmacro %}

package/dpr/components/card-group/view.njk

@@ -1,13 +1,10 @@
 {% macro dprCardGroup(cards, variant = 1) %}
-  {% from "dpr/components/loading-anim/view.njk" import dprLoadingAnim -%}
-
   <div class="dpr-card-group dpr-card-group-v{{ variant }}" data-dpr-module="card-group">
     {% for card in cards %}
       {% if variant === 1 %}
 
         <div class="dpr-card-group__item card card--clickable" data-click-navigate-to="{{ card.href }}">
           <div class="card-wrapper">
-            {{ dprLoadingAnim() }}
             <h2 class="govuk-heading-m card__heading">
               <a class="govuk-link card__link govuk-link--no-visited-state" href="{{ card.href }}">
                 {{ card.text }}
@@ -23,7 +20,6 @@
 
         <div class="dpr-card-group__item" data-click-navigate-to="{{ card.href }}">
           <div class="card-wrapper">
-            {{ dprLoadingAnim() }}
             <hr class="govuk-section-break govuk-section-break--m govuk-section-break--visible govuk-!-static-margin-top-0">
             <div class="dpr-card-group__item-header">
               <a class="govuk-link govuk-!-font-weight-bold govuk-link--no-visited-state govuk-body card__link" href="{{ card.href }}">

package/dpr/components/report-list/utils.js

@@ -37,7 +37,7 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_ReportQuery = __toESM(require("../../types/ReportQuery"));
 var import_reportingClient = __toESM(require("../../data/reportingClient"));
-var import_utils = __toESM(require("../_reports/report-actions/utils"));
+var import_utils = __toESM(require("../_reports/report-heading/report-actions/utils"));
 var import_utils2 = require("../../utils");
 var import_utils3 = __toESM(require("../_filters/utils"));
 var import_UserReports = require("../../types/UserReports");
@@ -45,7 +45,7 @@ var import_filtersTypeEnum = require("../_filters/filtersTypeEnum");
 function isListWithWarnings(data) {
   return data.data !== void 0;
 }
-async function renderList(listData, variantDefinition, reportQuery, req, response, next, title, layoutTemplate, otherOptions, reportName) {
+async function renderList(listData, variantDefinition, definition, reportQuery, req, response, next, title, layoutTemplate, otherOptions, reportName) {
   await Promise.all([listData.data, listData.count]).then(async (resolvedData) => {
     let data;
     let warnings = {};
@@ -65,7 +65,8 @@ async function renderList(listData, variantDefinition, reportQuery, req, respons
         specification,
         reportQuery,
         data,
-        filtersType: import_filtersTypeEnum.FiltersType.REQUEST
+        filtersType: import_filtersTypeEnum.FiltersType.REQUEST,
+        definition
       });
       const actions = import_utils.default.getActions({
         print: {
@@ -146,6 +147,7 @@ const renderListWithDefinition = async ({
         await renderList(
           getListData,
           variantDefinition,
+          reportDefinition,
           reportQuery,
           request,
           response,
@@ -182,10 +184,16 @@ const renderListWithData = async ({
     queryParams: request.query,
     definitionsPath: request.query["dataProductDefinitionsPath"]
   });
+  const definition = {
+    id: variantDefinition.id,
+    name: variantDefinition.name,
+    variant: variantDefinition
+  };
   const listData = getListDataSources(reportQuery);
   await renderList(
     listData,
     variantDefinition,
+    definition,
     reportQuery,
     request,
     response,