Fix public share links

.changeset/rich-actors-confess.md

@@ -0,0 +1,5 @@
+---
+'mexit-webapp': patch
+---
+
+Fix share note link of public space

.changeset/smooth-mice-mate.md

@@ -0,0 +1,5 @@
+---
+'mexit-webapp': patch
+---
+
+Fix public share links

apps/webapp/src/Components/EditorInfobar/ShareOptions.tsx

@@ -46,7 +46,7 @@ const ShareOptions = ({ context, id }: ShareOptionsProps) => {
   const [isLoading, setIsLoading] = useState(false)
   const { makeNotePrivate, makeNotePublic, isPublic } = useApi()
   // const { makeNamespacePublic, makeNamespacePrivate } = useNamespaceApi()
-  const { isNamespacePublic, makeNamespacePublic } = useNamespaces()
+  const { getNamespaceOfNodeid, isNamespacePublic, makeNamespacePublic } = useNamespaces()
 
   const publicUrl = useMemo(() => {
     if (context === 'note') {
@@ -56,6 +56,16 @@ const ShareOptions = ({ context, id }: ShareOptionsProps) => {
     }
   }, [id, isPublic, context, isNamespacePublic])
 
+  const noteNamespacePublicLink = useMemo(() => {
+    if (context === 'note') {
+      const namespace = getNamespaceOfNodeid(id)
+      return namespace && isNamespacePublic(namespace.id)
+        ? apiURLs.namespaces.getPublicURLofNote(namespace.id, id)
+        : undefined
+    }
+    return undefined
+  }, [id, context])
+
   // Helper function to set loading
   const tryError = async (fn: () => Promise<void>) => {
     try {
@@ -106,26 +116,46 @@ const ShareOptions = ({ context, id }: ShareOptionsProps) => {
       <div style={{ display: 'flex', flex: 1, alignItems: 'center' }}>
         <MexIcon color={theme.colors.primary} icon={globalLine} fontSize={24} margin="0 1rem 0 0" />
         <div style={{ gap: '1', userSelect: 'none' }}>
-          <CardTitle>Make this {context} public?</CardTitle>
-          <ItemDesc>Publish and share the link with everyone!</ItemDesc>
+          {context === 'note' && noteNamespacePublicLink ? (
+            <>
+              <CardTitle>This note is in a public space.</CardTitle>
+              <ItemDesc>Share the public space link</ItemDesc>
+            </>
+          ) : (
+            <>
+              <CardTitle>Make this {context} public?</CardTitle>
+              <ItemDesc>Publish and share the link with everyone!</ItemDesc>
+            </>
+          )}
         </div>
       </div>
       <div style={{ display: 'flex', alignItems: 'center' }}>
         <span style={{ marginRight: '.5rem' }}>
-          {publicUrl && (
-            <CopyButton text={publicUrl} size="20px" beforeCopyTooltip="Copy link" afterCopyTooltip="Link copied!" />
+          {noteNamespacePublicLink ? (
+            <CopyButton
+              text={noteNamespacePublicLink}
+              size="20px"
+              beforeCopyTooltip="Copy link"
+              afterCopyTooltip="Link copied!"
+            />
+          ) : (
+            publicUrl && (
+              <CopyButton text={publicUrl} size="20px" beforeCopyTooltip="Copy link" afterCopyTooltip="Link copied!" />
+            )
           )}
         </span>
         {isLoading ? (
           <Loading dots={3} transparent />
         ) : (
-          <ToggleButton
-            id="toggle-public"
-            value={!!publicUrl}
-            size="sm"
-            onChange={flipPublicAccess}
-            checked={!!publicUrl}
-          />
+          noteNamespacePublicLink === undefined && (
+            <ToggleButton
+              id="toggle-public"
+              value={!!publicUrl}
+              size="sm"
+              onChange={flipPublicAccess}
+              checked={!!publicUrl}
+            />
+          )
         )}
       </div>
     </Container>

apps/webapp/src/Views/PublicNamespaceView.tsx

@@ -13,6 +13,7 @@ function PublicNamespaceView() {
   const [showLoader, setShowLoader] = useState(true)
   const { setNamespace, setILinks, setCurrentNode } = usePublicNodeStore()
   const namespaceID = useParams().namespaceID
+  const noteID = useParams().nodeId
   const navigate = useNavigate()
   const { getPublicNamespaceAPI } = useNamespaceApi()
 
@@ -30,7 +31,12 @@ function PublicNamespaceView() {
           updatedAt: response.updatedAt
         })
 
-        const firstNode = response.nodeHierarchy[0]
+        // Use noteID in path params if found, otherwise open the first note in hierarchy
+        const firstNode = noteID
+          ? response.nodeHierarchy.find((node: any) => node.nodeid === noteID) ?? response.nodeHierarchy[0]
+          : response.nodeHierarchy[0]
+
+        // mog('firstNode', { firstNode, noteID })
 
         setILinks(response.nodeHierarchy)
         navigate(`node/${firstNode.nodeid}`)

libs/core/src/Utils/routes.ts

@@ -96,7 +96,9 @@ export const apiURLs = {
     share: `${MEXIT_BACKEND_URL_BASE}/namespace/share`,
     getUsersOfShared: (id: string) => `${MEXIT_BACKEND_URL_BASE}/namespace/shared/${id}/users`,
 
-    getPublicURL: (id: string) => `${MEXIT_FRONTEND_URL_BASE}/share/namespace/${id}`
+    getPublicURL: (id: string) => `${MEXIT_FRONTEND_URL_BASE}/share/namespace/${id}`,
+    getPublicURLofNote: (namespaceid: string, noteid: string) =>
+      `${MEXIT_FRONTEND_URL_BASE}/share/namespace/${namespaceid}/node/${noteid}`
   },
 
   // Link Shortener URLs