Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make resource team/user access page URLs consistent throughout app #2292

Merged
merged 1 commit into from
May 13, 2024
Merged

Make resource team/user access page URLs consistent throughout app #2292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/awx/access/credentials/components/CredentialAddTeams.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { awxAPI } from '../../../common/api/awx-utils';

describe('AwxCredentialAddTeams', () => {
const component = <CredentialAddTeams />;
const path = '/credentials/:id/team-access/add-teams';
const initialEntries = [`/credentials/1/team-access/add-teams`];
const path = '/credentials/:id/team-access/add';
const initialEntries = [`/credentials/1/team-access/add`];
const params = {
path,
initialEntries,
Expand Down
4 changes: 2 additions & 2 deletions frontend/awx/access/credentials/components/CredentialAddUsers.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { awxAPI } from '../../../common/api/awx-utils';

describe('AwxAddUsers', () => {
const component = <CredentialAddUsers />;
const path = '/credentials/:id/user-access/add-users';
const initialEntries = [`/credentials/1/user-access/add-users`];
const path = '/credentials/:id/user-access/add';
const initialEntries = [`/credentials/1/user-access/add`];
const params = {
path,
initialEntries,
Expand Down
4 changes: 2 additions & 2 deletions frontend/awx/main/routes/useAwxCredentialRoutes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ export function useAwxCredentialRoutes() {
},
{
id: AwxRoute.CredentialAddUsers,
path: ':id/users/add-users',
path: ':id/user-access/add',
element: <CredentialAddUsers />,
},
{
id: AwxRoute.CredentialAddTeams,
path: ':id/team-access/add-teams',
path: ':id/team-access/add',
element: <CredentialAddTeams />,
},
{
Expand Down
4 changes: 2 additions & 2 deletions frontend/awx/main/routes/useAwxInventoryRoutes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,12 @@ export function useAwxInventoryRoutes() {
},
{
id: AwxRoute.InventoryAddUsers,
path: ':id/users/add-users',
path: ':id/user-access/add',
element: <InventoryAddUsers />,
},
{
id: AwxRoute.InventoryAddTeams,
path: ':id/team-access/add-teams',
path: ':id/team-access/add',
element: <InventoryAddTeams />,
},
{
Expand Down
8 changes: 4 additions & 4 deletions frontend/awx/main/routes/useAwxTemplateRoutes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,12 @@ export function useAwxTemplateRoutes() {
},
{
id: AwxRoute.JobTemplateAddTeams,
path: ':id/teams/add-teams',
path: ':id/team-access/add',
element: <JobTemplateAddTeams />,
},
{
id: AwxRoute.JobTemplateAddUsers,
path: ':id/users/add-users',
path: ':id/user-access/add',
element: <JobTemplateAddUsers />,
},
{
Expand Down Expand Up @@ -292,12 +292,12 @@ export function useAwxTemplateRoutes() {
},
{
id: AwxRoute.WorkflowJobTemplateAddTeams,
path: ':id/teams/add-teams',
path: ':id/team-access/add',
element: <WorkflowJobTemplateAddTeams />,
},
{
id: AwxRoute.WorkflowJobTemplateAddUsers,
path: ':id/users/add-users',
path: ':id/user-access/add',
element: <WorkflowJobTemplateAddUsers />,
},
{
Expand Down
4 changes: 2 additions & 2 deletions frontend/awx/resources/inventories/components/InventoryAddTeams.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { awxAPI } from '../../../common/api/awx-utils';

describe('AwxInventoryAddTeams', () => {
const component = <InventoryAddTeams />;
const path = '/inventories/:id/team-access/add-teams';
const initialEntries = [`/inventories/1/team-access/add-teams`];
const path = '/inventories/:id/team-access/add';
const initialEntries = [`/inventories/1/team-access/add`];
const params = {
path,
initialEntries,
Expand Down
4 changes: 2 additions & 2 deletions frontend/awx/resources/inventories/components/InventoryAddUsers.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { awxAPI } from '../../../common/api/awx-utils';

describe('AwxAddUsers', () => {
const component = <InventoryAddUsers />;
const path = '/inventories/:id/user-access/add-users';
const initialEntries = [`/inventories/1/user-access/add-users`];
const path = '/inventories/:id/user-access/add';
const initialEntries = [`/inventories/1/user-access/add`];
const params = {
path,
initialEntries,
Expand Down
20 changes: 10 additions & 10 deletions frontend/eda/main/useEdaNavigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,12 @@ export function useEdaNavigation() {
},
{
id: EdaRoute.RulebookActivationAddUsers,
path: ':id/user-access/add-users',
path: ':id/user-access/add',
element: <EdaRulebookActivationAddUsers />,
},
{
id: EdaRoute.RulebookActivationAddTeams,
path: ':id/team-access/add-teams',
path: ':id/team-access/add',
element: <EdaRulebookActivationAddTeams />,
},
{
Expand Down Expand Up @@ -250,12 +250,12 @@ export function useEdaNavigation() {
},
{
id: EdaRoute.ProjectAddUsers,
path: ':id/user-access/add-users',
path: ':id/user-access/add',
element: <EdaProjectAddUsers />,
},
{
id: EdaRoute.ProjectAddTeams,
path: ':id/team-access/add-teams',
path: ':id/team-access/add',
element: <EdaProjectAddTeams />,
},
{
Expand Down Expand Up @@ -307,12 +307,12 @@ export function useEdaNavigation() {
},
{
id: EdaRoute.DecisionEnvironmentAddUsers,
path: ':id/users/add-users',
path: ':id/user-access/add',
element: <EdaDecisionEnvironmentAddUsers />,
},
{
id: EdaRoute.DecisionEnvironmentAddTeams,
path: ':id/team-access/add-teams',
path: ':id/team-access/add',
element: <EdaDecisionEnvironmentAddTeams />,
},
{
Expand Down Expand Up @@ -557,12 +557,12 @@ export function useEdaNavigation() {
},
{
id: EdaRoute.CredentialAddUsers,
path: ':id/users/add-users',
path: ':id/user-access/add',
element: <EdaCredentialAddUsers />,
},
{
id: EdaRoute.CredentialAddTeams,
path: ':id/team-access/add-teams',
path: ':id/team-access/add',
element: <EdaCredentialAddTeams />,
},
{
Expand Down Expand Up @@ -619,12 +619,12 @@ export function useEdaNavigation() {
},
{
id: EdaRoute.CredentialTypeAddUsers,
path: ':id/users/add-users',
path: ':id/user-access/add',
element: <EdaCredentialTypeAddUsers />,
},
{
id: EdaRoute.CredentialTypeAddTeams,
path: ':id/team-access/add-teams',
path: ':id/team-access/add',
element: <EdaCredentialTypeAddTeams />,
},
{
Expand Down