Skip to content

[Fleet] Add span tags to EuiModal and EuiConfirmModal header titles #149075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jen-huang wants to merge 2 commits into from
Closed

[Fleet] Add span tags to EuiModal and EuiConfirmModal header titles #149075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d5be38
Add span tags to modal headers
jen-huang Jan 17, 2023
b451706
Merge branch 'main' into fix/modal-headers
kibanamachine Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ...blic/applications/fleet/sections/agent_policy/components/agent_policy_delete_provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,12 @@ export const AgentPolicyDeleteProvider: React.FunctionComponent<Props> = ({
return (
<EuiConfirmModal
title={
<FormattedMessage
id="xpack.fleet.deleteAgentPolicy.confirmModal.deletePolicyTitle"
defaultMessage="Delete this agent policy?"
/>
<span>
<FormattedMessage
id="xpack.fleet.deleteAgentPolicy.confirmModal.deletePolicyTitle"
defaultMessage="Delete this agent policy?"
/>
</span>
}
onCancel={closeModal}
onConfirm={deleteAgentPolicy}
Expand Down
10 changes: 6 additions & 4 deletions ...fleet/public/applications/fleet/sections/agent_policy/components/confirm_deploy_modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ export const ConfirmDeployAgentPolicyModal: React.FunctionComponent<{
return (
<EuiConfirmModal
title={
<FormattedMessage
id="xpack.fleet.agentPolicy.confirmModalTitle"
defaultMessage="Save and deploy changes"
/>
<span>
<FormattedMessage
id="xpack.fleet.agentPolicy.confirmModalTitle"
defaultMessage="Save and deploy changes"
/>
</span>
}
onCancel={onCancel}
onConfirm={onConfirm}
Expand Down
16 changes: 9 additions & 7 deletions ...create_package_policy_page/single_page_layout/components/post_install_add_agent_modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,15 @@ export const PostInstallAddAgentModal: React.FunctionComponent<{
<EuiModal data-test-subj="postInstallAddAgentModal" onClose={onCancel}>
<EuiModalHeader>
<EuiModalHeaderTitle data-test-subj="confirmModalTitleText">
<FormattedMessage
id="xpack.fleet.agentPolicy.postInstallAddAgentModal"
defaultMessage="{packageName} integration added"
values={{
packageName: toTitleCase(packageInfo.title),
}}
/>
<h1>
<FormattedMessage
id="xpack.fleet.agentPolicy.postInstallAddAgentModal"
defaultMessage="{packageName} integration added"
values={{
packageName: toTitleCase(packageInfo.title),
}}
/>
</h1>
</EuiModalHeaderTitle>
</EuiModalHeader>

Expand Down
10 changes: 6 additions & 4 deletions ...ublic/applications/fleet/sections/agents/components/agent_reassign_policy_modal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,12 @@ export const AgentReassignAgentPolicyModal: React.FunctionComponent<Props> = ({
<EuiConfirmModal
data-test-subj="agentReassignPolicyModal"
title={
<FormattedMessage
id="xpack.fleet.agentReassignPolicy.flyoutTitle"
defaultMessage="Assign new agent policy"
/>
<span>
<FormattedMessage
id="xpack.fleet.agentReassignPolicy.flyoutTitle"
defaultMessage="Assign new agent policy"
/>
</span>
}
onCancel={onClose}
onConfirm={onSubmit}
Expand Down
22 changes: 13 additions & 9 deletions ...c/applications/fleet/sections/agents/components/agent_request_diagnostics_modal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,20 @@ export const AgentRequestDiagnosticsModal: React.FunctionComponent<Props> = ({
data-test-subj="requestDiagnosticsModal"
title={
isSingleAgent ? (
<FormattedMessage
id="xpack.fleet.requestDiagnostics.singleTitle"
defaultMessage="Request diagnostics"
/>
<span>
<FormattedMessage
id="xpack.fleet.requestDiagnostics.singleTitle"
defaultMessage="Request diagnostics"
/>
</span>
) : (
<FormattedMessage
id="xpack.fleet.requestDiagnostics.multipleTitle"
defaultMessage="Request diagnostics for {count} agents"
values={{ count: agentCount }}
/>
<span>
<FormattedMessage
id="xpack.fleet.requestDiagnostics.multipleTitle"
defaultMessage="Request diagnostics for {count} agents"
values={{ count: agentCount }}
/>
</span>
)
}
onCancel={onClose}
Expand Down
22 changes: 13 additions & 9 deletions ...fleet/public/applications/fleet/sections/agents/components/agent_unenroll_modal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,20 @@ export const AgentUnenrollAgentModal: React.FunctionComponent<Props> = ({
data-test-subj="agentUnenrollModal"
title={
isSingleAgent ? (
<FormattedMessage
id="xpack.fleet.unenrollAgents.deleteSingleTitle"
defaultMessage="Unenroll agent"
/>
<span>
<FormattedMessage
id="xpack.fleet.unenrollAgents.deleteSingleTitle"
defaultMessage="Unenroll agent"
/>
</span>
) : (
<FormattedMessage
id="xpack.fleet.unenrollAgents.forceDeleteMultipleTitle"
defaultMessage="Unenroll {count} agents"
values={{ count: agentCount }}
/>
<span>
<FormattedMessage
id="xpack.fleet.unenrollAgents.forceDeleteMultipleTitle"
defaultMessage="Unenroll {count} agents"
values={{ count: agentCount }}
/>
</span>
)
}
onCancel={onClose}
Expand Down
34 changes: 20 additions & 14 deletions .../fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,22 +225,28 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<AgentUpgradeAgentMo
title={
<>
{isSingleAgent ? (
<FormattedMessage
id="xpack.fleet.upgradeAgents.upgradeSingleTitle"
defaultMessage="Upgrade agent"
/>
<span>
<FormattedMessage
id="xpack.fleet.upgradeAgents.upgradeSingleTitle"
defaultMessage="Upgrade agent"
/>
</span>
) : isScheduled ? (
<FormattedMessage
id="xpack.fleet.upgradeAgents.scheduleUpgradeMultipleTitle"
defaultMessage="Schedule upgrade for {count, plural, one {agent} other {{count} agents} =true {all selected agents}}"
values={{ count: isAllAgents || agentCount }}
/>
<span>
<FormattedMessage
id="xpack.fleet.upgradeAgents.scheduleUpgradeMultipleTitle"
defaultMessage="Schedule upgrade for {count, plural, one {agent} other {{count} agents} =true {all selected agents}}"
values={{ count: isAllAgents || agentCount }}
/>
</span>
) : (
<FormattedMessage
id="xpack.fleet.upgradeAgents.upgradeMultipleTitle"
defaultMessage="Upgrade {count, plural, one {agent} other {{count} agents} =true {all selected agents}}"
values={{ count: isAllAgents || agentCount }}
/>
<span>
<FormattedMessage
id="xpack.fleet.upgradeAgents.upgradeMultipleTitle"
defaultMessage="Upgrade {count, plural, one {agent} other {{count} agents} =true {all selected agents}}"
values={{ count: isAllAgents || agentCount }}
/>
</span>
)}
</>
}
Expand Down
12 changes: 7 additions & 5 deletions ...pplications/integrations/sections/epm/screens/detail/settings/confirm_package_install.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ export const ConfirmPackageInstall = (props: ConfirmPackageInstallProps) => {
return (
<EuiConfirmModal
title={
<FormattedMessage
id="xpack.fleet.integrations.settings.confirmInstallModal.installTitle"
defaultMessage="Install {packageName}"
values={{ packageName }}
/>
<span>
<FormattedMessage
id="xpack.fleet.integrations.settings.confirmInstallModal.installTitle"
defaultMessage="Install {packageName}"
values={{ packageName }}
/>
</span>
}
onCancel={onCancel}
onConfirm={onConfirm}
Expand Down
12 changes: 7 additions & 5 deletions ...lications/integrations/sections/epm/screens/detail/settings/confirm_package_uninstall.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ export const ConfirmPackageUninstall = (props: ConfirmPackageUninstallProps) =>
return (
<EuiConfirmModal
title={
<FormattedMessage
id="xpack.fleet.integrations.settings.confirmUninstallModal.uninstallTitle"
defaultMessage="Uninstall {packageName}"
values={{ packageName }}
/>
<span>
<FormattedMessage
id="xpack.fleet.integrations.settings.confirmUninstallModal.uninstallTitle"
defaultMessage="Uninstall {packageName}"
values={{ packageName }}
/>
</span>
}
onCancel={onCancel}
onConfirm={onConfirm}
Expand Down
12 changes: 7 additions & 5 deletions x-pack/plugins/fleet/public/components/package_policy_delete_provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,13 @@ export const PackagePolicyDeleteProvider: React.FunctionComponent<Props> = ({
return (
<EuiConfirmModal
title={
<FormattedMessage
id="xpack.fleet.deletePackagePolicy.confirmModal.deleteMultipleTitle"
defaultMessage="Delete {count, plural, one {integration} other {# integrations}}?"
values={{ count: packagePolicies.length }}
/>
<span>
<FormattedMessage
id="xpack.fleet.deletePackagePolicy.confirmModal.deleteMultipleTitle"
defaultMessage="Delete {count, plural, one {integration} other {# integrations}}?"
values={{ count: packagePolicies.length }}
/>
</span>
}
onCancel={closeModal}
onConfirm={deletePackagePolicies}
Expand Down