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

Merge pull request #7754 from mabashian/convert-JobTemplatesList-useRequest

Browse Source 
Converts JobTemplatesList 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 23:04:18 +00:00 committed by GitHub
commit dd828cba26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/JobTemplatesList.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 { JobTemplatesAPI } 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,32 +17,33 @@ const QS_CONFIG = getQSConfig('job_templates', {
});
function JobTemplatesList({ i18n, nodeResource, onUpdateNodeResource }) {
const [count, setCount] = useState(0);
const [error, setError] = useState(null);
const [isLoading, setIsLoading] = useState(true);
const [jobTemplates, setJobTemplates] = useState([]);
const location = useLocation();
useEffect(() => {
(async () => {
setIsLoading(true);
setJobTemplates([]);
setCount(0);
const {
result: { jobTemplates, count },
error,
isLoading,
request: fetchJobTemplates,
} = useRequest(
useCallback(async () => {
const params = parseQueryString(QS_CONFIG, location.search);
try {
const { data } = await JobTemplatesAPI.read(params, {
role_level: 'execute_role',
});
setJobTemplates(data.results);
setCount(data.count);
} catch (err) {
setError(err);
} finally {
setIsLoading(false);
}
})();
}, [location]);
const results = await JobTemplatesAPI.read(params, {
role_level: 'execute_role',
});
return {
jobTemplates: results.data.results,
count: results.data.count,
};
}, [location]),
{
jobTemplates: [],
count: 0,
}
);
useEffect(() => {
fetchJobTemplates();
}, [fetchJobTemplates]);
return (
<PaginatedDataList
@ -76,11 +78,11 @@ function JobTemplatesList({ i18n, nodeResource, onUpdateNodeResource }) {
key: 'playbook',
},
{
name: i18n._(t`Created By (Username)`),
name: i18n._(t`Created by (username)`),
key: 'created_by__username',
},
{
name: i18n._(t`Modified By (Username)`),
name: i18n._(t`Modified by (username)`),
key: 'modified_by__username',
},
]}