Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions frontend/e2e/tests/flag-dependencies-test.pw.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { test, expect } from '../test-setup'
import {
createHelpers,
getFlagsmith,
log,
LONG_TIMEOUT,
visualSnapshot,
Expand All @@ -27,12 +26,6 @@ test.describe('Flag Dependencies', () => {
waitForModalToClose,
} = createHelpers(page)

const flagsmith = await getFlagsmith()
test.skip(
!flagsmith.hasFeature('flag_dependencies'),
'flag_dependencies is off, so the Dependencies tab is unreachable',
)

await page.goto('/login', { waitUntil: 'domcontentloaded' })
await page.waitForSelector('[name="email"]', { state: 'visible' })
await login(E2E_USER, PASSWORD)
Expand Down
4 changes: 1 addition & 3 deletions frontend/web/components/diff/DiffChangeRequest.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,7 @@ const DiffChangeRequest: FC<DiffChangeRequestType> = ({
// The API rejects these.
changeRequest.is_committed ||
!isVersioned ||
!canCreateChangeRequest ||
!Utils.getFlagsmithHasFeature('flag_dependencies') ||
!Utils.getFlagsmithHasFeature('flag_dependencies_change_requests')
!canCreateChangeRequest
const dependencies = useDependencyChanges({
changeRequestId: changeRequest?.id ?? 0,
environmentId,
Expand Down
8 changes: 1 addition & 7 deletions frontend/web/components/modals/create-feature/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -478,13 +478,7 @@ const CreateFeatureModal: FC<CreateFeatureModalProps> = (props) => {
controlValue < 0
const isVersionedChangeRequest = existingChangeRequest && isVersioned
const hideIdentityOverridesTab = Utils.getShouldHideIdentityOverridesTab()
// Where change requests are enforced, the tab also needs its own flag, so the
// change request flow can roll out separately.
const isDependenciesTabEnabled =
Utils.getFlagsmithHasFeature('flag_dependencies') &&
!existingChangeRequest &&
(!is4Eyes ||
Utils.getFlagsmithHasFeature('flag_dependencies_change_requests'))
const isDependenciesTabEnabled = !existingChangeRequest
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

let regexValid = true
try {
Expand Down
Loading