@dxos/plugin-space 0.8.4-main.422d1c7879 → 0.8.4-main.43cb759274

package/src/capabilities/state.ts

@@ -44,7 +44,7 @@ export default Capability.makeModule(
     const updateNavigableCollections = () => {
       const enabled =
         manager.getEnabled().includes('org.dxos.plugin.stack') ||
-        manager.getEnabled().includes('org.dxos.plugin.simple-layout');
+        manager.getEnabled().includes('org.dxos.plugin.simpleLayout');
       const current = registry.get(ephemeralAtom);
       if (enabled !== current.navigableCollections) {
         registry.update(ephemeralAtom, (c) => ({ ...c, navigableCollections: enabled }));

package/src/capabilities/undo-mappings.ts

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability, UndoMapping } from '@dxos/app-framework';
-import { Obj } from '@dxos/echo';
+import { Entity } from '@dxos/echo';
 
 import { meta } from '#meta';
 import { SpaceOperation } from '#operations';
@@ -39,13 +39,12 @@ export default Capability.makeModule(
             objects: output.objects,
             parentCollection: output.parentCollection,
             indices: output.indices,
-            nestedObjectsList: output.nestedObjectsList,
             wasActive: output.wasActive,
           }),
           message: (input, _output) => {
-            const ns = Obj.getTypename(input.objects[0]);
+            const ns = Entity.getTypename(input.objects[0]);
             return ns && input.objects.length === 1
-              ? ['object-deleted.label', { ns }]
+              ? ['object-deleted.label', { ns: [ns, meta.id] }]
               : ['objects-deleted.label', { ns: meta.id }];
           },
         }),

package/src/{cli/commands → commands}/database/add.ts

@@ -8,28 +8,21 @@ import * as Prompt from '@effect/cli/Prompt';
 import * as Console from 'effect/Console';
 import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
-import type * as Schema from 'effect/Schema';
 
 // eslint-disable-next-line unused-imports/no-unused-imports
 import { type Capability, Plugin } from '@dxos/app-framework';
-import { AppActivationEvents, AppCapabilities } from '@dxos/app-toolkit';
+import { AppActivationEvents, RootCollectionAnnotation } from '@dxos/app-toolkit';
 import { CommandConfig, Common, flushAndSync, print, spaceLayer } from '@dxos/cli-util';
 import { SpaceProperties } from '@dxos/client/echo';
-import { Database, Filter, Obj, Type } from '@dxos/echo';
-import { Collection } from '@dxos/echo';
-import { EntityKind, getTypeAnnotation } from '@dxos/echo/internal';
 // eslint-disable-next-line unused-imports/no-unused-imports
-import type { Operation } from '@dxos/operation';
+import type { Operation } from '@dxos/compute';
+import { Annotation, Collection, Database, Filter, Obj, Query, Scope, Type } from '@dxos/echo';
+import { EntityKind, HiddenAnnotation, getTypeAnnotation } from '@dxos/echo/internal';
 
-import { type CreateObject } from '#types';
+import { SpaceCapabilities } from '#types';
 
 import { printObject } from './util';
 
-export type Metadata = {
-  createObject: CreateObject;
-  inputSchema?: Schema.Schema.AnyNoContext;
-};
-
 export const add = Command.make(
   'add',
   {
@@ -42,17 +35,18 @@ export const add = Command.make(
       const manager = yield* Plugin.Service;
       const { db } = yield* Database.Service;
 
-      yield* manager.activate(AppActivationEvents.SetupMetadata);
+      yield* manager.activate(AppActivationEvents.SetupSchema);
 
       const resolve = (typename: string) => {
-        const metadata = manager.capabilities
-          .getAll(AppCapabilities.Metadata)
-          .find(({ id }) => id === typename)?.metadata;
-        return metadata?.createObject ? (metadata as Metadata) : undefined;
+        const entry = manager.capabilities
+          .getAll(SpaceCapabilities.CreateObjectEntry)
+          .find(({ id }) => id === typename);
+        return entry ?? undefined;
       };
 
       const [properties] = yield* Database.runQuery(Filter.type(SpaceProperties));
-      const collection = yield* Database.load<Collection.Collection>(properties[Collection.Collection.typename]);
+      const rootCollectionRef = Annotation.get(properties, RootCollectionAnnotation).pipe(Option.getOrUndefined);
+      const collection = rootCollectionRef ? yield* Database.load<Collection.Collection>(rootCollectionRef) : undefined;
 
       const selectedTypename = yield* Option.match(typename, {
         onNone: () => selectTypename(resolve),
@@ -63,7 +57,7 @@ export const add = Command.make(
         return yield* Effect.fail(new Error(`Unknown typename: ${selectedTypename}`));
       }
 
-      const result = yield* metadata.createObject({}, { db, target: collection });
+      const result = yield* metadata.createObject({}, { db, target: collection ?? db });
       const object = result.object;
       if (!Obj.isObject(object)) {
         return yield* Effect.fail(new Error(`Invalid object: ${object}`));
@@ -85,16 +79,17 @@ export const add = Command.make(
 /**
  * Prompts for typename selection if not provided.
  */
-const selectTypename = Effect.fn(function* (resolve: (typename: string) => Metadata | undefined) {
-  const schemas = yield* Database.runSchemaQuery({
-    location: ['database', 'runtime'],
-    includeSystem: false,
-  }).pipe(
-    Effect.map((schemas) => schemas.filter((schema) => getTypeAnnotation(schema)?.kind !== EntityKind.Relation)),
-    Effect.map((schemas) => schemas.filter((schema) => !!resolve(Type.getTypename(schema)))),
-  );
-
-  const choices = schemas.map((schema) => ({
+const selectTypename = Effect.fn(function* (
+  resolve: (typename: string) => SpaceCapabilities.CreateObjectEntry | undefined,
+) {
+  const { db } = yield* Database.Service;
+  const allTypes = yield* Database.runQuery(Query.select(Filter.type(Type.Type)).from(Scope.space(), Scope.registry()));
+  const types = allTypes
+    .filter((schema) => !HiddenAnnotation.get(Type.getSchema(schema)).pipe(Option.getOrElse(() => false)))
+    .filter((schema) => getTypeAnnotation(Type.getSchema(schema))?.kind !== EntityKind.Relation)
+    .filter((schema) => !!resolve(Type.getTypename(schema)));
+
+  const choices = types.map((schema) => ({
     // TODO(wittjosiah): Translations.
     title: Type.getTypename(schema),
     value: Type.getTypename(schema),

package/src/{cli/commands → commands}/database/query/query.test.ts

@@ -9,7 +9,7 @@ import * as Option from 'effect/Option';
 import { spaceLayer } from '@dxos/cli-util';
 import { TestConsole, TestLayer } from '@dxos/cli-util/testing';
 import { ClientService } from '@dxos/client';
-import { Obj } from '@dxos/echo';
+import { Obj, Type } from '@dxos/echo';
 import { runAndForwardErrors } from '@dxos/effect';
 import { Task } from '@dxos/types';
 
@@ -23,7 +23,7 @@ describe('spaces query', () => {
       yield* Effect.tryPromise(() => client.halo.createIdentity());
       const space = yield* Effect.tryPromise(() => client.spaces.create());
       yield* Effect.tryPromise(() => space.waitUntilReady());
-      yield* handler({ typename: Option.some(Task.Task.typename) }).pipe(
+      yield* handler({ typename: Option.some(Type.getTypename(Task.Task)) }).pipe(
         Effect.provide(spaceLayer(Option.some(space.id))),
       );
       const logger = yield* TestConsole.TestConsole;
@@ -41,7 +41,7 @@ describe('spaces query', () => {
       yield* Effect.tryPromise(() => space.waitUntilReady());
       space.db.add(Obj.make(Task.Task, { title: 'Task 1' }));
       space.db.add(Obj.make(Task.Task, { title: 'Task 2' }));
-      yield* handler({ typename: Option.some(Task.Task.typename) }).pipe(
+      yield* handler({ typename: Option.some(Type.getTypename(Task.Task)) }).pipe(
         Effect.provide(spaceLayer(Option.some(space.id))),
       );
       const logger = yield* TestConsole.TestConsole;

package/src/{cli/commands → commands}/database/stats.ts

@@ -11,8 +11,7 @@ import * as Function from 'effect/Function';
 import * as Record from 'effect/Record';
 
 import { CommandConfig, Common, printList, spaceLayer } from '@dxos/cli-util';
-import { Obj } from '@dxos/echo';
-import { Database, Filter, Query } from '@dxos/echo';
+import { Database, Filter, Obj, Query } from '@dxos/echo';
 
 import { printStats } from './util';
 

package/src/{cli/commands → commands}/database/util.ts

@@ -11,7 +11,7 @@ import { Entity } from '@dxos/echo';
 export const printObject = (obj: Entity.Unknown) => {
   const typename = Entity.getTypename(obj) ?? '<unknown>';
 
-  // TODO(wittjosiah): Obj.getSchema and thus Obj.getLabel are coming back undefined for some reason.
+  // TODO(wittjosiah): Obj.getType and thus Obj.getLabel are coming back undefined for some reason.
   return FormBuilder.make({ title: Entity.getLabel(obj) ?? typename }).pipe(
     FormBuilder.set('id', obj.id),
     FormBuilder.set('typename', typename),

package/src/{cli/commands → commands}/queue/query.ts

@@ -6,39 +6,45 @@ import * as Command from '@effect/cli/Command';
 import * as Options from '@effect/cli/Options';
 import * as Console from 'effect/Console';
 import * as Effect from 'effect/Effect';
-import * as Schema from 'effect/Schema';
 
 import { CommandConfig, printList } from '@dxos/cli-util';
 import { ClientService } from '@dxos/client';
-import { type Queue } from '@dxos/client/echo';
-import { DXN } from '@dxos/keys';
+import { Entity } from '@dxos/echo';
+import { EID } from '@dxos/keys';
 
 import { printQueueObject } from './util';
 
-// TODO(dmaretskyi): Extract
-const DXNSchema = Schema.String.pipe(
-  Schema.transform(Schema.instanceOf(DXN), {
-    decode: (value: string) => DXN.parse(value),
-    encode: (value: DXN) => value.toString(),
-  }),
-);
-
 export const query = Command.make(
   'query',
   {
-    dxn: Options.text('dxn').pipe(Options.withDescription('DXN of the queue.'), Options.withSchema(DXNSchema)),
+    dxn: Options.text('dxn').pipe(Options.withDescription('DXN of the queue.')),
   },
   Effect.fnUntraced(function* ({ dxn }) {
     const { json } = yield* CommandConfig;
     const client = yield* ClientService;
-    const queue = (yield* Effect.promise(() => client.graph.createRefResolver({}).resolve(dxn))) as Queue<any>;
+    const echoUri = EID.tryParse(dxn);
+    if (!echoUri) {
+      yield* Console.error(`Not a valid feed identifier: ${dxn}`);
+      return;
+    }
+    const spaceId = EID.getSpaceId(echoUri);
+    if (!spaceId) {
+      yield* Console.error(`Could not determine space from: ${dxn}`);
+      return;
+    }
+    const space = client.spaces.get(spaceId);
+    if (!space) {
+      yield* Console.error(`Space not found: ${spaceId}`);
+      return;
+    }
+    const queue = space.queues.get(echoUri);
     const objects = yield* Effect.promise(() => queue.queryObjects());
 
     if (json) {
       yield* Console.log(JSON.stringify(objects, null, 2));
     } else {
       // TODO(wittjosiah): Interactive table of results.
-      const formatted = objects.map(printQueueObject);
+      const formatted = (objects as Entity.Any[]).map(printQueueObject);
       yield* Console.log(printList(formatted));
     }
   }),

package/src/{cli/commands → commands}/space/create/create.ts

@@ -22,7 +22,7 @@ export const handler = Effect.fn(function* ({ name }: { name: Option.Option<stri
   yield* Effect.tryPromise(() => space.waitUntilReady());
 
   if (Option.isSome(name)) {
-    Obj.change(space.properties, (obj) => {
+    Obj.update(space.properties, (obj) => {
       obj.name = Option.getOrUndefined(name);
     });
   }

package/src/{cli/commands → commands}/space/list/list.test.ts

@@ -32,6 +32,6 @@ describe('spaces list', () => {
       const logs = logger.logs;
       expect(logs).toHaveLength(1);
       const formattedSpaces = TestConsole.parseJson(logs[0]);
-      expect(formattedSpaces).toHaveLength(2);
+      expect(formattedSpaces).toHaveLength(1);
     }).pipe(Effect.provide(TestLayer), Effect.scoped, runAndForwardErrors));
 });

package/src/{cli/commands → commands}/space/schema/list/list.ts

@@ -9,8 +9,7 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { CommandConfig, Common, getSpace, printList, spaceIdWithDefault } from '@dxos/cli-util';
-import { ClientService } from '@dxos/client';
-import { type Key } from '@dxos/echo';
+import { type Key, Type } from '@dxos/echo';
 import { getTypeAnnotation } from '@dxos/echo/internal';
 
 import { createTypenameFilter, mapSchemas, printSchemas } from './util';
@@ -23,28 +22,22 @@ export const handler = Effect.fn(function* ({
   typename: Option.Option<string>;
 }) {
   const { json } = yield* CommandConfig;
-  const client = yield* ClientService;
 
   const resolvedSpaceId = yield* spaceIdWithDefault(spaceId as Option.Option<Key.SpaceId>);
   const space = yield* getSpace(resolvedSpaceId);
 
-  const echoSchema = yield* Effect.tryPromise(() => space.db.schemaRegistry.query().run());
-  const runtimeSchema = space.internal.db.graph.schemaRegistry.schemas;
+  const types = space.db.graph.registry.list().filter(Type.isType);
 
-  const schemas = [
-    ...echoSchema.map((schema) => ({
-      id: schema.id,
-      typename: schema.typename,
-      version: schema.version,
-    })),
-    ...runtimeSchema.map((schema) => {
-      const schemaAnnotation = getTypeAnnotation(schema)!;
+  const schemas = types
+    .map((schema) => {
+      const schemaAnnotation = getTypeAnnotation(Type.getSchema(schema));
       return {
-        typename: schemaAnnotation.typename,
-        version: schemaAnnotation.version,
+        id: Type.getURI(schema).toString(),
+        typename: schemaAnnotation?.typename ?? Type.getTypename(schema) ?? '',
+        version: schemaAnnotation?.version ?? Type.getVersion(schema) ?? '',
       };
-    }),
-  ].filter(createTypenameFilter(Option.getOrUndefined(typename)));
+    })
+    .filter(createTypenameFilter(Option.getOrUndefined(typename)));
 
   if (json) {
     yield* Console.log(JSON.stringify(mapSchemas(schemas), null, 2));

package/src/components/AwaitingObject/AwaitingObject.tsx

@@ -7,9 +7,9 @@ import React, { useCallback, useEffect, useState } from '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 { Filter, Obj } from '@dxos/echo';
 import { useClient } from '@dxos/react-client';
-import { Filter, useQuery } from '@dxos/react-client/echo';
+import { useQuery } from '@dxos/react-client/echo';
 import { Button, Icon, Toast, useTranslation } from '@dxos/react-ui';
 import { osTranslations } from '@dxos/ui-theme';
 
@@ -40,7 +40,7 @@ export const AwaitingObject = ({ id }: { id: string }) => {
   }, [id]);
 
   useEffect(() => {
-    if (objects.findIndex((object) => Obj.getDXN(object).toString() === id) > -1) {
+    if (objects.findIndex((object) => Obj.getURI(object) === id) > -1) {
       setFound(true);
       if (layout.active.includes(id)) {
         setOpen(false);
@@ -58,37 +58,36 @@ export const AwaitingObject = ({ id }: { id: string }) => {
     void handleClose();
   }, [id, handleClose, invokePromise]);
 
+  // TODO(burdon): Why are we not using LayoutOperation.AddToast?
   return (
     <Toast.Root open={open} duration={TOAST_TIMEOUT} onOpenChange={setOpen}>
-      <Toast.Body>
-        <Toast.Title classNames='flex items-center gap-2'>
-          {found ? (
-            <>
-              <Icon icon='ph--check-circle--regular' />
-              <span>{t('found-object.label')}</span>
-            </>
-          ) : waiting ? (
-            <>
-              <Icon icon='ph--circle-notch--regular' classNames='animate-spin' />
-              <span>{t('waiting-for-object.label')}</span>
-            </>
-          ) : (
-            <>
-              <Icon icon='ph--circle-dashed--regular' />
-              <span>{t('object-not-found.label')}</span>
-            </>
-          )}
-        </Toast.Title>
-        <Toast.Description>
-          {t(
-            found
-              ? 'found-object.description'
-              : waiting
-                ? 'waiting-for-object.description'
-                : 'object-not-found.description',
-          )}
-        </Toast.Description>
-      </Toast.Body>
+      <Toast.Title classNames='flex items-center gap-2'>
+        {found ? (
+          <>
+            <Icon icon='ph--check-circle--regular' />
+            <span>{t('found-object.label')}</span>
+          </>
+        ) : waiting ? (
+          <>
+            <Icon icon='ph--circle-notch--regular' classNames='animate-spin' />
+            <span>{t('waiting-for-object.label')}</span>
+          </>
+        ) : (
+          <>
+            <Icon icon='ph--placeholder--regular' />
+            <span>{t('object-not-found.label')}</span>
+          </>
+        )}
+      </Toast.Title>
+      <Toast.Description>
+        {t(
+          found
+            ? 'found-object.description'
+            : waiting
+              ? 'waiting-for-object.description'
+              : 'object-not-found.description',
+        )}
+      </Toast.Description>
       <Toast.Actions>
         {found ? (
           <>

package/src/components/{CreateDialog → CreateObjectPanel}/CreateObjectPanel.tsx

@@ -2,21 +2,22 @@
 // Copyright 2024 DXOS.org
 //
 
-import type * as Schema from 'effect/Schema';
 import React, { useCallback, useMemo } from 'react';
 
-import { type Database, Obj } from '@dxos/echo';
-import { type Collection } from '@dxos/echo';
+import { type Collection, type Database, Obj } 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 { type SpaceId } from '@dxos/keys';
+import { type Space } from '@dxos/react-client/echo';
+import { Icon, toLocalizedString, useDefaultValue, useTranslation } from '@dxos/react-ui';
 import { Form, omitId } from '@dxos/react-ui-form';
+import { Picker } from '@dxos/react-ui-list';
 import { SearchList, useSearchListResults } from '@dxos/react-ui-search';
+import { getStyles } from '@dxos/ui-theme';
 import { type MaybePromise } from '@dxos/util';
 
 import { useInputSurfaceLookup } from '#hooks';
 import { meta } from '#meta';
-import { type CreateObject } from '#types';
+import { type SpaceCapabilities } from '#types';
 
 import { getSpaceDisplayName } from '../../util';
 
@@ -25,13 +26,11 @@ export type CreateObjectOption = {
   id: string;
   label: string;
   icon?: string;
+  iconHue?: string;
+  plugin?: string;
 };
 
-export type Metadata = {
-  createObject: CreateObject;
-  inputSchema?: Schema.Schema.AnyNoContext;
-  icon?: string;
-};
+export type Metadata = SpaceCapabilities.CreateObjectEntry;
 
 export type CreateObjectPanelProps = {
   options: CreateObjectOption[];
@@ -76,7 +75,7 @@ export const CreateObjectPanel = ({
   const handleSelectOption = useCallback(
     async (id: string) => {
       const metadata = resolve?.(id);
-      if (metadata && !metadata.inputSchema) {
+      if (metadata && !metadata.inputSchema && !metadata.customPanel) {
         await onCreateObject?.({ metadata });
       } else {
         onTypenameChange?.(id);
@@ -91,34 +90,47 @@ export const CreateObjectPanel = ({
   );
   const inputSurfaceLookup = useInputSurfaceLookup({ target });
 
-  // TODO(wittjosiah): These inputs should be rolled into a `Form` once it supports the necessary variants.
+  // TODO(wittjosiah): Extends and use react-ui-form to handle variants.
+
   if (!metadata) {
     return <SelectType options={sortedOptions} onChange={handleSelectOption} />;
   }
 
-  // TODO(burdon): Remove.
   if (!target) {
     return <SelectSpace spaces={spaces} defaultSpaceId={defaultSpaceId} onChange={onTargetChange} />;
   }
 
+  if (metadata.customPanel) {
+    const CustomPanel = metadata.customPanel;
+    return (
+      <CustomPanel
+        target={target}
+        initialFormValues={initialFormValues}
+        onCreateObject={(data) => handleCreateObject(data)}
+      />
+    );
+  }
+
   if (metadata.inputSchema) {
     return (
-      <Form.Root
-        autoFocus
-        schema={inputSchema}
-        defaultValues={initialFormValues}
-        fieldProvider={inputSurfaceLookup}
-        db={Obj.isObject(target) ? Obj.getDatabase(target) : target}
-        onSave={handleCreateObject}
-        testId='create-object-form'
-      >
-        <Form.Viewport>
-          <Form.Content>
-            <Form.FieldSet />
-            <Form.Submit />
-          </Form.Content>
-        </Form.Viewport>
-      </Form.Root>
+      <div className='[.dx-column-root_&]:col-span-full [.dx-column-root_&]:grid [.dx-column-root_&]:grid-cols-subgrid'>
+        <Form.Root
+          autoFocus
+          schema={inputSchema}
+          defaultValues={initialFormValues}
+          fieldProvider={inputSurfaceLookup}
+          db={Obj.isObject(target) ? Obj.getDatabase(target) : target}
+          onSave={handleCreateObject}
+          testId='create-object-form'
+        >
+          <Form.Viewport>
+            <Form.Content>
+              <Form.FieldSet />
+              <Form.Submit />
+            </Form.Content>
+          </Form.Viewport>
+        </Form.Root>
+      </div>
     );
   }
 
@@ -149,13 +161,26 @@ const SelectType = ({ options, onChange }: SelectTypeProps) => {
       />
       <SearchList.Viewport>
         {results.map((option) => (
-          <SearchList.Item
+          <Picker.Item
             key={option.id}
             value={option.id}
-            label={option.label}
-            icon={option.icon ?? 'ph--placeholder--regular'}
             onSelect={() => onChange(option.id)}
-          />
+            classNames='flex gap-3 items-center px-2 py-2 rounded-xs'
+          >
+            <Icon
+              icon={option.icon ?? 'ph--circle-dashed--regular'}
+              size={8}
+              classNames={getIconHueStyles(option.iconHue)}
+            />
+            <div className='flex flex-col min-w-0 grow gap-0.5'>
+              <span className='truncate'>{option.label}</span>
+              {option.plugin && (
+                <span className='truncate text-description text-xs'>
+                  {t('plugin-subtitle.label', { plugin: option.plugin })}
+                </span>
+              )}
+            </div>
+          </Picker.Item>
         ))}
       </SearchList.Viewport>
     </SearchList.Root>
@@ -223,3 +248,8 @@ const SelectSpace = ({ spaces, defaultSpaceId, onChange }: SelectSpaceProps) =>
     </SearchList.Root>
   );
 };
+
+const getIconHueStyles = (iconHue?: string): string | undefined => {
+  const styles = iconHue ? getStyles(iconHue) : undefined;
+  return styles?.text;
+};

package/src/components/SpaceSettings/SpaceSettings.stories.tsx

@@ -6,7 +6,8 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
+
 import { SpaceSettings } from './SpaceSettings';
 
 const meta = {

package/src/components/SyncStatus/save-tracker.ts

@@ -4,8 +4,9 @@
 
 import { type CleanupFn } from '@dxos/async';
 import { type Client } from '@dxos/client';
-import { type Space, type SpaceId } from '@dxos/client/echo';
+import { type Space } from '@dxos/client/echo';
 import { Context } from '@dxos/context';
+import { type SpaceId } from '@dxos/keys';
 
 export const createClientSaveTracker = (client: Client, cb: (state: 'saved' | 'saving') => void) => {
   const CleanupFns: Record<SpaceId, CleanupFn> = {};

package/src/components/index.ts

@@ -5,7 +5,7 @@
 import { type ComponentType, lazy } from 'react';
 
 export * from './AwaitingObject';
-export * from './CreateDialog';
+export * from './CreateObjectPanel';
 export * from './ForeignKeys';
 export * from './SyncStatus';
 

package/src/constants.ts

@@ -2,10 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
+import { DXN } from '@dxos/keys';
+
 import { meta } from '#meta';
 
-export const CREATE_OBJECT_DIALOG = `${meta.id}.CreateObjectDialog`;
-export const CREATE_SPACE_DIALOG = `${meta.id}.CreateSpaceDialog`;
-export const JOIN_DIALOG = `${meta.id}.JoinDialog`;
-export const OBJECT_RENAME_POPOVER = `${meta.id}.ObjectRenamePopover`;
-export const SPACE_RENAME_POPOVER = `${meta.id}.SpaceRenamePopover`;
+export const CREATE_OBJECT_DIALOG = DXN.make(`${meta.id}.createObjectDialog`);
+export const CREATE_SPACE_DIALOG = DXN.make(`${meta.id}.createSpaceDialog`);
+export const IMPORT_SPACE_DIALOG = DXN.make(`${meta.id}.importSpaceDialog`);
+export const JOIN_DIALOG = DXN.make(`${meta.id}.joinDialog`);
+export const ENTITY_RENAME_POPOVER = DXN.make(`${meta.id}.entityRenamePopover`);
+export const SPACE_RENAME_POPOVER = DXN.make(`${meta.id}.spaceRenamePopover`);