make resource team/user access page URLs consistent throughout app

ansible · May 10, 2024 · aee188a · aee188a
1 parent 0b35fa2
commit aee188a
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 26 deletions.
diff --git a/frontend/awx/access/credentials/components/CredentialAddTeams.cy.tsx b/frontend/awx/access/credentials/components/CredentialAddTeams.cy.tsx
@@ -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,

diff --git a/frontend/awx/access/credentials/components/CredentialAddUsers.cy.tsx b/frontend/awx/access/credentials/components/CredentialAddUsers.cy.tsx
@@ -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,

diff --git a/frontend/awx/main/routes/useAwxCredentialRoutes.tsx b/frontend/awx/main/routes/useAwxCredentialRoutes.tsx
@@ -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 />,
         },
         {

diff --git a/frontend/awx/main/routes/useAwxInventoryRoutes.tsx b/frontend/awx/main/routes/useAwxInventoryRoutes.tsx
@@ -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 />,
         },
         {

diff --git a/frontend/awx/main/routes/useAwxTemplateRoutes.tsx b/frontend/awx/main/routes/useAwxTemplateRoutes.tsx
@@ -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 />,
             },
             {
@@ -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 />,
             },
             {

diff --git a/frontend/awx/resources/inventories/components/InventoryAddTeams.cy.tsx b/frontend/awx/resources/inventories/components/InventoryAddTeams.cy.tsx
@@ -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,

diff --git a/frontend/awx/resources/inventories/components/InventoryAddUsers.cy.tsx b/frontend/awx/resources/inventories/components/InventoryAddUsers.cy.tsx
@@ -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,

diff --git a/frontend/eda/main/useEdaNavigation.tsx b/frontend/eda/main/useEdaNavigation.tsx
@@ -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 />,
         },
         {
@@ -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 />,
         },
         {
@@ -307,12 +307,12 @@ export function useEdaNavigation() {
         },
         {
           id: EdaRoute.DecisionEnvironmentAddUsers,
-          path: ':id/users/add-users',
+          path: ':id/users/add',
           element: <EdaDecisionEnvironmentAddUsers />,
         },
         {
           id: EdaRoute.DecisionEnvironmentAddTeams,
-          path: ':id/team-access/add-teams',
+          path: ':id/team-access/add',
           element: <EdaDecisionEnvironmentAddTeams />,
         },
         {
@@ -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 />,
             },
             {
@@ -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 />,
             },
             {