[9.0] [Synthetics] introduce new spaces field for synthetics api keys (…

…elastic#211816) (elastic#212150) # Backport This will backport the following commits from `main` to `9.0`: - [[Synthetics] introduce new spaces field for synthetics api keys (elastic#211816)](elastic#211816)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport)  Co-authored-by: Bailey Cash <bailey.cash@elastic.co>
kibanamachine · Feb 21, 2025 · b8a0cef · b8a0cef
1 parent 7711ae2
commit b8a0cef
Show file tree

Hide file tree

Showing 10 changed files with 153 additions and 88 deletions.
diff --git a/x-pack/solutions/observability/plugins/synthetics/common/runtime_types/settings/api_key.ts b/x-pack/solutions/observability/plugins/synthetics/common/runtime_types/settings/api_key.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import * as t from 'io-ts';
+
+export const APIKeyCodec = t.type({
+  spaces: t.array(t.string),
+});
+
+export type SyntheticsProjectAPIKey = t.TypeOf<typeof APIKeyCodec>;
diff --git a/...lugins/synthetics/public/apps/synthetics/components/settings/components/spaces_select.tsx b/...lugins/synthetics/public/apps/synthetics/components/settings/components/spaces_select.tsx
@@ -9,15 +9,17 @@ import React, { useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { EuiComboBox, EuiFormRow } from '@elastic/eui';
-import { Controller, useFormContext } from 'react-hook-form';
+import { Controller, FieldValues, Path, useFormContext } from 'react-hook-form';
 import { ALL_SPACES_ID } from '@kbn/security-plugin/public';
 
 import { ClientPluginsStart } from '../../../../../plugin';
-import { PrivateLocation } from '../../../../../../common/runtime_types';
 
-export const NAMESPACES_NAME = 'spaces';
+interface SpaceSelectorProps {
+  helpText: string;
+}
 
-export const SpaceSelector: React.FC = () => {
+export const SpaceSelector = <T extends FieldValues>({ helpText }: SpaceSelectorProps) => {
+  const NAMESPACES_NAME = 'spaces' as Path<T>;
   const { services } = useKibana<ClientPluginsStart>();
   const [spacesList, setSpacesList] = React.useState<Array<{ id: string; label: string }>>([]);
   const data = services.spaces?.ui.useSpaces();
@@ -26,7 +28,7 @@ export const SpaceSelector: React.FC = () => {
     control,
     formState: { isSubmitted },
     trigger,
-  } = useFormContext<PrivateLocation>();
+  } = useFormContext<T>();
   const { isTouched, error } = control.getFieldState(NAMESPACES_NAME);
 
   const showFieldInvalid = (isSubmitted || isTouched) && !!error;
@@ -49,7 +51,7 @@ export const SpaceSelector: React.FC = () => {
     <EuiFormRow
       fullWidth
       label={SPACES_LABEL}
-      helpText={HELP_TEXT}
+      helpText={helpText}
       isInvalid={showFieldInvalid}
       error={showFieldInvalid ? NAMESPACES_NAME : undefined}
     >
@@ -121,7 +123,3 @@ const allSpacesOption = {
 const SPACES_LABEL = i18n.translate('xpack.synthetics.privateLocation.spacesLabel', {
   defaultMessage: 'Spaces ',
 });
-
-const HELP_TEXT = i18n.translate('xpack.synthetics.privateLocation.spacesHelpText', {
-  defaultMessage: 'Select the spaces where this location will be available.',
-});
diff --git a/...synthetics/public/apps/synthetics/components/settings/private_locations/location_form.tsx b/...synthetics/public/apps/synthetics/components/settings/private_locations/location_form.tsx
@@ -62,7 +62,7 @@ export const LocationForm = ({ privateLocations }: { privateLocations: PrivateLo
         <EuiSpacer />
         <BrowserMonitorCallout />
         <EuiSpacer />
-        <SpaceSelector />
+        <SpaceSelector helpText={LOCATION_HELP_TEXT} />
       </EuiForm>
     </>
   );
@@ -95,6 +95,13 @@ export const LOCATION_NAME_LABEL = i18n.translate(
   }
 );
 
+const LOCATION_HELP_TEXT = i18n.translate(
+  'xpack.synthetics.privateLocation.locationSpacesHelpText',
+  {
+    defaultMessage: 'Select the spaces where this location will be available.',
+  }
+);
+
 const NAME_ALREADY_EXISTS = i18n.translate('xpack.synthetics.monitorManagement.alreadyExists', {
   defaultMessage: 'Location name already exists.',
 });

diff --git a/...nthetics/public/apps/synthetics/components/settings/project_api_keys/api_key_btn.test.tsx b/...nthetics/public/apps/synthetics/components/settings/project_api_keys/api_key_btn.test.tsx
@@ -12,25 +12,25 @@ import { ApiKeyBtn } from './api_key_btn';
 import { render } from '../../../utils/testing';
 
 describe('<APIKeyButton />', () => {
-  const setLoadAPIKey = jest.fn();
+  const clickCallback = jest.fn();
 
   it('calls delete monitor on monitor deletion', async () => {
-    render(<ApiKeyBtn setLoadAPIKey={setLoadAPIKey} apiKey="" loading={false} />);
+    render(<ApiKeyBtn apiKey="" loading={false} onClick={clickCallback} />);
 
     expect(screen.getByText('Generate Project API key')).toBeInTheDocument();
     await userEvent.click(screen.getByTestId('uptimeMonitorManagementApiKeyGenerate'));
-    expect(setLoadAPIKey).toHaveBeenCalled();
+    expect(clickCallback).toHaveBeenCalled();
   });
 
   it('shows correct content on loading', () => {
-    render(<ApiKeyBtn setLoadAPIKey={setLoadAPIKey} apiKey="" loading={true} />);
+    render(<ApiKeyBtn apiKey="" loading={true} onClick={clickCallback} />);
 
     expect(screen.getByText('Generating API key')).toBeInTheDocument();
   });
 
   it('shows api key when available and hides button', () => {
     const apiKey = 'sampleApiKey';
-    render(<ApiKeyBtn setLoadAPIKey={setLoadAPIKey} apiKey={apiKey} loading={false} />);
+    render(<ApiKeyBtn apiKey={apiKey} loading={false} onClick={clickCallback} />);
 
     expect(screen.queryByText('Generate Project API key')).not.toBeInTheDocument();
   });

diff --git a/...ns/synthetics/public/apps/synthetics/components/settings/project_api_keys/api_key_btn.tsx b/...ns/synthetics/public/apps/synthetics/components/settings/project_api_keys/api_key_btn.tsx
@@ -12,12 +12,12 @@ export const ApiKeyBtn = ({
   isDisabled,
   apiKey,
   loading,
-  setLoadAPIKey,
+  onClick: callback,
 }: {
   loading?: boolean;
   isDisabled?: boolean;
   apiKey?: string;
-  setLoadAPIKey: (val: boolean) => void;
+  onClick: Function;
 }) => {
   return (
     <>
@@ -30,9 +30,7 @@ export const ApiKeyBtn = ({
             fullWidth={true}
             isLoading={loading}
             color="primary"
-            onClick={() => {
-              setLoadAPIKey(true);
-            }}
+            onClick={() => callback()}
             data-test-subj="uptimeMonitorManagementApiKeyGenerate"
           >
             {loading ? GET_API_KEY_LOADING_LABEL : GET_API_KEY_LABEL}

diff --git a/...ics/public/apps/synthetics/components/settings/project_api_keys/project_api_keys.test.tsx b/...ics/public/apps/synthetics/components/settings/project_api_keys/project_api_keys.test.tsx
@@ -45,7 +45,6 @@ describe('<ProjectAPIKeys />', () => {
   });
 
   it('shows appropriate content when user does not have correct uptime save permissions', () => {
-    // const apiKey = 'sampleApiKey';
     render(<ProjectAPIKeys />, {
       state,
       core: makeUptimePermissionsCore({ save: false }),

diff --git a/...nthetics/public/apps/synthetics/components/settings/project_api_keys/project_api_keys.tsx b/...nthetics/public/apps/synthetics/components/settings/project_api_keys/project_api_keys.tsx
@@ -4,28 +4,55 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
-import { EuiText, EuiLink, EuiEmptyPrompt, EuiSwitch, EuiSpacer } from '@elastic/eui';
+import { EuiText, EuiLink, EuiEmptyPrompt, EuiSwitch, EuiSpacer, EuiForm } from '@elastic/eui';
+import { SpacesContextProps } from '@kbn/spaces-plugin/public';
 import { i18n } from '@kbn/i18n';
 import { useFetcher } from '@kbn/observability-shared-plugin/public';
 import { IHttpFetchError, ResponseErrorBody } from '@kbn/core-http-browser';
+import { ALL_SPACES_ID } from '@kbn/security-plugin/public';
+import { FormProvider } from 'react-hook-form';
+import { SyntheticsProjectAPIKey } from '../../../../../../common/runtime_types/settings/api_key';
 import { HelpCommands } from './help_commands';
 import { LoadingState } from '../../monitors_page/overview/overview/monitor_detail_flyout';
 import { fetchProjectAPIKey } from '../../../state/monitor_management/api';
 import { ClientPluginsStart } from '../../../../../plugin';
-import { ApiKeyBtn } from './api_key_btn';
 import { useEnablement } from '../../../hooks';
+import { SpaceSelector } from '../components/spaces_select';
+import { useFormWrapped } from '../../../../../hooks/use_form_wrapped';
+import { ApiKeyBtn } from './api_key_btn';
 
 const syntheticsTestRunDocsLink =
   'https://www.elastic.co/guide/en/observability/current/synthetic-run-tests.html';
+const getEmptyFunctionComponent: React.FC<SpacesContextProps> = ({ children }) => <>{children}</>;
 
 export const ProjectAPIKeys = () => {
   const { loading: enablementLoading, canManageApiKeys } = useEnablement();
   const [apiKey, setApiKey] = useState<string | undefined>(undefined);
   const [loadAPIKey, setLoadAPIKey] = useState(false);
   const [accessToElasticManagedLocations, setAccessToElasticManagedLocations] = useState(true);
 
+  const form = useFormWrapped({
+    mode: 'onSubmit',
+    reValidateMode: 'onChange',
+    shouldFocusError: true,
+    defaultValues: {
+      spaces: [ALL_SPACES_ID],
+    },
+  });
+
+  const { handleSubmit } = form;
+
+  const { spaces: spacesApi } = useKibana<ClientPluginsStart>().services;
+  const spaces = useMemo(() => form.getValues()?.spaces, [form]);
+
+  const ContextWrapper = useMemo(
+    () =>
+      spacesApi ? spacesApi.ui.components.getSpacesContextProvider : getEmptyFunctionComponent,
+    [spacesApi]
+  );
+
   const kServices = useKibana<ClientPluginsStart>().services;
   const canSaveIntegrations: boolean =
     !!kServices?.fleet?.authz.integrations.writeIntegrationPolicies;
@@ -35,13 +62,22 @@ export const ProjectAPIKeys = () => {
 
   const { data, loading, error } = useFetcher(async () => {
     if (loadAPIKey) {
-      return fetchProjectAPIKey(accessToElasticManagedLocations && Boolean(canUsePublicLocations));
+      return fetchProjectAPIKey(
+        accessToElasticManagedLocations && Boolean(canUsePublicLocations),
+        spaces
+      );
     }
     return null;
     // FIXME: Dario thinks there is a better way to do this but
     // he's getting tired and maybe the Synthetics folks can fix it
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [loadAPIKey, canUsePublicLocations]);
+  }, [loadAPIKey, canUsePublicLocations, spaces]);
+
+  const onSubmit = (formData: SyntheticsProjectAPIKey) => {
+    if (formData.spaces?.length) {
+      setLoadAPIKey(true);
+    }
+  };
 
   useEffect(() => {
     if (data?.apiKey) {
@@ -69,64 +105,67 @@ export const ProjectAPIKeys = () => {
   }
 
   return (
-    <>
-      <EuiEmptyPrompt
-        style={{ maxWidth: '50%' }}
-        title={<h2>{GET_API_KEY_GENERATE}</h2>}
-        body={
-          canSave && canManageApiKeys ? (
-            <>
-              <EuiText>
-                {GET_API_KEY_LABEL_DESCRIPTION}{' '}
-                {!canSaveIntegrations ? `${API_KEY_DISCLAIMER} ` : ''}
-                <EuiLink
-                  data-test-subj="syntheticsProjectAPIKeysLink"
-                  href={syntheticsTestRunDocsLink}
-                  external
-                  target="_blank"
-                >
-                  {LEARN_MORE_LABEL}
-                </EuiLink>
-              </EuiText>
-              <EuiSpacer />
-              <EuiSwitch
-                label={i18n.translate('xpack.synthetics.features.elasticManagedLocations', {
-                  defaultMessage: 'Elastic managed locations enabled',
-                })}
-                checked={accessToElasticManagedLocations && Boolean(canUsePublicLocations)}
-                onChange={() => {
-                  setAccessToElasticManagedLocations(!accessToElasticManagedLocations);
-                }}
-                disabled={!canUsePublicLocations}
-              />
-            </>
-          ) : (
-            <>
-              <EuiText>
-                {GET_API_KEY_REDUCED_PERMISSIONS_LABEL}{' '}
-                <EuiLink
-                  data-test-subj="syntheticsProjectAPIKeysLink"
-                  href={syntheticsTestRunDocsLink}
-                  external
-                  target="_blank"
-                >
-                  {LEARN_MORE_LABEL}
-                </EuiLink>
-              </EuiText>
-            </>
-          )
-        }
-        actions={
-          <ApiKeyBtn
-            loading={loading}
-            setLoadAPIKey={setLoadAPIKey}
-            apiKey={apiKey}
-            isDisabled={!canSave || !canManageApiKeys}
-          />
-        }
-      />
-      {apiKey && <HelpCommands apiKey={apiKey} />}
-    </>
+    <ContextWrapper>
+      <FormProvider {...form}>
+        <EuiEmptyPrompt
+          style={{ maxWidth: '50%' }}
+          title={<h2>{GET_API_KEY_GENERATE}</h2>}
+          body={
+            canSave && canManageApiKeys ? (
+              <EuiForm component="form" noValidate>
+                <EuiText>
+                  {GET_API_KEY_LABEL_DESCRIPTION}{' '}
+                  {!canSaveIntegrations ? `${API_KEY_DISCLAIMER} ` : ''}
+                  <EuiLink
+                    data-test-subj="syntheticsProjectAPIKeysLink"
+                    href={syntheticsTestRunDocsLink}
+                    external
+                    target="_blank"
+                  >
+                    {LEARN_MORE_LABEL}
+                  </EuiLink>
+                </EuiText>
+                <EuiSpacer />
+                <EuiSwitch
+                  label={i18n.translate('xpack.synthetics.features.elasticManagedLocations', {
+                    defaultMessage: 'Elastic managed locations enabled',
+                  })}
+                  checked={accessToElasticManagedLocations && Boolean(canUsePublicLocations)}
+                  onChange={() => {
+                    setAccessToElasticManagedLocations(!accessToElasticManagedLocations);
+                  }}
+                  disabled={!canUsePublicLocations}
+                />
+                <SpaceSelector helpText={API_KEY_HELP_TEXT} />
+              </EuiForm>
+            ) : (
+              <>
+                <EuiText>
+                  {GET_API_KEY_REDUCED_PERMISSIONS_LABEL}{' '}
+                  <EuiLink
+                    data-test-subj="syntheticsProjectAPIKeysLink"
+                    href={syntheticsTestRunDocsLink}
+                    external
+                    target="_blank"
+                  >
+                    {LEARN_MORE_LABEL}
+                  </EuiLink>
+                </EuiText>
+              </>
+            )
+          }
+          actions={
+            <ApiKeyBtn
+              loading={loading}
+              onClick={handleSubmit(onSubmit)}
+              apiKey={apiKey}
+              isDisabled={!canSave || !canManageApiKeys}
+            />
+          }
+        />
+        {apiKey && <HelpCommands apiKey={apiKey} />}
+      </FormProvider>
+    </ContextWrapper>
   );
 };
 
@@ -163,3 +202,7 @@ const GET_API_KEY_REDUCED_PERMISSIONS_LABEL = i18n.translate(
       'Use an API key to push monitors remotely from a CLI or CD pipeline. To generate an API key, you must have permissions to manage API keys and Uptime write access. Please contact your administrator.',
   }
 );
+
+const API_KEY_HELP_TEXT = i18n.translate('xpack.synthetics.privateLocation.apiKeySpacesHelpText', {
+  defaultMessage: 'Select the spaces where this API key will be available.',
+});
diff --git a/...s/observability/plugins/synthetics/public/apps/synthetics/state/monitor_management/api.ts b/...s/observability/plugins/synthetics/public/apps/synthetics/state/monitor_management/api.ts
@@ -63,10 +63,12 @@ export const updateMonitorAPI = async ({
 };
 
 export const fetchProjectAPIKey = async (
-  accessToElasticManagedLocations: boolean
+  accessToElasticManagedLocations: boolean,
+  spaces: string[]
 ): Promise<ProjectAPIKeyResponse> => {
   return await apiService.get(SYNTHETICS_API_URLS.SYNTHETICS_PROJECT_APIKEY, {
     accessToElasticManagedLocations,
+    spaces: JSON.stringify(spaces),
   });
 };