move code

Author: c121914yu

packages/global/support/user/inform/type.d.ts

@@ -1,11 +1,13 @@
 import { InformTypeEnum } from './constants';
 
 export type SendInformProps = {
-  tmbId?: string;
-  type: `${InformTypeEnum}`;
   title: string;
   content: string;
 };
+export type SendInform2User = SendInformProps & {
+  type: `${InformTypeEnum}`;
+  tmbId: string;
+};
 
 export type UserInformSchema = {
   _id: string;

packages/web/components/common/Icon/constants.ts

@@ -16,6 +16,7 @@ export const iconPaths = {
   'common/confirm/rightTip': () => import('./icons/common/confirm/rightTip.svg'),
   'common/courseLight': () => import('./icons/common/courseLight.svg'),
   'common/customTitleLight': () => import('./icons/common/customTitleLight.svg'),
+  'common/data': () => import('./icons/common/data.svg'),
   'common/editor/resizer': () => import('./icons/common/editor/resizer.svg'),
   'common/errorFill': () => import('./icons/common/errorFill.svg'),
   'common/file/move': () => import('./icons/common/file/move.svg'),

packages/web/components/common/Icon/icons/common/data.svg

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useDisclosure, Button, ModalBody, ModalFooter } from '@chakra-ui/react';
 import { useTranslation } from 'next-i18next';
-import MyModal from '@fastgpt/web/components/common/MyModal';
+import MyModal from '../components/common/MyModal';
 
 export const useConfirm = (props?: {
   title?: string;

projects/app/src/web/common/hooks/useConfirm.tsx renamed to packages/web/hooks/useConfirm.tsx

@@ -0,0 +1,41 @@
+import { useToast } from './useToast';
+import { useMutation } from '@tanstack/react-query';
+import type { UseMutationOptions } from '@tanstack/react-query';
+import { getErrText } from '@fastgpt/global/common/error/utils';
+import { useTranslation } from 'next-i18next';
+
+interface Props extends UseMutationOptions<any, any, any, any> {
+  successToast?: string | null;
+  errorToast?: string | null;
+}
+
+export const useRequest = ({ successToast, errorToast, onSuccess, onError, ...props }: Props) => {
+  const { toast } = useToast();
+  const { t } = useTranslation();
+  const mutation = useMutation<unknown, unknown, any, unknown>({
+    ...props,
+    onSuccess(res, variables: void, context: unknown) {
+      onSuccess?.(res, variables, context);
+      successToast &&
+        toast({
+          title: successToast,
+          status: 'success'
+        });
+    },
+    onError(err: any, variables: void, context: unknown) {
+      onError?.(err, variables, context);
+
+      if (errorToast !== undefined) {
+        const errText = t(getErrText(err, errorToast || ''));
+        if (errText) {
+          toast({
+            title: errText,
+            status: 'error'
+          });
+        }
+      }
+    }
+  });
+
+  return mutation;
+};

packages/web/hooks/useRequest.tsx

@@ -48,7 +48,7 @@
     "react": "18.2.0",
     "react-day-picker": "^8.7.1",
     "react-dom": "18.2.0",
-    "react-hook-form": "^7.43.1",
+    "react-hook-form": "7.43.1",
     "react-i18next": "13.5.0",
     "react-markdown": "^8.0.7",
     "react-syntax-highlighter": "^15.5.0",

pnpm-lock.yaml

@@ -1,7 +1,7 @@
 import React, { useRef } from 'react';
 import { ModalBody, Textarea, ModalFooter, Button } from '@chakra-ui/react';
 import MyModal from '@fastgpt/web/components/common/MyModal';
-import { useRequest } from '@/web/common/hooks/useRequest';
+import { useRequest } from '@fastgpt/web/hooks/useRequest';
 import { useTranslation } from 'next-i18next';
 import { updateChatUserFeedback } from '@/web/core/chat/api';
 

projects/app/package.json

@@ -10,7 +10,7 @@ import { compressImgFileAndUpload } from '@/web/common/file/controller';
 import { customAlphabet } from 'nanoid';
 import { ChatFileTypeEnum } from '@fastgpt/global/core/chat/constants';
 import { addDays } from 'date-fns';
-import { useRequest } from '@/web/common/hooks/useRequest';
+import { useRequest } from '@fastgpt/web/hooks/useRequest';
 import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants';
 import { OutLinkChatAuthProps } from '@fastgpt/global/support/permission/chat';
 import { ChatBoxInputFormType, ChatBoxInputType, UserInputFileItemType } from './type';

projects/app/src/components/ChatBox/FeedbackModal.tsx

@@ -20,7 +20,7 @@ import { getErrText } from '@fastgpt/global/common/error/utils';
 import { moduleTemplatesList } from '@fastgpt/global/core/module/template/constants';
 import RowTabs from '@fastgpt/web/components/common/Tabs/RowTabs';
 import { useWorkflowStore } from '@/web/core/workflow/store/workflow';
-import { useRequest } from '@/web/common/hooks/useRequest';
+import { useRequest } from '@fastgpt/web/hooks/useRequest';
 import ParentPaths from '@/components/common/ParentPaths';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { useRouter } from 'next/router';