@star-insure/sdk 3.3.1 → 4.0.0

package/package.json

@@ -2,7 +2,7 @@
     "name": "@star-insure/sdk",
     "description": "The SDK for Star Insure client apps with shared helper functions and TypeScript definitions.",
     "author": "alexclark_nz",
-    "version": "3.3.1",
+    "version": "4.0.0",
     "license": "MIT",
     "repository": {
         "type": "git",

package/src/components/common/Toasts.tsx

@@ -7,7 +7,7 @@ export default function Toasts() {
     const { toasts } = useToast();
 
     return (
-        <div className="fixed bottom-4 right-4 z-[110] flex flex-col gap-6">
+        <div className="fixed bottom-4 right-4 z-[120] flex flex-col gap-6">
             {toasts.map((toast: Toast) => (
                 <ToastItem {...toast} key={toast._id} />
             ))}

package/src/components/tables/TableRow.tsx

@@ -4,14 +4,14 @@ import cn from 'classnames';
 interface Props extends React.DetailedHTMLProps<React.HTMLAttributes<HTMLTableRowElement>, HTMLTableRowElement> {
     children: React.ReactNode;
     className?: string;
-    onClick?: () => void;
+    onClick?: (e?: React.SyntheticEvent) => void;
 }
 
 export default function TableRow({ children, className = '', onClick = () => {}, ...props }: Props) {
     const bgClass = className.includes('bg') ? '' : 'bg-white even:bg-gray-50'
 
     return (
-        <tr {...props} className={cn(className, bgClass, 'hover:bg-gray-100')} onClick={onClick}>
+        <tr {...props} className={cn(className, bgClass, 'hover:bg-gray-100')} onClick={(e) => onClick(e)}>
             {children}
         </tr>
     )

package/src/lib/dates.ts

@@ -1,30 +1,111 @@
 import { format, parse } from "date-fns";
 
-export function parseDate(dateString: string): Date {
-    // Make sure we've only got 10 characters
-    return parse(dateString.substring(0, 10), 'yyyy-MM-dd', new Date());
+/**
+ * Formats a date like "Jan 1, 2022 at 9:50am"
+ */
+export function formatDateNice(date: string|null|undefined, includeTime: boolean = true) {
+    const formatString = includeTime ? "MMM d, yyyy 'at' h:mma" : 'MMM d, yyyy';
+    const formatFunc = includeTime ? formatDateTime : formatDate;
+
+    return formatFunc(date, formatString);
 }
 
-export function parseDateTime(dateTimeString: string): Date {
-    return parse(dateTimeString, 'yyyy-MM-dd HH:mm:ss', new Date());
+/**
+ * Formats a date like "01/01/2022 09:50"
+ */
+export function formatDateForTable(date: string|null|undefined, includeTime: boolean = true) {
+    return includeTime ? formatDateTime(date) : formatDate(date);
 }
 
 /**
- * Formats a date like "Jan 1, 2022 at 9:50am"
+ * Formats a date to Star Insure standard format - dd/mm/yyyy
  */
-export function formatDateNice(date: string, includeTime: boolean = true) {
-    const formatString = includeTime ? "MMM d, yyyy 'at' h:mma" : 'MMM d, yyyy';
-    const parsed = includeTime ? parseDateTime(date) : parseDate(date);
+export function formatDate(date: Date|string|null|undefined, overrideFormatString?: string) {
+    // If date is undefined or null
+    if (!date) {
+        return '';
+    }
+
+    const formatString = overrideFormatString || 'dd/MM/yyyy';
+
+    // If date is a date object
+    if (date instanceof Date) {
+        return format(date, formatString);
+    }
+
+    /*
+     * If date is a string, first attempt to parse it in non-standard formats
+     * Only parse the first 10 characters of the string
+     * dd/MM/yyyy, dd-MM-yyyy, dd.MM.yyyy
+     */
+    const nonStandardDate = date
+        .substring(0, 10)
+        .split('-').join('/')
+        .split('.').join('/');
 
-    return format(parsed, formatString);
+    const parsedDate = parse(nonStandardDate, 'dd/MM/yyyy', new Date());
+    if (parsedDate.toString() !== 'Invalid Date') {
+        return format(parsedDate, formatString);
+    }
+
+    // Then attempt to parse it natively
+    const nativelyParsedDate = new Date(date);
+    if (nativelyParsedDate.toString() !== 'Invalid Date') {
+        return format(nativelyParsedDate, formatString);
+    }
+
+    return '';
 }
 
 /**
- * Formats a date like "01/01/2022 9:50AM"
+ * Formats a dateTime to Star Insure standard format - dd/mm/yyyy hh:mm
  */
-export function formatDateForTable(date: string, includeTime: boolean = true) {
-    const formatString = includeTime ? 'dd/MM/yyyy h:mma' : 'dd/MM/yyyy';
-    const parsed = includeTime ? parseDateTime(date) : parseDate(date);
+export function formatDateTime(dateTime: Date|string|null|undefined, overrideFormatString?: string) {
+    // If date is undefined or null
+    if (!dateTime) {
+        return '';
+    }
+
+    const formatString = overrideFormatString || 'dd/MM/yyyy HH:mm';
+
+    // If date is a date object
+    if (dateTime instanceof Date) {
+        return format(dateTime, formatString);
+    }
+
+    /*
+     * If date is a string, first attempt to parse it in non-standard formats
+     * dd/MM/yyyy HH:mm, dd-MM-yyyy HH:mm, dd.MM.yyyy HH:mm,
+     * dd/MM/yyyy hh:mm a, dd-MM-yyyy hh:mm a, dd.MM.yyyy hh:mm a,
+     * dd/MM/yyyy HH:mm:ss, dd-MM-yyyy HH:mm:ss, dd.MM.yyyy HH:mm:ss,
+     * dd/MM/yyyy hh:mm:ss a, dd-MM-yyyy hh:mm:ss a, dd.MM.yyyy hh:mm:ss a
+     */
+    const nonStandardDateTime = dateTime
+        // Remove commas between date and time
+        .split(',').join('')
+
+        // Only parse the first 22 characters of the string
+        .substring(0, 22)
+
+        // Replace dashes and dots with slashes
+        .split('-').join('/')
+        .split('.').join('/');
+
+    const is12Hour = ['AM', 'PM'].includes(nonStandardDateTime.slice(-2).toUpperCase());
+    const hasSeconds = nonStandardDateTime.split(':').length === 3;
+
+    const nonStandardFormat = (`dd/MM/yyyy ${is12Hour ? 'hh' : 'HH'}:mm${hasSeconds ? ':ss' : ''} ${is12Hour ? 'a' : ''}`).trim();
+
+    const parsedDateTime = parse(nonStandardDateTime, nonStandardFormat, new Date());
+    if (parsedDateTime.toString() !== 'Invalid Date') {
+        return format(parsedDateTime, formatString);
+    }
+
+    // Then attempt to parse it natively
+    const nativelyParsedDateTime = new Date(dateTime);
+    if (nativelyParsedDateTime.toString() !== 'Invalid Date') {
+        return format(nativelyParsedDateTime, formatString);
+    }
 
-    return format(parsed, formatString);
+    return '';
 }

package/src/lib/money.ts

@@ -52,7 +52,7 @@ export function gstCalc(input: number|string): {
 /**
  * Formats a value nicely
  */
- export function formatMoney(value: string|number, decimals: number = 2): string {
+ export function formatMoneyNumerals(value: string|number, decimals: number = 2): string {
     let toFormat = value;
     if (typeof value === 'string') {
         toFormat = value.replace(/[^\d.-]/g, '')
@@ -64,6 +64,20 @@ export function gstCalc(input: number|string): {
     });
 }
 
+/**
+ * Formats a value nicely
+ */
+export function formatMoney(value: string|number|null|undefined, decimals: number = 2): string {
+    if (value === null || value === undefined) {
+        return '';
+    }
+
+    return `$${formatMoneyNumerals(value, decimals)}`
+
+        // If the value is negative, we need to move the negative sign to the front
+        .replace('$-', '- $');
+}
+
 /**
  * Turns a formatted value in to a float
  */