Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-10-27 11:02:16 +01:00
Code Issues Projects Releases Wiki Activity

fix cr banner (#2501)

Browse Source
This commit is contained in:
Mateusz Kwasniewski 2022-11-22 14:59:38 +01:00 committed by GitHub
parent 4aff5ad379
commit 27cb6b742a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestOverview.tsx
View File

@ -21,6 +21,7 @@ import { useAuthUser } from 'hooks/api/getters/useAuth/useAuthUser';
import AccessContext from 'contexts/AccessContext'; import AccessContext from 'contexts/AccessContext';
import { ChangeRequestComment } from './ChangeRequestComments/ChangeRequestComment'; import { ChangeRequestComment } from './ChangeRequestComments/ChangeRequestComment';
import { AddCommentField } from './ChangeRequestComments/AddCommentField'; import { AddCommentField } from './ChangeRequestComments/AddCommentField';
import { useChangeRequestOpen } from 'hooks/api/getters/useChangeRequestOpen/useChangeRequestOpen';
const StyledAsideBox = styled(Box)(({ theme }) => ({ const StyledAsideBox = styled(Box)(({ theme }) => ({
width: '30%', width: '30%',
@ -58,6 +59,8 @@ export const ChangeRequestOverview: FC = () => {
id id
); );
const { changeState, addComment } = useChangeRequestApi(); const { changeState, addComment } = useChangeRequestApi();
const { refetch: refetchChangeRequestOpen } =
useChangeRequestOpen(projectId);
const { setToastData, setToastApiError } = useToast(); const { setToastData, setToastApiError } = useToast();
if (!changeRequest) { if (!changeRequest) {
@ -70,6 +73,7 @@ export const ChangeRequestOverview: FC = () => {
state: 'Applied', state: 'Applied',
}); });
refetchChangeRequest(); refetchChangeRequest();
refetchChangeRequestOpen();
setToastData({ setToastData({
type: 'success', type: 'success',
title: 'Success', title: 'Success',

4
frontend/src/component/changeRequest/ChangeRequestOverview/ReviewButton/ReviewButton.tsx
View File

@ -20,6 +20,7 @@ import { APPROVE_CHANGE_REQUEST } from 'component/providers/AccessProvider/permi
import PermissionButton from 'component/common/PermissionButton/PermissionButton'; import PermissionButton from 'component/common/PermissionButton/PermissionButton';
import { useAuthUser } from 'hooks/api/getters/useAuth/useAuthUser'; import { useAuthUser } from 'hooks/api/getters/useAuth/useAuthUser';
import AccessContext from 'contexts/AccessContext'; import AccessContext from 'contexts/AccessContext';
import { useChangeRequestOpen } from 'hooks/api/getters/useChangeRequestOpen/useChangeRequestOpen';
export const ReviewButton = () => { export const ReviewButton = () => {
const { isAdmin } = useContext(AccessContext); const { isAdmin } = useContext(AccessContext);
@ -27,6 +28,8 @@ export const ReviewButton = () => {
const id = useRequiredPathParam('id'); const id = useRequiredPathParam('id');
const { user } = useAuthUser(); const { user } = useAuthUser();
const { refetchChangeRequest, data } = useChangeRequest(projectId, id); const { refetchChangeRequest, data } = useChangeRequest(projectId, id);
const { refetch: refetchChangeRequestOpen } =
useChangeRequestOpen(projectId);
const { setToastApiError, setToastData } = useToast(); const { setToastApiError, setToastData } = useToast();
const { changeState } = useChangeRequestApi(); const { changeState } = useChangeRequestApi();
@ -40,6 +43,7 @@ export const ReviewButton = () => {
state: 'Approved', state: 'Approved',
}); });
refetchChangeRequest(); refetchChangeRequest();
refetchChangeRequestOpen();
setToastData({ setToastData({
type: 'success', type: 'success',
title: 'Success', title: 'Success',

16
frontend/src/hooks/api/getters/useChangeRequestOpen/useChangeRequestOpen.ts
View File

@ -1,5 +1,4 @@
import useSWR from 'swr'; import useSWR from 'swr';
import { useMemo } from 'react';
import { formatApiPath } from 'utils/formatPath'; import { formatApiPath } from 'utils/formatPath';
import handleErrorResponses from '../httpErrorResponseHandler'; import handleErrorResponses from '../httpErrorResponseHandler';
import { IChangeRequest } from 'component/changeRequest/changeRequest.types'; import { IChangeRequest } from 'component/changeRequest/changeRequest.types';
@ -18,13 +17,10 @@ export const useChangeRequestOpen = (project: string) => {
isOss() ? () => Promise.resolve([]) : fetcher isOss() ? () => Promise.resolve([]) : fetcher
); );
return useMemo( return {
() => ({ draft: data,
draft: data, loading: !error && !data,
loading: !error && !data, refetch: mutate,
refetch: () => mutate(), error,
error, };
}),
[data, error, mutate]
);
}; };