@uportal/form-builder 2.0.0 → 2.1.1

package/src/form-builder.js

@@ -1,16 +1,12 @@
 import { LitElement, html, css } from 'lit';
-import decode from 'jwt-decode';
-
-function delay(ms) {
-  return new Promise(resolve => setTimeout(resolve, ms));
-}
+import { jwtDecode } from 'jwt-decode';
 
 /**
  * Dynamic Form Builder Web Component
  * Fetches JSON schema and form data, then renders a dynamic form
- * 
+ *
  * @element form-builder
- * 
+ *
  * @attr {string} fbms-base-url - Base URL of the form builder microservice
  * @attr {string} fbms-form-fname - Form name to fetch
  * @attr {string} oidc-url - OpenID Connect URL for authentication
@@ -25,7 +21,7 @@ class FormBuilder extends LitElement {
 
     // Internal state
     schema: { type: Object, state: true },
-    formData: { type: Object, state: true },
+    _formData: { type: Object, state: true },
     uiSchema: { type: Object, state: true },
     fbmsFormVersion: { type: String, state: true },
     loading: { type: Boolean, state: true },
@@ -33,12 +29,20 @@ class FormBuilder extends LitElement {
     error: { type: String, state: true },
     token: { type: String, state: true },
     decoded: { type: Object, state: true },
+    submitSuccess: { type: Boolean, state: true },
+    validationFailed: { type: Boolean, state: true },
+    initialFormData: { type: Object, state: true },
+    hasChanges: { type: Boolean, state: true },
+    submissionStatus: { type: Object, state: true },
+    formCompleted: { type: Boolean, state: true },
+    submissionError: { type: String, state: true },
   };
 
   static styles = css`
     :host {
       display: block;
-      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
+      font-family:
+        -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
     }
 
     .container {
@@ -71,7 +75,27 @@ class FormBuilder extends LitElement {
     .form-group {
       display: flex;
       flex-direction: column;
-      gap: 8px;
+      gap: 4px;
+      margin: 14px 0px;
+    }
+
+    .nested-object {
+      margin-left: 20px;
+      padding-left: 20px;
+      border-left: 2px solid #e0e0e0;
+      margin-top: 10px;
+    }
+
+    .nested-object-title {
+      font-weight: 600;
+      color: #333;
+      margin-bottom: 10px;
+    }
+
+    .nested-object-description {
+      font-size: 0.875rem;
+      color: #666;
+      margin-bottom: 15px;
     }
 
     label {
@@ -90,11 +114,11 @@ class FormBuilder extends LitElement {
       margin-top: 4px;
     }
 
-    input[type="text"],
-    input[type="email"],
-    input[type="number"],
-    input[type="date"],
-    input[type="tel"],
+    input[type='text'],
+    input[type='email'],
+    input[type='number'],
+    input[type='date'],
+    input[type='tel'],
     textarea,
     select {
       padding: 8px 12px;
@@ -114,16 +138,40 @@ class FormBuilder extends LitElement {
       box-shadow: 0 0 0 3px rgba(0, 102, 204, 0.1);
     }
 
+    select[multiple] {
+      min-height: 120px;
+      padding: 4px;
+    }
+
+    select[multiple] option {
+      padding: 4px 8px;
+    }
+
     textarea {
       min-height: 100px;
       resize: vertical;
     }
 
-    input[type="checkbox"],
-    input[type="radio"] {
+    input[type='checkbox'],
+    input[type='radio'] {
       margin-right: 8px;
     }
 
+    fieldset {
+      border: none;
+      padding: 0;
+      margin: 0;
+      min-width: 0; /* Fix for some browsers */
+    }
+
+    legend {
+      font-weight: 700;
+      color: #333;
+      padding: 0;
+      margin-bottom: 8px;
+      font-size: 1rem;
+    }
+
     .checkbox-group,
     .radio-group {
       display: flex;
@@ -137,6 +185,18 @@ class FormBuilder extends LitElement {
       align-items: center;
     }
 
+    .checkbox-group.inline,
+    .radio-group.inline {
+      flex-direction: row;
+      flex-wrap: wrap;
+      gap: 16px;
+    }
+
+    .checkbox-group.inline .checkbox-item,
+    .radio-group.inline .radio-item {
+      margin-right: 0;
+    }
+
     .error-message {
       color: #c00;
       font-size: 0.875rem;
@@ -159,21 +219,21 @@ class FormBuilder extends LitElement {
       transition: background-color 0.2s;
     }
 
-    button[type="submit"] {
+    button[type='submit'] {
       background-color: #0066cc;
       color: white;
     }
 
-    button[type="submit"]:hover {
+    button[type='submit']:hover {
       background-color: #0052a3;
     }
 
-    button[type="button"] {
+    button[type='button'] {
       background-color: #c0c0c0;
       color: #333;
     }
 
-    button[type="button"]:hover {
+    button[type='button']:hover {
       background-color: #e0e0e0;
     }
 
@@ -195,7 +255,9 @@ class FormBuilder extends LitElement {
     }
 
     @keyframes spin {
-      to { transform: rotate(360deg); }
+      to {
+        transform: rotate(360deg);
+      }
     }
 
     .button-content {
@@ -203,20 +265,117 @@ class FormBuilder extends LitElement {
       align-items: center;
       justify-content: center;
     }
+
+    .status-message {
+      padding: 12px 16px;
+      border-radius: 4px;
+      margin-bottom: 20px;
+      font-weight: 500;
+    }
+
+    .status-message.success {
+      background-color: #d4edda;
+      border: 1px solid #c3e6cb;
+      color: #155724;
+    }
+
+    .status-message.validation-error {
+      background-color: #fff3cd;
+      border: 1px solid #ffeaa7;
+      color: #856404;
+    }
+
+    .status-message.error {
+      background-color: #f8d7da;
+      border: 1px solid #f5c6cb;
+      color: #721c24;
+    }
+
+    .status-message ul {
+      margin: 8px 0 0 0;
+      padding-left: 20px;
+    }
+
+    .status-message li {
+      margin: 4px 0;
+    }
+
+    form.submitting input,
+    form.submitting textarea,
+    form.submitting select,
+    form.submitting button:not([type='submit']) {
+      opacity: 0.6;
+      pointer-events: none;
+      cursor: not-allowed;
+    }
+
+    .info-only {
+      padding: 20px 0;
+    }
+
+    .info-only p {
+      line-height: 1.6;
+      color: #333;
+    }
+
+    .info-label {
+      font-weight: 500;
+      color: #333;
+      display: block;
+    }
   `;
 
+  // Getter and setter for formData
+  get formData() {
+    return this._formData;
+  }
+
+  set formData(value) {
+    const oldValue = this._formData;
+    this._formData = value;
+    this.requestUpdate('formData', oldValue);
+    this.updateStateFlags();
+  }
+
+  /**
+   * Get custom error message from schema if available
+   * Follows the pattern: schema.properties.fieldName.messages.ruleName
+   * For nested fields: schema.properties.parent.properties.child.messages.ruleName
+   * Returns null if field, messages, or rule doesn't exist
+   */
+  getCustomErrorMessage(fieldPath, ruleName) {
+    const pathParts = fieldPath.split('.');
+    let current = this.schema;
+
+    // Navigate to the field schema
+    for (const part of pathParts) {
+      current = current?.properties?.[part];
+      if (!current) return null;
+    }
+
+    // Check for custom message
+    return current?.messages?.[ruleName] ?? null;
+  }
+
   constructor() {
     super();
     this.loading = true;
     this.submitting = false;
     this.error = null;
     this.schema = null;
-    this.formData = {};
+    this._formData = {};
     this.uiSchema = null;
     this.fbmsFormVersion = null;
     this.token = null;
-    this.decoded = {sub: 'unknown'};
+    this.decoded = { sub: 'unknown' };
     this.fieldErrors = {};
+    this.submitSuccess = false;
+    this.validationFailed = false;
+    this.initialFormData = {};
+    this.hasChanges = false;
+    this.submissionStatus = null;
+    this.formCompleted = false;
+    this.submissionError = null;
   }
 
   async connectedCallback() {
@@ -235,10 +394,7 @@ class FormBuilder extends LitElement {
       }
 
       // Fetch form schema and data
-      await Promise.all([
-        this.fetchSchema(),
-        this.fetchFormData(),
-      ]);
+      await Promise.all([this.fetchSchema(), this.fetchFormData()]);
 
       this.loading = false;
     } catch (err) {
@@ -247,6 +403,80 @@ class FormBuilder extends LitElement {
     }
   }
 
+  /**
+   * Deep clone an object, handling Dates and other types
+   * Uses structuredClone if available, otherwise falls back to manual recursive
+   */
+  deepClone(obj) {
+    if (obj === null || obj === undefined) return obj;
+
+    // Use structuredClone if available (modern browsers)
+    if (typeof structuredClone === 'function') {
+      try {
+        return structuredClone(obj);
+      } catch (err) {
+        console.warn('structuredClone failed, falling back to manual clone:', err);
+      }
+    }
+
+    // Fallback: manual deep clone handling common types
+    if (obj instanceof Date) {
+      return new Date(obj.getTime());
+    }
+
+    if (Array.isArray(obj)) {
+      return obj.map((item) => this.deepClone(item));
+    }
+
+    if (typeof obj === 'object') {
+      const cloned = {};
+      for (const key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+          cloned[key] = this.deepClone(obj[key]);
+        }
+      }
+      return cloned;
+    }
+
+    // Primitives
+    return obj;
+  }
+
+  /**
+   * Deep equality check, handling Dates and other types
+   */
+  deepEqual(obj1, obj2) {
+    if (obj1 === obj2) return true;
+
+    if (obj1 === null || obj2 === null) return false;
+    if (obj1 === undefined || obj2 === undefined) return false;
+
+    if (obj1 instanceof Date && obj2 instanceof Date) {
+      return obj1.getTime() === obj2.getTime();
+    }
+
+    // If only one is a Date, they are not equal
+    if (obj1 instanceof Date || obj2 instanceof Date) {
+      return false;
+    }
+
+    if (Array.isArray(obj1) && Array.isArray(obj2)) {
+      if (obj1.length !== obj2.length) return false;
+      return obj1.every((item, index) => this.deepEqual(item, obj2[index]));
+    }
+
+    if (typeof obj1 === 'object' && typeof obj2 === 'object') {
+      const keys1 = Object.keys(obj1);
+      const keys2 = Object.keys(obj2);
+
+      if (keys1.length !== keys2.length) return false;
+
+      return keys1.every((key) => this.deepEqual(obj1[key], obj2[key]));
+    }
+
+    return false;
+  }
+
   async fetchToken() {
     try {
       const response = await fetch(this.oidcUrl, {
@@ -258,8 +488,14 @@ class FormBuilder extends LitElement {
       }
 
       const data = await response.text();
-      this.token = data
-      this.decoded = decode(this.token);
+      this.token = data;
+      try {
+        this.decoded = jwtDecode(this.token);
+      } catch (_err) {
+        // Only need this to get the name, so warn
+        console.warn('Security Token failed to decode -- setting user to unknown');
+        this.decoded = { sub: 'unknown' };
+      }
     } catch (err) {
       console.error('Token fetch error:', err);
       throw new Error('Authentication failed');
@@ -309,66 +545,250 @@ class FormBuilder extends LitElement {
 
       if (response.ok) {
         const payload = await response.json();
-        this.formData = payload.answers;
+        this._formData = payload?.answers ?? {}; // Use private property
+        this.initialFormData = this.deepClone(this._formData); // Use deepClone
       } else {
-        // It's OK if there's no existing data
-        this.formData = {};
+        this._formData = {};
+        this.initialFormData = {};
       }
+      this.hasChanges = false;
+      this.requestUpdate();
     } catch (err) {
       // Non-critical error
       console.warn('Could not fetch form data:', err);
-      this.formData = {};
+      this._formData = {};
+      this.initialFormData = {};
+      this.hasChanges = false;
+      this.requestUpdate();
     }
   }
 
-  handleInputChange(fieldName, event) {
-    const { type, value, checked } = event.target;
+  updateStateFlags() {
+    // Clear status messages when user makes changes
+    this.submitSuccess = false;
+    this.validationFailed = false;
+    this.submissionError = null;
 
-    this.formData = {
-      ...this.formData,
-      [fieldName]: type === 'checkbox' ? checked : value,
-    };
+    // Check if form data has changed from initial state
+    this.hasChanges = !this.deepEqual(this.formData, this.initialFormData);
+  }
+
+  /**
+   * Get nested value from formData using dot notation path
+   * e.g., "contact_information.email" => formData.contact_information.email
+   */
+  getNestedValue(path) {
+    if (!path || typeof path !== 'string') return undefined;
+
+    const parts = path.split('.').filter((part) => part.length > 0);
+    if (parts.length === 0) return undefined;
+
+    let value = this.formData;
+    for (const part of parts) {
+      value = value?.[part];
+    }
+    return value;
+  }
+
+  /**
+   * Sanitize a string for use as an HTML ID
+   * Replaces spaces and special characters with hyphens and collapses consecutive hyphens
+   * Ensures the ID starts with a letter by adding a prefix if necessary
+   */
+  sanitizeId(str) {
+    if (typeof str !== 'string') {
+      str = String(str ?? '');
+    }
+
+    // Replace invalid characters and collapse multiple hyphens
+    let sanitized = str.replace(/[^a-zA-Z0-9-_.]/g, '-').replace(/-+/g, '-');
+
+    // Trim leading/trailing hyphens that may have been introduced
+    sanitized = sanitized.replace(/^-+/, '').replace(/-+$/, '');
+
+    // Ensure we have some content
+    if (!sanitized) {
+      sanitized = 'id';
+    }
+
+    // Ensure the ID starts with a letter
+    if (!/^[A-Za-z]/.test(sanitized)) {
+      sanitized = 'id-' + sanitized;
+    }
+
+    return sanitized;
+  }
+
+  /**
+   * Set nested value in formData using dot notation path
+   */
+  setNestedValue(path, value) {
+    if (!path || typeof path !== 'string') return;
+
+    const parts = path.split('.').filter((part) => part.length > 0);
+    if (parts.length === 0) return;
+
+    const newData = { ...this.formData };
+    let current = newData;
+
+    for (let i = 0; i < parts.length - 1; i++) {
+      const part = parts[i];
+      const existing = current[part];
+      // Note: Arrays are not currently supported in schemas, but we preserve them
+      // to maintain data integrity. Setting properties on arrays may produce unexpected results.
+      if (Array.isArray(existing)) {
+        current[part] = [...existing];
+      } else if (!existing || typeof existing !== 'object') {
+        current[part] = {};
+      } else {
+        current[part] = { ...existing };
+      }
+      current = current[part];
+    }
+
+    current[parts[parts.length - 1]] = value;
+    this.formData = newData;
+  }
+
+  /**
+   * Get the schema object at a given path
+   * e.g., "contact_information" => schema.properties.contact_information
+   */
+  getSchemaAtPath(path) {
+    if (!path) return this.schema; // Handle empty string/null/undefined
+
+    const parts = path.split('.').filter((part) => part.length > 0);
+    if (parts.length === 0) return this.schema; // All segments were empty
+
+    let schema = this.schema;
+
+    for (const part of parts) {
+      schema = schema.properties?.[part];
+      if (!schema) return null;
+    }
+
+    return schema;
+  }
+
+  handleInputChange(fieldPath, event) {
+    const { type, value, checked } = event.target;
+    this.setNestedValue(fieldPath, type === 'checkbox' ? checked : value);
 
     // Clear field error on change
-    if (this.fieldErrors[fieldName]) {
+    if (this.fieldErrors[fieldPath]) {
       this.fieldErrors = { ...this.fieldErrors };
-      delete this.fieldErrors[fieldName];
+      delete this.fieldErrors[fieldPath];
     }
+
+    this.updateStateFlags();
   }
 
-  handleArrayChange(fieldName, index, event) {
-    const currentArray = this.formData[fieldName] || [];
+  handleArrayChange(fieldPath, index, event) {
+    const currentArray = this.getNestedValue(fieldPath) || [];
     const newArray = [...currentArray];
     newArray[index] = event.target.value;
+    this.setNestedValue(fieldPath, newArray);
 
-    this.formData = {
-      ...this.formData,
-      [fieldName]: newArray,
-    };
+    this.updateStateFlags();
   }
 
-  validateForm() {
+  handleMultiSelectChange(fieldPath, event) {
+    const selectedOptions = Array.from(event.target.selectedOptions);
+    const values = selectedOptions.map((option) => option.value);
+
+    this.setNestedValue(fieldPath, values);
+
+    // Clear field error on change
+    if (this.fieldErrors[fieldPath]) {
+      this.fieldErrors = { ...this.fieldErrors };
+      delete this.fieldErrors[fieldPath];
+    }
+
+    this.updateStateFlags();
+  }
+
+  handleCheckboxArrayChange(fieldPath, optionValue, event) {
+    const { checked } = event.target;
+    const currentArray = this.getNestedValue(fieldPath) || [];
+
+    let newArray;
+    if (checked) {
+      // Add to array if not already present
+      newArray = currentArray.includes(optionValue) ? currentArray : [...currentArray, optionValue];
+    } else {
+      // Remove from array
+      newArray = currentArray.filter((v) => v !== optionValue);
+    }
+
+    this.setNestedValue(fieldPath, newArray);
+
+    // Clear field error on change
+    if (this.fieldErrors[fieldPath]) {
+      this.fieldErrors = { ...this.fieldErrors };
+      delete this.fieldErrors[fieldPath];
+    }
+
+    this.updateStateFlags();
+  }
+
+  /**
+   * Recursively validate form fields including nested objects
+   */
+  validateFormFields(properties, required = [], basePath = '', depth = 0) {
+    const MAX_DEPTH = 10;
+    if (depth > MAX_DEPTH) {
+      console.warn(`Schema nesting exceeds maximum depth of ${MAX_DEPTH} at path: ${basePath}`);
+      return {};
+    }
+
     const errors = {};
-    const { properties = {}, required = [] } = this.schema;
 
     // Check required fields
-    required.forEach(fieldName => {
-      const value = this.formData[fieldName];
+    required.forEach((fieldName) => {
+      const fieldPath = basePath ? `${basePath}.${fieldName}` : fieldName;
+      const value = this.getNestedValue(fieldPath);
       if (value === undefined || value === null || value === '') {
-        errors[fieldName] = 'This field is required';
+        const customMsg = this.getCustomErrorMessage(fieldPath, 'required');
+        errors[fieldPath] = customMsg || 'This field is required';
       }
     });
 
     // Type validation
     Object.entries(properties).forEach(([fieldName, fieldSchema]) => {
-      const value = this.formData[fieldName];
+      const fieldPath = basePath ? `${basePath}.${fieldName}` : fieldName;
+      const value = this.getNestedValue(fieldPath);
+
+      // Handle nested objects recursively
+      if (fieldSchema.type === 'object' && fieldSchema.properties) {
+        const nestedErrors = this.validateFormFields(
+          fieldSchema.properties,
+          fieldSchema.required || [],
+          fieldPath,
+          depth + 1
+        );
+        Object.assign(errors, nestedErrors);
+        return;
+      }
 
       if (value !== undefined && value !== null && value !== '') {
         // Email validation
         if (fieldSchema.format === 'email') {
           const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
           if (!emailRegex.test(value)) {
-            errors[fieldName] = 'Invalid email address';
+            // Support both 'format' (generic) and 'email' (specific) custom message keys
+            const customMsg =
+              this.getCustomErrorMessage(fieldPath, 'format') ||
+              this.getCustomErrorMessage(fieldPath, 'email');
+            errors[fieldPath] = customMsg || 'Invalid email address';
+          }
+        }
+
+        // Pattern validation
+        if (fieldSchema.pattern) {
+          const regex = new RegExp(fieldSchema.pattern);
+          if (!regex.test(value)) {
+            const customMsg = this.getCustomErrorMessage(fieldPath, 'pattern');
+            errors[fieldPath] = customMsg || 'Invalid format';
           }
         }
 
@@ -376,13 +796,16 @@ class FormBuilder extends LitElement {
         if (fieldSchema.type === 'number' || fieldSchema.type === 'integer') {
           const num = Number(value);
           if (isNaN(num)) {
-            errors[fieldName] = 'Must be a number';
+            const customMsg = this.getCustomErrorMessage(fieldPath, 'type');
+            errors[fieldPath] = customMsg || 'Must be a number';
           } else {
             if (fieldSchema.minimum !== undefined && num < fieldSchema.minimum) {
-              errors[fieldName] = `Must be at least ${fieldSchema.minimum}`;
+              const customMsg = this.getCustomErrorMessage(fieldPath, 'minimum');
+              errors[fieldPath] = customMsg || `Must be at least ${fieldSchema.minimum}`;
             }
             if (fieldSchema.maximum !== undefined && num > fieldSchema.maximum) {
-              errors[fieldName] = `Must be at most ${fieldSchema.maximum}`;
+              const customMsg = this.getCustomErrorMessage(fieldPath, 'maximum');
+              errors[fieldPath] = customMsg || `Must be at most ${fieldSchema.maximum}`;
             }
           }
         }
@@ -390,24 +813,41 @@ class FormBuilder extends LitElement {
         // String length validation
         if (fieldSchema.type === 'string') {
           if (fieldSchema.minLength && value.length < fieldSchema.minLength) {
-            errors[fieldName] = `Must be at least ${fieldSchema.minLength} characters`;
+            const customMsg = this.getCustomErrorMessage(fieldPath, 'minLength');
+            errors[fieldPath] = customMsg || `Must be at least ${fieldSchema.minLength} characters`;
           }
           if (fieldSchema.maxLength && value.length > fieldSchema.maxLength) {
-            errors[fieldName] = `Must be at most ${fieldSchema.maxLength} characters`;
+            const customMsg = this.getCustomErrorMessage(fieldPath, 'maxLength');
+            errors[fieldPath] = customMsg || `Must be at most ${fieldSchema.maxLength} characters`;
           }
         }
       }
     });
 
-    this.fieldErrors = errors;
-    return Object.keys(errors).length === 0;
+    return errors;
+  }
+
+  validateForm() {
+    const { properties = {}, required = [] } = this.schema;
+    this.fieldErrors = this.validateFormFields(properties, required);
+    return Object.keys(this.fieldErrors).length === 0;
   }
 
   async handleSubmit(event) {
     event.preventDefault();
 
+    // Clear previous status messages
+    this.submitSuccess = false;
+    this.validationFailed = false;
     if (!this.validateForm()) {
-      this.requestUpdate();
+      this.validationFailed = true;
+      await this.updateComplete; // Wait for render to complete
+
+      // Scroll to validation warning banner at top of form
+      const validationWarning = this.shadowRoot.querySelector('.status-message.validation-error');
+      if (validationWarning) {
+        validationWarning.scrollIntoView({ behavior: 'smooth', block: 'start' });
+      }
       return;
     }
 
@@ -416,17 +856,25 @@ class FormBuilder extends LitElement {
       return;
     }
 
+    await this.submitWithRetry(false);
+  }
+
+  async submitWithRetry(isRetry = false) {
     try {
-      this.submitting = true;
-      this.error = null;
+      // Only set submitting on the first call, not on retry
+      if (!isRetry) {
+        this.submitting = true;
+      }
+      this.submissionError = null;
+      this.submissionStatus = null; // Clear previous messages
+
       const body = {
         username: this.decoded.sub,
         formFname: this.fbmsFormFname,
         formVersion: this.fbmsFormVersion,
         timestamp: Date.now(),
-        answers: this.formData
+        answers: this.formData,
       };
-      await delay(300);
 
       const url = `${this.fbmsBaseUrl}/api/v1/submissions/${this.fbmsFormFname}`;
       const headers = {
@@ -444,27 +892,121 @@ class FormBuilder extends LitElement {
         body: JSON.stringify(body),
       });
 
+      // Try to parse response body for messages (even on error)
+      let responseData = null;
+      try {
+        responseData = await response.json();
+        this.submissionStatus = responseData;
+      } catch (jsonErr) {
+        // Response might not be JSON
+        console.warn('Could not parse response as JSON:', jsonErr);
+      }
+
+      // Handle 403 - token may be stale
+      if (response.status === 403 && !isRetry) {
+        console.warn('Received 403, attempting to refresh token and retry...');
+
+        // Re-fetch token if OIDC URL is configured
+        if (this.oidcUrl) {
+          try {
+            await this.fetchToken();
+            console.warn('Token refreshed successfully, retrying submission...');
+
+            // Retry once with new token (submitting flag stays true)
+            return await this.submitWithRetry(true);
+          } catch (tokenError) {
+            console.error('Failed to refresh token:', tokenError);
+            // Fall through to handle the original 403 error
+            throw new Error('Authentication failed: Unable to refresh token');
+          }
+        } else {
+          console.warn('OIDC URL is not configured; cannot refresh token. Skipping retry.');
+          // Fall through to handle the 403 error normally
+        }
+      }
+
       if (!response.ok) {
-        throw new Error(`Failed to submit form: ${response.statusText}`);
+        // Provide specific error for 403 after retry
+        if (response.status === 403 && isRetry) {
+          throw new Error(
+            'Authorization failed: Access denied even after token refresh. You may not have permission to submit this form.'
+          );
+        }
+
+        // Use server error message if available
+        const errorMessage =
+          responseData?.messageHeader ||
+          responseData?.message ||
+          `Failed to submit form: ${response.statusText}`;
+        throw new Error(errorMessage);
       }
 
-      // Dispatch success event
-      this.dispatchEvent(new CustomEvent('form-submit-success', {
-        detail: { data: body },
-        bubbles: true,
-        composed: true,
-      }));
+      // Check for form forwarding header (safely handle missing headers object)
+      const formForward = response.headers?.get ? response.headers.get('x-fbms-formforward') : null;
+      if (formForward) {
+        // eslint-disable-next-line no-console
+        console.info(`Form submitted successfully. Forwarding to next form: ${formForward}`);
+        this.fbmsFormFname = formForward;
+
+        // Keep success state and messages visible for the forwarded form
+        this.submitSuccess = true;
+        // Note: submissionStatus is preserved to show server messages on the next form
+        this.formCompleted = false;
+
+        // Re-initialize with the new form
+        this.loading = true;
+        try {
+          await this.initialize();
+          return; // Exit early, don't show success message for intermediate form
+          // Note: finally block will set submitting = false
+        } catch (forwardingError) {
+          console.error('Failed to load forwarded form:', forwardingError);
+          this.loading = false;
+          this.submissionError =
+            forwardingError?.message || 'Form was submitted, but loading the next form failed.';
+        }
+      }
 
-      // Optional: Reset or show success message
-      this.error = null;
+      // Dispatch success event
+      this.dispatchEvent(
+        new CustomEvent('form-submit-success', {
+          detail: { data: body },
+          bubbles: true,
+          composed: true,
+        })
+      );
+
+      // No form forward - this is the final form completion
+      this.formCompleted = true;
+      this.submitSuccess = true;
+      this.submissionError = null;
+      this.initialFormData = this.deepClone(this.formData);
+      this.hasChanges = false;
+
+      await this.updateComplete;
+
+      // Scroll to success message
+      const successMsg = this.shadowRoot.querySelector('.status-message.success');
+      if (successMsg) {
+        successMsg.scrollIntoView({ behavior: 'smooth', block: 'start' });
+      }
     } catch (err) {
-      this.error = err.message || 'Failed to submit form';
-
-      this.dispatchEvent(new CustomEvent('form-submit-error', {
-        detail: { error: err.message },
-        bubbles: true,
-        composed: true,
-      }));
+      this.submissionError = err.message || 'Failed to submit form';
+
+      this.dispatchEvent(
+        new CustomEvent('form-submit-error', {
+          detail: { error: err.message },
+          bubbles: true,
+          composed: true,
+        })
+      );
+
+      // Scroll to error message at top of form
+      await this.updateComplete;
+      const errorMsg = this.shadowRoot.querySelector('.status-message.error');
+      if (errorMsg) {
+        errorMsg.scrollIntoView({ behavior: 'smooth', block: 'start' });
+      }
     } finally {
       this.submitting = false;
     }
@@ -476,49 +1018,211 @@ class FormBuilder extends LitElement {
     this.requestUpdate();
   }
 
-  renderField(fieldName, fieldSchema) {
-    const value = this.formData[fieldName];
-    const error = this.fieldErrors[fieldName];
-    const required = this.schema.required?.includes(fieldName);
-    const uiOptions = this.uiSchema?.[fieldName] || {};
+  /**
+   * Render a field - can be a simple input or a nested object
+   */
+  renderField(fieldName, fieldSchema, basePath = '', depth = 0) {
+    const MAX_DEPTH = 10;
+    if (depth > MAX_DEPTH) {
+      console.warn(`Schema nesting exceeds maximum depth of ${MAX_DEPTH}`);
+      return html`<div class="error">Schema too deeply nested</div>`;
+    }
+
+    const fieldPath = basePath ? `${basePath}.${fieldName}` : fieldName;
+
+    // Handle nested objects with properties
+    if (fieldSchema.type === 'object' && fieldSchema.properties) {
+      return this.renderNestedObject(fieldName, fieldSchema, basePath, depth);
+    }
+
+    // Single-value enum - render as informational text only (title serves as the message)
+    if (fieldSchema.enum && fieldSchema.enum.length === 1) {
+      return html`
+        <div class="form-group">
+          <span class="info-label">${fieldSchema.title || fieldName}</span>
+          ${fieldSchema.description
+            ? html`<span class="description">${fieldSchema.description}</span>`
+            : ''}
+        </div>
+      `;
+    }
+
+    // Regular field
+    const value = this.getNestedValue(fieldPath);
+    const error = this.fieldErrors[fieldPath];
+    // For nested fields, check the parent schema's required array
+    const parentSchema = basePath ? this.getSchemaAtPath(basePath) : this.schema;
+    const required = parentSchema?.required?.includes(fieldName) ?? false;
+    const uiSchemaPath = fieldPath.split('.');
+    let uiOptions = this.uiSchema;
+    for (const part of uiSchemaPath) {
+      uiOptions = uiOptions?.[part];
+    }
+    uiOptions = uiOptions || {};
+
+    const widget = uiOptions['ui:widget'];
+    const isGroupedInput = widget === 'radio' || widget === 'checkboxes';
 
     return html`
       <div class="form-group">
-        <label class="${required ? 'required' : ''}" for="${fieldName}">
-          ${fieldSchema.title || fieldName}
-        </label>
-
-        ${fieldSchema.description ? html`
-          <span class="description">${fieldSchema.description}</span>
-        ` : ''}
+        ${!isGroupedInput
+          ? html`
+              <label class="${required ? 'required' : ''}" for="${fieldPath}">
+                ${fieldSchema.title || fieldName}
+              </label>
+            `
+          : ''}
+        ${fieldSchema.description && !isGroupedInput
+          ? html` <span class="description">${fieldSchema.description}</span> `
+          : ''}
+        ${this.renderInput(fieldPath, fieldSchema, value, uiOptions)}
+        ${error ? html` <span class="error-message">${error}</span> ` : ''}
+      </div>
+    `;
+  }
 
-        ${this.renderInput(fieldName, fieldSchema, value, uiOptions)}
+  /**
+   * Render a nested object with its own properties
+   */
+  renderNestedObject(fieldName, fieldSchema, basePath = '', depth = 0) {
+    const fieldPath = basePath ? `${basePath}.${fieldName}` : fieldName;
 
-        ${error ? html`
-          <span class="error-message">${error}</span>
-        ` : ''}
+    return html`
+      <div class="nested-object">
+        ${fieldSchema.title
+          ? html`<div class="nested-object-title">${fieldSchema.title}</div>`
+          : ''}
+        ${fieldSchema.description
+          ? html`<div class="nested-object-description">${fieldSchema.description}</div>`
+          : ''}
+        ${Object.entries(fieldSchema.properties).map(([nestedFieldName, nestedFieldSchema]) =>
+          this.renderField(nestedFieldName, nestedFieldSchema, fieldPath, depth + 1)
+        )}
       </div>
     `;
   }
 
-  renderInput(fieldName, fieldSchema, value, uiOptions) {
-    const { type, enum: enumValues, format } = fieldSchema;
+  renderInput(fieldPath, fieldSchema, value, uiOptions) {
+    const { type, enum: enumValues, format, items } = fieldSchema;
+    const widget = uiOptions['ui:widget'];
+    const isInline = uiOptions['ui:options']?.inline;
 
-    // Enum - render as select
+    // Single-value enum - no input needed, title/label already displays the message
+    if (enumValues && enumValues.length === 1) {
+      return html``;
+    }
+
+    // Array of enums with checkboxes widget - render as checkboxes
+    if (type === 'array' && items?.enum && widget === 'checkboxes') {
+      const selectedValues = Array.isArray(value) ? value : [];
+      const containerClass = isInline ? 'checkbox-group inline' : 'checkbox-group';
+
+      // Extract basePath and fieldName from fieldPath
+      const pathParts = fieldPath.split('.');
+      const fieldName = pathParts[pathParts.length - 1];
+      const basePath = pathParts.slice(0, -1).join('.');
+
+      const parentSchema = basePath ? this.getSchemaAtPath(basePath) : this.schema;
+      const isRequired = parentSchema?.required?.includes(fieldName) ?? false;
+
+      return html`
+        <fieldset class="${containerClass}">
+          <legend class="${isRequired ? 'required' : ''}">${fieldSchema.title || fieldName}</legend>
+          ${fieldSchema.description
+            ? html`<span class="description">${fieldSchema.description}</span>`
+            : ''}
+          ${items.enum.map((opt) => {
+            const sanitizedId = this.sanitizeId(`${fieldPath}-${opt}`);
+            return html`
+              <div class="checkbox-item">
+                <input
+                  type="checkbox"
+                  id="${sanitizedId}"
+                  name="${fieldPath}"
+                  value="${opt}"
+                  .checked="${selectedValues.includes(opt)}"
+                  @change="${(e) => this.handleCheckboxArrayChange(fieldPath, opt, e)}"
+                />
+                <label for="${sanitizedId}">${opt}</label>
+              </div>
+            `;
+          })}
+        </fieldset>
+      `;
+    }
+
+    // Array of enums without widget - render as multi-select dropdown (default)
+    if (type === 'array' && items?.enum) {
+      const selectedValues = Array.isArray(value) ? value : [];
+
+      return html`
+        <select
+          id="${fieldPath}"
+          name="${fieldPath}"
+          multiple
+          size="5"
+          @change="${(e) => this.handleMultiSelectChange(fieldPath, e)}"
+        >
+          ${items.enum.map(
+            (opt) => html`
+              <option value="${opt}" ?selected="${selectedValues.includes(opt)}">${opt}</option>
+            `
+          )}
+        </select>
+      `;
+    }
+
+    // Enum with radio widget - render as radio buttons
+    if (enumValues && widget === 'radio') {
+      const containerClass = isInline ? 'radio-group inline' : 'radio-group';
+
+      // Extract basePath and fieldName from fieldPath
+      const pathParts = fieldPath.split('.');
+      const fieldName = pathParts[pathParts.length - 1];
+      const basePath = pathParts.slice(0, -1).join('.');
+
+      const parentSchema = basePath ? this.getSchemaAtPath(basePath) : this.schema;
+      const isRequired = parentSchema?.required?.includes(fieldName) ?? false;
+
+      return html`
+        <fieldset class="${containerClass}">
+          <legend class="${isRequired ? 'required' : ''}">${fieldSchema.title || fieldName}</legend>
+          ${fieldSchema.description
+            ? html`<span class="description">${fieldSchema.description}</span>`
+            : ''}
+          ${enumValues.map((opt) => {
+            const sanitizedId = this.sanitizeId(`${fieldPath}-${opt}`);
+            return html`
+              <div class="radio-item">
+                <input
+                  type="radio"
+                  id="${sanitizedId}"
+                  name="${fieldPath}"
+                  value="${opt}"
+                  .checked="${value === opt}"
+                  @change="${(e) => this.handleInputChange(fieldPath, e)}"
+                />
+                <label for="${sanitizedId}">${opt}</label>
+              </div>
+            `;
+          })}
+        </fieldset>
+      `;
+    }
+
+    // Enum - render as select (default)
     if (enumValues) {
       return html`
         <select
-          id="${fieldName}"
-          name="${fieldName}"
+          id="${fieldPath}"
+          name="${fieldPath}"
           .value="${value || ''}"
-          @change="${(e) => this.handleInputChange(fieldName, e)}"
+          @change="${(e) => this.handleInputChange(fieldPath, e)}"
         >
           <option value="">-- Select --</option>
-          ${enumValues.map(opt => html`
-            <option value="${opt}" ?selected="${value === opt}">
-              ${opt}
-            </option>
-          `)}
+          ${enumValues.map(
+            (opt) => html` <option value="${opt}" ?selected="${value === opt}">${opt}</option> `
+          )}
         </select>
       `;
     }
@@ -529,12 +1233,12 @@ class FormBuilder extends LitElement {
         <div class="checkbox-item">
           <input
             type="checkbox"
-            id="${fieldName}"
-            name="${fieldName}"
+            id="${fieldPath}"
+            name="${fieldPath}"
             .checked="${!!value}"
-            @change="${(e) => this.handleInputChange(fieldName, e)}"
+            @change="${(e) => this.handleInputChange(fieldPath, e)}"
           />
-          <label for="${fieldName}">${fieldSchema.title || fieldName}</label>
+          <label for="${fieldPath}">${fieldSchema.title || fieldPath.split('.').pop()}</label>
         </div>
       `;
     }
@@ -545,10 +1249,10 @@ class FormBuilder extends LitElement {
         return html`
           <input
             type="email"
-            id="${fieldName}"
-            name="${fieldName}"
+            id="${fieldPath}"
+            name="${fieldPath}"
             .value="${value || ''}"
-            @input="${(e) => this.handleInputChange(fieldName, e)}"
+            @input="${(e) => this.handleInputChange(fieldPath, e)}"
           />
         `;
       }
@@ -557,10 +1261,10 @@ class FormBuilder extends LitElement {
         return html`
           <input
             type="date"
-            id="${fieldName}"
-            name="${fieldName}"
+            id="${fieldPath}"
+            name="${fieldPath}"
             .value="${value || ''}"
-            @input="${(e) => this.handleInputChange(fieldName, e)}"
+            @input="${(e) => this.handleInputChange(fieldPath, e)}"
           />
         `;
       }
@@ -568,10 +1272,10 @@ class FormBuilder extends LitElement {
       if (uiOptions['ui:widget'] === 'textarea') {
         return html`
           <textarea
-            id="${fieldName}"
-            name="${fieldName}"
+            id="${fieldPath}"
+            name="${fieldPath}"
             .value="${value || ''}"
-            @input="${(e) => this.handleInputChange(fieldName, e)}"
+            @input="${(e) => this.handleInputChange(fieldPath, e)}"
           ></textarea>
         `;
       }
@@ -580,10 +1284,10 @@ class FormBuilder extends LitElement {
       return html`
         <input
           type="text"
-          id="${fieldName}"
-          name="${fieldName}"
+          id="${fieldPath}"
+          name="${fieldPath}"
           .value="${value || ''}"
-          @input="${(e) => this.handleInputChange(fieldName, e)}"
+          @input="${(e) => this.handleInputChange(fieldPath, e)}"
         />
       `;
     }
@@ -593,11 +1297,11 @@ class FormBuilder extends LitElement {
       return html`
         <input
           type="number"
-          id="${fieldName}"
-          name="${fieldName}"
+          id="${fieldPath}"
+          name="${fieldPath}"
           .value="${value || ''}"
           step="${type === 'integer' ? '1' : 'any'}"
-          @input="${(e) => this.handleInputChange(fieldName, e)}"
+          @input="${(e) => this.handleInputChange(fieldPath, e)}"
         />
       `;
     }
@@ -606,29 +1310,27 @@ class FormBuilder extends LitElement {
     return html`
       <input
         type="text"
-        id="${fieldName}"
-        name="${fieldName}"
+        id="${fieldPath}"
+        name="${fieldPath}"
         .value="${value || ''}"
-        @input="${(e) => this.handleInputChange(fieldName, e)}"
+        @input="${(e) => this.handleInputChange(fieldPath, e)}"
       />
     `;
   }
 
   render() {
-    if (this.loading) {
+    if (this.error) {
       return html`
         <div class="container">
-          <div class="loading">Loading form...</div>
+          <div class="error"><strong>Error:</strong> ${this.error}</div>
         </div>
       `;
     }
 
-    if (this.error) {
+    if (this.loading) {
       return html`
         <div class="container">
-          <div class="error">
-            <strong>Error:</strong> ${this.error}
-          </div>
+          <div class="loading">Loading form...</div>
         </div>
       `;
     }
@@ -641,30 +1343,106 @@ class FormBuilder extends LitElement {
       `;
     }
 
-    return html`
-      ${this.customStyles ? html`<style>${this.customStyles}</style>` : ''}
+    // NEW: Success-only view when form is completed
+    if (this.formCompleted) {
+      return html`
+        ${this.customStyles
+          ? html`<style>
+              ${this.customStyles}
+            </style>`
+          : ''}
 
-      <div class="container">
-        <form @submit="${this.handleSubmit}">
-          ${this.schema.title ? html`<h2>${this.schema.title}</h2>` : ''}
-          ${this.schema.description ? html`<p>${this.schema.description}</p>` : ''}
+        <div class="container">
+          <div class="status-message success">
+            <h2>✓ Form submitted successfully!</h2>
+            ${this.submissionStatus?.messages?.length > 0
+              ? html`
+                  <ul>
+                    ${this.submissionStatus.messages.map((msg) => html`<li>${msg}</li>`)}
+                  </ul>
+                `
+              : ''}
+          </div>
+        </div>
+      `;
+    }
 
-          ${Object.entries(this.schema.properties).map(([fieldName, fieldSchema]) =>
-            this.renderField(fieldName, fieldSchema)
-          )}
+    // Regular form view (rest of existing render code)
+    const hasFields = Object.keys(this.schema.properties).length > 0;
 
-          <div class="buttons">
-            <button type="submit" ?disabled="${this.submitting}">
-              <span class="button-content">
-                ${this.submitting ? html`<span class="spinner"></span>` : ''}
-                ${this.submitting ? 'Submitting...' : 'Submit'}
-              </span>
-            </button>
-            <button type="button" @click="${this.handleReset}" ?disabled="${this.submitting}">
-              Reset
-            </button>
-          </div>
-        </form>
+    return html`
+      ${this.customStyles
+        ? html`<style>
+            ${this.customStyles}
+          </style>`
+        : ''}
+
+      <div class="container">
+        ${this.submitSuccess
+          ? html`
+              <div class="status-message success">
+                ✓ Your form was successfully submitted.
+                ${this.submissionStatus?.messages?.length > 0
+                  ? html`
+                      <ul>
+                        ${this.submissionStatus.messages.map((msg) => html`<li>${msg}</li>`)}
+                      </ul>
+                    `
+                  : ''}
+              </div>
+            `
+          : ''}
+        ${hasFields
+          ? html`
+              <form @submit="${this.handleSubmit}" class="${this.submitting ? 'submitting' : ''}">
+                ${this.schema.title ? html`<h2>${this.schema.title}</h2>` : ''}
+                ${this.schema.description ? html`<p>${this.schema.description}</p>` : ''}
+                ${this.validationFailed
+                  ? html`
+                      <div class="status-message validation-error">
+                        ⚠ Please correct the errors below before submitting.
+                      </div>
+                    `
+                  : ''}
+                ${this.submissionError
+                  ? html`
+                      <div class="status-message error">
+                        <strong>Error:</strong> ${this.submissionError}
+                        ${this.submissionStatus?.messages?.length > 0
+                          ? html`
+                              <ul>
+                                ${this.submissionStatus.messages.map(
+                                  (msg) => html`<li>${msg}</li>`
+                                )}
+                              </ul>
+                            `
+                          : ''}
+                      </div>
+                    `
+                  : ''}
+                ${Object.entries(this.schema.properties).map(([fieldName, fieldSchema]) =>
+                  this.renderField(fieldName, fieldSchema)
+                )}
+
+                <div class="buttons">
+                  <button type="submit" ?disabled="${this.submitting}">
+                    <span class="button-content">
+                      ${this.submitting ? html`<span class="spinner"></span>` : ''}
+                      ${this.submitting ? 'Submitting...' : 'Submit'}
+                    </span>
+                  </button>
+                  <button type="button" @click="${this.handleReset}" ?disabled="${this.submitting}">
+                    Reset
+                  </button>
+                </div>
+              </form>
+            `
+          : html`
+              <div class="info-only">
+                ${this.schema.title ? html`<h2>${this.schema.title}</h2>` : ''}
+                ${this.schema.description ? html`<p>${this.schema.description}</p>` : ''}
+              </div>
+            `}
       </div>
     `;
   }