@ossy/workspaces 1.17.3 → 3.0.2

package/README.md

@@ -37,6 +37,10 @@ npm run build
 
 `@ossy/app` discovers the pages automatically by reading the `"ossy": { "src": "./src" }` field in this package's `package.json`.
 
+## Preview
+
+Workspace pages are exercised in **`@ossy/app-test`** on the production build path. Open workspace routes from the sidebar or inspect capabilities at `/packages/workspaces`. See [`packages/app-test/README.md`](../app-test/README.md).
+
 ## Peer dependencies
 
 | Package | Version |

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ossy/workspaces",
   "description": "Workspaces feature package - create, select, and manage workspaces, users, and invitations",
-  "version": "1.17.3",
+  "version": "3.0.2",
   "type": "module",
   "main": "./src/index.js",
   "module": "./src/index.js",
@@ -22,6 +22,10 @@
   "ossy": {
     "src": "./src"
   },
+  "dependencies": {
+    "@ossy/config": "^3.0.2",
+    "@ossy/schema": "^3.0.2"
+  },
   "peerDependencies": {
     "@ossy/design-system": ">=1.0.0",
     "@ossy/router-react": ">=1.0.0",
@@ -30,7 +34,6 @@
   },
   "devDependencies": {
     "@jest/globals": "^30.2.0",
-    "@ossy/platform": "^1.39.3",
     "casual": "^1.6.2",
     "jest": "^30.2.0"
   },
@@ -42,5 +45,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "a0d89185a17f8de8ce328c3a648c108ff1d61d8f"
+  "gitHead": "f0a8af3c370bbaffe4f7388c14f9345a5c6c56e5"
 }

package/src/AuthenticationGuard.jsx

@@ -25,7 +25,7 @@ export const AuthenticationGuard = ({ children }) => {
         <View layout="off-center" style={{ height: '100%' }}>
           <Guide
             style={{ width: '100vw', maxWidth: '300px' }}
-            slot="content"
+            data-region="content"
             title={t('authentication.guard.notAuthenticated.title')}
             text={t('authentication.guard.notAuthenticated.text')}
           />
@@ -36,7 +36,7 @@ export const AuthenticationGuard = ({ children }) => {
         <View layout="off-center" style={{ height: '100%' }}>
           <Guide
             style={{ width: '100vw', maxWidth: '300px' }}
-            slot="content"
+            data-region="content"
             title={t('authentication.guard.error.title')}
             text={t('authentication.guard.error.text')}
           />
@@ -49,7 +49,7 @@ export const AuthenticationGuard = ({ children }) => {
             name="spinner"
             style={{ width: '64px', height: '64px' }}
             className="rotate fill-50"
-            slot="content"
+            data-region="content"
           />
         </View>
       </Switch.Case>

package/src/Definition.js

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

package/src/Invitations.page.jsx

@@ -13,7 +13,7 @@ export const metadata = {
 export const InvitationsPage = () => {
   return (
     <View layout="off-center-m" style={{ height: '100%' }}>
-      <View slot="content" surface="primary" roundness="m" inset="m">
+      <View data-region="content" surface="primary" roundness="m" inset="m">
         <Invitations />
       </View>
     </View>

package/src/Invite.page.jsx

@@ -13,7 +13,7 @@ export const metadata = {
 export const InvitePage = () => {
   return (
     <View layout="off-center-m" style={{ height: '100%' }}>
-      <View slot="content" surface="primary" roundness="m" inset="m">
+      <View data-region="content" surface="primary" roundness="m" inset="m">
         <Invite />
       </View>
     </View>

package/src/SelectWorkspacePage.jsx

@@ -24,7 +24,7 @@ export const SelectWorkspacePage = () => {
     : asyncStatus
 
   const setWorkspace = workspaceId => {
-    selectWorkspace(workspaceId, router.getHref('@home/home'))
+    selectWorkspace(workspaceId, router.getHref('@home') || '/')
   }
 
   return (
@@ -59,7 +59,7 @@ export const SelectWorkspacePage = () => {
         <Switch.Case match={[PageFlow.Error]}>
           <View layout="off-center" style={{ height: '100%' }}>
             <Guide
-              slot="content"
+              data-region="content"
               style={{ width: '100vw', maxWidth: '500px' }}
               title={t('workspaces.select.errorTitle')}
               text={t('workspaces.select.errorText')}
@@ -74,7 +74,7 @@ export const SelectWorkspacePage = () => {
 
         <Switch.Case match={[PageFlow.Loading]}>
           <Icon
-            slot="content"
+            data-region="content"
             name="spinner"
             style={{ width: '64px', height: '64px' }}
             className="rotate"
@@ -116,7 +116,7 @@ export const SelectWorkspacePage = () => {
         <Switch.Case match={[PageFlow.NoWorkspacesCreated]}>
           <View layout="vertical-top" style={{ flexGrow: '1' }}>
             <Guide
-              slot="content"
+              data-region="content"
               style={{ padding: 'var(--space-xl) var(--space-m)', width: '100vw', maxWidth: '500px' }}
               title={`🎉 ${t('workspaces.select.emptyTitle')} 🎉`}
               text={t('workspaces.select.emptyText')}

package/src/WorkspaceSettings.page.jsx

@@ -13,7 +13,7 @@ export const metadata = {
 export const WorkspaceSettingsPage = () => {
   return (
     <View layout="off-center-m" style={{ height: '100%' }}>
-      <View slot="content" surface="primary" roundness="m" inset="m">
+      <View data-region="content" surface="primary" roundness="m" inset="m">
         <GeneralSettings />
       </View>
     </View>

package/src/accept-invitation.task.js

@@ -4,7 +4,7 @@ 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 { ConfigService } from '@ossy/config'
 import { createLogger } from '@ossy/observability'
 
 export const metadata = { id: '@ossy/workspaces/tasks/accept-invitation' }

package/src/create.task.js

@@ -1,6 +1,6 @@
 import { Aggregate } from '@ossy/event-store'
 import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
-import { ConfigService } from '@ossy/platform'
+import { ConfigService } from '@ossy/config'
 
 export const metadata = { id: '@ossy/workspaces/tasks/create' }
 

package/src/get-schemas.task.js

@@ -1,6 +1,6 @@
 import { Aggregate } from '@ossy/event-store'
 import { Workspace } from '@ossy/workspaces/server'
-import { getSystemSchemas } from '@ossy/platform'
+import { getSystemSchemas } from '@ossy/schema'
 import { mergeWorkspaceSchemas } from './merge-workspace-schemas.js'
 
 export const metadata = { id: '@ossy/workspaces/tasks/get-schemas' }

package/src/import-schemas.task.js

@@ -1,6 +1,6 @@
 import { Aggregate } from '@ossy/event-store'
 import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
-import { validateSchemasForImport } from '@ossy/platform'
+import { validateSchemasForImport } from '@ossy/schema'
 
 export const metadata = { id: '@ossy/workspaces/tasks/import-schemas' }
 

package/src/invite-user.task.js

@@ -4,7 +4,7 @@ import { UserSchema } from '@ossy/users/server'
 import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
 import { Token, TokenEvents } from '@ossy/tokens/server'
 import { EmailRenderer } from '@ossy/email'
-import { ConfigService } from '@ossy/platform'
+import { ConfigService } from '@ossy/config'
 import { createLogger } from '@ossy/observability'
 import WorkspaceInvitationEmail, { subject as workspaceInvitationSubject } from './workspace-invitation.email.jsx'
 

package/src/accept-invitation.api.js

@@ -1,46 +0,0 @@
-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/select-workspace.api.js

@@ -1,50 +0,0 @@
-import {
-  ActionService,
-  mergeUserAppSettingsCookie,
-} from '@ossy/platform'
-
-export const metadata = {
-  id: 'users.select-workspace',
-  path: '/api/v0/users/select-workspace',
-  method: 'GET',
-  query: ['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
-  }
-
-  if (!req.userId || req.userId === 'anonymous') {
-    res.status(401).json({ error: 'Unauthorized' })
-    return
-  }
-
-  const workspaceId = req.query.workspaceId
-  if (!workspaceId || typeof workspaceId !== 'string') {
-    res.status(400).json({ message: 'No workspaceId provided' })
-    return
-  }
-
-  try {
-    const workspaces = await ActionService.invoke('@ossy/workspaces/actions/list', { req })
-    if (!workspaces.some((w) => w.id === workspaceId)) {
-      res.status(403).json({ message: 'Forbidden' })
-      return
-    }
-
-    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 || 500).json({ message: err.message || 'Internal Server Error' })
-  }
-}

package/src/stories/Users.stories.jsx

@@ -1,35 +0,0 @@
-import React from 'react'
-import { View } from '@ossy/design-system'
-import { Users } from '../Users.jsx'
-import { withMockRouter, withMockSdk } from './decorators.jsx'
-
-export default {
-  title: 'Workspaces/Pages/Users',
-  component: Users,
-  decorators: [withMockRouter, withMockSdk],
-  parameters: {
-    layout: 'padded',
-    docs: {
-      story: {
-        inline: true,
-        height: 'auto',
-      },
-    },
-  },
-}
-
-export const Default = () => (
-  <View style={{ maxWidth: 720, width: '100%' }}>
-    <Users />
-  </View>
-)
-
-export const Empty = () => (
-  <View style={{ maxWidth: 720, width: '100%' }}>
-    <Users />
-  </View>
-)
-
-Empty.parameters = {
-  mockSdk: { users: [] },
-}

package/src/stories/decorators.jsx

@@ -1,59 +0,0 @@
-import {
-  createMockRouterDecorator,
-  createMockSdkDecorator,
-} from '../../../../.storybook/decorators/index.jsx'
-
-export const sampleWorkspaceUsers = [
-  { id: 'user-1', firstName: 'Anna', lastName: 'Svensson', email: 'anna@example.com', type: 'User' },
-  { id: 'user-2', firstName: 'Erik', lastName: 'Lind', email: 'erik@example.com', type: 'User' },
-  { id: 'bot-1', firstName: 'Deploy', lastName: 'Bot', email: 'bot@example.com', type: 'Bot' },
-]
-
-export const sampleWorkspaces = [
-  { id: 'ws-demo-1', name: 'Demo Workspace' },
-  { id: 'ws-demo-2', name: 'Acme Corp' },
-]
-
-export const sampleCurrentUser = {
-  id: 'user-1',
-  firstName: 'Anna',
-  lastName: 'Svensson',
-  email: 'anna@example.com',
-}
-
-function createWorkspaceHandlers (overrides = {}) {
-  const users = 'users' in overrides ? overrides.users : sampleWorkspaceUsers
-  const workspaces = 'workspaces' in overrides ? overrides.workspaces : sampleWorkspaces
-  const currentUser = 'currentUser' in overrides ? overrides.currentUser : sampleCurrentUser
-
-  return {
-    '@ossy/workspaces/actions/get-users': async () => users,
-    '@ossy/workspaces/actions/list': async () => workspaces,
-    '@ossy/authentication/actions/get-current-user': async () => currentUser,
-  }
-}
-
-const defaultMockRouter = {
-  href: 'http://localhost/en/workspaces',
-  pages: [],
-  language: 'en',
-  defaultLanguage: 'en',
-  supportedLanguages: ['en', 'sv'],
-  params: {},
-  searchParams: {},
-  navigate: () => {},
-  getHref: (target) => {
-    const id = typeof target === 'string' ? target : target?.id
-    if (id === '@workspace/invitations/add') return '/en/invitations/add'
-    if (id === '@profile/workspaces/create') return '/en/profile/workspaces/create'
-    if (id === '@home/home') return '/en/home'
-    if (id === '@storage/home' && target?.params?.workspaceId) {
-      return `/en/storage/${target.params.workspaceId}`
-    }
-    return `/en/${String(id ?? '').replace(/\//g, '-')}`
-  },
-  back: () => {},
-}
-
-export const withMockSdk = createMockSdkDecorator(createWorkspaceHandlers)
-export const withMockRouter = createMockRouterDecorator(defaultMockRouter)