From bc1d873b19f2bda0e7b38198bb37000be34710b2 Mon Sep 17 00:00:00 2001
From: Jonathan Haas <haasjona@gmail.com>
Date: Fri, 18 Apr 2025 06:20:50 +0000
Subject: [PATCH] [org] fix: Restore public view of measurement sets (#247)

Also by default view imperial measurement sets as imperial and metric ones as metric (this is questionable, and should probably be discussed, alternatively we could default displayAsMetric to the account setting?)

Fixes #230

Reviewed-on: https://codeberg.org/freesewing/freesewing/pulls/247
Reviewed-by: Joost De Cock <joostdecock@noreply.codeberg.org>
Co-authored-by: Jonathan Haas <haasjona@gmail.com>
Co-committed-by: Jonathan Haas <haasjona@gmail.com>
---
 packages/react/components/Account/Set.mjs | 32 +++++++++++------------
 sites/org/docs/set/index.mdx              | 16 ++++++++++++
 2 files changed, 31 insertions(+), 17 deletions(-)
 create mode 100644 sites/org/docs/set/index.mdx

diff --git a/packages/react/components/Account/Set.mjs b/packages/react/components/Account/Set.mjs
index 843c6f7117e..4ac96486407 100644
--- a/packages/react/components/Account/Set.mjs
+++ b/packages/react/components/Account/Set.mjs
@@ -6,7 +6,7 @@ import {
   urls,
 } from '@freesewing/config'
 import { measurements as measurementTranslations } from '@freesewing/i18n'
-import { i18n, measurements as designMeasurements } from '@freesewing/collection'
+import { measurements as designMeasurements } from '@freesewing/collection'
 import {
   cloudflareImageUrl,
   formatMm,
@@ -31,8 +31,6 @@ import {
   CompareIcon,
   CuratedMeasurementsSetIcon,
   EditIcon,
-  FlagIcon,
-  MeasurementsSetIcon,
   NoIcon,
   OkIcon,
   ResetIcon,
@@ -58,10 +56,6 @@ import { Yaml } from '@freesewing/react/components/Yaml'
 import { Popout } from '@freesewing/react/components/Popout'
 import { bundlePatternTranslations, draft, flattenFlags } from '../Editor/lib/index.mjs'
 import { Bonny } from '@freesewing/bonny'
-import { ZoomablePattern } from '../Editor/components/ZoomablePattern.mjs'
-import { HeaderMenuDraftViewFlags } from '../Editor/components/HeaderMenu.mjs'
-import { Flag, FlagsAccordionEntries } from '../Editor/components/Flag.mjs'
-import { i18n as pluginI18n } from '@freesewing/core-plugins'
 import { MiniNote, MiniTip } from '../Mini/index.mjs'
 
 const t = (input) => {
@@ -74,7 +68,7 @@ const t = (input) => {
  *
  * @param {object} props - All React props
  * @param {number} id - The ID of the measurements set to load
- * @param {bool} publicOnly - FIXME
+ * @param {bool} publicOnly - If the set should be used with the backend.getPublicSet method
  * @param {function} Link - An optional framework-specific Link component to use for client-side routing
  * @param {object} measurementHelpProvider - A function that returns a url or action to show help for a specific measurement
  */
@@ -116,6 +110,7 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
         setImperial(body.set.imperial ? true : false)
         setNotes(body.set.notes)
         setMeasies(body.set.measies)
+        setDisplayAsMetric(body.set.imperial ? false : true)
         setLoadingStatus([true, 'Measurements set loaded', true, true])
       } else setLoadingStatus([true, 'An error occured while contacting the backend', true, false])
     }
@@ -123,17 +118,20 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
       setLoadingStatus([true, 'Contacting the backend'])
       const [status, body] = await backend.getPublicSet(id)
       if (status === 200 && body.result === 'success') {
+        const isImperial = body.units === 'imperial'
         setMset({
-          ...body.data,
+          ...body,
           public: true,
-          measies: body.data.measurements,
+          measies: body.measurements,
+          imperial: isImperial,
         })
-        setName(body.data.name)
-        setImage(body.data.image)
-        setIsPublic(body.data.public ? true : false)
-        setImperial(body.data.imperial ? true : false)
-        setNotes(body.data.notes)
-        setMeasies(body.data.measurements)
+        setName(body.name)
+        setImage(body.image)
+        setIsPublic(body.public ? true : false)
+        setImperial(isImperial)
+        setNotes(body.notes)
+        setMeasies(body.measurements)
+        setDisplayAsMetric(!isImperial)
         setLoadingStatus([true, 'Measurements set loaded', true, true])
       } else
         setLoadingStatus([
@@ -276,7 +274,7 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
             </button>
           ) : null}
           {account.control > 2 ? (
-            <BookmarkButton slug={`sets/${mset.id}`} title={mset.name} type="set" thing="set" />
+            <BookmarkButton slug={`set?id=${mset.id}`} title={mset.name} type="set" thing="set" />
           ) : null}
           <button
             onClick={() =>
diff --git a/sites/org/docs/set/index.mdx b/sites/org/docs/set/index.mdx
new file mode 100644
index 00000000000..6a40b093417
--- /dev/null
+++ b/sites/org/docs/set/index.mdx
@@ -0,0 +1,16 @@
+---
+title: Measurement Set
+sidebar_class_name: tw-hidden
+---
+
+import { getSearchParam } from '@freesewing/utils'
+import { DocusaurusDoc } from '@freesewing/react/components/Docusaurus'
+import { RoleBlock } from '@freesewing/react/components/Role'
+import { Set } from '@freesewing/react/components/Account'
+import Link from '@docusaurus/Link'
+
+<DocusaurusDoc>
+  <RoleBlock user>
+    <Set Link={Link} id={getSearchParam('id')} publicOnly={true} />
+  </RoleBlock>
+</DocusaurusDoc>