Publish histories (labring#1331)

* fix http plugin edge (labring#95)

* fix http plugin edge

* use getHandleId

* perf: i18n file

* feat: histories list

* perf: request lock

* fix: ts

* move box components

* fix: edit form refresh

---------

Co-authored-by: heheer <[email protected]>

.vscode/nextapi.code-snippets

@@ -17,7 +17,7 @@
 			"",
 			"type Response = {};",
 			"",
-			"async function handler(req: NextApiRequest, res: NextApiResponse<any>): Promise<{}> {",
+			"async function handler(req: NextApiRequest, res: NextApiResponse<any>): Promise<Response> {",
 			"    $1",
 			"    return {}",
 			"}",

.vscode/settings.json

@@ -4,7 +4,7 @@
     "typescript.tsdk": "node_modules/typescript/lib",
     "prettier.prettierPath": "",
     "i18n-ally.localesPaths": [
-        "projects/app/public/locales",
+        "projects/app/i18n",
     ],
     "i18n-ally.enabledParsers": ["json"],
     "i18n-ally.keystyle": "nested",

packages/global/core/app/version.d.ts

@@ -2,6 +2,7 @@ import { StoreNodeItemType } from '../workflow/type';
 import { StoreEdgeItemType } from '../workflow/type/edge';
 
 export type AppVersionSchemaType = {
+  _id: string;
   appId: string;
   time: Date;
   nodes: StoreNodeItemType[];

packages/global/core/plugin/httpPlugin/utils.ts

@@ -14,6 +14,7 @@ import { CreateOnePluginParams } from '../controller';
 import { StoreNodeItemType } from '../../workflow/type';
 import { HttpImgUrl } from '../../../common/file/image/constants';
 import SwaggerParser from '@apidevtools/swagger-parser';
+import { getHandleId } from '../../../core/workflow/utils';
 
 export const str2OpenApiSchema = async (yamlStr = ''): Promise<OpenApiJsonSchema> => {
   try {
@@ -378,14 +379,14 @@ export const httpApiSchema2Plugins = async ({
       {
         source: pluginInputId,
         target: httpId,
-        sourcePort: `${pluginInputId}-source-right`,
-        targetPort: `${httpId}-target-left`
+        sourceHandle: getHandleId(pluginInputId, 'source', 'right'),
+        targetHandle: getHandleId(httpId, 'target', 'left')
       },
       {
         source: httpId,
         target: pluginOutputId,
-        sourcePort: `${httpId}-source-right`,
-        targetPort: `${pluginOutputId}-target-left`
+        sourceHandle: getHandleId(httpId, 'source', 'right'),
+        targetHandle: getHandleId(pluginOutputId, 'target', 'left')
       }
     ];
 

packages/global/core/workflow/template/constants.ts

@@ -83,41 +83,3 @@ export const moduleTemplatesFlat: FlowNodeTemplateType[] = [
   lafModule,
   ifElseNode
 ];
-
-export const moduleTemplatesList: nodeTemplateListType = [
-  {
-    type: FlowNodeTemplateTypeEnum.systemInput,
-    label: 'core.module.template.System input module',
-    list: []
-  },
-  {
-    type: FlowNodeTemplateTypeEnum.textAnswer,
-    label: 'core.module.template.Response module',
-    list: []
-  },
-  {
-    type: FlowNodeTemplateTypeEnum.functionCall,
-    label: 'core.module.template.Function module',
-    list: []
-  },
-  {
-    type: FlowNodeTemplateTypeEnum.tools,
-    label: 'core.module.template.Tool module',
-    list: []
-  },
-  {
-    type: FlowNodeTemplateTypeEnum.externalCall,
-    label: 'core.module.template.External module',
-    list: []
-  },
-  {
-    type: FlowNodeTemplateTypeEnum.personalPlugin,
-    label: '',
-    list: []
-  },
-  {
-    type: FlowNodeTemplateTypeEnum.other,
-    label: '其他',
-    list: []
-  }
-];

packages/web/common/fetch/type.d.ts

@@ -0,0 +1,8 @@
+export type PaginationProps<T = {}> = T & {
+  current: number;
+  pageSize: number;
+};
+export type PaginationResponse<T = any> = {
+  total: number;
+  list: T[];
+};

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

@@ -142,10 +142,12 @@ export const iconPaths = {
     import('./icons/core/workflow/inputType/selectLLM.svg'),
   'core/workflow/inputType/switch': () => import('./icons/core/workflow/inputType/switch.svg'),
   'core/workflow/inputType/textarea': () => import('./icons/core/workflow/inputType/textarea.svg'),
+  'core/workflow/revertVersion': () => import('./icons/core/workflow/revertVersion.svg'),
   'core/workflow/runError': () => import('./icons/core/workflow/runError.svg'),
   'core/workflow/runSkip': () => import('./icons/core/workflow/runSkip.svg'),
   'core/workflow/runSuccess': () => import('./icons/core/workflow/runSuccess.svg'),
   'core/workflow/running': () => import('./icons/core/workflow/running.svg'),
+  'core/workflow/versionHistories': () => import('./icons/core/workflow/versionHistories.svg'),
   date: () => import('./icons/date.svg'),
   delete: () => import('./icons/delete.svg'),
   edit: () => import('./icons/edit.svg'),

packages/web/components/common/MyBox/index.tsx

@@ -0,0 +1,19 @@
+import React, { forwardRef } from 'react';
+import { Box, BoxProps } from '@chakra-ui/react';
+import Loading from '../MyLoading';
+
+type Props = BoxProps & {
+  isLoading?: boolean;
+  text?: string;
+};
+
+const MyBox = ({ text, isLoading, children, ...props }: Props, ref: any) => {
+  return (
+    <Box ref={ref} position={'relative'} {...props}>
+      {isLoading && <Loading fixed={false} text={text} />}
+      {children}
+    </Box>
+  );
+};
+
+export default forwardRef(MyBox);

packages/web/components/common/MyDrawer/CustomRightDrawer.tsx

@@ -0,0 +1,80 @@
+import React from 'react';
+import MyIcon from '../Icon';
+import { Flex, Image, Box, CloseButton, FlexProps } from '@chakra-ui/react';
+import { useLoading } from '../../../hooks/useLoading';
+
+type Props = FlexProps & {
+  onClose: () => void;
+  iconSrc?: string;
+  title?: any;
+  isLoading?: boolean;
+  showMask?: boolean;
+};
+
+const CustomRightDrawer = ({
+  onClose,
+  iconSrc,
+  title,
+  maxW = ['90vw', '30vw'],
+  children,
+  isLoading,
+  showMask = true,
+  ...props
+}: Props) => {
+  const { Loading } = useLoading();
+  return (
+    <Flex
+      flexDirection={'column'}
+      position={'fixed'}
+      right={0}
+      bg={'white'}
+      zIndex={100}
+      maxW={maxW}
+      w={'100%'}
+      h={'90vh'}
+      borderLeftRadius={'lg'}
+      border={'base'}
+      boxShadow={'2'}
+      {...props}
+    >
+      <Flex
+        display={'flex'}
+        alignItems={'center'}
+        fontWeight={500}
+        background={'#FBFBFC'}
+        borderBottom={'1px solid #F4F6F8'}
+        roundedTop={'lg'}
+        py={'10px'}
+        px={5}
+      >
+        {iconSrc && (
+          <>
+            {iconSrc.startsWith('/') ? (
+              <Image mr={3} objectFit={'contain'} alt="" src={iconSrc} w={'20px'} />
+            ) : (
+              <MyIcon mr={3} name={iconSrc as any} w={'20px'} />
+            )}
+          </>
+        )}
+        <Box flex={'1'} fontSize={'lg'}>
+          {title}
+        </Box>
+        <CloseButton position={'relative'} fontSize={'sm'} top={0} right={0} onClick={onClose} />
+      </Flex>
+
+      <Box
+        flex={'1 0 0'}
+        py={props.py ?? 3}
+        px={props.px ?? 5}
+        overflow={props?.overflow ?? 'auto'}
+        display={'flex'}
+        flexDirection={'column'}
+      >
+        {children}
+      </Box>
+      <Loading loading={isLoading} fixed={false} />
+    </Flex>
+  );
+};
+
+export default React.memo(CustomRightDrawer);

packages/web/core/workflow/constants.ts

@@ -0,0 +1,41 @@
+import { FlowNodeTemplateTypeEnum } from '@fastgpt/global/core/workflow/constants';
+import { nodeTemplateListType } from '@fastgpt/global/core/workflow/type';
+import { TFunction } from 'next-i18next';
+
+export const workflowNodeTemplateList = (t: TFunction): nodeTemplateListType => [
+  {
+    type: FlowNodeTemplateTypeEnum.systemInput,
+    label: t('core.module.template.System input module'),
+    list: []
+  },
+  {
+    type: FlowNodeTemplateTypeEnum.textAnswer,
+    label: t('core.module.template.Response module'),
+    list: []
+  },
+  {
+    type: FlowNodeTemplateTypeEnum.functionCall,
+    label: t('core.module.template.Function module'),
+    list: []
+  },
+  {
+    type: FlowNodeTemplateTypeEnum.tools,
+    label: t('core.module.template.Tool module'),
+    list: []
+  },
+  {
+    type: FlowNodeTemplateTypeEnum.externalCall,
+    label: t('core.module.template.External module'),
+    list: []
+  },
+  {
+    type: FlowNodeTemplateTypeEnum.personalPlugin,
+    label: '',
+    list: []
+  },
+  {
+    type: FlowNodeTemplateTypeEnum.other,
+    label: t('common.Other'),
+    list: []
+  }
+];