@dxos/plugin-space 0.8.4-main.28f8d3d → 0.8.4-main.2c6827d

package/src/components/MenuFooter.tsx

@@ -9,11 +9,11 @@ import { type Obj } from '@dxos/echo';
 import { useClient } from '@dxos/react-client';
 import { DropdownMenu, Icon, toLocalizedString, useTranslation } from '@dxos/react-ui';
 
-import { SPACE_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { getSpaceDisplayName } from '../util';
 
 export const MenuFooter = ({ object }: { object: Obj.Any }) => {
-  const { t } = useTranslation(SPACE_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const client = useClient();
   const space = getSpace(object);
   const spaceName = space ? getSpaceDisplayName(space, { personal: client.spaces.default === space }) : '';

package/src/components/ObjectDetailsPanel/ObjectDetailsPanel.tsx

@@ -0,0 +1,51 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React from 'react';
+
+import { useClient } from '@dxos/react-client';
+import { Filter, getSpace, useQuery, useSchema } from '@dxos/react-client/echo';
+import { Callout, useTranslation } from '@dxos/react-ui';
+import { useSelected } from '@dxos/react-ui-attention';
+import { type View, getTypenameFromQuery } from '@dxos/schema';
+import { isNonNullable } from '@dxos/util';
+
+import { meta } from '../../meta';
+
+import { ObjectForm } from './ObjectForm';
+
+type RowDetailsPanelProps = { objectId: string; view: View.View };
+
+export const ObjectDetailsPanel = ({ objectId, view }: RowDetailsPanelProps) => {
+  const { t } = useTranslation(meta.id);
+  const client = useClient();
+  const space = getSpace(view);
+  const typename = view.query ? getTypenameFromQuery(view.query.ast) : undefined;
+  const schema = useSchema(client, space, typename);
+
+  const queriedObjects = useQuery(space, schema ? Filter.type(schema) : Filter.nothing());
+  const selectedRows = useSelected(objectId, 'multi');
+  const selectedObjects = selectedRows.map((id) => queriedObjects.find((obj) => obj.id === id)).filter(isNonNullable);
+
+  if (selectedObjects.length === 0) {
+    return (
+      <div role='none' className='plb-cardSpacingBlock pli-cardSpacingInline'>
+        <Callout.Root classNames='is-full'>
+          <Callout.Title>{t('row details no selection label')}</Callout.Title>
+        </Callout.Root>
+      </div>
+    );
+  }
+
+  return (
+    <div role='none' className='bs-full is-full flex flex-col p-2 gap-1 overflow-y-auto'>
+      {schema &&
+        selectedObjects.map((object) => (
+          <div key={object.id} className='border border-separator rounded'>
+            <ObjectForm object={object} schema={schema} />
+          </div>
+        ))}
+    </div>
+  );
+};

package/src/components/ObjectDetailsPanel/ObjectForm.tsx

@@ -0,0 +1,72 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Schema from 'effect/Schema';
+import React, { useCallback, useMemo } from 'react';
+
+import { DXN, Obj, type Ref, Tag, Type } from '@dxos/echo';
+import { type JsonPath, setValue } from '@dxos/echo/internal';
+import { invariant } from '@dxos/invariant';
+import { getSpace } from '@dxos/react-client/echo';
+import { Form, useRefQueryLookupHandler } from '@dxos/react-ui-form';
+import { isNonNullable } from '@dxos/util';
+
+import { meta as pluginMeta } from '../../meta';
+
+const TagSchema = Tag.Tag.pipe(Schema.omit('id'));
+
+type ObjectFormProps = { object: Obj.Any; schema: Schema.Schema.AnyNoContext };
+
+export const ObjectForm = ({ object, schema }: ObjectFormProps) => {
+  const space = getSpace(object);
+  const handleRefQueryLookup = useRefQueryLookupHandler({ space });
+
+  const formSchema = useMemo(
+    () => Schema.Struct({ tags: Schema.Array(Type.Ref(Tag.Tag)).pipe(Schema.optional) }).pipe(Schema.extend(schema)),
+    [schema],
+  );
+
+  const meta = Obj.getMeta(object);
+  const tags = (meta.tags ?? []).map((tag) => space?.db.ref(DXN.parse(tag))).filter(isNonNullable);
+  const values = useMemo(() => ({ tags, ...object }), [object, tags]);
+
+  const handleCreateTag = useCallback((values: Schema.Schema.Type<typeof TagSchema>) => {
+    invariant(space);
+    const tag = space.db.add(Tag.make(values));
+    const meta = Obj.getMeta(object);
+    meta.tags = [...(meta.tags ?? []), Obj.getDXN(tag).toString()];
+  }, []);
+
+  const handleSave = useCallback(
+    ({ tags, ...values }: any, { changed }: { changed: Record<JsonPath, boolean> }) => {
+      const changedPaths = Object.keys(changed).filter((path) => changed[path as JsonPath]) as JsonPath[];
+      for (const path of changedPaths) {
+        if (path === 'tags') {
+          const meta = Obj.getMeta(object);
+          meta.tags = tags?.map((tag: Ref.Ref<Tag.Tag>) => tag.dxn.toString()) ?? [];
+          continue;
+        }
+
+        const value = values[path];
+        setValue(object, path, value);
+      }
+    },
+    [object],
+  );
+
+  return (
+    <Form
+      autoSave
+      schema={formSchema}
+      values={values}
+      createSchema={TagSchema}
+      createOptionIcon='ph--plus--regular'
+      createOptionLabel={['add tag label', { ns: pluginMeta.id }]}
+      createInitialValuePath='label'
+      onCreate={handleCreateTag}
+      onSave={handleSave}
+      onQueryRefOptions={handleRefQueryLookup}
+    />
+  );
+};

package/src/components/ObjectDetailsPanel/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { ObjectDetailsPanel } from './ObjectDetailsPanel';
+
+export default ObjectDetailsPanel;

package/src/components/{PopoverRenameObject.tsx → ObjectRenamePopover/ObjectRenamePopover.tsx}

@@ -4,18 +4,18 @@
 
 import React, { useCallback, useRef, useState } from 'react';
 
-import { LayoutAction, createIntent, useIntentDispatcher } from '@dxos/app-framework';
+import { LayoutAction, createIntent } from '@dxos/app-framework';
+import { useIntentDispatcher } from '@dxos/app-framework/react';
 import { Obj } from '@dxos/echo';
-import { type Live } from '@dxos/live-object';
 import { log } from '@dxos/log';
 import { Button, Input, useTranslation } from '@dxos/react-ui';
 
-import { SPACE_PLUGIN } from '../meta';
+import { meta } from '../../meta';
 
-export const POPOVER_RENAME_OBJECT = `${SPACE_PLUGIN}/PopoverRenameObject`;
+export const OBJECT_RENAME_POPOVER = `${meta.id}/ObjectRenamePopover`;
 
-export const PopoverRenameObject = ({ object }: { object: Live<any> }) => {
-  const { t } = useTranslation(SPACE_PLUGIN);
+export const ObjectRenamePopover = ({ object }: { object: Obj.Any }) => {
+  const { t } = useTranslation(meta.id);
   const doneButton = useRef<HTMLButtonElement>(null);
   const [name, setName] = useState(Obj.getLabel(object));
   const { dispatchPromise: dispatch } = useIntentDispatcher();

package/src/components/ObjectRenamePopover/index.ts

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

package/src/components/ObjectSettings/AdvancedObjectSettings.tsx

@@ -5,11 +5,11 @@
 import React, { useCallback, useState } from 'react';
 
 import { Obj } from '@dxos/echo';
-import { ForeignKey } from '@dxos/echo-schema';
+import { ForeignKey } from '@dxos/echo/internal';
 import { IconButton, useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
 
-import { SPACE_PLUGIN } from '../../meta';
+import { meta } from '../../meta';
 
 import { ForeignKeys } from './ForeignKeys';
 
@@ -23,7 +23,7 @@ export type AdvancedObjectSettingsProps = {
 };
 
 export const AdvancedObjectSettings = ({ object }: AdvancedObjectSettingsProps) => {
-  const { t } = useTranslation(SPACE_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const [adding, setAdding] = useState(false);
   const { keys } = Obj.getMeta(object);
 

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

@@ -0,0 +1,63 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React, { useEffect, useState } from 'react';
+
+import { type Obj, Tag } from '@dxos/echo';
+import { useClientProvider, 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 { translations } from '../../translations';
+
+import { BaseObjectSettings } from './BaseObjectSettings';
+
+const DefaultStory = () => {
+  const { space } = useClientProvider();
+  const [object, setObject] = useState<Obj.Any>();
+
+  useEffect(() => {
+    if (space && !object) {
+      const object = space.db.add(Project.make());
+      setObject(object as Obj.Any);
+    }
+  }, [space, object]);
+
+  if (!object) {
+    return null;
+  }
+
+  return <BaseObjectSettings object={object} classNames='is-[20rem]' />;
+};
+
+const meta = {
+  title: 'plugins/plugin-space/BaseObjectSettings',
+  component: BaseObjectSettings as any,
+  render: render(DefaultStory),
+  decorators: [
+    withTheme,
+    withClientProvider({
+      createIdentity: true,
+      createSpace: true,
+      types: [Project.Project, Tag.Tag],
+      onCreateSpace: async ({ space }) => {
+        space.db.add(Tag.make({ label: 'Tag 1' }));
+        space.db.add(Tag.make({ label: 'Tag 2' }));
+        space.db.add(Tag.make({ label: 'Tag 3' }));
+      },
+    }),
+  ],
+  parameters: {
+    layout: 'centered',
+    translations,
+  },
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/components/ObjectSettings/BaseObjectSettings.tsx

@@ -2,12 +2,29 @@
 // Copyright 2024 DXOS.org
 //
 
-import React, { type PropsWithChildren, useRef } from 'react';
+import { batch } from '@preact/signals-core';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
+import * as Schema from 'effect/Schema';
+import React, { type PropsWithChildren, useCallback, useMemo } from 'react';
 
-import { type Obj } from '@dxos/echo';
-import { Input, type ThemedClassName, useTranslation } from '@dxos/react-ui';
+import { DXN, Obj, type Ref, Tag, Type } from '@dxos/echo';
+import { type JsonPath, setValue } from '@dxos/echo/internal';
+import { invariant } from '@dxos/invariant';
+import { getSpace } from '@dxos/react-client/echo';
+import { type ThemedClassName } from '@dxos/react-ui';
+import { Form, useRefQueryLookupHandler } from '@dxos/react-ui-form';
+import { isNonNullable } from '@dxos/util';
 
-import { meta } from '../../meta';
+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),
+});
+
+// TODO(wittjosiah): Better way to support validation of object schemas?
+const TagSchema = Tag.Tag.pipe(Schema.omit('id'));
 
 export type BaseObjectSettingsProps = ThemedClassName<
   PropsWithChildren<{
@@ -15,32 +32,79 @@ export type BaseObjectSettingsProps = ThemedClassName<
   }>
 >;
 
+// TODO(wittjosiah): Reconcile w/ ObjectDetailsPanel.
 export const BaseObjectSettings = ({ classNames, children, object }: BaseObjectSettingsProps) => {
-  const { t } = useTranslation(meta.id);
-  const inputRef = useRef<HTMLInputElement>(null);
+  const space = getSpace(object);
+  const handleRefQueryLookup = useRefQueryLookupHandler({ space });
+
+  const formSchema = useMemo(() => {
+    return Function.pipe(
+      Obj.getSchema(object),
+      Option.fromNullable,
+      Option.map((schema) => BaseSchema.pipe(Schema.extend(schema))),
+      Option.getOrUndefined,
+    );
+  }, [object]);
+
+  const meta = Obj.getMeta(object);
+  const tags = (meta.tags ?? []).map((tag) => space?.db.ref(DXN.parse(tag))).filter(isNonNullable);
+  const values = useMemo(
+    () => ({
+      tags,
+      ...object,
+    }),
+    [object, tags],
+  );
+
+  const handleCreateTag = useCallback((values: Schema.Schema.Type<typeof TagSchema>) => {
+    invariant(space);
+    const tag = space.db.add(Tag.make(values));
+    const meta = Obj.getMeta(object);
+    meta.tags = [...(meta.tags ?? []), Obj.getDXN(tag).toString()];
+  }, []);
+
+  const handleSave = useCallback(
+    (
+      { tags, ...values }: Schema.Schema.Type<typeof formSchema>,
+      { changed }: { changed: Record<JsonPath, boolean> },
+    ) => {
+      const changedPaths = Object.keys(changed).filter((path) => changed[path as JsonPath]) as JsonPath[];
+      batch(() => {
+        for (const path of changedPaths) {
+          if (path === 'tags') {
+            const meta = Obj.getMeta(object);
+            meta.tags = tags?.map((tag: Ref.Ref<Tag.Tag>) => tag.dxn.toString()) ?? [];
+            continue;
+          }
+
+          const value = values[path];
+          setValue(object, path, value);
+        }
+      });
+    },
+    [object],
+  );
+
+  if (!formSchema) {
+    return null;
+  }
 
-  // TODO(wittjosiah): This should be a form based on the schema of the object.
-  //  The form should only include fields with a specific settings annotation.
-  //  Perhaps also including the field of the title annotation as well.
   return (
     <>
-      <Input.Root>
-        <Input.Label>{t('name label')}</Input.Label>
-        <Input.TextInput
-          ref={inputRef}
-          placeholder={t('name placeholder')}
-          // TODO(burdon): Use annotation to get the name field.
-          value={(object as any).name ?? ''}
-          onChange={(event) => {
-            (object as any).name = event.target.value;
-          }}
-          onKeyDown={(event) => {
-            if (event.key === 'Enter') {
-              inputRef.current?.blur();
-            }
-          }}
-        />
-      </Input.Root>
+      <Form
+        classNames={classNames}
+        outerSpacing={false}
+        autoSave
+        schema={formSchema}
+        values={values}
+        createSchema={TagSchema}
+        createOptionIcon='ph--plus--regular'
+        createOptionLabel={['add tag label', { ns: pluginMeta.id }]}
+        createInitialValuePath='label'
+        onCreate={handleCreateTag}
+        onSave={handleSave}
+        onQueryRefOptions={handleRefQueryLookup}
+      />
       {children}
     </>
   );

package/src/components/ObjectSettings/ForeignKeys.tsx

@@ -4,10 +4,10 @@
 
 import React, { useCallback } from 'react';
 
-import { type ForeignKey } from '@dxos/echo-schema';
+import { type ForeignKey } from '@dxos/echo/internal';
 import { IconButton, List, ListItem, useTranslation } from '@dxos/react-ui';
 
-import { SPACE_PLUGIN } from '../../meta';
+import { meta } from '../../meta';
 
 export type ForeignKeysProps = {
   keys: ForeignKey[];
@@ -31,14 +31,14 @@ type KeyItemProps = {
 };
 
 const KeyItem = ({ forignKey, onDelete }: KeyItemProps) => {
-  const { t } = useTranslation(SPACE_PLUGIN);
+  const { t } = useTranslation(meta.id);
 
   const handleDelete = useCallback(() => {
     onDelete?.(forignKey);
   }, [forignKey, onDelete]);
 
   return (
-    <ListItem.Root classNames='px-2'>
+    <ListItem.Root classNames='pli-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/ObjectSettings/ObjectSettingsContainer.tsx

@@ -4,9 +4,9 @@
 
 import React, { useMemo } from 'react';
 
-import { Surface } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/react';
 import { type Obj } from '@dxos/echo';
-import { Clipboard } from '@dxos/react-ui';
+import { Clipboard, Toolbar } from '@dxos/react-ui';
 import { StackItem } from '@dxos/react-ui-stack';
 
 import { BaseObjectSettings } from './BaseObjectSettings';
@@ -21,7 +21,8 @@ export const ObjectSettingsContainer = ({ object, role }: ObjectSettingsContaine
 
   return (
     <Clipboard.Provider>
-      <StackItem.Content toolbar={false}>
+      <StackItem.Content toolbar>
+        <Toolbar.Root></Toolbar.Root>
         <div role='none' className='overflow-y-auto pli-cardSpacingInline plb-cardSpacingBlock'>
           <BaseObjectSettings object={object}>
             <Surface role='base-object-settings' data={data} />

package/src/components/ObjectSettings/index.ts

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

package/src/components/RecordArticle.stories.tsx

@@ -0,0 +1,115 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
+
+import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
+import { withPluginManager } from '@dxos/app-framework/testing';
+import { Filter, Obj, Ref, Relation, type Type } from '@dxos/echo';
+import { faker } from '@dxos/random';
+import { useQuery } from '@dxos/react-client/echo';
+import { useClientProvider, withClientProvider } from '@dxos/react-client/testing';
+import { withTheme } from '@dxos/react-ui/testing';
+import { Card } from '@dxos/react-ui-stack';
+import { Json } from '@dxos/react-ui-syntax-highlighter';
+import { type ValueGenerator, createAsyncGenerator } from '@dxos/schema/testing';
+import { translations as shellTranslations } from '@dxos/shell/react';
+import { render } from '@dxos/storybook-utils';
+import { HasSubject, Organization, Person, Task } from '@dxos/types';
+
+import { translations } from '../translations';
+
+import { RecordArticle } from './RecordArticle';
+
+faker.seed(1);
+const generator: ValueGenerator = faker as any;
+
+const DefaultStory = () => {
+  const { space } = useClientProvider();
+  const [object] = useQuery(space, Filter.type(Organization.Organization));
+  if (!object) {
+    return null;
+  }
+
+  return <RecordArticle subject={object} />;
+};
+
+const meta = {
+  title: 'plugins/plugin-space/RecordArticle',
+  component: RecordArticle as any,
+  render: render(DefaultStory),
+  decorators: [
+    withTheme,
+    // TODO(wittjosiah): Try to write story which does not depend on plugin manager.
+    withPluginManager({
+      capabilities: [
+        contributes(Capabilities.ReactSurface, [
+          createSurface({
+            id: 'section',
+            role: 'section',
+            component: ({ data }) => (
+              <Card.SurfaceRoot>
+                <Json classNames='text-sm' data={data} />
+              </Card.SurfaceRoot>
+            ),
+          }),
+          createSurface({
+            id: 'card',
+            role: 'card',
+            component: ({ data }) => (
+              <Card.SurfaceRoot>
+                <Json classNames='text-sm' data={data} />
+              </Card.SurfaceRoot>
+            ),
+          }),
+        ]),
+      ],
+    }),
+    // TODO(burdon): Use plugin.
+    withClientProvider({
+      createIdentity: true,
+      createSpace: true,
+      types: [Organization.Organization, Person.Person, Task.Task, HasSubject.HasSubject],
+      onCreateSpace: async ({ space }) => {
+        const org = space.db.add(
+          Obj.make(Organization.Organization, {
+            name: 'DXOS',
+          }),
+        );
+        const task = space.db.add(
+          Obj.make(Task.Task, {
+            title: 'Task',
+          }),
+        );
+        space.db.add(
+          Relation.make(HasSubject.HasSubject, {
+            [Relation.Source]: task,
+            [Relation.Target]: org,
+            completedAt: new Date().toISOString(),
+          }),
+        );
+        const objectGenerator = createAsyncGenerator(generator, Person.Person as Type.Obj.Any, {
+          db: space?.db,
+          force: true,
+        });
+        await objectGenerator.createObjects(3).then((objects) => {
+          objects.forEach((object) => {
+            object.organization = Ref.make(org);
+          });
+        });
+      },
+    }),
+  ],
+  parameters: {
+    layout: 'fullscreen',
+    translations: [...translations, ...shellTranslations],
+  },
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};