@dxos/plugin-space 0.8.4-main.74a063c4e0 → 0.8.4-main.765dc60934

package/src/capabilities/app-graph-builder/extensions/collections.ts

@@ -6,12 +6,19 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { AppCapabilities, LayoutOperation, Segments, getObjectPathFromObject, toUrlPath } from '@dxos/app-toolkit';
-import { SpaceState, getSpace, isSpace } from '@dxos/client/echo';
+import {
+  AppCapabilities,
+  AppNodeMatcher,
+  LayoutOperation,
+  Segments,
+  getObjectPathFromObject,
+  toUrlPath,
+} from '@dxos/app-toolkit';
+import { SpaceState, isSpace } from '@dxos/client/echo';
+import { Operation } from '@dxos/compute';
 import { Collection, Obj, Type } from '@dxos/echo';
 import { AtomObj } from '@dxos/echo-atom';
 import { invariant } from '@dxos/invariant';
-import { Operation } from '@dxos/operation';
 import { CreateAtom, Graph, GraphBuilder, Node } from '@dxos/plugin-graph';
 import { isNonNullable } from '@dxos/util';
 
@@ -24,12 +31,10 @@ import {
   COPY_LINK_LABEL,
   CREATE_OBJECT_IN_COLLECTION_LABEL,
   EXPOSE_OBJECT_LABEL,
-  type MetadataResolver,
   REMOVE_FROM_COLLECTION_LABEL,
   createObjectNode,
   getCollectionGraphNodePartials,
   getDynamicLabel,
-  whenSpace,
 } from './shared';
 
 //
@@ -44,14 +49,11 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
 }) {
   const capabilities = yield* Capability.Service;
 
-  const resolve = (get: any) => (typename: string) =>
-    capabilities.getAll(AppCapabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {};
-
   return yield* Effect.all([
     // Collections section virtual node under each space.
     GraphBuilder.createExtension({
       id: 'collections-section',
-      match: whenSpace,
+      match: AppNodeMatcher.whenSpace,
       connector: (space, get) => {
         const spaceState = get(CreateAtom.fromObservable(space.state));
         if (spaceState !== SpaceState.SPACE_READY) {
@@ -65,7 +67,7 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
         }
         const rootCollection = collectionRef?.target;
         const collectionPartials = rootCollection
-          ? getCollectionGraphNodePartials({ collection: rootCollection, db: space.db, resolve: resolve(get) })
+          ? getCollectionGraphNodePartials({ db: space.db, collection: rootCollection })
           : undefined;
 
         return Effect.succeed([
@@ -76,7 +78,7 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
             properties: {
               label: ['collections-section.label', { ns: meta.id }],
               icon: 'ph--folder--regular',
-              iconHue: 'neutral',
+              iconHue: 'amber',
               role: 'branch',
               position: 'hoist',
               testId: 'spacePlugin.collectionsSection',
@@ -123,7 +125,6 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
               createObjectNode({
                 db: space.db,
                 object,
-                resolve: resolve(get),
                 navigable: ephemeralState.navigableCollections,
                 parentCollection: collectionRef?.target,
               }),
@@ -140,7 +141,7 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
       connector: (collection, get) => {
         const ephemeralAtom = capabilities.get(SpaceCapabilities.EphemeralState);
         const ephemeralState = get(ephemeralAtom);
-        const space = getSpace(collection);
+        const db = Obj.getDatabase(collection);
 
         const collectionSnapshot = get(AtomObj.make(collection));
         const refs = collectionSnapshot.objects ?? [];
@@ -156,11 +157,10 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
           objects
             .map(
               (object: Obj.Unknown) =>
-                space &&
+                db &&
                 createObjectNode({
                   object,
-                  db: space.db,
-                  resolve: resolve(get),
+                  db,
                   navigable: ephemeralState.navigableCollections,
                   parentCollection: collection,
                 }),
@@ -176,12 +176,11 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
     GraphBuilder.createExtension({
       id: 'object-actions',
       match: (node) => {
-        const space = getSpace(node.data);
-        return space && Obj.isObject(node.data) && Obj.getTypename(node.data) === node.type
-          ? Option.some({ space, object: node.data, nodeId: node.id })
+        return Obj.getDatabase(node.data) && Obj.isObject(node.data) && Obj.getTypename(node.data) === node.type
+          ? Option.some({ object: node.data, nodeId: node.id })
           : Option.none();
       },
-      actions: ({ space, object, nodeId }, get) => {
+      actions: ({ object, nodeId }, get) => {
         const deletable = !Obj.instanceOf(Type.PersistentType, object);
 
         const [appGraph] = get(capabilities.atom(AppCapabilities.AppGraph));
@@ -201,7 +200,6 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
           constructObjectActions({
             object,
             nodeId,
-            resolve: resolve(get),
             deletable,
             navigable: ephemeralState.navigableCollections,
             shareableLinkOrigin,
@@ -221,7 +219,6 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
 const constructObjectActions = ({
   object,
   nodeId,
-  resolve,
   deletable = true,
   navigable = false,
   shareableLinkOrigin,
@@ -229,7 +226,6 @@ const constructObjectActions = ({
 }: {
   object: Obj.Unknown;
   nodeId: string;
-  resolve: MetadataResolver;
   shareableLinkOrigin: string;
   deletable?: boolean;
   navigable?: boolean;
@@ -260,7 +256,7 @@ const constructObjectActions = ({
       data: (params?: Node.InvokeProps) =>
         Operation.invoke(SpaceOperation.RenameObject, { object, caller: `${params?.caller}:${params?.parent?.id}` }),
       properties: {
-        label: getDynamicLabel('rename object label', typename, { defaultValue: 'Rename' }),
+        label: getDynamicLabel('rename-object.label', typename, { defaultValue: 'Rename' }),
         icon: 'ph--pencil-simple-line--regular',
         disposition: 'list-item',
         testId: 'spacePlugin.renameObject',
@@ -277,8 +273,8 @@ const constructObjectActions = ({
                   const layout = yield* Capabilities.getAtomValue(AppCapabilities.Layout);
                   const isActive = layout.active.includes(nodeId);
 
-                  Obj.change(parentCollection, (mutable) => {
-                    mutable.objects.splice(index, 1);
+                  Obj.update(parentCollection, (parentCollection) => {
+                    parentCollection.objects.splice(index, 1);
                   });
 
                   if (isActive) {

package/src/capabilities/app-graph-builder/extensions/companions.ts

@@ -12,6 +12,7 @@ import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
 // eslint-disable-next-line unused-imports/no-unused-imports
 import type { Node } from '@dxos/plugin-graph';
 import { linkedSegment } from '@dxos/react-ui-attention';
+import type { EchoViewRefPath } from '@dxos/schema';
 import { ViewAnnotation } from '@dxos/schema';
 
 import { meta } from '#meta';
@@ -64,11 +65,10 @@ export const createCompanionExtensions = Effect.fnUntraced(function* () {
         }
 
         const schema = Obj.getSchema(node.data);
-        const isView = Option.fromNullable(schema).pipe(
-          Option.flatMap((candidate) => ViewAnnotation.get(candidate)),
-          Option.getOrElse(() => false),
-        );
-        if (!isView) {
+        const path = schema ? ViewAnnotation.get(schema).pipe(Option.getOrElse(() => [] as EchoViewRefPath)) : [];
+        const isEchoViewBacked = schema && path.length > 0 ? ViewAnnotation.hasRefAlongPath(node.data, path) : false;
+
+        if (!isEchoViewBacked) {
           return Option.none();
         }
 

package/src/capabilities/app-graph-builder/extensions/settings.ts

@@ -3,23 +3,54 @@
 //
 
 import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 
-import { isPersonalSpace } from '@dxos/app-toolkit';
-import { GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
+import { AppNode, AppNodeMatcher, isPersonalSpace } from '@dxos/app-toolkit';
+import { type Space, isSpace } from '@dxos/client/echo';
+import { GraphBuilder, Node } from '@dxos/plugin-graph';
 
 import { meta } from '#meta';
+import { SETTINGS_SECTION_TYPE } from '#types';
 
 //
 // Extension Factory
 //
 
-/** Creates the settings-sections extension for space settings panel. */
+/**
+ * Settings section attached directly under each Space node, plus its children.
+ *
+ * The virtual `settings` section is pinned to the top via `position: 'hoist'`
+ * so it sits above the un-positioned middle band (collections, mailboxes,
+ * automations, integrations, etc.). It groups the panels contributed by this
+ * plugin (general, members) and by other plugins (automation, functions).
+ */
 export const createSettingsExtensions = Effect.fnUntraced(function* () {
-  const extension = yield* GraphBuilder.createExtension({
+  const sectionExtension = yield* GraphBuilder.createExtension({
+    id: 'settings-section',
+    match: AppNodeMatcher.whenSpace,
+    connector: (space) =>
+      Effect.succeed([
+        AppNode.makeSection({
+          id: 'settings',
+          type: SETTINGS_SECTION_TYPE,
+          label: ['settings-section.label', { ns: meta.id }],
+          icon: 'ph--sliders--regular',
+          iconHue: 'indigo',
+          space,
+          position: 'hoist',
+          testId: 'spacePlugin.settings',
+        }),
+      ]),
+  });
+
+  const childrenExtension = yield* GraphBuilder.createExtension({
     id: 'settings-sections',
-    match: NodeMatcher.whenNodeType(`${meta.id}.settings`),
-    connector: (node) => {
-      const personal = node.properties.space && isPersonalSpace(node.properties.space);
+    match: (node) => {
+      const space = isSpace(node.properties.space) ? (node.properties.space as Space) : undefined;
+      return node.type === SETTINGS_SECTION_TYPE && space ? Option.some(space) : Option.none();
+    },
+    connector: (space) => {
+      const personal = isPersonalSpace(space);
       return Effect.succeed([
         Node.make({
           id: 'general',
@@ -27,8 +58,9 @@ export const createSettingsExtensions = Effect.fnUntraced(function* () {
           data: `${meta.id}.general`,
           properties: {
             label: ['space-settings-properties.label', { ns: meta.id }],
-            icon: 'ph--sliders--regular',
-            position: 'hoist',
+            icon: 'ph--brackets-curly--regular',
+            iconHue: 'indigo',
+            space,
             testId: 'spacePlugin.general',
           },
         }),
@@ -41,24 +73,16 @@ export const createSettingsExtensions = Effect.fnUntraced(function* () {
                 properties: {
                   label: ['members-panel.label', { ns: meta.id }],
                   icon: 'ph--users--regular',
-                  position: 'hoist',
+                  iconHue: 'indigo',
+                  space,
                   testId: 'spacePlugin.members',
                 },
               }),
             ]
           : []),
-        Node.make({
-          id: 'schema',
-          type: `${meta.id}.schema`,
-          data: `${meta.id}.schema`,
-          properties: {
-            label: ['space-settings-schema.label', { ns: meta.id }],
-            icon: 'ph--shapes--regular',
-            testId: 'spacePlugin.schema',
-          },
-        }),
       ]);
     },
   });
-  return [extension];
+
+  return [sectionExtension, childrenExtension];
 });

package/src/capabilities/app-graph-builder/extensions/shared.test.ts

@@ -30,7 +30,7 @@ const TestViewWrapper = Schema.Struct({
     typename: 'test/ViewWrapper',
     version: '0.1.0',
   }),
-  ViewAnnotation.set(true),
+  ViewAnnotation.set(['view']),
 );
 
 describe('buildViewIndex', () => {
@@ -103,7 +103,7 @@ describe('buildViewIndex', () => {
     const userSchemas = db.schemaRegistry
       .query({ location: ['runtime'] })
       .runSync()
-      .filter((schema) => !ViewAnnotation.get(schema).pipe((opt) => opt._tag === 'Some' && opt.value));
+      .filter((schema) => !ViewAnnotation.has(schema));
     const viewIndex = buildViewIndex(registry.get.bind(registry) as any, { db } as any, userSchemas);
 
     expect(viewIndex.typenamesWithViews.size).toBe(0);

package/src/capabilities/app-graph-builder/extensions/shared.ts

@@ -6,20 +6,19 @@ import { type Atom } from '@effect-atom/atom-react';
 import * as Option from 'effect/Option';
 
 import { type Space, SpaceState, isSpace } from '@dxos/client/echo';
+import { type Operation } from '@dxos/compute';
 import { Filter, Obj, type Type } from '@dxos/echo';
 import { AtomObj, AtomQuery } from '@dxos/echo-atom';
 import { Migrations } from '@dxos/migrations';
-import { type Operation } from '@dxos/operation';
 import { type Node } from '@dxos/plugin-graph';
 import { type TreeData } from '@dxos/react-ui-list';
+import type { EchoViewRefPath } from '@dxos/schema';
 import { ViewAnnotation, getTypenameFromQuery } from '@dxos/schema';
-import { type Label } from '@dxos/ui-types';
+import { type Label } from '@dxos/ui-types/translations';
 
 import { meta } from '#meta';
-import { SPACE_TYPE } from '#types';
 
 export {
-  type MetadataResolver,
   ACCEPT_ECHO_CLASS,
   CACHEABLE_PROPS,
   CAN_DROP_OBJECT,
@@ -57,14 +56,6 @@ export const META_NS: { ns: string } = { ns: meta.id };
 export const BLOCK_REORDER_ABOVE = (_source: TreeData, instruction: any) => instruction.type === 'reorder-above';
 export const CAN_DROP_SPACE = (source: TreeData) => Obj.isObject(source.item.data) || isSpace(source.item.data);
 
-//
-// Matchers
-//
-
-/** Match space nodes and return the Space object. */
-export const whenSpace = (node: Node.Node): Option.Option<Space> =>
-  node.type === SPACE_TYPE && isSpace(node.data) ? Option.some(node.data) : Option.none();
-
 //
 // Caches (space-specific, not moved to app-toolkit)
 //
@@ -134,6 +125,8 @@ export type ViewIndex = {
   typenamesWithViews: Set<string>;
   /** View objects targeting a specific typename. */
   getViewsForTypename: (typename: string) => Obj.Any[];
+  /** True when the schema has `ViewAnnotation` and that path resolves non-null on `object`; false otherwise (no annotation, or null/undefined path — e.g. Kanban with unset `view`). */
+  isView: (object: Obj.Any) => boolean;
 };
 
 /**
@@ -143,18 +136,42 @@ export type ViewIndex = {
  */
 // TODO(wittjosiah): Make reactive to schema registry changes (currently only object/view mutations trigger updates).
 export const buildViewIndex = (get: Atom.Context, space: Space, schemas: Type.AnyEntity[]): ViewIndex => {
-  const viewSchemas = schemas.filter((schema) => ViewAnnotation.get(schema).pipe(Option.getOrElse(() => false)));
+  const viewSchemas = schemas.filter((schema) => ViewAnnotation.has(schema));
 
   const viewsByTypename = new Map<string, Obj.Any[]>();
+  // Object IDs whose `ViewAnnotation` path resolves to a non-null value.
+  // Used by `isView` to distinguish view instances from regular instances of
+  // the same schema (e.g. items-variant Kanban vs view-variant Kanban).
+  const viewObjectIds = new Set<string>();
 
   if (viewSchemas.length > 0) {
     const filter = Filter.or(...viewSchemas.map((schema) => Filter.type(schema)));
     const viewObjects = get(AtomQuery.make(space.db, filter));
 
     for (const viewObject of viewObjects) {
+      const holderSchema = Obj.getSchema(viewObject);
+      const path = holderSchema
+        ? ViewAnnotation.get(holderSchema).pipe(Option.getOrElse(() => [] as EchoViewRefPath))
+        : ([] as EchoViewRefPath);
+
+      if (path.length === 0) {
+        continue;
+      }
+
       const viewSnapshot = get(AtomObj.make(viewObject));
-      const viewRef = viewSnapshot.view;
-      const viewTarget = viewRef ? get(AtomObj.make(viewRef)) : undefined;
+      let holder: unknown = viewSnapshot;
+      for (const segment of path) {
+        holder =
+          holder == null || typeof holder !== 'object' ? undefined : (holder as Record<string, unknown>)[segment];
+      }
+      // Path resolved to a non-null value → this instance is a "view". Path
+      // resolved to null/undefined → it's a regular object that happens to
+      // be of a view-annotated schema.
+      if (holder != null) {
+        viewObjectIds.add(viewObject.id);
+      }
+
+      const viewTarget = holder !== undefined ? get(AtomObj.make(holder as Obj.Any)) : undefined;
       const typename = getTypenameFromQuery(viewTarget?.query?.ast);
       if (typename) {
         const existing = viewsByTypename.get(typename) ?? [];
@@ -167,5 +184,6 @@ export const buildViewIndex = (get: Atom.Context, space: Space, schemas: Type.An
   return {
     typenamesWithViews: new Set(viewsByTypename.keys()),
     getViewsForTypename: (typename) => viewsByTypename.get(typename) ?? [],
+    isView: (object) => viewObjectIds.has(object.id),
   };
 };

package/src/capabilities/app-graph-builder/extensions/spaces.ts

@@ -5,14 +5,15 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { AppCapabilities, getActiveSpace, getPersonalSpace, isPersonalSpace } from '@dxos/app-toolkit';
+import { AppCapabilities, AppNodeMatcher, getActiveSpace, getPersonalSpace, isPersonalSpace } from '@dxos/app-toolkit';
 import { type Space, SpaceState } from '@dxos/client/echo';
+import { Operation } from '@dxos/compute';
 import { Filter, Obj } from '@dxos/echo';
 import { AtomObj, AtomQuery } from '@dxos/echo-atom';
 import { Migrations } from '@dxos/migrations';
-import { Operation } from '@dxos/operation';
-import { ClientCapabilities } from '@dxos/plugin-client/types';
+import { ClientCapabilities } from '@dxos/plugin-client';
 import { CreateAtom, Graph, GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
+import { SpaceArchive } from '@dxos/protocols/proto/dxos/client/services';
 import { Expando } from '@dxos/schema';
 
 import { meta } from '#meta';
@@ -26,11 +27,9 @@ import {
   CREATE_OBJECT_IN_SPACE_LABEL,
   MIGRATE_SPACE_LABEL,
   RENAME_SPACE_LABEL,
-  SETTINGS_PANEL_LABEL,
   checkPendingMigration,
   spaceActionsCache,
   spaceRearrangeCache,
-  whenSpace,
 } from './shared';
 
 //
@@ -68,6 +67,45 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
               disposition: 'menu',
             },
           }),
+          Node.makeAction({
+            id: SpaceOperation.OpenImportSpace.meta.key,
+            data: () => Operation.invoke(SpaceOperation.OpenImportSpace),
+            properties: {
+              label: ['import-space.label', { ns: meta.id }],
+              icon: 'ph--upload--regular',
+              testId: 'spacePlugin.importSpace',
+            },
+          }),
+          Node.makeAction({
+            id: `${SpaceOperation.ExportSpace.meta.key}.binary`,
+            data: Effect.fnUntraced(function* () {
+              const client = yield* Capability.get(ClientCapabilities.Client);
+              const space = getActiveSpace(client, capabilities) ?? getPersonalSpace(client);
+              if (space) {
+                yield* Operation.invoke(SpaceOperation.ExportSpace, { space, format: SpaceArchive.Format.BINARY });
+              }
+            }),
+            properties: {
+              label: ['export-space-binary.label', { ns: meta.id }],
+              icon: 'ph--download--regular',
+              testId: 'spacePlugin.exportSpaceBinary',
+            },
+          }),
+          Node.makeAction({
+            id: `${SpaceOperation.ExportSpace.meta.key}.json`,
+            data: Effect.fnUntraced(function* () {
+              const client = yield* Capability.get(ClientCapabilities.Client);
+              const space = getActiveSpace(client, capabilities) ?? getPersonalSpace(client);
+              if (space) {
+                yield* Operation.invoke(SpaceOperation.ExportSpace, { space, format: SpaceArchive.Format.JSON });
+              }
+            }),
+            properties: {
+              label: ['export-space-json.label', { ns: meta.id }],
+              icon: 'ph--download--regular',
+              testId: 'spacePlugin.exportSpaceJson',
+            },
+          }),
           Node.makeAction({
             id: SpaceOperation.OpenMembers.meta.key,
             data: Effect.fnUntraced(function* () {
@@ -175,7 +213,7 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
 
     GraphBuilder.createExtension({
       id: 'actions',
-      match: whenSpace,
+      match: AppNodeMatcher.whenSpace,
       actions: (space, get) => {
         const [client] = get(capabilities.atom(ClientCapabilities.Client));
         const ephemeralAtom = capabilities.get(SpaceCapabilities.EphemeralState);
@@ -230,8 +268,8 @@ const constructSpaceNode = ({
           nextOrder.map(({ id }) => id),
         );
 
-        Obj.change(spacesOrder, (mutableOrder: any) => {
-          mutableOrder.order = nextOrder.map(({ id }) => id);
+        Obj.update(spacesOrder, (spacesOrder: any) => {
+          spacesOrder.order = nextOrder.map(({ id }) => id);
         });
       };
       spaceRearrangeCache.set(space.id, onRearrange);
@@ -258,19 +296,6 @@ const constructSpaceNode = ({
       onRearrange,
       canDrop: CAN_DROP_SPACE,
     },
-    nodes: [
-      Node.make({
-        id: 'settings',
-        type: `${meta.id}.settings`,
-        data: null,
-        properties: {
-          label: SETTINGS_PANEL_LABEL,
-          icon: 'ph--faders--regular',
-          disposition: 'alternate-tree',
-          space,
-        },
-      }),
-    ],
   });
 };