From b047cb0e1fa68bdae6a3bf72b87e37b53c6e392c Mon Sep 17 00:00:00 2001
From: Enoch Riese <enoch.riese@gmail.com>
Date: Tue, 5 Jul 2022 18:37:29 -0500
Subject: [PATCH] fixing little issues

---
 config/software/index.mjs                                 | 8 ++++----
 sites/shared/components/workbench/draft/svg-wrapper.js    | 2 +-
 .../components/workbench/inputs/design-option-pct-deg.js  | 2 +-
 .../workbench/menu/design-options/option-value.js         | 2 +-
 .../components/workbench/menu/design-options/option.js    | 4 ++--
 sites/shared/components/wrappers/workbench.js             | 2 ++
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/config/software/index.mjs b/config/software/index.mjs
index 305f002ccdb..c531b0597db 100644
--- a/config/software/index.mjs
+++ b/config/software/index.mjs
@@ -1,7 +1,7 @@
-import designsByType from './designs.json'
-import packages from './packages.json'
-import plugins from './plugins.json'
-import sites from './sites.json'
+import designsByType from './designs.json' assert { type: 'json' }
+import packages from './packages.json' assert { type: 'json' }
+import plugins from './plugins.json' assert { type: 'json' }
+import sites from './sites.json' assert { type: 'json' }
 
 // Helper method to construct summary objects
 const unpack = (obj, folder) => Object.fromEntries(
diff --git a/sites/shared/components/workbench/draft/svg-wrapper.js b/sites/shared/components/workbench/draft/svg-wrapper.js
index 6f276f02cff..8f737841084 100644
--- a/sites/shared/components/workbench/draft/svg-wrapper.js
+++ b/sites/shared/components/workbench/draft/svg-wrapper.js
@@ -38,7 +38,7 @@ const SvgWrapper = props => {
         <div style={{ width: size.width+'px', }}>
           <Svg {...patternProps} embed={gist.embed}>
             <Defs {...patternProps} />
-            <style>{`:root { --pattern-scale: ${gist.scale || 1}}`}</style>
+            <style>{`:root { --pattern-scale: ${gist.scale || 1}} ${patternProps.svg.style}`}</style>
             <g>
               {Object.keys(patternProps.parts).map((name) => (
                 <Part {...{ app, gist, updateGist, unsetGist, showInfo }}
diff --git a/sites/shared/components/workbench/inputs/design-option-pct-deg.js b/sites/shared/components/workbench/inputs/design-option-pct-deg.js
index 1b6174956c0..73f58833c32 100644
--- a/sites/shared/components/workbench/inputs/design-option-pct-deg.js
+++ b/sites/shared/components/workbench/inputs/design-option-pct-deg.js
@@ -92,7 +92,7 @@ const DesignOptionPctDeg = props => {
       />
       <div className="flex flex-row justify-between">
         <span className={val===dflt ? 'text-secondary' : 'text-accent'}>
-          {props.design.config.options[props.option]?.toAbs
+          {props.design.config.options[props.option]?.toAbs && props.gist.measurements
             ? formatMm(props.design.config.options[props.option].toAbs(value/100, props.gist))
             : ' '
           }
diff --git a/sites/shared/components/workbench/menu/design-options/option-value.js b/sites/shared/components/workbench/menu/design-options/option-value.js
index a92966dc535..1f689da5d99 100644
--- a/sites/shared/components/workbench/menu/design-options/option-value.js
+++ b/sites/shared/components/workbench/menu/design-options/option-value.js
@@ -13,7 +13,7 @@ export const values = {
           : 'text-accent'
       }>
         {formatPercentage(val)}
-        {props.design.config.options[props.option]?.toAbs
+        {props.design.config.options[props.option]?.toAbs && props.gist.measurements
           ? ' | ' +formatMm(props.design.config.options[props.option]?.toAbs(val, props.gist))
           : null
         }
diff --git a/sites/shared/components/workbench/menu/design-options/option.js b/sites/shared/components/workbench/menu/design-options/option.js
index 6e299532f03..b2da2f89b04 100644
--- a/sites/shared/components/workbench/menu/design-options/option.js
+++ b/sites/shared/components/workbench/menu/design-options/option.js
@@ -11,9 +11,9 @@ const Option = props => {
   const type = optionType(opt)
   const Input = inputs[type]
   const Value = values[type]
-  const hide = opt.hide && opt.hide(props.draft.settings);
+  const hide = opt.hide && opt.hide(props.draft.settings.options);
 
-  if (hide) return <Li></Li>
+  if (hide) return null
 
   if (type === 'bool') {
     const toggleBoolean = () => {
diff --git a/sites/shared/components/wrappers/workbench.js b/sites/shared/components/wrappers/workbench.js
index c52eb4b09e0..985ae7bb533 100644
--- a/sites/shared/components/wrappers/workbench.js
+++ b/sites/shared/components/wrappers/workbench.js
@@ -32,6 +32,8 @@ const views = {
 }
 
 const hasRequiredMeasurementsMethod = (design, gist) => {
+  if (design.config.measurements.length && !gist.measurements) return false
+
   for (const m of design.config.measurements || []) {
     if (!gist?.measurements?.[m]) return false
   }