plugin-cluster-manager 1.1.11 → 1.1.15

package/src/client/QueueAssignment.tsx

@@ -0,0 +1,355 @@
+import React, { useState, useEffect, useCallback } from 'react';
+import {
+  Card,
+  Table,
+  Tag,
+  Button,
+  Space,
+  Select,
+  message,
+  Modal,
+  Typography,
+  Alert,
+  Switch,
+  Popconfirm,
+  Row,
+  Col,
+  Tooltip,
+} from 'antd';
+import {
+  ReloadOutlined,
+  ScanOutlined,
+  BranchesOutlined,
+  CheckCircleOutlined,
+  CloseCircleOutlined,
+  MinusCircleOutlined,
+} from '@ant-design/icons';
+import { useApp } from '@nocobase/client-v2';
+import { useT } from './utils';
+
+const { Text } = Typography;
+
+interface DiscoveredQueue {
+  name: string;
+  label: string;
+  description: string;
+  type: 'event-queue' | 'redis-list';
+  pending: number | null;
+}
+
+interface RegisteredMapping {
+  id: number;
+  queueName: string;
+  label: string;
+  stackId: number | null;
+  enabled: boolean;
+  type: string;
+}
+
+interface StackInfo {
+  id: number;
+  name: string;
+  adapter: string;
+}
+
+export function QueueAssignment() {
+  const t = useT();
+  const api = useApp().apiClient;
+  const [loading, setLoading] = useState(false);
+  const [scanning, setScanning] = useState(false);
+  const [discovered, setDiscovered] = useState<DiscoveredQueue[]>([]);
+  const [mappings, setMappings] = useState<RegisteredMapping[]>([]);
+  const [unmapped, setUnmapped] = useState<DiscoveredQueue[]>([]);
+  const [stacks, setStacks] = useState<StackInfo[]>([]);
+
+  const fetchStacks = useCallback(async () => {
+    try {
+      const res = await api.request({ url: '/orchestratorStacks:list', params: { pageSize: 50 } });
+      const data = res.data?.data || [];
+      setStacks(data);
+    } catch {
+      // Collection not available
+    }
+  }, [api]);
+
+  const fetchMappings = useCallback(async () => {
+    try {
+      const res = await api.request({ url: '/workerQueueMappings:list', params: { pageSize: 200 } });
+      const data = res.data?.data || [];
+      setMappings(data);
+    } catch {
+      // Collection may not exist yet
+    }
+  }, [api]);
+
+  const scanQueues = useCallback(async () => {
+    setScanning(true);
+    try {
+      const res = await api.request({ url: '/workerQueueMappings:scanQueues' });
+      const data = res.data?.data || res.data;
+      setDiscovered(data.discovered || []);
+      setMappings(data.registered || []);
+      setUnmapped(data.unmapped || []);
+    } catch (err: any) {
+      message.error(`Scan failed: ${err.message}`);
+    } finally {
+      setScanning(false);
+    }
+  }, [api]);
+
+  const handleAutoMap = async () => {
+    setLoading(true);
+    try {
+      const res = await api.request({
+        url: '/workerQueueMappings:autoMap',
+        method: 'POST',
+        data: {},
+      });
+      const { created } = res.data?.data || res.data;
+      message.success(`Auto-mapped ${created.length} queue(s)`);
+      await scanQueues();
+    } catch (err: any) {
+      message.error(`Auto-map failed: ${err.message}`);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleUpdateMapping = async (id: number, values: Partial<RegisteredMapping>) => {
+    setLoading(true);
+    try {
+      await api.request({
+        url: '/workerQueueMappings:update',
+        method: 'PUT',
+        params: { filterByTk: id },
+        data: values,
+      });
+      await fetchMappings();
+    } catch (err: any) {
+      message.error(`Update failed: ${err.message}`);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleCreateMapping = async (queue: DiscoveredQueue) => {
+    setLoading(true);
+    try {
+      await api.request({
+        url: '/workerQueueMappings:create',
+        method: 'POST',
+        data: {
+          queueName: queue.name,
+          label: queue.label,
+          description: queue.description,
+          type: queue.type,
+          stackId: null,
+          enabled: true,
+        },
+      });
+      message.success(`Mapping created for "${queue.name}"`);
+      await scanQueues();
+    } catch (err: any) {
+      message.error(`Create failed: ${err.message}`);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleDeleteMapping = async (id: number) => {
+    setLoading(true);
+    try {
+      await api.request({
+        url: '/workerQueueMappings:destroy',
+        method: 'POST',
+        params: { filterByTk: id },
+      });
+      message.success('Mapping deleted');
+      await scanQueues();
+    } catch (err: any) {
+      message.error(`Delete failed: ${err.message}`);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    scanQueues();
+    fetchStacks();
+  }, [scanQueues, fetchStacks]);
+
+  const stackOptions = stacks.map((s) => ({
+    value: s.id,
+    label: s.name,
+  }));
+
+  const mappingMap = new Map(mappings.map((m) => [m.queueName, m]));
+
+  const allRows = discovered.map((q) => {
+    const mapping = mappingMap.get(q.name);
+    return {
+      key: q.name,
+      ...q,
+      mappingId: mapping?.id ?? null,
+      registered: Boolean(mapping),
+      stackId: mapping?.stackId ?? null,
+      enabled: mapping?.enabled ?? true,
+    };
+  });
+
+  const columns = [
+    {
+      title: t('Queue Name'),
+      dataIndex: 'name',
+      render: (name: string, record: any) => (
+        <Space>
+          {record.type === 'event-queue' ? (
+            <BranchesOutlined style={{ color: '#1890ff' }} />
+          ) : (
+            <MinusCircleOutlined style={{ color: '#52c41a' }} />
+          )}
+          <Text code>{name}</Text>
+        </Space>
+      ),
+    },
+    {
+      title: t('Label'),
+      dataIndex: 'label',
+      render: (label: string) => <Text>{label}</Text>,
+    },
+    {
+      title: t('Type'),
+      dataIndex: 'type',
+      width: 110,
+      render: (type: string) => (
+        <Tag color={type === 'event-queue' ? 'blue' : 'green'}>
+          {type === 'event-queue' ? 'EventQueue' : 'Redis List'}
+        </Tag>
+      ),
+    },
+    {
+      title: t('Pending'),
+      dataIndex: 'pending',
+      width: 80,
+      render: (val: number | null) => (val !== null ? <Text>{val}</Text> : <Text type="secondary">-</Text>),
+    },
+    {
+      title: t('Assigned Stack'),
+      dataIndex: 'stackId',
+      width: 160,
+      render: (stackId: number | null, record: any) => {
+        if (!record.registered) {
+          return <Text type="secondary">—</Text>;
+        }
+        return (
+          <Select
+            style={{ width: 150 }}
+            size="small"
+            allowClear
+            placeholder={t('All (default)')}
+            value={stackId}
+            options={stackOptions}
+            onChange={(value) => handleUpdateMapping(record.mappingId, { stackId: value ?? null })}
+          />
+        );
+      },
+    },
+    {
+      title: t('Enabled'),
+      dataIndex: 'enabled',
+      width: 80,
+      render: (enabled: boolean, record: any) => {
+        if (!record.registered) {
+          return <Text type="secondary">—</Text>;
+        }
+        return (
+          <Switch
+            size="small"
+            checked={enabled}
+            onChange={(checked) => handleUpdateMapping(record.mappingId, { enabled: checked })}
+          />
+        );
+      },
+    },
+    {
+      title: t('Actions'),
+      key: 'actions',
+      width: 200,
+      render: (_: any, record: any) => {
+        if (!record.registered) {
+          return (
+            <Button
+              size="small"
+              type="link"
+              icon={<CheckCircleOutlined style={{ color: '#52c41a' }} />}
+              onClick={() => handleCreateMapping(record)}
+            >
+              {t('Register')}
+            </Button>
+          );
+        }
+        return (
+          <Popconfirm title={t('Delete this mapping?')} onConfirm={() => handleDeleteMapping(record.mappingId)}>
+            <Button size="small" type="link" danger>
+              {t('Unregister')}
+            </Button>
+          </Popconfirm>
+        );
+      },
+    },
+  ];
+
+  return (
+    <div>
+      <Card size="small" style={{ marginBottom: 16 }}>
+        <Row justify="space-between" align="middle">
+          <Col>
+            <Space>
+              <Text strong>{t('Queue Assignment')}</Text>
+              <Text type="secondary">{t('Map queues to worker stacks. Unassigned queues run on all workers.')}</Text>
+            </Space>
+          </Col>
+          <Col>
+            <Space>
+              <Button icon={<ScanOutlined />} onClick={scanQueues} loading={scanning}>
+                {t('Scan Queues')}
+              </Button>
+              {unmapped.length > 0 && (
+                <Button onClick={handleAutoMap} loading={loading}>
+                  {t('Auto-map ({count})', { count: unmapped.length })}
+                </Button>
+              )}
+              <Button
+                icon={<ReloadOutlined />}
+                onClick={() => {
+                  scanQueues();
+                  fetchStacks();
+                }}
+              >
+                {t('Refresh')}
+              </Button>
+            </Space>
+          </Col>
+        </Row>
+      </Card>
+
+      {unmapped.length > 0 && (
+        <Alert
+          type="info"
+          showIcon
+          style={{ marginBottom: 16 }}
+          message={`${unmapped.length} queue(s) discovered but not yet registered. Click "Register" on each row or use "Auto-map" to create mappings.`}
+        />
+      )}
+
+      <Table
+        dataSource={allRows}
+        columns={columns}
+        rowKey="key"
+        size="small"
+        pagination={false}
+        locale={{ emptyText: t('No queues discovered. Click "Scan Queues" to detect registered queues.') }}
+      />
+    </div>
+  );
+}

package/src/client/RedisMonitor.tsx

@@ -7,7 +7,7 @@ import {
   ThunderboltOutlined,
   FieldTimeOutlined,
 } from '@ant-design/icons';
-import { useAPIClient } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import { formatBytes, formatUptime } from './utils';
 
 const { Text } = Typography;
@@ -40,7 +40,7 @@ interface RedisInfo {
 
 
 export function RedisMonitor() {
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const [info, setInfo] = useState<RedisInfo | null>(null);
   const [channels, setChannels] = useState<Record<string, number>>({});
   const [totalChannels, setTotalChannels] = useState(0);
@@ -306,7 +306,7 @@ export function RedisMonitor() {
 }
 
 function SyncMessagesSection() {
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const [data, setData] = useState<any>(null);
 
   useEffect(() => {