@dxos/plugin-pipeline 0.8.4-main.c351d160a8 → 0.8.4-main.dfabb4ec29

package/src/components/PipelineComponent/PipelineComponent.tsx

@@ -4,6 +4,7 @@
 
 import { useAtomValue } from '@effect-atom/atom-react';
 import { createContext } from '@radix-ui/react-context';
+import { Slot } from '@radix-ui/react-slot';
 import React, { type FC, type PropsWithChildren } from 'react';
 
 import { Obj } from '@dxos/echo';
@@ -11,8 +12,9 @@ import { Toolbar, type ToolbarRootProps, useTranslation } from '@dxos/react-ui';
 import { Board, type BoardModel, useBoard, useEventHandlerAdapter } from '@dxos/react-ui-mosaic';
 import { type ProjectionModel } from '@dxos/schema';
 import { type Pipeline } from '@dxos/types';
+import { composable, composableProps, slottable } from '@dxos/ui-theme';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
 
 import { PipelineColumn } from './PipelineColumn';
 
@@ -59,10 +61,17 @@ type PipelineContentProps = PropsWithChildren<{
   model: BoardModel<Pipeline.Column, Obj.Unknown>;
 }>;
 
-const PipelineContent = ({ model, children, ...props }: PipelineContentProps) => (
-  <Board.Root {...props} model={model}>
-    {children}
-  </Board.Root>
+const PipelineContent = slottable<HTMLDivElement, PipelineContentProps>(
+  ({ asChild, model, children, ...props }, forwardedRef) => {
+    const Comp = asChild ? Slot : 'div';
+    return (
+      <Board.Root model={model}>
+        <Comp {...composableProps(props)} ref={forwardedRef}>
+          {children}
+        </Comp>
+      </Board.Root>
+    );
+  },
 );
 
 PipelineContent.displayName = PIPELINE_CONTENT_NAME;
@@ -77,7 +86,7 @@ type PipelineColumnsProps = {
   pipeline: Pipeline.Pipeline;
 };
 
-const PipelineColumns = ({ pipeline }: PipelineColumnsProps) => {
+const PipelineColumns = composable<HTMLDivElement, PipelineColumnsProps>(({ pipeline, ...props }) => {
   const { model } = useBoard(PIPELINE_COLUMNS_NAME);
   const columns = useAtomValue(model.columns);
   const eventHandler = useEventHandlerAdapter<Pipeline.Column, Obj.Unknown>({
@@ -88,11 +97,11 @@ const PipelineColumns = ({ pipeline }: PipelineColumnsProps) => {
     get: (data) => data as unknown as Obj.Unknown,
     make: (object) => object as unknown as Pipeline.Column,
     canDrop: ({ source }) => model.isColumn(source.data),
-    onChange: (mutate) => Obj.change(pipeline, (p) => mutate(p.columns)),
+    onChange: (mutate) => Obj.update(pipeline, (pipeline) => mutate(pipeline.columns)),
   });
 
-  return <Board.Content id='pipeline' eventHandler={eventHandler} Tile={PipelineColumn} />;
-};
+  return <Board.Content {...props} id='pipeline' eventHandler={eventHandler} Tile={PipelineColumn} />;
+});
 
 PipelineColumns.displayName = PIPELINE_COLUMNS_NAME;
 
@@ -102,16 +111,16 @@ PipelineColumns.displayName = PIPELINE_COLUMNS_NAME;
 
 const PIPELINE_TOOLBAR_NAME = 'Pipeline.Toolbar';
 
-export const PipelineToolbar = (props: ToolbarRootProps) => {
+export const PipelineToolbar = composable<HTMLDivElement, ToolbarRootProps>(({ children, ...props }, forwardedRef) => {
   const { t } = useTranslation(meta.id);
   const { onAddColumn } = usePipeline(PIPELINE_TOOLBAR_NAME);
 
   return (
-    <Toolbar.Root {...props}>
-      <Toolbar.IconButton icon='ph--plus--regular' iconOnly label={t('add column label')} onClick={onAddColumn} />
+    <Toolbar.Root {...composableProps(props)} ref={forwardedRef}>
+      <Toolbar.IconButton icon='ph--plus--regular' iconOnly label={t('add-column.label')} onClick={onAddColumn} />
     </Toolbar.Root>
   );
-};
+});
 
 PipelineToolbar.displayName = PIPELINE_TOOLBAR_NAME;
 

package/src/containers/PipelineContainer/PipelineContainer.stories.tsx

@@ -12,24 +12,25 @@ import { Filter, Ref } from '@dxos/client/echo';
 import { Database, Feed, JsonSchema, Obj, Query, Tag } from '@dxos/echo';
 import { Collection, View } from '@dxos/echo';
 import { createFeedServiceLayer } from '@dxos/echo-db';
-import { ClientPlugin } from '@dxos/plugin-client';
-import { InboxPlugin } from '@dxos/plugin-inbox';
-import { PreviewPlugin } from '@dxos/plugin-preview';
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { initializeIdentity } from '@dxos/plugin-client/testing';
+import { InboxPlugin } from '@dxos/plugin-inbox/plugin';
+import { PreviewPlugin } from '@dxos/plugin-preview/testing';
 import { StorybookPlugin, corePlugins } from '@dxos/plugin-testing';
-import { faker } from '@dxos/random';
+import { random } from '@dxos/random';
 import { useDatabase, useQuery } from '@dxos/react-client/echo';
-import { withLayout, withTheme } from '@dxos/react-ui/testing';
-import { translations as stackTranslations } from '@dxos/react-ui-stack';
+import { translations as stackTranslations } from '@dxos/react-ui-stack/translations';
+import { withLayout } from '@dxos/react-ui/testing';
 import { ViewModel } from '@dxos/schema';
 import { createObjectFactory } from '@dxos/schema/testing';
 import { Message, Organization, Person, Pipeline, Task } from '@dxos/types';
 
-import { translations } from '../../translations';
-import PipelineObjectSettings from '../PipelineObjectSettings';
+import { translations } from '#translations';
 
+import PipelineProperties from '../PipelineProperties';
 import { PipelineContainer } from './PipelineContainer';
 
-faker.seed(0);
+random.seed(0);
 
 const DefaultStory = () => {
   const db = useDatabase();
@@ -43,7 +44,7 @@ const DefaultStory = () => {
   return (
     <div className='grow grid grid-cols-[1fr_350px] overflow-hidden h-full w-full'>
       <PipelineContainer role='article' subject={pipeline} attendableId='test' />
-      <PipelineObjectSettings pipeline={pipeline} classNames='border-s border-separator' />
+      <PipelineProperties pipeline={pipeline} classNames='border-s border-separator' />
     </div>
   );
 };
@@ -52,7 +53,6 @@ const meta = {
   title: 'plugins/plugin-pipeline/containers/PipelineContainer',
   render: DefaultStory,
   decorators: [
-    withTheme(),
     withLayout({ layout: 'fullscreen' }),
     withPluginManager({
       plugins: [
@@ -71,10 +71,7 @@ const meta = {
             Message.Message,
           ],
           onClientInitialized: Effect.fnUntraced(function* ({ client }) {
-            yield* Effect.promise(() => client.halo.createIdentity());
-            yield* Effect.promise(() => client.spaces.waitUntilReady());
-            const space = client.spaces.default;
-            yield* Effect.promise(() => space.waitUntilReady());
+            const { personalSpace } = yield* initializeIdentity(client);
 
             yield* Effect.gen(function* () {
               const tag = yield* Database.add(Tag.make({ label: 'important', hue: 'green' }));
@@ -108,9 +105,9 @@ const meta = {
               const messageFeed = yield* Database.add(Feed.make({ name: 'Messages' }));
               const messages = Array.from({ length: 20 }).map(() =>
                 Obj.make(Message.Message, {
-                  created: faker.date.recent().toISOString(),
+                  created: random.date.recent().toISOString(),
                   sender: { role: 'user' },
-                  blocks: [{ _tag: 'text' as const, text: faker.lorem.sentences(2) }],
+                  blocks: [{ _tag: 'text' as const, text: random.lorem.sentences(2) }],
                 }),
               );
               yield* Feed.append(messageFeed, messages);
@@ -127,9 +124,9 @@ const meta = {
               const taskFeed = yield* Database.add(Feed.make({ name: 'Tasks' }));
               const feedTasks = Array.from({ length: 10 }).map(() =>
                 Obj.make(Task.Task, {
-                  title: faker.lorem.sentence(),
-                  status: faker.helpers.arrayElement(['todo', 'in-progress', 'done']) as any,
-                  priority: faker.helpers.arrayElement(['low', 'medium', 'high']) as any,
+                  title: random.lorem.sentence(),
+                  status: random.helpers.arrayElement(['todo', 'in-progress', 'done']) as any,
+                  priority: random.helpers.arrayElement(['low', 'medium', 'high']) as any,
                 }),
               );
               yield* Feed.append(taskFeed, feedTasks);
@@ -171,12 +168,12 @@ const meta = {
                 yield* Database.add(
                   Obj.make(Organization.Organization, {
                     [Obj.Meta]: {
-                      tags: faker.datatype.boolean() ? [tagDxn] : [],
+                      tags: random.datatype.boolean() ? [tagDxn] : [],
                     },
-                    name: faker.company.name(),
-                    website: faker.internet.url(),
-                    description: faker.lorem.paragraph(),
-                    image: faker.image.url(),
+                    name: random.company.name(),
+                    website: random.internet.url(),
+                    description: random.lorem.paragraph(),
+                    image: random.image.url(),
                   }),
                 );
               }
@@ -186,29 +183,33 @@ const meta = {
                 yield* Database.add(
                   Obj.make(Task.Task, {
                     [Obj.Meta]: {
-                      tags: faker.datatype.boolean() ? [tagDxn] : [],
+                      tags: random.datatype.boolean() ? [tagDxn] : [],
                     },
-                    title: faker.lorem.sentence(),
-                    status: faker.helpers.arrayElement(['todo', 'in-progress', 'done']) as any,
-                    priority: faker.helpers.arrayElement(['low', 'medium', 'high']) as any,
+                    title: random.lorem.sentence(),
+                    status: random.helpers.arrayElement(['todo', 'in-progress', 'done']) as any,
+                    priority: random.helpers.arrayElement(['low', 'medium', 'high']) as any,
                   }),
                 );
               }
 
               // Generate sample Contacts.
-              const factory = createObjectFactory(space.db, faker as any);
+              const factory = createObjectFactory(personalSpace.db, random as any);
               yield* Effect.promise(() => factory([{ type: Person.Person, count: 12 }]));
 
               // Generate sample Projects.
               for (const _ of Array.from({ length: 20 })) {
                 yield* Database.add(
                   Pipeline.make({
-                    name: faker.commerce.productName(),
-                    description: faker.lorem.sentence(),
+                    name: random.commerce.productName(),
+                    description: random.lorem.sentence(),
                   }),
                 );
               }
-            }).pipe(Effect.provide(Layer.merge(Database.layer(space.db), createFeedServiceLayer(space.queues))));
+            }).pipe(
+              Effect.provide(
+                Layer.merge(Database.layer(personalSpace.db), createFeedServiceLayer(personalSpace.queues)),
+              ),
+            );
           }),
         }),
         InboxPlugin(),

package/src/containers/PipelineContainer/PipelineContainer.tsx

@@ -5,28 +5,26 @@
 import React, { useCallback, useEffect } from 'react';
 
 import { Capabilities } from '@dxos/app-framework';
-import { useCapability } from '@dxos/app-framework/ui';
-import { useOperationInvoker } from '@dxos/app-framework/ui';
-import { Surface } from '@dxos/app-framework/ui';
+import { Surface, useCapability, useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation } from '@dxos/app-toolkit';
 import {
+  AppSurface,
   OBJECT_ACTIONS_CONTRIBUTION_ID,
   OBJECT_ACTIONS_CONTRIBUTION_PRIORITY,
-  type SurfaceComponentProps,
   useObjectMenuItems,
 } from '@dxos/app-toolkit/ui';
-import { COMPANION_PREFIX } from '@dxos/app-toolkit';
-import { DeckOperation } from '@dxos/plugin-deck/types';
 import { Panel } from '@dxos/react-ui';
+import { linkedSegment } from '@dxos/react-ui-attention';
 import { useAttention } from '@dxos/react-ui-attention';
 import { useMenu } from '@dxos/react-ui-menu';
 import { type Pipeline } from '@dxos/types';
 
-import { type ItemProps, PipelineComponent } from '../../components';
-import { usePipelineBoardModel } from '../../hooks';
+import { type ItemProps, PipelineComponent } from '#components';
+import { usePipelineBoardModel } from '#hooks';
 
 const PIPELINE_ITEM = 'PipelineItem';
 
-export type PipelineContainerProps = SurfaceComponentProps<Pipeline.Pipeline>;
+export type PipelineContainerProps = AppSurface.ObjectArticleProps<Pipeline.Pipeline>;
 
 export const PipelineContainer = ({ role, subject: pipeline, attendableId }: PipelineContainerProps) => {
   const registry = useCapability(Capabilities.AtomRegistry);
@@ -36,8 +34,8 @@ export const PipelineContainer = ({ role, subject: pipeline, attendableId }: Pip
 
   const handleColumnAdd = useCallback(
     () =>
-      invokePromise(DeckOperation.ChangeCompanion, {
-        companion: `${COMPANION_PREFIX}settings`,
+      invokePromise(LayoutOperation.UpdateCompanion, {
+        subject: linkedSegment('settings'),
       }),
     [invokePromise],
   );
@@ -49,7 +47,7 @@ export const PipelineContainer = ({ role, subject: pipeline, attendableId }: Pip
           <PipelineComponent.Toolbar disabled={!hasAttention} />
         </Panel.Toolbar>
         <Panel.Content asChild>
-          <PipelineComponent.Content model={model}>
+          <PipelineComponent.Content asChild model={model}>
             <PipelineComponent.Columns pipeline={pipeline} />
           </PipelineComponent.Content>
         </Panel.Content>
@@ -75,7 +73,7 @@ const PipelineItem = ({ item, projectionModel }: ItemProps) => {
 
   return (
     <Surface.Surface
-      role='card--content'
+      type={AppSurface.Card}
       data={{
         subject: item,
         projection: projectionModel,

package/src/containers/PipelineContainer/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2023 DXOS.org
 //
 
-import { PipelineContainer } from './PipelineContainer';
-
-export default PipelineContainer;
+export { PipelineContainer as default } from './PipelineContainer';

package/src/containers/{PipelineObjectSettings/PipelineObjectSettings.tsx → PipelineProperties/PipelineProperties.tsx}

@@ -5,10 +5,10 @@
 import * as Schema from 'effect/Schema';
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 
+import { resolveSchemaWithRegistry } from '@dxos/app-toolkit/query';
+import { useTypeOptions } from '@dxos/app-toolkit/ui';
 import { DXN, Filter, JsonSchema, Obj, Query, type QueryAST, Ref, Tag } from '@dxos/echo';
 import { type JsonPath, type Mutable } from '@dxos/echo/internal';
-import { useTypeOptions } from '@dxos/plugin-space';
-import { resolveSchemaWithRegistry } from '@dxos/plugin-space';
 import { getSpace, useObject, useQuery } from '@dxos/react-client/echo';
 import { IconButton, type ThemedClassName, useAsyncEffect, useTranslation } from '@dxos/react-ui';
 import { Form, ViewEditor } from '@dxos/react-ui-form';
@@ -18,22 +18,21 @@ import { Pipeline } from '@dxos/types';
 import { mx, osTranslations, subtleHover } from '@dxos/ui-theme';
 import { arrayMove } from '@dxos/util';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
 
 const listGrid = 'grid grid-cols-[min-content_1fr_min-content_min-content_min-content]';
 const listItemGrid = 'grid grid-cols-subgrid col-span-5';
 
 const ColumnFormSchema = Pipeline.Column.pipe(Schema.mutable, Schema.pick('name'));
 
-// TODO(burdon): Standardize Object/Plugin settings.
-export type PipelineObjectSettingsProps = ThemedClassName<{
+export type PipelinePropertiesProps = ThemedClassName<{
   pipeline: Pipeline.Pipeline;
 }>;
 
 /**
  * Supports editing the pipeline view.
  */
-export const PipelineObjectSettings = ({ classNames, pipeline }: PipelineObjectSettingsProps) => {
+export const PipelineProperties = ({ classNames, pipeline }: PipelinePropertiesProps) => {
   const { t } = useTranslation(meta.id);
   const space = getSpace(pipeline);
   const [expandedId, setExpandedId] = useState<string>();
@@ -161,8 +160,8 @@ export const PipelineObjectSettings = ({ classNames, pipeline }: PipelineObjectS
   }, [space, updateColumns]);
 
   return (
-    <div role='none' className={mx('py-form-padding overflow-y-auto', classNames)}>
-      <h2 className='text-sm text-description py-1'>{t('views label')}</h2>
+    <div className={mx('py-form-padding overflow-y-auto', classNames)}>
+      <h2 className='text-sm text-description py-1'>{t('views.label')}</h2>
 
       <List.Root<Pipeline.Column>
         items={columns}
@@ -180,13 +179,13 @@ export const PipelineObjectSettings = ({ classNames, pipeline }: PipelineObjectS
                   classNames={listItemGrid}
                   aria-expanded={expandedId === column.view.dxn.toString()}
                 >
-                  <div role='none' className={mx(subtleHover, listItemGrid, 'rounded-xs cursor-pointer min-h-10')}>
+                  <div className={mx(subtleHover, listItemGrid, 'rounded-xs cursor-pointer min-h-10')}>
                     <List.ItemDragHandle />
                     <List.ItemTitle onClick={() => handleToggleField(column)}>
-                      {column.name || t('untitled view title')}
+                      {column.name || t('untitled-view.title')}
                     </List.ItemTitle>
                     <List.ItemDeleteButton
-                      label={t('delete view label')}
+                      label={t('delete-view.label')}
                       autoHide={false}
                       onClick={() => handleDelete(column)}
                       data-testid='view.delete'
@@ -194,7 +193,7 @@ export const PipelineObjectSettings = ({ classNames, pipeline }: PipelineObjectS
                     <IconButton
                       iconOnly
                       variant='ghost'
-                      label={t('toggle expand label', { ns: osTranslations })}
+                      label={t('toggle-expand.label', { ns: osTranslations })}
                       icon={
                         expandedId === column.view.dxn.toString()
                           ? 'ph--caret-down--regular'
@@ -204,7 +203,7 @@ export const PipelineObjectSettings = ({ classNames, pipeline }: PipelineObjectS
                     />
                   </div>
                   {expandedId === column.view.dxn.toString() && column?.view.target && (
-                    <div role='none' className='col-span-5 my-2 border border-separator rounded-md'>
+                    <div className='col-span-5 my-2 border border-separator rounded-md'>
                       <Form.Root
                         schema={ColumnFormSchema}
                         values={column}
@@ -235,8 +234,8 @@ export const PipelineObjectSettings = ({ classNames, pipeline }: PipelineObjectS
         )}
       </List.Root>
 
-      <div role='none' className='my-form-padding'>
-        <IconButton icon='ph--plus--regular' label={t('add view label')} onClick={handleAdd} classNames='w-full' />
+      <div className='my-form-padding'>
+        <IconButton icon='ph--plus--regular' label={t('add-view.label')} onClick={handleAdd} classNames='w-full' />
       </div>
     </div>
   );

package/src/containers/PipelineProperties/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { PipelineProperties as default } from './PipelineProperties';

package/src/containers/index.ts

@@ -5,4 +5,4 @@
 import { type ComponentType, lazy } from 'react';
 
 export const PipelineContainer: ComponentType<any> = lazy(() => import('./PipelineContainer'));
-export const PipelineObjectSettings: ComponentType<any> = lazy(() => import('./PipelineObjectSettings'));
+export const PipelineProperties: ComponentType<any> = lazy(() => import('./PipelineProperties'));

package/src/hooks/usePipelineBoardModel.ts

@@ -6,9 +6,9 @@ import { Atom, type Registry } from '@effect-atom/atom-react';
 import * as Schema from 'effect/Schema';
 import { useMemo } from 'react';
 
+import { getQueryTarget } from '@dxos/app-toolkit/query';
 import { Obj, Query } from '@dxos/echo';
 import { AtomObj, AtomQuery } from '@dxos/echo-atom';
-import { getQueryTarget } from '@dxos/plugin-space';
 import { getSpace, isSpace } from '@dxos/react-client/echo';
 import { type BoardModel } from '@dxos/react-ui-mosaic';
 import { Pipeline } from '@dxos/types';

package/src/index.ts

@@ -3,4 +3,3 @@
 //
 
 export * from './meta';
-export * from './PipelinePlugin';

package/src/plugin.ts

@@ -0,0 +1,9 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
+
+export const PipelinePlugin = Plugin.lazy(meta, () => import('#plugin'));

package/src/templates/research.ts

@@ -3,8 +3,8 @@
 //
 
 import { type Database, Filter, JsonSchema, Query, Ref } from '@dxos/echo';
-import { Mailbox } from '@dxos/plugin-inbox/types';
-import { Markdown } from '@dxos/plugin-markdown/types';
+import { Mailbox } from '@dxos/plugin-inbox';
+import { Markdown } from '@dxos/plugin-markdown';
 import { ViewModel } from '@dxos/schema';
 import { Message, Organization, Person, Pipeline } from '@dxos/types';
 

package/src/translations.ts

@@ -4,35 +4,35 @@ import { Pipeline } from '@dxos/types';
 // Copyright 2023 DXOS.org
 //
 
-import { meta } from './meta';
+import { meta } from '#meta';
 
 export const translations = [
   {
     'en-US': {
       [Pipeline.Pipeline.typename]: {
-        'typename label': 'Pipeline',
-        'typename label_zero': 'Pipelines',
-        'typename label_one': 'Pipeline',
-        'typename label_other': 'Pipelines',
-        'object name placeholder': 'New pipeline',
-        'add object label': 'Add pipeline',
-        'rename object label': 'Rename pipeline',
-        'delete object label': 'Delete pipeline',
-        'object deleted label': 'Pipeline deleted',
+        'typename.label': 'Pipeline',
+        'typename.label_zero': 'Pipelines',
+        'typename.label_one': 'Pipeline',
+        'typename.label_other': 'Pipelines',
+        'object-name.placeholder': 'New pipeline',
+        'add-object.label': 'Add pipeline',
+        'rename-object.label': 'Rename pipeline',
+        'delete-object.label': 'Delete pipeline',
+        'object-deleted.label': 'Pipeline deleted',
       },
       [meta.id]: {
-        'plugin name': 'Pipelines',
-        'add column label': 'Add column',
-        'add card label': 'Add object',
-        'untitled view title': 'New view',
-        'enumerating tab label': 'List',
-        'editing tab label': 'Edit',
-        'views label': 'Views',
-        'pipeline invocations label': 'Invocations',
-        'pipeline automation label': 'Automations',
-        'toggle expand label': 'Toggle expand',
-        'delete view label': 'Delete view',
-        'add view label': 'Add view',
+        'plugin.name': 'Pipelines',
+        'add-column.label': 'Add column',
+        'add-card.label': 'Add object',
+        'untitled-view.title': 'New view',
+        'enumerating-tab.label': 'List',
+        'editing-tab.label': 'Edit',
+        'views.label': 'Views',
+        'pipeline-invocations.label': 'Invocations',
+        'pipeline-automation.label': 'Automations',
+        'toggle-expand.label': 'Toggle expand',
+        'delete-view.label': 'Delete view',
+        'add-view.label': 'Add view',
       },
     },
   },