@dxos/plugin-space 0.8.4-main.bc674ce → 0.8.4-main.c351d160a8

package/src/cli/plugin.ts

@@ -4,10 +4,12 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common, Plugin } from '@dxos/app-framework';
+import { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
 import { Tag } from '@dxos/echo';
+import { Collection } from '@dxos/echo';
 import { ClientEvents } from '@dxos/plugin-client/types';
-import { Collection, DataTypes } from '@dxos/schema';
+import { DataTypes } from '@dxos/schema';
 import {
   AnchoredTo,
   Employer,
@@ -17,7 +19,7 @@ import {
   HasSubject,
   Organization,
   Person,
-  Project,
+  Pipeline,
   Task,
 } from '@dxos/types';
 
@@ -31,10 +33,18 @@ import { database, queue, space } from './commands';
 
 export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
   // TODO(wittjosiah): Could some of these commands make use of operations?
-  Common.Plugin.addCommandModule({
+  AppPlugin.addCommandModule({
     commands: [database, queue, space],
   }),
-  Common.Plugin.addSchemaModule({
+  AppPlugin.addMetadataModule({
+    metadata: {
+      id: Collection.Collection.typename,
+      metadata: {
+        createObject: ((props) => Effect.sync(() => Collection.make(props))) satisfies CreateObject,
+      },
+    },
+  }),
+  AppPlugin.addSchemaModule({
     schema: [
       ...DataTypes,
       AnchoredTo.AnchoredTo,
@@ -45,33 +55,30 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
       HasSubject.HasSubject,
       Organization.Organization,
       Person.Person,
-      Project.Project,
+      Pipeline.Pipeline,
       Tag.Tag,
       Task.Task,
     ],
   }),
-  Common.Plugin.addMetadataModule({
-    metadata: {
-      id: Collection.Collection.typename,
-      metadata: {
-        createObject: ((props) => Effect.sync(() => Collection.make(props))) satisfies CreateObject,
-        addToCollectionOnCreate: true,
-      },
-    },
-  }),
-  Plugin.addModule(({ invitationUrl = 'http://localhost:5173', invitationProp = 'spaceInvitationCode' }) => {
-    const createInvitationUrl = (invitationCode: string) => {
-      const baseUrl = new URL(invitationUrl);
-      baseUrl.searchParams.set(invitationProp, invitationCode);
-      return baseUrl.toString();
-    };
+  Plugin.addModule(
+    ({
+      shareableLinkOrigin = 'http://localhost:5173',
+      invitationPath = '/',
+      invitationProp = 'spaceInvitationCode',
+    }) => {
+      const createInvitationUrl = (invitationCode: string) => {
+        const baseUrl = new URL(invitationPath || '/', shareableLinkOrigin);
+        baseUrl.searchParams.set(invitationProp, invitationCode);
+        return baseUrl.toString();
+      };
 
-    return {
-      id: Capability.getModuleTag(OperationResolver),
-      activatesOn: Common.ActivationEvent.SetupOperationResolver,
-      activate: () => OperationResolver({ createInvitationUrl, observability: false }),
-    };
-  }),
+      return {
+        id: Capability.getModuleTag(OperationResolver),
+        activatesOn: ActivationEvents.SetupOperationResolver,
+        activate: () => OperationResolver({ createInvitationUrl, observability: false }),
+      };
+    },
+  ),
   Plugin.addModule({
     activatesOn: ClientEvents.IdentityCreated,
     activatesAfter: [SpaceEvents.DefaultSpaceReady],

package/src/components/{AwaitingObject.tsx → AwaitingObject/AwaitingObject.tsx}

@@ -4,16 +4,17 @@
 
 import React, { useCallback, useEffect, useState } from 'react';
 
-import { Common } from '@dxos/app-framework';
-import { useLayout, useOperationInvoker } from '@dxos/app-framework/react';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { useLayout } from '@dxos/app-toolkit/ui';
 import { Obj } from '@dxos/echo';
 import { useClient } from '@dxos/react-client';
 import { Filter, useQuery } from '@dxos/react-client/echo';
 import { Button, Icon, Toast, useTranslation } from '@dxos/react-ui';
 import { osTranslations } from '@dxos/ui-theme';
 
-import { meta } from '../meta';
-import { SpaceOperation } from '../types';
+import { meta } from '../../meta';
+import { SpaceOperation } from '../../types';
 
 const WAIT_FOR_OBJECT_TIMEOUT = 3 * 60 * 1_000;
 const TOAST_TIMEOUT = 4 * 60 * 1_000;
@@ -53,7 +54,7 @@ export const AwaitingObject = ({ id }: { id: string }) => {
   );
 
   const handleNavigate = useCallback(() => {
-    void invokePromise(Common.LayoutOperation.Open, { subject: [id] });
+    void invokePromise(LayoutOperation.Open, { subject: [id] });
     void handleClose();
   }, [id, handleClose, invokePromise]);
 

package/src/components/AwaitingObject/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+export * from './AwaitingObject';

package/src/components/CreateDialog/CreateObjectPanel.tsx

@@ -2,37 +2,41 @@
 // Copyright 2024 DXOS.org
 //
 
-import * as Option from 'effect/Option';
 import type * as Schema from 'effect/Schema';
 import React, { useCallback, useMemo } from 'react';
 
 import { type Database, Obj } from '@dxos/echo';
-import { type AnyProperties, type TypeAnnotation, getTypeAnnotation } from '@dxos/echo/internal';
+import { type Collection } from '@dxos/echo';
+import { type AnyProperties } from '@dxos/echo/internal';
 import { type Space, type SpaceId } from '@dxos/react-client/echo';
 import { toLocalizedString, useDefaultValue, useTranslation } from '@dxos/react-ui';
 import { Form, omitId } from '@dxos/react-ui-form';
 import { SearchList, useSearchListResults } from '@dxos/react-ui-searchlist';
-import { type Collection, ViewAnnotation } from '@dxos/schema';
-import { type MaybePromise, isNonNullable } from '@dxos/util';
+import { type MaybePromise } from '@dxos/util';
 
 import { useInputSurfaceLookup } from '../../hooks';
 import { meta } from '../../meta';
 import { type CreateObject } from '../../types';
 import { getSpaceDisplayName } from '../../util';
 
+/** Display-ready option for the create object search list. */
+export type CreateObjectOption = {
+  id: string;
+  label: string;
+  icon?: string;
+};
+
 export type Metadata = {
   createObject: CreateObject;
   inputSchema?: Schema.Schema.AnyNoContext;
-  addToCollectionOnCreate?: boolean;
   icon?: string;
 };
 
 export type CreateObjectPanelProps = {
-  schemas: Schema.Schema.AnyNoContext[];
+  options: CreateObjectOption[];
   spaces: Space[];
   typename?: string;
   target?: Database.Database | Collection.Collection;
-  views?: boolean;
   initialFormValues?: Partial<AnyProperties>;
   defaultSpaceId?: SpaceId;
   resolve?: (typename: string) => Metadata | undefined;
@@ -42,42 +46,21 @@ export type CreateObjectPanelProps = {
 };
 
 export const CreateObjectPanel = ({
-  schemas,
+  options,
   spaces,
   typename,
   target,
-  views,
-  initialFormValues: _initialFormValues,
+  initialFormValues: initialFormValuesProp,
   defaultSpaceId,
   resolve,
   onTargetChange,
   onTypenameChange,
   onCreateObject,
 }: CreateObjectPanelProps) => {
-  const { t } = useTranslation(meta.id);
-  const initialFormValues = useDefaultValue(_initialFormValues, () => ({}));
+  const initialFormValues = useDefaultValue(initialFormValuesProp, () => ({}));
   const metadata = typename && resolve?.(typename);
-  const options: TypeAnnotation[] = schemas
-    .filter((schema) => {
-      if (views == null) {
-        return true;
-      } else {
-        return views === ViewAnnotation.get(schema).pipe(Option.getOrElse(() => false));
-      }
-    })
-    .map((schema) => getTypeAnnotation(schema))
-    .filter(isNonNullable)
-    .sort((a, b) => {
-      const nameA = t('typename label', {
-        ns: a.typename,
-        defaultValue: a.typename,
-      });
-      const nameB = t('typename label', {
-        ns: b.typename,
-        defaultValue: b.typename,
-      });
-      return nameA.localeCompare(nameB);
-    });
+
+  const sortedOptions = useMemo(() => [...options].sort((a, b) => a.label.localeCompare(b.label)), [options]);
 
   const handleCreateObject = useCallback(
     async (props: Record<string, any>) => {
@@ -89,45 +72,59 @@ export const CreateObjectPanel = ({
     [onCreateObject, metadata],
   );
 
-  const handleSetTypename = useCallback(
-    async (typename: string) => {
-      const metadata = resolve?.(typename);
+  const handleSelectOption = useCallback(
+    async (id: string) => {
+      const metadata = resolve?.(id);
       if (metadata && !metadata.inputSchema) {
         await onCreateObject?.({ metadata });
       } else {
-        onTypenameChange?.(typename);
+        onTypenameChange?.(id);
       }
     },
     [resolve, onCreateObject],
   );
 
+  const inputSchema = useMemo(
+    () => (metadata && typeof metadata === 'object' && metadata.inputSchema ? omitId(metadata.inputSchema) : undefined),
+    [metadata],
+  );
   const inputSurfaceLookup = useInputSurfaceLookup({ target });
 
   // TODO(wittjosiah): These inputs should be rolled into a `Form` once it supports the necessary variants.
-  return !metadata ? (
-    <SelectSchema options={options} resolve={resolve} onChange={handleSetTypename} />
-  ) : !target ? (
-    <SelectSpace spaces={spaces} defaultSpaceId={defaultSpaceId} onChange={onTargetChange} />
-  ) : metadata.inputSchema ? (
-    <Form.Root
-      testId='create-object-form'
-      autoFocus
-      schema={omitId(metadata.inputSchema)}
-      values={initialFormValues}
-      db={Obj.isObject(target) ? Obj.getDatabase(target) : target}
-      fieldProvider={inputSurfaceLookup}
-      onSave={handleCreateObject}
-    >
-      <Form.Viewport>
-        <Form.Content>
-          <Form.FieldSet />
-          <Form.Submit />
-        </Form.Content>
-      </Form.Viewport>
-    </Form.Root>
-  ) : null;
+  if (!metadata) {
+    return <SelectType options={sortedOptions} onChange={handleSelectOption} />;
+  }
+
+  if (!target) {
+    return <SelectSpace spaces={spaces} defaultSpaceId={defaultSpaceId} onChange={onTargetChange} />;
+  }
+
+  if (metadata.inputSchema) {
+    return (
+      <Form.Root
+        testId='create-object-form'
+        autoFocus
+        schema={inputSchema}
+        defaultValues={initialFormValues}
+        db={Obj.isObject(target) ? Obj.getDatabase(target) : target}
+        fieldProvider={inputSurfaceLookup}
+        onSave={handleCreateObject}
+      >
+        <Form.Viewport>
+          <Form.Content>
+            <Form.FieldSet />
+            <Form.Submit />
+          </Form.Content>
+        </Form.Viewport>
+      </Form.Root>
+    );
+  }
+
+  return null;
 };
 
+CreateObjectPanel.displayName = 'CreateObjectPanel';
+
 const SelectSpace = ({
   spaces,
   defaultSpaceId,
@@ -168,80 +165,62 @@ const SelectSpace = ({
 
   return (
     <SearchList.Root onSearch={handleSearch}>
-      <div aria-label={t('space input label')} role='combobox' aria-expanded='true'>
+      <SearchList.Content>
         <SearchList.Input
           autoFocus
           data-testid='create-object-form.space-input'
           placeholder={t('space input placeholder')}
         />
-        <SearchList.Content>
-          <SearchList.Viewport>
-            {results.map((space) => (
-              <SearchList.Item
-                key={space.id}
-                value={space.id}
-                label={toLocalizedString(
-                  getSpaceDisplayName(space, {
-                    personal: space.id === defaultSpaceId,
-                  }),
-                  t,
-                )}
-                onSelect={() => onChange?.(space.db)}
-                classNames='flex items-center gap-2'
-              />
-            ))}
-          </SearchList.Viewport>
-        </SearchList.Content>
-      </div>
+        <SearchList.Viewport>
+          {results.map((space) => (
+            <SearchList.Item
+              key={space.id}
+              value={space.id}
+              label={toLocalizedString(
+                getSpaceDisplayName(space, {
+                  personal: space.id === defaultSpaceId,
+                }),
+                t,
+              )}
+              onSelect={() => onChange?.(space.db)}
+              classNames='flex items-center gap-2'
+            />
+          ))}
+        </SearchList.Viewport>
+      </SearchList.Content>
     </SearchList.Root>
   );
 };
 
-const SelectSchema = ({
-  options,
-  resolve,
-  onChange,
-}: {
-  options: TypeAnnotation[];
-  onChange: (type: string) => void;
-} & Pick<CreateObjectPanelProps, 'resolve'>) => {
+const SelectType = ({ options, onChange }: { options: CreateObjectOption[]; onChange: (id: string) => void }) => {
   const { t } = useTranslation(meta.id);
 
   const { results, handleSearch } = useSearchListResults({
     items: options,
-    extract: (option) =>
-      t('typename label', {
-        ns: option.typename,
-        defaultValue: option.typename,
-      }),
+    extract: (option) => option.label,
   });
 
   return (
     <SearchList.Root onSearch={handleSearch}>
-      <div aria-label={t('schema input label')} role='combobox' aria-expanded='true'>
+      <SearchList.Content>
         <SearchList.Input
           autoFocus
           data-testid='create-object-form.schema-input'
           placeholder={t('schema input placeholder')}
         />
-        <SearchList.Content>
-          <SearchList.Viewport>
-            {results.map((option) => (
-              <SearchList.Item
-                key={option.typename}
-                value={option.typename}
-                label={t('typename label', {
-                  ns: option.typename,
-                  defaultValue: option.typename,
-                })}
-                icon={resolve?.(option.typename)?.icon ?? 'ph--placeholder--regular'}
-                onSelect={() => onChange(option.typename)}
-                classNames='flex items-center gap-2'
-              />
-            ))}
-          </SearchList.Viewport>
-        </SearchList.Content>
-      </div>
+        <SearchList.Viewport>
+          {results.map((option) => (
+            <SearchList.Item
+              key={option.id}
+              value={option.id}
+              label={option.label}
+              icon={option.icon ?? 'ph--placeholder--regular'}
+              classNames='flex items-center gap-2'
+              onSelect={() => onChange(option.id)}
+            />
+          ))}
+        </SearchList.Viewport>
+      </SearchList.Content>
     </SearchList.Root>
   );
 };

package/src/components/CreateDialog/index.ts

@@ -2,5 +2,4 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './CreateObjectDialog';
-export * from './CreateSpaceDialog';
+export * from './CreateObjectPanel';

package/src/components/ObjectDetails/BaseObjectSettings.stories.tsx

@@ -7,9 +7,9 @@ import React, { useEffect, useState } from 'react';
 
 import { type Obj, Tag } from '@dxos/echo';
 import { useClientStory, withClientProvider } from '@dxos/react-client/testing';
-import { withTheme } from '@dxos/react-ui/testing';
-import { render } from '@dxos/storybook-utils';
-import { Project } from '@dxos/types';
+import { Loading, withTheme } from '@dxos/react-ui/testing';
+
+import { Pipeline } from '@dxos/types';
 
 import { translations } from '../../translations';
 
@@ -21,28 +21,28 @@ const DefaultStory = () => {
 
   useEffect(() => {
     if (space && !object) {
-      const object = space.db.add(Project.make());
+      const object = space.db.add(Pipeline.make());
       setObject(object);
     }
   }, [space, object]);
 
   if (!object) {
-    return null;
+    return <Loading data={{ space: !!space, object: !!object }} />;
   }
 
-  return <BaseObjectSettings object={object} classNames='is-[20rem]' />;
+  return <BaseObjectSettings object={object} classNames='w-[20rem]' />;
 };
 
 const meta = {
-  title: 'plugins/plugin-space/BaseObjectSettings',
+  title: 'plugins/plugin-space/components/BaseObjectSettings',
   component: BaseObjectSettings as any,
-  render: render(DefaultStory),
+  render: DefaultStory,
   decorators: [
-    withTheme,
+    withTheme(),
     withClientProvider({
       createIdentity: true,
       createSpace: true,
-      types: [Project.Project, Tag.Tag],
+      types: [Pipeline.Pipeline, Tag.Tag],
       onCreateSpace: async ({ space }) => {
         space.db.add(Tag.make({ label: 'Tag 1' }));
         space.db.add(Tag.make({ label: 'Tag 2' }));

package/src/components/ObjectDetails/BaseObjectSettings.tsx

@@ -7,7 +7,7 @@ import * as Option from 'effect/Option';
 import * as Schema from 'effect/Schema';
 import React, { type PropsWithChildren, useCallback, useMemo } from 'react';
 
-import { DXN, Obj, type Ref, Tag, Type } from '@dxos/echo';
+import { DXN, Obj, Ref, Tag, Type } from '@dxos/echo';
 import { type JsonPath, splitJsonPath } from '@dxos/echo/internal';
 import { invariant } from '@dxos/invariant';
 import { type ThemedClassName } from '@dxos/react-ui';
@@ -18,7 +18,7 @@ import { meta as pluginMeta } from '../../meta';
 
 // TODO(wittjosiah): Would be nice to control order when extending so this isn't always first/last.
 const BaseSchema = Schema.Struct({
-  tags: Schema.Array(Type.Ref(Tag.Tag)).pipe(Schema.optional),
+  tags: Schema.Array(Ref.Ref(Tag.Tag)).pipe(Schema.optional),
 });
 
 export type BaseObjectSettingsProps = ThemedClassName<
@@ -27,7 +27,7 @@ export type BaseObjectSettingsProps = ThemedClassName<
   }>
 >;
 
-// TODO(wittjosiah): Reconcile w/ ObjectDetailsPanel.
+// TODO(wittjosiah): Reconcile w/ ObjectForm.
 export const BaseObjectSettings = ({ classNames, children, object }: BaseObjectSettingsProps) => {
   const db = Obj.getDatabase(object);
 
@@ -35,7 +35,7 @@ export const BaseObjectSettings = ({ classNames, children, object }: BaseObjectS
     return Function.pipe(
       Obj.getSchema(object),
       Option.fromNullable,
-      Option.map((schema) => BaseSchema.pipe(Schema.extend(schema))),
+      Option.map((schema) => omitId(BaseSchema.pipe(Schema.extend(schema)))),
       Option.getOrUndefined,
     );
   }, [object]);
@@ -50,7 +50,7 @@ export const BaseObjectSettings = ({ classNames, children, object }: BaseObjectS
     [object, tags],
   );
 
-  const handleCreate = useCallback((schema: Type.Entity.Any, values: any) => {
+  const handleCreate = useCallback((schema: Type.AnyEntity, values: any) => {
     invariant(db);
     invariant(Type.isObjectSchema(schema));
     const newObject = db.add(Obj.make(schema, values));
@@ -87,7 +87,7 @@ export const BaseObjectSettings = ({ classNames, children, object }: BaseObjectS
         Obj.change(object, () => {
           for (const path of nonTagPaths) {
             const parts = splitJsonPath(path);
-            const value = Obj.getValue(values, parts);
+            const value = Obj.getValue(values as any, parts);
             Obj.setValue(object, parts, value);
           }
         });
@@ -102,8 +102,8 @@ export const BaseObjectSettings = ({ classNames, children, object }: BaseObjectS
 
   return (
     <Form.Root
-      schema={omitId(formSchema)}
-      values={values}
+      schema={formSchema}
+      defaultValues={values as any}
       createOptionIcon='ph--plus--regular'
       createOptionLabel={['add tag label', { ns: pluginMeta.id }]}
       createInitialValuePath='label'

package/src/components/ObjectDetails/ForeignKeys.tsx

@@ -38,7 +38,7 @@ const KeyItem = ({ forignKey, onDelete }: KeyItemProps) => {
   }, [forignKey, onDelete]);
 
   return (
-    <ListItem.Root classNames='pli-2'>
+    <ListItem.Root classNames='px-2'>
       <ListItem.Heading classNames='flex flex-col grow truncate'>
         <div>{forignKey.source}</div>
         <div className='text-description text-sm truncate'>{forignKey.id}</div>

package/src/components/ObjectDetails/index.ts

@@ -2,6 +2,5 @@
 // Copyright 2025 DXOS.org
 //
 
-import { ObjectDetails } from './ObjectDetails';
-
-export default ObjectDetails;
+export * from './BaseObjectSettings';
+export * from './ForeignKeys';

package/src/components/{ObjectCardStack → ObjectForm}/ObjectForm.tsx

@@ -5,7 +5,7 @@
 import * as Schema from 'effect/Schema';
 import React, { useCallback, useMemo } from 'react';
 
-import { DXN, Obj, type Ref, Tag, Type } from '@dxos/echo';
+import { DXN, Obj, Ref, Tag, Type } from '@dxos/echo';
 import { type JsonPath, splitJsonPath } from '@dxos/echo/internal';
 import { invariant } from '@dxos/invariant';
 import { Form, omitId } from '@dxos/react-ui-form';
@@ -23,9 +23,11 @@ export const ObjectForm = ({ object, schema }: ObjectFormProps) => {
 
   const formSchema = useMemo(
     () =>
-      Schema.Struct({
-        tags: Schema.Array(Type.Ref(Tag.Tag)).pipe(Schema.optional),
-      }).pipe(Schema.extend(omitId(schema))),
+      omitId(
+        Schema.Struct({
+          tags: Schema.Array(Ref.Ref(Tag.Tag)).pipe(Schema.optional),
+        }).pipe(Schema.extend(schema)),
+      ),
     [schema],
   );
 
@@ -33,7 +35,7 @@ export const ObjectForm = ({ object, schema }: ObjectFormProps) => {
   const tags = (meta.tags ?? []).map((tag) => db?.makeRef(DXN.parse(tag))).filter(isNonNullable);
   const values = useMemo(() => ({ tags, ...object }), [object, tags]);
 
-  const handleCreate = useCallback((schema: Type.Entity.Any, values: any) => {
+  const handleCreate = useCallback((schema: Type.AnyEntity, values: any) => {
     invariant(db);
     invariant(Type.isObjectSchema(schema));
     const newObject = db.add(Obj.make(schema, values));
@@ -78,8 +80,8 @@ export const ObjectForm = ({ object, schema }: ObjectFormProps) => {
 
   return (
     <Form.Root
-      schema={omitId(formSchema)}
-      values={values}
+      schema={formSchema}
+      defaultValues={values}
       createOptionIcon='ph--plus--regular'
       createOptionLabel={['add tag label', { ns: pluginMeta.id }]}
       createInitialValuePath='label'

package/src/components/{JoinDialog → ObjectForm}/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './JoinDialog';
+export * from './ObjectForm';

package/src/components/SyncStatus/index.ts

@@ -2,5 +2,5 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './InlineSyncStatus';
-export * from './SyncStatus';
+export * from './save-tracker';
+export * from './status';

package/src/components/index.ts

@@ -2,24 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
-import { lazy } from 'react';
-
 export * from './AwaitingObject';
 export * from './CreateDialog';
-export * from './CollectionSection';
-export * from './JoinDialog';
-export * from './MembersContainer';
-export * from './MenuFooter';
-export * from './ObjectRenamePopover';
-export * from './SchemaContainer';
-export * from './SpacePluginSettings';
-export * from './SpacePresence';
-export * from './SpaceRenamePopover';
-export * from './SpaceSettings';
+export * from './ObjectDetails';
+export * from './ObjectForm';
 export * from './SyncStatus';
-export * from './ViewEditor';
-
-export const CollectionArticle = lazy(() => import('./CollectionArticle'));
-export const ObjectCardStack = lazy(() => import('./ObjectCardStack'));
-export const ObjectDetails = lazy(() => import('./ObjectDetails'));
-export const RecordArticle = lazy(() => import('./RecordArticle'));