Skip to content

Commit f1f0ae2

Browse files
authored
fix: per;fix: invite user un refresh;perf: loginout (labring#3566)
* perf: loginout * fix: invite user un refresh * fix: per * fix: dockerfile * perf: docker file
1 parent 10d8c56 commit f1f0ae2

File tree

5 files changed

+41
-36
lines changed

5 files changed

+41
-36
lines changed

.github/workflows/preview-fastgpt-image.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,23 @@ jobs:
5151
--cache-to=type=local,dest=/tmp/.buildx-cache \
5252
-t ${DOCKER_REPO_TAGGED} \
5353
.
54+
# Add write md step after build
55+
- name: Write md
56+
run: |
57+
echo "# 🤖 Generated by deploy action" > report.md
58+
echo "📦 Preview Image: \`${DOCKER_REPO_TAGGED}\`" >> report.md
59+
cat report.md
60+
61+
- name: Gh Rebot for Sealos
62+
uses: labring/[email protected]
63+
if: ${{ (github.event_name == 'pull_request_target') }}
64+
with:
65+
version: v0.0.6
66+
env:
67+
GH_TOKEN: '${{ secrets.GH_PAT }}'
68+
SEALOS_TYPE: 'pr_comment'
69+
SEALOS_FILENAME: 'report.md'
70+
SEALOS_REPLACE_TAG: 'DEFAULT_REPLACE_DEPLOY'
5471

5572
helm-check:
5673
runs-on: ubuntu-20.04

projects/app/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ COPY ./projects/app/data /app/data
8282
RUN chown -R nextjs:nodejs /app/data
8383

8484
# Add tmp directory permission control
85-
RUN mkdir -p /tmp && chmod 666 /tmp
8685

8786
ENV NODE_ENV=production
8887
ENV NEXT_TELEMETRY_DISABLED=1

projects/app/src/components/support/user/team/UpdateInviteModal/index.tsx

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,50 @@
1-
import React, { useEffect } from 'react';
1+
import React from 'react';
22
import { useTranslation } from 'next-i18next';
33
import MyModal from '@fastgpt/web/components/common/MyModal';
4-
import {
5-
Button,
6-
ModalFooter,
7-
useDisclosure,
8-
ModalBody,
9-
Flex,
10-
Box,
11-
useTheme
12-
} from '@chakra-ui/react';
13-
import { useQuery } from '@tanstack/react-query';
4+
import { Button, ModalFooter, ModalBody, Flex, Box, useTheme } from '@chakra-ui/react';
145
import { getTeamList, updateInviteResult } from '@/web/support/user/team/api';
156
import { TeamMemberStatusEnum } from '@fastgpt/global/support/user/team/constant';
167
import Avatar from '@fastgpt/web/components/common/Avatar';
17-
import { useRequest } from '@fastgpt/web/hooks/useRequest';
188
import { useToast } from '@fastgpt/web/hooks/useToast';
199
import { useConfirm } from '@fastgpt/web/hooks/useConfirm';
2010
import { useSystemStore } from '@/web/common/system/useSystemStore';
11+
import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
12+
import { useUserStore } from '@/web/support/user/useUserStore';
2113

2214
const UpdateInviteModal = () => {
2315
const { t } = useTranslation();
2416
const theme = useTheme();
2517
const { toast } = useToast();
26-
const { ConfirmModal, openConfirm } = useConfirm({});
2718
const { feConfigs } = useSystemStore();
19+
const { initUserInfo } = useUserStore();
20+
21+
const { ConfirmModal, openConfirm } = useConfirm({});
2822

29-
const { data: inviteList = [], refetch } = useQuery(['getInviteList'], () =>
30-
feConfigs.isPlus ? getTeamList(TeamMemberStatusEnum.waiting) : []
23+
const { data: inviteList = [], run: fetchInviteList } = useRequest2(
24+
async () => (feConfigs.isPlus ? getTeamList(TeamMemberStatusEnum.waiting) : []),
25+
{
26+
manual: false
27+
}
3128
);
3229

33-
const { mutate: onAccept, isLoading: isLoadingAccept } = useRequest({
34-
mutationFn: updateInviteResult,
30+
const { runAsync: onAccept, loading: isLoadingAccept } = useRequest2(updateInviteResult, {
3531
onSuccess() {
3632
toast({
3733
status: 'success',
3834
title: t('common:user.team.invite.Accepted')
3935
});
40-
refetch();
36+
fetchInviteList();
37+
initUserInfo();
4138
}
4239
});
43-
const { mutate: onReject, isLoading: isLoadingReject } = useRequest({
44-
mutationFn: updateInviteResult,
40+
const { runAsync: onReject, loading: isLoadingReject } = useRequest2(updateInviteResult, {
4541
onSuccess() {
4642
toast({
4743
status: 'success',
4844
title: t('common:user.team.invite.Reject')
4945
});
50-
refetch();
46+
fetchInviteList();
47+
initUserInfo();
5148
}
5249
});
5350

@@ -59,7 +56,7 @@ const UpdateInviteModal = () => {
5956
<Box>
6057
<Box>{t('common:user.team.Processing invitations')}</Box>
6158
<Box fontWeight={'normal'} fontSize={'sm'} color={'myGray.500'}>
62-
{t('user.team.Processing invitations Tips', { amount: inviteList?.length })}
59+
{t('common:user.team.Processing invitations Tips', { amount: inviteList?.length })}
6360
</Box>
6461
</Box>
6562
}

projects/app/src/pages/account/team/index.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import { useContextSelector } from 'use-context-selector';
1010
import { useRouter } from 'next/router';
1111
import FillRowTabs from '@fastgpt/web/components/common/Tabs/FillRowTabs';
1212
import MyIcon from '@fastgpt/web/components/common/Icon';
13-
import { useToast } from '@fastgpt/web/hooks/useToast';
14-
import { useSystemStore } from '@/web/common/system/useSystemStore';
1513
import { TeamMemberRoleEnum } from '@fastgpt/global/support/user/team/constant';
1614
import { TeamContext, TeamModalContextProvider } from './components/context';
1715
import dynamic from 'next/dynamic';
Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
import type { NextApiRequest, NextApiResponse } from 'next';
2-
import { jsonRes } from '@fastgpt/service/common/response';
32
import { clearCookie } from '@fastgpt/service/support/permission/controller';
3+
import { NextAPI } from '@/service/middleware/entry';
44

5-
export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
6-
try {
7-
clearCookie(res);
8-
jsonRes(res);
9-
} catch (err) {
10-
jsonRes(res, {
11-
code: 500,
12-
error: err
13-
});
14-
}
5+
async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
6+
clearCookie(res);
157
}
8+
9+
export default NextAPI(handler);

0 commit comments

Comments
 (0)