Skip to content

Commit

Permalink
[8.x] fix: Change "Single Account" to "Single Project&…
Browse files Browse the repository at this point in the history
…quot; in button text (#200327) (#200813)

# Backport

This will backport the following commits from `main` to `8.x`:
- [fix: Change "Single Account" to "Single Project"
in button text (#200327)](#200327)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Samantha
Tan","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-19T19:38:13Z","message":"fix:
Change \"Single Account\" to \"Single Project\" in button text
(#200327)\n\n## Summary\r\n\r\nThis pull request
resolves\r\n[#198879](#198879),
where\r\n\"Single Account\" was incorrectly displayed in the GCP
integration\r\nscreen. The text has been updated to \"Single Project\"
to align with GCP\r\nterminology. Additionally, the paragraph above this
text was updated to\r\nensure consistency across the UI.\r\n\r\n##
Motivation\r\n\r\nAligning the GCP integration screen with GCP’s correct
terminology by\r\nreplacing \"Single Account\" with \"Single Project\"
ensures clarity and\r\nconsistency across the UI.\r\n\r\n##
Screenshots:\r\n**Before**: interface showing \"Single
Account\"\r\n\r\n<img width=\"858\" alt=\"Screenshot 2024-11-18 at 1 29
18 PM\"\r\nsrc=\"https://github.com/user-attachments/assets/c03cb5f0-8e30-4e90-852d-aa2e91d6918d\">\r\n\r\n**After**:
updated interface showing \"Single Project\"\r\n\r\n<img width=\"782\"
alt=\"Screenshot 2024-11-18 at 1 29
57 PM\"\r\nsrc=\"https://github.com/user-attachments/assets/2d1b3e09-8da8-401a-b711-34934c31a1b2\">\r\n\r\n\r\n###
Checklist\r\n\r\nCheck the PR satisfies following conditions.
\r\n\r\nReviewers should verify this PR satisfies this list as
well.\r\n\r\n- [x] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[
]\r\n~~[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials~~\r\n- [ ]
~~[Unit or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common scenarios~~\r\n- [ ] ~~If a
plugin configuration key changed, check if it needs to be\r\nallowlisted
in the cloud and added to the
[docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)~~\r\n-
[ ] ~~This was checked for breaking HTTP API changes, and any
breaking\r\nchanges have been approved by the breaking-change committee.
The\r\n`release_note:breaking` label should be applied in these
situations.~~\r\n- [ ] ~~[Flaky
Test\r\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\r\nused on any tests changed~~\r\n- [x] The PR description includes
the appropriate Release Notes section,\r\nand the correct
`release_node:*` label is applied per
the\r\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\r\n\r\n---------\r\n\r\nCo-authored-by:
Maxim Kholod
<[email protected]>","sha":"a5831c0d2346d7ea7b95cb0516ff67da46b9d68b","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","💝community","v9.0.0","backport:prev-minor","backport:version","v8.17.0"],"title":"fix:
Change \"Single Account\" to \"Single Project\" in button
text","number":200327,"url":"https://github.com/elastic/kibana/pull/200327","mergeCommit":{"message":"fix:
Change \"Single Account\" to \"Single Project\" in button text
(#200327)\n\n## Summary\r\n\r\nThis pull request
resolves\r\n[#198879](#198879),
where\r\n\"Single Account\" was incorrectly displayed in the GCP
integration\r\nscreen. The text has been updated to \"Single Project\"
to align with GCP\r\nterminology. Additionally, the paragraph above this
text was updated to\r\nensure consistency across the UI.\r\n\r\n##
Motivation\r\n\r\nAligning the GCP integration screen with GCP’s correct
terminology by\r\nreplacing \"Single Account\" with \"Single Project\"
ensures clarity and\r\nconsistency across the UI.\r\n\r\n##
Screenshots:\r\n**Before**: interface showing \"Single
Account\"\r\n\r\n<img width=\"858\" alt=\"Screenshot 2024-11-18 at 1 29
18 PM\"\r\nsrc=\"https://github.com/user-attachments/assets/c03cb5f0-8e30-4e90-852d-aa2e91d6918d\">\r\n\r\n**After**:
updated interface showing \"Single Project\"\r\n\r\n<img width=\"782\"
alt=\"Screenshot 2024-11-18 at 1 29
57 PM\"\r\nsrc=\"https://github.com/user-attachments/assets/2d1b3e09-8da8-401a-b711-34934c31a1b2\">\r\n\r\n\r\n###
Checklist\r\n\r\nCheck the PR satisfies following conditions.
\r\n\r\nReviewers should verify this PR satisfies this list as
well.\r\n\r\n- [x] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[
]\r\n~~[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials~~\r\n- [ ]
~~[Unit or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common scenarios~~\r\n- [ ] ~~If a
plugin configuration key changed, check if it needs to be\r\nallowlisted
in the cloud and added to the
[docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)~~\r\n-
[ ] ~~This was checked for breaking HTTP API changes, and any
breaking\r\nchanges have been approved by the breaking-change committee.
The\r\n`release_note:breaking` label should be applied in these
situations.~~\r\n- [ ] ~~[Flaky
Test\r\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\r\nused on any tests changed~~\r\n- [x] The PR description includes
the appropriate Release Notes section,\r\nand the correct
`release_node:*` label is applied per
the\r\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\r\n\r\n---------\r\n\r\nCo-authored-by:
Maxim Kholod
<[email protected]>","sha":"a5831c0d2346d7ea7b95cb0516ff67da46b9d68b"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/200327","number":200327,"mergeCommit":{"message":"fix:
Change \"Single Account\" to \"Single Project\" in button text
(#200327)\n\n## Summary\r\n\r\nThis pull request
resolves\r\n[#198879](#198879),
where\r\n\"Single Account\" was incorrectly displayed in the GCP
integration\r\nscreen. The text has been updated to \"Single Project\"
to align with GCP\r\nterminology. Additionally, the paragraph above this
text was updated to\r\nensure consistency across the UI.\r\n\r\n##
Motivation\r\n\r\nAligning the GCP integration screen with GCP’s correct
terminology by\r\nreplacing \"Single Account\" with \"Single Project\"
ensures clarity and\r\nconsistency across the UI.\r\n\r\n##
Screenshots:\r\n**Before**: interface showing \"Single
Account\"\r\n\r\n<img width=\"858\" alt=\"Screenshot 2024-11-18 at 1 29
18 PM\"\r\nsrc=\"https://github.com/user-attachments/assets/c03cb5f0-8e30-4e90-852d-aa2e91d6918d\">\r\n\r\n**After**:
updated interface showing \"Single Project\"\r\n\r\n<img width=\"782\"
alt=\"Screenshot 2024-11-18 at 1 29
57 PM\"\r\nsrc=\"https://github.com/user-attachments/assets/2d1b3e09-8da8-401a-b711-34934c31a1b2\">\r\n\r\n\r\n###
Checklist\r\n\r\nCheck the PR satisfies following conditions.
\r\n\r\nReviewers should verify this PR satisfies this list as
well.\r\n\r\n- [x] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[
]\r\n~~[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials~~\r\n- [ ]
~~[Unit or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common scenarios~~\r\n- [ ] ~~If a
plugin configuration key changed, check if it needs to be\r\nallowlisted
in the cloud and added to the
[docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)~~\r\n-
[ ] ~~This was checked for breaking HTTP API changes, and any
breaking\r\nchanges have been approved by the breaking-change committee.
The\r\n`release_note:breaking` label should be applied in these
situations.~~\r\n- [ ] ~~[Flaky
Test\r\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\r\nused on any tests changed~~\r\n- [x] The PR description includes
the appropriate Release Notes section,\r\nand the correct
`release_node:*` label is applied per
the\r\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\r\n\r\n---------\r\n\r\nCo-authored-by:
Maxim Kholod
<[email protected]>","sha":"a5831c0d2346d7ea7b95cb0516ff67da46b9d68b"}},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Samantha Tan <[email protected]>
  • Loading branch information
kibanamachine and samantha-t28 authored Nov 19, 2024
1 parent c501d2f commit 91e6da2
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ const getGcpAccountTypeOptions = (isGcpOrgDisabled: boolean): CspRadioGroupProps
{
id: GCP_SINGLE_ACCOUNT,
label: i18n.translate('xpack.csp.fleetIntegration.gcpAccountType.gcpSingleAccountLabel', {
defaultMessage: 'Single Account',
defaultMessage: 'Single Project',
}),
testId: 'gcpSingleAccountTestId',
},
Expand Down Expand Up @@ -377,7 +377,7 @@ const GcpAccountTypeSelect = ({
<EuiText color="subdued" size="s">
<FormattedMessage
id="xpack.csp.fleetIntegration.gcpAccountTypeDescriptionLabel"
defaultMessage="Select between single account or organization, and then fill in the name and description to help identify this integration."
defaultMessage="Select between single project or organization, and then fill in the name and description to help identify this integration."
/>
</EuiText>
<EuiSpacer size="l" />
Expand Down

0 comments on commit 91e6da2

Please sign in to comment.