@dxos/plugin-automation 0.8.4-main.67995b8 → 0.8.4-main.ae835ea

package/src/components/AutomationPanel/AutomationPanel.stories.tsx

@@ -2,21 +2,19 @@
 // Copyright 2024 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { Obj } from '@dxos/echo';
-import { FunctionType, FunctionTrigger } from '@dxos/functions';
+import { Function, Trigger } from '@dxos/functions';
 import { useSpaces } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
-import { AutomationPanel } from './AutomationPanel';
 import { functions } from '../../testing';
 import { translations } from '../../translations';
 
+import { AutomationPanel } from './AutomationPanel';
+
 const DefaultStory = () => {
   const spaces = useSpaces();
   const space = spaces[1];
@@ -28,30 +26,31 @@ const DefaultStory = () => {
   );
 };
 
-const meta: Meta = {
+const meta = {
   title: 'plugins/plugin-automation/AutomationPanel',
-  component: AutomationPanel,
+  component: AutomationPanel as any,
   render: DefaultStory,
   decorators: [
+    withTheme,
     withClientProvider({
       createIdentity: true,
       createSpace: true,
-      types: [FunctionType, FunctionTrigger],
-      onSpaceCreated: ({ space }) => {
+      types: [Function.Function, Trigger.Trigger],
+      onCreateSpace: ({ space }) => {
         for (const fn of functions) {
-          space.db.add(Obj.make(FunctionType, fn));
+          space.db.add(Function.make(fn));
         }
       },
     }),
-    withLayout(),
-    withTheme,
   ],
   parameters: {
     layout: 'centered',
     translations,
   },
-};
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 
-export const Default = {};
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/components/AutomationPanel/AutomationPanel.tsx

@@ -2,60 +2,61 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
-import React, { useState } from 'react';
-
-import { Filter, Obj } from '@dxos/echo';
-import {
-  FunctionType,
-  FunctionTrigger,
-  FunctionTriggerSchema,
-  type FunctionTriggerType,
-  ScriptType,
-  TriggerKind,
-} from '@dxos/functions';
+import * as Array from 'effect/Array';
+import * as EFn from 'effect/Function';
+import * as Match from 'effect/Match';
+import * as Schema from 'effect/Schema';
+import React, { useMemo, useState } from 'react';
+
+import { Filter, Obj, Tag } from '@dxos/echo';
+import { Function, Script, Trigger } from '@dxos/functions';
+import { useTypeOptions } from '@dxos/plugin-space';
 import { type Client, useClient } from '@dxos/react-client';
-import { useQuery, type Space, getSpace } from '@dxos/react-client/echo';
-import { Clipboard, IconButton, Input, Separator, useTranslation } from '@dxos/react-ui';
+import { type Space, getSpace, useQuery } from '@dxos/react-client/echo';
+import { Clipboard, IconButton, Input, Separator, type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { ControlItem, controlItemClasses } from '@dxos/react-ui-form';
 import { List } from '@dxos/react-ui-list';
 import { ghostHover, mx } from '@dxos/react-ui-theme';
+import { DataType } from '@dxos/schema';
 
-import { AUTOMATION_PLUGIN } from '../../meta';
+import { meta } from '../../meta';
 import { TriggerEditor, type TriggerEditorProps } from '../TriggerEditor';
 
 const grid = 'grid grid-cols-[40px_1fr_32px] min-bs-[2.5rem]';
 
-export type AutomationPanelProps = {
+export type AutomationPanelProps = ThemedClassName<{
   space: Space;
   object?: Obj.Any;
-  initialTrigger?: FunctionTriggerType;
+  initialTrigger?: Trigger.Trigger;
   onDone?: () => void;
-};
+}>;
 
 // TODO(burdon): Factor out common layout with ViewEditor.
-export const AutomationPanel = ({ space, object, initialTrigger, onDone }: AutomationPanelProps) => {
-  const { t } = useTranslation(AUTOMATION_PLUGIN);
+export const AutomationPanel = ({ classNames, space, object, initialTrigger, onDone }: AutomationPanelProps) => {
+  const { t } = useTranslation(meta.id);
   const client = useClient();
-  const triggers = useQuery(space, Filter.type(FunctionTrigger));
-  const functions = useQuery(space, Filter.type(FunctionType));
-  const scripts = useQuery(space, Filter.type(ScriptType));
-
-  const [trigger, setTrigger] = useState<FunctionTriggerType | undefined>(initialTrigger);
-  const [selected, setSelected] = useState<FunctionTrigger>();
-
-  const handleSelect = (trigger: FunctionTrigger) => {
-    const { id: _, ...values } = trigger;
-    setTrigger(values);
+  const functions = useQuery(space, Filter.type(Function.Function));
+  const triggers = useQuery(space, Filter.type(Trigger.Trigger));
+  const filteredTriggers = useMemo(() => {
+    return object ? triggers.filter(triggerMatch(object)) : triggers;
+  }, [object, triggers]);
+  const tags = useQuery(space, Filter.type(Tag.Tag));
+  const types = useTypeOptions({ space, annotation: ['dynamic', 'limited-static', 'object-form'] });
+
+  const [trigger, setTrigger] = useState<Trigger.Trigger | undefined>(initialTrigger);
+  const [selected, setSelected] = useState<Trigger.Trigger>();
+
+  const handleSelect = (trigger: Trigger.Trigger) => {
+    setTrigger(trigger);
     setSelected(trigger);
   };
 
   const handleAdd = () => {
-    setTrigger(Obj.make(FunctionTriggerSchema, {}));
+    setTrigger(Trigger.make({}));
     setSelected(undefined);
   };
 
-  const handleDelete = (trigger: FunctionTrigger) => {
+  const handleDelete = (trigger: Trigger.Trigger) => {
     space.db.remove(trigger);
     setTrigger(undefined);
     setSelected(undefined);
@@ -65,7 +66,7 @@ export const AutomationPanel = ({ space, object, initialTrigger, onDone }: Autom
     if (selected) {
       Object.assign(selected, trigger);
     } else {
-      space.db.add(Obj.make(FunctionTrigger, trigger));
+      space.db.add(Trigger.make(trigger));
     }
 
     setTrigger(undefined);
@@ -81,21 +82,33 @@ export const AutomationPanel = ({ space, object, initialTrigger, onDone }: Autom
   if (trigger) {
     return (
       <ControlItem title={t('trigger editor title')}>
-        <TriggerEditor space={space} trigger={trigger} onSave={handleSave} onCancel={handleCancel} />
+        <TriggerEditor
+          space={space}
+          trigger={trigger}
+          readonlySpec={Boolean(object)}
+          tags={tags}
+          types={types}
+          onSave={handleSave}
+          onCancel={handleCancel}
+        />
       </ControlItem>
     );
   }
 
   return (
-    <div className={controlItemClasses}>
-      {triggers.length > 0 && (
-        <List.Root<FunctionTrigger> items={triggers} isItem={Schema.is(FunctionTrigger)} getId={(field) => field.id}>
-          {({ items: triggers }) => (
+    <div className={mx(controlItemClasses, classNames)}>
+      {filteredTriggers.length > 0 && (
+        <List.Root<Trigger.Trigger>
+          items={filteredTriggers}
+          isItem={Schema.is(Trigger.Trigger)}
+          getId={(field) => field.id}
+        >
+          {({ items: filteredTriggers }) => (
             <div role='list' className='flex flex-col w-full'>
-              {triggers?.map((trigger) => {
+              {filteredTriggers?.map((trigger) => {
                 const copyAction = getCopyAction(client, trigger);
                 return (
-                  <List.Item<FunctionTrigger>
+                  <List.Item<Trigger.Trigger>
                     key={trigger.id}
                     item={trigger}
                     classNames={mx(grid, ghostHover, 'items-center', 'px-2')}
@@ -112,7 +125,7 @@ export const AutomationPanel = ({ space, object, initialTrigger, onDone }: Autom
                         classNames='px-1 cursor-pointer w-0 shrink truncate'
                         onClick={() => handleSelect(trigger)}
                       >
-                        {getFunctionName(scripts, functions, trigger) ?? '∅'}
+                        {getFunctionName(functions, trigger) ?? '∅'}
                       </List.ItemTitle>
 
                       {/* TODO: a better way to expose copy action */}
@@ -132,25 +145,25 @@ export const AutomationPanel = ({ space, object, initialTrigger, onDone }: Autom
           )}
         </List.Root>
       )}
-      {triggers.length > 0 && <Separator classNames='mlb-4' />}
+      {filteredTriggers.length > 0 && <Separator classNames='mlb-4' />}
       <IconButton icon='ph--plus--regular' label={t('new trigger label')} onClick={handleAdd} />
     </div>
   );
 };
 
-const getCopyAction = (client: Client, trigger: FunctionTrigger | undefined) => {
-  if (trigger?.spec?.kind === TriggerKind.Email) {
+const getCopyAction = (client: Client, trigger: Trigger.Trigger | undefined) => {
+  if (trigger?.spec?.kind === 'email') {
     return { translationKey: 'trigger copy email', contentProvider: () => `${getSpace(trigger)!.id}@dxos.network` };
   }
 
-  if (trigger?.spec?.kind === TriggerKind.Webhook) {
+  if (trigger?.spec?.kind === 'webhook') {
     return { translationKey: 'trigger copy url', contentProvider: () => getWebhookUrl(client, trigger) };
   }
 
   return undefined;
 };
 
-const getWebhookUrl = (client: Client, trigger: FunctionTrigger) => {
+const getWebhookUrl = (client: Client, trigger: Trigger.Trigger) => {
   const spaceId = getSpace(trigger)!.id;
   const edgeUrl = new URL(client.config.values.runtime!.services!.edge!.url!);
   const isSecure = edgeUrl.protocol.startsWith('https') || edgeUrl.protocol.startsWith('wss');
@@ -158,14 +171,52 @@ const getWebhookUrl = (client: Client, trigger: FunctionTrigger) => {
   return new URL(`/webhook/${spaceId}:${trigger.id}`, edgeUrl).toString();
 };
 
-const getFunctionName = (scripts: ScriptType[], functions: FunctionType[], trigger: FunctionTriggerType) => {
+const getFunctionName = (functions: Function.Function[], trigger: Trigger.Trigger) => {
   // TODO(wittjosiah): Truncation should be done in the UI.
   //   Warning that the List component is currently a can of worms.
   const shortId = trigger.function && `${trigger.function.dxn.toString().slice(0, 16)}…`;
   const functionObject = functions.find((fn) => fn === trigger.function?.target);
-  if (!functionObject) {
-    return shortId;
+  return functionObject?.name ?? shortId;
+};
+
+const scriptMatch = (script: Script.Script) => (trigger: Trigger.Trigger) => {
+  const fn = trigger.function?.target;
+  if (!Obj.instanceOf(Function.Function, fn)) {
+    return false;
   }
 
-  return scripts.find((s) => functionObject.source?.target?.id === s.id)?.name ?? shortId;
+  return fn.source?.target === script;
 };
+
+const projectMatch = (project: DataType.Project) => {
+  const viewQueries = EFn.pipe(
+    project.collections,
+    Array.map((collection) => collection.target),
+    Array.filter(Schema.is(DataType.View)),
+    Array.map((view) => Obj.getSnapshot(view).query.ast),
+    Array.map((ast) => JSON.stringify(ast)),
+  );
+
+  return (trigger: Trigger.Trigger) => {
+    const spec = Obj.getSnapshot(trigger).spec;
+    if (spec?.kind !== 'subscription') {
+      return false;
+    }
+
+    // TODO(wittjosiah): Implement better way of comparing query ASTs.
+    return viewQueries.some((query) => JSON.stringify(spec.query) === query);
+  };
+};
+
+const triggerMatch = Match.type<Obj.Any>().pipe(
+  Match.withReturnType<(trigger: Trigger.Trigger) => boolean>(),
+  Match.when(
+    (obj) => Obj.instanceOf(Script.Script, obj),
+    (obj) => scriptMatch(obj),
+  ),
+  Match.when(
+    (obj) => Obj.instanceOf(DataType.Project, obj),
+    (obj) => projectMatch(obj),
+  ),
+  Match.orElse((_obj) => () => true),
+);

package/src/components/AutomationSettings.tsx

@@ -0,0 +1,30 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React from 'react';
+
+import { useTranslation } from '@dxos/react-ui';
+import { ControlPage, ControlSection } from '@dxos/react-ui-form';
+
+import { meta } from '../meta';
+
+import { AutomationPanel, type AutomationPanelProps } from './AutomationPanel';
+import { TriggersSettings } from './TriggerSettings';
+
+export const AutomationSettings = (props: AutomationPanelProps) => {
+  const { t } = useTranslation(meta.id);
+  return (
+    <ControlPage>
+      <ControlSection
+        title={t('automation verbose label', { ns: meta.id })}
+        description={t('automation description', { ns: meta.id })}
+      >
+        <AutomationPanel {...props} />
+        <TriggersSettings space={props.space} />
+      </ControlSection>
+    </ControlPage>
+  );
+};
+
+export default AutomationSettings;

package/src/components/FunctionsContainer.tsx

@@ -7,24 +7,22 @@ import React from 'react';
 import { type Space } from '@dxos/react-client/echo';
 import { useTranslation } from '@dxos/react-ui';
 import { ControlPage, ControlSection } from '@dxos/react-ui-form';
-import { StackItem } from '@dxos/react-ui-stack';
+
+import { meta } from '../meta';
 
 import { FunctionsPanel } from './FunctionsPanel';
-import { AUTOMATION_PLUGIN } from '../meta';
 
 export const FunctionsContainer = ({ space }: { space: Space }) => {
-  const { t } = useTranslation(AUTOMATION_PLUGIN);
+  const { t } = useTranslation(meta.id);
   return (
-    <StackItem.Content classNames='block overflow-y-auto'>
-      <ControlPage>
-        <ControlSection
-          title={t('functions verbose label', { ns: AUTOMATION_PLUGIN })}
-          description={t('functions description', { ns: AUTOMATION_PLUGIN })}
-        >
-          <FunctionsPanel space={space} />
-        </ControlSection>
-      </ControlPage>
-    </StackItem.Content>
+    <ControlPage>
+      <ControlSection
+        title={t('functions verbose label', { ns: meta.id })}
+        description={t('functions description', { ns: meta.id })}
+      >
+        <FunctionsPanel space={space} />
+      </ControlSection>
+    </ControlPage>
   );
 };
 

package/src/components/FunctionsPanel/FunctionsPanel.tsx

@@ -2,18 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React, { useCallback, useMemo } from 'react';
 
-import { createIntent, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
-import { FunctionType, ScriptType } from '@dxos/functions';
-import { Filter, fullyQualifiedId, useQuery, type Space } from '@dxos/react-client/echo';
-import { Button, useTranslation } from '@dxos/react-ui';
+import { LayoutAction, createIntent, useIntentDispatcher } from '@dxos/app-framework';
+import { Function, Script } from '@dxos/functions';
+import { SpaceAction } from '@dxos/plugin-space/types';
+import { Filter, type Space, fullyQualifiedId, useQuery } from '@dxos/react-client/echo';
+import { Button, IconButton, useTranslation } from '@dxos/react-ui';
 import { controlItemClasses } from '@dxos/react-ui-form';
 import { List } from '@dxos/react-ui-list';
 import { ghostHover, mx } from '@dxos/react-ui-theme';
 
-import { AUTOMATION_PLUGIN } from '../../meta';
+import { meta } from '../../meta';
 
 const grid = 'grid grid-cols-[1fr_auto] min-bs-[2.5rem]';
 
@@ -22,9 +23,9 @@ export type FunctionsPanelProps = {
 };
 
 export const FunctionsPanel = ({ space }: FunctionsPanelProps) => {
-  const { t } = useTranslation(AUTOMATION_PLUGIN);
-  const functions = useQuery(space, Filter.type(FunctionType));
-  const scripts = useQuery(space, Filter.type(ScriptType));
+  const { t } = useTranslation(meta.id);
+  const functions = useQuery(space, Filter.type(Function.Function));
+  const scripts = useQuery(space, Filter.type(Script.Script));
   const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   const functionToScriptMap = useMemo(
@@ -40,13 +41,13 @@ export const FunctionsPanel = ({ space }: FunctionsPanelProps) => {
           }
           return map;
         },
-        {} as Record<string, ScriptType>,
+        {} as Record<string, Script.Script>,
       ),
     [functions, scripts],
   );
 
   const getScriptName = useCallback(
-    (func: FunctionType) => {
+    (func: Function.Function) => {
       const script = functionToScriptMap[func.id];
       return script?.name;
     },
@@ -54,7 +55,7 @@ export const FunctionsPanel = ({ space }: FunctionsPanelProps) => {
   );
 
   const handleGoToScript = useCallback(
-    (func: FunctionType) => {
+    (func: Function.Function) => {
       const script = functionToScriptMap[func.id];
       if (script) {
         void dispatch(createIntent(LayoutAction.Open, { part: 'main', subject: [fullyQualifiedId(script)] }));
@@ -63,14 +64,19 @@ export const FunctionsPanel = ({ space }: FunctionsPanelProps) => {
     [functionToScriptMap, dispatch],
   );
 
+  const handleDelete = useCallback(
+    (func: Function.Function) => dispatch(createIntent(SpaceAction.RemoveObjects, { objects: [func] })),
+    [dispatch],
+  );
+
   return (
     <div role='none' className={mx(controlItemClasses)}>
       {functions.length > 0 && (
-        <List.Root<FunctionType> items={functions} isItem={Schema.is(FunctionType)} getId={(func) => func.id}>
+        <List.Root<Function.Function> items={functions} isItem={Schema.is(Function.Function)} getId={(func) => func.id}>
           {({ items }) => (
             <div role='list' className='flex flex-col w-full'>
               {items?.map((func) => (
-                <List.Item<FunctionType>
+                <List.Item<Function.Function>
                   key={func.id}
                   item={func}
                   classNames={mx(grid, ghostHover, 'items-center', 'pli-2', 'min-bs-[3rem]')}
@@ -84,6 +90,12 @@ export const FunctionsPanel = ({ space }: FunctionsPanelProps) => {
                   {functionToScriptMap[func.id] && (
                     <Button onClick={() => handleGoToScript(func)}>{t('go to function source button label')}</Button>
                   )}
+                  <IconButton
+                    iconOnly
+                    icon='ph--trash--regular'
+                    label={t('delete function button label')}
+                    onClick={() => handleDelete(func)}
+                  />
                 </List.Item>
               ))}
             </div>

package/src/components/TriggerEditor/FunctionInputEditor.tsx

@@ -5,13 +5,13 @@
 import React, { useCallback, useMemo } from 'react';
 
 import { Ref, Type } from '@dxos/echo';
-import { type JsonPath } from '@dxos/echo-schema';
-import { type FunctionType } from '@dxos/functions';
+import { type JsonPath } from '@dxos/echo/internal';
+import { type Function } from '@dxos/functions';
 import { useOnTransition } from '@dxos/react-ui';
 import { Form, type FormInputStateProps, type QueryRefOptions, useFormValues } from '@dxos/react-ui-form';
 
 export type FunctionInputEditorProps = {
-  functions: FunctionType[];
+  functions: Function.Function[];
   onQueryRefOptions: QueryRefOptions;
 } & FormInputStateProps;
 
@@ -39,7 +39,13 @@ export const FunctionInputEditor = ({
   useOnTransition(
     // Clear function parameter input when the function changes.
     selectedFunctionValue,
-    (prevValue) => prevValue !== undefined && prevValue !== selectedFunctionValue,
+    (prevValue) => {
+      if (!Ref.isRef(prevValue) || !Ref.isRef(selectedFunctionValue)) {
+        return false;
+      }
+
+      return prevValue.dxn.toString() !== selectedFunctionValue.dxn.toString();
+    },
     (currValue) => currValue !== undefined,
     () => onValueChange('object', {}),
   );

package/src/components/TriggerEditor/SpecSelector.tsx

@@ -4,32 +4,38 @@
 
 import React, { useCallback, useMemo } from 'react';
 
-import { type FunctionTriggerType, TriggerKind, type TriggerType } from '@dxos/functions';
+import { Filter, Query } from '@dxos/echo';
+import { Trigger } from '@dxos/functions';
 import { useTranslation } from '@dxos/react-ui';
-import { SelectInput, type InputProps, useInputProps } from '@dxos/react-ui-form';
+import { type InputProps, SelectInput, useInputProps } from '@dxos/react-ui-form';
 
-import { AUTOMATION_PLUGIN } from '../../meta';
+import { meta } from '../../meta';
 
 export type SpecSelectorProps = InputProps;
 
 export const SpecSelector = (props: SpecSelectorProps) => {
-  const { t } = useTranslation(AUTOMATION_PLUGIN);
-  const specProps = useInputProps(['spec' satisfies keyof FunctionTriggerType]);
+  const { t } = useTranslation(meta.id);
+  const specProps = useInputProps(['spec' satisfies keyof Trigger.Trigger]);
 
   const handleTypeChange = useCallback(
-    (_type: any, value: string): TriggerType | undefined => {
+    (_type: any, value: string): Trigger.Spec | undefined => {
       const getDefaultTriggerSpec = (kind: string) => {
         switch (kind) {
-          case TriggerKind.Timer:
-            return { kind: TriggerKind.Timer, cron: '' };
-          case TriggerKind.Subscription:
-            return { kind: TriggerKind.Subscription, filter: {} };
-          case TriggerKind.Queue:
-            return { kind: TriggerKind.Queue, queue: '' };
-          case TriggerKind.Email:
-            return { kind: TriggerKind.Email };
-          case TriggerKind.Webhook:
-            return { kind: TriggerKind.Webhook };
+          case 'timer':
+            return { kind: 'timer', cron: '' };
+          case 'subscription':
+            return {
+              kind: 'subscription',
+              query: {
+                ast: Query.select(Filter.nothing()).ast,
+              },
+            };
+          case 'queue':
+            return { kind: 'queue', queue: 'dxn:' };
+          case 'email':
+            return { kind: 'email' };
+          case 'webhook':
+            return { kind: 'webhook' };
           default:
             return undefined;
         }
@@ -48,7 +54,7 @@ export const SpecSelector = (props: SpecSelectorProps) => {
 
   const options = useMemo(
     () =>
-      Object.values(TriggerKind).map((kind) => ({
+      Trigger.Kinds.map((kind) => ({
         value: kind,
         label: t(`trigger type ${kind}`),
       })),