feat: sync org from wecom, pref: member list pagination (#3549)

* feat: sync org

* chore: fe

* chore: loading

* chore: type

* pref: team member list change to pagination. Edit a sort of list apis.

* feat: member update avatar

* chore: user avatar move to tmb

* chore: init scripts move user avatar

* chore: sourceMember

* fix: list api sourceMember

* fix: member sync

* fix: pagination

* chore: adjust code

* chore: move changeOwner to pro

* chore: init v4819 script

* chore: adjust code

* chore: UserBox

projects/app/src/web/core/app/api.ts

@@ -5,7 +5,7 @@ import { AppUpdateParams, AppChangeOwnerBody } from '@/global/core/app/api';
 import type { CreateAppBody } from '@/pages/api/core/app/create';
 import type { ListAppBody } from '@/pages/api/core/app/list';
 import { AppLogsListItemType } from '@/types/app';
-import { PagingData } from '@/types';
+import { PaginationResponse } from '@fastgpt/web/common/fetch/type';
 
 /**
  * 获取应用列表
@@ -39,7 +39,7 @@ export const putAppById = (id: string, data: AppUpdateParams) =>
 
 // =================== chat logs
 export const getAppChatLogs = (data: GetAppChatLogsParams) =>
-  POST<PagingData<AppLogsListItemType>>(`/core/app/getChatLogs`, data);
+  POST<PaginationResponse<AppLogsListItemType>>(`/core/app/getChatLogs`, data);
 
 export const resumeInheritPer = (appId: string) =>
   GET(`/core/app/resumeInheritPermission`, { appId });

projects/app/src/web/core/app/api/plugin.ts

@@ -35,7 +35,8 @@ export const getTeamPlugTemplates = (data?: ListAppBody) =>
       intro: app.intro,
       showStatus: false,
       version: app.pluginData?.nodeVersion || defaultNodeVersion,
-      isTool: true
+      isTool: true,
+      sourceMember: app.sourceMember
     }))
   );
 

projects/app/src/web/core/app/api/version.ts

@@ -1,5 +1,5 @@
 import { PostPublishAppProps } from '@/global/core/app/api';
-import { GET, POST, DELETE, PUT } from '@/web/common/api/request';
+import { GET, POST } from '@/web/common/api/request';
 import type { AppVersionSchemaType } from '@fastgpt/global/core/app/version';
 import { PaginationProps } from '@fastgpt/web/common/fetch/type';
 import type {

projects/app/src/web/core/chat/context/chatRecordContext.tsx

@@ -2,7 +2,7 @@ import { getPaginationRecordsBody } from '@/pages/api/core/chat/getPaginationRec
 import { ChatSiteItemType } from '@fastgpt/global/core/chat/type';
 import { PaginationResponse } from '@fastgpt/web/common/fetch/type';
 import { useScrollPagination } from '@fastgpt/web/hooks/useScrollPagination';
-import React, { ReactNode, useEffect, useMemo, useState } from 'react';
+import React, { ReactNode, useMemo, useState } from 'react';
 import { createContext, useContextSelector } from 'use-context-selector';
 import { ChatItemContext } from './chatItemContext';
 import { getChatRecords } from '../api';
@@ -68,7 +68,7 @@ const ChatRecordContextProvider = ({
       const res = await getChatRecords(data);
 
       // First load scroll to bottom
-      if (data.offset === 0) {
+      if (Number(data.offset) === 0) {
         function scrollToBottom() {
           requestAnimationFrame(
             ChatBoxRef?.current ? () => ChatBoxRef?.current?.scrollToBottom?.() : scrollToBottom

projects/app/src/web/core/dataset/api.ts

@@ -37,7 +37,6 @@ import type { DatasetCollectionItemType } from '@fastgpt/global/core/dataset/typ
 import { DatasetCollectionSyncResultEnum } from '@fastgpt/global/core/dataset/constants';
 import type { DatasetDataItemType } from '@fastgpt/global/core/dataset/type';
 import type { DatasetCollectionsListItemType } from '@/global/core/dataset/type.d';
-import { PagingData } from '@/types';
 import type { getDatasetTrainingQueueResponse } from '@/pages/api/core/dataset/training/getDatasetTrainingQueue';
 import type { rebuildEmbeddingBody } from '@/pages/api/core/dataset/training/rebuildEmbedding';
 import type {
@@ -66,8 +65,6 @@ import type {
   listExistIdQuery,
   listExistIdResponse
 } from '@/pages/api/core/dataset/apiDataset/listExistId';
-import { FeishuServer, YuqueServer } from '@fastgpt/global/core/dataset/apiDataset';
-import { RequireOnlyOne } from '@fastgpt/global/common/type/utils';
 
 /* ======================== dataset ======================= */
 export const getDatasets = (data: GetDatasetListBody) =>
@@ -110,7 +107,7 @@ export const postSearchText = (data: SearchTestProps) =>
 
 /* ============================= collections ==================================== */
 export const getDatasetCollections = (data: GetDatasetCollectionsProps) =>
-  POST<PagingData<DatasetCollectionsListItemType>>(`/core/dataset/collection/list`, data);
+  POST<PaginationResponse<DatasetCollectionsListItemType>>(`/core/dataset/collection/list`, data);
 export const getDatasetCollectionPathById = (parentId: string) =>
   GET<ParentTreePathItemType[]>(`/core/dataset/collection/paths`, { parentId });
 export const getDatasetCollectionById = (id: string) =>

projects/app/src/web/core/dataset/components/SelectCollections.tsx

@@ -1,7 +1,7 @@
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import MyModal from '@fastgpt/web/components/common/MyModal';
 import ParentPaths from '@/components/common/ParentPaths';
-import { useRequest } from '@fastgpt/web/hooks/useRequest';
+import { useRequest, useRequest2 } from '@fastgpt/web/hooks/useRequest';
 import { getDatasetCollectionPathById, getDatasetCollections } from '@/web/core/dataset/api';
 import { Box, Flex, ModalFooter, Button, useTheme, Grid, Card, ModalBody } from '@chakra-ui/react';
 import { DatasetCollectionTypeEnum } from '@fastgpt/global/core/dataset/constants';
@@ -48,20 +48,24 @@ const SelectCollections = ({
 
   useQuery(['loadDatasetDetail', datasetId], () => loadDatasetDetail(datasetId));
 
-  const { data, isLoading } = useQuery(['getDatasetCollections', parentId], () =>
-    getDatasetCollections({
-      datasetId,
-      parentId,
-      selectFolder: type === 'folder',
-      simple: true,
-      pageNum: 1,
-      pageSize: 50
-    })
+  const { data, loading: isLoading } = useRequest2(
+    () =>
+      getDatasetCollections({
+        datasetId,
+        parentId,
+        selectFolder: type === 'folder',
+        simple: true,
+        pageNum: 1,
+        pageSize: 50
+      }),
+    {
+      manual: false,
+      refreshDeps: [datasetId, parentId, type]
+    }
   );
-
   const formatCollections = useMemo(
     () =>
-      data?.data.map((collection) => {
+      data?.list.map((collection) => {
         const icon = getCollectionIcon(collection.type, collection.name);
 
         return {
@@ -111,7 +115,7 @@ const SelectCollections = ({
       title={
         <Box>
           <ParentPaths
-            paths={paths.map((path, i) => ({
+            paths={paths.map((path) => ({
               parentId: path.parentId,
               parentName: path.parentName
             }))}

projects/app/src/web/support/activity/promotion/api.ts

@@ -1,6 +1,6 @@
-import { GET, POST, PUT } from '@/web/common/api/request';
+import { GET, POST } from '@/web/common/api/request';
 import type { PromotionRecordType } from '@/global/support/api/userRes.d';
-import { PagingData, type RequestPaging } from '@/types';
+import { PaginationProps, PaginationResponse } from '@fastgpt/web/common/fetch/type';
 
 /* get promotion init data */
 export const getPromotionInitData = () =>
@@ -10,5 +10,8 @@ export const getPromotionInitData = () =>
   }>('/proApi/support/activity/promotion/getPromotionData');
 
 /* promotion records */
-export const getPromotionRecords = (data: RequestPaging) =>
-  POST<PagingData<PromotionRecordType>>(`/proApi/support/activity/promotion/getPromotions`, data);
+export const getPromotionRecords = (data: PaginationProps) =>
+  POST<PaginationResponse<PromotionRecordType>>(
+    `/proApi/support/activity/promotion/getPromotions`,
+    data
+  );

projects/app/src/web/support/user/api.ts

@@ -90,3 +90,5 @@ export const getCaptchaPic = (username: string) =>
   GET<{
     captchaImage: string;
   }>('/proApi/support/user/account/captcha/getImgCaptcha', { username });
+
+export const postSyncMembers = () => POST('/proApi/support/user/team/org/sync');

projects/app/src/web/support/user/inform/api.ts

@@ -1,10 +1,10 @@
-import { GET, POST, PUT } from '@/web/common/api/request';
-import type { PagingData, RequestPaging } from '@/types';
+import { GET, POST } from '@/web/common/api/request';
 import type { UserInformSchema } from '@fastgpt/global/support/user/inform/type';
 import { SystemMsgModalValueType } from '@fastgpt/service/support/user/inform/type';
+import { PaginationProps, PaginationResponse } from '@fastgpt/web/common/fetch/type';
 
-export const getInforms = (data: RequestPaging) =>
-  POST<PagingData<UserInformSchema>>(`/proApi/support/user/inform/list`, data);
+export const getInforms = (data: PaginationProps) =>
+  POST<PaginationResponse<UserInformSchema>>(`/proApi/support/user/inform/list`, data);
 
 export const getUnreadCount = () =>
   GET<{

projects/app/src/web/support/user/team/api.ts

@@ -19,6 +19,7 @@ import {
 } from '@fastgpt/global/support/user/team/type.d';
 import { FeTeamPlanStatusType, TeamSubSchema } from '@fastgpt/global/support/wallet/sub/type';
 import { TeamInvoiceHeaderType } from '@fastgpt/global/support/user/team/type';
+import { PaginationProps, PaginationResponse } from '@fastgpt/web/common/fetch/type';
 
 /* --------------- team  ---------------- */
 export const getTeamList = (status: `${TeamMemberSchema['status']}`) =>
@@ -30,8 +31,8 @@ export const putSwitchTeam = (teamId: string) =>
   PUT<string>(`/proApi/support/user/team/switch`, { teamId });
 
 /* --------------- team member ---------------- */
-export const getTeamMembers = () =>
-  GET<TeamMemberItemType[]>(`/proApi/support/user/team/member/list`);
+export const getTeamMembers = (props: PaginationProps) =>
+  GET<PaginationResponse<TeamMemberItemType>>(`/proApi/support/user/team/member/list`, props);
 export const postInviteTeamMember = (data: InviteMemberProps) =>
   POST<InviteMemberResponse>(`/proApi/support/user/team/member/invite`, data);
 export const putUpdateMemberName = (name: string) =>

projects/app/src/web/support/user/useUserStore.ts

@@ -30,9 +30,6 @@ type State = {
   teamPlanStatus: FeTeamPlanStatusType | null;
   initTeamPlanStatus: () => Promise<any>;
 
-  teamMembers: TeamMemberItemType[];
-  loadAndGetTeamMembers: (init?: boolean) => Promise<TeamMemberItemType[]>;
-
   teamMemberGroups: MemberGroupListType;
   myGroups: MemberGroupListType;
   loadAndGetGroups: (init?: boolean) => Promise<MemberGroupListType>;
@@ -102,7 +99,7 @@ export const useUserStore = create<State>()(
         },
         // team
         teamPlanStatus: null,
-        initTeamPlanStatus() {
+        async initTeamPlanStatus() {
           return getTeamPlanStatus().then((res) => {
             set((state) => {
               state.teamPlanStatus = res;
@@ -110,21 +107,6 @@ export const useUserStore = create<State>()(
             return res;
           });
         },
-        teamMembers: [],
-        loadAndGetTeamMembers: async (init = false) => {
-          if (!useSystemStore.getState()?.feConfigs?.isPlus) return [];
-
-          const randomRefresh = Math.random() > 0.7;
-          if (!randomRefresh && !init && get().teamMembers?.length)
-            return Promise.resolve(get().teamMembers);
-
-          const res = await getTeamMembers();
-          set((state) => {
-            state.teamMembers = res;
-          });
-
-          return res;
-        },
         teamMemberGroups: [],
         teamOrgs: [],
         myGroups: [],

projects/app/src/web/support/wallet/bill/api.ts

@@ -1,14 +1,14 @@
-import { PagingData, RequestPaging } from '@/types';
 import { GET, POST } from '@/web/common/api/request';
 import { CreateBillProps, CreateBillResponse } from '@fastgpt/global/support/wallet/bill/api';
 import { BillTypeEnum } from '@fastgpt/global/support/wallet/bill/constants';
 import type { BillSchemaType } from '@fastgpt/global/support/wallet/bill/type.d';
+import { PaginationProps, PaginationResponse } from '@fastgpt/web/common/fetch/type';
 
 export const getBills = (
-  data: RequestPaging & {
+  data: PaginationProps<{
     type?: BillTypeEnum;
-  }
-) => POST<PagingData<BillSchemaType>>(`/proApi/support/wallet/bill/list`, data);
+  }>
+) => POST<PaginationResponse<BillSchemaType>>(`/proApi/support/wallet/bill/list`, data);
 
 export const getWxPayQRCode = (data: CreateBillProps) =>
   POST<CreateBillResponse>(`/proApi/support/wallet/bill/create`, data);

projects/app/src/web/support/wallet/bill/invoice/api.ts

@@ -1,8 +1,8 @@
-import { PagingData, RequestPaging } from '@/types';
 import { GET, POST } from '@/web/common/api/request';
 import { BillTypeEnum } from '@fastgpt/global/support/wallet/bill/constants';
 import { InvoiceType } from '@fastgpt/global/support/wallet/bill/type';
 import { InvoiceSchemaType } from '@fastgpt/global/support/wallet/bill/type';
+import { PaginationProps, PaginationResponse } from '@fastgpt/web/common/fetch/type';
 export type invoiceBillDataType = {
   type: BillTypeEnum;
   price: number;
@@ -16,5 +16,5 @@ export const getInvoiceBillsList = () =>
 export const submitInvoice = (data: InvoiceType) =>
   POST(`/proApi/support/wallet/bill/invoice/submit`, data);
 
-export const getInvoiceRecords = (data: RequestPaging) =>
-  POST<PagingData<InvoiceSchemaType>>(`/proApi/support/wallet/bill/invoice/records`, data);
+export const getInvoiceRecords = (data: PaginationProps) =>
+  POST<PaginationResponse<InvoiceSchemaType>>(`/proApi/support/wallet/bill/invoice/records`, data);

projects/app/src/web/support/wallet/usage/api.ts

@@ -1,10 +1,17 @@
-import { GET, POST } from '@/web/common/api/request';
+import { POST } from '@/web/common/api/request';
 import { CreateTrainingUsageProps } from '@fastgpt/global/support/wallet/usage/api.d';
-import type { PagingData, RequestPaging } from '@/types';
+import { UsageSourceEnum } from '@fastgpt/global/support/wallet/usage/constants';
 import type { UsageItemType } from '@fastgpt/global/support/wallet/usage/type';
+import { PaginationProps, PaginationResponse } from '@fastgpt/web/common/fetch/type';
 
-export const getUserUsages = (data: RequestPaging) =>
-  POST<PagingData<UsageItemType>>(`/proApi/support/wallet/usage/getUsage`, data);
+export const getUserUsages = (
+  data: PaginationProps<{
+    dateStart: Date;
+    dateEnd: Date;
+    source?: UsageSourceEnum;
+    teamMemberId: string;
+  }>
+) => POST<PaginationResponse<UsageItemType>>(`/proApi/support/wallet/usage/getUsage`, data);
 
 export const postCreateTrainingUsage = (data: CreateTrainingUsageProps) =>
   POST<string>(`/support/wallet/usage/createTrainingUsage`, data);