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

Fix remaning tests, removed unused code

Browse Source
This commit is contained in:
David O Neill
2024-01-19 14:56:23 +00:00
committed by Seth Foster
parent 1712540c8e
commit 449b95d1eb
5 changed files with 0 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
awx/ui/src/components/AddEndpointModal/AddEndpointModal.js
View File

@@ -1,94 +0,0 @@
import React from 'react';
import { t } from '@lingui/macro';
import { Form, FormGroup, Modal } from '@patternfly/react-core';
import { InstancesAPI } from 'api';
import { Formik } from 'formik';
import { FormColumnLayout } from 'components/FormLayout';
import FormField, { CheckboxField } from 'components/FormField';
import FormActionGroup from '../FormActionGroup/FormActionGroup';
function AddEndpointModal({
title = t`Add endpoint`,
onClose,
isAddEndpointModalOpen = false,
instance,
ouiaId,
}) {
const handleClose = () => {
onClose();
};
const handleEndpointAdd = async (values) => {
try {
values.id = instance.id;
InstancesAPI.updateReceptorAddresses(instance.id, values);
onClose();
} catch (error) {
// do nothing
}
};
return (
<Modal
ouiaId={ouiaId}
variant="large"
title={title}
aria-label={t`Add Endpoint modal`}
isOpen={isAddEndpointModalOpen}
onClose={handleClose}
actions={[]}
>
<Formik
initialValues={{
listener_port: 1001,
}}
onSubmit={handleEndpointAdd}
>
{(formik) => (
<Form autoComplete="off" onSubmit={formik.handleSubmit}>
<FormColumnLayout>
<FormField
id="address"
label={t`Address`}
name="address"
type="text"
/>
<FormField
id="websocket_path"
label={t`Websocket path`}
name="websocket path"
type="text"
/>
<FormField
id="listener_port"
label={t`Listener Port`}
name="listener_port"
type="number"
tooltip={t`Select the port that Receptor will listen on for incoming connections, e.g. 27199.`}
/>
<FormGroup fieldId="endpoint" label={t`Options`}>
<CheckboxField
id="peers_from_control_nodes"
name="peers_from_control_nodes"
label={t`Peers from control nodes`}
tooltip={t`If enabled, control nodes will peer to this instance automatically. If disabled, instance will be connected only to associated peers.`}
/>
</FormGroup>
<FormActionGroup
onCancel={handleClose}
onSubmit={formik.handleSubmit}
/>
</FormColumnLayout>
</Form>
)}
</Formik>
</Modal>
);
}
export default AddEndpointModal;

84
awx/ui/src/components/AddEndpointModal/AddEndpointModal.test.js
View File

@@ -1,84 +0,0 @@
import React from 'react';
import { act } from 'react-dom/test-utils';
import {
mountWithContexts,
waitForElement,
} from '../../../testUtils/enzymeHelpers';
import AssociateModal from './AddEndpointModal';
import mockHosts from './data.hosts.json';
jest.mock('../../api');
describe('<AssociateModal />', () => {
let wrapper;
let onClose;
let onAssociate;
let fetchRequest;
let optionsRequest;
beforeEach(async () => {
onClose = jest.fn();
onAssociate = jest.fn().mockResolvedValue();
fetchRequest = jest.fn().mockReturnValue({ data: { ...mockHosts } });
optionsRequest = jest.fn().mockResolvedValue({
data: {
actions: {
GET: {},
POST: {},
},
related_search_fields: [],
},
});
await act(async () => {
wrapper = mountWithContexts(
<AssociateModal
onClose={onClose}
onAssociate={onAssociate}
fetchRequest={fetchRequest}
optionsRequest={optionsRequest}
isModalOpen
/>
);
});
await waitForElement(wrapper, 'ContentLoading', (el) => el.length === 0);
});
afterEach(() => {
jest.clearAllMocks();
});
test('should render successfully', () => {
expect(wrapper.find('AssociateModal').length).toBe(1);
});
test('should fetch and render list items', () => {
expect(fetchRequest).toHaveBeenCalledTimes(1);
expect(optionsRequest).toHaveBeenCalledTimes(1);
expect(wrapper.find('CheckboxListItem').length).toBe(3);
});
test('should update selected list chips when items are selected', () => {
expect(wrapper.find('SelectedList Chip')).toHaveLength(0);
act(() => {
wrapper.find('CheckboxListItem').first().invoke('onSelect')();
});
wrapper.update();
expect(wrapper.find('SelectedList Chip')).toHaveLength(1);
wrapper.find('SelectedList Chip button').simulate('click');
expect(wrapper.find('SelectedList Chip')).toHaveLength(0);
});
test('save button should call onAssociate', () => {
act(() => {
wrapper.find('CheckboxListItem').first().invoke('onSelect')();
});
wrapper.find('button[aria-label="Save"]').simulate('click');
expect(onAssociate).toHaveBeenCalledTimes(1);
});
test('cancel button should call onClose', () => {
wrapper.find('button[aria-label="Cancel"]').simulate('click');
expect(onClose).toHaveBeenCalledTimes(1);
});
});

393
awx/ui/src/components/AddEndpointModal/data.hosts.json
View File

@@ -1,393 +0,0 @@
{
"count": 3,
"results": [
{
"id": 2,
"type": "host",
"url": "/api/v2/hosts/2/",
"related": {
"created_by": "/api/v2/users/10/",
"modified_by": "/api/v2/users/19/",
"variable_data": "/api/v2/hosts/2/variable_data/",
"groups": "/api/v2/hosts/2/groups/",
"all_groups": "/api/v2/hosts/2/all_groups/",
"job_events": "/api/v2/hosts/2/job_events/",
"job_host_summaries": "/api/v2/hosts/2/job_host_summaries/",
"activity_stream": "/api/v2/hosts/2/activity_stream/",
"inventory_sources": "/api/v2/hosts/2/inventory_sources/",
"smart_inventories": "/api/v2/hosts/2/smart_inventories/",
"ad_hoc_commands": "/api/v2/hosts/2/ad_hoc_commands/",
"ad_hoc_command_events": "/api/v2/hosts/2/ad_hoc_command_events/",
"insights": "/api/v2/hosts/2/insights/",
"ansible_facts": "/api/v2/hosts/2/ansible_facts/",
"inventory": "/api/v2/inventories/2/",
"last_job": "/api/v2/jobs/236/",
"last_job_host_summary": "/api/v2/job_host_summaries/2202/"
},
"summary_fields": {
"inventory": {
"id": 2,
"name": " Inventory 1 Org 0",
"description": "",
"has_active_failures": false,
"total_hosts": 33,
"hosts_with_active_failures": 0,
"total_groups": 4,
"has_inventory_sources": false,
"total_inventory_sources": 0,
"inventory_sources_with_failures": 0,
"organization_id": 2,
"kind": ""
},
"last_job": {
"id": 236,
"name": " Job Template 1 Project 0",
"description": "",
"finished": "2020-02-26T03:15:21.471439Z",
"status": "successful",
"failed": false,
"job_template_id": 18,
"job_template_name": " Job Template 1 Project 0"
},
"last_job_host_summary": {
"id": 2202,
"failed": false
},
"created_by": {
"id": 10,
"username": "user-3",
"first_name": "",
"last_name": ""
},
"modified_by": {
"id": 19,
"username": "all",
"first_name": "",
"last_name": ""
},
"user_capabilities": {
"edit": true,
"delete": true
},
"groups": {
"count": 2,
"results": [
{
"id": 1,
"name": " Group 1 Inventory 0"
},
{
"id": 2,
"name": " Group 2 Inventory 0"
}
]
},
"recent_jobs": [
{
"id": 236,
"name": " Job Template 1 Project 0",
"status": "successful",
"finished": "2020-02-26T03:15:21.471439Z"
},
{
"id": 232,
"name": " Job Template 1 Project 0",
"status": "successful",
"finished": "2020-02-25T21:20:33.593789Z"
},
{
"id": 229,
"name": " Job Template 1 Project 0",
"status": "successful",
"finished": "2020-02-25T16:19:46.364134Z"
},
{
"id": 228,
"name": " Job Template 1 Project 0",
"status": "successful",
"finished": "2020-02-25T16:18:54.138363Z"
},
{
"id": 225,
"name": " Job Template 1 Project 0",
"status": "successful",
"finished": "2020-02-25T15:55:32.247652Z"
}
]
},
"created": "2020-02-24T15:10:58.922179Z",
"modified": "2020-02-26T21:52:43.428530Z",
"name": ".host-000001.group-00000.dummy",
"description": "",
"inventory": 2,
"enabled": false,
"instance_id": "",
"variables": "",
"has_active_failures": false,
"has_inventory_sources": false,
"last_job": 236,
"last_job_host_summary": 2202,
"insights_system_id": null,
"ansible_facts_modified": null
},
{
"id": 3,
"type": "host",
"url": "/api/v2/hosts/3/",
"related": {
"created_by": "/api/v2/users/11/",
"modified_by": "/api/v2/users/1/",
"variable_data": "/api/v2/hosts/3/variable_data/",
"groups": "/api/v2/hosts/3/groups/",
"all_groups": "/api/v2/hosts/3/all_groups/",
"job_events": "/api/v2/hosts/3/job_events/",
"job_host_summaries": "/api/v2/hosts/3/job_host_summaries/",
"activity_stream": "/api/v2/hosts/3/activity_stream/",
"inventory_sources": "/api/v2/hosts/3/inventory_sources/",
"smart_inventories": "/api/v2/hosts/3/smart_inventories/",
"ad_hoc_commands": "/api/v2/hosts/3/ad_hoc_commands/",
"ad_hoc_command_events": "/api/v2/hosts/3/ad_hoc_command_events/",
"insights": "/api/v2/hosts/3/insights/",
"ansible_facts": "/api/v2/hosts/3/ansible_facts/",
"inventory": "/api/v2/inventories/2/",
"last_job": "/api/v2/jobs/236/",
"last_job_host_summary": "/api/v2/job_host_summaries/2195/"
},
"summary_fields": {
"inventory": {
"id": 2,
"name": " Inventory 1 Org 0",
"description": "",
"has_active_failures": false,
"total_hosts": 33,
"hosts_with_active_failures": 0,
"total_groups": 4,
"has_inventory_sources": false,
"total_inventory_sources": 0,
"inventory_sources_with_failures": 0,
"organization_id": 2,
"kind": ""
},
"last_job": {
"id": 236,
"name": " Job Template 1 Project 0",
"description": "",
"finished": "2020-02-26T03:15:21.471439Z",
"status": "successful",
"failed": false,
"job_template_id": 18,
"job_template_name": " Job Template 1 Project 0"
},
"last_job_host_summary": {
"id": 2195,
"failed": false
},
"created_by": {
"id": 11,
"username": "user-4",
"first_name": "",
"last_name": ""
},
"modified_by": {
"id": 1,
"username": "admin",
"first_name": "",
"last_name": ""
},
"user_capabilities": {
"edit": true,
"delete": true
},
"groups": {
"count": 2,
"results": [
{
"id": 1,
"name": " Group 1 Inventory 0"
},
{
"id": 2,
"name": " Group 2 Inventory 0"
}
]
},
"recent_jobs": [
{
"id": 236,
"name": " Job Template 1 Project 0",
"status": "successful",
"finished": "2020-02-26T03:15:21.471439Z"
},
{
"id": 232,
"name": " Job Template 1 Project 0",
"status": "successful",
"finished": "2020-02-25T21:20:33.593789Z"
},
{
"id": 229,
"name": " Job Template 1 Project 0",
"status": "successful",
"finished": "2020-02-25T16:19:46.364134Z"
},
{
"id": 228,
"name": " Job Template 1 Project 0",
"status": "successful",
"finished": "2020-02-25T16:18:54.138363Z"
},
{
"id": 225,
"name": " Job Template 1 Project 0",
"status": "successful",
"finished": "2020-02-25T15:55:32.247652Z"
}
]
},
"created": "2020-02-24T15:10:58.945113Z",
"modified": "2020-02-27T03:43:43.635871Z",
"name": ".host-000002.group-00000.dummy",
"description": "",
"inventory": 2,
"enabled": false,
"instance_id": "",
"variables": "",
"has_active_failures": false,
"has_inventory_sources": false,
"last_job": 236,
"last_job_host_summary": 2195,
"insights_system_id": null,
"ansible_facts_modified": null
},
{
"id": 4,
"type": "host",
"url": "/api/v2/hosts/4/",
"related": {
"created_by": "/api/v2/users/12/",
"modified_by": "/api/v2/users/1/",
"variable_data": "/api/v2/hosts/4/variable_data/",
"groups": "/api/v2/hosts/4/groups/",
"all_groups": "/api/v2/hosts/4/all_groups/",
"job_events": "/api/v2/hosts/4/job_events/",
"job_host_summaries": "/api/v2/hosts/4/job_host_summaries/",
"activity_stream": "/api/v2/hosts/4/activity_stream/",
"inventory_sources": "/api/v2/hosts/4/inventory_sources/",
"smart_inventories": "/api/v2/hosts/4/smart_inventories/",
"ad_hoc_commands": "/api/v2/hosts/4/ad_hoc_commands/",
"ad_hoc_command_events": "/api/v2/hosts/4/ad_hoc_command_events/",
"insights": "/api/v2/hosts/4/insights/",
"ansible_facts": "/api/v2/hosts/4/ansible_facts/",
"inventory": "/api/v2/inventories/2/",
"last_job": "/api/v2/jobs/236/",
"last_job_host_summary": "/api/v2/job_host_summaries/2192/"
},
"summary_fields": {
"inventory": {
"id": 2,
"name": " Inventory 1 Org 0",
"description": "",
"has_active_failures": false,
"total_hosts": 33,
"hosts_with_active_failures": 0,
"total_groups": 4,
"has_inventory_sources": false,
"total_inventory_sources": 0,
"inventory_sources_with_failures": 0,
"organization_id": 2,
"kind": ""
},
"last_job": {
"id": 236,
"name": " Job Template 1 Project 0",
"description": "",
"finished": "2020-02-26T03:15:21.471439Z",
"status": "successful",
"failed": false,
"job_template_id": 18,
"job_template_name": " Job Template 1 Project 0"
},
"last_job_host_summary": {
"id": 2192,
"failed": false
},
"created_by": {
"id": 12,
"username": "user-5",
"first_name": "",
"last_name": ""
},
"modified_by": {
"id": 1,
"username": "admin",
"first_name": "",
"last_name": ""
},
"user_capabilities": {
"edit": true,
"delete": true
},
"groups": {
"count": 2,
"results": [
{
"id": 1,
"name": " Group 1 Inventory 0"
},
{
"id": 2,
"name": " Group 2 Inventory 0"
}
]
},
"recent_jobs": [
{
"id": 236,
"name": " Job Template 1 Project 0",
"status": "successful",
"finished": "2020-02-26T03:15:21.471439Z"
},
{
"id": 232,
"name": " Job Template 1 Project 0",
"status": "successful",
"finished": "2020-02-25T21:20:33.593789Z"
},
{
"id": 229,
"name": " Job Template 1 Project 0",
"status": "successful",
"finished": "2020-02-25T16:19:46.364134Z"
},
{
"id": 228,
"name": " Job Template 1 Project 0",
"status": "successful",
"finished": "2020-02-25T16:18:54.138363Z"
},
{
"id": 225,
"name": " Job Template 1 Project 0",
"status": "successful",
"finished": "2020-02-25T15:55:32.247652Z"
}
]
},
"created": "2020-02-24T15:10:58.962312Z",
"modified": "2020-02-27T03:43:45.528882Z",
"name": ".host-000003.group-00000.dummy",
"description": "",
"inventory": 2,
"enabled": false,
"instance_id": "",
"variables": "",
"has_active_failures": false,
"has_inventory_sources": false,
"last_job": 236,
"last_job_host_summary": 2192,
"insights_system_id": null,
"ansible_facts_modified": null
}
]
}

1
awx/ui/src/components/AddEndpointModal/index.js
View File

@@ -1 +0,0 @@
export { default } from './AddEndpointModal';

34
awx/ui/src/screens/Instances/InstanceEndPointList/InstanceEndPointList.js
View File

@@ -7,7 +7,6 @@ import PaginatedTable, {
HeaderRow, HeaderRow,
// ToolbarAddButton, // ToolbarAddButton,
} from 'components/PaginatedTable'; } from 'components/PaginatedTable';
import AddEndpointModal from 'components/AddEndpointModal';
import useToast from 'hooks/useToast'; import useToast from 'hooks/useToast';
import { getQSConfig } from 'util/qs'; import { getQSConfig } from 'util/qs';
import { useParams } from 'react-router-dom'; import { useParams } from 'react-router-dom';
@@ -26,7 +25,6 @@ const QS_CONFIG = getQSConfig('peer', {
function InstanceEndPointList({ setBreadcrumb }) { function InstanceEndPointList({ setBreadcrumb }) {
const { id } = useParams(); const { id } = useParams();
const [isAddEndpointModalOpen, setisAddEndpointModalOpen] = useState(false);
const { Toast, toastProps } = useToast(); const { Toast, toastProps } = useToast();
const { const {
isLoading, isLoading,
@@ -98,14 +96,6 @@ function InstanceEndPointList({ setBreadcrumb }) {
const { selected, isAllSelected, handleSelect, clearSelected, selectAll } = const { selected, isAllSelected, handleSelect, clearSelected, selectAll } =
useSelected(endpoints); useSelected(endpoints);
// const handleEndpointDelete = async () => {
// // console.log(selected)
// // InstancesAPI.updateReceptorAddresses(instance.id, values);
// }
// const isHopNode = instance.node_type === 'hop';
// const isExecutionNode = instance.node_type === 'execution';
return ( return (
<CardBody> <CardBody>
<PaginatedTable <PaginatedTable
@@ -150,22 +140,6 @@ function InstanceEndPointList({ setBreadcrumb }) {
qsConfig={QS_CONFIG} qsConfig={QS_CONFIG}
additionalControls={ additionalControls={
[ [
// (isExecutionNode || isHopNode) && (
// <ToolbarAddButton
// ouiaId="add-endpoint-button"
// key="add-endpoint"
// defaultLabel={t`Add`}
// onClick={() => setisAddEndpointModalOpen(true)}
// />
// ),
// (isExecutionNode || isHopNode) && (
// <ToolbarAddButton
// ouiaId="delete-endpoint-button"
// key="delete-endpoint"
// defaultLabel={t`Delete`}
// onClick={() => handleEndpointDelete()}
// />
// ),
] ]
} }
/> />
@@ -182,14 +156,6 @@ function InstanceEndPointList({ setBreadcrumb }) {
/> />
)} )}
/> />
{isAddEndpointModalOpen && (
<AddEndpointModal
isAddEndpointModalOpen={isAddEndpointModalOpen}
onClose={() => setisAddEndpointModalOpen(false)}
title={t`New endpoint`}
instance={instance}
/>
)}
<Toast {...toastProps} /> <Toast {...toastProps} />
</CardBody> </CardBody>
); );