@dxos/plugin-space 0.8.4-main.67995b8 → 0.8.4-main.70d3990

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

@@ -4,7 +4,8 @@
 
 import React, { useCallback } from 'react';
 
-import { createIntent, LayoutAction, useAppGraph, useIntentDispatcher } from '@dxos/app-framework';
+import { LayoutAction, createIntent } from '@dxos/app-framework';
+import { useAppGraph, useIntentDispatcher } from '@dxos/app-framework/react';
 import { Trigger } from '@dxos/async';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
 import { useClient } from '@dxos/react-client';
@@ -13,9 +14,9 @@ import { type InvitationResult } from '@dxos/react-client/invitations';
 import { Dialog, useTranslation } from '@dxos/react-ui';
 import { JoinPanel, type JoinPanelProps } from '@dxos/shell/react';
 
-import { SPACE_PLUGIN } from '../meta';
+import { meta } from '../../meta';
 
-export const JOIN_DIALOG = `${SPACE_PLUGIN}/JoinDialog`;
+export const JOIN_DIALOG = `${meta.id}/JoinDialog`;
 
 export type JoinDialogProps = JoinPanelProps & {
   navigableCollections?: boolean;
@@ -25,7 +26,7 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
   const { dispatchPromise: dispatch } = useIntentDispatcher();
   const client = useClient();
   const { graph } = useAppGraph();
-  const { t } = useTranslation(SPACE_PLUGIN);
+  const { t } = useTranslation(meta.id);
 
   const handleDone = useCallback(
     async (result: InvitationResult | null) => {
@@ -39,10 +40,10 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
           createIntent(LayoutAction.AddToast, {
             part: 'toast',
             subject: {
-              id: `${SPACE_PLUGIN}/join-success`,
+              id: `${meta.id}/join-success`,
               duration: 5_000,
-              title: ['join success label', { ns: SPACE_PLUGIN }],
-              closeLabel: ['dismiss label', { ns: SPACE_PLUGIN }],
+              title: ['join success label', { ns: meta.id }],
+              closeLabel: ['dismiss label', { ns: meta.id }],
             },
           }),
         ),
@@ -69,7 +70,12 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
         space = await trigger.wait();
       }
 
-      await dispatch(createIntent(LayoutAction.SwitchWorkspace, { part: 'workspace', subject: space.id }));
+      await dispatch(
+        createIntent(LayoutAction.SwitchWorkspace, {
+          part: 'workspace',
+          subject: space.id,
+        }),
+      );
 
       // TODO(wittjosiah): If navigableCollections is false and there's no target,
       //   should try to navigate to the first object of the space replicates.
@@ -80,8 +86,18 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
         // If the target has not yet replicated, this will trigger a loading toast.
         await graph.waitForPath({ target }).catch(() => {});
         await Promise.all([
-          dispatch(createIntent(LayoutAction.Open, { part: 'main', subject: [target] })),
-          dispatch(createIntent(LayoutAction.Expose, { part: 'navigation', subject: target })),
+          dispatch(
+            createIntent(LayoutAction.Open, {
+              part: 'main',
+              subject: [target],
+            }),
+          ),
+          dispatch(
+            createIntent(LayoutAction.Expose, {
+              part: 'navigation',
+              subject: target,
+            }),
+          ),
         ]);
       }
 

package/src/components/JoinDialog/index.ts

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

package/src/components/MembersContainer/MembersContainer.stories.tsx

@@ -0,0 +1,56 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
+
+import { IntentPlugin } from '@dxos/app-framework';
+import { withPluginManager } from '@dxos/app-framework/testing';
+import { useSpace } from '@dxos/react-client/echo';
+import { withClientProvider } from '@dxos/react-client/testing';
+import { withTheme } from '@dxos/react-ui/testing';
+import { translations as shellTranslations } from '@dxos/shell/react';
+import { render } from '@dxos/storybook-utils';
+
+import { translations } from '../../translations';
+
+import { MembersContainer } from './MembersContainer';
+
+const DefaultStory = () => {
+  const space = useSpace();
+  if (!space) {
+    return null;
+  }
+
+  return (
+    <MembersContainer
+      space={space}
+      createInvitationUrl={(invitationCode) => `https://dxos.org/invite/${invitationCode}`}
+    />
+  );
+};
+
+const meta = {
+  title: 'plugins/plugin-space/MembersContainer',
+  component: MembersContainer as any,
+  render: render(DefaultStory),
+  decorators: [
+    withTheme, // TODO(wittjosiah): Try to write story which does not depend on plugin manager.
+    withPluginManager({ plugins: [IntentPlugin()] }),
+    withClientProvider({
+      createIdentity: true,
+      createSpace: true,
+    }),
+  ],
+  parameters: {
+    layout: 'fullscreen',
+    translations: [...translations, ...shellTranslations],
+  },
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

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

@@ -5,15 +5,17 @@
 import React, { type Dispatch, type SetStateAction, useCallback, useMemo, useState } from 'react';
 import { QR } from 'react-qr-rounded';
 
-import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
+import { createIntent } from '@dxos/app-framework';
+import { useIntentDispatcher } from '@dxos/app-framework/react';
+import { Obj } from '@dxos/echo';
 import { log } from '@dxos/log';
 import { useConfig } from '@dxos/react-client';
-import { fullyQualifiedId, useSpaceInvitations, type Space } from '@dxos/react-client/echo';
+import { type Space, useSpaceInvitations } from '@dxos/react-client/echo';
 import { type CancellableInvitationObservable, Invitation, InvitationEncoder } from '@dxos/react-client/invitations';
 import { Button, Clipboard, Icon, Input, useId, useTranslation } from '@dxos/react-ui';
-import { ControlPage, ControlSection, ControlFrame, ControlFrameItem, ControlItemInput } from '@dxos/react-ui-form';
+import { ControlFrame, ControlFrameItem, ControlItemInput, ControlPage, ControlSection } from '@dxos/react-ui-form';
 import { StackItem } from '@dxos/react-ui-stack';
-import { DataType } from '@dxos/schema';
+import { Collection } from '@dxos/schema';
 import {
   type ActionMenuItem,
   AuthCode,
@@ -26,9 +28,9 @@ import {
 } from '@dxos/shell/react';
 import { hexToEmoji } from '@dxos/util';
 
-import { SPACE_PLUGIN } from '../meta';
-import { SpaceAction } from '../types';
-import { COMPOSER_SPACE_LOCK } from '../util';
+import { meta } from '../../meta';
+import { SpaceAction } from '../../types';
+import { COMPOSER_SPACE_LOCK } from '../../util';
 
 // TODO(wittjosiah): Copied from Shell.
 const activeActionKey = 'dxos:react-shell/space-manager/active-action';
@@ -41,14 +43,13 @@ const handleInvitationEvent = (invitation: Invitation, subscription: ZenObservab
   }
 };
 
-export const MembersContainer = ({
-  space,
-  createInvitationUrl,
-}: {
+export type MembersContainerProps = {
   space: Space;
   createInvitationUrl: (invitationCode: string) => string;
-}) => {
-  const { t } = useTranslation(SPACE_PLUGIN);
+};
+
+export const MembersContainer = ({ space, createInvitationUrl }: MembersContainerProps) => {
+  const { t } = useTranslation(meta.id);
   const config = useConfig();
   const { dispatchPromise: dispatch } = useIntentDispatcher();
   const invitations = useSpaceInvitations(space.key);
@@ -64,7 +65,7 @@ export const MembersContainer = ({
   };
 
   // TODO(wittjosiah): Track which was the most recently viewed object.
-  const target = space.properties[DataType.Collection.typename]?.target?.objects[0]?.target;
+  const target = space.properties[Collection.Collection.typename]?.target?.objects[0]?.target;
 
   const locked = space.properties[COMPOSER_SPACE_LOCK];
   const handleChangeLocked = useCallback(() => {
@@ -76,7 +77,7 @@ export const MembersContainer = ({
       inviteOne: {
         label: t('invite one label', { ns: 'os' }),
         description: t('invite one description', { ns: 'os' }),
-        icon: () => <Icon icon='ph--user-plus--regular' size={5} />,
+        icon: 'ph--user-plus--regular',
         testId: 'membersContainer.inviteOne',
         onClick: async () => {
           const { data: invitation } = await dispatch(
@@ -85,7 +86,7 @@ export const MembersContainer = ({
               type: Invitation.Type.INTERACTIVE,
               authMethod: Invitation.AuthMethod.SHARED_SECRET,
               multiUse: false,
-              target: target && fullyQualifiedId(target),
+              target: target && Obj.getDXN(target).toString(),
             }),
           );
           if (invitation && config.values.runtime?.app?.env?.DX_ENVIRONMENT !== 'production') {
@@ -98,7 +99,7 @@ export const MembersContainer = ({
       inviteMany: {
         label: t('invite many label', { ns: 'os' }),
         description: t('invite many description', { ns: 'os' }),
-        icon: () => <Icon icon='ph--users-three--regular' size={5} />,
+        icon: 'ph--users-three--regular',
         testId: 'membersContainer.inviteMany',
         onClick: async () => {
           const { data: invitation } = await dispatch(
@@ -107,7 +108,7 @@ export const MembersContainer = ({
               type: Invitation.Type.DELEGATED,
               authMethod: Invitation.AuthMethod.KNOWN_PUBLIC_KEY,
               multiUse: true,
-              target: target && fullyQualifiedId(target),
+              target: target && Obj.getDXN(target).toString(),
             }),
           );
           if (invitation && config.values.runtime?.app?.env?.DX_ENVIRONMENT !== 'production') {
@@ -131,7 +132,7 @@ export const MembersContainer = ({
 
   return (
     <Clipboard.Provider>
-      <StackItem.Content classNames='block overflow-y-auto'>
+      <StackItem.Content scrollable>
         <ControlPage>
           <ControlSection title={t('members verbose label')} description={t('members description')}>
             <ControlFrame>
@@ -168,7 +169,7 @@ export const MembersContainer = ({
               )}
             </ControlFrame>
             {/* TODO(wittjosiah): Make ControlItemInput & ControlFrame compatible. */}
-            <div className='justify-center gap-4 p-0 mbs-4 container-max-width grid grid-cols-1 md:grid-cols-[1fr_min-content]'>
+            <div className='justify-center p-0 mbs-4 container-max-width grid grid-cols-1 md:grid-cols-[1fr_min-content]'>
               <ControlItemInput title={t('space locked label')} description={t('space locked description')}>
                 <Input.Switch checked={locked} onCheckedChange={handleChangeLocked} classNames='justify-self-end' />
               </ControlItemInput>
@@ -231,7 +232,7 @@ const InvitationQR = ({ id, url, onCancel }: { id: string; url: string; onCancel
   const emoji = hexToEmoji(id);
   return (
     <>
-      <p className='text-description'>{t('qr code description', { ns: SPACE_PLUGIN })}</p>
+      <p className='text-description'>{t('qr code description', { ns: meta.id })}</p>
       <div role='group' className='grid grid-cols-[1fr_min-content] mlb-2 gap-2'>
         <div role='none' className='is-full aspect-square relative text-description'>
           <QR

package/src/components/MembersContainer/index.ts

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

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.makeRef(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,33 +4,27 @@
 
 import React, { useCallback, useRef, useState } from 'react';
 
-import { createIntent, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
-import { type Live } from '@dxos/live-object';
+import { LayoutAction, createIntent } from '@dxos/app-framework';
+import { useIntentDispatcher } from '@dxos/app-framework/react';
+import { Obj } from '@dxos/echo';
 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: obj }: { 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);
-  // TODO(wittjosiah): Use schema here.
-  const object = obj as any;
-  // TODO(burdon): Field should not be hardcoded field.
-  const [name, setName] = useState(object.name || object.title || '');
+  const [name, setName] = useState(Obj.getLabel(object));
   const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   const handleDone = useCallback(() => {
     try {
-      object.name = name;
+      name && Obj.setLabel(object, name);
     } catch (err) {
-      try {
-        object.title = name;
-      } catch {
-        log.error('Failed to rename object', { err });
-      }
+      log.error('Failed to rename object', { err });
     }
     void dispatch(
       createIntent(LayoutAction.UpdatePopover, {

package/src/components/ObjectRenamePopover/index.ts

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

package/src/components/ObjectSettings/AdvancedObjectSettings.tsx

@@ -4,13 +4,13 @@
 
 import React, { useCallback, useState } from 'react';
 
-import { Obj } from '@dxos/echo';
-import { ForeignKey } from '@dxos/echo-schema';
+import { Key, Obj } from '@dxos/echo';
 import { IconButton, useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
 
+import { meta } from '../../meta';
+
 import { ForeignKeys } from './ForeignKeys';
-import { SPACE_PLUGIN } from '../../meta';
 
 const initialValues = {
   source: '',
@@ -22,14 +22,14 @@ 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);
 
   const handleNew = useCallback(() => setAdding(true), []);
   const handleCancel = useCallback(() => setAdding(false), []);
   const handleSave = useCallback(
-    (key: ForeignKey) => {
+    (key: Key.ForeignKey) => {
       const index = keys.findIndex(({ source, id }) => source === key.source && id === key.id);
       if (index === -1) {
         keys.push(key);
@@ -39,7 +39,7 @@ export const AdvancedObjectSettings = ({ object }: AdvancedObjectSettingsProps)
     [keys],
   );
   const handleDelete = useCallback(
-    (key: ForeignKey) => {
+    (key: Key.ForeignKey) => {
       const index = keys.findIndex(({ source, id }) => source === key.source && id === key.id);
       if (index !== -1) {
         keys.splice(index, 1);
@@ -69,7 +69,7 @@ export const AdvancedObjectSettings = ({ object }: AdvancedObjectSettingsProps)
       {adding && (
         <Form
           outerSpacing={false}
-          schema={ForeignKey}
+          schema={Key.ForeignKey}
           values={initialValues}
           onSave={handleSave}
           onCancel={handleCancel}

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 = {};