@ministryofjustice/hmpps-arns-frontend-components-lib 0.0.2 → 0.0.4

package/dist/arns/components/badge/macro.njk

@@ -1,25 +1,3 @@
-{#
-ARNS Predictor Badge Component
-
-Displays risk predictor score badges.
-
-Usage:
-  In route handler:
-    const riskData = await arnsComponents.getRiskData(token, 'crn', 'X123456')
-    res.render('page', { riskData })
-
-  In template:
-    {% from "components/badge/macro.njk" import predictorBadge %}
-    {{ predictorBadge({ data: riskData }) }}
-
-  With options:
-    {{ predictorBadge({ data: riskData, showScore: true }) }}
-
-@param {object} params
-@param {RiskData} params.data - Risk data from ArnsComponents.getRiskData()
-@param {boolean} [params.showScore=false] - Whether to display the percentage score
-@param {string} [params.classes] - Additional CSS classes
-#}
 {% macro predictorBadge(params) %}
   {%- include "./template.njk" -%}
 {% endmacro %}

package/dist/arns/components/badge/template.njk

@@ -1,59 +1,62 @@
 {#
   ARNS Predictor Badge Component
 
-  Displays risk predictor score badges.
+  @name predictorBadge
 
-  Usage:
-    In route handler:
-      const riskData = await arnsComponents.getRiskData(token, 'crn', 'X123456')
-      res.render('page', { riskData })
+  @description Displays specified risk predictor score badges.
+  It uses the latest assessment from the provided data set.
 
-    In template:
-      {% from "components/badge/macro.njk" import predictorBadge %}
-      {{ predictorBadge({ data: riskData }) }}
+  @example
+  In route handler:
+    const riskData = await arnsComponents.getRiskData(token, 'crn', 'X123456')
+    res.render('page', { riskData })
 
-    With options:
-      {{ predictorBadge({ data: riskData, showScore: true }) }}
+  In template:
+    {% from "components/badge/macro.njk" import predictorBadge %}
+    {{ predictorBadge({
+      data: riskData,
+      predictor: "allReoffendingPredictor",
+      showScore: true,
+      classes: "class-name-here"
+    }) }}
 
   @param {object} params
-  @param {RiskData} params.data - Risk data from ArnsComponents.getRiskData()
-  @param {boolean} [params.showScore=false] - Whether to display the percentage score
-  @param {string} [params.classes] - Additional CSS classes
+    @param {RiskData} params.data - Risk data object from ArnsComponents.getRiskData() containing an 'assessments' array
+    @param {string} params.predictor - The name of the specific predictor to display
+    @param {boolean} [params.showScore=false] - If true, displays the percentage score
+    @param {string} [params.classes] - Optional CSS utility classes to apply to the container
 #}
-
-{% set badges = params.data.badges if params.data else [] %}
+{% set latestAssessment = params.data.assessments | first if params.data.assessments else null %}
 {% set showScore = params.showScore if params.showScore else false %}
 
-{% if badges and badges.length %}
-<div class="predictor-badges{% if params.classes %} {{ params.classes }}{% endif %}">
-  {% for entry in badges %}
-    {% for key, predictor in entry %}
-      {% if predictor %}
+{% if latestAssessment is defined %}
+  <div class="predictor-badges{% if params.classes %} {{ params.classes }}{% endif %}">
+    {% for key, predictor in latestAssessment %}
+      {% if key == params.predictor %}
+
         {% set badgeClass = '' %}
-        {% switch predictor.level %}
-          {% case 'VERY_HIGH' %}
-            {% set badgeClass = 'predictor-badge--very-high' %}
-          {% case 'HIGH' %}
-            {% set badgeClass = 'predictor-badge--high' %}
-          {% case 'MEDIUM' %}
-            {% set badgeClass = 'predictor-badge--medium' %}
-          {% case 'LOW' %}
-            {% set badgeClass = 'predictor-badge--low' %}
+        {% switch predictor.band %}
+        {% case 'VERY HIGH' %}
+          {% set badgeClass = 'predictor-badge--very-high' %}
+        {% case 'HIGH' %}
+          {% set badgeClass = 'predictor-badge--high' %}
+        {% case 'MEDIUM' %}
+          {% set badgeClass = 'predictor-badge--medium' %}
+        {% case 'LOW' %}
+          {% set badgeClass = 'predictor-badge--low' %}
         {% endswitch %}
-
         <div class="{{ badgeClass }}">
-          <span class="predictor-badge__type_and_level">{{ predictor.type | upper }} <strong>{{ predictor.level | replace('_', ' ') }}</strong></span>
+          <span class="predictor-badge__type_and_level">{{ predictor.name | upper }} <strong>{{ predictor.band }}</strong></span>
 
-          {% if showScore and predictor.score %}
+          {% if showScore and predictor.score is defined %}
             <span class="predictor-badge__score">{{ predictor.score }}%</span>
           {% endif %}
 
           {% if predictor.staticOrDynamic %}
-            <span class="predictor-badge__static_or_dynamic">{{ predictor.staticOrDynamic | capitalize }}</span>
+            <span class="predictor-badge__static_or_dynamic">{{ predictor.staticOrDynamic }}</span>
           {% endif %}
         </div>
       {% endif %}
     {% endfor %}
-  {% endfor %}
-</div>
+  </div>
 {% endif %}

package/dist/index.cjs.js

@@ -2,172 +2,63 @@
 
 var hmppsRestClient = require('@ministryofjustice/hmpps-rest-client');
 
-function transformBadgeData(dto) {
-    const badgeEntries = [];
-    dto.forEach(listEntry => {
-        if (listEntry.outputVersion === '1') {
-            const ogrs3 = listEntry.output.groupReconvictionScore;
-            const ovp = listEntry.output.violencePredictorScore;
-            const ogp = listEntry.output.generalPredictorScore;
-            const rsr = listEntry.output.riskOfSeriousRecidivismScore;
-            const osp = listEntry.output.sexualPredictorScore;
-            if (ogrs3) {
-                const entry = {
-                    ogrs3PredictorScore: {
-                        level: ogrs3.scoreLevel,
-                        score: ogrs3.twoYears,
-                        type: 'OGRS3',
-                        staticOrDynamic: null,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (ovp) {
-                const entry = {
-                    ovpPredictorScore: {
-                        level: ovp.ovpRisk,
-                        score: ovp.twoYears,
-                        type: 'OVP',
-                        staticOrDynamic: null,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (ogp) {
-                const entry = {
-                    ogpPredictorScore: {
-                        level: ogp.ogpRisk,
-                        score: ogp.ogp2Year,
-                        type: 'OGP',
-                        staticOrDynamic: null,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (rsr) {
-                const entry = {
-                    rsrPredictorScore: {
-                        level: rsr.scoreLevel,
-                        score: rsr.percentageScore,
-                        type: 'RSR',
-                        staticOrDynamic: rsr.staticOrDynamic,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (osp) {
-                const entry = {
-                    ospdcPredictorScore: {
-                        level: osp.ospIndecentScoreLevel,
-                        score: osp.ospIndecentPercentageScore,
-                        type: 'OSP/DC',
-                        staticOrDynamic: null,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (osp) {
-                const entry = {
-                    ospiicPredictorScore: {
-                        level: osp.ospIndecentScoreLevel,
-                        score: osp.ospIndecentPercentageScore,
-                        type: 'OSP/IIC',
-                        staticOrDynamic: null,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
+function transformAllPredictorVersionedDtoToAssessments(dtos) {
+    // Sort DTOs by datetime (newest first)
+    const sortedDtos = [...dtos].sort((a, b) => {
+        return new Date(b.completedDate).getTime() - new Date(a.completedDate).getTime();
+    });
+    return sortedDtos.map(dto => {
+        const completedDate = dto.completedDate.toString();
+        const date = new Date(completedDate);
+        const dateFormatDayMonthYear = new Intl.DateTimeFormat('en-GB', {
+            day: '2-digit',
+            month: 'long',
+            year: 'numeric',
+        }).format(date);
+        const time = date.toLocaleTimeString('en-GB', {
+            hour: '2-digit',
+            minute: '2-digit',
+            hour12: false,
+        });
+        const dateFormatDayMonthYearTime = `${dateFormatDayMonthYear} at ${time}`;
+        const { output } = dto;
+        if (dto.outputVersion === '1') {
+            return {
+                outputVersion: '1',
+                completedDateTime: dateFormatDayMonthYearTime,
+                ogrs3: mapPredictor('OGRS', output.groupReconvictionScore.scoreLevel, null, output.groupReconvictionScore.twoYears, dateFormatDayMonthYear),
+                ovp: mapPredictor('OVP', output.violencePredictorScore.ovpRisk, null, output.violencePredictorScore.twoYears, dateFormatDayMonthYear),
+                ogp: mapPredictor('OGP', output.generalPredictorScore.ogpRisk, null, output.generalPredictorScore.ogp2Year, dateFormatDayMonthYear),
+                rsr: mapPredictor('RSR', output.riskOfSeriousRecidivismScore.scoreLevel, output.riskOfSeriousRecidivismScore.staticOrDynamic, output.riskOfSeriousRecidivismScore.percentageScore, dateFormatDayMonthYear),
+                ospdc: mapPredictor('OSP-DC', output.sexualPredictorScore.ospContactScoreLevel, null, output.sexualPredictorScore.ospContactPercentageScore, dateFormatDayMonthYear),
+                ospiic: mapPredictor('OSP-IIC', output.sexualPredictorScore.ospIndecentScoreLevel, null, output.sexualPredictorScore.ospIndecentPercentageScore, dateFormatDayMonthYear),
+            };
         }
-        else if (listEntry.outputVersion === '2') {
-            const ogrs4 = listEntry.output.allReoffendingPredictor;
-            const ovp2 = listEntry.output.violentReoffendingPredictor;
-            const snsv = listEntry.output.seriousViolentReoffendingPredictor;
-            const ospdc = listEntry.output.directContactSexualReoffendingPredictor;
-            const ospiic = listEntry.output.indirectImageContactSexualReoffendingPredictor;
-            const rsr = listEntry.output.combinedSeriousReoffendingPredictor;
-            if (ogrs4) {
-                const entry = {
-                    allReoffendingPredictor: {
-                        level: ogrs4.band,
-                        score: ogrs4.score,
-                        type: 'All reoffending predictor',
-                        staticOrDynamic: ogrs4.staticOrDynamic,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (ovp2) {
-                const entry = {
-                    violentReoffendingPredictor: {
-                        level: ovp2.band,
-                        score: ovp2.score,
-                        type: 'Violent reoffending predictor',
-                        staticOrDynamic: ovp2.staticOrDynamic,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (snsv) {
-                const entry = {
-                    seriousViolentReoffendingPredictor: {
-                        level: snsv.band,
-                        score: snsv.score,
-                        type: 'Serious violent reoffending predictor',
-                        staticOrDynamic: snsv.staticOrDynamic,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (ospdc) {
-                const entry = {
-                    directContactSexualReoffendingPredictor: {
-                        level: ospdc.band,
-                        score: ospdc.score,
-                        type: 'Direct contact sexual reoffending predictor',
-                        staticOrDynamic: null,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (ospiic) {
-                const entry = {
-                    indirectImageContactSexualReoffendingPredictor: {
-                        level: ospiic.band,
-                        score: ospiic.score,
-                        type: 'Indirect image contact sexual reoffending predictor',
-                        staticOrDynamic: null,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (rsr) {
-                const entry = {
-                    combinedSeriousReoffendingPredictor: {
-                        level: rsr.band,
-                        score: rsr.score,
-                        type: 'Combined serious reoffending predictor',
-                        staticOrDynamic: rsr.staticOrDynamic,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
+        if (dto.outputVersion === '2') {
+            return {
+                outputVersion: '2',
+                completedDateTime: dateFormatDayMonthYearTime,
+                allReoffendingPredictor: mapPredictor('All Reoffending Predictor', output.allReoffendingPredictor.band, output.allReoffendingPredictor.staticOrDynamic, output.allReoffendingPredictor.score, dateFormatDayMonthYear),
+                violentReoffendingPredictor: mapPredictor('Violent Reoffending Predictor', output.violentReoffendingPredictor.band, output.violentReoffendingPredictor.staticOrDynamic, output.violentReoffendingPredictor.score, dateFormatDayMonthYear),
+                seriousViolentReoffendingPredictor: mapPredictor('Serious Violent Reoffending Predictor', output.seriousViolentReoffendingPredictor.band, output.seriousViolentReoffendingPredictor.staticOrDynamic, output.seriousViolentReoffendingPredictor.score, dateFormatDayMonthYear),
+                directContactSexualReoffendingPredictor: mapPredictor('Direct Contact - Sexual Reoffending Predictor', output.directContactSexualReoffendingPredictor.band, null, output.directContactSexualReoffendingPredictor.score, dateFormatDayMonthYear),
+                indirectImageContactSexualReoffendingPredictor: mapPredictor('Images and Indirect Contact – Sexual Reoffending Predictor', output.indirectImageContactSexualReoffendingPredictor.band, null, output.indirectImageContactSexualReoffendingPredictor.score, dateFormatDayMonthYear),
+                combinedSeriousReoffendingPredictor: mapPredictor('Combined Serious Reoffending Predictor', output.combinedSeriousReoffendingPredictor.band, output.combinedSeriousReoffendingPredictor.staticOrDynamic, output.combinedSeriousReoffendingPredictor.score, dateFormatDayMonthYear),
+            };
         }
-        else
-            throw new Error('unexpected version');
+        throw new Error(`Unsupported output version: ${dto.outputVersion}`);
     });
-    return badgeEntries;
+}
+function mapPredictor(name, band, staticOrDynamic, score, date) {
+    return {
+        name,
+        band: band.replace(/_/g, ' ').toUpperCase(),
+        staticOrDynamic: staticOrDynamic
+            ? staticOrDynamic.charAt(0).toUpperCase() + staticOrDynamic.slice(1).toLowerCase()
+            : null,
+        score,
+        completedDate: date,
+    };
 }
 
 class ArnsComponents {
@@ -177,8 +68,7 @@ class ArnsComponents {
     async getRiskData(authOptions, identifierType, identifierValue) {
         const response = await this.restClient.get({ path: `/risks/predictors/all/${identifierType}/${identifierValue}` }, authOptions);
         return {
-            badges: transformBadgeData(response),
-            raw: response,
+            assessments: transformAllPredictorVersionedDtoToAssessments(response),
         };
     }
 }

package/dist/index.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs.js","sources":["../src/components/badge/transformation.ts","../src/ArnsComponents.ts"],"sourcesContent":[null,null],"names":["RestClient"],"mappings":";;;;AAGM,SAAU,kBAAkB,CAAC,GAA+B,EAAA;IAChE,MAAM,YAAY,GAAiB,EAAE;AAErC,IAAA,GAAG,CAAC,OAAO,CAAC,SAAS,IAAG;AACtB,QAAA,IAAI,SAAS,CAAC,aAAa,KAAK,GAAG,EAAE;AACnC,YAAA,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,sBAAsB;AACrD,YAAA,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,sBAAsB;AACnD,YAAA,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,qBAAqB;AAClD,YAAA,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,4BAA4B;AACzD,YAAA,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,oBAAoB;YAEjD,IAAI,KAAK,EAAE;AACT,gBAAA,MAAM,KAAK,GAAe;AACxB,oBAAA,mBAAmB,EAAE;wBACnB,KAAK,EAAE,KAAK,CAAC,UAAU;wBACvB,KAAK,EAAE,KAAK,CAAC,QAAQ;AACrB,wBAAA,IAAI,EAAE,OAAO;AACb,wBAAA,eAAe,EAAE,IAAI;AACrB,wBAAA,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE;AAClD,qBAAA;iBACF;AACD,gBAAA,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;YAC1B;YAEA,IAAI,GAAG,EAAE;AACP,gBAAA,MAAM,KAAK,GAAe;AACxB,oBAAA,iBAAiB,EAAE;wBACjB,KAAK,EAAE,GAAG,CAAC,OAAO;wBAClB,KAAK,EAAE,GAAG,CAAC,QAAQ;AACnB,wBAAA,IAAI,EAAE,KAAK;AACX,wBAAA,eAAe,EAAE,IAAI;AACrB,wBAAA,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE;AAClD,qBAAA;iBACF;AACD,gBAAA,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;YAC1B;YAEA,IAAI,GAAG,EAAE;AACP,gBAAA,MAAM,KAAK,GAAe;AACxB,oBAAA,iBAAiB,EAAE;wBACjB,KAAK,EAAE,GAAG,CAAC,OAAO;wBAClB,KAAK,EAAE,GAAG,CAAC,QAAQ;AACnB,wBAAA,IAAI,EAAE,KAAK;AACX,wBAAA,eAAe,EAAE,IAAI;AACrB,wBAAA,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE;AAClD,qBAAA;iBACF;AACD,gBAAA,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;YAC1B;YAEA,IAAI,GAAG,EAAE;AACP,gBAAA,MAAM,KAAK,GAAe;AACxB,oBAAA,iBAAiB,EAAE;wBACjB,KAAK,EAAE,GAAG,CAAC,UAAU;wBACrB,KAAK,EAAE,GAAG,CAAC,eAAe;AAC1B,wBAAA,IAAI,EAAE,KAAK;wBACX,eAAe,EAAE,GAAG,CAAC,eAAe;AACpC,wBAAA,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE;AAClD,qBAAA;iBACF;AACD,gBAAA,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;YAC1B;YAEA,IAAI,GAAG,EAAE;AACP,gBAAA,MAAM,KAAK,GAAe;AACxB,oBAAA,mBAAmB,EAAE;wBACnB,KAAK,EAAE,GAAG,CAAC,qBAAqB;wBAChC,KAAK,EAAE,GAAG,CAAC,0BAA0B;AACrC,wBAAA,IAAI,EAAE,QAAQ;AACd,wBAAA,eAAe,EAAE,IAAI;AACrB,wBAAA,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE;AAClD,qBAAA;iBACF;AACD,gBAAA,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;YAC1B;YAEA,IAAI,GAAG,EAAE;AACP,gBAAA,MAAM,KAAK,GAAe;AACxB,oBAAA,oBAAoB,EAAE;wBACpB,KAAK,EAAE,GAAG,CAAC,qBAAqB;wBAChC,KAAK,EAAE,GAAG,CAAC,0BAA0B;AACrC,wBAAA,IAAI,EAAE,SAAS;AACf,wBAAA,eAAe,EAAE,IAAI;AACrB,wBAAA,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE;AAClD,qBAAA;iBACF;AACD,gBAAA,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;YAC1B;QACF;AAAO,aAAA,IAAI,SAAS,CAAC,aAAa,KAAK,GAAG,EAAE;AAC1C,YAAA,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,uBAAuB;AACtD,YAAA,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,2BAA2B;AACzD,YAAA,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,kCAAkC;AAChE,YAAA,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,uCAAuC;AACtE,YAAA,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,8CAA8C;AAC9E,YAAA,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,mCAAmC;YAEhE,IAAI,KAAK,EAAE;AACT,gBAAA,MAAM,KAAK,GAAe;AACxB,oBAAA,uBAAuB,EAAE;wBACvB,KAAK,EAAE,KAAK,CAAC,IAAI;wBACjB,KAAK,EAAE,KAAK,CAAC,KAAK;AAClB,wBAAA,IAAI,EAAE,2BAA2B;wBACjC,eAAe,EAAE,KAAK,CAAC,eAAe;AACtC,wBAAA,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE;AAClD,qBAAA;iBACF;AACD,gBAAA,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;YAC1B;YAEA,IAAI,IAAI,EAAE;AACR,gBAAA,MAAM,KAAK,GAAe;AACxB,oBAAA,2BAA2B,EAAE;wBAC3B,KAAK,EAAE,IAAI,CAAC,IAAI;wBAChB,KAAK,EAAE,IAAI,CAAC,KAAK;AACjB,wBAAA,IAAI,EAAE,+BAA+B;wBACrC,eAAe,EAAE,IAAI,CAAC,eAAe;AACrC,wBAAA,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE;AAClD,qBAAA;iBACF;AACD,gBAAA,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;YAC1B;YAEA,IAAI,IAAI,EAAE;AACR,gBAAA,MAAM,KAAK,GAAe;AACxB,oBAAA,kCAAkC,EAAE;wBAClC,KAAK,EAAE,IAAI,CAAC,IAAI;wBAChB,KAAK,EAAE,IAAI,CAAC,KAAK;AACjB,wBAAA,IAAI,EAAE,uCAAuC;wBAC7C,eAAe,EAAE,IAAI,CAAC,eAAe;AACrC,wBAAA,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE;AAClD,qBAAA;iBACF;AACD,gBAAA,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;YAC1B;YAEA,IAAI,KAAK,EAAE;AACT,gBAAA,MAAM,KAAK,GAAe;AACxB,oBAAA,uCAAuC,EAAE;wBACvC,KAAK,EAAE,KAAK,CAAC,IAAI;wBACjB,KAAK,EAAE,KAAK,CAAC,KAAK;AAClB,wBAAA,IAAI,EAAE,6CAA6C;AACnD,wBAAA,eAAe,EAAE,IAAI;AACrB,wBAAA,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE;AAClD,qBAAA;iBACF;AACD,gBAAA,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;YAC1B;YAEA,IAAI,MAAM,EAAE;AACV,gBAAA,MAAM,KAAK,GAAe;AACxB,oBAAA,8CAA8C,EAAE;wBAC9C,KAAK,EAAE,MAAM,CAAC,IAAI;wBAClB,KAAK,EAAE,MAAM,CAAC,KAAK;AACnB,wBAAA,IAAI,EAAE,qDAAqD;AAC3D,wBAAA,eAAe,EAAE,IAAI;AACrB,wBAAA,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE;AAClD,qBAAA;iBACF;AACD,gBAAA,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;YAC1B;YAEA,IAAI,GAAG,EAAE;AACP,gBAAA,MAAM,KAAK,GAAe;AACxB,oBAAA,mCAAmC,EAAE;wBACnC,KAAK,EAAE,GAAG,CAAC,IAAI;wBACf,KAAK,EAAE,GAAG,CAAC,KAAK;AAChB,wBAAA,IAAI,EAAE,wCAAwC;wBAC9C,eAAe,EAAE,GAAG,CAAC,eAAe;AACpC,wBAAA,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE;AAClD,qBAAA;iBACF;AACD,gBAAA,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;YAC1B;QACF;;AAAO,YAAA,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC;AAC9C,IAAA,CAAC,CAAC;AAEF,IAAA,OAAO,YAAY;AACrB;;AC3Kc,MAAO,cAAc,CAAA;AAGjC,IAAA,WAAA,CACE,oBAA0C,EAC1C,MAA4B,EAC5B,SAA2B,OAAO,EAAA;AAElC,QAAA,IAAI,CAAC,UAAU,GAAG,IAAIA,0BAAU,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,CAAC;IACpF;AAEA,IAAA,MAAM,WAAW,CACf,WAAiC,EACjC,cAAsB,EACtB,eAAuB,EAAA;QAEvB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CACxC,EAAE,IAAI,EAAE,CAAA,sBAAA,EAAyB,cAAc,CAAA,CAAA,EAAI,eAAe,EAAE,EAAE,EACtE,WAAW,CACZ;QAED,OAAO;AACL,YAAA,MAAM,EAAE,kBAAkB,CAAC,QAAQ,CAAC;AACpC,YAAA,GAAG,EAAE,QAAQ;SACd;IACH;AACD;;;;"}
+{"version":3,"file":"index.cjs.js","sources":["../src/transformers/AllPredictorVersionedDtoToAssessmentsTransformer.ts","../src/ArnsComponents.ts"],"sourcesContent":[null,null],"names":["RestClient"],"mappings":"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"}

package/dist/index.d.ts

@@ -5,115 +5,40 @@ import Logger from 'bunyan';
 interface ArnsComponentsConfig extends ApiConfig {
 }
 
-declare enum StaticOrDynamic {
-    STATIC = "STATIC",
-    DYNAMIC = "DYNAMIC"
-}
-
-declare enum BandLevel {
-    LOW = "LOW",
-    MEDIUM = "MEDIUM",
-    HIGH = "HIGH",
-    VERY_HIGH = "VERY_HIGH",
-    NOT_APPLICABLE = "NOT_APPLICABLE"
-}
-
-interface BadgeData {
-    level: `${BandLevel}`;
-    score: number;
-    type: string;
-    staticOrDynamic: `${StaticOrDynamic}`;
+interface Predictor {
+    name: string;
+    band: string;
+    staticOrDynamic?: string;
+    score?: number;
     completedDate: string;
 }
-interface BadgeEntry {
-    [key: string]: BadgeData;
-}
-
-declare enum AssessmentStatusDto {
-    COMPLETE = "COMPLETE",
-    LOCKED_INCOMPLETE = "LOCKED_INCOMPLETE"
-}
-
-interface BasePredictorDto {
-    score: number;
-    band: `${BandLevel}`;
-}
-
-interface StaticOrDynamicPredictorDto extends BasePredictorDto {
-    staticOrDynamic: `${StaticOrDynamic}`;
-}
-
-interface VersionedStaticOrDynamicPredictorDto extends StaticOrDynamicPredictorDto {
-    algorithmVersion: string;
-}
 
-interface OgrScoreDto {
-    oneYear: number;
-    twoYears: number;
-    scoreLevel: `${BandLevel}`;
+interface AssessmentV1 {
+    outputVersion: '1';
+    completedDateTime: string;
+    ogrs3?: Predictor;
+    ovp?: Predictor;
+    ogp?: Predictor;
+    rsr: Predictor;
+    ospdc: Predictor;
+    ospiic: Predictor;
 }
 
-interface OvpScoreDto {
-    ovpStaticWeightedScore: number;
-    ovpDynamicWeightedScore: number;
-    ovpTotalWeightedScore: number;
-    oneYear: number;
-    twoYears: number;
-    ovpRisk: `${BandLevel}`;
+interface AssessmentV2 {
+    outputVersion: '2';
+    completedDateTime: string;
+    allReoffendingPredictor?: Predictor;
+    violentReoffendingPredictor?: Predictor;
+    seriousViolentReoffendingPredictor?: Predictor;
+    directContactSexualReoffendingPredictor?: Predictor;
+    indirectImageContactSexualReoffendingPredictor?: Predictor;
+    combinedSeriousReoffendingPredictor?: Predictor;
 }
 
-interface OgpScoreDto {
-    ogpStaticWeightedScore: number;
-    ogpDynamicWeightedScore: number;
-    ogpTotalWeightedScore: number;
-    ogp1Year: number;
-    ogp2Year: number;
-    ogpRisk: `${BandLevel}`;
-}
-
-declare enum RsrScoreSourceDto {
-    OASYS = "OASYS"
-}
-
-interface RsrScoreDto {
-    percentageScore: number;
-    staticOrDynamic: `${StaticOrDynamic}`;
-    source: `${RsrScoreSourceDto}`;
-    algorithmVersion: string;
-    scoreLevel: `${BandLevel}`;
-}
-
-interface OspScoreDto {
-    ospIndecentPercentageScore: number;
-    ospContactPercentageScore: number;
-    ospIndecentScoreLevel: `${BandLevel}`;
-    ospContactScoreLevel: `${BandLevel}`;
-}
-
-interface AllPredictorDto {
-    allReoffendingPredictor?: StaticOrDynamicPredictorDto;
-    violentReoffendingPredictor?: StaticOrDynamicPredictorDto;
-    seriousViolentReoffendingPredictor?: StaticOrDynamicPredictorDto;
-    directContactSexualReoffendingPredictor?: BasePredictorDto;
-    indirectImageContactSexualReoffendingPredictor?: BasePredictorDto;
-    combinedSeriousReoffendingPredictor?: VersionedStaticOrDynamicPredictorDto;
-    groupReconvictionScore?: OgrScoreDto;
-    violencePredictorScore?: OvpScoreDto;
-    generalPredictorScore?: OgpScoreDto;
-    riskOfSeriousRecidivismScore?: RsrScoreDto;
-    sexualPredictorScore?: OspScoreDto;
-}
-
-interface AllPredictorVersionedDto {
-    completedDate: string;
-    status: `${AssessmentStatusDto}`;
-    outputVersion: string;
-    output?: AllPredictorDto;
-}
+type Assessments = AssessmentV1 | AssessmentV2;
 
 interface RiskData {
-    badges: BadgeEntry[];
-    raw: AllPredictorVersionedDto[];
+    assessments: Assessments[];
 }
 
 declare class ArnsComponents {
@@ -123,4 +48,4 @@ declare class ArnsComponents {
 }
 
 export { ArnsComponents };
-export type { ArnsComponentsConfig, BadgeData, BadgeEntry, RiskData };
+export type { ArnsComponentsConfig, Assessments, RiskData };

package/dist/index.esm.js

@@ -1,171 +1,62 @@
 import { RestClient } from '@ministryofjustice/hmpps-rest-client';
 
-function transformBadgeData(dto) {
-    const badgeEntries = [];
-    dto.forEach(listEntry => {
-        if (listEntry.outputVersion === '1') {
-            const ogrs3 = listEntry.output.groupReconvictionScore;
-            const ovp = listEntry.output.violencePredictorScore;
-            const ogp = listEntry.output.generalPredictorScore;
-            const rsr = listEntry.output.riskOfSeriousRecidivismScore;
-            const osp = listEntry.output.sexualPredictorScore;
-            if (ogrs3) {
-                const entry = {
-                    ogrs3PredictorScore: {
-                        level: ogrs3.scoreLevel,
-                        score: ogrs3.twoYears,
-                        type: 'OGRS3',
-                        staticOrDynamic: null,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (ovp) {
-                const entry = {
-                    ovpPredictorScore: {
-                        level: ovp.ovpRisk,
-                        score: ovp.twoYears,
-                        type: 'OVP',
-                        staticOrDynamic: null,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (ogp) {
-                const entry = {
-                    ogpPredictorScore: {
-                        level: ogp.ogpRisk,
-                        score: ogp.ogp2Year,
-                        type: 'OGP',
-                        staticOrDynamic: null,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (rsr) {
-                const entry = {
-                    rsrPredictorScore: {
-                        level: rsr.scoreLevel,
-                        score: rsr.percentageScore,
-                        type: 'RSR',
-                        staticOrDynamic: rsr.staticOrDynamic,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (osp) {
-                const entry = {
-                    ospdcPredictorScore: {
-                        level: osp.ospIndecentScoreLevel,
-                        score: osp.ospIndecentPercentageScore,
-                        type: 'OSP/DC',
-                        staticOrDynamic: null,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (osp) {
-                const entry = {
-                    ospiicPredictorScore: {
-                        level: osp.ospIndecentScoreLevel,
-                        score: osp.ospIndecentPercentageScore,
-                        type: 'OSP/IIC',
-                        staticOrDynamic: null,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
+function transformAllPredictorVersionedDtoToAssessments(dtos) {
+    // Sort DTOs by datetime (newest first)
+    const sortedDtos = [...dtos].sort((a, b) => {
+        return new Date(b.completedDate).getTime() - new Date(a.completedDate).getTime();
+    });
+    return sortedDtos.map(dto => {
+        const completedDate = dto.completedDate.toString();
+        const date = new Date(completedDate);
+        const dateFormatDayMonthYear = new Intl.DateTimeFormat('en-GB', {
+            day: '2-digit',
+            month: 'long',
+            year: 'numeric',
+        }).format(date);
+        const time = date.toLocaleTimeString('en-GB', {
+            hour: '2-digit',
+            minute: '2-digit',
+            hour12: false,
+        });
+        const dateFormatDayMonthYearTime = `${dateFormatDayMonthYear} at ${time}`;
+        const { output } = dto;
+        if (dto.outputVersion === '1') {
+            return {
+                outputVersion: '1',
+                completedDateTime: dateFormatDayMonthYearTime,
+                ogrs3: mapPredictor('OGRS', output.groupReconvictionScore.scoreLevel, null, output.groupReconvictionScore.twoYears, dateFormatDayMonthYear),
+                ovp: mapPredictor('OVP', output.violencePredictorScore.ovpRisk, null, output.violencePredictorScore.twoYears, dateFormatDayMonthYear),
+                ogp: mapPredictor('OGP', output.generalPredictorScore.ogpRisk, null, output.generalPredictorScore.ogp2Year, dateFormatDayMonthYear),
+                rsr: mapPredictor('RSR', output.riskOfSeriousRecidivismScore.scoreLevel, output.riskOfSeriousRecidivismScore.staticOrDynamic, output.riskOfSeriousRecidivismScore.percentageScore, dateFormatDayMonthYear),
+                ospdc: mapPredictor('OSP-DC', output.sexualPredictorScore.ospContactScoreLevel, null, output.sexualPredictorScore.ospContactPercentageScore, dateFormatDayMonthYear),
+                ospiic: mapPredictor('OSP-IIC', output.sexualPredictorScore.ospIndecentScoreLevel, null, output.sexualPredictorScore.ospIndecentPercentageScore, dateFormatDayMonthYear),
+            };
         }
-        else if (listEntry.outputVersion === '2') {
-            const ogrs4 = listEntry.output.allReoffendingPredictor;
-            const ovp2 = listEntry.output.violentReoffendingPredictor;
-            const snsv = listEntry.output.seriousViolentReoffendingPredictor;
-            const ospdc = listEntry.output.directContactSexualReoffendingPredictor;
-            const ospiic = listEntry.output.indirectImageContactSexualReoffendingPredictor;
-            const rsr = listEntry.output.combinedSeriousReoffendingPredictor;
-            if (ogrs4) {
-                const entry = {
-                    allReoffendingPredictor: {
-                        level: ogrs4.band,
-                        score: ogrs4.score,
-                        type: 'All reoffending predictor',
-                        staticOrDynamic: ogrs4.staticOrDynamic,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (ovp2) {
-                const entry = {
-                    violentReoffendingPredictor: {
-                        level: ovp2.band,
-                        score: ovp2.score,
-                        type: 'Violent reoffending predictor',
-                        staticOrDynamic: ovp2.staticOrDynamic,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (snsv) {
-                const entry = {
-                    seriousViolentReoffendingPredictor: {
-                        level: snsv.band,
-                        score: snsv.score,
-                        type: 'Serious violent reoffending predictor',
-                        staticOrDynamic: snsv.staticOrDynamic,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (ospdc) {
-                const entry = {
-                    directContactSexualReoffendingPredictor: {
-                        level: ospdc.band,
-                        score: ospdc.score,
-                        type: 'Direct contact sexual reoffending predictor',
-                        staticOrDynamic: null,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (ospiic) {
-                const entry = {
-                    indirectImageContactSexualReoffendingPredictor: {
-                        level: ospiic.band,
-                        score: ospiic.score,
-                        type: 'Indirect image contact sexual reoffending predictor',
-                        staticOrDynamic: null,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
-            if (rsr) {
-                const entry = {
-                    combinedSeriousReoffendingPredictor: {
-                        level: rsr.band,
-                        score: rsr.score,
-                        type: 'Combined serious reoffending predictor',
-                        staticOrDynamic: rsr.staticOrDynamic,
-                        completedDate: listEntry.completedDate.toString(),
-                    },
-                };
-                badgeEntries.push(entry);
-            }
+        if (dto.outputVersion === '2') {
+            return {
+                outputVersion: '2',
+                completedDateTime: dateFormatDayMonthYearTime,
+                allReoffendingPredictor: mapPredictor('All Reoffending Predictor', output.allReoffendingPredictor.band, output.allReoffendingPredictor.staticOrDynamic, output.allReoffendingPredictor.score, dateFormatDayMonthYear),
+                violentReoffendingPredictor: mapPredictor('Violent Reoffending Predictor', output.violentReoffendingPredictor.band, output.violentReoffendingPredictor.staticOrDynamic, output.violentReoffendingPredictor.score, dateFormatDayMonthYear),
+                seriousViolentReoffendingPredictor: mapPredictor('Serious Violent Reoffending Predictor', output.seriousViolentReoffendingPredictor.band, output.seriousViolentReoffendingPredictor.staticOrDynamic, output.seriousViolentReoffendingPredictor.score, dateFormatDayMonthYear),
+                directContactSexualReoffendingPredictor: mapPredictor('Direct Contact - Sexual Reoffending Predictor', output.directContactSexualReoffendingPredictor.band, null, output.directContactSexualReoffendingPredictor.score, dateFormatDayMonthYear),
+                indirectImageContactSexualReoffendingPredictor: mapPredictor('Images and Indirect Contact – Sexual Reoffending Predictor', output.indirectImageContactSexualReoffendingPredictor.band, null, output.indirectImageContactSexualReoffendingPredictor.score, dateFormatDayMonthYear),
+                combinedSeriousReoffendingPredictor: mapPredictor('Combined Serious Reoffending Predictor', output.combinedSeriousReoffendingPredictor.band, output.combinedSeriousReoffendingPredictor.staticOrDynamic, output.combinedSeriousReoffendingPredictor.score, dateFormatDayMonthYear),
+            };
         }
-        else
-            throw new Error('unexpected version');
+        throw new Error(`Unsupported output version: ${dto.outputVersion}`);
     });
-    return badgeEntries;
+}
+function mapPredictor(name, band, staticOrDynamic, score, date) {
+    return {
+        name,
+        band: band.replace(/_/g, ' ').toUpperCase(),
+        staticOrDynamic: staticOrDynamic
+            ? staticOrDynamic.charAt(0).toUpperCase() + staticOrDynamic.slice(1).toLowerCase()
+            : null,
+        score,
+        completedDate: date,
+    };
 }
 
 class ArnsComponents {
@@ -175,8 +66,7 @@ class ArnsComponents {
     async getRiskData(authOptions, identifierType, identifierValue) {
         const response = await this.restClient.get({ path: `/risks/predictors/all/${identifierType}/${identifierValue}` }, authOptions);
         return {
-            badges: transformBadgeData(response),
-            raw: response,
+            assessments: transformAllPredictorVersionedDtoToAssessments(response),
         };
     }
 }

package/dist/index.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.esm.js","sources":["../src/components/badge/transformation.ts","../src/ArnsComponents.ts"],"sourcesContent":[null,null],"names":[],"mappings":"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"}
+{"version":3,"file":"index.esm.js","sources":["../src/transformers/AllPredictorVersionedDtoToAssessmentsTransformer.ts","../src/ArnsComponents.ts"],"sourcesContent":[null,null],"names":[],"mappings":"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"}

package/dist/transformers/AllPredictorVersionedDtoToAssessmentsTransformer.d.ts

@@ -0,0 +1,3 @@
+import { AllPredictorVersionedDto } from '../types/dtos/AllPredictorVersionedDto';
+import { Assessments } from '../types/Assessments';
+export declare function transformAllPredictorVersionedDtoToAssessments(dtos: AllPredictorVersionedDto[]): Assessments[];

package/dist/types/AssessmentV1.d.ts

@@ -0,0 +1,11 @@
+import { Predictor } from './Predictor';
+export interface AssessmentV1 {
+    outputVersion: '1';
+    completedDateTime: string;
+    ogrs3?: Predictor;
+    ovp?: Predictor;
+    ogp?: Predictor;
+    rsr: Predictor;
+    ospdc: Predictor;
+    ospiic: Predictor;
+}

package/dist/types/AssessmentV2.d.ts

@@ -0,0 +1,11 @@
+import { Predictor } from './Predictor';
+export interface AssessmentV2 {
+    outputVersion: '2';
+    completedDateTime: string;
+    allReoffendingPredictor?: Predictor;
+    violentReoffendingPredictor?: Predictor;
+    seriousViolentReoffendingPredictor?: Predictor;
+    directContactSexualReoffendingPredictor?: Predictor;
+    indirectImageContactSexualReoffendingPredictor?: Predictor;
+    combinedSeriousReoffendingPredictor?: Predictor;
+}

package/dist/types/Assessments.d.ts

@@ -0,0 +1,3 @@
+import { AssessmentV1 } from './AssessmentV1';
+import { AssessmentV2 } from './AssessmentV2';
+export type Assessments = AssessmentV1 | AssessmentV2;

package/dist/types/Predictor.d.ts

@@ -0,0 +1,7 @@
+export interface Predictor {
+    name: string;
+    band: string;
+    staticOrDynamic?: string;
+    score?: number;
+    completedDate: string;
+}

package/dist/types/RiskData.d.ts

@@ -1,6 +1,4 @@
-import { BadgeEntry } from './badgeData';
-import { AllPredictorVersionedDto } from './dtos/allPredictorVersionedDto';
+import { Assessments } from './Assessments';
 export interface RiskData {
-    badges: BadgeEntry[];
-    raw: AllPredictorVersionedDto[];
+    assessments: Assessments[];
 }

package/dist/types/dtos/{allPredictorDto.d.ts → AllPredictorDto.d.ts}

@@ -1,11 +1,11 @@
-import { BasePredictorDto } from './basePredictorDto';
-import { StaticOrDynamicPredictorDto } from './staticOrDynamicPredictorDto';
-import { VersionedStaticOrDynamicPredictorDto } from './versionedStaticOrDynamicPredictorDto';
-import { OgrScoreDto } from './ogrScoreDto';
-import { OvpScoreDto } from './ovpScoreDto';
-import { OgpScoreDto } from './ogpScoreDto';
-import { RsrScoreDto } from './rsrScoreDto';
-import { OspScoreDto } from './ospScoreDto';
+import { BasePredictorDto } from './BasePredictorDto';
+import { StaticOrDynamicPredictorDto } from './StaticOrDynamicPredictorDto';
+import { VersionedStaticOrDynamicPredictorDto } from './VersionedStaticOrDynamicPredictorDto';
+import { OgrScoreDto } from './OgrScoreDto';
+import { OvpScoreDto } from './OvpScoreDto';
+import { OgpScoreDto } from './OgpScoreDto';
+import { RsrScoreDto } from './RsrScoreDto';
+import { OspScoreDto } from './OspScoreDto';
 export interface AllPredictorDto {
     allReoffendingPredictor?: StaticOrDynamicPredictorDto;
     violentReoffendingPredictor?: StaticOrDynamicPredictorDto;

package/dist/types/dtos/{allPredictorVersionedDto.d.ts → AllPredictorVersionedDto.d.ts}

@@ -1,5 +1,5 @@
-import { AssessmentStatusDto } from './assessmentStatusDto';
-import { AllPredictorDto } from './allPredictorDto';
+import { AssessmentStatusDto } from './AssessmentStatusDto';
+import { AllPredictorDto } from './AllPredictorDto';
 export interface AllPredictorVersionedDto {
     completedDate: string;
     status: `${AssessmentStatusDto}`;

package/dist/types/dtos/{basePredictorDto.d.ts → BasePredictorDto.d.ts}

@@ -1,4 +1,4 @@
-import { BandLevel } from '../bandLevel';
+import { BandLevel } from './BandLevel';
 export interface BasePredictorDto {
     score: number;
     band: `${BandLevel}`;

package/dist/types/dtos/{ogpScoreDto.d.ts → OgpScoreDto.d.ts}

@@ -1,4 +1,4 @@
-import { BandLevel } from '../bandLevel';
+import { BandLevel } from './BandLevel';
 export interface OgpScoreDto {
     ogpStaticWeightedScore: number;
     ogpDynamicWeightedScore: number;

package/dist/types/dtos/{ogrScoreDto.d.ts → OgrScoreDto.d.ts}

@@ -1,4 +1,4 @@
-import { BandLevel } from '../bandLevel';
+import { BandLevel } from './BandLevel';
 export interface OgrScoreDto {
     oneYear: number;
     twoYears: number;

package/dist/types/dtos/{ospScoreDto.d.ts → OspScoreDto.d.ts}

@@ -1,4 +1,4 @@
-import { BandLevel } from '../bandLevel';
+import { BandLevel } from './BandLevel';
 export interface OspScoreDto {
     ospIndecentPercentageScore: number;
     ospContactPercentageScore: number;

package/dist/types/dtos/{ovpScoreDto.d.ts → OvpScoreDto.d.ts}

@@ -1,4 +1,4 @@
-import { BandLevel } from '../bandLevel';
+import { BandLevel } from './BandLevel';
 export interface OvpScoreDto {
     ovpStaticWeightedScore: number;
     ovpDynamicWeightedScore: number;

package/dist/types/dtos/{rsrScoreDto.d.ts → RsrScoreDto.d.ts}

@@ -1,6 +1,6 @@
-import { StaticOrDynamic } from '../staticOrDynamic';
-import { BandLevel } from '../bandLevel';
-import { RsrScoreSourceDto } from './rsrScoreSourceDto';
+import { StaticOrDynamic } from './StaticOrDynamic';
+import { BandLevel } from './BandLevel';
+import { RsrScoreSourceDto } from './RsrScoreSourceDto';
 export interface RsrScoreDto {
     percentageScore: number;
     staticOrDynamic: `${StaticOrDynamic}`;

package/dist/types/dtos/{staticOrDynamicPredictorDto.d.ts → StaticOrDynamicPredictorDto.d.ts}

@@ -1,5 +1,5 @@
-import { StaticOrDynamic } from '../staticOrDynamic';
-import { BasePredictorDto } from './basePredictorDto';
+import { StaticOrDynamic } from './StaticOrDynamic';
+import { BasePredictorDto } from './BasePredictorDto';
 export interface StaticOrDynamicPredictorDto extends BasePredictorDto {
     staticOrDynamic: `${StaticOrDynamic}`;
 }

package/dist/types/dtos/{versionedStaticOrDynamicPredictorDto.d.ts → VersionedStaticOrDynamicPredictorDto.d.ts}

@@ -1,4 +1,4 @@
-import { StaticOrDynamicPredictorDto } from './staticOrDynamicPredictorDto';
+import { StaticOrDynamicPredictorDto } from './StaticOrDynamicPredictorDto';
 export interface VersionedStaticOrDynamicPredictorDto extends StaticOrDynamicPredictorDto {
     algorithmVersion: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ministryofjustice/hmpps-arns-frontend-components-lib",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "ARNS front-end library for risk score visualisations",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",

package/dist/components/badge/transformation.d.ts

@@ -1,3 +0,0 @@
-import { AllPredictorVersionedDto } from '../../types/dtos/allPredictorVersionedDto';
-import { BadgeEntry } from '../../types/badgeData';
-export declare function transformBadgeData(dto: AllPredictorVersionedDto[]): BadgeEntry[];

package/dist/types/badgeData.d.ts

@@ -1,12 +0,0 @@
-import { StaticOrDynamic } from './staticOrDynamic';
-import { BandLevel } from './bandLevel';
-export interface BadgeData {
-    level: `${BandLevel}`;
-    score: number;
-    type: string;
-    staticOrDynamic: `${StaticOrDynamic}`;
-    completedDate: string;
-}
-export interface BadgeEntry {
-    [key: string]: BadgeData;
-}