@dxos/plugin-space 0.8.4-main.bc674ce → 0.8.4-main.c351d160a8

package/src/capabilities/operation-resolver/operation-resolver.ts

@@ -3,10 +3,20 @@
 //
 
 import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 
-import { Capability, Common, Plugin, UndoMapping } from '@dxos/app-framework';
+import { Capabilities, Capability, Plugin, UndoMapping } from '@dxos/app-framework';
+import {
+  AppCapabilities,
+  LayoutOperation,
+  getCollectionsPath,
+  getObjectPath,
+  getObjectPathFromObject,
+  getTypePath,
+} from '@dxos/app-toolkit';
 import { SpaceState, getSpace } from '@dxos/client/echo';
-import { Database, Obj, Query, Ref, Relation, Type } from '@dxos/echo';
+import { Database, Obj, Query, Ref, Relation, Type, View } from '@dxos/echo';
+import { Collection } from '@dxos/echo';
 import { EchoDatabaseImpl, Serializer } from '@dxos/echo-db';
 import { invariant } from '@dxos/invariant';
 import { Migrations } from '@dxos/migrations';
@@ -14,13 +24,13 @@ import { OperationResolver } from '@dxos/operation';
 import { Operation } from '@dxos/operation';
 import { ClientCapabilities } from '@dxos/plugin-client/types';
 import { ObservabilityOperation } from '@dxos/plugin-observability/types';
+import { ViewAnnotation } from '@dxos/schema';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
-import { ATTENDABLE_PATH_SEPARATOR } from '@dxos/react-ui-attention/types';
+import { getSpacePath } from '@dxos/app-toolkit';
 import { iconValues } from '@dxos/react-ui-pickers/icons';
-import { Collection, ProjectionModel, createEchoChangeCallback, getTypenameFromQuery } from '@dxos/schema';
+import { CollectionModel, ProjectionModel, createEchoChangeCallback, getTypenameFromQuery } from '@dxos/schema';
 import { hues } from '@dxos/ui-theme';
 
-import { type JoinDialogProps } from '../../components';
 import {
   CREATE_OBJECT_DIALOG,
   CREATE_SPACE_DIALOG,
@@ -28,9 +38,12 @@ import {
   OBJECT_RENAME_POPOVER,
   SPACE_RENAME_POPOVER,
 } from '../../constants';
+import { type JoinDialogProps } from '../../containers/JoinDialog';
+import { meta } from '../../meta';
 import { SpaceEvents } from '../../types';
 import { SpaceCapabilities, SpaceOperation } from '../../types';
 import { COMPOSER_SPACE_LOCK, cloneObject, getNestedObjects } from '../../util';
+import { isNonNullable } from '@dxos/util';
 
 type OperationResolverOptions = {
   createInvitationUrl: (invitationCode: string) => string;
@@ -38,16 +51,15 @@ type OperationResolverOptions = {
 };
 
 export default Capability.makeModule(
-  Effect.fnUntraced(function* (props?: OperationResolverOptions) {
-    const { createInvitationUrl, observability } = props!;
+  Effect.fnUntraced(function* ({ createInvitationUrl, observability }: OperationResolverOptions) {
     const capabilityManager = yield* Capability.Service;
 
     const resolve = (typename: string) =>
-      capabilityManager.getAll(Common.Capability.Metadata).find(({ id }: { id: string }) => id === typename)
-        ?.metadata ?? {};
+      capabilityManager.getAll(AppCapabilities.Metadata).find(({ id }: { id: string }) => id === typename)?.metadata ??
+      {};
 
     return [
-      Capability.contributes(Common.Capability.UndoMapping, [
+      Capability.contributes(Capabilities.UndoMapping, [
         UndoMapping.make({
           operation: SpaceOperation.DeleteField,
           inverse: SpaceOperation.RestoreField,
@@ -57,7 +69,7 @@ export default Capability.makeModule(
             props: output.props,
             index: output.index,
           }),
-          message: ['field deleted label', { ns: 'dxos.org/plugin/space' }],
+          message: ['field deleted label', { ns: meta.id }],
         }),
         UndoMapping.make({
           operation: SpaceOperation.RemoveObjects,
@@ -73,11 +85,11 @@ export default Capability.makeModule(
             const ns = Obj.getTypename(input.objects[0]);
             return ns && input.objects.length === 1
               ? ['object deleted label', { ns }]
-              : ['objects deleted label', { ns: 'plugin-space' }];
+              : ['objects deleted label', { ns: meta.id }];
           },
         }),
       ]),
-      Capability.contributes(Common.Capability.OperationResolver, [
+      Capability.contributes(Capabilities.OperationResolver, [
         //
         // Open
         //
@@ -106,7 +118,7 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.Join,
           handler: Effect.fnUntraced(function* (input) {
-            yield* Operation.invoke(Common.LayoutOperation.UpdateDialog, {
+            yield* Operation.invoke(LayoutOperation.UpdateDialog, {
               subject: JOIN_DIALOG,
               blockAlign: 'start',
               props: {
@@ -123,7 +135,7 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.WaitForObject,
           handler: Effect.fnUntraced(function* (input) {
-            yield* Common.Capability.updateAtomValue(SpaceCapabilities.EphemeralState, (current) => ({
+            yield* Capabilities.updateAtomValue(SpaceCapabilities.EphemeralState, (current) => ({
               ...current,
               awaiting: input.id,
             }));
@@ -136,9 +148,9 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.OpenSettings,
           handler: Effect.fnUntraced(function* (input) {
-            yield* Operation.invoke(Common.LayoutOperation.Open, {
-              subject: [`properties-settings${ATTENDABLE_PATH_SEPARATOR}${input.space.id}`],
-              workspace: input.space.id,
+            yield* Operation.invoke(LayoutOperation.Open, {
+              subject: [`${getSpacePath(input.space.id)}/settings`],
+              workspace: getSpacePath(input.space.id),
             });
           }),
         }),
@@ -149,13 +161,12 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.RemoveObjects,
           handler: Effect.fnUntraced(function* (input) {
-            const layout = yield* Common.Capability.getAtomValue(Common.Capability.Layout);
+            const layout = yield* Capabilities.getAtomValue(AppCapabilities.Layout);
             const objects = input.objects as Obj.Unknown[];
 
             // All objects must be a member of the same space.
             const space = getSpace(objects[0]);
             invariant(space && objects.every((obj) => Obj.isObject(obj) && getSpace(obj) === space));
-            const openObjectIds = new Set<string>(layout.active);
 
             const parentCollection: Collection.Collection =
               input.target ?? space.properties[Collection.Collection.typename]?.target;
@@ -174,8 +185,9 @@ export default Capability.makeModule(
             // Close objects that were open.
             const wasActive = objects
               .flatMap((obj, i) => [obj, ...nestedObjectsList[i]])
-              .filter((obj) => Obj.isObject(obj) && openObjectIds.has(Obj.getDXN(obj).toString()))
-              .map((obj) => Obj.getDXN(obj).toString());
+              .filter(Obj.isObject)
+              .map((object) => layout.active.find((graphId) => graphId.endsWith(object.id)))
+              .filter(isNonNullable);
 
             for (let i = 0; i < objects.length; i++) {
               const obj = objects[i];
@@ -205,7 +217,7 @@ export default Capability.makeModule(
             }
 
             if (wasActive.length > 0) {
-              yield* Operation.invoke(Common.LayoutOperation.Close, { subject: wasActive });
+              yield* Operation.invoke(LayoutOperation.Close, { subject: wasActive });
             }
 
             // Return data needed for undo.
@@ -225,7 +237,7 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.DeleteField,
           handler: Effect.fnUntraced(function* (input) {
-            const registry = yield* Capability.get(Common.Capability.AtomRegistry);
+            const registry = yield* Capability.get(Capabilities.AtomRegistry);
             const view = input.view as any;
             const db = Obj.getDatabase(view);
             invariant(db);
@@ -259,9 +271,9 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.OpenCreateObject,
           handler: Effect.fnUntraced(function* (input) {
-            const ephemeralState = yield* Common.Capability.getAtomValue(SpaceCapabilities.EphemeralState);
+            const ephemeralState = yield* Capabilities.getAtomValue(SpaceCapabilities.EphemeralState);
             const navigable = input.navigable ?? true;
-            yield* Operation.invoke(Common.LayoutOperation.UpdateDialog, {
+            yield* Operation.invoke(LayoutOperation.UpdateDialog, {
               subject: CREATE_OBJECT_DIALOG,
               blockAlign: 'start',
               props: {
@@ -270,11 +282,11 @@ export default Capability.makeModule(
                 typename: input.typename,
                 initialFormValues: input.initialFormValues,
                 onCreateObject: input.onCreateObject,
+                targetNodeId: input.targetNodeId,
                 shouldNavigate: navigable
                   ? (object: Obj.Unknown) => {
                       const isCollection = Obj.instanceOf(Collection.Collection, object);
-                      const isSystemCollection = Obj.instanceOf(Collection.Managed, object);
-                      return (!isCollection && !isSystemCollection) || ephemeralState.navigableCollections;
+                      return !isCollection || ephemeralState.navigableCollections;
                     }
                   : () => false,
               },
@@ -293,23 +305,39 @@ export default Capability.makeModule(
             const db = Database.isDatabase(target) ? target : Obj.getDatabase(target);
             invariant(db, 'Database not found.');
 
-            yield* Collection.add({
+            yield* CollectionModel.add({
               object,
               target: Database.isDatabase(target) ? undefined : target,
               hidden: input.hidden,
-            }).pipe(Effect.provide(Database.Service.layer(db)));
+            }).pipe(Effect.provide(Database.layer(db)));
 
+            const typename = Obj.getTypename(object)!;
             yield* Operation.schedule(ObservabilityOperation.SendEvent, {
               name: 'space.object.add',
               properties: {
                 spaceId: db.spaceId,
                 objectId: object.id,
+                typename: Obj.getTypename(object),
               },
             });
 
+            const [schema] = db.schemaRegistry.query({ typename, location: ['runtime'] }).runSync();
+            const isViewSchema = schema !== undefined && ViewAnnotation.get(schema).pipe(Option.getOrElse(() => false));
+            const view = isViewSchema
+              ? yield* Effect.promise(() => (object as Obj.Any).view.load() as Promise<View.View>)
+              : undefined;
+            const viewTargetTypename = view ? getTypenameFromQuery(view.query.ast) : undefined;
+            const subject = getSubjectPathForNewObject({
+              spaceId: db.spaceId,
+              objectId: object.id,
+              nodeId: input.targetNodeId,
+              typename,
+              viewTargetTypename,
+            });
+
             return {
               id: Obj.getDXN(object).toString(),
-              subject: [Obj.getDXN(object).toString()],
+              subject: [subject],
               object,
             };
           }),
@@ -381,7 +409,7 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.OpenCreateSpace,
           handler: Effect.fnUntraced(function* () {
-            yield* Operation.invoke(Common.LayoutOperation.UpdateDialog, {
+            yield* Operation.invoke(LayoutOperation.UpdateDialog, {
               subject: CREATE_SPACE_DIALOG,
               blockAlign: 'start',
             });
@@ -413,11 +441,6 @@ export default Capability.makeModule(
               }
             });
 
-            // Create records smart collection.
-            Obj.change(collection, (c) => {
-              c.objects.push(Ref.make(Collection.makeManaged({ key: Type.getTypename(Type.PersistentType) })));
-            });
-
             // Allow other plugins to add default content.
             yield* Plugin.activate(SpaceEvents.SpaceCreated);
             const onCreateSpaceCallbacks = yield* Capability.getAll(SpaceCapabilities.OnCreateSpace);
@@ -447,12 +470,12 @@ export default Capability.makeModule(
             const { space, version: targetVersion } = input;
 
             if (space.state.get() === SpaceState.SPACE_REQUIRES_MIGRATION) {
-              yield* Common.Capability.updateAtomValue(SpaceCapabilities.EphemeralState, (current) => ({
+              yield* Capabilities.updateAtomValue(SpaceCapabilities.EphemeralState, (current) => ({
                 ...current,
                 sdkMigrationRunning: { ...current.sdkMigrationRunning, [space.id]: true },
               }));
               yield* Effect.promise(() => space.internal.migrate());
-              yield* Common.Capability.updateAtomValue(SpaceCapabilities.EphemeralState, (current) => ({
+              yield* Capabilities.updateAtomValue(SpaceCapabilities.EphemeralState, (current) => ({
                 ...current,
                 sdkMigrationRunning: { ...current.sdkMigrationRunning, [space.id]: false },
               }));
@@ -494,9 +517,9 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.Rename,
           handler: Effect.fnUntraced(function* (input) {
-            yield* Operation.invoke(Common.LayoutOperation.UpdatePopover, {
+            yield* Operation.invoke(LayoutOperation.UpdatePopover, {
               subject: SPACE_RENAME_POPOVER,
-              anchorId: `dxos.org/ui/${input.caller}/${input.space.id}`,
+              anchorId: input.caller ?? '',
               props: input.space,
             });
           }),
@@ -509,9 +532,9 @@ export default Capability.makeModule(
           operation: SpaceOperation.RenameObject,
           handler: Effect.fnUntraced(function* (input) {
             const object = input.object as Obj.Unknown;
-            yield* Operation.invoke(Common.LayoutOperation.UpdatePopover, {
+            yield* Operation.invoke(LayoutOperation.UpdatePopover, {
               subject: OBJECT_RENAME_POPOVER,
-              anchorId: `dxos.org/ui/${input.caller}/${Obj.getDXN(object).toString()}`,
+              anchorId: input.caller ?? '',
               props: object,
             });
           }),
@@ -523,9 +546,9 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.OpenMembers,
           handler: Effect.fnUntraced(function* (input) {
-            yield* Operation.invoke(Common.LayoutOperation.Open, {
-              subject: [`members-settings${ATTENDABLE_PATH_SEPARATOR}${input.space.id}`],
-              workspace: input.space.id,
+            yield* Operation.invoke(LayoutOperation.Open, {
+              subject: [`${getSpacePath(input.space.id)}/settings`],
+              workspace: getSpacePath(input.space.id),
             });
           }),
         }),
@@ -567,58 +590,16 @@ export default Capability.makeModule(
           }),
         }),
 
-        //
-        // UseStaticSchema
-        //
-        OperationResolver.make({
-          operation: SpaceOperation.UseStaticSchema,
-          handler: Effect.fnUntraced(function* (input) {
-            const db = input.db as Database.Database;
-            const client = yield* Capability.get(ClientCapabilities.Client);
-            const schema: any = yield* Effect.promise(() =>
-              (client as any).graph.schemaRegistry.query({ typename: input.typename, location: ['runtime'] }).first(),
-            );
-            const space = client.spaces.get(db.spaceId);
-            invariant(space, 'Space not found');
-
-            Obj.change(space.properties, (p) => {
-              if (!p.staticRecords) {
-                p.staticRecords = [];
-              }
-              if (!p.staticRecords.includes(input.typename)) {
-                p.staticRecords.push(input.typename);
-              }
-            });
-
-            yield* Plugin.activate(SpaceEvents.SchemaAdded);
-            const onSchemaAdded = yield* Capability.getAll(SpaceCapabilities.OnSchemaAdded);
-            yield* Effect.all(
-              onSchemaAdded.map((callback) => callback({ db, schema, show: input.show })),
-              { concurrency: 'unbounded' },
-            );
-
-            yield* Operation.schedule(ObservabilityOperation.SendEvent, {
-              name: 'space.schema.use',
-              properties: {
-                spaceId: space.id,
-                typename: Type.getTypename(schema),
-              },
-            });
-
-            return {};
-          }),
-        }),
-
         //
         // AddSchema
         //
         OperationResolver.make({
           operation: SpaceOperation.AddSchema,
           handler: Effect.fnUntraced(function* (input) {
-            const db = input.db as any;
-            const schemas = (yield* Effect.promise(() => db.schemaRegistry.register([input.schema]))) as any[];
+            const db = input.db;
+            const schemas = yield* Effect.promise(() => db.schemaRegistry.register([input.schema]));
             const schema = schemas[0];
-            Obj.change(schema.storedSchema, (s) => {
+            Obj.change(schema.persistentSchema, (s) => {
               if (input.name) {
                 s.name = input.name;
               }
@@ -646,7 +627,7 @@ export default Capability.makeModule(
               },
             });
 
-            return { id: schema.id, object: schema.storedSchema, schema };
+            return { id: schema.id, object: schema.persistentSchema, schema };
           }),
         }),
 
@@ -690,7 +671,7 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.RestoreField,
           handler: Effect.fnUntraced(function* (input) {
-            const registry = yield* Capability.get(Common.Capability.AtomRegistry);
+            const registry = yield* Capability.get(Capabilities.AtomRegistry);
             const view = input.view as any;
             const db = Obj.getDatabase(view);
             invariant(db);
@@ -750,7 +731,7 @@ export default Capability.makeModule(
 
             // Re-open objects that were active.
             if (wasActive.length > 0) {
-              yield* Operation.invoke(Common.LayoutOperation.Open, { subject: wasActive });
+              yield* Operation.invoke(LayoutOperation.Open, { subject: wasActive });
             }
           }),
         }),
@@ -758,3 +739,25 @@ export default Capability.makeModule(
     ];
   }),
 );
+
+/** Resolves the subject path where a newly added object should be opened in the graph. */
+const getSubjectPathForNewObject = (props: {
+  spaceId: string;
+  objectId: string;
+  nodeId?: string;
+  typename: string;
+  /** When set, the object is a view (e.g. Table) and should open under the type its query targets. */
+  viewTargetTypename?: string;
+}): string => {
+  const { nodeId, typename, viewTargetTypename, spaceId, objectId } = props;
+  if (typeof nodeId === 'string') {
+    return `${nodeId}/${objectId}`;
+  }
+  if (typename === Collection.Collection.typename) {
+    return getCollectionsPath(spaceId, objectId);
+  }
+  if (viewTargetTypename) {
+    return getTypePath(spaceId, viewTargetTypename, objectId);
+  }
+  return getObjectPath(spaceId, typename, objectId);
+};

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

@@ -5,8 +5,8 @@
 import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { Capability, Common } from '@dxos/app-framework';
-import { useAtomCapability } from '@dxos/app-framework/react';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { useAtomCapability } from '@dxos/app-framework/ui';
 
 import { AwaitingObject } from '../../components';
 import { meta } from '../../meta';
@@ -14,7 +14,7 @@ import { SpaceCapabilities } from '../../types';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
-    Capability.contributes(Common.Capability.ReactRoot, {
+    Capability.contributes(Capabilities.ReactRoot, {
       id: meta.id,
       root: () => {
         const ephemeral = useAtomCapability(SpaceCapabilities.EphemeralState);