From ea9a232accef50dad5cc6a922f2ca4f7b16d8099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivar=20Conradi=20=C3=98sthus?= Date: Wed, 8 May 2024 14:44:21 +0200 Subject: [PATCH] fix: removed dupliacted component (#7013) --- .../EnvironmentAccordionBody.tsx | 7 +- .../StrategyNonDraggableItem.tsx | 131 ------------------ 2 files changed, 5 insertions(+), 133 deletions(-) delete mode 100644 frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/StrategyDraggableItem/StrategyNonDraggableItem.tsx diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/EnvironmentAccordionBody.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/EnvironmentAccordionBody.tsx index 5f1b33c5ef..ed3674c665 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/EnvironmentAccordionBody.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/EnvironmentAccordionBody.tsx @@ -19,7 +19,6 @@ import { useChangeRequestsEnabled } from 'hooks/useChangeRequestsEnabled'; import { usePendingChangeRequests } from 'hooks/api/getters/usePendingChangeRequests/usePendingChangeRequests'; import usePagination from 'hooks/usePagination'; import type { IFeatureStrategy } from 'interfaces/strategy'; -import { StrategyNonDraggableItem } from './StrategyDraggableItem/StrategyNonDraggableItem'; import { usePlausibleTracker } from 'hooks/usePlausibleTracker'; import { useUiFlag } from 'hooks/useUiFlag'; @@ -251,7 +250,7 @@ const EnvironmentAccordionBody = ({
{page.map((strategy, index) => ( - {}) as any} + onDragOver={(() => {}) as any} + onDragEnd={(() => {}) as any} /> ))}
diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/StrategyDraggableItem/StrategyNonDraggableItem.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/StrategyDraggableItem/StrategyNonDraggableItem.tsx deleted file mode 100644 index 8097167b2c..0000000000 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/StrategyDraggableItem/StrategyNonDraggableItem.tsx +++ /dev/null @@ -1,131 +0,0 @@ -import { useRef } from 'react'; -import { Box, useMediaQuery, useTheme } from '@mui/material'; -import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; -import { StrategySeparator } from 'component/common/StrategySeparator/StrategySeparator'; -import type { IFeatureEnvironment } from 'interfaces/featureToggle'; -import type { IFeatureStrategy } from 'interfaces/strategy'; -import { StrategyItem } from './StrategyItem/StrategyItem'; -import { useRequiredPathParam } from 'hooks/useRequiredPathParam'; -import { - useStrategyChangesFromRequest, - type UseStrategyChangeFromRequestResult, -} from './StrategyItem/useStrategyChangesFromRequest'; -import { ChangesScheduledBadge } from 'component/changeRequest/ModifiedInChangeRequestStatusBadge/ChangesScheduledBadge'; -import type { IFeatureChange } from 'component/changeRequest/changeRequest.types'; -import { Badge } from 'component/common/Badge/Badge'; -import { - type ScheduledChangeRequestViewModel, - useScheduledChangeRequestsWithStrategy, -} from 'hooks/api/getters/useScheduledChangeRequestsWithStrategy/useScheduledChangeRequestsWithStrategy'; - -interface IStrategyItemProps { - strategy: IFeatureStrategy; - environmentName: string; - index: number; - otherEnvironments?: IFeatureEnvironment['name'][]; -} - -/** - * @deprecated - */ -export const StrategyNonDraggableItem = ({ - strategy, - index, - environmentName, - otherEnvironments, -}: IStrategyItemProps) => { - const projectId = useRequiredPathParam('projectId'); - const featureId = useRequiredPathParam('featureId'); - const ref = useRef(null); - const strategyChangesFromRequest = useStrategyChangesFromRequest( - projectId, - featureId, - environmentName, - strategy.id, - ); - - const { changeRequests: scheduledChangesUsingStrategy } = - useScheduledChangeRequestsWithStrategy(projectId, strategy.id); - - return ( - - 0} - show={} - /> - - - - ); -}; - -const ChangeRequestStatusBadge = ({ - change, -}: { - change: IFeatureChange | undefined; -}) => { - const theme = useTheme(); - const isSmallScreen = useMediaQuery(theme.breakpoints.down('sm')); - - if (isSmallScreen) { - return null; - } - - return ( - - Modified in draft} - /> - Deleted in draft} - /> - - ); -}; - -const renderHeaderChildren = ( - changes?: UseStrategyChangeFromRequestResult, - scheduledChanges?: ScheduledChangeRequestViewModel[], -): JSX.Element[] => { - const badges: JSX.Element[] = []; - if (changes?.length === 0 && scheduledChanges?.length === 0) { - return []; - } - - const draftChange = changes?.find( - ({ isScheduledChange }) => !isScheduledChange, - ); - - if (draftChange) { - badges.push( - , - ); - } - - if (scheduledChanges && scheduledChanges.length > 0) { - badges.push( - scheduledChange.id, - )} - />, - ); - } - - return badges; -};