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

Merge pull request #10173 from nixocio/ui_issue_10078

Browse Source 
Display Edit/Delete on EE details page as per last API changes

Display Edit/Delete buttons on details page for EE managed by tower.
See: #10078

Reviewed-by: Jake McDermott <yo@jakemcdermott.me>
Reviewed-by: Tiago Góes <tiago.goes2009@gmail.com>
This commit is contained in:
softwarefactory-project-zuul[bot] 2021-05-11 20:25:31 +00:00 committed by GitHub
commit 74282c5dfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.jsx
View File

@ -113,33 +113,31 @@ function ExecutionEnvironmentDetails({ executionEnvironment }) {
dataCy="execution-environment-modified"
/>
</DetailList>
{!managedByTower && (
<CardActionsRow>
{summary_fields.user_capabilities?.edit && (
<Button
ouiaId="execution-environment-detail-edit-button"
aria-label={t`edit`}
component={Link}
to={`/execution_environments/${id}/edit`}
>
{t`Edit`}
</Button>
)}
{summary_fields.user_capabilities?.delete && (
<DeleteButton
name={image}
modalTitle={t`Delete Execution Environment`}
onConfirm={deleteExecutionEnvironment}
isDisabled={isLoading}
ouiaId="delete-button"
deleteDetailsRequests={deleteDetailsRequests}
deleteMessage={t`This execution environment is currently being used by other resources. Are you sure you want to delete it?`}
>
{t`Delete`}
</DeleteButton>
)}
</CardActionsRow>
)}
<CardActionsRow>
{summary_fields.user_capabilities?.edit && (
<Button
ouiaId="execution-environment-detail-edit-button"
aria-label={t`edit`}
component={Link}
to={`/execution_environments/${id}/edit`}
>
{t`Edit`}
</Button>
)}
{summary_fields.user_capabilities?.delete && (
<DeleteButton
name={image}
modalTitle={t`Delete Execution Environment`}
onConfirm={deleteExecutionEnvironment}
isDisabled={isLoading}
ouiaId="delete-button"
deleteDetailsRequests={deleteDetailsRequests}
deleteMessage={t`This execution environment is currently being used by other resources. Are you sure you want to delete it?`}
>
{t`Delete`}
</DeleteButton>
)}
</CardActionsRow>
{error && (
<AlertModal

6
awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.test.jsx
View File

@ -153,7 +153,7 @@ describe('<ExecutionEnvironmentDetails/>', () => {
expect(history.location.pathname).toBe('/execution_environments');
});
test('should not render action buttons to ee managed by tower', async () => {
test('should render action buttons to ee managed by tower', async () => {
await act(async () => {
wrapper = mountWithContexts(
<ExecutionEnvironmentDetails
@ -185,9 +185,9 @@ describe('<ExecutionEnvironmentDetails/>', () => {
expect(dates).toHaveLength(2);
expect(dates.at(0).prop('date')).toEqual(executionEnvironment.created);
expect(dates.at(1).prop('date')).toEqual(executionEnvironment.modified);
expect(wrapper.find('Button[aria-label="edit"]')).toHaveLength(0);
expect(wrapper.find('Button[aria-label="edit"]')).toHaveLength(1);
expect(wrapper.find('Button[aria-label="Delete"]')).toHaveLength(0);
expect(wrapper.find('Button[aria-label="Delete"]')).toHaveLength(1);
});
test('should have proper number of delete detail requests', async () => {