perf: refresh page.img mode.collection filter

de6ac0f5 · archer · 18e0212d · de6ac0f5 · de6ac0f5 · de6ac0f5
Commit de6ac0f5 authored May 09, 2023 by archer
11 changed files
--- a/public/icon/human.png
+++ b/public/icon/human.png
--- a/src/components/Layout/index.tsx
+++ b/src/components/Layout/index.tsx
-import React, { useCallback, useEffect } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import { Box, useColorMode, Flex } from '@chakra-ui/react';
 import Navbar from './navbar';
 import NavbarPhone from './navbarPhone';
@@ -11,6 +11,9 @@ import { useGlobalStore } from '@/store/global';
 const pcUnShowLayoutRoute: Record<string, boolean> = {
  '/login': true
 };
+const phoneUnShowLayoutRoute: Record<string, boolean> = {
+  '/login': true
+};
 const Layout = ({ children, isPcDevice }: { children: JSX.Element; isPcDevice: boolean }) => {
  const { isPc } = useScreen({ defaultIsPc: isPcDevice });
@@ -19,14 +22,21 @@ const Layout = ({ children, isPcDevice }: { children: JSX.Element; isPcDevice: b
  const { Loading } = useLoading({ defaultLoading: true });
  const { loading } = useGlobalStore();
+  const isChatPage = useMemo(
+    () => router.pathname === '/chat' && Object.values(router.query).join('').length !== 0,
+    [router.pathname, router.query]
+  );
  useEffect(() => {
    if (colorMode === 'dark' && router.pathname !== '/chat') {
      setColorMode('light');
    }
  }, [colorMode, router.pathname, setColorMode]);
-  const RenderPc = useCallback(
+  return (
-    () =>
+    <>
+      <Box h={'100%'} overflow={'overlay'} bg={'gray.100'}>
+        {isPc ? (
          pcUnShowLayoutRoute[router.pathname] ? (
            <Auth>{children}</Auth>
          ) : (
@@ -38,22 +48,10 @@ const Layout = ({ children, isPcDevice }: { children: JSX.Element; isPcDevice: b
                <Auth>{children}</Auth>
              </Box>
            </>
-      ),
+          )
-    [children, router.pathname]
+        ) : phoneUnShowLayoutRoute[router.pathname] || isChatPage ? (
-  );
+          <Auth>{children}</Auth>
+        ) : (
-  const RenderPhone = useCallback(() => {
-    const phoneUnShowLayoutRoute: Record<string, boolean> = {
-      '/login': true
-    };
-    const isChatPage =
-      router.pathname === '/chat' && Object.values(router.query).join('').length !== 0;
-    if (phoneUnShowLayoutRoute[router.pathname] || isChatPage) {
-      return <Auth>{children}</Auth>;
-    }
-    return (
          <Flex h={'100%'} flexDirection={'column'}>
            <Box flex={'1 0 0'} h={0} overflow={'overlay'}>
              <Auth>{children}</Auth>
@@ -62,13 +60,7 @@ const Layout = ({ children, isPcDevice }: { children: JSX.Element; isPcDevice: b
              <NavbarPhone />
            </Box>
          </Flex>
-    );
+        )}
-  }, [children, router]);
-  return (
-    <>
-      <Box h={'100%'} overflow={'overlay'} bg={'gray.100'}>
-        {isPc ? <RenderPc /> : <RenderPhone />}
      </Box>
      {loading && <Loading />}
    </>

--- a/src/pages/api/model/data/splitData.ts
+++ b/src/pages/api/model/data/splitData.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, SplitData, Model } from '@/service/mongo';
-import { authToken } from '@/service/utils/auth';
+import { authModel, authToken } from '@/service/utils/auth';
 import { generateVector } from '@/service/events/generateVector';
 import { generateQA } from '@/service/events/generateQA';
 import { PgClient } from '@/service/pg';
@@ -23,15 +23,11 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
    const userId = await authToken(req);
    // 验证是否是该用户的 model
-    const model = await Model.findOne({
+    await authModel({
-      _id: modelId,
+      modelId,
      userId
    });
-    if (!model) {
-      throw new Error('无权操作该模型');
-    }
    if (mode === 'qa') {
      // 批量QA拆分插入数据
      await SplitData.create({

--- a/src/pages/api/model/list.ts
+++ b/src/pages/api/model/list.ts
@@ -22,9 +22,13 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
      ).sort({
        _id: -1
      }),
-      Collection.find({
+      Collection.find({ userId })
-        userId
+        .populate({
-      }).populate('modelId', '_id avatar name chat.systemPrompt')
+          path: 'modelId',
+          select: '_id avatar name chat.systemPrompt',
+          match: { 'share.isShare': true }
+        })
+        .then((res) => res.filter((item) => item.modelId))
    ]);
    jsonRes<ModelListResponse>(res, {

--- a/src/pages/chat/components/Empty.tsx
+++ b/src/pages/chat/components/Empty.tsx
@@ -28,7 +28,13 @@ const Empty = ({
    >
      <Card p={4} mb={10}>
        <Flex mb={2} alignItems={'center'} justifyContent={'center'}>
-          <Image src={avatar || LOGO_ICON} w={'32px'} h={'32px'} alt={''} />
+          <Image
+            src={avatar || LOGO_ICON}
+            w={'32px'}
+            maxH={'40px'}
+            objectFit={'contain'}
+            alt={''}
+          />
          <Box ml={3} fontSize={'3xl'} fontWeight={'bold'}>
            {name}
          </Box>

--- a/src/pages/chat/index.tsx
+++ b/src/pages/chat/index.tsx
@@ -488,9 +488,6 @@ const Chat = ({
    modelId && setLastChatModelId(modelId);
    setLastChatId(chatId);
-    // focus scroll bottom
-    chatId && scrollToBottom('auto');
    /* get mode and chat into ↓ */
    // phone: history page
@@ -640,7 +637,7 @@ const Chat = ({
                      />
                    </MenuButton>
                    <MenuList fontSize={'sm'}>
-                      {chatData.model.canUse && (
+                      {chatData.model.canUse && item.obj === 'AI' && (
                        <MenuItem onClick={() => router.push(`/model?modelId=${chatData.modelId}`)}>
                          AI助手详情
                        </MenuItem>
@@ -675,6 +672,7 @@ const Chat = ({
                      </Box>
                    )}
                  </Box>
+                  {/* copy and clear icon */}
                  {isPc && (
                    <Flex h={'100%'} flexDirection={'column'} ml={2} w={'14px'} height={'100%'}>
                      <Box minH={'40px'} flex={1}>
@@ -815,8 +813,6 @@ const Chat = ({
  );
 };
-export default Chat;
 Chat.getInitialProps = ({ query, req }: any) => {
  return {
    modelId: query?.modelId || '',
@@ -824,3 +820,5 @@ Chat.getInitialProps = ({ query, req }: any) => {
    isPcDevice: !/Mobile/.test(req ? req.headers['user-agent'] : navigator.userAgent)
  };
 };
+export default Chat;
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -6,6 +6,7 @@ import { useScreen } from '@/hooks/useScreen';
 import type { ResLogin } from '@/api/response/user';
 import { useRouter } from 'next/router';
 import { useUserStore } from '@/store/user';
+import { useChatStore } from '@/store/chat';
 import LoginForm from './components/LoginForm';
 import dynamic from 'next/dynamic';
 const RegisterForm = dynamic(() => import('./components/RegisterForm'));
@@ -16,16 +17,33 @@ const Login = ({ isPcDevice }: { isPcDevice: boolean }) => {
  const { lastRoute = '' } = router.query as { lastRoute: string };
  const { isPc } = useScreen({ defaultIsPc: isPcDevice });
  const [pageType, setPageType] = useState<`${PageTypeEnum}`>(PageTypeEnum.login);
-  const { setUserInfo } = useUserStore();
+  const { setUserInfo, setLastModelId, loadMyModels } = useUserStore();
+  const { setLastChatId, setLastChatModelId, loadHistory } = useChatStore();
  const loginSuccess = useCallback(
    (res: ResLogin) => {
+      // init store
+      setLastChatId('');
+      setLastModelId('');
+      setLastChatModelId('');
+      loadMyModels(true);
+      loadHistory({ pageNum: 1, init: true });
      setUserInfo(res.user);
      setTimeout(() => {
        router.push(lastRoute ? decodeURIComponent(lastRoute) : '/model');
      }, 100);
    },
-    [lastRoute, router, setUserInfo]
+    [
+      lastRoute,
+      loadHistory,
+      loadMyModels,
+      router,
+      setLastChatId,
+      setLastChatModelId,
+      setLastModelId,
+      setUserInfo
+    ]
  );
  function DynamicComponent({ type }: { type: `${PageTypeEnum}` }) {

--- a/src/pages/model/components/detail/components/ModelEditForm.tsx
+++ b/src/pages/model/components/detail/components/ModelEditForm.tsx
@@ -55,8 +55,8 @@ const ModelEditForm = ({
      try {
        const base64 = await compressImg({
          file,
-          maxW: 40,
+          maxW: 100,
-          maxH: 60
+          maxH: 100
        });
        setValue('avatar', base64);
        setRefresh((state) => !state);

--- a/src/pages/number/index.tsx
+++ b/src/pages/number/index.tsx
@@ -57,8 +57,8 @@ const NumberSetting = () => {
      try {
        const base64 = await compressImg({
          file,
-          maxW: 40,
+          maxW: 100,
-          maxH: 60
+          maxH: 100
        });
        onclickSave({
          ...userInfo,
@@ -100,8 +100,8 @@ const NumberSetting = () => {
            src={userInfo?.avatar}
            alt={'avatar'}
            w={['28px', '36px']}
-            h={['28px', '36px']}
+            maxH={'40px'}
-            objectFit={'cover'}
+            objectFit={'contain'}
            cursor={'pointer'}
            title={'点击切换头像'}
            onClick={onOpenSelectFile}

--- a/src/service/errorCode.ts
+++ b/src/service/errorCode.ts
@@ -36,7 +36,8 @@ export const proxyError: Record<string, boolean> = {
 export enum ERROR_ENUM {
  unAuthorization = 'unAuthorization',
-  insufficientQuota = 'insufficientQuota'
+  insufficientQuota = 'insufficientQuota',
+  unAuthModel = 'unAuthModel'
 }
 export const ERROR_RESPONSE: Record<
  any,
@@ -58,5 +59,11 @@ export const ERROR_RESPONSE: Record<
    statusText: ERROR_ENUM.insufficientQuota,
    message: '账号余额不足',
    data: null
+  },
+  [ERROR_ENUM.unAuthModel]: {
+    code: 511,
+    statusText: ERROR_ENUM.unAuthModel,
+    message: '无权使用该模型',
+    data: null
  }
 };
--- a/src/service/utils/auth.ts
+++ b/src/service/utils/auth.ts
@@ -114,7 +114,7 @@ export const authModel = async ({
    2. authUser = false and share, anyone can use
  */
  if ((authOwner || (authUser && !model.share.isShare)) && userId !== String(model.userId)) {
-    return Promise.reject('无权操作该模型');
+    return Promise.reject(ERROR_ENUM.unAuthModel);
  }
  // do not share detail info