From 0537d3d5f6666fb0e8a2462b7368f7a89ec62717 Mon Sep 17 00:00:00 2001 From: Mateusz Kwasniewski Date: Mon, 20 May 2024 13:52:21 +0200 Subject: [PATCH] feat: switch to hook without features list (#7085) --- frontend/src/component/project/Project/Import/Import.test.tsx | 2 +- .../project/Project/Import/configure/ImportOptions.tsx | 4 ++-- frontend/src/component/project/Project/Project.tsx | 4 ++-- .../ProjectFeaturesBatchActions/ArchiveButton.tsx | 3 --- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/frontend/src/component/project/Project/Import/Import.test.tsx b/frontend/src/component/project/Project/Import/Import.test.tsx index 0cf050b77b..a30c2471bf 100644 --- a/frontend/src/component/project/Project/Import/Import.test.tsx +++ b/frontend/src/component/project/Project/Import/Import.test.tsx @@ -13,7 +13,7 @@ const setupApi = () => { current: { enterprise: 'present' }, }, }); - testServerRoute(server, '/api/admin/projects/default', { + testServerRoute(server, '/api/admin/projects/default/overview', { environments: [ { environment: 'development' }, { environment: 'production' }, diff --git a/frontend/src/component/project/Project/Import/configure/ImportOptions.tsx b/frontend/src/component/project/Project/Import/configure/ImportOptions.tsx index ada48305c5..17355a4f4e 100644 --- a/frontend/src/component/project/Project/Import/configure/ImportOptions.tsx +++ b/frontend/src/component/project/Project/Import/configure/ImportOptions.tsx @@ -3,7 +3,7 @@ import KeyboardArrowDownOutlined from '@mui/icons-material/KeyboardArrowDownOutl import { type FC, useEffect } from 'react'; import { Box, styled, Typography } from '@mui/material'; import { IMPORT_ENVIRONMENT } from 'utils/testIds'; -import useProject from 'hooks/api/getters/useProject/useProject'; +import useProjectOverview from 'hooks/api/getters/useProjectOverview/useProjectOverview'; const ImportOptionsContainer = styled(Box)(({ theme }) => ({ backgroundColor: theme.palette.background.elevation2, @@ -31,7 +31,7 @@ export const ImportOptions: FC = ({ environment, onChange, }) => { - const { project: projectInfo } = useProject(project); + const { project: projectInfo } = useProjectOverview(project); const environmentOptions = projectInfo.environments.map( ({ environment }) => ({ key: environment, diff --git a/frontend/src/component/project/Project/Project.tsx b/frontend/src/component/project/Project/Project.tsx index 07fbb9c377..89ec55b286 100644 --- a/frontend/src/component/project/Project/Project.tsx +++ b/frontend/src/component/project/Project/Project.tsx @@ -1,5 +1,4 @@ import { useNavigate } from 'react-router'; -import useProject from 'hooks/api/getters/useProject/useProject'; import useLoading from 'hooks/useLoading'; import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; import { @@ -43,6 +42,7 @@ import { HiddenProjectIconWithTooltip } from './HiddenProjectIconWithTooltip/Hid import { ChangeRequestPlausibleProvider } from 'component/changeRequest/ChangeRequestContext'; import { ProjectApplications } from '../ProjectApplications/ProjectApplications'; import { ProjectInsights } from './ProjectInsights/ProjectInsights'; +import useProjectOverview from 'hooks/api/getters/useProjectOverview/useProjectOverview'; const StyledBadge = styled(Badge)(({ theme }) => ({ position: 'absolute', @@ -65,7 +65,7 @@ interface ITab { export const Project = () => { const projectId = useRequiredPathParam('projectId'); const params = useQueryParams(); - const { project, loading, error, refetch } = useProject(projectId); + const { project, loading, error, refetch } = useProjectOverview(projectId); const ref = useLoading(loading, '[data-loading-project=true]'); const { setToastData, setToastApiError } = useToast(); const [modalOpen, setModalOpen] = useState(false); diff --git a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeaturesBatchActions/ArchiveButton.tsx b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeaturesBatchActions/ArchiveButton.tsx index 697d873636..ec9dfdc0a7 100644 --- a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeaturesBatchActions/ArchiveButton.tsx +++ b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeaturesBatchActions/ArchiveButton.tsx @@ -2,7 +2,6 @@ import { useMemo, useState, type VFC } from 'react'; import { Button } from '@mui/material'; import { PermissionHOC } from 'component/common/PermissionHOC/PermissionHOC'; import { DELETE_FEATURE } from 'component/providers/AccessProvider/permissions'; -import useProject from 'hooks/api/getters/useProject/useProject'; import { FeatureArchiveDialog } from 'component/common/FeatureArchiveDialog/FeatureArchiveDialog'; import { usePlausibleTracker } from 'hooks/usePlausibleTracker'; import type { FeatureSchema } from 'openapi'; @@ -30,7 +29,6 @@ export const ArchiveButton: VFC = ({ features, onConfirm, }) => { - const { refetch } = useProject(projectId); const [isDialogOpen, setIsDialogOpen] = useState(false); const { trackEvent } = usePlausibleTracker(); @@ -44,7 +42,6 @@ export const ArchiveButton: VFC = ({ const onArchive = async () => { setIsDialogOpen(false); onConfirm?.(); - await refetch(); trackEvent('batch_operations', { props: { eventType: 'features archived',