@gadmin2n/schematics 0.0.147 → 0.0.149

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/workflow/workflow.service.ts

@@ -61,7 +61,7 @@ export interface BusinessEventCatalogItem {
   label: string;
   schemaName: string;
   tableName: string;
-  operation: 'INSERT' | 'UPDATE' | 'DELETE';
+  operations: Array<'INSERT' | 'UPDATE' | 'DELETE'>;
   watchedFields: string[];
   primaryKeyFields: string[];
   isEnabled: boolean;
@@ -128,7 +128,7 @@ export function buildBusinessEventCatalog(
     code: string;
     schemaName: string;
     tableName: string;
-    operation: string;
+    operations: string[];
     watchedFields: Prisma.JsonValue;
     primaryKeyFields: Prisma.JsonValue;
     isEnabled: boolean;
@@ -143,12 +143,14 @@ export function buildBusinessEventCatalog(
         column.schemaName === row.schemaName &&
         column.tableName === row.tableName,
     );
-    const prefixes =
-      row.operation === 'INSERT'
-        ? ['after']
-        : row.operation === 'DELETE'
+    const prefixes = [
+      ...(row.operations.some((operation) => operation !== 'INSERT')
         ? ['before']
-        : ['before', 'after'];
+        : []),
+      ...(row.operations.some((operation) => operation !== 'DELETE')
+        ? ['after']
+        : []),
+    ];
     const fields = [
       ...primaryKeyFields.flatMap((columnName) => {
         const column = sourceColumns.find(
@@ -164,17 +166,22 @@ export function buildBusinessEventCatalog(
             `${prefix}.${column.columnName}`,
             column,
             false,
-            column.nullable,
+            column.nullable ||
+              row.operations.includes(
+                prefix === 'before' ? 'INSERT' : 'DELETE',
+              ),
           ),
         ),
       ),
     ];
     return {
       registrationCode: row.code,
-      label: `${row.schemaName}.${row.tableName} · ${row.operation}`,
+      label: `${row.schemaName}.${row.tableName} · ${row.operations.join(
+        ' / ',
+      )}`,
       schemaName: row.schemaName,
       tableName: row.tableName,
-      operation: row.operation as BusinessEventCatalogItem['operation'],
+      operations: row.operations as BusinessEventCatalogItem['operations'],
       watchedFields,
       primaryKeyFields,
       isEnabled: row.isEnabled,
@@ -226,7 +233,28 @@ export function validateBusinessEventTriggers(
     const event = eventByCode.get(registrationCode);
     if (!event) continue;
 
-    validateBusinessEventMatch(config.match, event);
+    const rules = config.operationRules;
+    if (!Array.isArray(rules) || rules.length === 0)
+      throw invalidBusinessEventMatch(event, '请至少启用一种操作的启动规则');
+    const seen = new Set<string>();
+    for (const value of rules) {
+      const rule = asRecord(value);
+      const operation =
+        rule.operation as BusinessEventCatalogItem['operations'][number];
+      if (!event.operations.includes(operation) || seen.has(operation))
+        throw invalidBusinessEventMatch(event, '操作未登记或重复配置');
+      seen.add(operation);
+      // before is unavailable for INSERT; after is unavailable for DELETE.
+      const availableEvent = {
+        ...event,
+        fields: event.fields.filter(
+          (field) =>
+            !(operation === 'INSERT' && field.path.startsWith('before.')) &&
+            !(operation === 'DELETE' && field.path.startsWith('after.')),
+        ),
+      };
+      validateBusinessEventMatch(rule.match, availableEvent);
+    }
 
     if (config.processingMode !== 'SERIAL_BY_KEY') continue;
 
@@ -246,7 +274,13 @@ export function validateBusinessEventTriggers(
   }
 }
 
-const EVENT_MATCH_OPERATORS = new Set(['EQ', 'NEQ', 'EMPTY', 'NOT_EMPTY']);
+const EVENT_MATCH_OPERATORS = new Set([
+  'EQ',
+  'NEQ',
+  'IN',
+  'EMPTY',
+  'NOT_EMPTY',
+]);
 const EVENT_MATCH_UNARY_OPERATORS = new Set(['EMPTY', 'NOT_EMPTY']);
 
 function validateBusinessEventMatch(
@@ -292,14 +326,27 @@ function validateBusinessEventMatch(
         : field.type === 'boolean'
         ? 'BOOLEAN'
         : 'STRING';
+    let values: unknown[] = [right.value];
+    if (operator === 'IN') {
+      try {
+        values = JSON.parse(String(right.value));
+      } catch {
+        throw invalidBusinessEventMatch(event, '比较值列表无效');
+      }
+    }
     if (
       right.source !== 'FIXED' ||
       right.valueType !== expectedValueType ||
-      typeof right.value !== 'string' ||
-      (expectedValueType === 'NUMBER' &&
-        (!right.value.trim() || !Number.isFinite(Number(right.value)))) ||
-      (expectedValueType === 'BOOLEAN' &&
-        !['true', 'false'].includes(right.value))
+      !Array.isArray(values) ||
+      values.length === 0 ||
+      values.some(
+        (value) =>
+          typeof value !== 'string' ||
+          (expectedValueType === 'NUMBER' &&
+            (!value.trim() || !Number.isFinite(Number(value)))) ||
+          (expectedValueType === 'BOOLEAN' &&
+            !['true', 'false'].includes(value)),
+      )
     ) {
       throw invalidBusinessEventMatch(event, `字段“${path}”的比较值类型不正确`);
     }
@@ -592,7 +639,13 @@ export class WorkflowService {
 
     const runsMap = new Map<
       bigint,
-      { pending: number; running: number; completed: number; failed: number }
+      {
+        pending: number;
+        running: number;
+        completed: number;
+        failed: number;
+        cancelled: number;
+      }
     >();
     for (const row of instanceCounts) {
       if (!runsMap.has(row.workflowId)) {
@@ -601,6 +654,7 @@ export class WorkflowService {
           running: 0,
           completed: 0,
           failed: 0,
+          cancelled: 0,
         });
       }
       const entry = runsMap.get(row.workflowId)!;
@@ -627,6 +681,7 @@ export class WorkflowService {
         running: 0,
         completed: 0,
         failed: 0,
+        cancelled: 0,
       },
       lastRun: lastRunMap.get(item.id)?.createdAt || null,
     }));
@@ -713,11 +768,7 @@ export class WorkflowService {
     const [events, columns, schemaName] = await Promise.all([
       this.prisma.workflowBusinessEventRegistration.findMany({
         where: { isEnabled: true },
-        orderBy: [
-          { schemaName: 'asc' },
-          { tableName: 'asc' },
-          { operation: 'asc' },
-        ],
+        orderBy: [{ schemaName: 'asc' }, { tableName: 'asc' }, { code: 'asc' }],
       }),
       this.findBusinessEventColumns(),
       this.findBusinessEventSchema(),
@@ -802,7 +853,7 @@ export class WorkflowService {
     data: {
       schemaName: string;
       tableName: string;
-      operation: 'INSERT' | 'UPDATE' | 'DELETE';
+      operations: Array<'INSERT' | 'UPDATE' | 'DELETE'>;
       watchedFields: string[];
     },
     creator: string,
@@ -823,17 +874,24 @@ export class WorkflowService {
     if (sourceColumns.length === 0)
       throw new BadRequestException('请选择可监听的数据库表');
 
+    if (
+      !Array.isArray(data.operations) ||
+      data.operations.length === 0 ||
+      data.operations.some(
+        (operation) => !['INSERT', 'UPDATE', 'DELETE'].includes(operation),
+      )
+    ) {
+      throw new BadRequestException('请至少选择一种有效的数据操作');
+    }
+    const operations = [...new Set(data.operations)].sort();
     const requestedFields = [
       ...new Set(
         data.watchedFields.map((field) => field.trim()).filter(Boolean),
       ),
     ].sort();
-    if (data.operation === 'UPDATE' && requestedFields.length === 0)
+    if (operations.includes('UPDATE') && requestedFields.length === 0)
       throw new BadRequestException('请至少选择一个监听字段');
-    const watchedFields =
-      data.operation === 'UPDATE'
-        ? requestedFields
-        : sourceColumns.map((column) => column.columnName).sort();
+    const watchedFields = operations.includes('UPDATE') ? requestedFields : [];
     const availableFields = new Set(
       sourceColumns.map((column) => column.columnName),
     );
@@ -853,7 +911,7 @@ export class WorkflowService {
         JSON.stringify({
           schemaName: data.schemaName,
           tableName: data.tableName,
-          operation: data.operation,
+          operations,
           watchedFields,
         }),
       )
@@ -877,7 +935,7 @@ export class WorkflowService {
               registrationKey,
               schemaName: data.schemaName,
               tableName: data.tableName,
-              operation: data.operation,
+              operations,
               watchedFields,
               primaryKeyFields,
               creator,
@@ -887,7 +945,9 @@ export class WorkflowService {
       return registration;
     });
     this.logger.log(
-      `Registered ${event.operation} listener ${event.schemaName}.${event.tableName} (${event.code})`,
+      `Registered ${event.operations.join('/')} listener ${event.schemaName}.${
+        event.tableName
+      } (${event.code})`,
     );
     return buildBusinessEventCatalog([event], columns)[0];
   }
@@ -898,7 +958,7 @@ export class WorkflowService {
       id: bigint;
       schemaName: string;
       tableName: string;
-      operation: string;
+      operations: string[];
       watchedFields: Prisma.JsonValue;
       primaryKeyFields: Prisma.JsonValue;
     },
@@ -926,10 +986,13 @@ export class WorkflowService {
     const workflowSchema = quoteIdentifier(
       workflowSchemaRows[0]?.schemaName || 'public',
     );
-    const triggerEvent =
-      event.operation === 'UPDATE'
-        ? `UPDATE OF ${watchedFields.map(quoteIdentifier).join(', ')}`
-        : event.operation;
+    const triggerEvent = event.operations
+      .map((operation) =>
+        operation === 'UPDATE'
+          ? `UPDATE OF ${watchedFields.map(quoteIdentifier).join(', ')}`
+          : operation,
+      )
+      .join(' OR ');
 
     await tx.$executeRawUnsafe(`
       CREATE OR REPLACE FUNCTION ${schema}.${functionName}()
@@ -2260,8 +2323,13 @@ export class WorkflowService {
   async cancelExecutionInTransaction(
     tx: Prisma.TransactionClient,
     instanceId: bigint,
+    requestedBy: string,
     reason?: string,
   ) {
+    const normalizedRequestedBy = requestedBy.trim().slice(0, 128);
+    if (!normalizedRequestedBy)
+      throw new BadRequestException('Cancellation requester is required');
+
     const rows = await tx.$queryRaw<
       Array<{
         id: bigint;
@@ -2301,6 +2369,7 @@ export class WorkflowService {
           status: 'CANCELLED',
           finishedAt: now,
           cancellationRequestedAt: now,
+          cancellationRequestedBy: normalizedRequestedBy,
           cancellationReason: reason?.trim().slice(0, 512) || null,
           cancellationStatus: instance.temporalRunId ? 'PENDING' : 'COMPLETED',
           cancellationLastError: null,

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/workflowConfig/node-config-validator.service.spec.ts

@@ -112,7 +112,7 @@ describe('NodeConfigValidatorService', () => {
         },
         details: [],
       },
-      subjects: [{ source: 'STATIC', provider: 'USER', refs: ['reviewer'] }],
+      subjects: [{ source: 'STATIC', refs: ['reviewer'] }],
       rejectionRule: { mode: 'ANY' },
       timeout: { durationSeconds: 0, action: 'REJECTED' },
     };
@@ -148,7 +148,7 @@ describe('NodeConfigValidatorService', () => {
         },
         details: [],
       },
-      subjects: [{ source: 'STATIC', provider: 'USER', refs: ['reviewer'] }],
+      subjects: [{ source: 'STATIC', refs: ['reviewer'] }],
       approvalRule: { mode: 'ANY' },
       rejectionRule: { mode: 'ANY' },
       timeout: { durationSeconds: 0, action: 'REJECTED' },
@@ -210,7 +210,6 @@ describe('NodeConfigValidatorService', () => {
       subjects: [
         {
           source: 'DYNAMIC',
-          provider: 'USER',
           inputKey: 'direct_manager',
           label: '查询直属领导',
         },
@@ -354,3 +353,60 @@ describe('NodeConfigValidatorService', () => {
     ).not.toThrow();
   });
 });
+
+describe('event trigger operation rules schema', () => {
+  const schema = NODE_TYPES.find((node) => node.type === 'event_trigger')!
+    .configSchema as JsonSchema;
+  const service = new NodeConfigValidatorService();
+  const validate = (operationRules: unknown) =>
+    service.validateOrThrow('event:5', schema, {
+      registrationCode: 'request-changes',
+      processingMode: 'PARALLEL',
+      operationRules,
+    });
+  it('accepts multiple operations with list conditions', () => {
+    expect(() =>
+      validate([
+        { operation: 'INSERT' },
+        {
+          operation: 'UPDATE',
+          match: {
+            combineOperation: 'AND',
+            conditions: [
+              {
+                id: 'status',
+                left: { source: 'WORKFLOW', path: 'after.status' },
+                operator: 'IN',
+                right: {
+                  source: 'FIXED',
+                  valueType: 'STRING',
+                  value: '["PENDING","PENDING_SUPERIOR"]',
+                },
+              },
+            ],
+          },
+        },
+      ]),
+    ).not.toThrow();
+  });
+  it('rejects empty rules and incomplete conditions', () => {
+    expect(() => validate([])).toThrow(BadRequestException);
+    expect(() =>
+      validate([
+        {
+          operation: 'UPDATE',
+          match: {
+            combineOperation: 'AND',
+            conditions: [
+              {
+                id: 'status',
+                left: { source: 'WORKFLOW', path: 'after.status' },
+                operator: 'IN',
+              },
+            ],
+          },
+        },
+      ]),
+    ).toThrow(BadRequestException);
+  });
+});

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/workflowConfig/subject-config-validator.service.spec.ts

@@ -1,5 +1,4 @@
 import { BadRequestException } from '@nestjs/common';
-import { SubjectProviderError } from '../subjectProvider/subject-provider.errors';
 import { SubjectProviderRegistry } from '../subjectProvider/subject-provider.registry';
 import {
   ActorContext,
@@ -28,9 +27,9 @@ const schema = {
   },
 };
 
-function provider(): jest.Mocked<SubjectProvider> {
+function provider(key = 'USER'): jest.Mocked<SubjectProvider> {
   return {
-    key: 'USER_GROUP',
+    key,
     descriptor: jest.fn(),
     search: jest.fn(),
     create: jest.fn(),
@@ -58,8 +57,8 @@ describe('SubjectConfigValidatorService', () => {
       {
         approval: {
           subjects: [
-            { provider: 'USER_GROUP', refs: ['group:ops'] },
-            { provider: 'USER_GROUP', refs: ['group:security'] },
+            { source: 'STATIC', refs: ['alice'] },
+            { source: 'STATIC', refs: ['bob'] },
           ],
         },
       },
@@ -67,15 +66,39 @@ describe('SubjectConfigValidatorService', () => {
     );
 
     expect(subjectProvider.validate).toHaveBeenCalledWith(
-      ['group:ops', 'group:security'],
+      ['alice', 'bob'],
       actor,
     );
   });
 
+  it('validates fixed user groups with the user-group provider', async () => {
+    const userGroupProvider = provider('USER_GROUP');
+    registry.register(userGroupProvider);
+
+    await service.validateSubjects(
+      schema,
+      {
+        approval: {
+          subjects: [
+            {
+              source: 'STATIC',
+              provider: 'USER_GROUP',
+              refs: ['finance'],
+            },
+          ],
+        },
+      },
+      actor,
+    );
+
+    expect(userGroupProvider.validate).toHaveBeenCalledWith(['finance'], actor);
+    expect(subjectProvider.validate).not.toHaveBeenCalled();
+  });
+
   it('rejects malformed, duplicate, and provider-invalid references', async () => {
     subjectProvider.validate.mockResolvedValue({
       valid: false,
-      issues: [{ ref: 'group:missing', code: 'NOT_FOUND', message: 'Missing' }],
+      issues: [{ ref: 'missing', code: 'NOT_FOUND', message: 'Missing' }],
     });
 
     await expect(
@@ -83,7 +106,7 @@ describe('SubjectConfigValidatorService', () => {
         schema,
         {
           approval: {
-            subjects: [{ provider: 'USER_GROUP', refs: ['group:missing'] }],
+            subjects: [{ source: 'STATIC', refs: ['missing'] }],
           },
         },
         actor,
@@ -96,19 +119,7 @@ describe('SubjectConfigValidatorService', () => {
     });
   });
 
-  it('preserves registry errors and sanitizes unexpected provider failures', async () => {
-    await expect(
-      service.validateSubjects(
-        schema,
-        {
-          approval: {
-            subjects: [{ provider: 'MISSING', refs: ['value'] }],
-          },
-        },
-        actor,
-      ),
-    ).rejects.toBeInstanceOf(SubjectProviderError);
-
+  it('sanitizes unexpected provider failures', async () => {
     subjectProvider.validate.mockRejectedValueOnce(
       new BadRequestException({ code: 'PROVIDER_LEAK', secret: 'secret DSN' }),
     );
@@ -117,7 +128,7 @@ describe('SubjectConfigValidatorService', () => {
         schema,
         {
           approval: {
-            subjects: [{ provider: 'USER_GROUP', refs: ['group:ops'] }],
+            subjects: [{ source: 'STATIC', refs: ['alice'] }],
           },
         },
         actor,

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/workflowConfig/subject-config-validator.service.ts

@@ -137,16 +137,10 @@ export class SubjectConfigValidatorService {
         return;
       }
 
-      const provider = validNonBlankString(entry.provider);
       const source = entry.source ?? 'STATIC';
+      const provider =
+        source === 'DYNAMIC' ? 'USER' : validProvider(entry.provider) ?? 'USER';
       const rawRefs = entry.refs;
-      if (!provider) {
-        issues.push({
-          path: `${entryPath}/provider`,
-          code: 'INVALID_PROVIDER',
-          message: 'provider must be a nonblank string',
-        });
-      }
       if (source === 'DYNAMIC') {
         const inputKey = validNonBlankString(entry.inputKey);
         if (!inputKey) {
@@ -164,11 +158,9 @@ export class SubjectConfigValidatorService {
         } else {
           seenDynamicInputs.add(inputKey);
         }
-        if (provider) {
-          grouped.set(provider, grouped.get(provider) ?? []);
-          if (!providerPaths.has(provider))
-            providerPaths.set(provider, entryPath);
-        }
+        grouped.set(provider, grouped.get(provider) ?? []);
+        if (!providerPaths.has(provider))
+          providerPaths.set(provider, entryPath);
         return;
       }
       if (!Array.isArray(rawRefs) || rawRefs.length === 0) {
@@ -190,17 +182,8 @@ export class SubjectConfigValidatorService {
           });
           return;
         }
-        if (!provider) return;
-
-        const duplicateKey = `${provider}\0${ref}`;
+        const duplicateKey = `${provider}\u0000${ref}`;
         if (seen.has(duplicateKey)) {
-          issues.push({
-            path: `${entryPath}/refs/${refIndex}`,
-            provider,
-            ref,
-            code: 'DUPLICATE_REF',
-            message: 'duplicate ref for provider',
-          });
           return;
         }
 
@@ -232,6 +215,10 @@ function validNonBlankString(value: unknown): string | undefined {
     : undefined;
 }
 
+function validProvider(value: unknown): 'USER' | 'USER_GROUP' | undefined {
+  return value === 'USER' || value === 'USER_GROUP' ? value : undefined;
+}
+
 function toJsonPointer(path: readonly string[]): string {
   if (path.length === 0) return '/';
   return `/${path

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/components/StaffSelect/StaffSelect.test.tsx

@@ -0,0 +1,69 @@
+import { fireEvent, render, screen } from '@testing-library/react';
+import { act } from 'react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { searchStaffDirectory } from './staff-directory.api';
+import { StaffSelect } from './StaffSelect';
+
+vi.mock('./staff-directory.api', () => ({
+  searchStaffDirectory: vi.fn(),
+}));
+
+vi.mock('antd', () => ({
+  Select: ({ onSearch, onChange, options = [] }: any) => (
+    <div>
+      <input
+        aria-label="staff search"
+        onChange={(event) => onSearch(event.target.value)}
+      />
+      {options.map((option: any) => (
+        <button key={option.value} onClick={() => onChange(option.value)}>
+          {option.label}
+        </button>
+      ))}
+    </div>
+  ),
+  Empty: Object.assign(() => <div>empty</div>, {
+    PRESENTED_IMAGE_SIMPLE: 'simple',
+  }),
+  Space: ({ children }: any) => <div>{children}</div>,
+  Spin: () => <div>loading</div>,
+  Typography: {
+    Text: ({ children }: any) => <span>{children}</span>,
+  },
+}));
+
+describe('StaffSelect', () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    vi.clearAllMocks();
+  });
+
+  afterEach(() => vi.useRealTimers());
+
+  it('searches through the shared backend and returns the selected person', async () => {
+    vi.mocked(searchStaffDirectory).mockResolvedValue([
+      {
+        userId: 'junrujrwang',
+        displayName: 'Junru Wang',
+        businessGroup: 'OIT',
+      },
+    ]);
+    const onChange = vi.fn();
+    const onPersonChange = vi.fn();
+    render(<StaffSelect onChange={onChange} onPersonChange={onPersonChange} />);
+
+    fireEvent.change(screen.getByRole('textbox', { name: 'staff search' }), {
+      target: { value: 'junru' },
+    });
+    await act(() => vi.advanceTimersByTimeAsync(300));
+
+    expect(searchStaffDirectory).toHaveBeenCalledWith('junru');
+    fireEvent.click(
+      screen.getByRole('button', { name: 'Junru Wang (junrujrwang)' }),
+    );
+    expect(onChange).toHaveBeenCalledWith('junrujrwang');
+    expect(onPersonChange).toHaveBeenCalledWith(
+      expect.objectContaining({ userId: 'junrujrwang' }),
+    );
+  });
+});