From 6505b5c56248c5562931f12775339424c031bf7f Mon Sep 17 00:00:00 2001
From: Luis Majano <lmajano@gmail.com>
Date: Mon, 2 May 2022 14:51:19 -0600
Subject: [PATCH] CBDEBUGGER-19 #resolve patches to have real serialized form
 data.

---
 .github/workflows/ci.yml                      |  1 +
 .github/workflows/tests.yml                   |  2 ++
 box.json                                      |  2 +-
 changelog.md                                  |  7 ++++++
 models/DebuggerService.cfc                    |  2 +-
 .../requestTracker/httpRequestPanel.cfm       | 22 +++++++++----------
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index be4c335..d2cfef6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,6 +47,7 @@ jobs:
         uses: Ortus-Solutions/setup-commandbox@main
         with:
           forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
+          version: 5.4.2
 
       - name: Setup Environment Variables For Build Process
         id: current_version
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 599c22d..19cbb77 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -51,6 +51,8 @@ jobs:
 
       - name: Setup CommandBox CLI
         uses: Ortus-Solutions/setup-commandbox@main
+        with:
+          version: 5.4.2
 
       - name: Install Dependencies
         run: |
diff --git a/box.json b/box.json
index 90d5657..c0c2024 100644
--- a/box.json
+++ b/box.json
@@ -2,7 +2,7 @@
     "name":"ColdBox Debugger",
     "author":"Ortus Solutions <info@ortussolutions.com",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbdebugger/@build.version@/cbdebugger-@build.version@.zip",
-    "version":"3.4.0",
+    "version":"3.3.2",
     "slug":"cbdebugger",
     "type":"modules",
     "homepage":"https://github.com/coldbox-modules/cbdebugger",
diff --git a/changelog.md b/changelog.md
index b2cd613..9fab2f9 100644
--- a/changelog.md
+++ b/changelog.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+----
+
+## [3.3.2] => 2022-MAY-02
+
+### Fixed
+
+* [CBDEBUGGER-19](https://ortussolutions.atlassian.net/browse/CBDEBUGGER-19) - JSON Form serialization not working on formatting.
 
 ----
 
diff --git a/models/DebuggerService.cfc b/models/DebuggerService.cfc
index a6dd2c6..a06ae49 100755
--- a/models/DebuggerService.cfc
+++ b/models/DebuggerService.cfc
@@ -191,7 +191,7 @@ component
 			"exception"     : {},
 			"executionTime" : 0,
 			"endFreeMemory" : 0,
-			"formData"      : ( form ?: {} ),
+			"formData"      : serializeJson( form ?: {} ),
 			"fullUrl"       : arguments.event.getFullUrl(),
 			"httpHost"      : cgi.HTTP_HOST,
 			"httpReferer"   : cgi.HTTP_REFERER,
diff --git a/views/main/panels/requestTracker/httpRequestPanel.cfm b/views/main/panels/requestTracker/httpRequestPanel.cfm
index 1a11096..b58b78b 100644
--- a/views/main/panels/requestTracker/httpRequestPanel.cfm
+++ b/views/main/panels/requestTracker/httpRequestPanel.cfm
@@ -100,18 +100,16 @@
 				</tr>
 			</cfif>
 			<!--- Form Params --->
-			<cfif structCount( args.profiler.formData )>
-				<tr>
-					<th width="125" align="right">Form Params:</th>
-					<td>
-						<div class="cbd-cellScroller">
-							<code>
-								<pre>#jsonFormatter.formatJSON( args.profiler.formData.toString() )#</pre>
-							</code>
-						</div>
-					</td>
-				</tr>
-			</cfif>
+			<tr>
+				<th width="125" align="right">Form Params:</th>
+				<td>
+					<div class="cbd-cellScroller">
+						<code>
+							<pre>#jsonFormatter.formatJSON( args.profiler.formData )#</pre>
+						</code>
+					</div>
+				</td>
+			</tr>
 		</table>
 
 		<cfset headerKeys = args.profiler.requestData.headers.keyArray()>