chore: merge develop

Author: Jon Waldstein

src/API/REST/V3/Routes/Campaigns/GetCampaignRevenue.php

@@ -210,7 +210,7 @@ public function mapResultsByDate(array $results, string $groupBy): array
     }
 
     /**
-     * @since unreleased
+     * @since 4.10.0
      */
     public function getSchema(): array
     {

src/API/REST/V3/Routes/Donors/DonorController.php

@@ -449,6 +449,26 @@ public function get_item_schema(): array
                         ],
                     ],
                 ],
+                'customFields' => [
+                    'type' => 'array',
+                    'readonly' => true,
+                    'description' => esc_html__('Custom fields (sensitive data)', 'give'),
+                    'items' => [
+                        'type' => 'object',
+                        'properties' => [
+                            'label' => [
+                                'type' => 'string',
+                                'description' => esc_html__('Field label', 'give'),
+                                'format' => 'text-field',
+                            ],
+                            'value' => [
+                                'type' => 'string',
+                                'description' => esc_html__('Field value', 'give'),
+                                'format' => 'text-field',
+                            ],
+                        ],
+                    ],
+                ],
             ],
         ];
 

src/Admin/ajv.ts

@@ -1,7 +1,7 @@
 import {__, sprintf} from '@wordpress/i18n';
 import {JSONSchemaType} from 'ajv';
-import addFormats from 'ajv-formats';
 import addErrors from 'ajv-errors';
+import addFormats from 'ajv-formats';
 
 /**
  * Create an AJV resolver for react-hook-form with WordPress REST API schema
@@ -15,6 +15,7 @@ import addErrors from 'ajv-errors';
  * Key advantage: WordPress REST API supports most JSON Schema Draft 4 features but lacks
  * some advanced features (if/then/else, allOf, not) that AJV can provide for enhanced frontend validation.
  *
+ * @since 4.10.0 Refactor transformWordPressSchemaToDraft7 to handle readonly/readOnly fields and conditionally remove enum from nullable fields when value is null to prevent AJV conflicts
  * @since 4.9.0
  *
  * @param schema - The JSON Schema from WordPress REST API
@@ -30,7 +31,7 @@ export function ajvResolver(schema: JSONSchemaType<any>) {
 
             const transformedData = transformFormDataForValidation(data, schema);
             const ajv = configureAjvForWordPress();
-            const transformedSchema = transformWordPressSchemaToDraft7(schema);
+            const transformedSchema = transformWordPressSchemaToDraft7(schema, data);
             const validate = ajv.compile(transformedSchema);
             const valid = validate(transformedData);
 
@@ -64,7 +65,6 @@ export function ajvResolver(schema: JSONSchemaType<any>) {
     };
 }
 
-
 /**
  * Configure standard AJV (Draft 7/2019-09) for WordPress REST API compatibility
  *
@@ -143,6 +143,8 @@ function configureAjvForWordPress() {
     // Add WordPress-specific custom formats that are not in the standard
     ajv.addFormat('text-field', true); // WordPress custom format - no validation, only sanitization
     ajv.addFormat('textarea-field', true); // WordPress custom format - no validation, only sanitization
+    ajv.addFormat('integer', true); // WordPress custom format - no validation, only sanitization
+    ajv.addFormat('boolean', true); // WordPress custom format - no validation, only sanitization
 
     // Transform WordPress schemas to be compatible with Draft 7/2019-09
     // This converts Draft 03/04 syntax (required: true on properties) to Draft 7 syntax
@@ -167,13 +169,15 @@ function configureAjvForWordPress() {
  * with AJV (Draft 7/2019-09). The transformation includes:
  * - Converts 'required: true' on individual properties to 'required' array at object level
  * - Updates $schema reference from Draft 04 to Draft 7/2019-09
+ * - Removes readonly/readOnly fields from validation (they shouldn't be validated by frontend)
+ * - Conditionally removes enum from nullable fields when value is null to prevent AJV conflicts
  * - Preserves all advanced features (if/then/else, allOf, etc.) that WordPress ignores
  *   but AJV can use for enhanced frontend validation
  *
  * Key benefit: WordPress schemas can include advanced validation rules (if/then/else, allOf, not)
  * that are ignored by the backend but utilized by the frontend for better UX.
  */
-function transformWordPressSchemaToDraft7(schema: JSONSchemaType<any>): JSONSchemaType<any> {
+function transformWordPressSchemaToDraft7(schema: JSONSchemaType<any>, data?: any): JSONSchemaType<any> {
     if (!schema || typeof schema !== 'object') {
         return schema;
     }
@@ -191,15 +195,36 @@ function transformWordPressSchemaToDraft7(schema: JSONSchemaType<any>): JSONSche
 
         Object.keys(transformed.properties).forEach((key) => {
             const prop = transformed.properties[key];
-            if (prop && typeof prop === 'object' && prop.required === true) {
+
+            // Early return if prop is not a valid object
+            if (!prop || typeof prop !== 'object') {
+                return;
+            }
+
+            // Converts 'required: true' on individual properties to 'required' array at object level
+            if (prop.required === true) {
                 requiredFields.push(key);
                 delete prop.required;
             }
 
-            // Add custom error messages for each property
-            if (prop && typeof prop === 'object') {
-                errorMessages[key] = getCustomErrorMessage(prop, key);
+            // Remove readonly/readOnly fields from validation (they shouldn't be validated by frontend)
+            if (prop.readonly === true || prop.readOnly === true) {
+                delete transformed.properties[key];
+                return;
             }
+
+            // For WordPress Array type + enum (like honorific), conditionally remove enum based on current value
+            // This prevents AJV conflicts when nullable fields have null values
+            if (Array.isArray(prop.type) && prop.enum) {
+                const currentValue = data && data[key];
+                const allowsNull = prop.type.includes('null');
+                if (currentValue === null && allowsNull) {
+                    delete prop.enum;
+                }
+            }
+
+            // Add custom error messages for each property
+            errorMessages[key] = getCustomErrorMessage(prop, key);
         });
 
         if (requiredFields.length > 0) {
@@ -293,7 +318,6 @@ function getCustomErrorMessage(prop: any, fieldName: string): string {
     return sprintf(__('%s is invalid.', 'give'), fieldName);
 }
 
-
 /**
  * Transform form data to be compatible with JSON Schema validation
  *
@@ -515,4 +539,3 @@ function transformOneOfValue(value: any, oneOfSchemas: any[]): any {
     // Fallback: return null
     return null;
 }
-

src/Admin/common/amountFormatter.ts

@@ -0,0 +1,13 @@
+/**
+ * @since 4.0.0
+ */
+export function amountFormatter(
+    currency: Intl.NumberFormatOptions['currency'],
+    options?: Intl.NumberFormatOptions
+): Intl.NumberFormat {
+    return new Intl.NumberFormat(navigator.language, {
+        style: 'currency',
+        currency: currency,
+        ...options,
+    });
+}

src/Admin/common/formatTimestamp.ts

@@ -0,0 +1,40 @@
+/**
+ * @since 4.10.0
+ */
+export function formatTimestamp(timestamp: string | null | undefined, useComma: boolean = false): string {
+    // Handle null, undefined, or empty string
+    if (!timestamp) {
+        return '—';
+    }
+
+    const date = new Date(timestamp);
+
+    // Check if the date is valid
+    if (isNaN(date.getTime())) {
+        return '—';
+    }
+
+    const day = date.getDate();
+    const ordinal = (day: number): string => {
+        if (day > 3 && day < 21) return 'th';
+        switch (day % 10) {
+            case 1:
+                return 'st';
+            case 2:
+                return 'nd';
+            case 3:
+                return 'rd';
+            default:
+                return 'th';
+        }
+    };
+
+    const dayWithOrdinal = `${day}${ordinal(day)}`;
+    const month = date.toLocaleString('en-US', {month: 'long'});
+    const year = date.getFullYear();
+    const time = date.toLocaleString('en-US', {hour: 'numeric', minute: '2-digit', hour12: true}).toLowerCase();
+    const separator = useComma ? ', ' : ' • ';
+
+    return `${dayWithOrdinal} ${month} ${year}${separator}${time}`;
+}
+

src/Admin/common/getRelativeTimeString.ts

@@ -0,0 +1,14 @@
+import {formatDistanceToNow} from 'date-fns';
+
+/**
+ * Returns a relative time string for a given date (e.g. "Today" or "2 days ago")
+ *
+ * @since 4.10.0
+ */
+export function getRelativeTimeString(date: Date): string {
+    const now = new Date();
+    if (date.toDateString() === now.toDateString()) {
+        return 'Today';
+    }
+    return formatDistanceToNow(date, {addSuffix: true});
+}

src/Admin/common/prepareDefaultValuesFromSchema.ts

@@ -0,0 +1,48 @@
+import { SchemaProperty } from '../types';
+
+/**
+ * @since 4.10.0
+ */
+export function prepareDefaultValuesFromSchema(
+    record: Record<string, any>,
+    schemaProperties: Record<string, SchemaProperty>
+): Record<string, any> {
+    const isReadOnly = (schema: SchemaProperty): boolean => {
+        return schema?.readOnly || schema?.readonly;
+    };
+
+    const isObject = (value: any, schema: SchemaProperty): boolean => {
+        return schema?.properties &&typeof value === "object" && value !== null && !Array.isArray(value);
+    };
+
+    const isArray = (value: any, schema: SchemaProperty): boolean => {
+        return schema?.type === "array" && schema?.items && Array.isArray(value);
+    };
+
+    const processValue = (value: any, schema: SchemaProperty): any => {
+        if (isObject(value, schema)) {
+            return prepareDefaultValuesFromSchema(value, schema.properties as Record<string, SchemaProperty>);
+        }
+
+        if (isArray(value, schema)) {
+            return value.map(item =>
+                isObject(item, schema.items as SchemaProperty)
+                    ? prepareDefaultValuesFromSchema(item, (schema.items as any).properties ?? {})
+                    : item
+            );
+        }
+
+        return value;
+    };
+
+    return Object.fromEntries(
+        Object.entries(record)
+            .filter(([key]) => !isReadOnly(schemaProperties[key]))
+            .map(([key, value]) => [
+                key,
+                schemaProperties[key]
+                    ? processValue(value, schemaProperties[key])
+                    : value
+            ])
+    );
+}

src/Admin/components/Notices/index.tsx

@@ -4,18 +4,21 @@ import {__} from '@wordpress/i18n';
 import styles from './styles.module.scss';
 
 /**
+ * @since 4.10.0 Add className prop
  * @since 4.8.0
  */
 interface Props {
     type: 'info' | 'warning' | 'error';
+    className?: string;
     children: React.ReactNode;
     dismissHandleClick?: () => void;
 }
 
 /**
+ * @since 4.10.0 Add className prop
  * @since 4.8.0
  */
-export default ({type, children, dismissHandleClick}: Props) => {
+export default ({type, children, dismissHandleClick, className}: Props) => {
     const [isVisible, setIsVisible] = useState(true);
 
     const handleDismiss = () => {
@@ -29,7 +32,7 @@ export default ({type, children, dismissHandleClick}: Props) => {
         return null;
     }
 
-    const noticeClasses = `${styles.notice} ${
+    const noticeClasses = `${styles.notice} ${className} ${
         type === 'warning' ? styles.warning : type === 'error' ? styles.error : styles.info
     }`;
 

src/Admin/fields/Status/index.tsx

@@ -0,0 +1,40 @@
+import { __ } from "@wordpress/i18n";
+import cx from "classnames";
+import { AdminSectionField } from "@givewp/components/AdminDetailsPage/AdminSection";
+import Notice from "@givewp/admin/components/Notices";
+import { useFormContext, useFormState } from "react-hook-form";
+import styles from "./styles.module.scss";
+
+/**
+ * @since 4.10.0
+ */
+export default function Status({statusOptions}: {statusOptions: Record<string, string>}) {
+    const {register, watch} = useFormContext();
+    const {errors} = useFormState();
+    const {isDirty, dirtyFields} = useFormState();
+    const isStatusDirty = isDirty && dirtyFields?.status;
+    const status = watch('status');
+
+    return (
+        <AdminSectionField error={errors.status?.message as string}>
+            <label htmlFor="status">{__('Status', 'give')}</label>
+            <div className={cx(styles.statusSelect, styles[`statusSelect--${status}`])}>
+                <select id="status" className={styles.statusSelectInput} {...register('status')}>
+                    {statusOptions && (
+                        Object.entries(statusOptions).map(([value, label]) => (
+                            <option key={value} value={value}>
+                                {label as string}
+                            </option>
+                        ))
+                    )}
+                </select>
+            </div>
+
+            {isStatusDirty && (
+                <Notice type="info" className={styles.notice}>
+                    {__('This will not change the status at the gateway.', 'give')}
+                </Notice>
+            )}
+        </AdminSectionField>
+    );
+}

src/Admin/fields/Status/styles.module.scss

@@ -0,0 +1,52 @@
+
+.statusSelect {
+    --statusOptionColor: var(--givewp-grey-500);
+    position: relative;
+
+    &::before {
+        background-color: var(--statusOptionColor);
+        border-radius: 50%;
+        content: '';
+        display: inline-block;
+        height: 0.75rem;
+        left: var(--givewp-spacing-4);
+        pointer-events: none;
+        position: absolute;
+        top: 50%;
+        transform: translateY(-50%);
+        width: 0.75rem;
+    }
+
+    &--pending,
+    &--processing {
+        --statusOptionColor: var(--givewp-blue-500);
+    }
+
+    &--active,
+    &--publish {
+        --statusOptionColor: var(--givewp-green-500);
+    }
+
+    &--completed {
+        --statusOptionColor: var(--givewp-emerald-500);
+    }
+
+    &--expired,
+    &--cancelled,
+    &--failing,
+    &--failed,
+    &--cancelled,
+    &--revoked,
+    &--trashed {
+        --statusOptionColor: var(--givewp-red-500);
+    }
+
+    select.statusSelectInput {
+        padding-left: calc(var(--givewp-spacing-6) + 0.75rem);
+    }
+}
+
+.notice {
+    margin-top: var(--givewp-spacing-1);
+    transform: translateX(1px);
+}