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

Merge pull request #7755 from mabashian/convert-InventorySourcesList-useRequest

Browse Source 
Converts InventorySourcesList to use useRequest in preparation for advanced search

Reviewed-by: Jake McDermott <yo@jakemcdermott.me>
             https://github.com/jakemcdermott
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-07-29 22:48:32 +00:00 committed by GitHub
commit 21a2b1a630
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/InventorySourcesList.jsx
View File

@ -1,10 +1,11 @@
import React, { useState, useEffect } from 'react';
import React, { useEffect, useCallback } from 'react';
import { useLocation } from 'react-router-dom';
import { withI18n } from '@lingui/react';
import { t } from '@lingui/macro';
import { func, shape } from 'prop-types';
import { InventorySourcesAPI } from '../../../../../../api';
import { getQSConfig, parseQueryString } from '../../../../../../util/qs';
import useRequest from '../../../../../../util/useRequest';
import PaginatedDataList from '../../../../../../components/PaginatedDataList';
import DataListToolbar from '../../../../../../components/DataListToolbar';
import CheckboxListItem from '../../../../../../components/CheckboxListItem';
@ -16,29 +17,31 @@ const QS_CONFIG = getQSConfig('inventory_sources', {
});
function InventorySourcesList({ i18n, nodeResource, onUpdateNodeResource }) {
const [count, setCount] = useState(0);
const [error, setError] = useState(null);
const [inventorySources, setInventorySources] = useState([]);
const [isLoading, setIsLoading] = useState(true);
const location = useLocation();
useEffect(() => {
(async () => {
setIsLoading(true);
setInventorySources([]);
setCount(0);
const {
result: { inventorySources, count },
error,
isLoading,
request: fetchInventorySources,
} = useRequest(
useCallback(async () => {
const params = parseQueryString(QS_CONFIG, location.search);
try {
const { data } = await InventorySourcesAPI.read(params);
setInventorySources(data.results);
setCount(data.count);
} catch (err) {
setError(err);
} finally {
setIsLoading(false);
}
})();
}, [location]);
const results = await InventorySourcesAPI.read(params);
return {
inventorySources: results.data.results,
count: results.data.count,
};
}, [location]),
{
inventorySources: [],
count: 0,
}
);
useEffect(() => {
fetchInventorySources();
}, [fetchInventorySources]);
return (
<PaginatedDataList
@ -72,8 +75,8 @@ function InventorySourcesList({ i18n, nodeResource, onUpdateNodeResource }) {
name: i18n._(t`Source`),
key: 'source',
options: [
[`file`, i18n._(t`File, Directory or Script`)],
[`scm`, i18n._(t`Sourced from a Project`)],
[`file`, i18n._(t`File, directory or script`)],
[`scm`, i18n._(t`Sourced from a project`)],
[`ec2`, i18n._(t`Amazon EC2`)],
[`gce`, i18n._(t`Google Compute Engine`)],
[`azure_rm`, i18n._(t`Microsoft Azure Resource Manager`)],
@ -82,7 +85,7 @@ function InventorySourcesList({ i18n, nodeResource, onUpdateNodeResource }) {
[`openstack`, i18n._(t`OpenStack`)],
[`rhv`, i18n._(t`Red Hat Virtualization`)],
[`tower`, i18n._(t`Ansible Tower`)],
[`custom`, i18n._(t`Custom Script`)],
[`custom`, i18n._(t`Custom script`)],
],
},
]}