mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
# Backport This will backport the following commits from `main` to `8.15`: - [[UII] Remove action links and buttons when secrets field is disabled (#188252)](https://github.com/elastic/kibana/pull/188252) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Jen Huang","email":"its.jenetic@gmail.com"},"sourceCommit":{"committedDate":"2024-07-12T18:31:16Z","message":"[UII] Remove action links and buttons when secrets field is disabled (#188252)\n\n## Summary\r\n\r\nResolves #187642 \r\n\r\nThis PR removes action links and buttons to replace and convert secrets\r\nfields if the field itself is disabled, for cases like the user not\r\nhaving write permissions:\r\n\r\n<img width=\"730\" alt=\"image\"\r\nsrc=\"https://github.com/user-attachments/assets/957ad858-74bf-4f28-a212-148253e4ca0f\">\r\n\r\n<img width=\"716\" alt=\"image\"\r\nsrc=\"https://github.com/user-attachments/assets/d70f7946-8b62-4e13-9d16-98ddac26b826\">\r\n\r\nAlso applies sentence casing to `Service token` label.\r\n\r\n### Checklist\r\n\r\n- [x] [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","sha":"4c0db61e6d92ada57833471a33daa5eb40c38e44","branchLabelMapping":{"^v8.16.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:prev-minor","v8.16.0"],"title":"[UII] Remove action links and buttons when secrets field is disabled","number":188252,"url":"https://github.com/elastic/kibana/pull/188252","mergeCommit":{"message":"[UII] Remove action links and buttons when secrets field is disabled (#188252)\n\n## Summary\r\n\r\nResolves #187642 \r\n\r\nThis PR removes action links and buttons to replace and convert secrets\r\nfields if the field itself is disabled, for cases like the user not\r\nhaving write permissions:\r\n\r\n<img width=\"730\" alt=\"image\"\r\nsrc=\"https://github.com/user-attachments/assets/957ad858-74bf-4f28-a212-148253e4ca0f\">\r\n\r\n<img width=\"716\" alt=\"image\"\r\nsrc=\"https://github.com/user-attachments/assets/d70f7946-8b62-4e13-9d16-98ddac26b826\">\r\n\r\nAlso applies sentence casing to `Service token` label.\r\n\r\n### Checklist\r\n\r\n- [x] [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","sha":"4c0db61e6d92ada57833471a33daa5eb40c38e44"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.16.0","branchLabelMappingKey":"^v8.16.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/188252","number":188252,"mergeCommit":{"message":"[UII] Remove action links and buttons when secrets field is disabled (#188252)\n\n## Summary\r\n\r\nResolves #187642 \r\n\r\nThis PR removes action links and buttons to replace and convert secrets\r\nfields if the field itself is disabled, for cases like the user not\r\nhaving write permissions:\r\n\r\n<img width=\"730\" alt=\"image\"\r\nsrc=\"https://github.com/user-attachments/assets/957ad858-74bf-4f28-a212-148253e4ca0f\">\r\n\r\n<img width=\"716\" alt=\"image\"\r\nsrc=\"https://github.com/user-attachments/assets/d70f7946-8b62-4e13-9d16-98ddac26b826\">\r\n\r\nAlso applies sentence casing to `Service token` label.\r\n\r\n### Checklist\r\n\r\n- [x] [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","sha":"4c0db61e6d92ada57833471a33daa5eb40c38e44"}}]}] BACKPORT--> Co-authored-by: Jen Huang <its.jenetic@gmail.com>
This commit is contained in:
Kibana Machine
GitHub
parent
98895c5a1b
commit
c37905cab9
6 changed files with 54 additions and 36 deletions
|
|
@ -182,7 +182,7 @@ queue:
|
|||
|
||||
cy.contains('Name is required');
|
||||
cy.contains('URL is required');
|
||||
cy.contains('Service Token is required');
|
||||
cy.contains('Service token is required');
|
||||
shouldDisplayError(SETTINGS_OUTPUTS.NAME_INPUT);
|
||||
shouldDisplayError('serviceTokenSecretInput');
|
||||
});
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ const kafkaSectionsLabels = [
|
|||
'Broker settings',
|
||||
];
|
||||
|
||||
const remoteEsOutputLabels = ['Hosts', 'Service Token'];
|
||||
const remoteEsOutputLabels = ['Hosts', 'Service token'];
|
||||
|
||||
describe('EditOutputFlyout', () => {
|
||||
const mockStartServices = (isServerlessEnabled?: boolean) => {
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ export const OutputFormRemoteEsSection: React.FunctionComponent<Props> = (props)
|
|||
label={
|
||||
<FormattedMessage
|
||||
id="xpack.fleet.settings.editOutputFlyout.serviceTokenLabel"
|
||||
defaultMessage="Service Token"
|
||||
defaultMessage="Service token"
|
||||
/>
|
||||
}
|
||||
{...inputs.serviceTokenInput.formRowProps}
|
||||
|
|
@ -105,7 +105,7 @@ export const OutputFormRemoteEsSection: React.FunctionComponent<Props> = (props)
|
|||
<SecretFormRow
|
||||
fullWidth
|
||||
title={i18n.translate('xpack.fleet.settings.editOutputFlyout.serviceTokenLabel', {
|
||||
defaultMessage: 'Service Token',
|
||||
defaultMessage: 'Service token',
|
||||
})}
|
||||
{...inputs.serviceTokenSecretInput.formRowProps}
|
||||
cancelEdit={inputs.serviceTokenSecretInput.cancelEdit}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
import React from 'react';
|
||||
import { fireEvent } from '@testing-library/react';
|
||||
import { renderReactTestingLibraryWithI18n } from '@kbn/test-jest-helpers';
|
||||
|
||||
import { SecretFormRow } from './output_form_secret_form_row';
|
||||
|
||||
describe('SecretFormRow', () => {
|
||||
|
|
@ -42,8 +43,8 @@ describe('SecretFormRow', () => {
|
|||
expect(queryByText(initialValue)).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('should not enable the replace button if the row is disabled', () => {
|
||||
const { getByText } = renderReactTestingLibraryWithI18n(
|
||||
it('should not enable action links if the row is disabled', () => {
|
||||
const { getByText, queryByText } = renderReactTestingLibraryWithI18n(
|
||||
<SecretFormRow
|
||||
title={title}
|
||||
initialValue={initialValue}
|
||||
|
|
@ -57,7 +58,10 @@ describe('SecretFormRow', () => {
|
|||
</SecretFormRow>
|
||||
);
|
||||
|
||||
expect(getByText('Replace Test Secret').closest('button')).toBeDisabled();
|
||||
expect(getByText('The saved Test Secret is hidden.')).toBeInTheDocument();
|
||||
expect(queryByText('Replace Test Secret')).not.toBeInTheDocument();
|
||||
expect(queryByText('Click to use secret storage instead')).not.toBeInTheDocument();
|
||||
expect(queryByText('Click to use plain text storage instead')).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('should call the cancelEdit function when the cancel button is clicked', () => {
|
||||
|
|
|
|||
|
|
@ -55,32 +55,45 @@ export const SecretFormRow: React.FC<{
|
|||
const [editMode, setEditMode] = useState(isConvertedToSecret || !initialValue);
|
||||
const valueHiddenPanel = (
|
||||
<EuiPanel color="subdued" borderRadius="none" hasShadow={false}>
|
||||
<EuiText size="s" color="subdued">
|
||||
<FormattedMessage
|
||||
id="xpack.fleet.outputForm.secretValueHiddenMessage"
|
||||
defaultMessage="The saved {varName} is hidden. You can only replace the {varName}."
|
||||
values={{
|
||||
varName: title,
|
||||
}}
|
||||
/>
|
||||
</EuiText>
|
||||
<EuiSpacer size="s" />
|
||||
<EuiButtonEmpty
|
||||
disabled={disabled}
|
||||
onClick={() => setEditMode(true)}
|
||||
color="primary"
|
||||
iconType="refresh"
|
||||
iconSide="left"
|
||||
size="xs"
|
||||
>
|
||||
<FormattedMessage
|
||||
id="xpack.fleet.outputForm.editSecretValue"
|
||||
defaultMessage="Replace {varName}"
|
||||
values={{
|
||||
varName: title,
|
||||
}}
|
||||
/>
|
||||
</EuiButtonEmpty>
|
||||
{disabled ? (
|
||||
<EuiText size="s" color="subdued">
|
||||
<FormattedMessage
|
||||
id="xpack.fleet.outputForm.secretValueHiddenAndDisabledMessage"
|
||||
defaultMessage="The saved {varName} is hidden."
|
||||
values={{
|
||||
varName: title,
|
||||
}}
|
||||
/>
|
||||
</EuiText>
|
||||
) : (
|
||||
<>
|
||||
<EuiText size="s" color="subdued">
|
||||
<FormattedMessage
|
||||
id="xpack.fleet.outputForm.secretValueHiddenMessage"
|
||||
defaultMessage="The saved {varName} is hidden. You can only replace the {varName}."
|
||||
values={{
|
||||
varName: title,
|
||||
}}
|
||||
/>
|
||||
</EuiText>
|
||||
<EuiSpacer size="s" />
|
||||
<EuiButtonEmpty
|
||||
onClick={() => setEditMode(true)}
|
||||
color="primary"
|
||||
iconType="refresh"
|
||||
iconSide="left"
|
||||
size="xs"
|
||||
>
|
||||
<FormattedMessage
|
||||
id="xpack.fleet.outputForm.editSecretValue"
|
||||
defaultMessage="Replace {varName}"
|
||||
values={{
|
||||
varName: title,
|
||||
}}
|
||||
/>
|
||||
</EuiButtonEmpty>
|
||||
</>
|
||||
)}
|
||||
</EuiPanel>
|
||||
);
|
||||
|
||||
|
|
@ -134,6 +147,7 @@ export const SecretFormRow: React.FC<{
|
|||
);
|
||||
|
||||
const helpText = useMemo(() => {
|
||||
if (disabled) return null;
|
||||
if (isConvertedToSecret)
|
||||
return (
|
||||
<EuiCallOut size="s" color="warning">
|
||||
|
|
@ -172,9 +186,9 @@ export const SecretFormRow: React.FC<{
|
|||
/>
|
||||
);
|
||||
return undefined;
|
||||
}, [initialValue, isConvertedToSecret, onToggleSecretStorage]);
|
||||
}, [disabled, initialValue, isConvertedToSecret, onToggleSecretStorage]);
|
||||
|
||||
const plainTextHelp = (
|
||||
const plainTextHelp = disabled ? null : (
|
||||
<FormattedMessage
|
||||
id="xpack.fleet.settings.editOutputFlyout.secretInputCalloutTitle"
|
||||
defaultMessage="This field should be stored as a secret, currently it is set to be stored as plain text. {enableSecretLink}"
|
||||
|
|
|
|||
|
|
@ -277,7 +277,7 @@ export function validateServiceToken(value: string) {
|
|||
if (!value || value === '') {
|
||||
return [
|
||||
i18n.translate('xpack.fleet.settings.outputForm.serviceTokenRequiredErrorMessage', {
|
||||
defaultMessage: 'Service Token is required',
|
||||
defaultMessage: 'Service token is required',
|
||||
}),
|
||||
];
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue