shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-28 19:25:40 +03:00
Code Releases Activity

Use location hook in routed tabs

Browse Source 
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:
Jake McDermott 2020-12-18 09:36:25 -05:00
parent f09120a973
commit fa1ef87f20
No known key found for this signature in database
GPG Key ID: 0E56ED990CDFCB4F
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui_next/src/components/RoutedTabs/RoutedTabs.jsx
View File

@ -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;