External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-22 00:07:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Replace withRouter with useHistory hook

Browse Source
This commit is contained in:
mabashian
2020-01-30 12:34:39 -05:00
parent ef854aabb7
commit 877e630a90
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui_next/src/screens/Job/WorkflowOutput/WorkflowOutputNode.jsx
View File

@@ -1,6 +1,6 @@
import React, { useContext } from 'react'; import React, { useContext } from 'react';
import { WorkflowStateContext } from '@contexts/Workflow'; import { WorkflowStateContext } from '@contexts/Workflow';
import { withRouter } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import { withI18n } from '@lingui/react'; import { withI18n } from '@lingui/react';
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
import styled from 'styled-components'; import styled from 'styled-components';
@@ -56,7 +56,8 @@ const NodeDefaultLabel = styled.p`
white-space: nowrap; white-space: nowrap;
`; `;
function WorkflowOutputNode({ history, i18n, mouseEnter, mouseLeave, node }) { function WorkflowOutputNode({ i18n, mouseEnter, mouseLeave, node }) {
const history = useHistory();
const { nodePositions } = useContext(WorkflowStateContext); const { nodePositions } = useContext(WorkflowStateContext);
let borderColor = '#93969A'; let borderColor = '#93969A';
@@ -130,4 +131,4 @@ WorkflowOutputNode.propTypes = {
node: shape().isRequired, node: shape().isRequired,
}; };
export default withI18n()(withRouter(WorkflowOutputNode)); export default withI18n()(WorkflowOutputNode);

7
awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeModal.jsx
View File

@@ -1,5 +1,5 @@
import React, { useContext, useState } from 'react'; import React, { useContext, useState } from 'react';
import { withRouter } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import { import {
WorkflowDispatchContext, WorkflowDispatchContext,
WorkflowStateContext, WorkflowStateContext,
@@ -16,7 +16,8 @@ import Wizard from '@components/Wizard';
import { NodeTypeStep } from './NodeTypeStep'; import { NodeTypeStep } from './NodeTypeStep';
import { RunStep, NodeNextButton } from '.'; import { RunStep, NodeNextButton } from '.';
function NodeModal({ askLinkType, history, i18n, onSave, title }) { function NodeModal({ askLinkType, i18n, onSave, title }) {
const history = useHistory();
const dispatch = useContext(WorkflowDispatchContext); const dispatch = useContext(WorkflowDispatchContext);
const { nodeToEdit } = useContext(WorkflowStateContext); const { nodeToEdit } = useContext(WorkflowStateContext);
@@ -210,4 +211,4 @@ NodeModal.propTypes = {
title: node.isRequired, title: node.isRequired,
}; };
export default withI18n()(withRouter(NodeModal)); export default withI18n()(NodeModal);

7
awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Visualizer.jsx
View File

@@ -3,7 +3,7 @@ import {
WorkflowDispatchContext, WorkflowDispatchContext,
WorkflowStateContext, WorkflowStateContext,
} from '@contexts/Workflow'; } from '@contexts/Workflow';
import { withRouter } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import { withI18n } from '@lingui/react'; import { withI18n } from '@lingui/react';
import styled from 'styled-components'; import styled from 'styled-components';
import { shape } from 'prop-types'; import { shape } from 'prop-types';
@@ -65,7 +65,8 @@ const fetchWorkflowNodes = async (
return workflowNodes.concat(data.results); return workflowNodes.concat(data.results);
}; };
function Visualizer({ history, template, i18n }) { function Visualizer({ template, i18n }) {
const history = useHistory();
const [state, dispatch] = useReducer(workflowReducer, { const [state, dispatch] = useReducer(workflowReducer, {
addLinkSourceNode: null, addLinkSourceNode: null,
addLinkTargetNode: null, addLinkTargetNode: null,
@@ -467,4 +468,4 @@ Visualizer.propTypes = {
template: shape().isRequired, template: shape().isRequired,
}; };
export default withI18n()(withRouter(Visualizer)); export default withI18n()(Visualizer);