- fix for js for template break missing

- fix for boolean formatting in dumb adobe that doesn't adhere to casting rules - improvement of remove all for custom fields with nice confirmations and only show when they exist.
Ortus-Solutions · Oct 20, 2023 · 8480409 · 8480409
1 parent 5e747a3
commit 8480409
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 39 deletions.
diff --git a/box.json b/box.json
@@ -33,14 +33,14 @@
         "testbox":"^5.0.0+1",
         "commandbox-cfformat":"*",
         "commandbox-docbox":"*",
-        "route-visualizer":"^1.4.0+24",
-        "cbdebugger":"be"
+        "cbdebugger":"be",
+        "route-visualizer":"^2.0.0+6"
     },
     "installPaths":{
         "testbox":"testbox/",
         "coldbox":"coldbox/",
-        "route-visualizer":"modules/route-visualizer/",
-        "cbdebugger":"modules/cbdebugger/"
+        "cbdebugger":"modules/cbdebugger/",
+        "route-visualizer":"modules/route-visualizer/"
     },
     "ignores":[],
     "scripts":{

diff --git a/config/modules/cbdebugger.cfc b/config/modules/cbdebugger.cfc
@@ -7,15 +7,15 @@ component {
 			enabled          : getSystemSetting( "CBDEBUGGER_ENABLED", false ),
 			// This setting controls if you will activate the debugger for visualizations ONLY
 			// The debugger will still track requests even in non debug mode.
-			debugMode        : false,
+			debugMode        : true,
 			// The URL password to use to activate it on demand
 			debugPassword    : "cb",
 			// This flag enables/disables the end of request debugger panel docked to the bottem of the page.
 			// If you disable i, then the only way to visualize the debugger is via the `/cbdebugger` endpoint
-			requestPanelDock : false,
+			requestPanelDock : true,
 			// Request Tracker Options
 			requestTracker   : {
-				storage                      : "cachebox",
+				storage                      : "memory",
 				cacheName                    : "template",
 				trackDebuggerEvents          : false,
 				// Expand by default the tracker panel or not
@@ -46,7 +46,7 @@ component {
 				httpRequest : {
 					expanded        : false,
 					// If enabled, we will profile HTTP Body content, disabled by default as it contains lots of data
-					profileHTTPBody : false
+					profileHTTPBody : true
 				}
 			},
 			// ColdBox Tracer Appender Messages
@@ -80,7 +80,19 @@ component {
 				// Log the binding parameters
 				logParams : false
 			},
-			async : { enabled : false, expanded : false }
+			// Adobe ColdFusion SQL Collector
+			acfSql   : { enabled : false, expanded : false, logParams : true },
+			// Lucee SQL Collector
+			luceeSQL : { enabled : false, expanded : false, logParams : true },
+			// Async Manager Collector
+			async    : { enabled : true, expanded : false },
+			// Hyper Collector
+			hyper    : {
+				enabled         : false,
+				expanded        : false,
+				logResponseData : false,
+				logRequestBody  : false
+			}
 		};
 	}
 

diff --git a/modules/contentbox/modules/contentbox-admin/resources/assets/js/editors/editors.js b/modules/contentbox/modules/contentbox-admin/resources/assets/js/editors/editors.js
@@ -612,6 +612,7 @@ window.applyContentTemplateToField = function( fieldName, definition ){
 							}
 						}
 					);
+					break;
 				}
 				default:{
 					if ( $templateField[ 0 ].localName == "select" ){

diff --git a/modules/contentbox/modules/contentbox-admin/views/_components/editor/CustomFields.cfm b/modules/contentbox/modules/contentbox-admin/views/_components/editor/CustomFields.cfm
@@ -28,7 +28,8 @@
 			type="button"
 			id="removeCustomFieldsButton"
 			class="btn btn-sm btn-danger"
-			@click="cleanCustomFields"
+			x-show="customFields.length > 0"
+			@click="removeAllCustomFields"
 		>
 			<i class="fa fa-trash fa-lg"></i> Remove All
 		</button>

diff --git a/modules/contentbox/modules/contentbox-admin/views/_components/editor/CustomFieldsHelper.cfm b/modules/contentbox/modules/contentbox-admin/views/_components/editor/CustomFieldsHelper.cfm
@@ -27,12 +27,10 @@ function customFieldsModel(){
 			this.customFields.push( newField );
 		},
 
-		cleanCustomFields(){
-			this.customFields.forEach( ( item, index ) => {
-				if( !item.key.trim() ){
-					this.customFields.splice( index, 1 );
-				}
-			} );
+		removeAllCustomFields(){
+			if( confirm( "Really delete all custom fields?" ) ){
+				this.customFields = [];
+			}
 		},
 
 		removeCustomField( field ){

diff --git a/modules/contentbox/modules/contentbox-admin/views/content/editorHelper.cfm b/modules/contentbox/modules/contentbox-admin/views/content/editorHelper.cfm
@@ -1,15 +1,19 @@
 <cfoutput>
 <script>
 window.authentication = #toJSON( prc.jwtTokens )#
-window.assignedTemplate = #( !isNull( prc.oContent.getContentTemplate() ) ? toJSON( prc.oContent.getContentTemplate().getMemento() ) : javacast( "boolean", false ) )#
+window.assignedTemplate = #( !isNull( prc.oContent.getContentTemplate() ) ? toJSON( prc.oContent.getContentTemplate().getMemento() ) : booleanFormat( false ) )#
 
 // Editor alerts model
 function alertsModel(){
 	return {
-		init(){
-			$nextTick( () => window.alerts = this.alerts ) },
 		alerts : [],
+
+		init(){
+			$nextTick( () => window.alerts = this.alerts )
+		},
+
 		removeAlert : index => this.alerts.splice( index, 1 ),
+
 		addAlert( alert ){
 			if( alert instanceof CustomEvent ){
 				alert = alert.detail
@@ -18,36 +22,41 @@ function alertsModel(){
 		}
 	}
 }
+
 /**
  * Enclosure for custom editor startup
  */
 $cbEditorStartup = function(){
 	#prc.oEditorDriver.startup()#
 }
+
 /**
  * Enclosure for custom editor startup
  */
 $cbEditorShutdown = function(){
 	#prc.oEditorDriver.shutdown()#
 }
 
-// Dynamic global variables coming from ColdFusion
-$cbEditorConfig = {
-	adminEntryPoint 	: "#prc.cbAdminEntryPoint#",
-	adminEntryURL		: "#event.buildLink( prc.cbAdminEntryPoint )#",
-	changelogMandatory	: #prc.cbSettings.cb_versions_commit_mandatory#,
-	isBlogDisabled		: #prc.oCurrentSite.getIsBlogEnabled() ? 'false' : 'true'#,
-	// Set by the content type handler
-	slugifyURL			: "#event.buildLink( prc.xehSlugify )#",
-	slugCheckURL		: "#event.buildLink( prc.xehSlugCheck )#"
-};
-
 // Load Editor Provider Assets now
 #prc.oEditorDriver.loadAssets()#
+
 // On Dom Ready
 document.addEventListener( "DOMContentLoaded", () => {
+
+	// Dynamic global variables coming from ColdFusion
+	$cbEditorConfig = {
+		adminEntryPoint 	: "#prc.cbAdminEntryPoint#",
+		adminEntryURL		: "#event.buildLink( prc.cbAdminEntryPoint )#",
+		changelogMandatory	: #prc.cbSettings.cb_versions_commit_mandatory#,
+		isBlogDisabled		: #prc.oCurrentSite.getIsBlogEnabled() ? 'false' : 'true'#,
+		// Set by the content type handler
+		slugifyURL			: "#event.buildLink( prc.xehSlugify )#",
+		slugCheckURL		: "#event.buildLink( prc.xehSlugCheck )#"
+	};
+
  	// Editor Form Pointer
 	$contentForm = $( "##contentForm" );
+
 	// Setup the Editors
 	setupEditors(
 		$contentForm,
@@ -58,6 +67,8 @@ document.addEventListener( "DOMContentLoaded", () => {
 		</cfif>
 		'#event.buildLink( prc.xehContentSave )#'
 	);
+
+	// Apply content templates
 	if( document.getElementById( 'contentTemplate' ) && document.getElementById( 'contentTemplate' ).value !== 'null' ){
 		applyContentTemplate( document.getElementById( 'contentTemplate' ).value );
 	}

diff --git a/modules/contentbox/modules/contentbox-admin/views/contentStore/index.cfm b/modules/contentbox/modules/contentbox-admin/views/contentStore/index.cfm
@@ -112,7 +112,7 @@
 									</button>
 									<ul class="dropdown-menu list-unstyled">
 										<cfif prc.availableTemplates.len()>
-											<li class="dropdown-header"><i class="fa fa-map-o"></i> From Template:</li>
+											<li class="dropdown-header"><i class="fa fa-object-group"></i> From Template:</li>
 											<cfloop array="#prc.availableTemplates#" item="template">
 												<li class="mb-5">
 													<a
@@ -130,7 +130,7 @@
 												</a>
 											</li>
 										<li class="mb-5">
-											<a href="#event.buildLink( prc.xehTemplates & "##create-ContentStore" )#"><i class="fa fa-map-o"></i> New Template</a>
+											<a href="#event.buildLink( prc.xehTemplates & "##create-ContentStore" )#"><i class="fa fa-object-group"></i> New Template</a>
 										</li>
 									</ul>
 								</div>

diff --git a/modules/contentbox/modules/contentbox-admin/views/contentTemplates/index.cfm b/modules/contentbox/modules/contentbox-admin/views/contentTemplates/index.cfm
@@ -6,7 +6,7 @@
 		<div class="row">
 			<div class="col-md-12">
 				<h1 class="h1">
-					<i class="fa fa-tags"></i> Content Templates (<span x-text="templates.length"></span>)
+					<i class="fa fa-object-group"></i> Content Templates (<span x-text="templates.length"></span>)
 				</h1>
 			</div>
 		</div>
@@ -574,4 +574,4 @@
 			prePostExempt = true
 		)#
 	</cfif>
-	</cfoutput>
+	</cfoutput>
diff --git a/modules/contentbox/modules/contentbox-admin/views/entries/index.cfm b/modules/contentbox/modules/contentbox-admin/views/entries/index.cfm
@@ -116,7 +116,7 @@
 									</button>
 									<ul class="dropdown-menu list-unstyled">
 										<cfif prc.availableTemplates.len()>
-											<li class="dropdown-header"><i class="fa fa-map-o"></i> From Template:</li>
+											<li class="dropdown-header"><i class="fa fa-object-group"></i> From Template:</li>
 											<cfloop array="#prc.availableTemplates#" item="template">
 												<li class="mb-5">
 													<a
@@ -135,7 +135,7 @@
 												</a>
 											</li>
 										<li class="mb-5">
-											<a href="#event.buildLink( prc.xehTemplates & "##create-Entry" )#"><i class="fa fa-map-o"></i> New Template</a>
+											<a href="#event.buildLink( prc.xehTemplates & "##create-Entry" )#"><i class="fa fa-object-group"></i> New Template</a>
 										</li>
 									</ul>
 								</div>

diff --git a/modules/contentbox/modules/contentbox-admin/views/pages/index.cfm b/modules/contentbox/modules/contentbox-admin/views/pages/index.cfm
@@ -113,12 +113,16 @@
 										</button>
 										<ul class="dropdown-menu list-unstyled">
 											<cfif prc.availableTemplates.len()>
-												<li class="dropdown-header"><i class="fa fa-map-o"></i> From Template:</li>
+												<li class="dropdown-header">
+													<i class="fa fa-object-group"></i> From Template:
+												</li>
 												<cfloop array="#prc.availableTemplates#" item="template">
 													<li class="mb-5">
 														<a
 															href="#event.buildLink( prc.xehPageEditor & "/parentId/" & encodeForHTMLAttribute( rc.parent ) & "?contentTemplate=" & encodeForHTMLAttribute( template[ "templateID" ] ) )#"
-														><small><i class="fa fa-plus"></i> #template[ "name" ]#</small></a>
+														>
+															<small><i class="fa fa-clone"></i> #template[ "name" ]#</small>
+														</a>
 													</li>
 												</cfloop>
 												<li role="separator" class="divider"></li>
@@ -131,7 +135,7 @@
 													</a>
 												</li>
 											<li class="mb-5">
-												<a href="#event.buildLink( prc.xehTemplates & "##create" )#"><i class="fa fa-map-o"></i> New Template</a>
+												<a href="#event.buildLink( prc.xehTemplates & "##create" )#"><i class="fa fa-object-group"></i> New Template</a>
 											</li>
 										</ul>
 									</div>
-Original file line number
+Diff line change
@@ Expand Up @@
     							}
     						}
     					);
+    					break;
     				}
     				default:{
     					if ( $templateField[ 0 ].localName == "select" ){
@@ Expand Down @@