@ossy/workspaces 1.17.2 → 1.17.3

package/package.json

@@ -1,17 +1,21 @@
 {
   "name": "@ossy/workspaces",
   "description": "Workspaces feature package - create, select, and manage workspaces, users, and invitations",
-  "version": "1.17.2",
+  "version": "1.17.3",
   "type": "module",
   "main": "./src/index.js",
   "module": "./src/index.js",
   "exports": {
     ".": "./src/index.js",
     "./server": "./src/server.js",
+    "./entitlements": "./src/entitlements.js",
+    "./merge-workspace-schemas": "./src/merge-workspace-schemas.js",
+    "./SchemasReadBootstrap": "./src/SchemasReadBootstrap.jsx",
     "./workspace-invitation.email.jsx": "./src/workspace-invitation.email.jsx"
   },
   "scripts": {
-    "test": "NODE_OPTIONS=--experimental-vm-modules jest --verbose"
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest --verbose",
+    "test:integration": "NODE_OPTIONS=--experimental-vm-modules jest --config jest.integration.config.js --verbose"
   },
   "author": "Ossy <yourfriends@ossy.se> (https://ossy.se)",
   "license": "MIT",
@@ -26,7 +30,7 @@
   },
   "devDependencies": {
     "@jest/globals": "^30.2.0",
-    "@ossy/platform": "^1.39.2",
+    "@ossy/platform": "^1.39.3",
     "casual": "^1.6.2",
     "jest": "^30.2.0"
   },
@@ -38,5 +42,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "2b8745d57fee8b6c08787e2755b4df489291a5cd"
+  "gitHead": "a0d89185a17f8de8ce328c3a648c108ff1d61d8f"
 }

package/src/CreateWorkspacePage.jsx

@@ -1,17 +1,10 @@
 import React, { useState } from 'react'
 import { ListWorkspaces, CreateWorkspace } from '@ossy/workspaces'
 import { useSdk, cacheKey } from '@ossy/sdk-react'
-import {
-  Button,
-  useInputValue,
-  Title,
-  Input,
-  View,
-  useLocale,
-} from '@ossy/design-system'
+import { Button, useInputValue, Input, View, useLocale } from '@ossy/design-system'
 import { useRouter } from '@ossy/router-react'
 import { AuthenticationGuard } from './AuthenticationGuard.jsx'
-import { patchUserWorkspaceId } from './patchUserWorkspaceId.js'
+import { selectWorkspace } from './selectWorkspace.js'
 import { metadata as CreateWorkspaceMeta } from './create.action.js'
 
 export const CreateWorkspacePage = () => {
@@ -25,12 +18,10 @@ export const CreateWorkspacePage = () => {
     sdk.invoke(CreateWorkspace, { name: workspaceName })
       .then((workspace) => {
         sdk.invalidate(cacheKey(ListWorkspaces))
-        return patchUserWorkspaceId(workspace.id).then((res) => {
-          if (!res.ok) throw new Error('Could not select the new workspace')
-          window.location.assign(
-            router.getHref({ id: '@storage/home', params: { workspaceId: workspace.id } })
-          )
-        })
+        selectWorkspace(
+          workspace.id,
+          router.getHref({ id: '@storage/home', params: { workspaceId: workspace.id } })
+        )
       })
       .catch(err => { setError(err.message) })
   }
@@ -40,7 +31,7 @@ export const CreateWorkspacePage = () => {
       <View gap="m">
 
         <title>{t('profile/workspaces/create.documentTitle')}</title>
-        <Title variant="primary" className="stack-m">{t('workspaces.create.title')}</Title>
+        <Text variant="heading-primary" className="stack-m" as="h1" text="workspaces.create.title" />
 
         <Input
           id="workspaceName"

package/src/Definition.js

@@ -4,4 +4,5 @@ export const Definition = {
   description: 'Workspace lifecycle, members, invitations, and services.',
   icon: 'users',
   statuses: ['beta'],
+  entitlementRequired: false,
 }

package/src/GeneralSettings.jsx

@@ -1,42 +1,100 @@
 import React, { useState } from 'react'
-import { GetWorkspace } from '@ossy/workspaces'
+import { GetWorkspace, EnableService, DisableService } from '@ossy/workspaces'
 import { GetCurrentUser } from '@ossy/authentication'
-import { useSdk, AsyncStatus } from '@ossy/sdk-react'
-import { Switch, Title, Button, View, Text, useLocale } from '@ossy/design-system'
+import { useSdk, AsyncStatus, cacheKey } from '@ossy/sdk-react'
+import { Switch, Button, View, Text, ContentHeader, useLocale } from '@ossy/design-system'
 
 const formatDate = (timestamp) => timestamp ? new Date(timestamp).toLocaleDateString() : ''
 const FlowStage = { View: 'View', Edit: 'Edit' }
 
+/** Built-in capabilities a workspace can enable (package name → locale label key). */
+const MANAGED_SERVICES = []
+
+function isServiceOn (services, packageName) {
+  return services?.[packageName]?.enabled === true
+}
+
 export const GeneralSettings = () => {
   const { t } = useLocale()
   const sdk = useSdk()
-  const { data: workspace } = sdk.read(GetWorkspace)
+  const { data: workspace, refetch: refetchWorkspace } = sdk.read(GetWorkspace)
   const { status: userStatus } = sdk.read(GetCurrentUser)
   const [flowStage, setFlowStage] = useState(FlowStage.View)
+  const [busyPackage, setBusyPackage] = useState(null)
   const services = workspace?.services || {}
 
+  const toggleService = async (packageName, enable) => {
+    setBusyPackage(packageName)
+    try {
+      const action = enable ? EnableService : DisableService
+      await sdk.invoke(action, { service: packageName })
+      sdk.invalidate(cacheKey(GetWorkspace))
+      await refetchWorkspace()
+    } finally {
+      setBusyPackage(null)
+    }
+  }
+
   return (
     <View gap="l" inset="m">
-      <View layout="row" gap="s" justifyContent="space-between">
-        <Title>{t('workspace.settings.detailsTitle')}</Title>
-        <Switch on={flowStage}>
-          <Switch.Case match={[FlowStage.View]}>
-            <Button prefix={{ size: 's', name: 'pen' }} variant="cta" disabled>{t('workspace.settings.edit')}</Button>
-          </Switch.Case>
-        </Switch>
-      </View>
+      <ContentHeader
+        title="workspace.settings.detailsTitle"
+        description="workspace.settings.detailsDescription"
+        inset="none"
+        far={(
+          <Switch on={flowStage}>
+            <Switch.Case match={[FlowStage.View]}>
+              <Button prefix={{ size: 's', name: 'pen' }} variant="cta" disabled label="workspace.settings.edit" />
+            </Switch.Case>
+          </Switch>
+        )}
+      />
       {userStatus === AsyncStatus.Loading ? (
         <Text>{t('workspace.settings.loading')}</Text>
       ) : (
         <View gap="s">
-          <View layout="row" gap="s"><Text style={{ fontWeight: 'bold' }}>{t('workspace.settings.name')}</Text><Text>{workspace?.name}</Text></View>
-          <View layout="row" gap="s"><Text style={{ fontWeight: 'bold' }}>{t('workspace.settings.created')}</Text><Text>{formatDate(workspace?.created)}</Text></View>
-          <Title variant="tertiary">{t('workspace.settings.services')}</Title>
-          <View gap="xs">
-            {Object.entries(services).map(([key, enabled]) => (
-              <Text key={key}>{key}: {enabled ? 'on' : 'off'}</Text>
-            ))}
+          <View layout="row" gap="s"><Text style={{ fontWeight: 'bold' }} text="workspace.settings.name" /><Text>{workspace?.name}</Text></View>
+          <View layout="row" gap="s"><Text style={{ fontWeight: 'bold' }} text="workspace.settings.created" /><Text>{formatDate(workspace?.created)}</Text></View>
+          {MANAGED_SERVICES.length > 0 && (
+          <>
+          <Text variant="heading-tertiary" as="h3" text="workspace.settings.services" />
+          <View gap="m">
+            {MANAGED_SERVICES.map(({ package: packageName, labelKey }) => {
+              const enabled = isServiceOn(services, packageName)
+              return (
+                <View key={packageName} layout="row" gap="m" alignItems="center" justifyContent="space-between">
+                  <Text data-service-status={packageName}>
+                    {t(labelKey)}: {enabled ? t('workspace.settings.service.on') : t('workspace.settings.service.off')}
+                  </Text>
+                  {enabled ? (
+                    <Button
+                      variant="neutral"
+                      size="s"
+                      data-action={DisableService.id}
+                      data-service={packageName}
+                      disabled={busyPackage === packageName}
+                      onClick={() => toggleService(packageName, false)}
+                    >
+                      {t('workspace.settings.service.disable')}
+                    </Button>
+                  ) : (
+                    <Button
+                      variant="primary"
+                      size="s"
+                      data-action={EnableService.id}
+                      data-service={packageName}
+                      disabled={busyPackage === packageName}
+                      onClick={() => toggleService(packageName, true)}
+                    >
+                      {t('workspace.settings.service.enable')}
+                    </Button>
+                  )}
+                </View>
+              )
+            })}
           </View>
+          </>
+          )}
         </View>
       )}
     </View>

package/src/Invitations.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { GetWorkspace } from '@ossy/workspaces'
 import { useSdk } from '@ossy/sdk-react'
-import { Title, Text, Button, View, Icon, useLocale } from '@ossy/design-system'
+import { Text, Button, View, Icon, ContentHeader, useLocale } from '@ossy/design-system'
 import { useRouter } from '@ossy/router-react'
 
 export const Invitations = () => {
@@ -13,15 +13,15 @@ export const Invitations = () => {
 
   return (
     <View gap="m">
-      <View inset="s" gap="s">
-        <View layout="row" justifyContent="space-between" alignItems="center">
-          <Title>{t('workspace.invitations.title')}</Title>
+      <ContentHeader
+        title="workspace.invitations.title"
+        description="workspace.invitations.description"
+        far={(
           <Button variant="cta" href={router.getHref('@workspace/invitations/add')} prefix="user-add">
             {t('workspace.invitations.invite')}
           </Button>
-        </View>
-        <Text style={{ maxWidth: '400px' }}>{t('workspace.invitations.description')}</Text>
-      </View>
+        )}
+      />
       <View gap="xs">
         {invitations.map(invite => (
           <View layout="row" roundness="s" alignItems="center" inset="m" gap="m" selectable key={invite.email}>

package/src/Invite.jsx

@@ -2,17 +2,7 @@ import React, { useState, useRef } from 'react'
 import { InviteUser } from '@ossy/workspaces'
 import { useSdk } from '@ossy/sdk-react'
 import { useRouter } from '@ossy/router-react'
-import {
-  useInputValue,
-  Button,
-  Title,
-  Input,
-  Switch,
-  Guide,
-  Text,
-  View,
-  useLocale,
-} from '@ossy/design-system'
+import { useInputValue, Button, Input, Switch, Guide, Text, View, useLocale } from '@ossy/design-system'
 
 const FlowStage = {
   EnterEmail: 'EnterEmail',
@@ -42,10 +32,8 @@ export const Invite = () => {
 
       <Switch.Case match={[FlowStage.EnterEmail]}>
         <View gap="m">
-          <Title variant="primary">{t('workspace.invite.title')}</Title>
-          <Text>
-            {t('workspace.invite.description')}
-          </Text>
+          <Text variant="heading-primary" as="h1" text="workspace.invite.title" />
+          <Text text="workspace.invite.description" />
           <form
             ref={formRef}
             onSubmit={sendInvite}
@@ -57,7 +45,7 @@ export const Invite = () => {
                 id="registerField"
                 className="stack-m"
                 type="email"
-                placeholder={t('workspace.invite.emailPlaceholder')}
+                placeholder="workspace.invite.emailPlaceholder"
                 required
                 value={email}
                 onChange={e => setEmail(e.target.value)}
@@ -68,16 +56,18 @@ export const Invite = () => {
                 <Button
                   variant="link"
                   id="cancelButton"
-                  href={() => router.back()}>{t('design-system.cancel')}
-                </Button>
+                  href={() => router.back()}
+                  label="design-system.cancel"
+                />
 
                 <Button
                   variant="cta"
                   id="registerButton"
                   data-action={InviteUser.id}
                   type="submit"
-                  onClick={sendInvite}>{t('workspace.invite.submit')}
-                </Button>
+                  label="workspace.invite.submit"
+                  onClick={sendInvite}
+                />
               </View>
             </View>
           </form>
@@ -86,11 +76,11 @@ export const Invite = () => {
 
       <Switch.Case match={[FlowStage.Success]}>
         <Guide
-          title={t('workspace.invite.successTitle')}
+          title="workspace.invite.successTitle"
           titleVariant="primary"
         >
           <Text>
-            {t('workspace.invite.successBody')}
+            <Text as="span" text="workspace.invite.successBody" />
             <br/>
             ✌️
           </Text>
@@ -98,9 +88,7 @@ export const Invite = () => {
       </Switch.Case>
 
       <Switch.Case match={[FlowStage.Error]}>
-        <Text>
-          {t('workspace.invite.error')}
-        </Text>
+        <Text text="workspace.invite.error" />
       </Switch.Case>
 
     </Switch>

package/src/SchemasReadBootstrap.jsx

@@ -0,0 +1,20 @@
+import React, { useEffect } from 'react'
+import { AsyncStatus, cacheKey, useReadCacheStore } from '@ossy/sdk-react'
+import { metadata as GetSchemas } from './get-schemas.action.js'
+
+/**
+ * Seed the GetSchemas read cache from SSR props so schema lookups work on first paint.
+ */
+export function SchemasReadBootstrap ({ schemas }) {
+  const store = useReadCacheStore()
+
+  useEffect(() => {
+    if (!Array.isArray(schemas) || schemas.length === 0) return
+    const key = cacheKey(GetSchemas)
+    const entry = store.getEntry(key)
+    if (entry.status === AsyncStatus.Success) return
+    store.setEntry(key, { status: AsyncStatus.Success, data: schemas, error: null })
+  }, [schemas, store])
+
+  return null
+}

package/src/SelectWorkspacePage.jsx

@@ -1,10 +1,10 @@
 import React from 'react'
 import { ListWorkspaces } from '@ossy/workspaces'
 import { useSdk, AsyncStatus } from '@ossy/sdk-react'
-import { Title, Text, Switch, Button, View, Guide, Icon, useLocale } from '@ossy/design-system'
+import { Text, Switch, Button, View, Guide, Icon, useLocale } from '@ossy/design-system'
 import { useRouter } from '@ossy/router-react'
 import { AuthenticationGuard } from './AuthenticationGuard.jsx'
-import { patchUserWorkspaceId } from './patchUserWorkspaceId.js'
+import { selectWorkspace } from './selectWorkspace.js'
 
 const PageFlow = {
   Error: AsyncStatus.Error,
@@ -24,10 +24,7 @@ export const SelectWorkspacePage = () => {
     : asyncStatus
 
   const setWorkspace = workspaceId => {
-    patchUserWorkspaceId(workspaceId).then((res) => {
-      if (!res.ok) return
-      window.location.assign(router.getHref('@home/home'))
-    })
+    selectWorkspace(workspaceId, router.getHref('@home/home'))
   }
 
   return (
@@ -43,9 +40,9 @@ export const SelectWorkspacePage = () => {
             alignItems: 'center',
             marginBottom: 'var(--space-m)',
           }}>
-            <Title variant="primary">
+            <Text variant="heading-primary" as="h1">
               {t('workspaces.select.title')}
-            </Title>
+            </Text>
             <Button
               prefix="math-plus"
               variant="cta"

package/src/Users.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { GetUsers } from '@ossy/workspaces'
 import { useSdk, AsyncStatus } from '@ossy/sdk-react'
-import { Text, View, Icon, Title, Button, useLocale } from '@ossy/design-system'
+import { Text, View, Icon, Button, ContentHeader, useLocale } from '@ossy/design-system'
 import { useRouter } from '@ossy/router-react'
 
 export const Users = () => {
@@ -14,15 +14,15 @@ export const Users = () => {
 
   return (
     <View gap="m">
-      <View inset="s" gap="s">
-        <View layout="row" justifyContent="space-between" alignItems="center">
-          <Title>{t('workspace.users.title')}</Title>
+      <ContentHeader
+        title="workspace.users.title"
+        description="workspace.users.description"
+        far={(
           <Button variant="cta" href={router.getHref('@workspace/invitations/add')} prefix="user-add">
             {t('workspace.users.invite')}
           </Button>
-        </View>
-        <Text style={{ maxWidth: '400px' }}>{t('workspace.users.description')}</Text>
-      </View>
+        )}
+      />
       <View gap="xs">
         {users.map(user => (
           <View layout="row" roundness="s" alignItems="center" inset="m" gap="m" selectable key={user.id}>

package/src/Users.page.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { View } from '@ossy/design-system'
+import { Page } from '@ossy/design-system'
 import { Users } from './Users.jsx'
 
 export const metadata = {
@@ -12,9 +12,9 @@ export const metadata = {
 
 export const UsersPage = () => {
   return (
-    <View gap="m" surface="primary" style={{ padding: 'var(--space-m) var(--space-l)', height: '100%', overflowY: 'auto' }}>
+    <Page>
       <Users />
-    </View>
+    </Page>
   )
 }
 

package/src/accept-invitation.action.js

@@ -1 +1 @@
-export const metadata = { id: 'workspaces/accept-invitation', access: 'public' }
+export const metadata = { id: '@ossy/workspaces/actions/accept-invitation', access: 'public' }

package/src/accept-invitation.api.js

@@ -0,0 +1,46 @@
+import {
+  ActionService,
+  mergeUserAppSettingsCookie,
+  setAuthCookie,
+} from '@ossy/platform'
+
+export const metadata = {
+  id: 'users.accept-invitation',
+  path: '/api/v0/users/accept-invitation',
+  action: '@ossy/workspaces/actions/accept-invitation',
+  method: 'GET',
+  query: ['token', 'workspaceId', 'redirect'],
+}
+
+export default async function handle (req, res) {
+  if (req.method !== 'GET') {
+    res.setHeader('Allow', 'GET')
+    res.status(405).json({ error: 'Method Not Allowed' })
+    return
+  }
+
+  try {
+    const { authToken, workspaceId } = await ActionService.invoke('@ossy/workspaces/actions/accept-invitation', {
+      payload: {
+        token: req.query.token,
+        workspaceId: req.query.workspaceId,
+      },
+      req,
+    })
+
+    setAuthCookie(res, authToken)
+    if (workspaceId) {
+      mergeUserAppSettingsCookie(req, res, { workspaceId })
+    }
+
+    const redirect = req.query.redirect
+    if (redirect && typeof redirect === 'string') {
+      res.redirect(302, redirect)
+      return
+    }
+
+    res.status(200).json('')
+  } catch (err) {
+    res.status(err.status || 401).json('')
+  }
+}

package/src/accept-invitation.task.js

@@ -1,14 +1,15 @@
 import jwt from 'jsonwebtoken'
 import { Aggregate } from '@ossy/event-store'
+import { UserSchema } from '@ossy/users/server'
 import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
 import { User, UsersEvents } from '@ossy/users/server'
 import { Token, TokenEvents } from '@ossy/tokens/server'
 import { ConfigService } from '@ossy/platform'
 import { createLogger } from '@ossy/observability'
 
-export const metadata = { id: 'workspaces/accept-invitation' }
+export const metadata = { id: '@ossy/workspaces/tasks/accept-invitation' }
 
-const log = createLogger('workspaces/accept-invitation')
+const log = createLogger('@ossy/workspaces/tasks/accept-invitation')
 
 function verifyToken(token) {
   return new Promise((resolve, reject) => {
@@ -32,7 +33,7 @@ export async function run({ payload, req }) {
 
   if (!email) throw Object.assign(new Error('No email found in token payload'), { status: 401 })
 
-  const existingUser = await Aggregate.Collection.findOne({ type: 'User', 'state.email': email }).then(agg => agg?.state)
+  const existingUser = await Aggregate.Collection.findOne({ type: UserSchema.user, 'state.email': email }).then(agg => agg?.state)
 
   if (existingUser && workspace.users.includes(existingUser.id)) {
     throw Object.assign(new Error('User already in workspace'), { status: 400 })
@@ -60,7 +61,7 @@ export async function run({ payload, req }) {
       Aggregate.Of(Workspace, resolvedWorkspaceId).then(Aggregate.Add(userInvitationAccepted)),
     ])
   } else {
-    const signUpEvent = UsersEvents.SignedUp({ email })
+    const signUpEvent = UsersEvents.Created({ email })
     userId = signUpEvent.createdBy
     const signInExpiresIn = ConfigService.TokenValidity
     signInExpiresAt = Date.now() + signInExpiresIn * 1000
@@ -80,5 +81,5 @@ export async function run({ payload, req }) {
     ])
   }
 
-  return { authToken: signInToken, authExpiresAt: signInExpiresAt }
+  return { authToken: signInToken, authExpiresAt: signInExpiresAt, workspaceId: resolvedWorkspaceId }
 }

package/src/create-api-token.action.js

@@ -1 +1 @@
-export const metadata = { id: 'workspaces/create-api-token', access: 'workspace' }
+export const metadata = { id: '@ossy/workspaces/actions/create-api-token', access: 'workspace' }

package/src/create-api-token.task.js

@@ -1,7 +1,7 @@
 import { Aggregate } from '@ossy/event-store'
 import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
 
-export const metadata = { id: 'workspaces/create-api-token' }
+export const metadata = { id: '@ossy/workspaces/tasks/create-api-token' }
 
 export async function run({ payload, req }) {
   const createdBy = payload?.userId ?? req?.userId

package/src/create.action.js

@@ -1 +1 @@
-export const metadata = { id: 'workspaces/create', access: 'authenticated' }
+export const metadata = { id: '@ossy/workspaces/actions/create', access: 'authenticated' }

package/src/create.task.js

@@ -2,7 +2,7 @@ import { Aggregate } from '@ossy/event-store'
 import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
 import { ConfigService } from '@ossy/platform'
 
-export const metadata = { id: 'workspaces/create' }
+export const metadata = { id: '@ossy/workspaces/tasks/create' }
 
 export async function run({ payload, req }) {
   const createdBy = payload?.userId ?? req?.userId

package/src/disable-service.action.js

@@ -1 +1 @@
-export const metadata = { id: 'workspaces/disable-service', access: 'workspace' }
+export const metadata = { id: '@ossy/workspaces/actions/disable-service', access: 'workspace' }

package/src/disable-service.task.js

@@ -1,25 +1,13 @@
 import { Aggregate } from '@ossy/event-store'
 import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
+import { assertEnableableService } from './service-keys.js'
 
-export const metadata = { id: 'workspaces/disable-service' }
-
-const AVAILABLE_SERVICES = [
-  '@ossy/tasks/visual-content-descriptors',
-  '@ossy/tasks/resize-common-web',
-  '@ossy/resumes',
-  '@ossy/consultancy',
-  '@ossy/apps',
-  '@ossy/domains',
-]
+export const metadata = { id: '@ossy/workspaces/tasks/disable-service' }
 
 export async function run({ payload, req }) {
   const createdBy = payload?.userId ?? req?.userId
   const workspaceId = payload?.workspaceId ?? req?.workspaceId
-  const service = payload?.service
-
-  if (!AVAILABLE_SERVICES.includes(service)) {
-    throw Object.assign(new Error(`Service ${service} is not available`), { status: 400 })
-  }
+  const service = assertEnableableService(payload?.service)
 
   const event = WorkspacesEvents.ServiceDisabled({ createdBy, service })
   await Aggregate.Of(Workspace, workspaceId).then(Aggregate.Add(event))