@hmcts/opal-frontend-common 0.0.102 → 0.0.104

package/fesm2022/hmcts-opal-frontend-common-components-moj-moj-sortable-table.mjs

@@ -87,11 +87,11 @@ class MojSortableTableHeaderComponent {
         });
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.20", ngImport: i0, type: MojSortableTableHeaderComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "21.2.20", type: MojSortableTableHeaderComponent, isStandalone: true, selector: "opal-lib-moj-sortable-table-header, [opal-lib-moj-sortable-table-header]", inputs: { columnKey: "columnKey", sortDirection: "sortDirection", dataIndex: "dataIndex" }, outputs: { sortChange: "sortChange" }, host: { properties: { "attr.aria-sort": "this.ariaSort", "attr.scope": "this.hostScope", "class": "this.hostClass" } }, ngImport: i0, template: "<button type=\"button\" (click)=\"toggleSort()\" [attr.data-index]=\"dataIndex\">\n  <ng-content></ng-content>\n  <svg\n    [opalLibMojSortableTableHeaderSortIcon]=\"sortDirection\"\n    width=\"22\"\n    height=\"22\"\n    focusable=\"false\"\n    aria-hidden=\"true\"\n    role=\"img\"\n    vviewBox=\"0 0 22 22\"\n  ></svg>\n</button>\n", dependencies: [{ kind: "directive", type: MojSortableTableHeaderSortIconDirective, selector: "[opalLibMojSortableTableHeaderSortIcon]", inputs: ["opalLibMojSortableTableHeaderSortIcon"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "21.2.20", type: MojSortableTableHeaderComponent, isStandalone: true, selector: "opal-lib-moj-sortable-table-header, [opal-lib-moj-sortable-table-header]", inputs: { columnKey: "columnKey", sortDirection: "sortDirection", dataIndex: "dataIndex" }, outputs: { sortChange: "sortChange" }, host: { properties: { "attr.aria-sort": "this.ariaSort", "attr.scope": "this.hostScope", "class": "this.hostClass" } }, ngImport: i0, template: "<button type=\"button\" (click)=\"toggleSort()\" [attr.data-index]=\"dataIndex\">\n  <ng-content></ng-content>\n  <svg\n    [opalLibMojSortableTableHeaderSortIcon]=\"sortDirection\"\n    width=\"22\"\n    height=\"22\"\n    focusable=\"false\"\n    aria-hidden=\"true\"\n    role=\"img\"\n    viewBox=\"0 0 22 22\"\n  ></svg>\n</button>\n", dependencies: [{ kind: "directive", type: MojSortableTableHeaderSortIconDirective, selector: "[opalLibMojSortableTableHeaderSortIcon]", inputs: ["opalLibMojSortableTableHeaderSortIcon"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.20", ngImport: i0, type: MojSortableTableHeaderComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'opal-lib-moj-sortable-table-header, [opal-lib-moj-sortable-table-header]', changeDetection: ChangeDetectionStrategy.OnPush, imports: [MojSortableTableHeaderSortIconDirective], template: "<button type=\"button\" (click)=\"toggleSort()\" [attr.data-index]=\"dataIndex\">\n  <ng-content></ng-content>\n  <svg\n    [opalLibMojSortableTableHeaderSortIcon]=\"sortDirection\"\n    width=\"22\"\n    height=\"22\"\n    focusable=\"false\"\n    aria-hidden=\"true\"\n    role=\"img\"\n    vviewBox=\"0 0 22 22\"\n  ></svg>\n</button>\n" }]
+            args: [{ selector: 'opal-lib-moj-sortable-table-header, [opal-lib-moj-sortable-table-header]', changeDetection: ChangeDetectionStrategy.OnPush, imports: [MojSortableTableHeaderSortIconDirective], template: "<button type=\"button\" (click)=\"toggleSort()\" [attr.data-index]=\"dataIndex\">\n  <ng-content></ng-content>\n  <svg\n    [opalLibMojSortableTableHeaderSortIcon]=\"sortDirection\"\n    width=\"22\"\n    height=\"22\"\n    focusable=\"false\"\n    aria-hidden=\"true\"\n    role=\"img\"\n    viewBox=\"0 0 22 22\"\n  ></svg>\n</button>\n" }]
         }], propDecorators: { columnKey: [{
                 type: Input
             }], sortDirection: [{

package/fesm2022/hmcts-opal-frontend-common-services-utils-service.mjs

@@ -1,7 +1,10 @@
-import { DOCUMENT, ViewportScroller } from '@angular/common';
+import { DOCUMENT, ViewportScroller, formatCurrency } from '@angular/common';
 import * as i0 from '@angular/core';
 import { inject, Injectable } from '@angular/core';
 
+// Matches decimal strings with an optional leading minus and either no commas or correctly grouped thousands.
+// The optional decimal point may have no fractional digits to preserve accepted values such as "1.".
+const DECIMAL_OR_GROUPED_NUMBER_PATTERN = /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d*)?$/;
 class UtilsService {
     document = inject(DOCUMENT);
     viewportScroller = inject(ViewportScroller);
@@ -22,20 +25,24 @@ class UtilsService {
         return str.toUpperCase();
     }
     /**
-     * Converts a number to a monetary string representation.
-     * @param amount - The number to convert.
-     * @returns The monetary string representation of the number.
+     * Converts a finite number or decimal string to a GBP monetary string.
+     * String values may use a leading minus, correctly positioned thousands separators, and surrounding whitespace.
+     * @param amount - The numeric value to convert.
+     * @returns The formatted monetary value, or an empty string when the input is invalid.
      */
     convertToMonetaryString(amount) {
-        let negativeValue = false;
         if (typeof amount === 'string') {
-            amount = Number.parseFloat(amount);
+            const trimmedAmount = amount.trim();
+            if (!DECIMAL_OR_GROUPED_NUMBER_PATTERN.test(trimmedAmount)) {
+                return '';
+            }
+            amount = Number(trimmedAmount.replaceAll(',', ''));
         }
-        if (amount < 0) {
-            negativeValue = true;
-            amount = Math.abs(amount);
+        if (!Number.isFinite(amount)) {
+            return '';
         }
-        return `${negativeValue ? '-' : ''}£${amount.toFixed(2)}`;
+        const normalizedAmount = amount === 0 ? 0 : amount;
+        return formatCurrency(normalizedAmount, 'en-GB', '£', 'GBP', '1.2-2');
     }
     /**
      * Formats a 6-digit number or string as a sort code.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/opal-frontend-common",
-  "version": "0.0.102",
+  "version": "0.0.104",
   "license": "MIT",
   "repository": {
     "type": "git",

package/types/hmcts-opal-frontend-common-services-utils-service.d.ts

@@ -16,9 +16,10 @@ declare class UtilsService {
      */
     upperCaseAllLetters(str: string): string;
     /**
-     * Converts a number to a monetary string representation.
-     * @param amount - The number to convert.
-     * @returns The monetary string representation of the number.
+     * Converts a finite number or decimal string to a GBP monetary string.
+     * String values may use a leading minus, correctly positioned thousands separators, and surrounding whitespace.
+     * @param amount - The numeric value to convert.
+     * @returns The formatted monetary value, or an empty string when the input is invalid.
      */
     convertToMonetaryString(amount: number | string): string;
     /**