@dxos/plugin-space 0.8.4-main.8360d9e660 → 0.8.4-main.8baae0fced

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';
+import { meta } from '#meta';
 
 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)
 //
@@ -84,17 +75,17 @@ export const spaceRearrangeCache = new Map<string, (nextOrder: Space[]) => void>
 // Static Labels
 //
 
-export const ADD_VIEW_TO_SCHEMA_LABEL: Label = ['add view to schema label', META_NS];
-export const COPY_LINK_LABEL: Label = ['copy link label', META_NS];
-export const CREATE_OBJECT_IN_COLLECTION_LABEL: Label = ['create object in collection label', META_NS];
-export const CREATE_OBJECT_IN_SPACE_LABEL: Label = ['create object in space label', META_NS];
-export const EXPOSE_OBJECT_LABEL: Label = ['expose object label', META_NS];
-export const MIGRATE_SPACE_LABEL: Label = ['migrate space label', META_NS];
-export const NEW_TYPE_LABEL: Label = ['new type label', META_NS];
-export const REMOVE_FROM_COLLECTION_LABEL: Label = ['remove from collection label', META_NS];
-export const RENAME_SPACE_LABEL: Label = ['rename space label', META_NS];
-export const SETTINGS_PANEL_LABEL: Label = ['settings panel label', META_NS];
-export const SNAPSHOT_BY_SCHEMA_LABEL: Label = ['snapshot by schema label', META_NS];
+export const ADD_VIEW_TO_SCHEMA_LABEL: Label = ['add-view-to-schema.label', META_NS];
+export const COPY_LINK_LABEL: Label = ['copy-link.label', META_NS];
+export const CREATE_OBJECT_IN_COLLECTION_LABEL: Label = ['create-object-in-collection.label', META_NS];
+export const CREATE_OBJECT_IN_SPACE_LABEL: Label = ['create-object-in-space.label', META_NS];
+export const EXPOSE_OBJECT_LABEL: Label = ['expose-object.label', META_NS];
+export const MIGRATE_SPACE_LABEL: Label = ['migrate-space.label', META_NS];
+export const NEW_TYPE_LABEL: Label = ['new-type.label', META_NS];
+export const REMOVE_FROM_COLLECTION_LABEL: Label = ['remove-from-collection.label', META_NS];
+export const RENAME_SPACE_LABEL: Label = ['rename-space.label', META_NS];
+export const SETTINGS_PANEL_LABEL: Label = ['settings-panel.label', META_NS];
+export const SNAPSHOT_BY_SCHEMA_LABEL: Label = ['snapshot-by-schema.label', META_NS];
 
 //
 // Helpers
@@ -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,32 +5,38 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { AppCapabilities, COMPANION_PREFIX } from '@dxos/app-toolkit';
+import {
+  AppCapabilities,
+  AppNodeMatcher,
+  getActiveSpace,
+  getPersonalSpace,
+  isExemplarSpace,
+  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';
 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 { getActiveSpace } from '../../../hooks';
-import { meta } from '../../../meta';
-import { SPACE_TYPE, SpaceCapabilities, SpaceOperation } from '../../../types';
-import { SHARED, getSpaceDisplayName } from '../../../util';
+import { meta } from '#meta';
+import { SpaceOperation } from '#operations';
+import { SPACE_TYPE, SpaceCapabilities } from '#types';
 
+import { SHARED, getSpaceDisplayName } from '../../../util';
 import {
   CACHEABLE_PROPS,
   CAN_DROP_SPACE,
   CREATE_OBJECT_IN_SPACE_LABEL,
   MIGRATE_SPACE_LABEL,
   RENAME_SPACE_LABEL,
-  SETTINGS_PANEL_LABEL,
   checkPendingMigration,
   spaceActionsCache,
   spaceRearrangeCache,
-  whenSpace,
 } from './shared';
 
 //
@@ -43,40 +49,81 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
 
   return yield* Effect.all([
     GraphBuilder.createExtension({
-      id: `${meta.id}.primary-actions`,
-      position: 'hoist',
+      id: 'primary-actions',
+      position: 'first',
       match: NodeMatcher.whenRoot,
       actions: () =>
         Effect.succeed([
-          {
+          Node.makeAction({
             id: SpaceOperation.OpenCreateSpace.meta.key,
             data: () => Operation.invoke(SpaceOperation.OpenCreateSpace),
             properties: {
-              label: ['create space label', { ns: meta.id }],
+              label: ['create-space.label', { ns: meta.id }],
               icon: 'ph--plus--regular',
               testId: 'spacePlugin.createSpace',
               disposition: 'menu',
             },
-          },
-          {
+          }),
+          Node.makeAction({
             id: SpaceOperation.Join.meta.key,
             data: () => Operation.invoke(SpaceOperation.Join, {}),
             properties: {
-              label: ['join space label', { ns: meta.id }],
+              label: ['join-space.label', { ns: meta.id }],
               icon: 'ph--sign-in--regular',
               testId: 'spacePlugin.joinSpace',
               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* () {
               const client = yield* Capability.get(ClientCapabilities.Client);
-              const space = getActiveSpace(capabilities) ?? client.spaces.default;
-              yield* Operation.invoke(SpaceOperation.OpenMembers, { space });
+              const space = getActiveSpace(client, capabilities) ?? getPersonalSpace(client);
+              if (space) {
+                yield* Operation.invoke(SpaceOperation.OpenMembers, { space });
+              }
             }),
             properties: {
-              label: ['share space label', { ns: meta.id }],
+              label: ['share-space.label', { ns: meta.id }],
               icon: 'ph--users--regular',
               testId: 'spacePlugin.shareSpace',
               keyBinding: {
@@ -84,40 +131,41 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
                 windows: 'alt+.',
               },
             },
-          },
-          {
+          }),
+          Node.makeAction({
             id: SpaceOperation.OpenSettings.meta.key,
             data: Effect.fnUntraced(function* () {
               const client = yield* Capability.get(ClientCapabilities.Client);
-              const space = getActiveSpace(capabilities) ?? client.spaces.default;
-              yield* Operation.invoke(SpaceOperation.OpenSettings, { space });
+              const space = getActiveSpace(client, capabilities) ?? getPersonalSpace(client);
+              if (space) {
+                yield* Operation.invoke(SpaceOperation.OpenSettings, { space });
+              }
             }),
             properties: {
-              label: ['open current space settings label', { ns: meta.id }],
+              label: ['open-current-space-settings.label', { ns: meta.id }],
               icon: 'ph--faders--regular',
               keyBinding: {
                 macos: 'meta+shift+,',
                 windows: 'ctrl+shift+,',
               },
             },
-          },
+          }),
         ]),
     }),
 
     GraphBuilder.createExtension({
-      id: `${meta.id}.spaces`,
+      id: 'spaces',
       match: NodeMatcher.whenRoot,
       connector: (_node, get) => {
         const client = capabilities.get(ClientCapabilities.Client);
         const stateAtom = capabilities.get(SpaceCapabilities.State);
         const ephemeralAtom = capabilities.get(SpaceCapabilities.EphemeralState);
         const spacesAtom = CreateAtom.fromObservable(client.spaces);
-        const isReadyAtom = CreateAtom.fromObservable(client.spaces.isReady);
 
         const spaces = get(spacesAtom);
-        const isReady = get(isReadyAtom);
+        const personalSpace = getPersonalSpace(client);
 
-        if (!spaces || !isReady) {
+        if (!spaces || !personalSpace) {
           return Effect.succeed([]);
         }
 
@@ -127,9 +175,7 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
         const ephemeralState = get(ephemeralAtom);
 
         try {
-          const [spacesOrder] = get(
-            AtomQuery.make(client.spaces.default.db, Filter.type(Expando.Expando, { key: SHARED })),
-          );
+          const [spacesOrder] = get(AtomQuery.make(personalSpace.db, Filter.type(Expando.Expando, { key: SHARED })));
           const { graph } = capabilities.get(AppCapabilities.AppGraph);
 
           const spacesOrderSnapshot = spacesOrder ? get(AtomObj.make(spacesOrder)) : undefined;
@@ -152,11 +198,12 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
               ...spaces.filter((space) => !orderMap.has(space.id)),
             ]
               .filter((space, idx) => (settings?.showHidden ? true : spaceStates[idx] !== SpaceState.SPACE_INACTIVE))
+              .filter((space) => space.tags.length === 0 || isPersonalSpace(space) || isExemplarSpace(space))
               .map((space) =>
                 constructSpaceNode({
                   space,
                   navigable: ephemeralState.navigableCollections,
-                  personal: space === client.spaces.default,
+                  personal: isPersonalSpace(space),
                   namesCache: state.spaceNames,
                   graph,
                   spacesOrder,
@@ -172,8 +219,8 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
     }),
 
     GraphBuilder.createExtension({
-      id: `${meta.id}.actions`,
-      match: whenSpace,
+      id: 'actions',
+      match: AppNodeMatcher.whenSpace,
       actions: (space, get) => {
         const [client] = get(capabilities.atom(ClientCapabilities.Client));
         const ephemeralAtom = capabilities.get(SpaceCapabilities.EphemeralState);
@@ -228,15 +275,15 @@ 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);
     }
   }
 
-  return {
+  return Node.make({
     id: space.id,
     type: SPACE_TYPE,
     cacheable: CACHEABLE_PROPS,
@@ -256,19 +303,7 @@ const constructSpaceNode = ({
       onRearrange,
       canDrop: CAN_DROP_SPACE,
     },
-    nodes: [
-      {
-        id: 'settings',
-        type: `${meta.id}.settings`,
-        data: null,
-        properties: {
-          label: SETTINGS_PANEL_LABEL,
-          icon: 'ph--faders--regular',
-          disposition: 'alternate-tree',
-        },
-      },
-    ],
-  };
+  });
 };
 
 /** Builds the action list for a space node (migrate, create object, rename). */
@@ -290,24 +325,25 @@ const constructSpaceActions = ({ space, migrating }: { space: Space; migrating?:
   const actions: Node.NodeArg<Node.ActionData<Operation.Service>>[] = [];
 
   if (hasPendingMigration) {
-    actions.push({
-      id: SpaceOperation.Migrate.meta.key,
-      type: Node.ActionGroupType,
-      data: () => Operation.invoke(SpaceOperation.Migrate, { space }),
-      properties: {
-        label: MIGRATE_SPACE_LABEL,
-        icon: 'ph--database--regular',
-        disposition: 'list-item-primary',
-        disabled: isMigrating,
-      },
-    });
+    actions.push(
+      Node.make({
+        id: SpaceOperation.Migrate.meta.key,
+        type: Node.ActionGroupType,
+        data: () => Operation.invoke(SpaceOperation.Migrate, { space }),
+        properties: {
+          label: MIGRATE_SPACE_LABEL,
+          icon: 'ph--database--regular',
+          disposition: 'list-item-primary',
+          disabled: isMigrating,
+        },
+      }),
+    );
   }
 
   if (state === SpaceState.SPACE_READY && !hasPendingMigration) {
     actions.push(
-      {
+      Node.makeAction({
         id: SpaceOperation.OpenCreateObject.meta.key,
-        type: Node.ActionType,
         data: () => Operation.invoke(SpaceOperation.OpenCreateObject, { target: space.db }),
         properties: {
           label: CREATE_OBJECT_IN_SPACE_LABEL,
@@ -315,10 +351,9 @@ const constructSpaceActions = ({ space, migrating }: { space: Space; migrating?:
           disposition: 'list-item-primary',
           testId: 'spacePlugin.createObject',
         },
-      },
-      {
+      }),
+      Node.makeAction({
         id: SpaceOperation.Rename.meta.key,
-        type: Node.ActionType,
         data: (params?: Node.InvokeProps) =>
           Operation.invoke(SpaceOperation.Rename, { space, caller: `${params?.caller}:${params?.parent?.id}` }),
         properties: {
@@ -329,7 +364,7 @@ const constructSpaceActions = ({ space, migrating }: { space: Space; migrating?:
             windows: 'shift+F6',
           },
         },
-      },
+      }),
     );
   }