@lobehub/lobehub 2.0.0-next.47 → 2.0.0-next.48

package/src/app/[variants]/(main)/discover/(detail)/features/Breadcrumb.tsx

@@ -3,10 +3,11 @@
 import { CopyButton } from '@lobehub/ui';
 import { Breadcrumb as AntdBreadcrumb } from 'antd';
 import { useTheme } from 'antd-style';
+import Link from 'next/link';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
-import { Link } from 'react-router-dom';
+import urlJoin from 'url-join';
 
 import { DiscoverTab } from '@/types/discover';
 
@@ -17,11 +18,11 @@ const Breadcrumb = memo<{ identifier: string; tab: DiscoverTab }>(({ tab, identi
     <AntdBreadcrumb
       items={[
         {
-          title: <Link to={'/'}>Discover</Link>,
+          title: <Link href={'/discover'}>Discover</Link>,
         },
         {
           title: (
-            <Link to={`/${tab}`}>
+            <Link href={urlJoin('/discover', tab)}>
               {tab === DiscoverTab.Mcp ? 'MCP Servers' : t(`tab.${tab}` as any)}
             </Link>
           ),

package/src/app/[variants]/(main)/discover/(list)/_layout/Desktop/Nav.tsx

@@ -14,6 +14,7 @@ import { DiscoverTab } from '@/types/discover';
 import { MAX_WIDTH, SCROLL_PARENT_ID } from '../../../features/const';
 import { useNav } from '../../../features/useNav';
 import SortButton from '../../features/SortButton';
+import MarketSourceSwitch from '../../assistant/features/MarketSourceSwitch';
 import { useScroll } from './useScroll';
 
 export const useStyles = createStyles(({ cx, stylish, css, token }) => ({
@@ -88,7 +89,8 @@ const Nav = memo(() => {
           />
         </Flexbox>
         {!isHome && (
-          <Flexbox align={'center'} gap={4} horizontal>
+          <Flexbox align={'center'} gap={8} horizontal>
+            {activeKey === DiscoverTab.Assistants && <MarketSourceSwitch />}
             <SortButton />
           </Flexbox>
         )}

package/src/app/[variants]/(main)/discover/(list)/assistant/AssistantPage.tsx

@@ -13,7 +13,7 @@ import List from './features/List';
 import Loading from './loading';
 
 const AssistantPage = memo<{ mobile?: boolean }>(() => {
-  const { q, page, category, sort, order } = useQuery() as AssistantQueryParams;
+  const { q, page, category, sort, order, source } = useQuery() as AssistantQueryParams;
   const useAssistantList = useDiscoverStore((s) => s.useAssistantList);
   const { data, isLoading } = useAssistantList({
     category,
@@ -22,8 +22,11 @@ const AssistantPage = memo<{ mobile?: boolean }>(() => {
     pageSize: 21,
     q,
     sort,
+    source,
   });
 
+  console.log("data",data)
+
   if (isLoading || !data) return <Loading />;
 
   const { items, currentPage, pageSize, totalCount } = data;

package/src/app/[variants]/(main)/discover/(list)/assistant/Client.tsx

@@ -6,22 +6,26 @@ import { Flexbox } from 'react-layout-kit';
 import { withSuspense } from '@/components/withSuspense';
 import { useQuery } from '@/hooks/useQuery';
 import { useDiscoverStore } from '@/store/discover';
-import { AssistantQueryParams, DiscoverTab } from '@/types/discover';
+import { AssistantMarketSource, AssistantQueryParams, DiscoverTab } from '@/types/discover';
 
 import Pagination from '../features/Pagination';
 import List from './features/List';
 import Loading from './loading';
 
 const Client = memo<{ mobile?: boolean }>(() => {
-  const { q, page, category, sort, order } = useQuery() as AssistantQueryParams;
+  const { q, page, category, sort, order, ownerId, source } =
+    useQuery() as AssistantQueryParams;
+  const marketSource = (source as AssistantMarketSource | undefined) ?? 'new';
   const useAssistantList = useDiscoverStore((s) => s.useAssistantList);
   const { data, isLoading } = useAssistantList({
     category,
     order,
+    ownerId,
     page,
     pageSize: 21,
     q,
     sort,
+    source: marketSource,
   });
 
   if (isLoading || !data) return <Loading />;

package/src/app/[variants]/(main)/discover/(list)/assistant/features/Category/index.tsx

@@ -16,15 +16,19 @@ import { useCategory } from './useCategory';
 
 const Category = memo(() => {
   const useAssistantCategories = useDiscoverStore((s) => s.useAssistantCategories);
-  const { category = 'all', q } = useQuery() as { category?: AssistantCategory; q?: string };
-  const { data: items = [] } = useAssistantCategories({ q });
+  const {
+    category = 'all',
+    q,
+    source,
+  } = useQuery() as { category?: AssistantCategory; q?: string; source?: string };
+  const { data: items = [] } = useAssistantCategories({ q, source: source as any });
   const navigate = useNavigate();
   const cates = useCategory();
 
   const genUrl = (key: AssistantCategory) =>
     qs.stringifyUrl(
       {
-        query: { category: key === AssistantCategory.All ? null : key, q },
+        query: { category: key === AssistantCategory.All ? null : key, q, source },
         url: '/assistant',
       },
       { skipNull: true },

package/src/app/[variants]/(main)/discover/(list)/assistant/features/List/Item.tsx

@@ -2,6 +2,7 @@ import { Github } from '@lobehub/icons';
 import { ActionIcon, Avatar, Block, Icon, Text } from '@lobehub/ui';
 import { createStyles } from 'antd-style';
 import { ClockIcon } from 'lucide-react';
+import qs from 'query-string';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
@@ -9,7 +10,8 @@ import { Link, useNavigate } from 'react-router-dom';
 import urlJoin from 'url-join';
 
 import PublishedTime from '@/components/PublishedTime';
-import { DiscoverAssistantItem } from '@/types/discover';
+import { useQuery } from '@/hooks/useQuery';
+import { AssistantMarketSource, DiscoverAssistantItem } from '@/types/discover';
 
 import TokenTag from './TokenTag';
 
@@ -61,9 +63,18 @@ const AssistantItem = memo<DiscoverAssistantItem>(
     knowledgeCount,
     backgroundColor,
   }) => {
+
+    console.log("author",author)
     const { styles, theme } = useStyles();
     const navigate = useNavigate();
-    const link = urlJoin('/assistant', identifier);
+    const { source } = useQuery() as { source?: AssistantMarketSource };
+    const link = qs.stringifyUrl(
+      {
+        query: { source },
+        url: urlJoin('/assistant', identifier),
+      },
+      { skipNull: true },
+    );
     const { t } = useTranslation('discover');
 
     return (

package/src/app/[variants]/(main)/discover/(list)/assistant/features/MarketSourceSwitch.tsx

@@ -0,0 +1,64 @@
+'use client';
+
+import { Dropdown, DropdownMenuItemType, Icon } from '@lobehub/ui';
+import { Button } from 'antd';
+import { ChevronDown, Store } from 'lucide-react';
+import { memo, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useQuery } from '@/hooks/useQuery';
+import { useQueryRoute } from '@/hooks/useQueryRoute';
+import { AssistantMarketSource } from '@/types/discover';
+
+const MarketSourceSwitch = memo(() => {
+  const { t } = useTranslation('discover');
+  const router = useQueryRoute();
+  const query = useQuery() as { source?: AssistantMarketSource };
+  const currentSource = (query.source as AssistantMarketSource) ?? 'new';
+
+  const items = useMemo(
+    () =>
+      [
+        {
+          key: 'new',
+          label: t('assistants.marketSource.new'),
+        },
+        {
+          key: 'legacy',
+          label: t('assistants.marketSource.legacy'),
+        },
+      ] satisfies DropdownMenuItemType[],
+    [t],
+  );
+
+  const handleChange = (value: AssistantMarketSource) => {
+    router.push('/discover/assistant', {
+      query: {
+        page: null,
+        source: value === 'new' ? null : value,
+      },
+    });
+  };
+
+  return (
+    <Dropdown
+      menu={{
+        // @ts-expect-error 等待 antd 修复
+        activeKey: currentSource,
+        items,
+        onClick: ({ key }) => handleChange(key as AssistantMarketSource),
+      }}
+      trigger={['click', 'hover']}
+    >
+      <Button icon={<Icon icon={Store} />} type={'text'}>
+        {t('assistants.marketSource.label')}:{' '}
+        {items.find((item) => item.key === currentSource)?.label}
+        <Icon icon={ChevronDown} />
+      </Button>
+    </Dropdown>
+  );
+});
+
+MarketSourceSwitch.displayName = 'MarketSourceSwitch';
+
+export default MarketSourceSwitch;

package/src/app/[variants]/(main)/discover/(list)/features/SortButton/index.tsx

@@ -7,6 +7,7 @@ import { useTranslation } from 'react-i18next';
 
 import { useQuery } from '@/hooks/useQuery';
 import { useQueryRoute } from '@/hooks/useQueryRoute';
+import { useMarketAuth } from '@/layout/AuthProvider/MarketAuth';
 import {
   AssistantSorts,
   DiscoverTab,
@@ -21,11 +22,12 @@ const SortButton = memo(() => {
   const pathname = usePathname();
   const { sort } = useQuery();
   const router = useQueryRoute();
+  const { isAuthenticated, getCurrentUserInfo } = useMarketAuth();
   const activeTab = useMemo(() => pathname.split('discover/')[1] as DiscoverTab, [pathname]);
   const items = useMemo(() => {
     switch (activeTab) {
       case DiscoverTab.Assistants: {
-        return [
+        const baseItems = [
           {
             key: AssistantSorts.CreatedAt,
             label: t('assistants.sorts.createdAt'),
@@ -51,6 +53,16 @@ const SortButton = memo(() => {
             label: t('assistants.sorts.knowledgeCount'),
           },
         ];
+
+        // Only add "My Own" option if user is authenticated
+        if (isAuthenticated) {
+          baseItems.push({
+            key: AssistantSorts.MyOwn,
+            label: t('assistants.sorts.myown'),
+          });
+        }
+
+        return baseItems;
       }
       case DiscoverTab.Plugins: {
         return [
@@ -144,7 +156,7 @@ const SortButton = memo(() => {
         return [];
       }
     }
-  }, [t, activeTab]);
+  }, [t, activeTab, isAuthenticated]);
 
   const activeItem: any = useMemo(() => {
     if (sort) {
@@ -155,11 +167,18 @@ const SortButton = memo(() => {
   }, [items, sort]);
 
   const handleSort = (config: string) => {
-    router.push(pathname, {
-      query: {
-        sort: config,
-      },
-    });
+    const query: any = { sort: config };
+
+    // If "My Own" is selected, add ownerId to query
+    if (config === AssistantSorts.MyOwn) {
+      const userInfo = getCurrentUserInfo();
+      console.log('userInfo', userInfo);
+      if (userInfo?.accountId) {
+        query.ownerId = userInfo.accountId;
+      }
+    }
+
+    router.push(pathname, { query });
   };
 
   if (items?.length === 0) return null;

package/src/app/[variants]/(main)/profile/_layout/Desktop/index.tsx

@@ -34,16 +34,16 @@ const Layout = memo<LayoutProps>(({ children, category }) => {
           {category}
         </Header>
       )}
-      <SettingContainer
-        addonAfter={<Footer />}
-        style={{
-          paddingBlock: 24,
-          paddingInline: 32,
-        }}
-      >
-        {children}
-      </SettingContainer>
-    </Flexbox>
+        <SettingContainer
+          addonAfter={<Footer />}
+          style={{
+            paddingBlock: 24,
+            paddingInline: 32,
+          }}
+        >
+          {children}
+        </SettingContainer>
+      </Flexbox>
   );
 });
 

package/src/app/[variants]/(main)/settings/_layout/type.ts

@@ -2,5 +2,5 @@ import { ReactNode } from 'react';
 
 export interface LayoutProps {
   children?: ReactNode;
-  showLLM?: boolean
+  showLLM?: boolean;
 }

package/src/app/[variants]/(main)/settings/agent/index.tsx

@@ -13,15 +13,16 @@ import { useCategory } from '@/features/AgentSetting/AgentCategory/useCategory';
 import { ChatSettingsTabs } from '@/store/global/initialState';
 import { useUserStore } from '@/store/user';
 import { settingsSelectors } from '@/store/user/selectors';
-import DesktopLayout from './_layout/Desktop'
-import MobileLayout from './_layout/Mobile'
+
+import DesktopLayout from './_layout/Desktop';
+import MobileLayout from './_layout/Mobile';
 
 type AgentPageType = {
   mobile?: boolean;
-}
+};
 
 const Page = memo((props: AgentPageType) => {
-  const { mobile } = props
+  const { mobile } = props;
   const cateItems = useCategory();
   const [tab, setTab] = useQueryState('tab', {
     defaultValue: ChatSettingsTabs.Prompt,
@@ -37,7 +38,6 @@ const Page = memo((props: AgentPageType) => {
 
   if (!isUserStateInit) return <Skeleton active paragraph={{ rows: 5 }} title={false} />;
 
-
   const PageContent = (
     <>
       {mobile && (
@@ -65,12 +65,13 @@ const Page = memo((props: AgentPageType) => {
         tab={tab as ChatSettingsTabs}
       />
     </>
-  )
+  );
 
-  return mobile ? <MobileLayout>
-    {PageContent}
-  </MobileLayout> : <DesktopLayout>
-    {PageContent}</DesktopLayout>;
+  return mobile ? (
+    <MobileLayout>{PageContent}</MobileLayout>
+  ) : (
+    <DesktopLayout>{PageContent}</DesktopLayout>
+  );
 });
 
 Page.displayName = 'AgentSetting';

package/src/app/[variants]/(main)/settings/common/index.tsx

@@ -5,7 +5,7 @@ import Common from './features/Common/Common';
 const Page = () => {
   return (
     <>
-      <Common/>
+      <Common />
       <Appearance />
       <ChatAppearance />
     </>

package/src/app/[variants]/(main)/settings/page.tsx

@@ -1,16 +1,15 @@
 import ServerLayout from '@/components/server/ServerLayout';
+import { serverFeatureFlags } from '@/config/featureFlags';
 import { metadataModule } from '@/server/metadata';
 import { translation } from '@/server/translation';
 import { DynamicLayoutProps } from '@/types/next';
 import { RouteVariants } from '@/utils/server/routeVariants';
 
+import SettingsContextProvider from './_layout/ContextProvider';
 import Desktop from './_layout/Desktop';
 import Mobile from './_layout/Mobile';
 import { LayoutProps } from './_layout/type';
 
-import { serverFeatureFlags } from '@/config/featureFlags';
-import SettingsContextProvider from './_layout/ContextProvider';
-
 export const generateMetadata = async (props: DynamicLayoutProps) => {
   const locale = await RouteVariants.getLocale(props);
   const { t } = await translation('setting', locale);
@@ -21,19 +20,23 @@ export const generateMetadata = async (props: DynamicLayoutProps) => {
   });
 };
 
-const SettingsLayout = ServerLayout<LayoutProps & {
-  showLLM?: boolean
-}>({ Desktop, Mobile });
+const SettingsLayout = ServerLayout<
+  LayoutProps & {
+    showLLM?: boolean;
+  }
+>({ Desktop, Mobile });
 
 const SettingsPage = async (props: DynamicLayoutProps) => {
   const showLLM = serverFeatureFlags().showProvider;
   const { showOpenAIProxyUrl, showOpenAIApiKey } = serverFeatureFlags();
 
   return (
-    <SettingsContextProvider value={{
-      showOpenAIApiKey: showOpenAIApiKey,
-      showOpenAIProxyUrl: showOpenAIProxyUrl
-    }}>
+    <SettingsContextProvider
+      value={{
+        showOpenAIApiKey: showOpenAIApiKey,
+        showOpenAIProxyUrl: showOpenAIProxyUrl,
+      }}
+    >
       <SettingsLayout {...props} showLLM={showLLM} />
     </SettingsContextProvider>
   );

package/src/app/[variants]/(main)/settings/provider/ProviderMenu/Item.tsx

@@ -44,42 +44,41 @@ const ProviderItem = memo<ProviderItemProps>(
     const { styles, cx } = useStyles();
     const searchParams = useSearchParams();
 
-    const activeKey = searchParams.get('provider');
+  const activeKey = searchParams.get('provider');
 
-    const isCustom = source === AiProviderSourceEnum.Custom;
-    return (
-      <div
-        className={cx(styles.container, activeKey === id && styles.active)}
-        onClick={() => {
-          onClick(id);
-        }}
-      >
-        <Flexbox gap={8} horizontal>
-          {isCustom && logo ? (
-            <Avatar
-              alt={name || id}
-              avatar={logo}
-              shape={'square'}
-              size={24}
-              style={{ borderRadius: 6 }}
-            />
-          ) : (
-            <ProviderIcon provider={id} size={24} style={{ borderRadius: 6 }} type={'avatar'} />
-          )}
-          {name}
-        </Flexbox>
-        <Flexbox horizontal>
-          {enabled && (
-            <Center width={24}>
-              <Badge status="success" />
-            </Center>
-          )}
-          {/* cloud slot */}
+  const isCustom = source === AiProviderSourceEnum.Custom;
+  return (
+    <div
+      className={cx(styles.container, activeKey === id && styles.active)}
+      onClick={() => {
+        onClick(id);
+      }}
+    >
+      <Flexbox gap={8} horizontal>
+        {isCustom && logo ? (
+          <Avatar
+            alt={name || id}
+            avatar={logo}
+            shape={'square'}
+            size={24}
+            style={{ borderRadius: 6 }}
+          />
+        ) : (
+          <ProviderIcon provider={id} size={24} style={{ borderRadius: 6 }} type={'avatar'} />
+        )}
+        {name}
+      </Flexbox>
+      <Flexbox horizontal>
+        {enabled && (
+          <Center width={24}>
+            <Badge status="success" />
+          </Center>
+        )}
+        {/* cloud slot */}
 
-          {/* cloud slot */}
-        </Flexbox>
-      </div>
-    );
-  },
-);
+        {/* cloud slot */}
+      </Flexbox>
+    </div>
+  );
+});
 export default ProviderItem;

package/src/app/[variants]/(main)/settings/provider/ProviderMenu/SearchResult.tsx

@@ -9,10 +9,8 @@ import { useAiInfraStore } from '@/store/aiInfra';
 
 import ProviderItem from './Item';
 
-const SearchResult = memo((props:{
-  onProviderSelect?: (key: string)=>void
-}) => {
-  const {onProviderSelect =()=>{} } = props
+const SearchResult = memo((props: { onProviderSelect?: (key: string) => void }) => {
+  const { onProviderSelect = () => {} } = props;
   const { t } = useTranslation('modelProvider');
 
   const searchKeyword = useAiInfraStore((s) => s.providerSearchKeyword);
@@ -37,7 +35,9 @@ const SearchResult = memo((props:{
           {t('menu.notFound')}
         </Flexbox>
       ) : (
-        filteredProviders.map((item) => <ProviderItem {...item} key={item.id} onClick={onProviderSelect} />)
+        filteredProviders.map((item) => (
+          <ProviderItem {...item} key={item.id} onClick={onProviderSelect} />
+        ))
       )}
     </Flexbox>
   );

package/src/app/[variants]/(main)/settings/provider/_layout/Desktop/Container.tsx

@@ -5,9 +5,15 @@ import { PropsWithChildren, memo } from 'react';
 import SettingContainer from '@/features/Setting/SettingContainer';
 
 const Container = memo<PropsWithChildren>(({ children }) => {
-  return <SettingContainer style={{
-    paddingBlock: 24,
-    paddingInline: 32
-  }}>{children}</SettingContainer>;
+  return (
+    <SettingContainer
+      style={{
+        paddingBlock: 24,
+        paddingInline: 32,
+      }}
+    >
+      {children}
+    </SettingContainer>
+  );
 });
 export default Container;

package/src/app/market-auth-callback/layout.tsx

@@ -0,0 +1,15 @@
+import { ReactNode } from 'react';
+
+interface RootLayoutProps {
+  children: ReactNode;
+}
+
+const RootLayout = ({ children }: RootLayoutProps) => {
+  return (
+    <html lang="en" suppressHydrationWarning>
+      <body>{children}</body>
+    </html>
+  );
+};
+
+export default RootLayout;