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

Align prod and dev routing

Browse Source
This commit is contained in:
Jake McDermott
2020-06-17 11:40:09 -04:00
parent aef382862c
commit 01b8087cb3
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui_next/src/App.jsx
View File

@@ -2,7 +2,7 @@ import React from 'react';
import { import {
useRouteMatch, useRouteMatch,
useLocation, useLocation,
HashRouter, BrowserRouter,
Route, Route,
Switch, Switch,
Redirect, Redirect,
@@ -76,7 +76,7 @@ function App() {
} }
export default () => ( export default () => (
<HashRouter> <BrowserRouter basename="/next">
<App /> <App />
</HashRouter> </BrowserRouter>
); );

6
awx/ui_next/src/components/AppContainer/AppContainer.test.jsx
View File

@@ -66,9 +66,9 @@ describe('<AppContainer />', () => {
// sidebar groups and route links // sidebar groups and route links
expect(wrapper.find('NavExpandableGroup').length).toBe(2); expect(wrapper.find('NavExpandableGroup').length).toBe(2);
expect(wrapper.find('a[href="/#/foo"]').length).toBe(1); expect(wrapper.find('a[href="/foo"]').length).toBe(1);
expect(wrapper.find('a[href="/#/bar"]').length).toBe(1); expect(wrapper.find('a[href="/bar"]').length).toBe(1);
expect(wrapper.find('a[href="/#/fiz"]').length).toBe(1); expect(wrapper.find('a[href="/fiz"]').length).toBe(1);
expect(wrapper.find('#group_one').length).toBe(1); expect(wrapper.find('#group_one').length).toBe(1);
expect(wrapper.find('#group_two').length).toBe(1); expect(wrapper.find('#group_two').length).toBe(1);

5
awx/ui_next/src/components/AppContainer/NavExpandableGroup.jsx
View File

@@ -1,6 +1,6 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { withRouter } from 'react-router-dom'; import { withRouter, Link } from 'react-router-dom';
import { NavExpandable, NavItem } from '@patternfly/react-core'; import { NavExpandable, NavItem } from '@patternfly/react-core';
class NavExpandableGroup extends Component { class NavExpandableGroup extends Component {
@@ -41,9 +41,8 @@ class NavExpandableGroup extends Component {
groupId={groupId} groupId={groupId}
isActive={this.isActivePath(path)} isActive={this.isActivePath(path)}
key={path} key={path}
to={`/next/#${path}`}
> >
{title} <Link to={path}>{title}</Link>
</NavItem> </NavItem>
))} ))}
</NavExpandable> </NavExpandable>

3
awx/ui_next/urls.py
View File

@@ -1,6 +1,7 @@
from django.conf.urls import url from django.conf.urls import url
from django.views.generic.base import TemplateView from django.views.generic.base import TemplateView
class IndexView(TemplateView): class IndexView(TemplateView):
template_name = 'index.html' template_name = 'index.html'
@@ -9,5 +10,5 @@ class IndexView(TemplateView):
app_name = 'ui_next' app_name = 'ui_next'
urlpatterns = [ urlpatterns = [
url(r'^next/$', IndexView.as_view(), name='ui_next') url(r'^next/*', IndexView.as_view(), name='ui_next')
] ]