@dxos/plugin-space 0.8.4-main.c85a9c8dae → 0.8.4-main.d9fc60f731

package/src/containers/MembersContainer/index.ts

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

package/src/containers/MenuFooter/MenuFooter.tsx

@@ -4,25 +4,25 @@
 
 import React from 'react';
 
+import { isPersonalSpace } from '@dxos/app-toolkit';
 import { getSpace } from '@dxos/client/echo';
 import { type Obj } from '@dxos/echo';
-import { useClient } from '@dxos/react-client';
 import { DropdownMenu, Icon, toLocalizedString, useTranslation } from '@dxos/react-ui';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
+
 import { getSpaceDisplayName } from '../../util';
 
 export const MenuFooter = ({ object }: { object: Obj.Unknown }) => {
   const { t } = useTranslation(meta.id);
-  const client = useClient();
   const space = getSpace(object);
-  const spaceName = space ? getSpaceDisplayName(space, { personal: client.spaces.default === space }) : '';
+  const spaceName = space ? getSpaceDisplayName(space, { personal: isPersonalSpace(space) }) : '';
   return space ? (
     <>
       <DropdownMenu.Separator />
-      <DropdownMenu.GroupLabel>{t('menu footer label')}</DropdownMenu.GroupLabel>
+      <DropdownMenu.GroupLabel>{t('menu-footer.label')}</DropdownMenu.GroupLabel>
       <dl className='ps-2 mb-2 text-xs grid grid-cols-[max-content_1fr] gap-2'>
-        <dt className='uppercase text-[.75em] tracking-wide font-medium mt-px self-start'>{t('location label')}</dt>
+        <dt className='uppercase text-[.75em] tracking-wide font-medium mt-px self-start'>{t('location.label')}</dt>
         <dd className='line-clamp-3'>
           <Icon icon='ph--planet--regular' classNames='inline-block me-1' />
           {toLocalizedString(spaceName, t)}

package/src/containers/MenuFooter/index.ts

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

package/src/containers/ObjectCardStack/ObjectCardStack.tsx

@@ -4,17 +4,16 @@
 
 import React, { forwardRef, useState } from 'react';
 
-import { Obj } from '@dxos/echo';
-import { type View } from '@dxos/echo';
-import { Filter, useQuery, useSchema } from '@dxos/react-client/echo';
+import { Filter, Obj, type View } from '@dxos/echo';
+import { useQuery, useType } from '@dxos/react-client/echo';
 import { Card, Message, Panel, ScrollArea, Toolbar, useTranslation } from '@dxos/react-ui';
 import { useSelected } from '@dxos/react-ui-attention';
+import { ObjectForm } from '@dxos/react-ui-form';
 import { Mosaic } from '@dxos/react-ui-mosaic';
 import { getTypenameFromQuery } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
-import { ObjectForm } from '../../components';
-import { meta } from '../../meta';
+import { meta } from '#meta';
 
 export type ObjectCardStackProps = {
   view: View.View;
@@ -28,27 +27,27 @@ export const ObjectCardStack = forwardRef<HTMLDivElement, ObjectCardStackProps>(
   const { t } = useTranslation(meta.id);
   const db = Obj.getDatabase(view);
   const typename = view.query ? getTypenameFromQuery(view.query.ast) : undefined;
-  const schema = useSchema(db, typename);
+  const type = useType(db, typename);
 
-  const queriedObjects = useQuery(db, schema ? Filter.type(schema) : Filter.nothing());
+  const queriedObjects = useQuery(db, type ? Filter.type(type) : Filter.nothing());
   const selectedRows = useSelected(objectId, 'multi');
   const selectedObjects = selectedRows.map((id) => queriedObjects.find((obj) => obj.id === id)).filter(isNonNullable);
 
   const [viewport, setViewport] = useState<HTMLElement | null>(null);
 
-  if (!schema) {
+  if (!type) {
     return null;
   }
 
   return (
-    <Panel.Root className='dx-article' ref={forwardedRef}>
+    <Panel.Root className='dx-document' ref={forwardedRef}>
       <Panel.Toolbar asChild>
         <Toolbar.Root />
       </Panel.Toolbar>
       <Panel.Content>
         {selectedObjects.length === 0 ? (
           <Message.Root>
-            <Message.Title>{t('row details no selection label')}</Message.Title>
+            <Message.Title>{t('row-details-no-selection.label')}</Message.Title>
           </Message.Root>
         ) : (
           <Mosaic.Root>
@@ -66,7 +65,7 @@ export const ObjectCardStack = forwardRef<HTMLDivElement, ObjectCardStackProps>(
                     Tile={({ ...props }) => (
                       <Mosaic.Tile {...props}>
                         <Card.Root>
-                          <ObjectForm object={props.data} schema={schema} />
+                          <ObjectForm object={props.data} type={type} />
                         </Card.Root>
                       </Mosaic.Tile>
                     )}

package/src/containers/ObjectCardStack/index.ts

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

package/src/containers/ObjectProperties/ObjectProperties.tsx

@@ -0,0 +1,32 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { forwardRef, useMemo } from 'react';
+
+import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+import { type Obj } from '@dxos/echo';
+import { Panel, Toolbar } from '@dxos/react-ui';
+import { ObjectProperties as NaturalObjectProperties } from '@dxos/react-ui-form';
+
+export type ObjectPropertiesProps = AppSurface.ObjectPropertiesProps<Obj.Unknown>;
+
+export const ObjectProperties = forwardRef<HTMLDivElement, ObjectPropertiesProps>(
+  ({ role, subject: object }, forwardedRef) => {
+    const data = useMemo<AppSurface.ObjectPropertiesData>(() => ({ subject: object }), [object]);
+
+    return (
+      <Panel.Root role={role} className='dx-document' ref={forwardedRef}>
+        <Panel.Toolbar asChild>
+          <Toolbar.Root />
+        </Panel.Toolbar>
+        <Panel.Content asChild>
+          <NaturalObjectProperties object={object}>
+            <Surface.Surface type={AppSurface.ObjectProperties} data={data} />
+          </NaturalObjectProperties>
+        </Panel.Content>
+      </Panel.Root>
+    );
+  },
+);

package/src/containers/ObjectProperties/index.ts

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

package/src/containers/RecordArticle/RecordArticle.stories.tsx

@@ -0,0 +1,82 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capability } from '@dxos/app-framework';
+import { withPluginManager } from '@dxos/app-framework/testing';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { Filter } from '@dxos/echo';
+import { ClientPlugin } from '@dxos/plugin-client/testing';
+import { PreviewPlugin } from '@dxos/plugin-preview/testing';
+import { StorybookPlugin, corePlugins } from '@dxos/plugin-testing';
+import { random } from '@dxos/random';
+import { useQuery, useSpaces } from '@dxos/react-client/echo';
+import { Loading, withLayout } from '@dxos/react-ui/testing';
+import { createObjectFactory } from '@dxos/schema/testing';
+import { Organization, Person } from '@dxos/types';
+
+import { translations } from '#translations';
+
+import { RecordArticle } from './RecordArticle';
+
+random.seed(0);
+
+const PERSON_COUNT = 100;
+
+const DefaultStory = () => {
+  const spaces = useSpaces();
+  const space = spaces[spaces.length - 1];
+  const organizations = useQuery(space?.db, Filter.type(Organization.Organization));
+  const org = organizations[0];
+  if (!org) {
+    return <Loading />;
+  }
+
+  return <RecordArticle role='article' subject={org} attendableId='story' />;
+};
+
+const meta = {
+  title: 'plugins/plugin-space/containers/RecordArticle',
+  render: DefaultStory,
+  decorators: [
+    withLayout({ layout: 'fullscreen' }),
+    withPluginManager({
+      capabilities: [Capability.contributes(AppCapabilities.Translations, translations)],
+      plugins: [
+        ...corePlugins(),
+        StorybookPlugin({}),
+        PreviewPlugin(),
+        ClientPlugin({
+          types: [Organization.Organization, Person.Person],
+          onClientInitialized: ({ client }) =>
+            Effect.gen(function* () {
+              yield* Effect.promise(() => client.halo.createIdentity());
+              const space = yield* Effect.promise(() => client.spaces.create());
+              yield* Effect.promise(() => space.waitUntilReady());
+
+              const factory = createObjectFactory(space.db, random as any);
+              yield* Effect.promise(() =>
+                factory([
+                  { type: Organization.Organization, count: 1 },
+                  { type: Person.Person, count: PERSON_COUNT },
+                ]),
+              );
+            }),
+        }),
+      ],
+    }),
+  ],
+  parameters: {
+    layout: 'fullscreen',
+  },
+} satisfies Meta;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/containers/RecordArticle/RecordArticle.tsx

@@ -2,123 +2,62 @@
 // Copyright 2023 DXOS.org
 //
 
-import React, { useMemo } from 'react';
+import React from 'react';
 
 import { Surface } from '@dxos/app-framework/ui';
-import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
-import { type Database, Entity, Filter, Obj, Ref, Relation } from '@dxos/echo';
-import { useQuery } from '@dxos/react-client/echo';
-import { Panel, ScrollArea, useTranslation } from '@dxos/react-ui';
-import { Card as MosaicCard } from '@dxos/react-ui';
-import { Masonry } from '@dxos/react-ui-masonry';
-import { mx } from '@dxos/ui-theme';
-import { isNonNullable } from '@dxos/util';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+import { Obj, Type } from '@dxos/echo';
+import { Card, Input, Panel, ScrollArea, Toolbar, useTranslation } from '@dxos/react-ui';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
 
-export const RecordArticle = ({ role, subject }: SurfaceComponentProps) => {
+export const RecordArticle = ({ role, subject }: AppSurface.ObjectArticleProps) => {
   const { t } = useTranslation(meta.id);
+  // Obj.getType fails for database-registered (dynamic) schemas due to DXN mismatch;
+  // fall back to typename query which matches TypeSchema.typename.
   const db = Obj.getDatabase(subject);
-  const data = useMemo(() => ({ subject }), [subject]);
-  const related = useRelatedObjects(db, subject, {
-    references: true,
-    relations: true,
-  });
-  const singleColumn = related.length === 1;
+  const typename = Obj.getTypename(subject);
+  const schema =
+    Obj.getType(subject) ??
+    (typename && db
+      ? db.graph.registry
+          .list()
+          .filter(Type.isType)
+          .find((t) => Type.getTypename(t) === typename)
+      : undefined);
+  const icon =
+    schema && Type.getDatabase(schema) != null
+      ? 'ph--cube--regular'
+      : (Obj.getIcon(subject)?.icon ?? 'ph--circle-dashed--regular');
 
   return (
-    <Panel.Root role={role} className='dx-article'>
+    <Panel.Root role={role}>
+      <Panel.Toolbar asChild>
+        <Toolbar.Root />
+      </Panel.Toolbar>
       <Panel.Content asChild>
         <ScrollArea.Root orientation='vertical'>
-          <ScrollArea.Viewport classNames='p-4 gap-4'>
-            <div role='none' className='flex w-full dx-card-max-width'>
-              <Surface.Surface role='section' data={data} limit={1} />
+          <ScrollArea.Viewport classNames='p-4 space-y-4'>
+            <Card.Root classNames='dx-card-max-width'>
+              <Card.Header>
+                <Card.Icon icon={icon} />
+                <Card.Title>{Obj.getLabel(subject, { fallback: 'typename' })}</Card.Title>
+              </Card.Header>
+              <Card.Body>
+                <Surface.Surface type={AppSurface.Card} data={{ subject }} limit={1} />
+              </Card.Body>
+            </Card.Root>
+
+            {/* TODO(burdon): Only show label if surface exists? */}
+            <div className='flex flex-col gap-form-gap'>
+              <Input.Root>
+                <Input.Label>{t('related-actions.label')}</Input.Label>
+              </Input.Root>
+              <Surface.Surface role='prompts' data={{ subject }} limit={1} />
             </div>
-
-            {related.length > 0 && (
-              <div role='none' className={mx('flex flex-col gap-1', singleColumn ? 'dx-card-max-width' : 'w-full')}>
-                <label className='mt-2 text-sm text-description'>{t('related objects label')}</label>
-                <Masonry.Root<Entity.Unknown>
-                  items={related}
-                  render={Card}
-                  columnCount={singleColumn ? 1 : undefined}
-                  intrinsicHeight
-                />
-              </div>
-            )}
           </ScrollArea.Viewport>
         </ScrollArea.Root>
       </Panel.Content>
     </Panel.Root>
   );
 };
-
-const Card = ({ data: subject }: { data: Entity.Unknown }) => {
-  const data = useMemo(() => ({ subject }), [subject]);
-  return (
-    <MosaicCard.Root>
-      <MosaicCard.Toolbar>
-        <span />
-        <MosaicCard.Title>{Entity.getLabel(subject)}</MosaicCard.Title>
-      </MosaicCard.Toolbar>
-      <Surface.Surface role='card--content' data={data} limit={1} />
-    </MosaicCard.Root>
-  );
-};
-
-// TODO(wittjosiah): This is a hack. ECHO needs to have a back reference index to easily query for related objects.
-const useRelatedObjects = (
-  db?: Database.Database,
-  record?: Obj.Unknown,
-  options: { references?: boolean; relations?: boolean } = {},
-) => {
-  const objects = useQuery(db, Filter.everything());
-  return useMemo(() => {
-    if (!record) {
-      return [];
-    }
-
-    const related: Entity.Unknown[] = [];
-
-    // TODO(burdon): Change Person => Organization to relations.
-    if (options.references) {
-      const getReferences = (obj: Entity.Unknown): Ref.Unknown[] => {
-        return Object.getOwnPropertyNames(obj)
-          .map((name) => obj[name as keyof Obj.Unknown])
-          .filter((value) => Ref.isRef(value)) as Ref.Unknown[];
-      };
-
-      const references = getReferences(record);
-      const referenceTargets = references.map((ref) => ref.target).filter(isNonNullable);
-      const referenceSources = objects.filter((obj) => {
-        const refs = getReferences(obj);
-        return refs.some((ref) => ref.target === record);
-      });
-
-      related.push(...referenceTargets, ...referenceSources);
-    }
-
-    if (options.relations) {
-      // TODO(dmaretskyi): Workaround until https://github.com/dxos/dxos/pull/10100 lands.
-      const isValidRelation = (obj: Relation.Unknown) => {
-        try {
-          return Relation.isRelation(obj) && Relation.getSource(obj) && Relation.getTarget(obj);
-        } catch {
-          return false;
-        }
-      };
-
-      const relations = objects.filter(Relation.isRelation).filter((obj) => isValidRelation(obj));
-      const targetObjects = relations
-        .filter((relation) => Relation.getTarget(relation) === record)
-        .map((relation) => Relation.getSource(relation));
-      const sourceObjects = relations
-        .filter((relation) => Relation.getSource(relation) === record)
-        .map((relation) => Relation.getTarget(relation));
-
-      related.push(...targetObjects, ...sourceObjects);
-    }
-
-    return related;
-  }, [record, objects]);
-};

package/src/containers/RecordArticle/index.ts

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

package/src/containers/RelatedArticle/RelatedArticle.tsx

@@ -0,0 +1,74 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { useMemo } from 'react';
+
+import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface, useObjectMenuItems } from '@dxos/app-toolkit/ui';
+import { Entity, Obj } from '@dxos/echo';
+import { Card, Panel, Toolbar, useTranslation } from '@dxos/react-ui';
+import { Masonry } from '@dxos/react-ui-masonry';
+import { Menu } from '@dxos/react-ui-menu';
+
+import { useRelatedObjects } from '#hooks';
+import { meta } from '#meta';
+
+// TODO(burdon): Companion type.
+export type RelatedArticleProps = Pick<
+  AppSurface.ObjectArticleProps<Obj.Unknown, {}, Obj.Unknown>,
+  'role' | 'companionTo'
+>;
+
+export const RelatedArticle = ({ role, companionTo }: RelatedArticleProps) => {
+  const db = Obj.getDatabase(companionTo);
+  const items = useRelatedObjects(db, companionTo, { references: true, relations: true });
+
+  return (
+    <Masonry.Root Tile={ObjectCard}>
+      <Panel.Root role={role}>
+        <Panel.Toolbar asChild>
+          <Toolbar.Root />
+        </Panel.Toolbar>
+        <Panel.Content asChild>
+          <Masonry.Content classNames='p-2' centered>
+            <Masonry.Viewport items={items} />
+          </Masonry.Content>
+        </Panel.Content>
+      </Panel.Root>
+    </Masonry.Root>
+  );
+};
+
+/** Masonry tile renderer for a related entity. */
+const ObjectCard = ({ data: subject, classNames }: { data: Entity.Unknown; classNames?: string }) => {
+  const { t } = useTranslation(meta.id);
+  const data = useMemo(() => ({ subject }), [subject]);
+  const icon = Entity.getIcon(subject)?.icon ?? 'ph--circle-dashed--regular';
+
+  // TODO(burdon): BUG: Includes item itself.
+  const menuItems = useObjectMenuItems(subject);
+
+  return (
+    <Menu.Root>
+      <Card.Root classNames={classNames}>
+        <Card.Header>
+          <Card.Icon icon={icon} />
+          <Card.Title>{Entity.getLabel(subject, { fallback: 'typename' })}</Card.Title>
+          <Menu.Trigger asChild disabled={!menuItems?.length}>
+            <Toolbar.IconButton
+              iconOnly
+              variant='ghost'
+              icon='ph--dots-three-vertical--regular'
+              label={t('more-actions.label')}
+            />
+          </Menu.Trigger>
+          <Menu.Content items={menuItems} />
+        </Card.Header>
+        <Card.Body>
+          <Surface.Surface type={AppSurface.Card} data={data} limit={1} />
+        </Card.Body>
+      </Card.Root>
+    </Menu.Root>
+  );
+};

package/src/containers/RelatedArticle/index.ts

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

package/src/containers/SchemaContainer/SchemaContainer.tsx

@@ -4,57 +4,51 @@
 
 import React, { useEffect, useState } from 'react';
 
-import { type Type } from '@dxos/echo';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+import { Type } from '@dxos/echo';
 import { type Space } from '@dxos/react-client/echo';
 import { useTranslation } from '@dxos/react-ui';
 import { Settings } from '@dxos/react-ui-form';
 import { mx } from '@dxos/ui-theme';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
 
-type SchemaPanelProps = { space: Space };
-
-export const SchemaContainer = ({ space }: SchemaPanelProps) => {
+export const SchemaContainer = ({ space }: AppSurface.SpaceArticleProps) => {
   const { t } = useTranslation(meta.id);
-  const schemas = useQuerySpaceSchemas(space);
+  const types = useQuerySpaceTypes(space);
 
   return (
-    <Settings.Root>
-      <Settings.Section title={t('schema verbose label')} description={t('schema description')}>
+    <Settings.Viewport>
+      <Settings.Section title={t('schema-verbose.label')} description={t('schema.description')}>
         <div
-          role='none'
           className={mx([
             'grid md:col-span-2 grid-cols-subgrid gap-trim-sm items-center',
             '*:first:mt-0! *:last:mb-0! px-trim-md py-trim-md',
             'border border-separator rounded-md',
           ])}
         >
-          {schemas.length === 0 && <div className='text-center py-4'>{t('no schemas found message')}</div>}
-          {schemas.map((schema) => (
-            <div role='none' key={schema.id}>
-              {schema.typename}
-            </div>
+          {types.length === 0 && <div className='text-center py-4'>{t('no-schemas-found.message')}</div>}
+          {types.map((type) => (
+            <div key={type.id}>{Type.getTypename(type)}</div>
           ))}
         </div>
       </Settings.Section>
-    </Settings.Root>
+    </Settings.Viewport>
   );
 };
 
 /**
- * Subscribe to and retrieve all schemas from a space's schema registry.
+ * Subscribe to and retrieve all types from a space's registry.
  */
-export const useQuerySpaceSchemas = (space: Space): Type.RuntimeType[] => {
-  const [schemas, setSchemas] = useState<Type.RuntimeType[]>([]);
+export const useQuerySpaceTypes = (space: Space): Type.AnyEntity[] => {
+  const [types, setTypes] = useState<Type.AnyEntity[]>(() => [...space.db.graph.registry.list().filter(Type.isType)]);
 
   useEffect(() => {
-    const query = space.db.schemaRegistry.query();
-    const initialResults = query.runSync();
-    setSchemas(initialResults);
-
-    const unsubscribe = query.subscribe(() => setSchemas(query.results));
-    return () => unsubscribe();
+    setTypes([...space.db.graph.registry.list().filter(Type.isType)]);
+    return space.db.graph.registry.changed.on(() => {
+      setTypes([...space.db.graph.registry.list().filter(Type.isType)]);
+    });
   }, [space]);
 
-  return schemas;
+  return types;
 };

package/src/containers/SchemaContainer/index.ts

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

package/src/containers/SmallPresenceLive/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export { SmallPresenceLive as default } from '../SpacePresence/SpacePresence';
+export { SmallPresenceLive as default } from '../SpacePresence';

package/src/containers/SpacePresence/SpacePresence.stories.tsx

@@ -9,7 +9,7 @@ import { IdentityDid, PublicKey } from '@dxos/keys';
 import { HaloSpaceMember, SpaceMember } from '@dxos/react-client/echo';
 import { withTheme } from '@dxos/react-ui/testing';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
 
 import { FullPresence, type Member, type MemberPresenceProps, SmallPresence } from './SpacePresence';