From 6d40525286543c11c6ea99c81ebba9299ebba5ca Mon Sep 17 00:00:00 2001 From: David Bolack Date: Fri, 17 Jul 2026 20:09:26 -0500 Subject: [PATCH] Remove relocate failover defaults to brewDefaults --- server/brewDefaults.js | 23 +++++++++++++++++++++-- shared/helpers.js | 28 ++++++++++++++-------------- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/server/brewDefaults.js b/server/brewDefaults.js index 501914735..fecdfa052 100644 --- a/server/brewDefaults.js +++ b/server/brewDefaults.js @@ -20,8 +20,27 @@ const DEFAULT_BREW = { published : false, pageCount : 1, gDrive : false, - trashed : false - + trashed : false, + bleed : { + top : '.125in', + bottom : '.125in', + inner : '.125in', + outer : '.125in' + }, + safetySpace : { + top : '.25in', + bottom : '.25in', + outer : '.25in', + inner : '.5in', + }, + trimSize : { + width : '8.5in', + height : '11in', + }, + columns : '2', + columnGutter : '.125in', + license : 'None', + legalAuthors : '' }; // Default values for older brews with missing properties // e.g., missing "renderer" is assumed to be "legacy" diff --git a/shared/helpers.js b/shared/helpers.js index ab78caf71..63d348bb5 100644 --- a/shared/helpers.js +++ b/shared/helpers.js @@ -97,35 +97,35 @@ const splitTextStyleAndMetadata = (brew)=>{ // Copy Required Bleed Space or Use defaults brew.bleed = { - top : metadata.bleed?.top || '.125in', - bottom : metadata.bleed?.bottom || '.125in', - inner : metadata.bleed?.inner || '.125in', - outer : metadata.bleed?.outer || '.125in', + top : metadata.bleed?.top, + bottom : metadata.bleed?.bottom, + inner : metadata.bleed?.inner, + outer : metadata.bleed?.outer, }; // Copy Required Safe Space or Use defaults brew.safetySpace = { - top : metadata.safetySpace?.top || '.25in', - bottom : metadata.safetySpace?.bottom || '.25in', - outer : metadata.safetySpace?.outer || '.25in', - inner : metadata.safetySpace?.inner || '.5in', + top : metadata.safetySpace?.top, + bottom : metadata.safetySpace?.bottom, + outer : metadata.safetySpace?.outer, + inner : metadata.safetySpace?.inner, }; // Set brew paper trim size or default to US Letter brew.trimSize = { - width : metadata.trimSize?.width || '8.5in', - height : metadata.trimSize?.height || '11in', + width : metadata.trimSize?.width, + height : metadata.trimSize?.height, }; // Set Column specs or use defaults - brew.columns = metadata?.columns || 2; - brew.columnGutter = metadata?.columnGutter || '.125in'; + brew.columns = metadata?.columns; + brew.columnGutter = metadata?.columnGutter; // Set License or set to Unlicensed - brew.license = metadata?.license || 'None'; + brew.license = metadata?.license; // Set Authors legal names or to empty. - brew.legalAuthors = metadata.legalAuthors || ''; + brew.legalAuthors = metadata.legalAuthors; brew.text = brew.text.slice(index + 6); }