@ossy/resources 3.7.1 → 3.9.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ossy/resources",
   "description": "Resource domain — aggregate and events for the Ossy resource model",
-  "version": "3.7.1",
+  "version": "3.9.0",
   "private": false,
   "type": "module",
   "main": "./src/index.js",
@@ -23,10 +23,10 @@
     "src": "./src"
   },
   "dependencies": {
-    "@ossy/event-store": "^3.7.0",
+    "@ossy/event-store": "^3.8.0",
     "@ossy/fold": "^3.4.0",
-    "@ossy/platform": "^3.7.1",
-    "@ossy/schema": "^3.6.1"
+    "@ossy/platform": "^3.9.0",
+    "@ossy/schema": "^3.8.0"
   },
   "peerDependencies": {
     "@ossy/design-system": ">=1.0.0",
@@ -49,5 +49,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "1ee220424da6b065034a7f52f52aa4a6ce7c88d5"
+  "gitHead": "f404be69becb27a1fd853a6ff1903554e76e7d17"
 }

package/src/CreateDirectory.page.jsx

@@ -8,12 +8,13 @@ export const metadata = {
     sv: '/resources/create/mapp',
     en: '/resources/create/directory',
   },
+  layout: '@ossy/app/layout/blank',
 }
 
 
 export const CreateDirectoryPage = () => {
   return (
-    <View layout="off-center-s" style={{ height: '100%' }}>
+    <View surface="base" layout="off-center-s" inset="s" style={{ minHeight: '100dvh' }}>
       <View data-region="content" surface="primary" roundness="m" inset="m">
         <CreateDirectory/>
       </View>

package/src/CreateDocument.jsx

@@ -1,38 +1,106 @@
-import React, { useState } from 'react'
+import React, { useMemo, useState } from 'react'
 import { createDocument } from './resource.helpers.js'
 import { useSdk } from '@ossy/sdk-react'
-import { Alert, useLocale } from '@ossy/design-system'
+import { Alert, Button, Text, View, useLocale } from '@ossy/design-system'
 import { useRouter } from '@ossy/router-react'
 import { GenericResourceForm } from './GenericResourceForm.jsx'
+import { useSchemas } from './useSchemas.js'
+import { safeReturnTo, schemasForGenericCreate } from './document-create.helpers.js'
 
 export const CreateDocument = () => {
   const { t } = useLocale()
   const router = useRouter()
   const schemaId = router.searchParams.schemaId
   const location = router.searchParams.location
+  const category = router.searchParams.category
   const sdk = useSdk()
+  const schemas = useSchemas()
   const [error, setError] = useState()
 
-  const onCancel = () => {
-    const search = new URLSearchParams({ location }).toString()
-    router.navigate(`@storage/home?${search}`)
+  const returnTo = safeReturnTo(router.searchParams.returnTo)
+
+  const creatable = useMemo(
+    () => schemasForGenericCreate(schemas, { category: category || undefined }),
+    [schemas, category],
+  )
+
+  const grouped = useMemo(() => {
+    const groups = new Map()
+    for (const schema of creatable) {
+      const name = schema.categoryName || t('resources.form.otherCategory')
+      const list = groups.get(name) || []
+      list.push(schema)
+      groups.set(name, list)
+    }
+    return [...groups.entries()].sort(([a], [b]) => a.localeCompare(b))
+  }, [creatable, t])
+
+  const onDone = () => {
+    if (returnTo) {
+      router.navigate(returnTo)
+      return
+    }
+    const search = location ? new URLSearchParams({ location }).toString() : ''
+    router.navigate(`@storage/home${search ? `?${search}` : ''}`)
   }
 
   const onSubmit = ({ name, content, type }) => {
     createDocument(sdk, { type, location, name, content })
-      .then(() => onCancel())
+      .then(() => onDone())
       .catch((err) => setError(err?.message || t('resources.form.createFailed')))
   }
 
+  const selectSchema = (id) => {
+    const params = new URLSearchParams()
+    if (location) params.set('location', location)
+    if (category) params.set('category', category)
+    if (returnTo) params.set('returnTo', returnTo)
+    params.set('schemaId', id)
+    router.navigate(`@create-document?${params.toString()}`)
+  }
+
+  if (!schemaId) {
+    return (
+      <View gap="m" style={{ minWidth: 'min(28rem, calc(100vw - 2rem))' }}>
+        <View gap="xs">
+          <Text variant="heading-tertiary" as="h3" text="resources.createDocument.title" />
+          <Text color="secondary" text="resources.createDocument.pickType" />
+        </View>
+        {grouped.length === 0 ? (
+          <Text color="secondary" text="resources.createDocument.noTypes" />
+        ) : grouped.map(([categoryName, items]) => (
+          <View key={categoryName} gap="s">
+            <Text variant="small" weight="medium">{categoryName}</Text>
+            <View layout="row" gap="s" style={{ flexWrap: 'wrap' }}>
+              {items.map((schema) => (
+                <Button
+                  key={schema.id}
+                  variant="neutral"
+                  prefix={schema.icon || 'add'}
+                  onClick={() => selectSchema(schema.id)}
+                >
+                  {schema.name || schema.id}
+                </Button>
+              ))}
+            </View>
+          </View>
+        ))}
+        <View layout="row" justifyContent="flex-end">
+          <Button variant="link" onClick={onDone} label="design-system.cancel" />
+        </View>
+      </View>
+    )
+  }
+
   return (
     <>
+      {error && <Alert variant="danger">{error}</Alert>}
       <GenericResourceForm
         schemaId={schemaId}
         mode="create"
         onSubmit={onSubmit}
-        onCancel={onCancel}
+        onCancel={onDone}
       />
-      {error && <Alert>{error}</Alert>}
     </>
   )
 }

package/src/CreateDocument.page.jsx

@@ -8,12 +8,13 @@ export const metadata = {
     sv: '/resources/create/dokument',
     en: '/resources/create/document',
   },
+  layout: '@ossy/app/layout/blank',
 }
 
 
 export const CreateDocumentPage = () => {
   return (
-    <View layout="off-center-m" style={{ height: '100%' }}>
+    <View surface="base" layout="off-center-m" inset="s" style={{ minHeight: '100dvh' }}>
       <View data-region="content" surface='primary' roundness='m' inset="m">
         <CreateDocument />
       </View>

package/src/GenericResourceForm.jsx

@@ -33,27 +33,33 @@ function ResourceCreateFormFallback ({
   const [content, setContent] = useState(initialContent)
   const [error, setError] = useState()
 
-  const handleSubmit = () => {
-    if (!name?.trim()) {
+  const handleSubmit = (event) => {
+    event?.preventDefault?.()
+    const title = name?.trim() || (typeof content?.name === 'string' ? content.name.trim() : '')
+    if (!title) {
       setError(t('resources.form.nameRequired'))
       return
     }
-    if (template) {
-      const result = validateContent(engine, template, content)
-      if (!result.ok) {
-        setError(result.message)
+    try {
+      if (template) {
+        const result = validateContent(engine, template, content)
+        if (!result.ok) {
+          setError(result.message)
+          return
+        }
+        setError(undefined)
+        onSubmit?.({ name: title, content: result.data, type: schemaId })
         return
       }
       setError(undefined)
-      onSubmit?.({ name: name.trim(), content: result.data, type: schemaId })
-      return
+      onSubmit?.({ name: title, content, type: schemaId })
+    } catch (err) {
+      setError(err?.message || t('resources.form.createFailed'))
     }
-    setError(undefined)
-    onSubmit?.({ name: name.trim(), content, type: schemaId })
   }
 
   return (
-    <View stack gap="m">
+    <View as="form" stack gap="m" onSubmit={handleSubmit}>
       <InputTitle
         id="resource-name"
         type="text"
@@ -73,7 +79,7 @@ function ResourceCreateFormFallback ({
       {error && <Alert variant="danger">{error}</Alert>}
       <View layout="row" gap="s" justifyContent="flex-end">
         {onCancel && <Button variant="link" onClick={onCancel} label="design-system.cancel" />}
-        <Button variant="cta" onClick={handleSubmit}>
+        <Button type="submit" variant="cta">
           {submitLabel || (template?.name ? `${t('design-system.add')} ${template.name}` : t('resources.form.createResource'))}
         </Button>
       </View>

package/src/ResourceDetails.jsx

@@ -1,6 +1,5 @@
-import React, { useState } from 'react'
+import React from 'react'
 import { metadata as GetResource } from './get.action.js'
-import { updateResourceAccess } from './resource.helpers.js'
 import { useSdk } from '@ossy/sdk-react'
 import { useSchema } from './useSchemas.js'
 import { Text, View } from '@ossy/design-system'
@@ -10,8 +9,6 @@ export const ResourceDetails = ({ resourceId }) => {
     const sdk = useSdk()
     const { data: resource } = sdk.read(GetResource, { resourceId }, { enabled: !!resourceId })
     const template = useSchema(resource?.type)
-    const [accessBusy, setAccessBusy] = useState(false)
-    const [accessError, setAccessError] = useState(null)
 
     const details = {
         Id: resource?.id,
@@ -22,19 +19,6 @@ export const ResourceDetails = ({ resourceId }) => {
         Created: resource?.created && new Date(resource?.created).toLocaleString(),
     }
 
-    const showAccessToggle = resource?.id
-      && resource?.type !== '@ossy/platform/schema/directory'
-      && resource?.type !== 'directory'
-
-    const onAccessChange = (event) => {
-        const next = event.target.checked ? 'public' : 'restricted'
-        setAccessError(null)
-        setAccessBusy(true)
-        updateResourceAccess(sdk, { id: resourceId, access: next })
-            .catch(() => setAccessError('Could not update access'))
-            .finally(() => setAccessBusy(false))
-    }
-
     return (
         <View gap="s" style={{ maxWidth: '320px' }}>
             {
@@ -48,32 +32,6 @@ export const ResourceDetails = ({ resourceId }) => {
                     </View>
                 ))
             }
-            {showAccessToggle && (
-                <View gap="xs" style={{ paddingTop: 'var(--space-s)' }}>
-                    <View layout="row" gap="m" alignItems="center">
-                        <Text variant="small" style={{ fontWeight: 'bold', flexShrink: 0 }}>
-                            Public media link
-                        </Text>
-                        <span style={{ flexGrow: 1 }} />
-                        <input
-                            type="checkbox"
-                            checked={(resource?.access || 'restricted') === 'public'}
-                            disabled={accessBusy}
-                            onChange={onAccessChange}
-                            aria-label="Allow anyone with the link to view media"
-                        />
-                    </View>
-                    <Text variant="small" style={{ opacity: 0.85, lineHeight: 1.35 }}>
-                        When on, image and file URLs use the CDN and work without signing in.
-                        When off, only workspace members get time-limited download links.
-                    </Text>
-                    {accessError && (
-                        <Text variant="small" style={{ color: 'var(--palette-danger, #c00)' }}>
-                            {accessError}
-                        </Text>
-                    )}
-                </View>
-            )}
         </View>
     )
 }

package/src/ResourceGrid.jsx

@@ -13,6 +13,7 @@ import {
 } from '@ossy/design-system'
 import { formatBytes } from './utils/format-bytes.js'
 import { ResourceSelectionCheckbox } from './ResourceSelectionCheckbox.jsx'
+import { resourceAccessIcon, isShareableResource } from './resource-share.js'
 
 const TILE_WIDTH = 160
 
@@ -189,6 +190,7 @@ const ResourceGridItem = memo(function ResourceGridItem({
       inset="m"
       gap="s"
       data-resource-id={resource.id}
+      data-resource-access={resource.access || 'restricted'}
       style={{
         width: TILE_WIDTH,
         textDecoration: 'none',
@@ -201,7 +203,7 @@ const ResourceGridItem = memo(function ResourceGridItem({
         position: 'relative',
       }}
     >
-      {(showSelectionControls || selected) && (
+      {showSelectionControls && (
         <View
           style={{
             position: 'absolute',
@@ -217,6 +219,23 @@ const ResourceGridItem = memo(function ResourceGridItem({
           />
         </View>
       )}
+      {isShareableResource(resource) && (
+        <View
+          style={{
+            position: 'absolute',
+            top: 'var(--space-xs, 4px)',
+            left: showSelectionControls ? 'calc(var(--space-xs, 4px) + 28px)' : 'var(--space-xs, 4px)',
+            zIndex: 1,
+          }}
+          aria-hidden="true"
+        >
+          <Icon
+            size="s"
+            name={resourceAccessIcon(resource)}
+            style={{ fill: 'hsl(0, 0%, 55%)' }}
+          />
+        </View>
+      )}
       {actions ? (
         <View
           style={{

package/src/ResourceList.jsx

@@ -14,6 +14,7 @@ import {
 } from '@ossy/design-system'
 import { formatBytes } from './utils/format-bytes.js'
 import { ResourceSelectionCheckbox } from './ResourceSelectionCheckbox.jsx'
+import { resourceAccessIcon, isShareableResource } from './resource-share.js'
 
 function useSchemaMap() {
   const templates = useSchemas()
@@ -160,7 +161,7 @@ const ResourceListItem = memo(function ResourceListItem({
 
     const leading = (
       <View layout="row" alignItems="center" gap="s" style={{ flexShrink: 0 }}>
-        {(showSelectionControls || selected) && (
+        {showSelectionControls && (
           <ResourceSelectionCheckbox
             selected={selected}
             onToggle={handleToggleSelect}
@@ -179,7 +180,19 @@ const ResourceListItem = memo(function ResourceListItem({
           selectable
           selected={selected}
           leading={leading}
-          meta={<Size content={content} />}
+          meta={(
+            <View layout="row" alignItems="center" gap="s" style={{ flexShrink: 0 }}>
+              {isShareableResource(resource) && (
+                <Icon
+                  size="s"
+                  name={resourceAccessIcon(resource)}
+                  aria-hidden="true"
+                  style={{ fill: 'hsl(0, 0%, 55%)', flexShrink: 0 }}
+                />
+              )}
+              <Size content={content} />
+            </View>
+          )}
           trailing={(
             <RowActions
               actions={actions}
@@ -190,6 +203,7 @@ const ResourceListItem = memo(function ResourceListItem({
             />
           )}
           data-resource-id={resource.id}
+          data-resource-access={resource.access || 'restricted'}
         >
           {typeof name === 'string' ? name : ''}
         </List.Item>

package/src/ResourcePanel.jsx

@@ -5,18 +5,36 @@ import {
   removeResource,
   renameResource,
   resourceDownloadHref,
+  updateResourceAccess,
   updateResourceContent,
 } from './resource.helpers.js'
 import { useSdk } from '@ossy/sdk-react'
-import { Switch, View, Text, Button, InputTitle, Alert, useInputValue, useLocale } from '@ossy/design-system'
+import {
+  Switch,
+  View,
+  Text,
+  Button,
+  InputTitle,
+  Alert,
+  useInputValue,
+  useLocale,
+  Dropdown,
+  ContextMenu,
+} from '@ossy/design-system'
 import { ResourceFactory } from './ResourceFactory.jsx'
 import { ResourceDetails } from './ResourceDetails.jsx'
 import { ResourceTags } from './ResourceTags.jsx'
 import { ResourceDescription } from './ResourceDescription.jsx'
+import { ResourceShareDialog } from './ResourceShareDialog.jsx'
 import { useForm } from './useForm.js'
 import { useSchema } from './useSchemas.js'
 import { useSchemaEngine } from './useSchemaEngine.js'
 import { validateContent } from '@ossy/schema'
+import {
+  isShareableResource,
+  resourceAccessIcon,
+  resourceAccessOf,
+} from './resource-share.js'
 
 const ViewMode = {
   Closed: 'Closed',
@@ -42,14 +60,28 @@ export const ResourcePanel = memo(function ResourcePanel ({
   const [contentError, setContentError] = useState()
   const [resourceName, setResourceName] = useInputValue('')
   const [panelViewModes, setPanelViewModes] = useState(DefaultViewModes)
+  const [accessBusy, setAccessBusy] = useState(false)
+  const [accessError, setAccessError] = useState(null)
+  const [shareOpen, setShareOpen] = useState(false)
 
   const { data: resource = {} } = sdk.read(GetResource, { resourceId }, { enabled: !!resourceId })
   const template = useSchema(resource?.type)
   const engine = useSchemaEngine()
   const downloadHref = isDownloadableResource(resource) ? resourceDownloadHref(resource) : null
+  const shareable = isShareableResource(resource)
+  const access = resourceAccessOf(resource)
 
   const form = useForm({ defaultData: resource.content })
 
+  const onVisibilityChange = (nextAccess) => {
+    if (!resourceId || accessBusy || nextAccess === access) return
+    setAccessError(null)
+    setAccessBusy(true)
+    updateResourceAccess(sdk, { id: resourceId, access: nextAccess })
+      .catch(() => setAccessError(t('resources.share.accessError')))
+      .finally(() => setAccessBusy(false))
+  }
+
   const onCloseResource = () => {
     if (!_onClose) return
     setPanelViewModes(DefaultViewModes)
@@ -176,9 +208,46 @@ export const ResourcePanel = memo(function ResourcePanel ({
             <Switch.Case match={[ViewMode.View]}>
 
                 <View.Item fill surface="primary" style={{ padding: '4px 8px' }}>
-                  <Text as="h3" variant="breadcrumb">{resourceName}</Text>
+                  <Text as="h3" variant="small" style={{ fontWeight: 'bold' }}>{resourceName}</Text>
                </View.Item>
 
+              {shareable && (
+                <Dropdown
+                  trigger={(
+                    <Button
+                      prefix={resourceAccessIcon(resource)}
+                      variant="command"
+                      disabled={accessBusy}
+                      aria-label={t('resources.share.visibility')}
+                      title={t(`resources.share.access.${access}`)}
+                    />
+                  )}
+                >
+                  <View inset="xs" surface="primary" roundness="s">
+                    <ContextMenu roundness="s" surface="primary">
+                      {['public', 'workspace', 'restricted'].map((value) => (
+                        <ContextMenu.Item
+                          key={value}
+                          prefix={value === 'public' ? 'globe' : 'lock'}
+                          suffix={access === value ? 'check' : undefined}
+                          disabled={accessBusy}
+                          onClick={() => onVisibilityChange(value)}
+                        >
+                          {t(`resources.share.access.${value}`)}
+                        </ContextMenu.Item>
+                      ))}
+                    </ContextMenu>
+                  </View>
+                </Dropdown>
+              )}
+              {shareable && (
+                <Button
+                  prefix="share"
+                  variant="command"
+                  aria-label={t('resources.share.title')}
+                  onClick={() => setShareOpen(true)}
+                />
+              )}
               {downloadHref && (
                 <Button
                   prefix="software-download"
@@ -263,6 +332,18 @@ export const ResourcePanel = memo(function ResourcePanel ({
 
       </View.Item>
 
+      {accessError && (
+        <View.Item>
+          <Alert variant="danger">{accessError}</Alert>
+        </View.Item>
+      )}
+
+      <ResourceShareDialog
+        resourceId={resourceId}
+        isVisible={shareOpen}
+        onClose={() => setShareOpen(false)}
+      />
+
     </View>
   )
 })

package/src/ResourceShareDialog.jsx

@@ -0,0 +1,183 @@
+'use client'
+import React, { useEffect, useState } from 'react'
+import { Overlay, View, Text, Button, Guide, useLocale } from '@ossy/design-system'
+import { AsyncStatus, useSdk } from '@ossy/sdk-react'
+import { metadata as GetResource } from './get.action.js'
+import { updateResourceAccess } from './resource.helpers.js'
+import {
+  getResourceShareUrl,
+  isPublicResource,
+  isShareableResource,
+} from './resource-share.js'
+
+/**
+ * Confirm making a resource public and copy its share link.
+ *
+ * @param {{
+ *   resourceId?: string | null,
+ *   isVisible?: boolean,
+ *   onClose?: () => void,
+ * }} props
+ */
+export function ResourceShareDialog ({
+  resourceId,
+  isVisible = false,
+  onClose = () => {},
+}) {
+  const sdk = useSdk()
+  const { t } = useLocale()
+  const { status, data: resource = {} } = sdk.read(
+    GetResource,
+    { resourceId },
+    { enabled: Boolean(resourceId) && isVisible },
+  )
+
+  const [busy, setBusy] = useState(false)
+  const [error, setError] = useState(null)
+  const [linkCopied, setLinkCopied] = useState(false)
+  const [madePublic, setMadePublic] = useState(false)
+
+  const loading = status !== AsyncStatus.Success && status !== AsyncStatus.Error
+  const shareable = status === AsyncStatus.Success && isShareableResource(resource)
+  const isPublic = madePublic || isPublicResource(resource)
+  const shareUrl = getResourceShareUrl(resourceId || resource)
+
+  useEffect(() => {
+    if (!isVisible) {
+      setBusy(false)
+      setError(null)
+      setLinkCopied(false)
+      setMadePublic(false)
+    }
+  }, [isVisible])
+
+  const copyLink = async (url) => {
+    if (!url) return
+    try {
+      await navigator.clipboard.writeText(url)
+      setLinkCopied(true)
+      setTimeout(() => setLinkCopied(false), 2000)
+    } catch {
+      setError(t('resources.share.copyFailed'))
+    }
+  }
+
+  const onConfirmShare = async () => {
+    if (!resourceId || busy) return
+    setError(null)
+    setBusy(true)
+    try {
+      if (!isPublic) {
+        await updateResourceAccess(sdk, { id: resourceId, access: 'public' })
+        setMadePublic(true)
+      }
+      const url = getResourceShareUrl(resourceId)
+      await copyLink(url)
+    } catch {
+      setError(t('resources.share.publishError'))
+    } finally {
+      setBusy(false)
+    }
+  }
+
+  if (!isVisible || !resourceId) return null
+
+  return (
+    <Overlay isVisible={true} onClose={onClose}>
+      <View layout="off-center-s" style={{ height: '100%' }}>
+        <View data-region="content" style={{ width: 'min(420px, 92vw)' }}>
+          <View surface="primary" roundness="s">
+            <View surface="primary" inset="l" roundness="s" gap="m">
+              {loading ? (
+                <Guide
+                  title={t('resources.share.title')}
+                  text={t('resources.share.sharing')}
+                  actions={[
+                    {
+                      label: t('resources.share.close'),
+                      variant: 'command',
+                      onClick: onClose,
+                    },
+                  ]}
+                />
+              ) : !shareable ? (
+                <Guide
+                  title={t('resources.share.title')}
+                  text={t('resources.share.notShareable')}
+                  actions={[
+                    {
+                      label: t('resources.share.close'),
+                      variant: 'command',
+                      onClick: onClose,
+                    },
+                  ]}
+                />
+              ) : (
+                <>
+                  <Guide
+                    title={t('resources.share.title')}
+                    text={isPublic
+                      ? t('resources.share.alreadyPublic')
+                      : t('resources.share.confirmPublic')}
+                  />
+
+                  {shareUrl && isPublic && (
+                    <View gap="xs">
+                      <Text
+                        variant="small"
+                        style={{
+                          wordBreak: 'break-all',
+                          fontFamily: 'ui-monospace, SFMono-Regular, Menlo, monospace',
+                        }}
+                      >
+                        {shareUrl}
+                      </Text>
+                    </View>
+                  )}
+
+                  {error && (
+                    <Text
+                      variant="small"
+                      style={{ color: 'var(--palette-danger, #c00)' }}
+                    >
+                      {error}
+                    </Text>
+                  )}
+
+                  <View layout="row" gap="s" style={{ justifyContent: 'flex-end', flexWrap: 'wrap' }}>
+                    <Button variant="command" onClick={onClose} disabled={busy}>
+                      {t('resources.share.close')}
+                    </Button>
+                    {isPublic ? (
+                      <Button
+                        variant="cta"
+                        prefix="link"
+                        disabled={busy || !shareUrl}
+                        onClick={() => copyLink(shareUrl)}
+                      >
+                        {linkCopied
+                          ? t('resources.share.linkCopied')
+                          : t('resources.share.copyLink')}
+                      </Button>
+                    ) : (
+                      <Button
+                        variant="cta"
+                        prefix="share"
+                        disabled={busy || !resource?.id}
+                        onClick={onConfirmShare}
+                      >
+                        {busy
+                          ? t('resources.share.sharing')
+                          : t('resources.share.makePublic')}
+                      </Button>
+                    )}
+                  </View>
+                </>
+              )}
+            </View>
+          </View>
+        </View>
+      </View>
+    </Overlay>
+  )
+}

package/src/Upload.page.jsx

@@ -8,12 +8,13 @@ export const metadata = {
     sv: '/resources/ladda-upp',
     en: '/resources/upload',
   },
+  layout: '@ossy/app/layout/blank',
 }
 
 
 export const UploadPage = () => {
   return (
-    <View layout="off-center-s" style={{ height: '100%' }}>
+    <View surface="base" layout="off-center-s" inset="s" style={{ minHeight: '100dvh' }}>
       <View data-region="content" surface="primary" roundness="m" inset="m">
         <UploadResources/>
       </View>

package/src/VideoResource.jsx

@@ -1,7 +1,6 @@
-import React  from 'react'
+import React from 'react'
 import { metadata as GetResource } from './get.action.js'
 import { useSdk } from '@ossy/sdk-react'
-import { View } from '@ossy/design-system'
 
 export const VideoResource = ({
   resourceId
@@ -10,17 +9,17 @@ export const VideoResource = ({
   const { data: resource } = sdk.read(GetResource, { resourceId }, { enabled: !!resourceId })
 
   return (
-    <View stack bordered>
-          <View.Item fill style={{ padding: '16px 8px' }}>
-
-      <div style={{ display: 'flex', justifyContent: 'center' }}>
-              <video
-                controls
-                src={resource?.content?.src}
-                style={{ width: 'auto', height: '400px', margin: 'var(--space-l) auto' }}
-              />
-            </div>
-      </View.Item>
-    </View>
+    <div style={{ display: 'flex', justifyContent: 'center', padding: 'var(--space-m) var(--space-s) var(--space-xl)' }}>
+      <video
+        controls
+        src={resource?.content?.src}
+        style={{
+          width: '100%',
+          maxWidth: '960px',
+          height: 'auto',
+          margin: 'var(--space-m) auto var(--space-l)',
+        }}
+      />
+    </div>
   )
 }

package/src/document-create.helpers.js

@@ -0,0 +1,97 @@
+import { parseSchemaId } from '@ossy/schema'
+
+/**
+ * Document types that can be created from the generic create-document GUI.
+ * Platform internals and capability schemas are excluded.
+ *
+ * @param {object} schema
+ * @returns {boolean}
+ */
+export function isGenericCreateSchema (schema) {
+  if (!schema?.id || !Array.isArray(schema.fields) || schema.fields.length === 0) return false
+  const category = schema.categoryName ?? ''
+  if (/platform/i.test(category)) return false
+  return true
+}
+
+function kebabConcept (value) {
+  return String(value)
+    .replace(/([a-z0-9])([A-Z])/g, '$1-$2')
+    .replace(/_/g, '-')
+    .toLowerCase()
+}
+
+/**
+ * Treat canonical ADR 0006 ids and pre-migration `@provider/feature/concept` ids
+ * as the same create-document type (e.g. employee vs schema/employee).
+ *
+ * @param {string} [schemaId]
+ * @returns {string | undefined}
+ */
+export function schemaCreateIdentity (schemaId) {
+  if (typeof schemaId !== 'string' || !schemaId) return schemaId
+  const parsed = parseSchemaId(schemaId)
+  if (parsed) return `${parsed.provider}/${parsed.feature}/${kebabConcept(parsed.concept)}`
+  const legacy = /^@([^/]+)\/([^/]+)\/([^/]+)$/.exec(schemaId)
+  if (legacy) return `${legacy[1]}/${legacy[2]}/${kebabConcept(legacy[3])}`
+  return schemaId
+}
+
+function schemaNameKey (schema) {
+  const name = schema?.name
+  if (!name) return null
+  return `name:${schema.categoryName ?? ''}:${name}`
+}
+
+/**
+ * @param {object[]} schemas
+ * @param {{ category?: string }} [options]
+ * @returns {object[]}
+ */
+export function schemasForGenericCreate (schemas, { category } = {}) {
+  const list = Array.isArray(schemas) ? schemas : []
+  const seen = new Set()
+  const result = []
+  for (const schema of list) {
+    if (!isGenericCreateSchema(schema)) continue
+    if (category && schema.categoryName !== category) continue
+    const identity = schemaCreateIdentity(schema.id)
+    const nameKey = schemaNameKey(schema)
+    if (seen.has(identity) || (nameKey && seen.has(nameKey))) continue
+    seen.add(identity)
+    if (nameKey) seen.add(nameKey)
+    result.push(schema)
+  }
+  return result
+}
+
+/**
+ * Same-origin relative path only.
+ * @param {unknown} value
+ * @returns {string | null}
+ */
+export function safeReturnTo (value) {
+  if (typeof value !== 'string') return null
+  const trimmed = value.trim()
+  if (!trimmed.startsWith('/') || trimmed.startsWith('//')) return null
+  return trimmed
+}
+
+/**
+ * Path + search from a router href or window URL, if it is a safe returnTo.
+ * @param {unknown} href
+ * @returns {string | null}
+ */
+export function pathFromHref (href) {
+  if (typeof href !== 'string' || !href) return null
+  const trimmed = href.trim()
+  if (trimmed.startsWith('//')) return null
+  try {
+    const url = /^[a-z][a-z0-9+.-]*:/i.test(trimmed)
+      ? new URL(trimmed)
+      : new URL(trimmed, 'http://ossy.invalid')
+    return safeReturnTo(`${url.pathname}${url.search}`)
+  } catch {
+    return safeReturnTo(trimmed)
+  }
+}

package/src/document-create.helpers.spec.js

@@ -0,0 +1,79 @@
+import { describe, expect, it } from '@jest/globals'
+import { isGenericCreateSchema, pathFromHref, safeReturnTo, schemaCreateIdentity, schemasForGenericCreate } from './document-create.helpers.js'
+
+describe('document-create helpers', () => {
+  it('excludes platform schemas and field-less types', () => {
+    const schemas = [
+      { id: '@ossy/consultancy/schema/employee', categoryName: 'Consultancy', fields: [{ name: 'name', type: 'text' }] },
+      { id: '@ossy/platform/schema/file', categoryName: 'Platform', fields: [{ name: 'name', type: 'text' }] },
+      { id: '@ossy/empty/schema/x', categoryName: 'Other', fields: [] },
+    ]
+    expect(schemasForGenericCreate(schemas).map((s) => s.id)).toEqual([
+      '@ossy/consultancy/schema/employee',
+    ])
+    expect(isGenericCreateSchema(schemas[1])).toBe(false)
+  })
+
+  it('filters by category when asked', () => {
+    const schemas = [
+      { id: 'a', categoryName: 'Consultancy', fields: [{ name: 'n', type: 'text' }] },
+      { id: 'b', categoryName: 'Web', fields: [{ name: 'n', type: 'text' }] },
+    ]
+    expect(schemasForGenericCreate(schemas, { category: 'Consultancy' }).map((s) => s.id)).toEqual(['a'])
+  })
+
+  it('aliases canonical and pre-migration consultancy ids', () => {
+    expect(schemaCreateIdentity('@ossy/consultancy/schema/employee')).toBe('ossy/consultancy/employee')
+    expect(schemaCreateIdentity('@ossy/consultancy/employee')).toBe('ossy/consultancy/employee')
+    expect(schemaCreateIdentity('@ossy/consultancy/companyBasicInfo')).toBe('ossy/consultancy/company-basic-info')
+    expect(schemaCreateIdentity('@ossy/consultancy/schema/company-basic-info')).toBe('ossy/consultancy/company-basic-info')
+  })
+
+  it('hides workspace copies of system schemas on the create picker', () => {
+    const schemas = [
+      { id: '@ossy/consultancy/schema/company-basic-info', name: 'Company Basic Info', categoryName: 'Consultancy', icon: 'organisation', fields: [{ name: 'name', type: 'text' }] },
+      { id: '@ossy/consultancy/schema/contract', name: 'Contract', categoryName: 'Consultancy', icon: 'file', fields: [{ name: 'name', type: 'text' }] },
+      { id: '@ossy/consultancy/schema/employee', name: 'Employee', categoryName: 'Consultancy', icon: 'user-add', fields: [{ name: 'name', type: 'text' }] },
+      { id: '@ossy/consultancy/schema/opportunity', name: 'Opportunity', categoryName: 'Consultancy', fields: [{ name: 'name', type: 'text' }] },
+      { id: '@ossy/consultancy/schema/proposal', name: 'Proposal', categoryName: 'Consultancy', icon: 'file', fields: [{ name: 'name', type: 'text' }] },
+      { id: '@ossy/consultancy/schema/vacation', name: 'Vacation', categoryName: 'Consultancy', icon: 'calendar', fields: [{ name: 'name', type: 'text' }] },
+      { id: '@ossy/consultancy/vacation', name: 'Vacation', categoryName: 'Consultancy', fields: [{ name: 'name', type: 'text' }] },
+      { id: '@ossy/consultancy/employee', name: 'Employee', categoryName: 'Consultancy', fields: [{ name: 'name', type: 'text' }] },
+      { id: '@ossy/consultancy/companyBasicInfo', name: 'Company Basic Info', categoryName: 'Consultancy', fields: [{ name: 'name', type: 'text' }] },
+      { id: '@ossy/consultancy/contract', name: 'Contract', categoryName: 'Consultancy', fields: [{ name: 'name', type: 'text' }] },
+    ]
+    expect(schemasForGenericCreate(schemas).map((s) => s.id)).toEqual([
+      '@ossy/consultancy/schema/company-basic-info',
+      '@ossy/consultancy/schema/contract',
+      '@ossy/consultancy/schema/employee',
+      '@ossy/consultancy/schema/opportunity',
+      '@ossy/consultancy/schema/proposal',
+      '@ossy/consultancy/schema/vacation',
+    ])
+  })
+
+  it('keeps workspace-only custom types', () => {
+    const schemas = [
+      { id: '@ossy/consultancy/schema/employee', name: 'Employee', categoryName: 'Consultancy', fields: [{ name: 'name', type: 'text' }] },
+      { id: 'workspace/custom-invoice', name: 'Invoice', categoryName: 'Consultancy', fields: [{ name: 'name', type: 'text' }] },
+    ]
+    expect(schemasForGenericCreate(schemas).map((s) => s.id)).toEqual([
+      '@ossy/consultancy/schema/employee',
+      'workspace/custom-invoice',
+    ])
+  })
+
+  it('only allows same-origin relative returnTo paths', () => {
+    expect(safeReturnTo('/forecasts')).toBe('/forecasts')
+    expect(safeReturnTo('/en/forecasts?x=1')).toBe('/en/forecasts?x=1')
+    expect(safeReturnTo('//evil.example')).toBe(null)
+    expect(safeReturnTo('https://evil.example')).toBe(null)
+  })
+
+  it('extracts a safe returnTo from a router href', () => {
+    expect(pathFromHref('http://localhost:3006/en/forecasts')).toBe('/en/forecasts')
+    expect(pathFromHref('/sv/prognoser')).toBe('/sv/prognoser')
+    expect(pathFromHref('https://evil.example/en/forecasts')).toBe('/en/forecasts')
+    expect(pathFromHref('//evil.example')).toBe(null)
+  })
+})

package/src/en.translations.json

@@ -8,6 +8,7 @@
   "resources.form.createFailed": "Create failed",
   "resources.form.createResource": "Create resource",
   "resources.form.typeRemoved": "This document type has been removed and can't be edited.",
+  "resources.form.otherCategory": "Other",
   "@ossy/resources/actions/create.label": "Create resource",
   "@ossy/resources/actions/create.description": "Create a new resource in the workspace",
   "@ossy/resources/actions/list.label": "List resources",
@@ -41,12 +42,30 @@
   "resources.upload.location": "Location: {location}",
   "resources.createDirectory.title": "Create directory",
   "resources.createDocument.title": "Create document",
+  "resources.createDocument.pickType": "Choose a document type to create in this location.",
+  "resources.createDocument.noTypes": "No document types are available to create here.",
   "resources.createDirectory.description": "Create a new directory to organize your resources. The new directory will be created in the location: {location}",
   "resources.createDirectory.namePlaceholder": "Directory name",
   "resources.createDirectory.submit": "Create directory",
   "resources.createDirectory.errorEmpty": "Directory name cannot be empty",
   "resources.createDirectory.errorOssyPrefix": "Directory name cannot start with @ossy",
   "resources.panel.download": "Download",
+  "resources.share.title": "Share link",
+  "resources.share.confirmPublic": "Make this resource public so anyone with the link can open it. You can copy the link after confirming.",
+  "resources.share.alreadyPublic": "This resource is public. Copy the link below to share it.",
+  "resources.share.makePublic": "Make public & copy link",
+  "resources.share.copyLink": "Copy link",
+  "resources.share.linkCopied": "Link copied",
+  "resources.share.copyFailed": "Could not copy the link",
+  "resources.share.publishError": "Could not update sharing settings",
+  "resources.share.accessError": "Could not update visibility",
+  "resources.share.sharing": "Sharing…",
+  "resources.share.close": "Close",
+  "resources.share.notShareable": "Folders cannot be shared with a public link.",
+  "resources.share.visibility": "Visibility",
+  "resources.share.access.public": "Public",
+  "resources.share.access.workspace": "Workspace",
+  "resources.share.access.restricted": "Private",
   "@ossy/resources/schema/markdown.body.label": "Body",
   "@ossy/resources/schema/markdown.body.description": "Markdown content (headings, lists, links, code)."
 }

package/src/index.js

@@ -23,6 +23,7 @@ export * from './ResourceContentPage.jsx'
 export * from './ResourceDescription.jsx'
 export * from './ResourceDetails.jsx'
 export * from './ResourceDialogMove.jsx'
+export * from './ResourceShareDialog.jsx'
 export * from './ResourceFactory.jsx'
 export * from './GenericResourceDetail.jsx'
 export * from './GenericResourceForm.jsx'
@@ -52,3 +53,4 @@ export * from './useSchemaEngine.js'
 export * from './useDocumentValidator.js'
 export * from './useForm.js'
 export * from './resource.helpers.js'
+export * from './document-create.helpers.js'

package/src/resource-create.page.jsx

@@ -4,6 +4,7 @@ import { useSdk } from '@ossy/sdk-react'
 import { View, useLocale } from '@ossy/design-system'
 import { useRouter } from '@ossy/router-react'
 import { GenericResourceForm } from './GenericResourceForm.jsx'
+import { safeReturnTo } from './document-create.helpers.js'
 
 export const metadata = {
   id: 'resources/create/generic',
@@ -11,6 +12,7 @@ export const metadata = {
     en: '/resources/create/:schemaId',
     sv: '/resources/skapa/:schemaId',
   },
+  layout: '@ossy/app/layout/blank',
 }
 
 /** Generic resource create page — slot lookup with template Fields fallback. */
@@ -19,10 +21,15 @@ export default function GenericResourceCreatePage () {
   const { t } = useLocale()
   const schemaId = decodeURIComponent(router.params.schemaId || '')
   const location = router.searchParams.location
+  const returnTo = safeReturnTo(router.searchParams.returnTo)
   const sdk = useSdk()
   const [error, setError] = useState()
 
   const onCancel = () => {
+    if (returnTo) {
+      router.navigate(returnTo)
+      return
+    }
     const search = location ? new URLSearchParams({ location }).toString() : ''
     router.navigate(`@storage/home${search ? `?${search}` : ''}`)
   }
@@ -34,7 +41,7 @@ export default function GenericResourceCreatePage () {
   }
 
   return (
-    <View layout="off-center-m" style={{ height: '100%' }}>
+    <View surface="base" layout="off-center-m" inset="s" style={{ minHeight: '100dvh' }}>
       <View data-region="content" surface="primary" roundness="m" inset="m">
         <GenericResourceForm
           schemaId={schemaId}

package/src/resource-detail.page.jsx

@@ -16,7 +16,7 @@ export default function ResourceDetailPage () {
   const resourceId = router.params.resourceId
 
   return (
-    <View layout="off-center-m" style={{ height: '100%' }}>
+    <View layout="off-center-l" style={{ height: '100%' }}>
       <View data-region="content" surface="primary" roundness="m" inset="m">
         <GenericResourceDetail resourceId={resourceId} />
       </View>

package/src/resource-share.js

@@ -0,0 +1,67 @@
+/**
+ * Share / visibility helpers for workspace resources.
+ *
+ * Public files are readable at `/r/{id}` without signing in.
+ */
+
+export const RESOURCE_ACCESS_VALUES = Object.freeze(['public', 'workspace', 'restricted'])
+
+/**
+ * @param {object | null | undefined} resource
+ * @returns {'public' | 'workspace' | 'restricted'}
+ */
+export function resourceAccessOf (resource) {
+  const access = resource?.access
+  if (RESOURCE_ACCESS_VALUES.includes(access)) return access
+  return 'restricted'
+}
+
+/**
+ * @param {object | null | undefined} resource
+ * @returns {boolean}
+ */
+export function isPublicResource (resource) {
+  return resourceAccessOf(resource) === 'public'
+}
+
+/**
+ * Icon name for list/grid visibility affordance.
+ *
+ * @param {object | null | undefined} resource
+ * @returns {'globe' | 'lock'}
+ */
+export function resourceAccessIcon (resource) {
+  return isPublicResource(resource) ? 'globe' : 'lock'
+}
+
+/**
+ * Absolute (or app-relative) share URL for a resource.
+ *
+ * @param {string | { id?: string }} resourceOrId
+ * @param {{ origin?: string }} [options]
+ * @returns {string | null}
+ */
+export function getResourceShareUrl (resourceOrId, { origin } = {}) {
+  const id = typeof resourceOrId === 'string' ? resourceOrId : resourceOrId?.id
+  if (!id) return null
+  const path = `/r/${encodeURIComponent(id)}`
+  const resolvedOrigin = origin
+    ?? (typeof window !== 'undefined' ? window.location?.origin : undefined)
+  if (resolvedOrigin) {
+    return `${resolvedOrigin}${path}`
+  }
+  return path
+}
+
+/**
+ * Whether the resource can expose a public share link (non-directories).
+ *
+ * @param {object | null | undefined} resource
+ * @returns {boolean}
+ */
+export function isShareableResource (resource) {
+  if (!resource?.id) return false
+  const type = resource.type
+  if (type === '@ossy/platform/schema/directory' || type === 'directory') return false
+  return true
+}

package/src/resource-share.spec.js

@@ -0,0 +1,68 @@
+import { describe, expect, it } from '@jest/globals'
+import {
+  getResourceShareUrl,
+  isPublicResource,
+  isShareableResource,
+  resourceAccessIcon,
+  resourceAccessOf,
+} from './resource-share.js'
+
+describe('resource-share', () => {
+  describe('resourceAccessOf', () => {
+    it('defaults to restricted', () => {
+      expect(resourceAccessOf(undefined)).toBe('restricted')
+      expect(resourceAccessOf({})).toBe('restricted')
+      expect(resourceAccessOf({ access: 'nope' })).toBe('restricted')
+    })
+
+    it('returns known access values', () => {
+      expect(resourceAccessOf({ access: 'public' })).toBe('public')
+      expect(resourceAccessOf({ access: 'workspace' })).toBe('workspace')
+      expect(resourceAccessOf({ access: 'restricted' })).toBe('restricted')
+    })
+  })
+
+  describe('isPublicResource / resourceAccessIcon', () => {
+    it('treats public as public + globe', () => {
+      expect(isPublicResource({ access: 'public' })).toBe(true)
+      expect(resourceAccessIcon({ access: 'public' })).toBe('globe')
+    })
+
+    it('treats non-public as private + lock', () => {
+      expect(isPublicResource({ access: 'workspace' })).toBe(false)
+      expect(isPublicResource({ access: 'restricted' })).toBe(false)
+      expect(resourceAccessIcon({ access: 'workspace' })).toBe('lock')
+      expect(resourceAccessIcon({})).toBe('lock')
+    })
+  })
+
+  describe('getResourceShareUrl', () => {
+    it('builds /r/{id} and absolutizes with origin', () => {
+      expect(getResourceShareUrl('abc')).toBe('/r/abc')
+      expect(getResourceShareUrl({ id: 'res_1' }, { origin: 'https://ossy.se' }))
+        .toBe('https://ossy.se/r/res_1')
+    })
+
+    it('encodes the id', () => {
+      expect(getResourceShareUrl('a/b')).toBe('/r/a%2Fb')
+    })
+
+    it('returns null without an id', () => {
+      expect(getResourceShareUrl(null)).toBe(null)
+      expect(getResourceShareUrl({})).toBe(null)
+    })
+  })
+
+  describe('isShareableResource', () => {
+    it('allows files and documents', () => {
+      expect(isShareableResource({ id: '1', type: '@ossy/platform/schema/file' })).toBe(true)
+      expect(isShareableResource({ id: '1', type: 'image/png' })).toBe(true)
+    })
+
+    it('rejects directories and missing ids', () => {
+      expect(isShareableResource({ id: '1', type: 'directory' })).toBe(false)
+      expect(isShareableResource({ id: '1', type: '@ossy/platform/schema/directory' })).toBe(false)
+      expect(isShareableResource({ type: 'file' })).toBe(false)
+    })
+  })
+})

package/src/resource.helpers.js

@@ -19,6 +19,15 @@ export {
   triggerResourceDownloads,
 } from './resource-download.js'
 
+export {
+  getResourceShareUrl,
+  isPublicResource,
+  isShareableResource,
+  resourceAccessIcon,
+  resourceAccessOf,
+  RESOURCE_ACCESS_VALUES,
+} from './resource-share.js'
+
 export {
   applyResourceSelectionGesture,
   idsInRange,

package/src/sv.translations.json

@@ -8,6 +8,7 @@
   "resources.form.createFailed": "Skapandet misslyckades",
   "resources.form.createResource": "Skapa resurs",
   "resources.form.typeRemoved": "Den här dokumenttypen har tagits bort och kan inte redigeras.",
+  "resources.form.otherCategory": "Övrigt",
   "@ossy/resources/actions/create.label": "Skapa resurs",
   "@ossy/resources/actions/create.description": "Skapa en ny resurs i workspace",
   "@ossy/resources/actions/list.label": "Lista resurser",
@@ -41,12 +42,30 @@
   "resources.upload.location": "Plats: {location}",
   "resources.createDirectory.title": "Skapa mapp",
   "resources.createDocument.title": "Skapa dokument",
+  "resources.createDocument.pickType": "Välj en dokumenttyp att skapa på den här platsen.",
+  "resources.createDocument.noTypes": "Inga dokumenttyper kan skapas här.",
   "resources.createDirectory.description": "Skapa en ny mapp för att organisera dina resurser. Den nya mappen skapas på platsen: {location}",
   "resources.createDirectory.namePlaceholder": "Mappnamn",
   "resources.createDirectory.submit": "Skapa mapp",
   "resources.createDirectory.errorEmpty": "Mappnamn får inte vara tomt",
   "resources.createDirectory.errorOssyPrefix": "Mappnamn får inte börja med @ossy",
   "resources.panel.download": "Ladda ner",
+  "resources.share.title": "Dela länk",
+  "resources.share.confirmPublic": "Gör den här resursen publik så att alla med länken kan öppna den. Du kan kopiera länken efter bekräftelse.",
+  "resources.share.alreadyPublic": "Den här resursen är publik. Kopiera länken nedan för att dela den.",
+  "resources.share.makePublic": "Gör publik & kopiera länk",
+  "resources.share.copyLink": "Kopiera länk",
+  "resources.share.linkCopied": "Länk kopierad",
+  "resources.share.copyFailed": "Kunde inte kopiera länken",
+  "resources.share.publishError": "Kunde inte uppdatera delningsinställningar",
+  "resources.share.accessError": "Kunde inte uppdatera synlighet",
+  "resources.share.sharing": "Delar…",
+  "resources.share.close": "Stäng",
+  "resources.share.notShareable": "Mappar kan inte delas med en publik länk.",
+  "resources.share.visibility": "Synlighet",
+  "resources.share.access.public": "Publik",
+  "resources.share.access.workspace": "Workspace",
+  "resources.share.access.restricted": "Privat",
   "@ossy/resources/schema/markdown.body.label": "Innehåll",
   "@ossy/resources/schema/markdown.body.description": "Markdown-innehåll (rubriker, listor, länkar, kod)."
 }