@dxos/plugin-space 0.8.4-main.406dc2a → 0.8.4-main.548089c

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 { type Space, fullyQualifiedId, useSpaceInvitations } 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 { 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 { meta } 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';
@@ -63,7 +65,7 @@ export const MembersContainer = ({ space, createInvitationUrl }: MembersContaine
   };
 
   // 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(() => {
@@ -84,7 +86,7 @@ export const MembersContainer = ({ space, createInvitationUrl }: MembersContaine
               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') {
@@ -106,7 +108,7 @@ export const MembersContainer = ({ space, createInvitationUrl }: MembersContaine
               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') {

package/src/components/MembersContainer/index.ts

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

package/src/components/ObjectDetailsPanel/ObjectDetailsPanel.tsx

@@ -8,15 +8,14 @@ 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 DataType } from '@dxos/schema';
-import { getTypenameFromQuery } from '@dxos/schema';
+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: DataType.View };
+type RowDetailsPanelProps = { objectId: string; view: View.View };
 
 export const ObjectDetailsPanel = ({ objectId, view }: RowDetailsPanelProps) => {
   const { t } = useTranslation(meta.id);

package/src/components/ObjectDetailsPanel/ObjectForm.tsx

@@ -5,11 +5,12 @@
 import * as Schema from 'effect/Schema';
 import React, { useCallback, useMemo } from 'react';
 
-import { DXN, Obj, Tag, Type } from '@dxos/echo';
+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';
 
@@ -22,32 +23,28 @@ export const ObjectForm = ({ object, schema }: ObjectFormProps) => {
   const handleRefQueryLookup = useRefQueryLookupHandler({ space });
 
   const formSchema = useMemo(
-    () => Schema.Struct({ tag: Type.Ref(Tag.Tag).pipe(Schema.optional) }).pipe(Schema.extend(schema)),
+    () => Schema.Struct({ tags: Schema.Array(Type.Ref(Tag.Tag)).pipe(Schema.optional) }).pipe(Schema.extend(schema)),
     [schema],
   );
 
   const meta = Obj.getMeta(object);
-  const tag = meta.tags?.[0] ? space?.db.ref(DXN.parse(meta.tags?.[0])) : undefined;
-  const values = useMemo(() => ({ tag, ...object }), [object, tag]);
+  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 = [Obj.getDXN(tag).toString()];
+    meta.tags = [...(meta.tags ?? []), Obj.getDXN(tag).toString()];
   }, []);
 
   const handleSave = useCallback(
-    (values: any, { changed }: { changed: Record<JsonPath, boolean> }) => {
+    ({ 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 === 'tag') {
-          const tag = values[path];
+        if (path === 'tags') {
           const meta = Obj.getMeta(object);
-          const currentTag = meta.tags?.[0];
-          if (currentTag !== tag?.dxn.toString()) {
-            meta.tags = tag ? [tag.dxn.toString()] : [];
-          }
+          meta.tags = tags?.map((tag: Ref.Ref<Tag.Tag>) => tag.dxn.toString()) ?? [];
           continue;
         }
 

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

@@ -4,17 +4,17 @@
 
 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 { meta } from '../meta';
+import { meta } from '../../meta';
 
-export const POPOVER_RENAME_OBJECT = `${meta.id}/PopoverRenameObject`;
+export const OBJECT_RENAME_POPOVER = `${meta.id}/ObjectRenamePopover`;
 
-export const PopoverRenameObject = ({ object }: { object: Live<any> }) => {
+export const ObjectRenamePopover = ({ object }: { object: Obj.Any }) => {
   const { t } = useTranslation(meta.id);
   const doneButton = useRef<HTMLButtonElement>(null);
   const [name, setName] = useState(Obj.getLabel(object));

package/src/components/ObjectRenamePopover/index.ts

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

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

@@ -5,11 +5,11 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useEffect, useState } from 'react';
 
-import { Obj, Tag } from '@dxos/echo';
-import { Expando } from '@dxos/react-client/echo';
+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';
 
@@ -21,7 +21,7 @@ const DefaultStory = () => {
 
   useEffect(() => {
     if (space && !object) {
-      const object = space.db.add(Obj.make(Expando, {}));
+      const object = space.db.add(Project.make());
       setObject(object as Obj.Any);
     }
   }, [space, object]);
@@ -30,7 +30,7 @@ const DefaultStory = () => {
     return null;
   }
 
-  return <BaseObjectSettings object={object} />;
+  return <BaseObjectSettings object={object} classNames='is-[20rem]' />;
 };
 
 const meta = {
@@ -42,7 +42,7 @@ const meta = {
     withClientProvider({
       createIdentity: true,
       createSpace: true,
-      types: [Tag.Tag],
+      types: [Project.Project, Tag.Tag],
       onCreateSpace: async ({ space }) => {
         space.db.add(Tag.make({ label: 'Tag 1' }));
         space.db.add(Tag.make({ label: 'Tag 2' }));
@@ -51,7 +51,7 @@ const meta = {
     }),
   ],
   parameters: {
-    layout: 'fullscreen',
+    layout: 'centered',
     translations,
   },
 } satisfies Meta<typeof DefaultStory>;

package/src/components/ObjectSettings/BaseObjectSettings.tsx

@@ -2,31 +2,25 @@
 // Copyright 2024 DXOS.org
 //
 
+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 { DXN, Obj, Tag, Type } from '@dxos/echo';
-import { DescriptionAnnotation } from '@dxos/echo/internal';
+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 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({
-  label: Schema.String.pipe(Schema.optional),
-  // TODO(wittjosiah): Support multiple tags.
-  tag: Type.Ref(Tag.Tag).pipe(Schema.optional),
-});
-
-// TODO(wittjosiah): Use extend but need to be able to control order of fields.
-const BaseSchemaWithDescription = Schema.Struct({
-  label: Schema.String.pipe(Schema.optional),
-  description: Schema.String.pipe(Schema.optional),
-  tag: Type.Ref(Tag.Tag).pipe(Schema.optional),
+  tags: Schema.Array(Type.Ref(Tag.Tag)).pipe(Schema.optional),
 });
 
 // TODO(wittjosiah): Better way to support validation of object schemas?
@@ -44,61 +38,61 @@ export const BaseObjectSettings = ({ classNames, children, object }: BaseObjectS
   const handleRefQueryLookup = useRefQueryLookupHandler({ space });
 
   const formSchema = useMemo(() => {
-    const description = Function.pipe(
+    return Function.pipe(
       Obj.getSchema(object),
       Option.fromNullable,
-      Option.flatMap((schema) => DescriptionAnnotation.get(schema)),
+      Option.map((schema) => BaseSchema.pipe(Schema.extend(schema))),
       Option.getOrUndefined,
     );
-    if (description) {
-      return BaseSchemaWithDescription;
-    } else {
-      return BaseSchema;
-    }
   }, [object]);
 
   const meta = Obj.getMeta(object);
-  const tag = meta.tags?.[0] ? space?.db.ref(DXN.parse(meta.tags?.[0])) : undefined;
+  const tags = (meta.tags ?? []).map((tag) => space?.db.ref(DXN.parse(tag))).filter(isNonNullable);
   const values = useMemo(
     () => ({
-      label: Obj.getLabel(object),
-      description: Obj.getDescription(object),
-      tag,
+      tags,
+      ...object,
     }),
-    [object, tag],
+    [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 = [Obj.getDXN(tag).toString()];
+    meta.tags = [...(meta.tags ?? []), Obj.getDXN(tag).toString()];
   }, []);
 
   const handleSave = useCallback(
-    (values: Schema.Schema.Type<typeof BaseSchemaWithDescription>) => {
-      if (values.label !== undefined && Obj.getLabel(object) !== values.label) {
-        Obj.setLabel(object, values.label);
-      }
+    (
+      { 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;
+          }
 
-      if (values.description !== undefined && Obj.getDescription(object) !== values.description) {
-        Obj.setDescription(object, values.description);
-      }
-
-      const meta = Obj.getMeta(object);
-      const currentTag = meta.tags?.[0];
-      if (values.tag !== undefined && currentTag !== values.tag?.dxn.toString()) {
-        meta.tags = [values.tag.dxn.toString()];
-      }
+          const value = values[path];
+          setValue(object, path, value);
+        }
+      });
     },
     [object],
   );
 
-  // TODO(wittjosiah): The schema for this form should be based on the schema of the object.
-  //  Perhaps with fields filtered down to only those with a specific settings annotation.
+  if (!formSchema) {
+    return null;
+  }
+
   return (
     <>
       <Form
+        classNames={classNames}
         outerSpacing={false}
         autoSave
         schema={formSchema}

package/src/components/ObjectSettings/ForeignKeys.tsx

@@ -38,7 +38,7 @@ const KeyItem = ({ forignKey, onDelete }: KeyItemProps) => {
   }, [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,7 +4,7 @@
 
 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, Toolbar } from '@dxos/react-ui';
 import { StackItem } from '@dxos/react-ui-stack';

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

package/src/components/RecordArticle.tsx

@@ -0,0 +1,114 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import React, { useMemo } from 'react';
+
+import { Surface } from '@dxos/app-framework/react';
+import { type SurfaceComponentProps } from '@dxos/app-framework/react';
+import { Filter, type Obj, Ref, Relation } from '@dxos/echo';
+import { type Space, getSpace, useQuery } from '@dxos/react-client/echo';
+import { useTranslation } from '@dxos/react-ui';
+import { Masonry } from '@dxos/react-ui-masonry';
+import { StackItem } from '@dxos/react-ui-stack';
+import { mx } from '@dxos/react-ui-theme';
+import { isNonNullable } from '@dxos/util';
+
+import { meta } from '../meta';
+
+export const RecordArticle = ({ object }: SurfaceComponentProps) => {
+  const { t } = useTranslation(meta.id);
+  const space = getSpace(object);
+  const data = useMemo(() => ({ subject: object }), [object]);
+  const related = useRelatedObjects(space, object, {
+    references: true,
+    relations: true,
+  });
+  const singleColumn = related.length === 1;
+
+  return (
+    <StackItem.Content>
+      <div role='none' className={mx('flex flex-col gap-4 p-4 is-full overflow-y-auto')}>
+        <div role='none' className={mx('flex is-full card-max-width')}>
+          <Surface role='section' data={data} limit={1} />
+        </div>
+
+        {related.length > 0 && (
+          <div role='none' className={mx('flex flex-col gap-1', singleColumn ? 'card-max-width' : 'is-full')}>
+            <label className='mbs-2 text-sm text-description'>{t('related objects label')}</label>
+            <Masonry.Root<Obj.Any>
+              items={related}
+              render={Card}
+              columnCount={singleColumn ? 1 : undefined}
+              intrinsicHeight
+            />
+          </div>
+        )}
+      </div>
+    </StackItem.Content>
+  );
+};
+
+const Card = ({ data: subject }: { data: Obj.Any }) => {
+  const data = useMemo(() => ({ subject }), [subject]);
+  return <Surface role='card' data={data} limit={1} />;
+};
+
+// TODO(wittjosiah): This is a hack. ECHO needs to have a back reference index to easily query for related objects.
+const useRelatedObjects = (
+  space?: Space,
+  record?: Obj.Any,
+  options: { references?: boolean; relations?: boolean } = {},
+) => {
+  const objects = useQuery(space, Filter.everything());
+  return useMemo(() => {
+    if (!record) {
+      return [];
+    }
+
+    const related: Obj.Any[] = [];
+
+    // TODO(burdon): Change Person => Organization to relations.
+    if (options.references) {
+      const getReferences = (obj: Obj.Any): Ref.Any[] => {
+        return Object.getOwnPropertyNames(obj)
+          .map((name) => obj[name as keyof Obj.Any])
+          .filter((value) => Ref.isRef(value)) as Ref.Any[];
+      };
+
+      const references = getReferences(record);
+      const referenceTargets = references.map((ref) => ref.target).filter(isNonNullable);
+      const referenceSources = objects.filter((obj) => {
+        const refs = getReferences(obj);
+        return refs.some((ref) => ref.target === record);
+      });
+
+      related.push(...referenceTargets, ...referenceSources);
+    }
+
+    if (options.relations) {
+      // TODO(dmaretskyi): Workaround until https://github.com/dxos/dxos/pull/10100 lands.
+      const isValidRelation = (obj: Obj.Any) => {
+        try {
+          return Relation.isRelation(obj) && Relation.getSource(obj) && Relation.getTarget(obj);
+        } catch {
+          return false;
+        }
+      };
+
+      const relations = objects.filter((obj) => Relation.isRelation(obj)).filter((obj) => isValidRelation(obj));
+      const targetObjects = relations
+        .filter((relation) => Relation.getTarget(relation) === record)
+        .map((relation) => Relation.getSource(relation));
+      const sourceObjects = relations
+        .filter((relation) => Relation.getSource(relation) === record)
+        .map((relation) => Relation.getTarget(relation));
+
+      related.push(...targetObjects, ...sourceObjects);
+    }
+
+    return related;
+  }, [record, objects]);
+};
+
+export default RecordArticle;

package/src/components/SchemaContainer.tsx

@@ -14,32 +14,11 @@ import { meta } from '../meta';
 
 type SchemaPanelProps = { space: Space };
 
-// TODO(ZaymonFC):
-//   - Support deleting Schema. This should tie in to some sort of
-//     'DangerZone™️' / 'Are you really sure?' / 'this might have consequences' component.
-
-/**
- * Subscribe to and retrieve all schemas from a space's schema registry.
- */
-export const useQuerySpaceSchemas = (space: Space): Type.Schema[] => {
-  const [schemas, setSchemas] = useState<Type.Schema[]>([]);
-
-  useEffect(() => {
-    const query = space.db.schemaRegistry.query();
-    const initialResults = query.runSync();
-    setSchemas(initialResults);
-
-    const unsubscribe = query.subscribe(() => setSchemas(query.results));
-    return () => unsubscribe();
-  }, [space]);
-
-  return schemas;
-};
-
 export const SchemaContainer = ({ space }: SchemaPanelProps) => {
   const { t } = useTranslation(meta.id);
   const schemas = useQuerySpaceSchemas(space);
 
+  // TODO(ZaymonFC): Support deleting Schema (DangerZone section).
   return (
     <StackItem.Content scrollable>
       <ControlPage>
@@ -47,8 +26,8 @@ export const SchemaContainer = ({ space }: SchemaPanelProps) => {
           <div role='none' className={controlItemClasses}>
             {schemas.length === 0 && <div className='text-center plb-4'>{t('no schemas found message')}</div>}
             {schemas.map((schema) => (
-              <div key={schema.id}>
-                <div>{schema.typename}</div>
+              <div role='none' key={schema.id}>
+                {schema.typename}
               </div>
             ))}
           </div>
@@ -57,3 +36,21 @@ export const SchemaContainer = ({ space }: SchemaPanelProps) => {
     </StackItem.Content>
   );
 };
+
+/**
+ * Subscribe to and retrieve all schemas from a space's schema registry.
+ */
+export const useQuerySpaceSchemas = (space: Space): Type.Schema[] => {
+  const [schemas, setSchemas] = useState<Type.Schema[]>([]);
+
+  useEffect(() => {
+    const query = space.db.schemaRegistry.query();
+    const initialResults = query.runSync();
+    setSchemas(initialResults);
+
+    const unsubscribe = query.subscribe(() => setSchemas(query.results));
+    return () => unsubscribe();
+  }, [space]);
+
+  return schemas;
+};