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

Merge pull request #10570 from nixocio/ui_remove_with_router

Browse Source 
Remove mix usage of hooks and HOC for router
This commit is contained in:
Kersom
2021-07-22 08:34:55 -04:00
committed by GitHub
parent 5d20acaa92 719c9e824b
commit d68c118fd4
7 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui_next/src/components/AddRole/SelectResourceStep.js
View File

@@ -1,6 +1,6 @@
import React, { useCallback, useEffect } from 'react'; import React, { useCallback, useEffect } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { withRouter, useLocation } from 'react-router-dom'; import { useLocation } from 'react-router-dom';
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
import useRequest from 'hooks/useRequest'; import useRequest from 'hooks/useRequest';
import { SearchColumns, SortColumns } from 'types'; import { SearchColumns, SortColumns } from 'types';
@@ -148,4 +148,4 @@ SelectResourceStep.defaultProps = {
}; };
export { SelectResourceStep as _SelectResourceStep }; export { SelectResourceStep as _SelectResourceStep };
export default withRouter(SelectResourceStep); export default SelectResourceStep;

4
awx/ui_next/src/components/Lookup/ApplicationLookup.js
View File

@@ -1,6 +1,6 @@
import React, { useCallback, useEffect } from 'react'; import React, { useCallback, useEffect } from 'react';
import { func, node, string } from 'prop-types'; import { func, node, string } from 'prop-types';
import { withRouter, useLocation } from 'react-router-dom'; import { useLocation } from 'react-router-dom';
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
import { FormGroup } from '@patternfly/react-core'; import { FormGroup } from '@patternfly/react-core';
import { ApplicationsAPI } from 'api'; import { ApplicationsAPI } from 'api';
@@ -151,4 +151,4 @@ ApplicationLookup.defaultProps = {
fieldName: 'application', fieldName: 'application',
}; };
export default withRouter(ApplicationLookup); export default ApplicationLookup;

4
awx/ui_next/src/components/Lookup/HostFilterLookup.js
View File

@@ -1,5 +1,5 @@
import React, { useState, useEffect, useCallback } from 'react'; import React, { useState, useEffect, useCallback } from 'react';
import { withRouter, useHistory, useLocation } from 'react-router-dom'; import { useHistory, useLocation } from 'react-router-dom';
import { number, func, bool, string } from 'prop-types'; import { number, func, bool, string } from 'prop-types';
import styled from 'styled-components'; import styled from 'styled-components';
@@ -411,4 +411,4 @@ HostFilterLookup.defaultProps = {
enableRelatedFuzzyFiltering: true, enableRelatedFuzzyFiltering: true,
}; };
export default withRouter(HostFilterLookup); export default HostFilterLookup;

3
awx/ui_next/src/screens/Job/Job.js
View File

@@ -1,7 +1,6 @@
import React, { useEffect, useCallback } from 'react'; import React, { useEffect, useCallback } from 'react';
import { import {
Route, Route,
withRouter,
Switch, Switch,
Redirect, Redirect,
Link, Link,
@@ -173,5 +172,5 @@ function Job({ setBreadcrumb }) {
); );
} }
export default withRouter(Job); export default Job;
export { Job as _Job }; export { Job as _Job };

4
awx/ui_next/src/screens/Job/JobOutput/JobOutput.js
View File

@@ -1,5 +1,5 @@
import React, { useCallback, useEffect, useRef, useState } from 'react'; import React, { useCallback, useEffect, useRef, useState } from 'react';
import { useHistory, useLocation, withRouter } from 'react-router-dom'; import { useHistory, useLocation } from 'react-router-dom';
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
import styled from 'styled-components'; import styled from 'styled-components';
import { import {
@@ -948,4 +948,4 @@ function JobOutput({ job, eventRelatedSearchableKeys, eventSearchableKeys }) {
} }
export { JobOutput as _JobOutput }; export { JobOutput as _JobOutput };
export default withRouter(JobOutput); export default JobOutput;

3
awx/ui_next/src/screens/Organization/Organization.js
View File

@@ -4,7 +4,6 @@ import { t } from '@lingui/macro';
import { import {
Switch, Switch,
Route, Route,
withRouter,
Redirect, Redirect,
Link, Link,
useLocation, useLocation,
@@ -235,5 +234,5 @@ function Organization({ setBreadcrumb, me }) {
); );
} }
export default withRouter(Organization); export default Organization;
export { Organization as _Organization }; export { Organization as _Organization };

3
awx/ui_next/src/screens/Project/Project.js
View File

@@ -4,7 +4,6 @@ import { t } from '@lingui/macro';
import { import {
Switch, Switch,
Route, Route,
withRouter,
Redirect, Redirect,
Link, Link,
useParams, useParams,
@@ -206,5 +205,5 @@ function Project({ setBreadcrumb }) {
); );
} }
export default withRouter(Project); export default Project;
export { Project as _Project }; export { Project as _Project };