github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Don't display banner if not needed, even after update the form (#121856) (#122089)

Browse source 
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Co-authored-by: David Sánchez <davidsansol92@gmail.com>
This commit is contained in:
Kibana Machine 2021-12-28 14:17:24 -05:00 • committed by GitHub
parent a5fa683afc
commit c5896807b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_flyout.tsx
View file

@ -120,15 +120,34 @@ export const CreateTrustedAppFlyout = memo<CreateTrustedAppFlyoutProps>(
'trustedAppsByPolicyEnabled'
);
const [wasByPolicy, setWasByPolicy] = useState(!isGlobalEffectScope(formValues.effectScope));
// set initial state of `wasByPolicy` that checks if the initial state of the exception was by policy or not
useEffect(() => {
if (!isFormDirty && formValues.effectScope) {
setWasByPolicy(!isGlobalEffectScope(formValues.effectScope));
}
}, [isFormDirty, formValues.effectScope]);
const isGlobal = useMemo(() => {
return isGlobalEffectScope((formValues as NewTrustedApp).effectScope);
}, [formValues]);
const showExpiredLicenseBanner = useMemo(() => {
return (
isTrustedAppsByPolicyEnabled && !isPlatinumPlus && isEditMode && (!isGlobal || isFormDirty)
isTrustedAppsByPolicyEnabled &&
!isPlatinumPlus &&
isEditMode &&
wasByPolicy &&
(!isGlobal || isFormDirty)
);
}, [isTrustedAppsByPolicyEnabled, isPlatinumPlus, isEditMode, isGlobal, isFormDirty]);
}, [
isTrustedAppsByPolicyEnabled,
isPlatinumPlus,
isEditMode,
isGlobal,
isFormDirty,
wasByPolicy,
]);
// If there was a failure trying to retrieve the Trusted App for edit item,
// then redirect back to the list ++ show toast message.
@ -197,7 +216,7 @@ export const CreateTrustedAppFlyout = memo<CreateTrustedAppFlyoutProps>(
id="xpack.securitySolution.trustedapps.createTrustedAppFlyout.expiredLicenseMessage"
defaultMessage="Your Kibana license has been downgraded. Future policy configurations will now be globally assigned to all policies. For more information, see our "
/>
<EuiLink external href={`${docLinks.links.securitySolution.trustedApps}`}>
<EuiLink target="_blank" href={`${docLinks.links.securitySolution.trustedApps}`}>
<FormattedMessage
id="xpack.securitySolution.trustedapps.docsLink"
defaultMessage="Trusted applications documentation."
@ -228,6 +247,7 @@ export const CreateTrustedAppFlyout = memo<CreateTrustedAppFlyoutProps>(
isInvalid={!!creationErrors}
isEditMode={isEditMode}
isDirty={isFormDirty}
wasByPolicy={wasByPolicy}
error={creationErrorsMessage}
policies={policies}
trustedApp={formValues}

1
x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.test.tsx
View file

@ -136,6 +136,7 @@ describe('When using the Trusted App Form', () => {
trustedApp: latestUpdatedTrustedApp,
isEditMode: false,
isDirty: false,
wasByPolicy: false,
onChange: jest.fn((updates) => {
latestUpdatedTrustedApp = updates.item;
}),

10
x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.tsx
View file

@ -216,6 +216,7 @@ export type CreateTrustedAppFormProps = Pick<
trustedApp: MaybeImmutable<NewTrustedApp>;
isEditMode: boolean;
isDirty: boolean;
wasByPolicy: boolean;
onChange: (state: TrustedAppFormState) => void;
/** Setting passed on to the EffectedPolicySelect component */
policies: Pick<EffectedPolicySelectProps, 'options' | 'isLoading'>;
@ -227,6 +228,7 @@ export const CreateTrustedAppForm = memo<CreateTrustedAppFormProps>(
fullWidth,
isEditMode,
isDirty,
wasByPolicy,
onChange,
trustedApp: _trustedApp,
policies = { options: [] },
@ -246,9 +248,9 @@ export const CreateTrustedAppForm = memo<CreateTrustedAppFormProps>(
return isGlobalEffectScope(trustedApp.effectScope);
}, [trustedApp]);
const hideAssignmentSection = useMemo(() => {
return !isPlatinumPlus && (!isEditMode || (isGlobal && !isDirty));
}, [isEditMode, isGlobal, isDirty, isPlatinumPlus]);
const showAssignmentSection = useMemo(() => {
return isPlatinumPlus || (isEditMode && (!isGlobal || (wasByPolicy && isGlobal && isDirty)));
}, [isEditMode, isGlobal, isDirty, isPlatinumPlus, wasByPolicy]);
const osOptions: Array<EuiSuperSelectOption<OperatingSystem>> = useMemo(
() => OPERATING_SYSTEMS.map((os) => ({ value: os, inputDisplay: OS_TITLES[os] })),
@ -575,7 +577,7 @@ export const CreateTrustedAppForm = memo<CreateTrustedAppFormProps>(
data-test-subj={getTestId('conditionsBuilder')}
/>
</EuiFormRow>
{isTrustedAppsByPolicyEnabled && !hideAssignmentSection ? (
{isTrustedAppsByPolicyEnabled && showAssignmentSection ? (
<>
<EuiHorizontalRule />
<EuiFormRow fullWidth={fullWidth} data-test-subj={getTestId('policySelection')}>