@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.1.21 → 4.1.23

package/dpr/components/_charts/utils.js

@@ -7,7 +7,7 @@ const types_1 = require("../_dashboards/dashboard/types");
 const datasetHelper_1 = __importDefault(require("../../utils/datasetHelper"));
 const utils_1 = __importDefault(require("../_dashboards/dashboard-list/utils"));
 const createChart = (chartDefinition, rawData) => {
-    const timeseriesChartTypes = [types_1.DashboardVisualisationType.BAR_TIMESERIES, types_1.DashboardVisualisationType.LINE];
+    const timeseriesChartTypes = [types_1.DashboardVisualisationType.BAR_TIMESERIES, types_1.DashboardVisualisationType.LINE_TIMESERIES];
     const { type } = chartDefinition;
     let table;
     let chart;
@@ -195,7 +195,7 @@ const createTimeseriesChart = (chartDefinition, timeseriesData) => {
     const { columns } = chartDefinition;
     const { keys, measures } = columns;
     const unit = measures[0].unit ? measures[0].unit : undefined;
-    const type = chartDefinition.type === types_1.DashboardVisualisationType.BAR_TIMESERIES ? 'bar' : chartDefinition.type;
+    const type = chartDefinition.type === types_1.DashboardVisualisationType.BAR_TIMESERIES ? 'bar' : 'line';
     const groupKey = datasetHelper_1.default.getGroupKey(keys, timeseriesData);
     const labelId = groupKey.id;
     const timeBlockData = datasetHelper_1.default.groupRowsByTimestamp(timeseriesData);

package/dpr/components/_charts/utils.ts

@@ -18,7 +18,7 @@ import DatasetHelper from '../../utils/datasetHelper'
 import DashboardListUtils from '../_dashboards/dashboard-list/utils'
 
 const createChart = (chartDefinition: DashboardVisualisation, rawData: DashboardDataResponse[]): ChartCardData => {
-  const timeseriesChartTypes = [DashboardVisualisationType.BAR_TIMESERIES, DashboardVisualisationType.LINE]
+  const timeseriesChartTypes = [DashboardVisualisationType.BAR_TIMESERIES, DashboardVisualisationType.LINE_TIMESERIES]
   const { type } = chartDefinition
 
   let table: MoJTable
@@ -250,7 +250,8 @@ const createTimeseriesChart = (
   const { keys, measures } = columns
 
   const unit = measures[0].unit ? measures[0].unit : undefined
-  const type = chartDefinition.type === DashboardVisualisationType.BAR_TIMESERIES ? 'bar' : chartDefinition.type
+
+  const type = chartDefinition.type === DashboardVisualisationType.BAR_TIMESERIES ? 'bar' : 'line'
 
   const groupKey = DatasetHelper.getGroupKey(keys, timeseriesData)
   const labelId = groupKey.id as keyof DashboardDataResponse

package/dpr/components/_dashboards/dashboard/types.js

@@ -6,8 +6,9 @@ var DashboardVisualisationType;
     DashboardVisualisationType["LIST"] = "list";
     DashboardVisualisationType["DONUT"] = "doughnut";
     DashboardVisualisationType["BAR"] = "bar";
-    DashboardVisualisationType["BAR_TIMESERIES"] = "bar-timeseries";
     DashboardVisualisationType["LINE"] = "line";
+    DashboardVisualisationType["BAR_TIMESERIES"] = "bar-timeseries";
+    DashboardVisualisationType["LINE_TIMESERIES"] = "line-timeseries";
     DashboardVisualisationType["SCORECARD"] = "scorecard";
     DashboardVisualisationType["SCORECARD_GROUP"] = "scorecard-group";
 })(DashboardVisualisationType || (exports.DashboardVisualisationType = DashboardVisualisationType = {}));

package/dpr/components/_dashboards/dashboard/types.ts

@@ -50,8 +50,9 @@ export enum DashboardVisualisationType {
   LIST = 'list',
   DONUT = 'doughnut',
   BAR = 'bar',
-  BAR_TIMESERIES = 'bar-timeseries',
   LINE = 'line',
+  BAR_TIMESERIES = 'bar-timeseries',
+  LINE_TIMESERIES = 'line-timeseries',
   SCORECARD = 'scorecard',
   SCORECARD_GROUP = 'scorecard-group',
 }

package/dpr/components/_dashboards/dashboard/utils.js

@@ -83,6 +83,7 @@ const getSections = (dashboardDefinition, dashboardData) => {
                 case types_1.DashboardVisualisationType.BAR:
                 case types_1.DashboardVisualisationType.LINE:
                 case types_1.DashboardVisualisationType.BAR_TIMESERIES:
+                case types_1.DashboardVisualisationType.LINE_TIMESERIES:
                 case types_1.DashboardVisualisationType.DONUT: {
                     data = utils_1.default.createChart(visDefinition, dashboardData);
                     break;

package/dpr/components/_dashboards/dashboard/utils.ts

@@ -126,6 +126,7 @@ const getSections = (
         case DashboardVisualisationType.BAR:
         case DashboardVisualisationType.LINE:
         case DashboardVisualisationType.BAR_TIMESERIES:
+        case DashboardVisualisationType.LINE_TIMESERIES:
         case DashboardVisualisationType.DONUT: {
           data = ChartUtils.createChart(visDefinition, dashboardData)
           break

package/dpr/components/_dashboards/dashboard-visualisation/view.njk

@@ -18,11 +18,7 @@
       <p class="govuk-body">{{ description }}</p>
     {% endif %}
 
-    {% if type === 'bar' or type === 'line' or type === 'doughnut' or type === 'bar-timeseries' %}
-
-      {{ dprChartCard(id, data) }}
-
-    {% elif type === 'scorecard-group' %}
+    {% if type === 'scorecard-group' %}
 
       {{ dprScoreCardGroup(id, data) }}
 
@@ -30,6 +26,10 @@
 
       {{ dprDashboardList(id, data) }}
 
+    {% else %}
+
+      {{ dprChartCard(id, data) }}
+    
     {% endif %}
 
   </div>

package/dpr/components/_sync/sync-report/utils.js

@@ -114,6 +114,7 @@ const getReport = async ({ req, res, services }) => {
 };
 const getReportRenderData = async (req, count, specification, reportQuery, data) => {
     const url = (0, parseurl_1.default)(req);
+    const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`;
     const pagination = utils_1.default.getPaginationData(url, count);
     const dataTable = new DataTableBuilder_1.default(specification.fields)
         .withHeaderSortOptions(reportQuery)
@@ -133,6 +134,7 @@ const getReportRenderData = async (req, count, specification, reportQuery, data)
         reportUrl: url.pathname.replace('/download-disabled', '').replace('/download-disabled?', ''),
         reportSearch: url.search,
         encodedSearch: url.search ? encodeURIComponent(url.search) : undefined,
+        fullUrl,
     };
 };
 const getRenderData = async ({ req, reportDefinition, reportQuery, reportData, count, csrfToken, canDownload, }) => {

package/dpr/components/_sync/sync-report/utils.ts

@@ -185,6 +185,7 @@ const getReportRenderData = async (
   data: Dict<string>[],
 ) => {
   const url = parseUrl(req)
+  const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`
   const pagination = PaginationUtils.getPaginationData(url, count)
 
   const dataTable: DataTable = new DataTableBuilder(specification.fields)
@@ -214,6 +215,7 @@ const getReportRenderData = async (
     reportUrl: url.pathname.replace('/download-disabled', '').replace('/download-disabled?', ''),
     reportSearch: url.search,
     encodedSearch: url.search ? encodeURIComponent(url.search) : undefined,
+    fullUrl,
   }
 }
 

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

@@ -39,10 +39,10 @@ async function renderList(listData, variantDefinition, reportQuery, request, res
             share: {
                 reportName,
                 name: variantDefinition.name,
-                url: reportRenderData.reportUrl,
+                url: reportRenderData.fullUrl,
             },
             copy: {
-                url: reportRenderData.reportUrl,
+                url: reportRenderData.fullUrl,
             },
         });
         const renderData = {

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

@@ -66,10 +66,10 @@ export async function renderList(
         share: {
           reportName,
           name: variantDefinition.name,
-          url: reportRenderData.reportUrl,
+          url: reportRenderData.fullUrl,
         },
         copy: {
-          url: reportRenderData.reportUrl,
+          url: reportRenderData.fullUrl,
         },
       })
 

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@ministryofjustice/hmpps-digital-prison-reporting-frontend",
   "description": "The Digital Prison Reporting Frontend contains templates and code to help display data effectively in UI applications.",
-  "version": "4.1.21",
-  "main": "dpr/assets/js/all.mjs",
+  "version": "4.1.23",
+  "main": "dpr/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {
     "node": "^22",