diff --git a/frontend/src/component/feature/Dependencies/AddDependencyDialogue.test.tsx b/frontend/src/component/feature/Dependencies/AddDependencyDialogue.test.tsx index 36d6ba62dac..8aa4eed12bb 100644 --- a/frontend/src/component/feature/Dependencies/AddDependencyDialogue.test.tsx +++ b/frontend/src/component/feature/Dependencies/AddDependencyDialogue.test.tsx @@ -81,13 +81,14 @@ test('Delete dependency', async () => { }); }); -test('Add dependency', async () => { +test('Edit dependency', async () => { let closed = false; setupApi(); render( { closed = true; @@ -95,7 +96,7 @@ test('Add dependency', async () => { />, ); - const removeDependency = await screen.findByText('Remove'); + const removeDependency = await screen.findByText('Add'); await waitFor(() => { expect(removeDependency).not.toBeDisabled(); @@ -103,6 +104,7 @@ test('Add dependency', async () => { // Open the dropdown by selecting the role. const dropdown = screen.queryAllByRole('combobox')[0]; + expect(dropdown.innerHTML).toBe('parentB'); userEvent.click(dropdown); const parentAOption = await screen.findByText('parentA'); diff --git a/frontend/src/component/feature/Dependencies/AddDependencyDialogue.tsx b/frontend/src/component/feature/Dependencies/AddDependencyDialogue.tsx index 2c7f29e20ea..35a0111db27 100644 --- a/frontend/src/component/feature/Dependencies/AddDependencyDialogue.tsx +++ b/frontend/src/component/feature/Dependencies/AddDependencyDialogue.tsx @@ -18,6 +18,7 @@ import { DependenciesUpgradeAlert } from './DependenciesUpgradeAlert'; interface IAddDependencyDialogueProps { project: string; featureId: string; + parentFeatureId?: string; showDependencyDialogue: boolean; onClose: () => void; } @@ -161,10 +162,13 @@ const useManageDependency = ( export const AddDependencyDialogue = ({ project, featureId, + parentFeatureId, showDependencyDialogue, onClose, }: IAddDependencyDialogueProps) => { - const [parent, setParent] = useState(REMOVE_DEPENDENCY_OPTION.key); + const [parent, setParent] = useState( + parentFeatureId || REMOVE_DEPENDENCY_OPTION.key, + ); const handleClick = useManageDependency( project, featureId, diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewSidePanel/FeatureOverviewSidePanelDetails/DependencyRow.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewSidePanel/FeatureOverviewSidePanelDetails/DependencyRow.tsx index 95da86a358d..c2269af0fa3 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewSidePanel/FeatureOverviewSidePanelDetails/DependencyRow.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewSidePanel/FeatureOverviewSidePanelDetails/DependencyRow.tsx @@ -164,6 +164,7 @@ export const DependencyRow: FC<{ feature: IFeatureToggle }> = ({ feature }) => { setShowDependencyDialogue(false)} showDependencyDialogue={showDependencyDialogue} /> diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewSidePanel/FeatureOverviewSidePanelDetails/FeatureOverviewSidePanelDetails.test.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewSidePanel/FeatureOverviewSidePanelDetails/FeatureOverviewSidePanelDetails.test.tsx index 1ff95536114..b9628e6f878 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewSidePanel/FeatureOverviewSidePanelDetails/FeatureOverviewSidePanelDetails.test.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewSidePanel/FeatureOverviewSidePanelDetails/FeatureOverviewSidePanelDetails.test.tsx @@ -18,7 +18,7 @@ const setupApi = () => { testServerRoute( server, '/api/admin/projects/default/features/feature/parents', - [], + ['some_parent'], ); testServerRoute( server, @@ -243,6 +243,7 @@ test('delete dependency with change request', async () => { }); test('edit dependency', async () => { + setupChangeRequestApi(); render(