Skip to content
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

fix: [Search:WorkplaceSearch:API keys page]API key page modal dialog, flyout missing title from announcement #202716

Merged
merged 5 commits into from
Dec 11, 2024
Merged

fix: [Search:WorkplaceSearch:API keys page]API key page modal dialog, flyout missing title from announcement #202716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5376b57
fix: [Search:WorkplaceSearch:API keys page]API key page modal dialog,…
alexwizp Dec 3, 2024
39751bc
Merge branch 'main' into #201570
alexwizp Dec 5, 2024
54aee2c
Merge branch 'main' into #201570
alexwizp Dec 6, 2024
8577608
Merge branch 'main' into #201570
alexwizp Dec 9, 2024
dfff7d8
Merge branch 'main' into #201570
alexwizp Dec 11, 2024
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
6 changes: 5 additions & 1 deletion ...cations/analytics/components/add_analytics_collections/add_analytics_collection_modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,17 @@ export const AddAnalyticsCollectionModal: React.FC<AddAnalyticsCollectionModalPr
</EuiModalBody>

<EuiModalFooter>
<EuiButtonEmpty onClick={onClose}>
<EuiButtonEmpty
data-test-subj="enterpriseSearchAddAnalyticsCollectionModalCancelButton"
onClick={onClose}
>
{i18n.translate('xpack.enterpriseSearch.analytics.collectionsCreate.form.cancelButton', {
defaultMessage: 'Cancel',
})}
</EuiButtonEmpty>

<EuiButton
data-test-subj="enterpriseSearchAddAnalyticsCollectionModalCreateButton"
fill
type="submit"
form={modalFormId}
Expand Down
19 changes: 16 additions & 3 deletions ..._search/public/applications/workplace_search/views/api_keys/components/api_key_flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
EuiButton,
EuiForm,
EuiTitle,
useGeneratedHtmlId,
} from '@elastic/eui';

import { CLOSE_BUTTON_LABEL, SAVE_BUTTON_LABEL } from '../../../../shared/constants';
Expand All @@ -44,12 +45,20 @@ export const ApiKeyFlyout: React.FC = () => {
activeApiTokenRawName: rawName,
} = useValues(ApiKeysLogic);

const flyoutTitleId = useGeneratedHtmlId();

return (
<EuiPortal>
<EuiFlyout onClose={hideApiKeyForm} hideCloseButton ownFocus size="s">
<EuiFlyout
onClose={hideApiKeyForm}
hideCloseButton
ownFocus
size="s"
aria-labelledby={flyoutTitleId}
>
<EuiFlyoutHeader hasBorder>
<EuiTitle size="m">
<h2>{API_KEY_FLYOUT_TITLE}</h2>
<h2 id={flyoutTitleId}>{API_KEY_FLYOUT_TITLE}</h2>
</EuiTitle>
</EuiFlyoutHeader>
<EuiFlyoutBody>
Expand Down Expand Up @@ -86,7 +95,11 @@ export const ApiKeyFlyout: React.FC = () => {
<EuiFlyoutFooter>
<EuiFlexGroup justifyContent="spaceBetween">
<EuiFlexItem grow={false}>
<EuiButtonEmpty iconType="cross" onClick={hideApiKeyForm}>
<EuiButtonEmpty
data-test-subj="enterpriseSearchApiKeyFlyoutButton"
iconType="cross"
onClick={hideApiKeyForm}
>
{CLOSE_BUTTON_LABEL}
</EuiButtonEmpty>
</EuiFlexItem>
Expand Down
11 changes: 10 additions & 1 deletion ...e_search/public/applications/workplace_search/views/api_keys/components/api_keys_list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ import React from 'react';

import { useActions, useValues } from 'kea';

import { EuiBasicTable, EuiBasicTableColumn, EuiCopy, EuiConfirmModal } from '@elastic/eui';
import {
EuiBasicTable,
EuiBasicTableColumn,
EuiCopy,
EuiConfirmModal,
useGeneratedHtmlId,
} from '@elastic/eui';

import { DELETE_BUTTON_LABEL, CANCEL_BUTTON_LABEL } from '../../../../shared/constants';
import { HiddenText } from '../../../../shared/hidden_text';
Expand All @@ -32,16 +38,19 @@ export const ApiKeysList: React.FC = () => {
const { deleteApiKey, onPaginate, stageTokenNameForDeletion, hideDeleteModal } =
useActions(ApiKeysLogic);
const { apiTokens, meta, dataLoading, deleteModalVisible } = useValues(ApiKeysLogic);
const modalTitleId = useGeneratedHtmlId();

const deleteModal = (
<EuiConfirmModal
title={API_KEYS_CONFIRM_DELETE_TITLE}
titleProps={{ id: modalTitleId }}
onCancel={hideDeleteModal}
onConfirm={deleteApiKey}
cancelButtonText={CANCEL_BUTTON_LABEL}
confirmButtonText={DELETE_BUTTON_LABEL}
buttonColor="danger"
defaultFocusedButton="confirm"
aria-labelledby={modalTitleId}
>
<p>{API_KEYS_CONFIRM_DELETE_LABEL}</p>
</EuiConfirmModal>
Expand Down
Loading