@ossy/workspaces 3.11.0 → 3.12.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ossy/workspaces",
   "description": "Workspaces feature package - create, select, and manage workspaces, users, and invitations",
-  "version": "3.11.0",
+  "version": "3.12.0",
   "type": "module",
   "main": "./src/index.js",
   "module": "./src/index.js",
@@ -35,6 +35,7 @@
     "@ossy/design-system": ">=1.0.0",
     "@ossy/router-react": ">=1.0.0",
     "@ossy/sdk-react": ">=1.0.0",
+    "@ossy/users": ">=1.0.0",
     "react": ">=19.0.0 <20.0.0"
   },
   "devDependencies": {
@@ -50,5 +51,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "53ff8456920e09151c9d88df4a6c3ee958d811eb"
+  "gitHead": "c2650803219ad1831559b512848358d9550ffad2"
 }

package/src/GeneralSettings.jsx

@@ -1,9 +1,11 @@
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
 import { GetWorkspace, EnableService, DisableService } from '@ossy/workspaces'
 import { GetCurrentUser } from '@ossy/authentication'
 import { useSdk, AsyncStatus, cacheKey } from '@ossy/sdk-react'
 import { Switch, Button, View, Text, ContentHeader, useLocale } from '@ossy/design-system'
 
+const GET_WORKSPACE_KPIS = { id: '@ossy/analytics/actions/get-workspace-kpis' }
+
 const formatDate = (timestamp) => timestamp ? new Date(timestamp).toLocaleDateString() : ''
 const FlowStage = { View: 'View', Edit: 'Edit' }
 
@@ -21,8 +23,30 @@ export const GeneralSettings = () => {
   const { status: userStatus } = sdk.read(GetCurrentUser)
   const [flowStage, setFlowStage] = useState(FlowStage.View)
   const [busyPackage, setBusyPackage] = useState(null)
+  const [kpis, setKpis] = useState({ status: 'idle', members: 0, resources: 0 })
   const services = workspace?.services || {}
 
+  useEffect(() => {
+    if (!workspace?.id) return undefined
+    let cancelled = false
+    sdk.invoke(GET_WORKSPACE_KPIS, {})
+      .then((json) => {
+        if (cancelled) return
+        setKpis({
+          status: 'success',
+          members: json?.members || 0,
+          resources: json?.resources || 0,
+        })
+      })
+      .catch(() => {
+        if (cancelled) return
+        setKpis((current) => ({ ...current, status: 'error' }))
+      })
+    return () => {
+      cancelled = true
+    }
+  }, [sdk, workspace?.id])
+
   const toggleService = async (packageName, enable) => {
     setBusyPackage(packageName)
     try {
@@ -61,6 +85,12 @@ export const GeneralSettings = () => {
         >
           <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>
+          {kpis.status === 'success' && (
+            <>
+              <View layout="row" gap="s"><Text style={{ fontWeight: 'bold' }} text="workspace.settings.members" /><Text>{kpis.members}</Text></View>
+              <View layout="row" gap="s"><Text style={{ fontWeight: 'bold' }} text="workspace.settings.resources" /><Text>{kpis.resources}</Text></View>
+            </>
+          )}
           {MANAGED_SERVICES.length > 0 && (
           <>
           <Text variant="heading-tertiary" as="h3" text="workspace.settings.services" />

package/src/en.translations.json

@@ -78,6 +78,8 @@
   "workspace.settings.service.enable": "Enable",
   "workspace.settings.service.disable": "Disable",
   "workspace.settings.loading": "Loading...",
+  "workspace.settings.members": "Members",
+  "workspace.settings.resources": "Resources",
   "workspace.invitations.description": "Invite users to your workspace to collaborate.",
   "workspace.invitations.invite": "Invite user",
   "workspace.invitations.empty": "No invitations",

package/src/invite-user.flow.js

@@ -1,4 +1,5 @@
 import signUpFlow from '@ossy/authentication/sign-up.flow.js'
+import { CompleteUserName, CompleteUserNameForm } from '@ossy/users'
 import { InviteUser } from '@ossy/workspaces'
 import { metadata as InviteUserForm } from './invite-user.form.js'
 
@@ -10,12 +11,13 @@ export const metadata = {
 }
 
 /**
- * Happy path for issue #5 — invite a teammate, then accept via invitation email.
+ * Invite a teammate, accept via email, then complete the signed-in name gate
+ * (issue #419). Invitees are created email-only; product UI prompts for name.
  */
 export default {
   title: 'Invite and accept workspace invitation',
   description:
-    'Signed-in user invites another email, asserts pending invite, invitee accepts via email and lands on workspaces',
+    'Signed-in user invites another email, invitee accepts, sets name on the product gate, and sees that name on profile',
   steps: [
     ...signUpFlow.steps,
     // Keep the inviter address before the invite form overwrites `$email`.
@@ -36,5 +38,28 @@ export default {
     },
     { result: { selector: '[data-flow-stage="invite-verify-success"]', timeout: 15000 } },
     { result: { page: '@profile/workspaces', timeout: 20000 } },
+    { result: { selector: '[data-flow-stage="complete-user-name"]', timeout: 15000 } },
+    {
+      form: CompleteUserNameForm,
+      fields: {
+        firstName: 'Invitee',
+        lastName: 'Named',
+      },
+    },
+    { action: CompleteUserName },
+    {
+      result: {
+        selector: '[data-flow-stage="complete-user-name"]',
+        hidden: true,
+        timeout: 15000,
+      },
+    },
+    { page: '@profile' },
+    {
+      result: {
+        selector: '[data-user-name="Invitee Named"]',
+        timeout: 15000,
+      },
+    },
   ],
 }

package/src/sv.translations.json

@@ -78,6 +78,8 @@
   "workspace.settings.service.enable": "Aktivera",
   "workspace.settings.service.disable": "Inaktivera",
   "workspace.settings.loading": "Laddar...",
+  "workspace.settings.members": "Medlemmar",
+  "workspace.settings.resources": "Resurser",
   "workspace.invitations.description": "Bjud in användare till ditt workspace för att samarbeta.",
   "workspace.invitations.invite": "Bjud in användare",
   "workspace.invitations.empty": "Inga inbjudningar",

package/src/workspaces.queries.js

@@ -4,42 +4,78 @@ import { WorkspaceSchema } from './schema-ids.js'
 
 const log = createLogger('workspaces')
 
+/**
+ * Membership events that mean the user belongs to a workspace.
+ * Kept narrow so the list query never scans every workspace stream.
+ */
+const MEMBERSHIP_EVENTS = ['Created', 'UserInvitationAccepted']
+
 export class WorkspacesQueries {
+  /**
+   * Minified `{ id, name }[]` for workspaces the user created or joined.
+   *
+   * Pipeline shape (perf-critical for select-workspace):
+   * 1. `$match` only this user's membership events (not every workspace event)
+   * 2. `$group` by workspace id (name when the user is the creator)
+   * 3. `$lookup` the workspace `Created` event for name when the user only joined
+   */
   static getAllByUserIncluded (userId) {
     log.info('[WorkspacesQueries] getAllByUserIncluded()')
+    if (!userId) return Promise.resolve([])
+
     return EventStore.Aggregate([
-      { $match: { type: WorkspaceSchema.workspace, resourceId: { $exists: true } } },
-      { $group: { _id: '$resourceId', events: { $push: '$$ROOT' } } },
       {
         $match: {
-          $or: [
-            { 'events.createdBy': userId },
-            { 'events.event': 'UserInvitationAccepted', 'events.createdBy': userId },
-          ],
-          'events.event': { $in: ['Created', 'UserInvitationAccepted'] },
+          type: WorkspaceSchema.workspace,
+          createdBy: userId,
+          event: { $in: MEMBERSHIP_EVENTS },
         },
       },
       {
-        $project: {
-          id: '$_id',
+        $group: {
+          _id: '$resourceId',
           name: {
-            $let: {
-              vars: {
-                created: {
-                  $arrayElemAt: [
-                    {
-                      $filter: {
-                        input: '$events',
-                        as: 'e',
-                        cond: { $eq: ['$$e.event', 'Created'] },
-                      },
-                    },
-                    0,
+            $max: {
+              $cond: [
+                { $eq: ['$event', 'Created'] },
+                '$payload.name',
+                null,
+              ],
+            },
+          },
+        },
+      },
+      {
+        $lookup: {
+          from: 'eventstore',
+          let: { workspaceId: '$_id' },
+          pipeline: [
+            {
+              $match: {
+                $expr: {
+                  $and: [
+                    { $eq: ['$resourceId', '$$workspaceId'] },
+                    { $eq: ['$type', WorkspaceSchema.workspace] },
+                    { $eq: ['$event', 'Created'] },
                   ],
                 },
               },
-              in: '$$created.payload.name',
             },
+            { $limit: 1 },
+            { $project: { _id: 0, name: '$payload.name' } },
+          ],
+          as: '_created',
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          id: '$_id',
+          name: {
+            $ifNull: [
+              '$name',
+              { $arrayElemAt: ['$_created.name', 0] },
+            ],
           },
         },
       },

package/src/workspaces.queries.spec.js

@@ -0,0 +1,59 @@
+import { beforeEach, describe, expect, it, jest } from '@jest/globals'
+
+const aggregateMock = jest.fn()
+
+jest.unstable_mockModule('@ossy/event-store', () => ({
+  EventStore: {
+    Aggregate: aggregateMock,
+  },
+}))
+
+jest.unstable_mockModule('@ossy/observability', () => ({
+  createLogger: () => ({
+    info: () => {},
+    error: () => {},
+    warn: () => {},
+    debug: () => {},
+  }),
+}))
+
+const { WorkspacesQueries } = await import('./workspaces.queries.js')
+const { WorkspaceSchema } = await import('./schema-ids.js')
+
+describe('WorkspacesQueries.getAllByUserIncluded', () => {
+  beforeEach(() => {
+    aggregateMock.mockReset()
+  })
+
+  it('returns [] without hitting Mongo when userId is missing', async () => {
+    await expect(WorkspacesQueries.getAllByUserIncluded()).resolves.toEqual([])
+    await expect(WorkspacesQueries.getAllByUserIncluded(null)).resolves.toEqual([])
+    expect(aggregateMock).not.toHaveBeenCalled()
+  })
+
+  it('scopes the aggregation to this user membership events only', async () => {
+    aggregateMock.mockResolvedValue([{ id: 'ws-1', name: 'Acme' }])
+
+    await expect(WorkspacesQueries.getAllByUserIncluded('user-1')).resolves.toEqual([
+      { id: 'ws-1', name: 'Acme' },
+    ])
+
+    expect(aggregateMock).toHaveBeenCalledTimes(1)
+    const [pipeline] = aggregateMock.mock.calls[0]
+    expect(pipeline[0]).toEqual({
+      $match: {
+        type: WorkspaceSchema.workspace,
+        createdBy: 'user-1',
+        event: { $in: ['Created', 'UserInvitationAccepted'] },
+      },
+    })
+    expect(pipeline.some(stage => stage.$lookup?.from === 'eventstore')).toBe(true)
+    // Must not scan every workspace stream then filter
+    expect(JSON.stringify(pipeline[0])).not.toContain('events.createdBy')
+  })
+
+  it('returns [] when the aggregation rejects', async () => {
+    aggregateMock.mockRejectedValue(new Error('mongo down'))
+    await expect(WorkspacesQueries.getAllByUserIncluded('user-1')).resolves.toEqual([])
+  })
+})