@ossy/workspaces 1.17.2 → 3.0.1

package/src/merge-workspace-schemas.spec.js

@@ -0,0 +1,16 @@
+import { describe, expect, it } from '@jest/globals'
+import { mergeWorkspaceSchemas } from './merge-workspace-schemas.js'
+
+describe('mergeWorkspaceSchemas', () => {
+  it('appends workspace-only schemas', () => {
+    const system = [{ id: 'a', name: 'A', fields: [] }]
+    const workspace = [{ id: 'b', name: 'B', fields: [] }]
+    expect(mergeWorkspaceSchemas(system, workspace).map(s => s.id)).toEqual(['a', 'b'])
+  })
+
+  it('lets workspace schemas override system ids', () => {
+    const system = [{ id: 'a', name: 'System', fields: [] }]
+    const workspace = [{ id: 'a', name: 'Custom', fields: [] }]
+    expect(mergeWorkspaceSchemas(system, workspace)[0].name).toBe('Custom')
+  })
+})

package/src/remove-member.action.js

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

package/src/remove-member.task.js

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

package/src/schema-ids.js

@@ -0,0 +1,3 @@
+export const WorkspaceSchema = Object.freeze({
+  workspace: '@ossy/workspaces/schema/workspace',
+})

package/src/select-workspace.api.js

@@ -0,0 +1,50 @@
+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/selectWorkspace.js

@@ -0,0 +1,11 @@
+export function selectWorkspaceHref (workspaceId, redirect) {
+  const params = new URLSearchParams({ workspaceId: String(workspaceId) })
+  if (redirect != null && redirect !== '') {
+    params.set('redirect', String(redirect))
+  }
+  return `/api/v0/users/select-workspace?${params}`
+}
+
+export function selectWorkspace (workspaceId, redirect) {
+  window.location.assign(selectWorkspaceHref(workspaceId, redirect))
+}

package/src/service-keys.js

@@ -0,0 +1 @@
+export { assertEnableableService } from './entitlements.js'

package/src/sv.translations.json

@@ -8,41 +8,41 @@
   "workspaces.select.title": "Mina workspaces",
   "workspaces.select.newWorkspace": "Nytt workspace",
   "workspaces.select.loading": "Laddar...",
-  "workspaces.select.description": "Workspaces är separata miljöer där du kan hantera resurser, mallar, tjänster och fakturering.",
+  "workspaces.select.description": "Workspaces är separata miljöer där du kan hantera resurser, scheman, tjänster och fakturering.",
   "workspaces.select.errorTitle": "Vi kunde inte ladda dina workspaces",
   "workspaces.select.errorText": "Något gick fel när dina workspaces skulle laddas. Kanske har din session gått ut, eller så har vi klantat till det. Prova att börja om från startsidan.",
   "workspaces.select.errorAction": "Gå till startsidan",
   "workspaces.select.emptyTitle": "Nu sätter vi igång",
-  "workspaces.select.emptyText": "För att komma igång behöver vi skapa ett workspace. Ett workspace kapslar in resurser, resursmallar, faktureringsinformation och vilka användare som har tillgång.",
+  "workspaces.select.emptyText": "För att komma igång behöver vi skapa ett workspace. Ett workspace kapslar in resurser, scheman, faktureringsinformation och vilka användare som har tillgång.",
   "workspaces.select.emptyAction": "Skapa ett workspace",
-  "workspaces/create.label": "Skapa workspace",
-  "workspaces/create.description": "Skapa ett nytt workspace för den inloggade användaren",
-  "workspaces/accept-invitation.label": "Acceptera inbjudan",
-  "workspaces/accept-invitation.description": "Acceptera en workspace-inbjudan",
-  "workspaces/create-api-token.label": "Skapa workspace API-nyckel",
-  "workspaces/create-api-token.description": "Skapa en API-nyckel kopplad till workspace",
-  "workspaces/disable-service.label": "Inaktivera tjänst",
-  "workspaces/disable-service.description": "Inaktivera en tjänst för workspace",
-  "workspaces/enable-service.label": "Aktivera tjänst",
-  "workspaces/enable-service.description": "Aktivera en tjänst för workspace",
-  "workspaces/get-api-tokens.label": "Hämta workspace API-nycklar",
-  "workspaces/get-api-tokens.description": "Lista API-nycklar för workspace",
-  "workspaces/get-invitations.label": "Hämta inbjudningar",
-  "workspaces/get-invitations.description": "Lista väntande workspace-inbjudningar",
-  "workspaces/get-resource-templates.label": "Hämta resursmallar",
-  "workspaces/get-resource-templates.description": "Lista resursmallar tillgängliga för workspace",
-  "workspaces/get-users.label": "Hämta workspace-användare",
-  "workspaces/get-users.description": "Lista medlemmar i workspace",
-  "workspaces/get.label": "Hämta workspace",
-  "workspaces/get.description": "Ladda ett workspace via id",
-  "workspaces/import-resource-templates.label": "Importera resursmallar",
-  "workspaces/import-resource-templates.description": "Importera resursmallar till workspace",
-  "workspaces/invite-user.label": "Bjud in användare",
-  "workspaces/invite-user.description": "Skicka en workspace-inbjudan till en användare",
-  "workspaces/remove-member.label": "Ta bort medlem",
-  "workspaces/remove-member.description": "Ta bort en användare från workspace",
-  "workspaces/list.label": "Lista workspaces",
-  "workspaces/list.description": "Lista workspaces för den inloggade användaren",
+  "@ossy/workspaces/actions/create.label": "Skapa workspace",
+  "@ossy/workspaces/actions/create.description": "Skapa ett nytt workspace för den inloggade användaren",
+  "@ossy/workspaces/actions/accept-invitation.label": "Acceptera inbjudan",
+  "@ossy/workspaces/actions/accept-invitation.description": "Acceptera en workspace-inbjudan",
+  "@ossy/workspaces/actions/create-api-token.label": "Skapa workspace API-nyckel",
+  "@ossy/workspaces/actions/create-api-token.description": "Skapa en API-nyckel kopplad till workspace",
+  "@ossy/workspaces/actions/disable-service.label": "Inaktivera tjänst",
+  "@ossy/workspaces/actions/disable-service.description": "Inaktivera en tjänst för workspace",
+  "@ossy/workspaces/actions/enable-service.label": "Aktivera tjänst",
+  "@ossy/workspaces/actions/enable-service.description": "Aktivera en tjänst för workspace",
+  "@ossy/workspaces/actions/get-api-tokens.label": "Hämta workspace API-nycklar",
+  "@ossy/workspaces/actions/get-api-tokens.description": "Lista API-nycklar för workspace",
+  "@ossy/workspaces/actions/get-invitations.label": "Hämta inbjudningar",
+  "@ossy/workspaces/actions/get-invitations.description": "Lista väntande workspace-inbjudningar",
+  "@ossy/workspaces/actions/get-schemas.label": "Hämta scheman",
+  "@ossy/workspaces/actions/get-schemas.description": "Lista scheman tillgängliga för workspace",
+  "@ossy/workspaces/actions/get-users.label": "Hämta workspace-användare",
+  "@ossy/workspaces/actions/get-users.description": "Lista medlemmar i workspace",
+  "@ossy/workspaces/actions/get.label": "Hämta workspace",
+  "@ossy/workspaces/actions/get.description": "Ladda ett workspace via id",
+  "@ossy/workspaces/actions/import-schemas.label": "Importera scheman",
+  "@ossy/workspaces/actions/import-schemas.description": "Importera scheman till workspace",
+  "@ossy/workspaces/actions/invite-user.label": "Bjud in användare",
+  "@ossy/workspaces/actions/invite-user.description": "Skicka en workspace-inbjudan till en användare",
+  "@ossy/workspaces/actions/remove-member.label": "Ta bort medlem",
+  "@ossy/workspaces/actions/remove-member.description": "Ta bort en användare från workspace",
+  "@ossy/workspaces/actions/list.label": "Lista workspaces",
+  "@ossy/workspaces/actions/list.description": "Lista workspaces för den inloggade användaren",
   "workspace/settings.documentTitle": "Workspace-inställningar",
   "workspace.settings.title": "Workspace-inställningar",
   "workspace/users.documentTitle": "Användare",
@@ -54,10 +54,16 @@
   "workspace/invitations/add.documentTitle": "Bjud in användare",
   "workspace.invitations.title": "Inbjudningar",
   "workspace.settings.detailsTitle": "Workspace-detaljer",
+  "workspace.settings.detailsDescription": "Hantera workspace-namn, tjänster och metadata.",
   "workspace.settings.edit": "Redigera",
   "workspace.settings.name": "Namn",
   "workspace.settings.created": "Skapad",
   "workspace.settings.services": "Tjänster",
+  "workspace.settings.service.booking": "Bokning",
+  "workspace.settings.service.on": "på",
+  "workspace.settings.service.off": "av",
+  "workspace.settings.service.enable": "Aktivera",
+  "workspace.settings.service.disable": "Inaktivera",
   "workspace.settings.loading": "Laddar...",
   "workspace.invitations.description": "Bjud in användare till ditt workspace för att samarbeta.",
   "workspace.invitations.invite": "Bjud in användare",

package/src/sync-workspace-membership.task.js

@@ -1,20 +1,21 @@
 import { Aggregate } from '@ossy/event-store'
 import { User, UsersEvents } from '@ossy/users/server'
 import { JoinWorkspace, LeaveWorkspace } from '@ossy/users'
+import { WorkspaceSchema } from './schema-ids.js'
 
 export const metadata = {
-  id: 'sync-workspace-membership',
+  id: '@ossy/workspaces/tasks/sync-workspace-membership',
   triggers: [
-    { aggregateType: 'Workspace', event: 'Created' },
-    { aggregateType: 'Workspace', event: 'UserInvitationAccepted' },
-    { aggregateType: 'Workspace', event: 'UserRemoved' },
+    { type: WorkspaceSchema.workspace, event: 'Created' },
+    { type: WorkspaceSchema.workspace, event: 'UserInvitationAccepted' },
+    { type: WorkspaceSchema.workspace, event: 'UserRemoved' },
   ],
 }
 
 export async function run ({ event, sdk }) {
-  const workspaceId = event.aggregateId
+  const workspaceId = event.resourceId
 
-  if (event.type === 'UserRemoved') {
+  if (event.event === 'UserRemoved') {
     const userId = event.payload.userId
 
     if (sdk) {

package/src/workspace-invitation.email.jsx

@@ -1,6 +1,6 @@
 import { EmailLayout, EmailButton, EmailText } from '@ossy/email'
 
-export const id = 'workspaces/invitation'
+export const id = '@ossy/workspaces/emails/invitation'
 export const subject = 'You have been invited'
 
 export default function WorkspaceInvitationEmail({ workspace, invitedBy, verificationToken, baseUrl = 'https://app.ossy.se', theme }) {

package/src/workspace-users.component.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 = {
@@ -7,9 +7,9 @@ export const metadata = {
 }
 
 export const WorkspaceUsersContent = () => (
-  <View gap="m" surface="primary" style={{ padding: 'var(--space-m) var(--space-l)', height: '100%', overflowY: 'auto' }}>
+  <Page>
     <Users />
-  </View>
+  </Page>
 )
 
 export default WorkspaceUsersContent

package/src/workspace.aggregate.js

@@ -1,50 +1,42 @@
+import { normalizeWorkspaceServices } from './entitlements.js'
+import { WorkspaceSchema } from './schema-ids.js'
+
 export class Workspace {
 
+  static kind = 'entity'
+  static SchemaId = WorkspaceSchema.workspace
   static AggregateType = 'Workspace'
 
-  static View(events, state = {}) {
-    return events
-      .reduce((workspace, event) => {
-
-      switch (event.type) {
+  static View (events, state = {}) {
+    const folded = events.reduce((workspace, event) => {
+      switch (event.event) {
 
         case 'Created':
           return {
             ...workspace,
-            id: event.aggregateId,
+            id: event.resourceId,
+            type: event.type,
             name: event.payload.name,
             createdBy: event.createdBy,
             created: event.created,
             apiTokens: [],
             users: [event.createdBy],
             invitations: [],
-            resourceTemplates: [],
-            services: {
-              // '@ossy/visual-content-classifiers': true,
-              '@ossy/tasks/resize-common-web': true,
-              '@ossy/apps': true,
-              '@ossy/domains': true,
-            }
+            schemas: [],
+            services: {},
           }
 
-        case 'ResourceTemplatesImported':
+        case 'SchemasImported':
           return {
             ...workspace,
-            resourceTemplates: [
-              ...(event.payload.templates || []),
-            ]
+            schemas: [...(event.payload.schemas || [])],
           }
 
         case 'UserInvited': {
           const oneWeek = 1000 * 60 * 60 * 24 * 7
           const expired = event.payload.expiresAt < Date.now()
-          // show expired workspace invitations for 7 days
           const showInvitation = (event.payload.expiresAt + oneWeek) > Date.now()
-
-          if (!showInvitation) {
-            return workspace
-          }
-
+          if (!showInvitation) return workspace
           return {
             ...workspace,
             invitations: [
@@ -53,42 +45,35 @@ export class Workspace {
                 email: event.payload.email,
                 invitedAt: event.created,
                 expiresAt: event.payload.expiresAt,
-                expired: expired
-              }
-            ]
+                expired,
+              },
+            ],
           }
         }
 
-        case 'UserInvitationAccepted': {
+        case 'UserInvitationAccepted':
           return {
             ...workspace,
-            users: [
-              ...workspace.users,
-              event.createdBy
-            ],
-            invitations: workspace.invitations.filter(invitation => invitation.email !== event.payload.email)
+            users: [...workspace.users, event.createdBy],
+            invitations: workspace.invitations.filter(invitation => invitation.email !== event.payload.email),
           }
-        }
 
         case 'ApiTokenCreated':
           return {
             ...workspace,
             apiTokens: [
-              ...(apiTokens || []),
-              {
-                id: event.id,
-                description: event.payload.description
-              }
-            ]
+              ...(workspace.apiTokens || []),
+              { id: event.id, description: event.payload.description },
+            ],
           }
-        
+
         case 'ServiceEnabled':
           return {
             ...workspace,
             services: {
               ...(workspace.services || {}),
-              [event.payload.service]: true
-            }
+              [event.payload.service]: { enabled: true },
+            },
           }
 
         case 'ServiceDisabled':
@@ -96,23 +81,26 @@ export class Workspace {
             ...workspace,
             services: {
               ...(workspace.services || {}),
-              [event.payload.service]: false
-            }
+              [event.payload.service]: { enabled: false },
+            },
           }
 
         case 'UserRemoved':
           return {
             ...workspace,
-            users: (workspace.users || []).filter(id => id !== event.payload.userId)
+            users: (workspace.users || []).filter(id => id !== event.payload.userId),
           }
 
         default:
           return workspace
-
       }
     }, state)
-  }
 
+    return {
+      ...folded,
+      services: normalizeWorkspaceServices(folded.services),
+    }
+  }
 }
 
 export { Workspace as Aggregate }

package/src/workspace.schema.js

@@ -0,0 +1,9 @@
+export default {
+  id: '@ossy/workspaces/schema/workspace',
+  name: 'Workspace',
+  categoryName: 'Workspaces',
+  icon: 'building',
+  fields: [
+    { name: 'name', type: 'text' },
+  ],
+}

package/src/workspaces.events.js

@@ -1,171 +1,77 @@
-/**
- * Field
- * @typedef {Object} Field
- * @property {string} type - field type
- * @property {string} name - name of field
- */
-
- /**
-  * ResourceTemplate
-  * @typedef {Object} ResourceTemplate
-  * @property {string} name - Displayname of the resource template
-  * @property {Field[]} fields - Allowed fields
-  */
-
+import { nanoid } from 'nanoid'
+import { WorkspaceSchema } from './schema-ids.js'
 
 /**
-  * @class
-  */
+ * ADR 0008 workspace entity events.
+ */
 export class WorkspacesEvents {
 
-  /**
-   * Return type of WorkspacesEvents.Created
-   * @typedef {Object} Created
-   * @property {string} type - Created
-   * @property {string} createdBy - userId of user who created the workspace
-   * @property {CreatedPayload} payload - event payload
-   */
+  static Created ({ resourceId, createdBy, name }) {
+    return {
+      type: WorkspaceSchema.workspace,
+      resourceId: resourceId ?? nanoid(),
+      event: 'Created',
+      createdBy,
+      payload: { name },
+    }
+  }
 
-   /**
-    * Payload of Workspace.Created event
-    * @typedef {Object} CreatedPayload
-    * @property {string} name - Name of workspace
-    */
+  static SchemasImported ({ createdBy, schemas }) {
+    return {
+      event: 'SchemasImported',
+      createdBy,
+      payload: { schemas },
+    }
+  }
 
-  /**
-   * Input for WorkspacesEvents.Created
-   * @typedef {Object} CreatedInput
-   * @property {string} name - Name of workspace
-   * @property {string} createdBy - userId of user who created the workspace
-   */
+  static ApiTokenCreated ({ createdBy, description, token }) {
+    return {
+      event: 'ApiTokenCreated',
+      createdBy,
+      payload: { description, token },
+    }
+  }
 
-  /**
-   *  Use this to indicate that a new workspace have been created
-   *
-   * @param {CreatedInput} input
-   * @return {Created} - Workspace created event
-   *
-   * @example
-   * const name = 'ossy.se'
-   * const createdBy = 'fake-user-id-123'
-   *
-   * const event = WorkspacesEvents.Created({ name, createdBy })
-   *
-   * Aggregate.Of(Workspace, event)
-   */
-  static Created({ createdBy, name }) {
-    return ({
-      type: 'Created',
-      createdBy: createdBy,
+  static UserInvited ({ createdBy, email, expiresAt }) {
+    return {
+      event: 'UserInvited',
+      createdBy,
       payload: {
-        name: name
-      }
-    })
-   }
-
-   /**
-    * Return type of WorkspacesEvents.ResourceTemplatesImported
-    * @typedef {Object} ResourceTemplatesImported
-    * @property {string} type - ResourceTemplatesImported
-    * @property {string} createdBy - userId of user who created the workspace
-    * @property {ResourceTemplate[]} payload - event payload
-    */
-
-   /**
-    * Input for WorkspacesEvents.Created
-    * @typedef {Object} ResourceTemplatesImportedInput
-    * @property {ResourceTemplate[]} templates - List of resource templates
-    * @property {string} createdBy - userId of user who created the workspace
-    */
-
-   /**
-    *  Use this to save imported resource templates
-    *
-    * @param {ResourceTemplatesImportedInput} input
-    * @return {ResourceTemplatesImported} - Resource templates imported event
-    *
-    * @example
-    * const templates = []
-    * const createdBy = 'fake-user-123'
-    *
-    * const event = WorkspacesEvents.Created({ templates, createdBy })
-    *
-    * Aggregate.Of(Workspace, userId)
-    *  .then(Aggregate.Add(event))
-    */
-   static ResourceTemplatesImported({ createdBy, templates }) {
-     return ({
-       type: 'ResourceTemplatesImported',
-       createdBy: createdBy,
-       payload: {
-         templates: templates
-       }
-     })
-   }
-
-   // Not in use atm, use API TOKENS in the user aggregate instead.
-   // Caller is responsible for generating the token value.
-   static ApiTokenCreated({ createdBy, description, token }) {
-     return ({
-       type: 'ApiTokenCreated',
-       createdBy: createdBy,
-       payload: {
-         description: description,
-         token: token
-       }
-     })
-   }
-   
-
-   static UserInvited({ createdBy, email, expiresAt }) {
-     return ({
-       type: 'UserInvited',
-       createdBy: createdBy,
-       payload: {
-         email: email,
-         expiresAt: new Date().getTime() + 1000 * 60 * 60 * 24 * 7, // One week
-       }
-     })
-   }
+        email,
+        expiresAt: expiresAt ?? Date.now() + 1000 * 60 * 60 * 24 * 7,
+      },
+    }
+  }
 
-   static UserInvitationAccepted({ createdBy, email }) {
-     return ({
-       type: 'UserInvitationAccepted',
-       createdBy: createdBy,
-       payload: {
-        email: email
-       }
-     })
-   }
-   
-   static ServiceEnabled({ createdBy, service }) {
-     return ({
-       type: 'ServiceEnabled',
-       createdBy: createdBy,
-       payload: {
-         service: service
-       }
-     })
+  static UserInvitationAccepted ({ createdBy, email }) {
+    return {
+      event: 'UserInvitationAccepted',
+      createdBy,
+      payload: { email },
+    }
   }
 
-  static ServiceDisabled({ createdBy, service }) {
-    return ({
-      type: 'ServiceDisabled',
-      createdBy: createdBy,
-      payload: {
-        service: service
-      }
-    })
+  static ServiceEnabled ({ createdBy, service }) {
+    return {
+      event: 'ServiceEnabled',
+      createdBy,
+      payload: { service },
+    }
   }
 
-  static UserRemoved({ createdBy, userId }) {
-    return ({
-      type: 'UserRemoved',
-      createdBy: createdBy,
-      payload: {
-        userId: userId
-      }
-    })
+  static ServiceDisabled ({ createdBy, service }) {
+    return {
+      event: 'ServiceDisabled',
+      createdBy,
+      payload: { service },
+    }
   }
 
+  static UserRemoved ({ createdBy, userId }) {
+    return {
+      event: 'UserRemoved',
+      createdBy,
+      payload: { userId },
+    }
+  }
 }