External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-11 11:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

LaunchButton: rename isSending to isLaunching

Browse Source
This commit is contained in:
Keith J. Grant
2021-04-19 09:05:15 -07:00
parent dc0256441f
commit 5e228c4d98
10 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui_next/src/components/JobList/JobListItem.jsx
View File

@@ -91,22 +91,22 @@ function JobListItem({
> >
{job.status === 'failed' && job.type === 'job' ? ( {job.status === 'failed' && job.type === 'job' ? (
<LaunchButton resource={job}> <LaunchButton resource={job}>
{({ handleRelaunch, isSending }) => ( {({ handleRelaunch, isLaunching }) => (
<ReLaunchDropDown <ReLaunchDropDown
handleRelaunch={handleRelaunch} handleRelaunch={handleRelaunch}
isSending={isSending} isLaunching={isLaunching}
/> />
)} )}
</LaunchButton> </LaunchButton>
) : ( ) : (
<LaunchButton resource={job}> <LaunchButton resource={job}>
{({ handleRelaunch, isSending }) => ( {({ handleRelaunch, isLaunching }) => (
<Button <Button
ouiaId={`${job.id}-relaunch-button`} ouiaId={`${job.id}-relaunch-button`}
variant="plain" variant="plain"
onClick={handleRelaunch} onClick={handleRelaunch}
aria-label={i18n._(t`Relaunch`)} aria-label={i18n._(t`Relaunch`)}
isDisabled={isSending} isDisabled={isLaunching}
> >
<RocketIcon /> <RocketIcon />
</Button> </Button>

12
awx/ui_next/src/components/LaunchButton/LaunchButton.jsx
View File

@@ -36,12 +36,12 @@ function LaunchButton({ resource, i18n, children, history }) {
const [showLaunchPrompt, setShowLaunchPrompt] = useState(false); const [showLaunchPrompt, setShowLaunchPrompt] = useState(false);
const [launchConfig, setLaunchConfig] = useState(null); const [launchConfig, setLaunchConfig] = useState(null);
const [surveyConfig, setSurveyConfig] = useState(null); const [surveyConfig, setSurveyConfig] = useState(null);
const [isSending, setIsSending] = useState(false); const [isLaunching, setIsLaunching] = useState(false);
const [resourceCredentials, setResourceCredentials] = useState([]); const [resourceCredentials, setResourceCredentials] = useState([]);
const [error, setError] = useState(null); const [error, setError] = useState(null);
const handleLaunch = async () => { const handleLaunch = async () => {
setIsSending(true); setIsLaunching(true);
const readLaunch = const readLaunch =
resource.type === 'workflow_job_template' resource.type === 'workflow_job_template'
? WorkflowJobTemplatesAPI.readLaunch(resource.id) ? WorkflowJobTemplatesAPI.readLaunch(resource.id)
@@ -99,7 +99,7 @@ function LaunchButton({ resource, i18n, children, history }) {
history.push(`/jobs/${job.id}/output`); history.push(`/jobs/${job.id}/output`);
} catch (launchError) { } catch (launchError) {
setError(launchError); setError(launchError);
setIsSending(false); setIsLaunching(false);
} }
}; };
@@ -107,7 +107,7 @@ function LaunchButton({ resource, i18n, children, history }) {
let readRelaunch; let readRelaunch;
let relaunch; let relaunch;
setIsSending(true); setIsLaunching(true);
if (resource.type === 'inventory_update') { if (resource.type === 'inventory_update') {
// We'll need to handle the scenario where the src no longer exists // We'll need to handle the scenario where the src no longer exists
readRelaunch = InventorySourcesAPI.readLaunchUpdate( readRelaunch = InventorySourcesAPI.readLaunchUpdate(
@@ -151,7 +151,7 @@ function LaunchButton({ resource, i18n, children, history }) {
} }
} catch (err) { } catch (err) {
setError(err); setError(err);
setIsSending(false); setIsLaunching(false);
} }
}; };
@@ -160,7 +160,7 @@ function LaunchButton({ resource, i18n, children, history }) {
{children({ {children({
handleLaunch, handleLaunch,
handleRelaunch, handleRelaunch,
isSending, isLaunching,
})} })}
{error && ( {error && (
<AlertModal <AlertModal

6
awx/ui_next/src/components/LaunchButton/ReLaunchDropDown.jsx
View File

@@ -14,7 +14,7 @@ import { RocketIcon } from '@patternfly/react-icons';
function ReLaunchDropDown({ function ReLaunchDropDown({
isPrimary = false, isPrimary = false,
handleRelaunch, handleRelaunch,
isSending, isLaunching,
i18n, i18n,
ouiaId, ouiaId,
}) { }) {
@@ -41,7 +41,7 @@ function ReLaunchDropDown({
onClick={() => { onClick={() => {
handleRelaunch({ hosts: 'all' }); handleRelaunch({ hosts: 'all' });
}} }}
isDisabled={isSending} isDisabled={isLaunching}
> >
{i18n._(t`All`)} {i18n._(t`All`)}
</DropdownItem>, </DropdownItem>,
@@ -53,7 +53,7 @@ function ReLaunchDropDown({
onClick={() => { onClick={() => {
handleRelaunch({ hosts: 'failed' }); handleRelaunch({ hosts: 'failed' });
}} }}
isDisabled={isSending} isDisabled={isLaunching}
> >
{i18n._(t`Failed hosts`)} {i18n._(t`Failed hosts`)}
</DropdownItem>, </DropdownItem>,

4
awx/ui_next/src/components/TemplateList/TemplateListItem.jsx
View File

@@ -176,11 +176,11 @@ function TemplateListItem({
tooltip={i18n._(t`Launch Template`)} tooltip={i18n._(t`Launch Template`)}
> >
<LaunchButton resource={template}> <LaunchButton resource={template}>
{({ handleLaunch, isSending }) => ( {({ handleLaunch, isLaunching }) => (
<Button <Button
ouiaId={`${template.id}-launch-button`} ouiaId={`${template.id}-launch-button`}
id={`template-action-launch-${template.id}`} id={`template-action-launch-${template.id}`}
isDisabled={isDisabled || isSending} isDisabled={isDisabled || isLaunching}
aria-label={i18n._(t`Launch template`)} aria-label={i18n._(t`Launch template`)}
variant="plain" variant="plain"
onClick={handleLaunch} onClick={handleLaunch}

8
awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx
View File

@@ -371,23 +371,23 @@ function JobDetail({ job, i18n }) {
job.summary_fields.user_capabilities.start && job.summary_fields.user_capabilities.start &&
(job.status === 'failed' && job.type === 'job' ? ( (job.status === 'failed' && job.type === 'job' ? (
<LaunchButton resource={job}> <LaunchButton resource={job}>
{({ handleRelaunch, isSending }) => ( {({ handleRelaunch, isLaunching }) => (
<ReLaunchDropDown <ReLaunchDropDown
ouiaId="job-detail-relaunch-dropdown" ouiaId="job-detail-relaunch-dropdown"
isPrimary isPrimary
handleRelaunch={handleRelaunch} handleRelaunch={handleRelaunch}
isSending={isSending} isLaunching={isLaunching}
/> />
)} )}
</LaunchButton> </LaunchButton>
) : ( ) : (
<LaunchButton resource={job} aria-label={i18n._(t`Relaunch`)}> <LaunchButton resource={job} aria-label={i18n._(t`Relaunch`)}>
{({ handleRelaunch, isSending }) => ( {({ handleRelaunch, isLaunching }) => (
<Button <Button
ouiaId="job-detail-relaunch-button" ouiaId="job-detail-relaunch-button"
type="submit" type="submit"
onClick={handleRelaunch} onClick={handleRelaunch}
isDisabled={isSending} isDisabled={isLaunching}
> >
{i18n._(t`Relaunch`)} {i18n._(t`Relaunch`)}
</Button> </Button>

8
awx/ui_next/src/screens/Job/JobOutput/shared/OutputToolbar.jsx
View File

@@ -144,23 +144,23 @@ const OutputToolbar = ({
> >
{job.status === 'failed' && job.type === 'job' ? ( {job.status === 'failed' && job.type === 'job' ? (
<LaunchButton resource={job}> <LaunchButton resource={job}>
{({ handleRelaunch, isSending }) => ( {({ handleRelaunch, isLaunching }) => (
<ReLaunchDropDown <ReLaunchDropDown
handleRelaunch={handleRelaunch} handleRelaunch={handleRelaunch}
ouiaId="job-output-relaunch-dropdown" ouiaId="job-output-relaunch-dropdown"
isSending={isSending} isLaunching={isLaunching}
/> />
)} )}
</LaunchButton> </LaunchButton>
) : ( ) : (
<LaunchButton resource={job}> <LaunchButton resource={job}>
{({ handleRelaunch, isSending }) => ( {({ handleRelaunch, isLaunching }) => (
<Button <Button
ouiaId="job-output-relaunch-button" ouiaId="job-output-relaunch-button"
variant="plain" variant="plain"
onClick={handleRelaunch} onClick={handleRelaunch}
aria-label={i18n._(t`Relaunch`)} aria-label={i18n._(t`Relaunch`)}
isDisabled={isSending} isDisabled={isLaunching}
> >
<RocketIcon /> <RocketIcon />
</Button> </Button>

4
awx/ui_next/src/screens/Project/ProjectJobTemplatesList/ProjectJobTemplatesListItem.jsx
View File

@@ -116,13 +116,13 @@ function ProjectJobTemplateListItem({
{canLaunch && template.type === 'job_template' && ( {canLaunch && template.type === 'job_template' && (
<Tooltip content={i18n._(t`Launch Template`)} position="top"> <Tooltip content={i18n._(t`Launch Template`)} position="top">
<LaunchButton resource={template}> <LaunchButton resource={template}>
{({ handleLaunch, isSending }) => ( {({ handleLaunch, isLaunching }) => (
<Button <Button
ouiaId={`${template.id}-launch-button`} ouiaId={`${template.id}-launch-button`}
css="grid-column: 1" css="grid-column: 1"
variant="plain" variant="plain"
onClick={handleLaunch} onClick={handleLaunch}
isDisabled={isSending} isDisabled={isLaunching}
> >
<RocketIcon /> <RocketIcon />
</Button> </Button>

4
awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
View File

@@ -387,13 +387,13 @@ function JobTemplateDetail({ i18n, template }) {
)} )}
{canLaunch && ( {canLaunch && (
<LaunchButton resource={template} aria-label={i18n._(t`Launch`)}> <LaunchButton resource={template} aria-label={i18n._(t`Launch`)}>
{({ handleLaunch, isSending }) => ( {({ handleLaunch, isLaunching }) => (
<Button <Button
ouiaId="job-template-detail-launch-button" ouiaId="job-template-detail-launch-button"
variant="secondary" variant="secondary"
type="submit" type="submit"
onClick={handleLaunch} onClick={handleLaunch}
isDisabled={isSending} isDisabled={isLaunching}
> >
{i18n._(t`Launch`)} {i18n._(t`Launch`)}
</Button> </Button>

4
awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
View File

@@ -227,13 +227,13 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
)} )}
{canLaunch && ( {canLaunch && (
<LaunchButton resource={template} aria-label={i18n._(t`Launch`)}> <LaunchButton resource={template} aria-label={i18n._(t`Launch`)}>
{({ handleLaunch, isSending }) => ( {({ handleLaunch, isLaunching }) => (
<Button <Button
ouiaId="workflow-job-template-detail-launch-button" ouiaId="workflow-job-template-detail-launch-button"
variant="secondary" variant="secondary"
type="submit" type="submit"
onClick={handleLaunch} onClick={handleLaunch}
isDisabled={isSending} isDisabled={isLaunching}
> >
{i18n._(t`Launch`)} {i18n._(t`Launch`)}
</Button> </Button>

4
awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerToolbar.jsx
View File

@@ -125,12 +125,12 @@ function VisualizerToolbar({
resource={template} resource={template}
aria-label={i18n._(t`Launch workflow`)} aria-label={i18n._(t`Launch workflow`)}
> >
{({ handleLaunch, isSending }) => ( {({ handleLaunch, isLaunching }) => (
<ActionButton <ActionButton
id="visualizer-launch" id="visualizer-launch"
variant="plain" variant="plain"
isDisabled={ isDisabled={
hasUnsavedChanges || totalNodes === 0 || isSending hasUnsavedChanges || totalNodes === 0 || isLaunching
} }
onClick={handleLaunch} onClick={handleLaunch}
> >