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

package/src/capabilities/react-surface/react-surface.tsx

@@ -10,15 +10,14 @@ import React, { useCallback } from 'react';
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { Surface, useAtomCapability, useSettingsState } from '@dxos/app-framework/ui';
 import { AppCapabilities } from '@dxos/app-toolkit';
-import { useLayout } from '@dxos/app-toolkit/ui';
 import { Database, Obj, type Ref } from '@dxos/echo';
 import { Collection, type View } from '@dxos/echo';
 import { findAnnotation } from '@dxos/effect';
-import { type Space, SpaceState, getSpace, isSpace, parseId, useSpace } from '@dxos/react-client/echo';
+import { type Space, SpaceState, getSpace, isSpace, useSpace } from '@dxos/react-client/echo';
 import { Input } from '@dxos/react-ui';
 import { type FormFieldComponentProps, SelectField } from '@dxos/react-ui-form';
 import { HuePicker, IconPicker } from '@dxos/react-ui-pickers';
-import { ManagedCollection, ViewAnnotation } from '@dxos/schema';
+import { ViewAnnotation } from '@dxos/schema';
 import { type JoinPanelProps } from '@dxos/shell/react';
 
 import {
@@ -51,7 +50,7 @@ import {
   SyncStatus,
   ViewEditor,
 } from '../../containers';
-import { useTypeOptions } from '../../hooks';
+import { useActiveSpace, useTypeOptions } from '../../hooks';
 import { meta } from '../../meta';
 import {
   HueAnnotationId,
@@ -70,40 +69,22 @@ export default Capability.makeModule(
   Effect.fnUntraced(function* ({ createInvitationUrl }: ReactSurfaceOptions) {
     return Capability.contributes(Capabilities.ReactSurface, [
       Surface.create({
-        id: `${meta.id}/article`,
-        role: 'article',
-        filter: (data): data is { subject: Space } =>
-          // TODO(wittjosiah): Need to avoid shotgun parsing space state everywhere.
-          isSpace(data.subject) && data.subject.state.get() === SpaceState.SPACE_READY,
-        component: ({ data, role, ...rest }) => (
-          <Surface.Surface
-            data={{
-              id: data.subject.id,
-              subject: data.subject.properties[Collection.Collection.typename]?.target,
-            }}
-            role={role}
-            {...rest}
-          />
-        ),
-      }),
-      Surface.create({
-        id: `${meta.id}/collection-fallback`,
+        id: `${meta.id}.collection-fallback`,
         role: 'article',
         position: 'fallback',
-        filter: (data): data is { subject: Collection.Collection | ManagedCollection.ManagedCollection } =>
-          Obj.instanceOf(Collection.Collection, data.subject) ||
-          Obj.instanceOf(ManagedCollection.ManagedCollection, data.subject),
+        filter: (data): data is { subject: Collection.Collection } =>
+          Obj.instanceOf(Collection.Collection, data.subject),
         component: ({ data }) => <CollectionArticle subject={data.subject} />,
       }),
       Surface.create({
-        id: `${meta.id}/record-article`,
+        id: `${meta.id}.record-article`,
         role: 'article',
         position: 'fallback',
         filter: (data): data is { subject: Obj.Unknown } => Obj.isObject(data.subject),
         component: ({ data }) => <RecordArticle subject={data.subject} />,
       }),
       Surface.create({
-        id: `${meta.id}/plugin-settings`,
+        id: `${meta.id}.plugin-settings`,
         role: 'article',
         filter: (data): data is { subject: AppCapabilities.Settings } =>
           AppCapabilities.isSettings(data.subject) && data.subject.prefix === meta.id,
@@ -113,21 +94,19 @@ export default Capability.makeModule(
         },
       }),
       Surface.create({
-        id: `${meta.id}/companion/object-settings`,
+        id: `${meta.id}.companion.object-settings`,
         role: 'article',
         filter: (data): data is { companionTo: Obj.Unknown } =>
           Obj.isObject(data.companionTo) && data.subject === 'settings',
         component: ({ ref, data, role }) => <ObjectDetails subject={data.companionTo} role={role} ref={ref} />,
       }),
       Surface.create({
-        id: `${meta.id}/space-settings-properties`,
+        id: `${meta.id}.space-settings-properties`,
         role: 'article',
-        filter: (data): data is { subject: string } => data.subject === `${meta.id}/properties`,
+        filter: (data): data is { subject: string } => data.subject === `${meta.id}.general`,
         component: ({ ref }) => {
-          const layout = useLayout();
-          const { spaceId } = parseId(layout.workspace);
-          const space = useSpace(spaceId);
-          if (!space || !spaceId) {
+          const space = useActiveSpace();
+          if (!space) {
             return null;
           }
 
@@ -135,15 +114,13 @@ export default Capability.makeModule(
         },
       }),
       Surface.create({
-        id: `${meta.id}/space-settings-members`,
+        id: `${meta.id}.space-settings-members`,
         role: 'article',
         position: 'hoist',
-        filter: (data): data is { subject: string } => data.subject === `${meta.id}/members`,
+        filter: (data): data is { subject: string } => data.subject === `${meta.id}.members`,
         component: () => {
-          const layout = useLayout();
-          const { spaceId } = parseId(layout.workspace);
-          const space = useSpace(spaceId);
-          if (!space || !spaceId) {
+          const space = useActiveSpace();
+          if (!space) {
             return null;
           }
 
@@ -151,14 +128,12 @@ export default Capability.makeModule(
         },
       }),
       Surface.create({
-        id: `${meta.id}/space-settings-schema`,
+        id: `${meta.id}.space-settings-schema`,
         role: 'article',
-        filter: (data): data is { subject: string } => data.subject === `${meta.id}/schema`,
+        filter: (data): data is { subject: string } => data.subject === `${meta.id}.schema`,
         component: () => {
-          const layout = useLayout();
-          const { spaceId } = parseId(layout.workspace);
-          const space = useSpace(spaceId);
-          if (!space || !spaceId) {
+          const space = useActiveSpace();
+          if (!space) {
             return null;
           }
 
@@ -166,7 +141,7 @@ export default Capability.makeModule(
         },
       }),
       Surface.create({
-        id: `${meta.id}/selected-objects`,
+        id: `${meta.id}.selected-objects`,
         role: 'article',
         filter: (
           data,
@@ -211,7 +186,7 @@ export default Capability.makeModule(
         component: ({ data }) => <CreateObjectDialog {...data.props} />,
       }),
       Surface.create({
-        id: `${meta.id}/create-initial-space-form-[hue]`,
+        id: `${meta.id}.create-initial-space-form-[hue]`,
         role: 'form-input',
         filter: (data): data is { prop: string; schema: Schema.Schema<any> } => {
           const annotation = findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, HueAnnotationId);
@@ -230,7 +205,7 @@ export default Capability.makeModule(
         },
       }),
       Surface.create({
-        id: `${meta.id}/create-initial-space-form-[icon]`,
+        id: `${meta.id}.create-initial-space-form-[icon]`,
         role: 'form-input',
         filter: (data): data is { prop: string; schema: Schema.Schema<any> } => {
           const annotation = findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, IconAnnotationId);
@@ -254,7 +229,7 @@ export default Capability.makeModule(
         },
       }),
       Surface.create({
-        id: `${meta.id}/typename-form-input`,
+        id: `${meta.id}.typename-form-input`,
         role: 'form-input',
         filter: (
           data,
@@ -281,7 +256,7 @@ export default Capability.makeModule(
         },
       }),
       Surface.create({
-        id: `${meta.id}/object-settings`,
+        id: `${meta.id}.object-settings`,
         role: 'object-settings',
         filter: (data): data is { subject: { view: Ref.Ref<View.View> } } => {
           if (!Obj.isObject(data.subject)) {
@@ -317,13 +292,13 @@ export default Capability.makeModule(
         component: ({ data }) => <ObjectRenamePopover object={data.props} />,
       }),
       Surface.create({
-        id: `${meta.id}/menu-footer`,
+        id: `${meta.id}.menu-footer`,
         role: 'menu-footer',
         filter: (data): data is { subject: Obj.Unknown } => Obj.isObject(data.subject),
         component: ({ data }) => <MenuFooter object={data.subject} />,
       }),
       Surface.create({
-        id: `${meta.id}/navtree-presence`,
+        id: `${meta.id}.navtree-presence`,
         role: 'navtree-item-end',
         filter: (data): data is { id: string; subject: Obj.Unknown; open?: boolean } =>
           typeof data.id === 'string' && Obj.isObject(data.subject),
@@ -334,7 +309,7 @@ export default Capability.makeModule(
       }),
       // TODO(wittjosiah): Attention glyph for non-echo items should be handled elsewhere.
       Surface.create({
-        id: `${meta.id}/navtree-presence-fallback`,
+        id: `${meta.id}.navtree-presence-fallback`,
         role: 'navtree-item-end',
         position: 'fallback',
         filter: (data): data is { id: string; open?: boolean } => typeof data.id === 'string',
@@ -342,13 +317,13 @@ export default Capability.makeModule(
       }),
       // TODO(wittjosiah): Broken?
       Surface.create({
-        id: `${meta.id}/navtree-sync-status`,
+        id: `${meta.id}.navtree-sync-status`,
         role: 'navtree-item-end',
         filter: (data): data is { subject: Space; open?: boolean } => isSpace(data.subject),
         component: ({ data }) => <InlineSyncStatus space={data.subject} open={data.open} />,
       }),
       Surface.create({
-        id: `${meta.id}/navbar-presence`,
+        id: `${meta.id}.navbar-presence`,
         role: 'navbar-end',
         position: 'hoist',
         filter: (data): data is { subject: Space | Obj.Unknown } => isSpace(data.subject) || Obj.isObject(data.subject),
@@ -364,14 +339,14 @@ export default Capability.makeModule(
         },
       }),
       Surface.create({
-        id: `${meta.id}/collection-section`,
+        id: `${meta.id}.collection-section`,
         role: 'section',
         filter: (data): data is { subject: Collection.Collection } =>
           Obj.instanceOf(Collection.Collection, data.subject),
         component: ({ data }) => <CollectionSection subject={data.subject} />,
       }),
       Surface.create({
-        id: `${meta.id}/status`,
+        id: `${meta.id}.status`,
         role: 'status',
         component: () => <SyncStatus />,
       }),

package/src/capabilities/repair/repair.ts

@@ -5,9 +5,8 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { Collection, Obj, Ref, Type } from '@dxos/echo';
+import { Collection, Obj, Ref } from '@dxos/echo';
 import { type Space } from '@dxos/react-client/echo';
-import { ManagedCollection } from '@dxos/schema';
 
 import { SpaceCapabilities } from '../../types';
 
@@ -15,7 +14,6 @@ export default Capability.makeModule(() =>
   Effect.succeed(
     Capability.contributes(SpaceCapabilities.Repair, async ({ space }: { space: Space }) => {
       await removeQueryCollections(space);
-      await ensureSystemCollection(space);
     }),
   ),
 );
@@ -30,42 +28,15 @@ const removeQueryCollections = async (space: Space) => {
   }
 
   const objects = await Promise.all(rootCollection.objects.map((ref) => ref.load()));
-  const queryCollections = objects.filter((object) => Obj.getTypename(object) === 'dxos.org/type/QueryCollection');
+  const queryCollections = objects.filter((object) => Obj.getTypename(object) === 'org.dxos.type.query-collection');
   if (queryCollections.length === 0) {
     return;
   }
 
   Obj.change(rootCollection, (c) => {
     c.objects = objects
-      .filter((object) => Obj.getTypename(object) !== 'dxos.org/type/QueryCollection')
+      .filter((object) => Obj.getTypename(object) !== 'org.dxos.type.query-collection')
       .map((object) => Ref.make(object));
   });
   queryCollections.forEach((object) => space.db.remove(object));
 };
-
-/**
- * Ensure the root collection has a system collection for StoredSchema.
- */
-const ensureSystemCollection = async (space: Space) => {
-  const rootCollection: Collection.Collection = await space.properties[Collection.Collection.typename]?.load();
-  if (!rootCollection) {
-    return;
-  }
-
-  const objects = await Promise.all(rootCollection.objects.map((ref) => ref.load()));
-  const records = objects.find(
-    (object) =>
-      Obj.instanceOf(ManagedCollection.ManagedCollection, object) &&
-      object.key === Type.getTypename(Type.PersistentType),
-  );
-  if (records) {
-    return;
-  }
-
-  const recordsCollectionRef = Ref.make(
-    ManagedCollection.makeManagedCollection({ key: Type.getTypename(Type.PersistentType) }),
-  );
-  Obj.change(rootCollection, (c) => {
-    c.objects.push(recordsCollectionRef);
-  });
-};

package/src/capabilities/spaces-ready/spaces-ready.ts

@@ -6,7 +6,7 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
+import { AppCapabilities, LayoutOperation, getSpacePath } from '@dxos/app-toolkit';
 import { SubscriptionList } from '@dxos/async';
 import { Filter, Obj } from '@dxos/echo';
 import { log } from '@dxos/log';
@@ -48,7 +48,7 @@ export default Capability.makeModule(
     // Check if deck state indicates we should switch to default space.
     const layout = registry.get(layoutAtom);
     if (layout.workspace === 'default') {
-      yield* invoke(LayoutOperation.SwitchWorkspace, { subject: defaultSpace.id });
+      yield* invoke(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(defaultSpace.id) });
     }
 
     // Initialize space sharing lock in default space.

package/src/capabilities/state/state.ts

@@ -25,7 +25,7 @@ export default Capability.makeModule(
 
     // Persisted state using KVS store.
     const stateAtom = createKvsStore({
-      key: `${meta.id}/state`,
+      key: `${meta.id}.state`,
       schema: SpaceCapabilities.StateSchema,
       defaultValue: () => ({ ...defaultSpaceState }),
     });
@@ -42,7 +42,9 @@ export default Capability.makeModule(
     const manager = yield* Capability.get(Capabilities.PluginManager);
     // Update navigableCollections based on plugin state.
     const updateNavigableCollections = () => {
-      const enabled = manager.getEnabled().includes('dxos.org/plugin/stack');
+      const enabled =
+        manager.getEnabled().includes('org.dxos.plugin.stack') ||
+        manager.getEnabled().includes('org.dxos.plugin.simple-layout');
       const current = registry.get(ephemeralAtom);
       if (enabled !== current.navigableCollections) {
         registry.update(ephemeralAtom, (c) => ({ ...c, navigableCollections: enabled }));

package/src/cli/commands/database/add.ts

@@ -28,7 +28,6 @@ import { printObject } from './util';
 export type Metadata = {
   createObject: CreateObject;
   inputSchema?: Schema.Schema.AnyNoContext;
-  addToCollectionOnCreate?: boolean;
 };
 
 export const add = Command.make(

package/src/cli/commands/space/close/close.ts

@@ -19,7 +19,7 @@ export const handler = ({ spaceId }: { spaceId: Key.SpaceId }) =>
     const space = yield* getSpace(spaceId);
 
     // Flush and sync before closing
-    yield* Effect.tryPromise(() => space.db.flush({ indexes: true }));
+    yield* Effect.tryPromise(() => space.db.flush());
     yield* waitForSync(space);
 
     yield* Effect.tryPromise(() => space.close());

package/src/cli/commands/space/create/create.ts

@@ -48,7 +48,7 @@ export const handler = Effect.fn(function* ({ name }: { name: Option.Option<stri
   }
 
   // Flush and sync before completion
-  yield* Effect.tryPromise(() => space.db.flush({ indexes: true }));
+  yield* Effect.tryPromise(() => space.db.flush());
   yield* waitForSync(space);
 });
 

package/src/cli/commands/space/join/join.ts

@@ -88,7 +88,7 @@ export const handler = Effect.fn(function* ({
   }
 
   // Flush and sync after joining
-  yield* Effect.tryPromise(() => space.db.flush({ indexes: true }));
+  yield* Effect.tryPromise(() => space.db.flush());
   yield* waitForSync(space);
 
   if (json) {

package/src/cli/commands/space/open/open.ts

@@ -20,7 +20,7 @@ export const handler = ({ spaceId }: { spaceId: Key.SpaceId }) =>
     yield* Effect.tryPromise(() => space.open());
 
     // Flush and sync after opening
-    yield* Effect.tryPromise(() => space.db.flush({ indexes: true }));
+    yield* Effect.tryPromise(() => space.db.flush());
     yield* waitForSync(space);
 
     if (json) {

package/src/cli/plugin.ts

@@ -41,7 +41,6 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
       id: Collection.Collection.typename,
       metadata: {
         createObject: ((props) => Effect.sync(() => Collection.make(props))) satisfies CreateObject,
-        addToCollectionOnCreate: true,
       },
     },
   }),

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

@@ -13,8 +13,8 @@ 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;

package/src/components/AwaitingObject/index.ts

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

package/src/components/CreateDialog/CreateObjectPanel.tsx

@@ -29,7 +29,6 @@ export type CreateObjectOption = {
 export type Metadata = {
   createObject: CreateObject;
   inputSchema?: Schema.Schema.AnyNoContext;
-  addToCollectionOnCreate?: boolean;
   icon?: string;
 };
 
@@ -85,6 +84,10 @@ export const CreateObjectPanel = ({
     [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.
@@ -101,7 +104,7 @@ export const CreateObjectPanel = ({
       <Form.Root
         testId='create-object-form'
         autoFocus
-        schema={omitId(metadata.inputSchema)}
+        schema={inputSchema}
         defaultValues={initialFormValues}
         db={Obj.isObject(target) ? Obj.getDatabase(target) : target}
         fieldProvider={inputSurfaceLookup}

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

@@ -7,8 +7,8 @@ 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 { Loading, withTheme } from '@dxos/react-ui/testing';
+
 import { Pipeline } from '@dxos/types';
 
 import { translations } from '../../translations';
@@ -27,7 +27,7 @@ const DefaultStory = () => {
   }, [space, object]);
 
   if (!object) {
-    return null;
+    return <Loading data={{ space: !!space, object: !!object }} />;
   }
 
   return <BaseObjectSettings object={object} classNames='w-[20rem]' />;
@@ -36,7 +36,7 @@ const DefaultStory = () => {
 const meta = {
   title: 'plugins/plugin-space/components/BaseObjectSettings',
   component: BaseObjectSettings as any,
-  render: render(DefaultStory),
+  render: DefaultStory,
   decorators: [
     withTheme(),
     withClientProvider({

package/src/components/ObjectDetails/BaseObjectSettings.tsx

@@ -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]);
@@ -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)}
-      defaultValues={values}
+      schema={formSchema}
+      defaultValues={values as any}
       createOptionIcon='ph--plus--regular'
       createOptionLabel={['add tag label', { ns: pluginMeta.id }]}
       createInitialValuePath='label'

package/src/components/ObjectForm/ObjectForm.tsx

@@ -23,9 +23,11 @@ export const ObjectForm = ({ object, schema }: ObjectFormProps) => {
 
   const formSchema = useMemo(
     () =>
-      Schema.Struct({
-        tags: Schema.Array(Ref.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],
   );
 
@@ -78,7 +80,7 @@ export const ObjectForm = ({ object, schema }: ObjectFormProps) => {
 
   return (
     <Form.Root
-      schema={omitId(formSchema)}
+      schema={formSchema}
       defaultValues={values}
       createOptionIcon='ph--plus--regular'
       createOptionLabel={['add tag label', { ns: pluginMeta.id }]}

package/src/constants.ts

@@ -4,8 +4,8 @@
 
 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 = `${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`;

package/src/containers/CollectionArticle/CollectionArticle.tsx

@@ -7,15 +7,12 @@ import React, { useCallback, useMemo } from 'react';
 import { useCapabilities, useOperationInvoker } from '@dxos/app-framework/ui';
 import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
 import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
-import { Feed, Filter, Obj } from '@dxos/echo';
+import { Obj } from '@dxos/echo';
 import { type Collection } from '@dxos/echo';
-import { useClient } from '@dxos/react-client';
-import { getSpace, useQuery } from '@dxos/react-client/echo';
 import { Panel, ScrollArea, Toolbar, toLocalizedString, useTranslation } from '@dxos/react-ui';
 import { Card } from '@dxos/react-ui';
 import { Mosaic, type MosaicStackTileComponent } from '@dxos/react-ui-mosaic';
 import { SearchList, useSearchListResults } from '@dxos/react-ui-searchlist';
-import { ManagedCollection } from '@dxos/schema';
 import { getStyles } from '@dxos/ui-theme';
 
 import { meta } from '../../meta';
@@ -31,9 +28,7 @@ const useMetadataResolver = () => {
 /**
  * Article view for collections.
  */
-export const CollectionArticle = ({
-  subject,
-}: SurfaceComponentProps<Collection.Collection | ManagedCollection.ManagedCollection>) => {
+export const CollectionArticle = ({ subject }: SurfaceComponentProps<Collection.Collection>) => {
   const { t } = useTranslation(meta.id);
   const resolveMetadata = useMetadataResolver();
   const { items, handleSearch } = useCollectionItems(subject, resolveMetadata);
@@ -101,58 +96,16 @@ const ObjectTile: MosaicStackTileComponent<ObjectItem> = (props) => {
   );
 };
 
-/**
- * Hook to get items from a regular collection.
- */
-const useRegularCollectionItems = (collection: Collection.Collection): Obj.Unknown[] => {
-  return useMemo(
-    () => (collection.objects ?? []).map((ref) => ref.target).filter((obj): obj is Obj.Unknown => Obj.isObject(obj)),
-    [collection.objects],
-  );
-};
-
-/**
- * Hook to get items from a managed collection by querying the space.
- */
-const useManagedCollectionItems = (collection: ManagedCollection.ManagedCollection): Obj.Unknown[] => {
-  const client = useClient();
-  const space = getSpace(collection);
-  const [typename, feedKind] = collection.key.split('~');
-
-  const schema = useMemo(
-    () => client.graph.schemaRegistry.query({ typename, location: ['runtime'] }).runSync()[0],
-    [client, typename],
-  );
-
-  const filter = useMemo(
-    () =>
-      typename === Feed.Feed.typename
-        ? Filter.type(Feed.Feed, { kind: feedKind })
-        : schema
-          ? Filter.type(schema)
-          : Filter.nothing(),
-    [typename, schema, feedKind],
-  );
-
-  return useQuery(space?.db, filter);
-};
-
 type MetadataResolver = (typename: string) => { icon?: string; iconHue?: string };
 
 /**
  * Combined hook to get collection items with search/filter support.
  */
-const useCollectionItems = (
-  collection: Collection.Collection | ManagedCollection.ManagedCollection,
-  resolveMetadata: MetadataResolver,
-) => {
-  const isManaged = Obj.instanceOf(ManagedCollection.ManagedCollection, collection);
-
-  // Call both hooks unconditionally to satisfy React's rules of hooks.
-  const regularObjects = useRegularCollectionItems(collection as Collection.Collection);
-  const managedObjects = useManagedCollectionItems(collection as ManagedCollection.ManagedCollection);
-
-  const objects = isManaged ? managedObjects : regularObjects;
+const useCollectionItems = (collection: Collection.Collection, resolveMetadata: MetadataResolver) => {
+  const objects = useMemo(
+    () => (collection.objects ?? []).map((ref) => ref.target).filter((obj): obj is Obj.Unknown => Obj.isObject(obj)),
+    [collection.objects],
+  );
 
   // Convert objects to items with resolved metadata.
   const items = useMemo(