@lobehub/lobehub 2.0.0-next.276 → 2.0.0-next.277

package/src/app/[variants]/(main)/agent/profile/features/AgentCronJobs/index.tsx

@@ -2,38 +2,43 @@
 
 import { ENABLE_BUSINESS_FEATURES } from '@lobechat/business-const';
 import { Flexbox } from '@lobehub/ui';
-import { Modal, Typography } from 'antd';
+import { Typography } from 'antd';
 import { Clock } from 'lucide-react';
-import { memo, useRef, useState } from 'react';
+import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
+import urlJoin from 'url-join';
 
+import { useQueryRoute } from '@/hooks/useQueryRoute';
 import { useAgentStore } from '@/store/agent';
 
 import CronJobCards from './CronJobCards';
-import CronJobForm from './CronJobForm';
 import { useAgentCronJobs } from './hooks/useAgentCronJobs';
 
 const { Title } = Typography;
 
-interface AgentCronJobsProps {
-  onFormModalChange?: (show: boolean) => void;
-  showFormModal?: boolean;
-}
-
-const AgentCronJobs = memo<AgentCronJobsProps>(({ showFormModal, onFormModalChange }) => {
+const AgentCronJobs = memo(() => {
   const { t } = useTranslation('setting');
   const agentId = useAgentStore((s) => s.activeAgentId);
-  const [internalShowForm, setInternalShowForm] = useState(false);
-  const [editingJob, setEditingJob] = useState<string | null>(null);
-  const [submitting, setSubmitting] = useState(false);
-  const formRef = useRef<any>(null);
+  const router = useQueryRoute();
+
+  const { cronJobs, loading, deleteCronJob } = useAgentCronJobs(agentId);
 
-  // Use external control if provided, otherwise use internal state
-  const showForm = showFormModal ?? internalShowForm;
-  const setShowForm = onFormModalChange ?? setInternalShowForm;
+  // Edit: Navigate to cron job detail page
+  const handleEdit = useCallback(
+    (jobId: string) => {
+      if (!agentId) return;
+      router.push(urlJoin('/agent', agentId, 'cron', jobId));
+    },
+    [agentId, router],
+  );
 
-  const { cronJobs, loading, createCronJob, updateCronJob, deleteCronJob } =
-    useAgentCronJobs(agentId);
+  // Delete: Keep the existing delete logic
+  const handleDelete = useCallback(
+    async (jobId: string) => {
+      await deleteCronJob(jobId);
+    },
+    [deleteCronJob],
+  );
 
   if (!ENABLE_BUSINESS_FEATURES) return null;
 
@@ -41,89 +46,29 @@ const AgentCronJobs = memo<AgentCronJobsProps>(({ showFormModal, onFormModalChan
     return null;
   }
 
-  const handleCreate = async (data: any) => {
-    setSubmitting(true);
-    try {
-      await createCronJob(data);
-      setShowForm(false);
-    } finally {
-      setSubmitting(false);
-    }
-  };
-
-  const handleEdit = (jobId: string) => {
-    setEditingJob(jobId);
-    setShowForm(true);
-  };
-
-  const handleUpdate = async (data: any) => {
-    if (editingJob) {
-      setSubmitting(true);
-      try {
-        await updateCronJob(editingJob, data);
-        setShowForm(false);
-        setEditingJob(null);
-      } finally {
-        setSubmitting(false);
-      }
-    }
-  };
-
-  const handleCancel = () => {
-    setShowForm(false);
-    setEditingJob(null);
-    formRef.current?.resetFields();
-  };
-
-  const handleModalOk = () => {
-    formRef.current?.submit();
-  };
-
-  const handleDelete = async (jobId: string) => {
-    await deleteCronJob(jobId);
-  };
-
   const hasCronJobs = cronJobs && cronJobs.length > 0;
 
-  return (
-    <>
-      {/* Show cards section only if there are jobs */}
-      {hasCronJobs && (
-        <Flexbox gap={12} style={{ marginBottom: 16, marginTop: 16 }}>
-          <Title level={5} style={{ margin: 0 }}>
-            <Flexbox align="center" gap={8} horizontal>
-              <Clock size={16} />
-              {t('agentCronJobs.title')}
-            </Flexbox>
-          </Title>
+  // Only show if there are jobs
+  if (!hasCronJobs) {
+    return null;
+  }
 
-          <CronJobCards
-            cronJobs={cronJobs}
-            loading={loading}
-            onDelete={handleDelete}
-            onEdit={handleEdit}
-          />
+  return (
+    <Flexbox gap={12} style={{ marginBottom: 16, marginTop: 16 }}>
+      <Title level={5} style={{ margin: 0 }}>
+        <Flexbox align="center" gap={8} horizontal>
+          <Clock size={16} />
+          {t('agentCronJobs.title')}
         </Flexbox>
-      )}
-
-      {/* Form Modal */}
-      <Modal
-        confirmLoading={submitting}
-        okText={editingJob ? t('agentCronJobs.save' as any) : t('agentCronJobs.create' as any)}
-        onCancel={handleCancel}
-        onOk={handleModalOk}
-        open={showForm}
-        title={editingJob ? t('agentCronJobs.editJob') : t('agentCronJobs.addJob')}
-        width={640}
-      >
-        <CronJobForm
-          editingJob={editingJob ? cronJobs?.find((job) => job.id === editingJob) : undefined}
-          formRef={formRef}
-          onCancel={handleCancel}
-          onSubmit={editingJob ? handleUpdate : handleCreate}
-        />
-      </Modal>
-    </>
+      </Title>
+
+      <CronJobCards
+        cronJobs={cronJobs}
+        loading={loading}
+        onDelete={handleDelete}
+        onEdit={handleEdit}
+      />
+    </Flexbox>
   );
 });
 

package/src/app/[variants]/(main)/agent/profile/features/ProfileEditor/index.tsx

@@ -2,7 +2,7 @@
 
 import { ENABLE_BUSINESS_FEATURES } from '@lobechat/business-const';
 import { Button, Flexbox } from '@lobehub/ui';
-import { Divider, message } from 'antd';
+import { Divider } from 'antd';
 import isEqual from 'fast-deep-equal';
 import { Clock, PlayIcon } from 'lucide-react';
 import React, { memo, useCallback } from 'react';
@@ -11,7 +11,6 @@ import urlJoin from 'url-join';
 
 import ModelSelect from '@/features/ModelSelect';
 import { useQueryRoute } from '@/hooks/useQueryRoute';
-import { agentCronJobService } from '@/services/agentCronJob';
 import { useAgentStore } from '@/store/agent';
 import { agentSelectors } from '@/store/agent/selectors';
 import { useChatStore } from '@/store/chat';
@@ -29,25 +28,10 @@ const ProfileEditor = memo(() => {
   const switchTopic = useChatStore((s) => s.switchTopic);
   const router = useQueryRoute();
 
-  const handleCreateCronJob = useCallback(async () => {
+  const handleCreateCronJob = useCallback(() => {
     if (!agentId) return;
-    try {
-      const result = await agentCronJobService.create({
-        agentId,
-        content: t('agentCronJobs.form.content.placeholder') || 'This is a cron job',
-        cronPattern: '*/30 * * * *',
-        enabled: true,
-        name: t('agentCronJobs.addJob') || 'Cron Job Task',
-      });
-
-      if (result.success) {
-        router.push(urlJoin('/agent', agentId, 'cron', result.data.id));
-      }
-    } catch (error) {
-      console.error('Failed to create cron job:', error);
-      message.error('Failed to create scheduled task');
-    }
-  }, [agentId, router, t]);
+    router.push(urlJoin('/agent', agentId, 'cron', 'new'));
+  }, [agentId, router]);
 
   return (
     <>

package/src/app/[variants]/(main)/community/features/UserAvatar/index.tsx

@@ -16,7 +16,14 @@ import { serverConfigSelectors } from '@/store/serverConfig/selectors';
  */
 const checkNeedsProfileSetup = (
   enableMarketTrustedClient: boolean,
-  userProfile: { avatarUrl: string | null; bannerUrl: string | null; socialLinks: { github?: string; twitter?: string; website?: string } | null } | null | undefined,
+  userProfile:
+    | {
+        avatarUrl: string | null;
+        bannerUrl: string | null;
+        socialLinks: { github?: string; twitter?: string; website?: string } | null;
+      }
+    | null
+    | undefined,
 ): boolean => {
   if (!enableMarketTrustedClient) return false;
   if (!userProfile) return true;
@@ -33,7 +40,9 @@ const UserAvatar = memo(() => {
   const [loading, setLoading] = useState(false);
   const { isAuthenticated, isLoading, getCurrentUserInfo, signIn } = useMarketAuth();
 
-  const enableMarketTrustedClient = useServerConfigStore(serverConfigSelectors.enableMarketTrustedClient);
+  const enableMarketTrustedClient = useServerConfigStore(
+    serverConfigSelectors.enableMarketTrustedClient,
+  );
 
   const userInfo = getCurrentUserInfo();
   const username = userInfo?.sub;
@@ -70,8 +79,9 @@ const UserAvatar = memo(() => {
     return <Skeleton.Avatar active shape={'square'} size={28} style={{ borderRadius: 6 }} />;
   }
 
-  // 未认证，或者是 trustedClient 模式但需要完善资料时，显示登录按钮
-  if (!isAuthenticated || needsProfileSetup) {
+  // 如果启用了 trustedClient，不显示"成为创作者"按钮，直接显示头像
+  // 否则，未认证或需要完善资料时，显示登录按钮
+  if (!enableMarketTrustedClient && (!isAuthenticated || needsProfileSetup)) {
     return (
       <Button
         icon={UserCircleIcon}
@@ -92,7 +102,7 @@ const UserAvatar = memo(() => {
 
   return (
     <Avatar
-      avatar={avatarUrl || userProfile?.userName}
+      avatar={avatarUrl || userProfile?.userName || username}
       onClick={handleAvatarClick}
       shape={'square'}
       size={28}

package/src/app/[variants]/(main)/group/_layout/Sidebar/GroupConfig/AgentProfilePopup.tsx

@@ -136,12 +136,7 @@ const AgentProfilePopup = memo<AgentProfilePopupProps>(({ agent, groupId, childr
             </Text>
 
             {/* Settings Button */}
-            <Flexbox
-              align="center"
-              horizontal
-              justify="flex-end"
-              style={{ paddingBlockStart: 0 }}
-            >
+            <Flexbox align="center" horizontal justify="flex-end" style={{ paddingBlockStart: 0 }}>
               <ActionIcon
                 icon={Settings}
                 onClick={handleSettings}

package/src/server/globalConfig/index.ts

@@ -74,6 +74,7 @@ export const getServerGlobalConfig = async () => {
     defaultAgent: {
       config: parseAgentConfig(DEFAULT_AGENT_CONFIG),
     },
+    enableBusinessFeatures: ENABLE_BUSINESS_FEATURES,
     enableEmailVerification: authEnv.AUTH_EMAIL_VERIFICATION,
     enableKlavis: !!klavisEnv.KLAVIS_API_KEY,
     enableLobehubSkill: !!(appEnv.MARKET_TRUSTED_CLIENT_SECRET && appEnv.MARKET_TRUSTED_CLIENT_ID),

package/src/services/chatGroup/index.ts

@@ -89,10 +89,7 @@ class ChatGroupService {
    * Batch create virtual agents and add them to an existing group.
    * This is more efficient than calling createAgentOnly multiple times.
    */
-  batchCreateAgentsInGroup = (
-    groupId: string,
-    agents: GroupMemberConfig[],
-  ) => {
+  batchCreateAgentsInGroup = (groupId: string, agents: GroupMemberConfig[]) => {
     return lambdaClient.group.batchCreateAgentsInGroup.mutate({
       agents: agents as Partial<AgentItem>[],
       groupId,

package/src/store/serverConfig/selectors.ts

@@ -3,6 +3,7 @@ import { type ServerConfigStore } from './store';
 export const featureFlagsSelectors = (s: ServerConfigStore) => s.featureFlags;
 
 export const serverConfigSelectors = {
+  enableBusinessFeatures: (s: ServerConfigStore) => s.serverConfig.enableBusinessFeatures || false,
   enableEmailVerification: (s: ServerConfigStore) =>
     s.serverConfig.enableEmailVerification || false,
   enableKlavis: (s: ServerConfigStore) => s.serverConfig.enableKlavis || false,