mirror of
https://github.com/ansible/awx.git
synced 2024-10-28 19:25:40 +03:00
Use location hook in routed tabs
Fix a unit test that is failing due to history.location not updating as expected when a routed tab is selected.
This commit is contained in:
parent
f09120a973
commit
fa1ef87f20
@ -1,19 +1,20 @@
|
||||
import React from 'react';
|
||||
import { shape, string, number, arrayOf, node, oneOfType } from 'prop-types';
|
||||
import { Tab, Tabs, TabTitleText } from '@patternfly/react-core';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
import { useHistory, useLocation } from 'react-router-dom';
|
||||
|
||||
function RoutedTabs(props) {
|
||||
const { tabsArray } = props;
|
||||
const history = useHistory();
|
||||
const location = useLocation();
|
||||
|
||||
const getActiveTabId = () => {
|
||||
const match = tabsArray.find(tab => tab.link === history.location.pathname);
|
||||
const match = tabsArray.find(tab => tab.link === location.pathname);
|
||||
if (match) {
|
||||
return match.id;
|
||||
}
|
||||
const subpathMatch = tabsArray.find(tab =>
|
||||
history.location.pathname.startsWith(tab.link)
|
||||
location.pathname.startsWith(tab.link)
|
||||
);
|
||||
if (subpathMatch) {
|
||||
return subpathMatch.id;
|
||||
|
Loading…
Reference in New Issue
Block a user