@gadmin2n/schematics 0.0.96 → 0.0.98

package/dist/lib/application/files/gadmin2-game-angle-demo/temporal/worker/src/dsl/validate.ts

@@ -0,0 +1,109 @@
+/**
+ * DSL handle validator. Confirms each edge's sourceHandle matches the
+ * source node's declared outputs (or, for dynamic nodes like switch,
+ * matches a value derived from config).
+ *
+ * Used at workflow publish time (server-side via a duplicated copy)
+ * and optionally during DSL parsing on the worker side.
+ */
+
+import type { WorkflowDSL, DslNode } from './types';
+import { NODE_TYPE_META } from './node-types';
+
+export type DslValidationCode =
+  | 'EXTRA_HANDLE'      // node has [] outputs, but edge set sourceHandle
+  | 'MISSING_HANDLE'    // node has named outputs, but edge has no sourceHandle (or empty string)
+  | 'UNKNOWN_HANDLE';   // edge sourceHandle is set but ∉ declared outputs
+
+export interface DslValidationError {
+  edgeId: string;
+  source: string;
+  target: string;
+  code: DslValidationCode;
+  reason: string;
+}
+
+/**
+ * Validate every edge's sourceHandle against the source node's outputs metadata.
+ *
+ * Rules per source node's outputs:
+ *  - outputs === null:  dynamic — handles must come from deriveDynamicOutputs(node).
+ *                       Edge sourceHandle MUST be present and ∈ derived list, OR if the
+ *                       derived list is empty (config not yet filled), no constraint.
+ *  - outputs === []:    edge sourceHandle MUST be undefined (no named handles allowed).
+ *  - outputs.length>0:  edge sourceHandle MUST be present and ∈ outputs.
+ *
+ * Returns an array of errors (empty if DSL is valid).
+ */
+export function validateDslHandles(dsl: WorkflowDSL): DslValidationError[] {
+  const errors: DslValidationError[] = [];
+  const nodeMap = new Map<string, DslNode>(dsl.nodes.map((n) => [n.id, n]));
+
+  for (const edge of dsl.edges) {
+    const src = nodeMap.get(edge.source);
+    if (!src) continue; // separate concern (orphan edge); not this validator's job
+
+    const meta = NODE_TYPE_META[src.type];
+    if (!meta) continue; // guards against retired/unknown node types from older DSLs
+
+    const handles = meta.outputs === null
+      ? deriveDynamicOutputs(src)
+      : meta.outputs;
+
+    if (meta.outputs !== null && handles.length === 0) {
+      // Single anonymous output: sourceHandle must be absent
+      if (edge.sourceHandle != null && edge.sourceHandle !== '') {
+        errors.push({
+          edgeId: edge.id,
+          source: edge.source,
+          target: edge.target,
+          code: 'EXTRA_HANDLE',
+          reason: `Node "${src.type}" has no named output handles; edge must not set sourceHandle (got "${edge.sourceHandle}").`,
+        });
+      }
+      continue;
+    }
+
+    // Enumerated or dynamic non-empty: sourceHandle required and must match
+    if (handles.length === 0) {
+      // Dynamic + config not yet filled: skip rather than block edits in progress
+      continue;
+    }
+    if (edge.sourceHandle == null || edge.sourceHandle === '') {
+      errors.push({
+        edgeId: edge.id,
+        source: edge.source,
+        target: edge.target,
+        code: 'MISSING_HANDLE',
+        reason: `Node "${src.type}" requires a sourceHandle; choose one of: ${handles.join(', ')}.`,
+      });
+      continue;
+    }
+    if (!handles.includes(edge.sourceHandle)) {
+      errors.push({
+        edgeId: edge.id,
+        source: edge.source,
+        target: edge.target,
+        code: 'UNKNOWN_HANDLE',
+        reason: `Node "${src.type}" sourceHandle "${edge.sourceHandle}" is not in declared outputs: ${handles.join(', ')}.`,
+      });
+    }
+  }
+
+  return errors;
+}
+
+/**
+ * For dynamic-output nodes (currently just `switch`), derive the list of
+ * handle ids from the node's config.
+ */
+function deriveDynamicOutputs(node: DslNode): string[] {
+  if (node.type === 'switch') {
+    const cases = (node.config as any)?.cases as Array<{ value?: string }> | undefined;
+    if (!Array.isArray(cases)) return [];
+    return cases
+      .map((c) => c?.value)
+      .filter((v): v is string => typeof v === 'string' && v.length > 0);
+  }
+  return [];
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/temporal/worker/src/tests/validate.test.ts

@@ -0,0 +1,205 @@
+import { describe, it, expect } from 'vitest';
+import { validateDslHandles } from '../dsl/validate';
+import type { WorkflowDSL } from '../dsl/types';
+
+// ─── helpers ─────────────────────────────────────────────────────────────────
+
+function makeNode(
+  id: string,
+  type: string,
+  config: Record<string, any> = {},
+): WorkflowDSL['nodes'][number] {
+  return {
+    id,
+    type: type as any,
+    label: id,
+    position: { x: 0, y: 0 },
+    config,
+  };
+}
+
+function makeEdge(
+  id: string,
+  source: string,
+  target: string,
+  sourceHandle?: string,
+): WorkflowDSL['edges'][number] {
+  return sourceHandle === undefined
+    ? { id, source, target }
+    : { id, source, target, sourceHandle };
+}
+
+// ─── if_else (enumerated outputs) ────────────────────────────────────────────
+
+describe('validateDslHandles — if_else', () => {
+  it('accepts sourceHandle "true"', () => {
+    const dsl: WorkflowDSL = {
+      nodes: [makeNode('a', 'if_else'), makeNode('b', 'http_request')],
+      edges: [makeEdge('e1', 'a', 'b', 'true')],
+    };
+    expect(validateDslHandles(dsl)).toEqual([]);
+  });
+
+  it('accepts sourceHandle "false"', () => {
+    const dsl: WorkflowDSL = {
+      nodes: [makeNode('a', 'if_else'), makeNode('b', 'http_request')],
+      edges: [makeEdge('e1', 'a', 'b', 'false')],
+    };
+    expect(validateDslHandles(dsl)).toEqual([]);
+  });
+
+  it('rejects unknown sourceHandle "maybe"', () => {
+    const dsl: WorkflowDSL = {
+      nodes: [makeNode('a', 'if_else'), makeNode('b', 'http_request')],
+      edges: [makeEdge('e1', 'a', 'b', 'maybe')],
+    };
+    const errors = validateDslHandles(dsl);
+    expect(errors).toHaveLength(1);
+    expect(errors[0].edgeId).toBe('e1');
+    expect(errors[0].code).toBe('UNKNOWN_HANDLE');
+    expect(errors[0].reason).toMatch(/not in declared outputs/);
+  });
+
+  it('rejects missing sourceHandle', () => {
+    const dsl: WorkflowDSL = {
+      nodes: [makeNode('a', 'if_else'), makeNode('b', 'http_request')],
+      edges: [makeEdge('e1', 'a', 'b')],
+    };
+    const errors = validateDslHandles(dsl);
+    expect(errors).toHaveLength(1);
+    expect(errors[0].edgeId).toBe('e1');
+    expect(errors[0].code).toBe('MISSING_HANDLE');
+    expect(errors[0].reason).toMatch(/requires a sourceHandle/);
+  });
+
+  it('rejects empty-string sourceHandle as missing', () => {
+    const dsl: WorkflowDSL = {
+      nodes: [makeNode('a', 'if_else'), makeNode('b', 'http_request')],
+      edges: [makeEdge('e1', 'a', 'b', '')],
+    };
+    const errors = validateDslHandles(dsl);
+    expect(errors).toHaveLength(1);
+    expect(errors[0].edgeId).toBe('e1');
+    expect(errors[0].code).toBe('MISSING_HANDLE');
+  });
+});
+
+// ─── cron_trigger (no named outputs) ─────────────────────────────────────────
+
+describe('validateDslHandles — cron_trigger (no named outputs)', () => {
+  it('rejects sourceHandle "foo" on a node with no named handles', () => {
+    const dsl: WorkflowDSL = {
+      nodes: [makeNode('t', 'cron_trigger'), makeNode('a', 'http_request')],
+      edges: [makeEdge('e1', 't', 'a', 'foo')],
+    };
+    const errors = validateDslHandles(dsl);
+    expect(errors).toHaveLength(1);
+    expect(errors[0].edgeId).toBe('e1');
+    expect(errors[0].code).toBe('EXTRA_HANDLE');
+    expect(errors[0].reason).toMatch(/no named output handles/);
+  });
+
+  it('accepts no sourceHandle', () => {
+    const dsl: WorkflowDSL = {
+      nodes: [makeNode('t', 'cron_trigger'), makeNode('a', 'http_request')],
+      edges: [makeEdge('e1', 't', 'a')],
+    };
+    expect(validateDslHandles(dsl)).toEqual([]);
+  });
+
+  it('accepts empty-string sourceHandle (treated as absent for [] nodes)', () => {
+    const dsl: WorkflowDSL = {
+      nodes: [makeNode('t', 'cron_trigger'), makeNode('a', 'http_request')],
+      edges: [makeEdge('e1', 't', 'a', '')],
+    };
+    expect(validateDslHandles(dsl)).toEqual([]);
+  });
+});
+
+// ─── switch (dynamic outputs) ────────────────────────────────────────────────
+
+describe('validateDslHandles — switch (dynamic outputs)', () => {
+  it('accepts sourceHandle matching a case value', () => {
+    const dsl: WorkflowDSL = {
+      nodes: [
+        makeNode('s', 'switch', { cases: [{ value: 'a' }, { value: 'b' }] }),
+        makeNode('x', 'http_request'),
+      ],
+      edges: [makeEdge('e1', 's', 'x', 'a')],
+    };
+    expect(validateDslHandles(dsl)).toEqual([]);
+  });
+
+  it('rejects sourceHandle not in case values', () => {
+    const dsl: WorkflowDSL = {
+      nodes: [
+        makeNode('s', 'switch', { cases: [{ value: 'a' }] }),
+        makeNode('x', 'http_request'),
+      ],
+      edges: [makeEdge('e1', 's', 'x', 'c')],
+    };
+    const errors = validateDslHandles(dsl);
+    expect(errors).toHaveLength(1);
+    expect(errors[0].edgeId).toBe('e1');
+    expect(errors[0].code).toBe('UNKNOWN_HANDLE');
+  });
+
+  it('skips validation when switch config has no cases (in-progress editor)', () => {
+    const dsl: WorkflowDSL = {
+      nodes: [makeNode('s', 'switch'), makeNode('x', 'http_request')],
+      edges: [makeEdge('e1', 's', 'x', 'anything')],
+    };
+    expect(validateDslHandles(dsl)).toEqual([]);
+  });
+});
+
+// ─── out-of-scope (orphan / unknown) ────────────────────────────────────────
+
+describe('validateDslHandles — out-of-scope', () => {
+  it('ignores edge referencing missing source node', () => {
+    const dsl: WorkflowDSL = {
+      nodes: [makeNode('b', 'http_request')],
+      edges: [makeEdge('e1', 'ghost', 'b', 'true')],
+    };
+    expect(validateDslHandles(dsl)).toEqual([]);
+  });
+
+  it('ignores edges from unknown node types', () => {
+    const dsl: WorkflowDSL = {
+      nodes: [makeNode('u', 'wholly_made_up_type'), makeNode('b', 'http_request')],
+      edges: [makeEdge('e1', 'u', 'b', 'whatever')],
+    };
+    expect(validateDslHandles(dsl)).toEqual([]);
+  });
+});
+
+// ─── multiple errors collected ──────────────────────────────────────────────
+
+describe('validateDslHandles — multiple errors', () => {
+  it('collects every error in one pass', () => {
+    const dsl: WorkflowDSL = {
+      nodes: [
+        makeNode('if', 'if_else'),
+        makeNode('cron', 'cron_trigger'),
+        makeNode('sw', 'switch', { cases: [{ value: 'a' }] }),
+        makeNode('x', 'http_request'),
+      ],
+      edges: [
+        makeEdge('e1', 'if', 'x', 'maybe'),    // bad enumerated
+        makeEdge('e2', 'if', 'x'),              // missing required
+        makeEdge('e3', 'cron', 'x', 'foo'),    // forbidden handle
+        makeEdge('e4', 'sw', 'x', 'c'),        // bad dynamic
+      ],
+    };
+    const errors = validateDslHandles(dsl);
+    expect(errors).toHaveLength(4);
+    expect(errors.map((e) => e.edgeId).sort()).toEqual(['e1', 'e2', 'e3', 'e4']);
+    const byEdge = Object.fromEntries(errors.map((e) => [e.edgeId, e.code]));
+    expect(byEdge).toEqual({
+      e1: 'UNKNOWN_HANDLE',
+      e2: 'MISSING_HANDLE',
+      e3: 'EXTRA_HANDLE',
+      e4: 'UNKNOWN_HANDLE',
+    });
+  });
+});

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

@@ -1,3 +1,4 @@
+import React, { useMemo } from 'react';
 import { useGetLocale, useSetLocale, useGetIdentity } from '@refinedev/core';
 import {
   Layout,
@@ -7,14 +8,12 @@ import {
   Avatar,
   Typography,
   theme,
-  Select,
 } from 'antd';
 import { DownOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
-import { useContext } from 'react';
-import { BusinessContext } from 'components/contexts/business';
 import type { MenuProps } from 'antd';
 import { agentAttrs } from 'components/agentPanel/agentAttributes';
+import { HEADER_HEIGHT, Z_INDEX } from 'constants/layout';
 
 type IUser = {
   id: number;
@@ -26,81 +25,81 @@ const { Text } = Typography;
 const { useToken } = theme;
 
 export const Header: React.FC = () => {
-  const { i18n } = useTranslation();
+  const { i18n, t } = useTranslation();
   const locale = useGetLocale();
   const changeLanguage = useSetLocale();
   const { token } = useToken();
   const { data: user } = useGetIdentity<IUser>();
-  const { business, setBusiness, businessList } = useContext(BusinessContext);
 
   const currentLocale = locale();
 
-  const langMenu: MenuProps = {
-    selectedKeys: currentLocale ? [currentLocale] : [],
-    items: [...(i18n.languages || [])].sort().map((lang: string) => ({
-      key: lang,
-      icon: (
-        <span style={{ marginRight: 8 }}>
-          <Avatar size={16} src={`/images/flags/${lang}.svg`} />
-        </span>
-      ),
-      label: lang === 'en' ? 'English' : '中文',
-    })),
-    onClick: ({ key: lang }) => changeLanguage(lang),
-  };
+  // Sort once per language list change, not on every render.
+  const langMenu = useMemo<MenuProps>(
+    () => ({
+      selectedKeys: currentLocale ? [currentLocale] : [],
+      items: [...(i18n.languages || [])].sort().map((lang: string) => ({
+        key: lang,
+        icon: (
+          <span style={{ marginRight: 8, display: 'inline-flex' }}>
+            <Avatar size={16} src={`/images/flags/${lang}.svg`} alt="" />
+          </span>
+        ),
+        label: lang === 'en' ? 'English' : '中文',
+      })),
+      onClick: ({ key: lang }) => changeLanguage(lang),
+    }),
+    [i18n.languages, currentLocale, changeLanguage],
+  );
+
+  const currentLanguageLabel = currentLocale === 'en' ? 'English' : '中文';
 
   const headerStyles: React.CSSProperties = {
     backgroundColor: token.colorBgElevated,
     display: 'flex',
     justifyContent: 'flex-end',
     alignItems: 'center',
-    padding: '0px 24px',
-    height: '64px',
+    padding: '0 24px',
+    height: HEADER_HEIGHT,
     position: 'sticky',
     top: 0,
-    zIndex: 999,
+    zIndex: Z_INDEX.STICKY,
+    // 与下方内容区切分。1px 软分隔线胜过纯白对纯白边界。
+    borderBottom: `1px solid ${token.colorBorderSecondary}`,
   };
 
   return (
     <Layout.Header style={headerStyles} {...agentAttrs({ type: 'app-header' })}>
-      {/* <Select
-        showSearch
-        defaultValue={business.gameId}
-        style={{ width: 160 }}
-        variant="borderless"
-        options={[
-          ...businessList.map((item) => ({
-            label: item.gameName,
-            value: item.gameId,
-          })),
-          {
-            label: '管理员专用',
-            options: [{ value: '-1', label: 'All games' }],
-          },
-        ]}
-        optionFilterProp="label"
-        onChange={(gameId) => {
-          const gameInfo =
-            gameId === '-1'
-              ? { gameId: '-1', gameName: 'All games' }
-              : businessList.find((item) => item.gameId === gameId)!;
-          setBusiness(gameInfo);
-          window.location.reload();
-        }}
-      /> */}
-      <Dropdown menu={langMenu}>
-        <Button type="link">
-          <Space>
-            <Avatar size={16} src={`/images/flags/${currentLocale}.svg`} />
-            {currentLocale === 'en' ? 'English' : '中文'}
-            <DownOutlined />
+      <Dropdown
+        menu={langMenu}
+        placement="bottomRight"
+        trigger={['hover', 'click']}
+      >
+        <Button
+          type="text"
+          aria-label={t('header.changeLanguage', 'Change language')}
+        >
+          <Space size={6}>
+            <Avatar
+              size={16}
+              src={`/images/flags/${currentLocale}.svg`}
+              alt=""
+            />
+            <span>{currentLanguageLabel}</span>
+            <DownOutlined
+              style={{ fontSize: 10, color: token.colorTextTertiary }}
+            />
           </Space>
         </Button>
       </Dropdown>
-      <Space style={{ marginLeft: '8px' }} size="middle">
-        {user?.name && <Text strong>{user.name}</Text>}
-        {user?.avatar && <Avatar src={user?.avatar} alt={user?.name} />}
-      </Space>
+
+      {(user?.name || user?.avatar) && (
+        <Space size="middle" style={{ marginLeft: 16 }}>
+          {user?.name && <Text strong>{user.name}</Text>}
+          {user?.avatar && (
+            <Avatar src={user.avatar} alt={user?.name ?? 'User avatar'} />
+          )}
+        </Space>
+      )}
     </Layout.Header>
   );
 };

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

@@ -4,10 +4,14 @@ import { Grid, Layout as AntdLayout } from 'antd';
 import { Header } from './header';
 import { Sider } from './sider';
 import { OffLayoutArea } from 'components/offLayoutArea';
+import { HEADER_HEIGHT } from 'constants/layout';
 
 export const Layout: React.FC<React.PropsWithChildren> = ({ children }) => {
   const breakpoint = Grid.useBreakpoint();
-  const isSmall = typeof breakpoint.sm === 'undefined' ? true : breakpoint.sm;
+  // 在 Ant Design 的命名里, breakpoint.sm = true 表示 viewport >= 576px
+  // (即 *不是* 极窄手机). 用 isAtLeastSm 命名比反语义的 isSmall 清楚得多.
+  // useBreakpoint 首次渲染可能返回空对象, 默认按桌面处理避免抖动.
+  const isAtLeastSm = breakpoint.sm ?? true;
 
   return (
     <ThemedLayoutContextProvider>
@@ -17,8 +21,8 @@ export const Layout: React.FC<React.PropsWithChildren> = ({ children }) => {
           <Header />
           <AntdLayout.Content
             style={{
-              padding: isSmall ? 32 : 16,
-              height: 'calc(100vh - 64px)',
+              padding: isAtLeastSm ? 32 : 16,
+              height: `calc(100vh - ${HEADER_HEIGHT}px)`,
               overflowY: 'auto',
             }}
           >

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

@@ -1,5 +1,9 @@
 import React from 'react';
 
+/**
+ * App 品牌图标。fill 使用 currentColor，让父级通过 `color` 控制颜色，
+ * 因此可被深色 / 浅色主题、selected / disabled 等不同上下文复用。
+ */
 export const Logo = (props: React.SVGProps<SVGSVGElement>) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
@@ -7,10 +11,12 @@ export const Logo = (props: React.SVGProps<SVGSVGElement>) => (
     height={24}
     viewBox="0 0 24 24"
     fill="none"
+    role="img"
+    aria-hidden="true"
     {...props}
   >
     <path
-      fill="#1677FF"
+      fill="currentColor"
       fillRule="evenodd"
       d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12Zm3.744-18.41c.182-.647-.446-1.03-1.02-.621l-8.008 5.705c-.622.443-.524 1.326.147 1.326h2.109v-.016h4.11l-3.35 1.181-1.476 5.245c-.182.647.446 1.03 1.02.621l8.008-5.705c.622-.443.524-1.326-.147-1.326H13.94l1.805-6.41Z"
       clipRule="evenodd"