1
0
mirror of https://github.com/Unleash/unleash.git synced 2025-04-29 01:15:48 +02:00

Change request API draft to open (#2320)

Draft to open
This commit is contained in:
sjaanus 2022-11-04 08:44:56 +01:00 committed by GitHub
parent 0717b281fa
commit f0a929044d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions

View File

@ -14,7 +14,7 @@ import { PageHeader } from 'component/common/PageHeader/PageHeader';
import { HelpOutline } from '@mui/icons-material'; import { HelpOutline } from '@mui/icons-material';
import EnvironmentIcon from 'component/common/EnvironmentIcon/EnvironmentIcon'; import EnvironmentIcon from 'component/common/EnvironmentIcon/EnvironmentIcon';
import { ChangeRequest } from '../ChangeRequest/ChangeRequest'; import { ChangeRequest } from '../ChangeRequest/ChangeRequest';
import { useChangeRequestDraft } from 'hooks/api/getters/useChangeRequestDraft/useChangeRequestDraft'; import { useChangeRequestOpen } from 'hooks/api/getters/useChangeRequestOpen/useChangeRequestOpen';
import { useChangeRequestApi } from 'hooks/api/actions/useChangeRequestApi/useChangeRequestApi'; import { useChangeRequestApi } from 'hooks/api/actions/useChangeRequestApi/useChangeRequestApi';
import { ChangeRequestStatusBadge } from '../ChangeRequestStatusBadge/ChangeRequestStatusBadge'; import { ChangeRequestStatusBadge } from '../ChangeRequestStatusBadge/ChangeRequestStatusBadge';
@ -65,7 +65,7 @@ export const ChangeRequestSidebar: VFC<IChangeRequestSidebarProps> = ({
draft, draft,
loading, loading,
refetch: refetchChangeRequest, refetch: refetchChangeRequest,
} = useChangeRequestDraft(project); } = useChangeRequestOpen(project);
const { changeState } = useChangeRequestApi(); const { changeState } = useChangeRequestApi();
const onReview = async (draftId: number) => { const onReview = async (draftId: number) => {

View File

@ -4,7 +4,7 @@ import { useStyles as useAppStyles } from 'component/App.styles';
import WarningAmberIcon from '@mui/icons-material/WarningAmber'; import WarningAmberIcon from '@mui/icons-material/WarningAmber';
import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
import { ChangeRequestSidebar } from '../ChangeRequestSidebar/ChangeRequestSidebar'; import { ChangeRequestSidebar } from '../ChangeRequestSidebar/ChangeRequestSidebar';
import { useChangeRequestDraft } from 'hooks/api/getters/useChangeRequestDraft/useChangeRequestDraft'; import { useChangeRequestOpen } from 'hooks/api/getters/useChangeRequestOpen/useChangeRequestOpen';
interface IDraftBannerProps { interface IDraftBannerProps {
project: string; project: string;
@ -13,7 +13,7 @@ interface IDraftBannerProps {
export const DraftBanner: VFC<IDraftBannerProps> = ({ project }) => { export const DraftBanner: VFC<IDraftBannerProps> = ({ project }) => {
const { classes } = useAppStyles(); const { classes } = useAppStyles();
const [isSidebarOpen, setIsSidebarOpen] = useState(false); const [isSidebarOpen, setIsSidebarOpen] = useState(false);
const { draft, loading } = useChangeRequestDraft(project); const { draft, loading } = useChangeRequestOpen(project);
const environment = ''; const environment = '';
if ((!loading && !draft) || draft?.length === 0) { if ((!loading && !draft) || draft?.length === 0) {

View File

@ -13,9 +13,9 @@ const fetcher = (path: string) => {
.then(res => res.json()); .then(res => res.json());
}; };
export const useChangeRequestDraft = (project: string) => { export const useChangeRequestOpen = (project: string) => {
const { data, error, mutate } = useSWR<IChangeRequest[]>( const { data, error, mutate } = useSWR<IChangeRequest[]>(
formatApiPath(`api/admin/projects/${project}/change-requests/draft`), formatApiPath(`api/admin/projects/${project}/change-requests/open`),
fetcher fetcher
); );

View File

@ -2,12 +2,12 @@ import { useCallback, useState } from 'react';
import useToast from 'hooks/useToast'; import useToast from 'hooks/useToast';
import { formatUnknownError } from 'utils/formatUnknownError'; import { formatUnknownError } from 'utils/formatUnknownError';
import { useChangeRequestApi } from './api/actions/useChangeRequestApi/useChangeRequestApi'; import { useChangeRequestApi } from './api/actions/useChangeRequestApi/useChangeRequestApi';
import { useChangeRequestDraft } from './api/getters/useChangeRequestDraft/useChangeRequestDraft'; import { useChangeRequestOpen } from './api/getters/useChangeRequestOpen/useChangeRequestOpen';
export const useChangeRequestToggle = (project: string) => { export const useChangeRequestToggle = (project: string) => {
const { setToastData, setToastApiError } = useToast(); const { setToastData, setToastApiError } = useToast();
const { addChangeRequest } = useChangeRequestApi(); const { addChangeRequest } = useChangeRequestApi();
const { refetch: refetchChangeRequests } = useChangeRequestDraft(project); const { refetch: refetchChangeRequests } = useChangeRequestOpen(project);
const [changeRequestDialogDetails, setChangeRequestDialogDetails] = const [changeRequestDialogDetails, setChangeRequestDialogDetails] =
useState<{ useState<{