Skip to content
Merged
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
12 changes: 5 additions & 7 deletions frontend/web/components/pages/ChangeRequestDetailPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ import DiffChangeRequest from 'components/diff/DiffChangeRequest'
import JSONReference from 'components/JSONReference'
import ErrorMessage from 'components/ErrorMessage'
import ConfigProvider from 'common/providers/ConfigProvider'
import { useHistory } from 'react-router-dom'

type ChangeRequestPageType = {
router: RouterChildContext['router']
match: {
params: {
environmentId: string
Expand All @@ -50,10 +50,8 @@ type ChangeRequestPageType = {
}
}

const ChangeRequestDetailPage: FC<ChangeRequestPageType> = ({
match,
router,
}) => {
const ChangeRequestDetailPage: FC<ChangeRequestPageType> = ({ match }) => {
const history = useHistory()
const { environmentId, id, projectId } = match.params
const [_, setUpdate] = useState(Date.now())
const error = ChangeRequestStore.error
Expand Down Expand Up @@ -145,7 +143,7 @@ const ChangeRequestDetailPage: FC<ChangeRequestPageType> = ({
destructive: true,
onYes: () => {
AppActions.deleteChangeRequest(id, () => {
router.history.replace(
history.replace(
`/project/${projectId}/environment/${environmentId}/change-requests`,
)
})
Expand All @@ -163,7 +161,7 @@ const ChangeRequestDetailPage: FC<ChangeRequestPageType> = ({
openModal(
'Edit Change Request',
<CreateFlagModal
history={router.history}
history={history}
environmentId={environmentId}
projectId={projectId}
changeRequest={changeRequest}
Expand Down
Loading