diff --git a/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/__snapshots__/confirm_delete_modal.test.tsx.snap b/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/__snapshots__/confirm_delete_modal.test.tsx.snap
deleted file mode 100644
index 5bf93a1021c05..0000000000000
--- a/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/__snapshots__/confirm_delete_modal.test.tsx.snap
+++ /dev/null
@@ -1,93 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ConfirmDeleteModal renders as expected 1`] = `
-
-
-
-
-
-
-
-
-
-
-
- ,
- }
- }
- />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
diff --git a/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.scss b/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.scss
deleted file mode 100644
index 887495a231485..0000000000000
--- a/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.spcConfirmDeleteModal {
- max-width: $euiFormMaxWidth + ($euiSizeL * 2);
-}
diff --git a/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.test.tsx b/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.test.tsx
index 36d282a1cd653..59c7dde71aedb 100644
--- a/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.test.tsx
+++ b/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.test.tsx
@@ -6,10 +6,10 @@
*/
import React from 'react';
+import { act } from 'react-dom/test-utils';
import { mountWithIntl, shallowWithIntl } from '@kbn/test/jest';
-import type { SpacesManager } from '../../../spaces_manager';
import { spacesManagerMock } from '../../../spaces_manager/mocks';
import { ConfirmDeleteModal } from './confirm_delete_modal';
@@ -22,25 +22,53 @@ describe('ConfirmDeleteModal', () => {
};
const spacesManager = spacesManagerMock.create();
- spacesManager.getActiveSpace.mockResolvedValue(space);
-
const onCancel = jest.fn();
- const onConfirm = jest.fn();
expect(
shallowWithIntl(
-
+
)
- ).toMatchSnapshot();
+ ).toMatchInlineSnapshot(`
+
+
+
+
+
+ ,
+ }
+ }
+ />
+
+
+
+
+
+
+ `);
});
- it(`requires the space name to be typed before confirming`, () => {
+ it('deletes the space when confirmed', async () => {
const space = {
id: 'my-space',
name: 'My Space',
@@ -48,34 +76,23 @@ describe('ConfirmDeleteModal', () => {
};
const spacesManager = spacesManagerMock.create();
- spacesManager.getActiveSpace.mockResolvedValue(space);
-
const onCancel = jest.fn();
- const onConfirm = jest.fn();
+ const onSuccess = jest.fn();
const wrapper = mountWithIntl(
-
);
- const input = wrapper.find('input');
- expect(input).toHaveLength(1);
-
- input.simulate('change', { target: { value: 'My Invalid Space Name ' } });
-
- const confirmButton = wrapper.find('button[data-test-subj="confirmModalConfirmButton"]');
- confirmButton.simulate('click');
-
- expect(onConfirm).not.toHaveBeenCalled();
-
- input.simulate('change', { target: { value: 'My Space' } });
- confirmButton.simulate('click');
+ await act(async () => {
+ wrapper.find('EuiButton[data-test-subj="confirmModalConfirmButton"]').simulate('click');
+ await spacesManager.deleteSpace.mock.results[0];
+ });
- expect(onConfirm).toHaveBeenCalledTimes(1);
+ expect(spacesManager.deleteSpace).toHaveBeenLastCalledWith(space);
});
});
diff --git a/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx b/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
index 100b5b6493e30..f3ed578a94962 100644
--- a/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
+++ b/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
@@ -5,224 +5,127 @@
* 2.0.
*/
-import './confirm_delete_modal.scss';
-
-import type { CommonProps, EuiModalProps } from '@elastic/eui';
-import {
- EuiButton,
- EuiButtonEmpty,
- EuiCallOut,
- EuiFieldText,
- EuiFormRow,
- EuiModal,
- EuiModalBody,
- EuiModalFooter,
- EuiModalHeader,
- EuiModalHeaderTitle,
- EuiSpacer,
- EuiText,
-} from '@elastic/eui';
-import type { ChangeEvent } from 'react';
-import React, { Component } from 'react';
-
-import type { InjectedIntl } from '@kbn/i18n/react';
-import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
+import { EuiCallOut, EuiConfirmModal, EuiSpacer, EuiText } from '@elastic/eui';
+import type { FunctionComponent } from 'react';
+import React from 'react';
+import useAsync from 'react-use/lib/useAsync';
+import useAsyncFn from 'react-use/lib/useAsyncFn';
+
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
import type { Space } from 'src/plugins/spaces_oss/common';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
import type { SpacesManager } from '../../../spaces_manager';
interface Props {
space: Space;
spacesManager: SpacesManager;
- onCancel: () => void;
- onConfirm: () => void;
- intl: InjectedIntl;
-}
-
-interface State {
- confirmSpaceName: string;
- error: boolean | null;
- deleteInProgress: boolean;
- isDeletingCurrentSpace: boolean;
+ onCancel(): void;
+ onSuccess?(): void;
}
-class ConfirmDeleteModalUI extends Component {
- public state = {
- confirmSpaceName: '',
- error: null,
- deleteInProgress: false,
- isDeletingCurrentSpace: false,
- };
-
- public componentDidMount() {
- isCurrentSpace(this.props.space, this.props.spacesManager).then((result) => {
- this.setState({
- isDeletingCurrentSpace: result,
- });
- });
- }
-
- public render() {
- const { space, onCancel, intl } = this.props;
- const { isDeletingCurrentSpace } = this.state;
-
- let warning = null;
- if (isDeletingCurrentSpace) {
- const name = (
-
- ({space.name})
-
- );
- warning = (
- <>
-
-
-
-
-
-
- >
+export const ConfirmDeleteModal: FunctionComponent = ({
+ space,
+ onSuccess,
+ onCancel,
+ spacesManager,
+}) => {
+ const { services } = useKibana();
+
+ const { value: isCurrentSpace } = useAsync(
+ async () => space.id === (await spacesManager.getActiveSpace()).id,
+ [space.id]
+ );
+
+ const [state, deleteSpace] = useAsyncFn(async () => {
+ try {
+ await spacesManager.deleteSpace(space);
+ services.notifications!.toasts.addSuccess(
+ i18n.translate('xpack.spaces.management.confirmDeleteModal.successMessage', {
+ defaultMessage: "Deleted space '{name}'",
+ values: { name: space.name },
+ })
);
- }
-
- // This is largely the same as the built-in EuiConfirmModal component, but we needed the ability
- // to disable the buttons since this could be a long-running operation
-
- const modalProps: Omit & CommonProps = {
- onClose: onCancel,
- className: 'spcConfirmDeleteModal',
- initialFocus: 'input[name="confirmDeleteSpaceInput"]',
- };
-
- return (
-
-
-
-
-
-
-
-
-
-
-
-
- ),
- }}
- />
-
-
-
-
-
-
- {warning}
-
-
-
-
-
-
-
-
-
-
-
-
- );
- }
-
- private onSpaceNameChange = (e: ChangeEvent) => {
- if (typeof this.state.error === 'boolean') {
- this.setState({
- confirmSpaceName: e.target.value,
- error: e.target.value !== this.props.space.name,
- });
- } else {
- this.setState({
- confirmSpaceName: e.target.value,
- });
- }
- };
-
- private onConfirm = async () => {
- if (this.state.confirmSpaceName === this.props.space.name) {
- const needsRedirect = this.state.isDeletingCurrentSpace;
- const spacesManager = this.props.spacesManager;
-
- this.setState({
- deleteInProgress: true,
- });
-
- await this.props.onConfirm();
-
- this.setState({
- deleteInProgress: false,
- });
-
- if (needsRedirect) {
+ if (isCurrentSpace) {
spacesManager.redirectToSpaceSelector();
+ } else {
+ onSuccess?.();
}
- } else {
- this.setState({
- error: true,
+ } catch (error) {
+ services.notifications!.toasts.addDanger({
+ title: i18n.translate('xpack.spaces.management.confirmDeleteModal.errorMessage', {
+ defaultMessage: "Could not delete space '{name}'",
+ values: { name: space.name },
+ }),
+ text: (error as any).body?.message || error.message,
});
}
- };
-}
-
-async function isCurrentSpace(space: Space, spacesManager: SpacesManager) {
- return space.id === (await spacesManager.getActiveSpace()).id;
-}
-
-export const ConfirmDeleteModal = injectI18n(ConfirmDeleteModalUI);
+ }, [isCurrentSpace]);
+
+ return (
+
+ {isCurrentSpace && (
+ <>
+
+
+
+
+ >
+ )}
+
+
+
+
+
+ ),
+ }}
+ />
+
+
+
+
+
+
+ );
+};
diff --git a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
index d03b878cb19ab..92b68426d172e 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
@@ -95,44 +95,13 @@ export class DeleteSpacesButton extends Component {
showConfirmDeleteModal: false,
});
}}
- onConfirm={this.deleteSpaces}
+ onSuccess={() => {
+ this.setState({
+ showConfirmDeleteModal: false,
+ });
+ this.props.onDelete?.();
+ }}
/>
);
};
-
- public deleteSpaces = async () => {
- const { spacesManager, space } = this.props;
-
- this.setState({
- showConfirmDeleteModal: false,
- });
-
- try {
- await spacesManager.deleteSpace(space);
- } catch (error) {
- const { message: errorMessage = '' } = error.data || error.body || {};
-
- this.props.notifications.toasts.addDanger(
- i18n.translate('xpack.spaces.management.deleteSpacesButton.deleteSpaceErrorTitle', {
- defaultMessage: 'Error deleting space: {errorMessage}',
- values: { errorMessage },
- })
- );
- return;
- }
-
- const message = i18n.translate(
- 'xpack.spaces.management.deleteSpacesButton.spaceSuccessfullyDeletedNotificationMessage',
- {
- defaultMessage: 'Deleted {spaceName} space.',
- values: { spaceName: space.name },
- }
- );
-
- this.props.notifications.toasts.addSuccess(message);
-
- if (this.props.onDelete) {
- this.props.onDelete();
- }
- };
}
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap b/x-pack/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_page.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
rename to x-pack/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_page.test.tsx.snap
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_pages.test.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx
similarity index 100%
rename from x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_pages.test.tsx
rename to x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
index ac57a566e2a00..a4f797e441ab5 100644
--- a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
@@ -180,53 +180,16 @@ export class SpacesGridPage extends Component {
showConfirmDeleteModal: false,
});
}}
- onConfirm={this.deleteSpace}
+ onSuccess={() => {
+ this.setState({
+ showConfirmDeleteModal: false,
+ });
+ this.loadGrid();
+ }}
/>
);
};
- public deleteSpace = async () => {
- const { spacesManager } = this.props;
-
- const space = this.state.selectedSpace;
-
- if (!space) {
- return;
- }
-
- this.setState({
- showConfirmDeleteModal: false,
- });
-
- try {
- await spacesManager.deleteSpace(space);
- } catch (error) {
- const { message: errorMessage = '' } = error.data || error.body || {};
-
- this.props.notifications.toasts.addDanger(
- i18n.translate('xpack.spaces.management.spacesGridPage.errorDeletingSpaceErrorMessage', {
- defaultMessage: 'Error deleting space: {errorMessage}',
- values: {
- errorMessage,
- },
- })
- );
- return;
- }
-
- this.loadGrid();
-
- const message = i18n.translate(
- 'xpack.spaces.management.spacesGridPage.spaceSuccessfullyDeletedNotificationMessage',
- {
- defaultMessage: 'Deleted "{spaceName}" space.',
- values: { spaceName: space.name },
- }
- );
-
- this.props.notifications.toasts.addSuccess(message);
- };
-
public loadGrid = async () => {
const { spacesManager, getFeatures, notifications } = this.props;
diff --git a/x-pack/plugins/spaces/public/management/spaces_management_app.tsx b/x-pack/plugins/spaces/public/management/spaces_management_app.tsx
index 65eb140184220..a47ab8ee319e5 100644
--- a/x-pack/plugins/spaces/public/management/spaces_management_app.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_management_app.tsx
@@ -14,7 +14,10 @@ import type { StartServicesAccessor } from 'src/core/public';
import type { RegisterManagementAppArgs } from 'src/plugins/management/public';
import type { Space } from 'src/plugins/spaces_oss/common';
-import { RedirectAppLinks } from '../../../../../src/plugins/kibana_react/public';
+import {
+ KibanaContextProvider,
+ RedirectAppLinks,
+} from '../../../../../src/plugins/kibana_react/public';
import type { PluginsStart } from '../plugin';
import type { SpacesManager } from '../spaces_manager';
@@ -34,13 +37,16 @@ export const spacesManagementApp = Object.freeze({
}),
async mount({ element, setBreadcrumbs, history }) {
- const [startServices, { SpacesGridPage }, { ManageSpacePage }] = await Promise.all([
+ const [
+ [coreStart, { features }],
+ { SpacesGridPage },
+ { ManageSpacePage },
+ ] = await Promise.all([
getStartServices(),
import('./spaces_grid'),
import('./edit_space'),
]);
- const [{ notifications, i18n: i18nStart, application }, { features }] = startServices;
const spacesBreadcrumbs = [
{
text: i18n.translate('xpack.spaces.management.breadcrumb', {
@@ -49,6 +55,7 @@ export const spacesManagementApp = Object.freeze({
href: `/`,
},
];
+ const { notifications, i18n: i18nStart, application } = coreStart;
const SpacesGridPageWithBreadcrumbs = () => {
setBreadcrumbs(spacesBreadcrumbs);
@@ -114,23 +121,25 @@ export const spacesManagementApp = Object.freeze({
};
render(
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ,
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ,
element
);
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 13a0f25e7d721..10a68189d3a80 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -22665,13 +22665,6 @@
"xpack.spaces.management.confirmAlterActiveSpaceModal.reloadWarningMessage": "このスペースで表示される機能を更新しました。保存後にページが更新されます。",
"xpack.spaces.management.confirmAlterActiveSpaceModal.title": "スペースの更新の確認",
"xpack.spaces.management.confirmAlterActiveSpaceModal.updateSpaceButton": "スペースを更新",
- "xpack.spaces.management.confirmDeleteModal.allContentsText": "すべてのコンテンツ",
- "xpack.spaces.management.confirmDeleteModal.cancelButtonLabel": "キャンセル",
- "xpack.spaces.management.confirmDeleteModal.confirmDeleteSpaceButtonLabel": "スペース {spaceName} を削除",
- "xpack.spaces.management.confirmDeleteModal.confirmSpaceNameFormRowLabel": "削除するスペース名の確定",
- "xpack.spaces.management.confirmDeleteModal.deleteSpaceAndAllContentsButtonLabel": " スペースとすべてのコンテンツを削除",
- "xpack.spaces.management.confirmDeleteModal.redirectAfterDeletingCurrentSpaceWarningMessage": "現在のスペース {name} を削除しようとしています。続行すると、別のスペースを選択する画面に移動します。",
- "xpack.spaces.management.confirmDeleteModal.spaceNamesDoNoMatchErrorMessage": "スペース名が一致していません。",
"xpack.spaces.management.copyToSpace.actionDescription": "1つ以上のスペースでこの保存されたオブジェクトのコピーを作成します",
"xpack.spaces.management.copyToSpace.actionTitle": "スペースにコピー",
"xpack.spaces.management.copyToSpace.cancelButton": "キャンセル",
@@ -22736,8 +22729,6 @@
"xpack.spaces.management.customizeSpaceAvatar.selectImageUrl": "画像ファイルを選択",
"xpack.spaces.management.deleteSpacesButton.deleteSpaceAriaLabel": "スペースを削除",
"xpack.spaces.management.deleteSpacesButton.deleteSpaceButtonLabel": "スペースを削除",
- "xpack.spaces.management.deleteSpacesButton.deleteSpaceErrorTitle": "スペースの削除中にエラーが発生:{errorMessage}",
- "xpack.spaces.management.deleteSpacesButton.spaceSuccessfullyDeletedNotificationMessage": "{spaceName} スペースが削除されました。",
"xpack.spaces.management.deselectAllFeaturesLink": "すべて選択解除",
"xpack.spaces.management.enabledFeatures.featureCategoryButtonLabel": "カテゴリ切り替え",
"xpack.spaces.management.enabledSpaceFeatures.allFeaturesEnabledMessage": " (表示されているすべての機能) ",
@@ -22753,7 +22744,6 @@
"xpack.spaces.management.manageSpacePage.avatarFormRowLabel": "アバター",
"xpack.spaces.management.manageSpacePage.awesomeSpacePlaceholder": "素晴らしいスペース",
"xpack.spaces.management.manageSpacePage.cancelSpaceButton": "キャンセル",
- "xpack.spaces.management.manageSpacePage.clickToCustomizeTooltip": "クリックしてこのスペースのアバターをカスタマイズします",
"xpack.spaces.management.manageSpacePage.createSpaceButton": "スペースを作成",
"xpack.spaces.management.manageSpacePage.createSpaceTitle": "スペースの作成",
"xpack.spaces.management.manageSpacePage.customizeSpacePanelDescription": "スペースに名前を付けてアバターをカスタマイズします。",
@@ -22788,7 +22778,6 @@
"xpack.spaces.management.spacesGridPage.deleteActionName": "{spaceName} を削除。",
"xpack.spaces.management.spacesGridPage.descriptionColumnName": "説明",
"xpack.spaces.management.spacesGridPage.editSpaceActionName": "{spaceName} を編集。",
- "xpack.spaces.management.spacesGridPage.errorDeletingSpaceErrorMessage": "スペースの削除中にエラーが発生:{errorMessage}",
"xpack.spaces.management.spacesGridPage.errorTitle": "スペースの読み込みエラー",
"xpack.spaces.management.spacesGridPage.featuresColumnName": "機能",
"xpack.spaces.management.spacesGridPage.identifierColumnName": "識別子",
@@ -22798,7 +22787,6 @@
"xpack.spaces.management.spacesGridPage.someFeaturesEnabled": "{totalFeatureCount} 件中 {enabledFeatureCount} 件の機能を表示中",
"xpack.spaces.management.spacesGridPage.spaceColumnName": "スペース",
"xpack.spaces.management.spacesGridPage.spacesTitle": "スペース",
- "xpack.spaces.management.spacesGridPage.spaceSuccessfullyDeletedNotificationMessage": "「{spaceName}」スペースが削除されました。",
"xpack.spaces.management.spacesGridPage.tableCaption": "Kibana スペース",
"xpack.spaces.management.toggleAllFeaturesLink": " (すべて変更) ",
"xpack.spaces.management.unauthorizedPrompt.permissionDeniedDescription": "スペースを管理するアクセス権がありません。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index c5e13f69465a7..64ff1561d8304 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -23024,14 +23024,6 @@
"xpack.spaces.management.confirmAlterActiveSpaceModal.reloadWarningMessage": "您已更新此工作区中的可见功能。保存后,您的页面将重新加载。",
"xpack.spaces.management.confirmAlterActiveSpaceModal.title": "确认更新工作区",
"xpack.spaces.management.confirmAlterActiveSpaceModal.updateSpaceButton": "更新工作区",
- "xpack.spaces.management.confirmDeleteModal.allContentsText": "所有内容",
- "xpack.spaces.management.confirmDeleteModal.cancelButtonLabel": "取消",
- "xpack.spaces.management.confirmDeleteModal.confirmDeleteSpaceButtonLabel": "删除空间 {spaceName}",
- "xpack.spaces.management.confirmDeleteModal.confirmSpaceNameFormRowLabel": "确认要删除的工作区名称",
- "xpack.spaces.management.confirmDeleteModal.deleteSpaceAndAllContentsButtonLabel": " 删除空间及其所有内容",
- "xpack.spaces.management.confirmDeleteModal.deletingSpaceWarningMessage": "删除空间会永久删除空间及{allContents}。此操作无法撤消。",
- "xpack.spaces.management.confirmDeleteModal.redirectAfterDeletingCurrentSpaceWarningMessage": "您即将删除当前空间 {name}。如果继续,您将会被重定向以选择其他空间的位置。",
- "xpack.spaces.management.confirmDeleteModal.spaceNamesDoNoMatchErrorMessage": "空间名称不匹配。",
"xpack.spaces.management.copyToSpace.actionDescription": "在一个或多个工作区中创建此已保存对象的副本",
"xpack.spaces.management.copyToSpace.actionTitle": "复制到工作区",
"xpack.spaces.management.copyToSpace.cancelButton": "取消",
@@ -23097,8 +23089,6 @@
"xpack.spaces.management.customizeSpaceAvatar.selectImageUrl": "选择图像文件",
"xpack.spaces.management.deleteSpacesButton.deleteSpaceAriaLabel": "删除此空间",
"xpack.spaces.management.deleteSpacesButton.deleteSpaceButtonLabel": "删除空间",
- "xpack.spaces.management.deleteSpacesButton.deleteSpaceErrorTitle": "删除空间时出错:{errorMessage}",
- "xpack.spaces.management.deleteSpacesButton.spaceSuccessfullyDeletedNotificationMessage": "已删除 {spaceName} 空间。",
"xpack.spaces.management.deselectAllFeaturesLink": "取消全选",
"xpack.spaces.management.enabledFeatures.featureCategoryButtonLabel": "类别切换",
"xpack.spaces.management.enabledSpaceFeatures.allFeaturesEnabledMessage": " (所有可见功能) ",
@@ -23114,7 +23104,6 @@
"xpack.spaces.management.manageSpacePage.avatarFormRowLabel": "头像",
"xpack.spaces.management.manageSpacePage.awesomeSpacePlaceholder": "超卓的空间",
"xpack.spaces.management.manageSpacePage.cancelSpaceButton": "取消",
- "xpack.spaces.management.manageSpacePage.clickToCustomizeTooltip": "单击可定制此工作区头像",
"xpack.spaces.management.manageSpacePage.createSpaceButton": "创建工作区",
"xpack.spaces.management.manageSpacePage.createSpaceTitle": "创建一个空间",
"xpack.spaces.management.manageSpacePage.customizeSpacePanelDescription": "命名您的工作区并定制其头像。",
@@ -23149,7 +23138,6 @@
"xpack.spaces.management.spacesGridPage.deleteActionName": "删除 {spaceName}。",
"xpack.spaces.management.spacesGridPage.descriptionColumnName": "描述",
"xpack.spaces.management.spacesGridPage.editSpaceActionName": "编辑 {spaceName}。",
- "xpack.spaces.management.spacesGridPage.errorDeletingSpaceErrorMessage": "删除空间时出错:{errorMessage}",
"xpack.spaces.management.spacesGridPage.errorTitle": "加载工作区时出错",
"xpack.spaces.management.spacesGridPage.featuresColumnName": "功能",
"xpack.spaces.management.spacesGridPage.identifierColumnName": "标识符",
@@ -23159,7 +23147,6 @@
"xpack.spaces.management.spacesGridPage.someFeaturesEnabled": "{enabledFeatureCount} / {totalFeatureCount} 个功能可见",
"xpack.spaces.management.spacesGridPage.spaceColumnName": "工作区",
"xpack.spaces.management.spacesGridPage.spacesTitle": "工作区",
- "xpack.spaces.management.spacesGridPage.spaceSuccessfullyDeletedNotificationMessage": "已删除“{spaceName}”工作区。",
"xpack.spaces.management.spacesGridPage.tableCaption": "Kibana 工作区",
"xpack.spaces.management.toggleAllFeaturesLink": " (全部更改) ",
"xpack.spaces.management.unauthorizedPrompt.permissionDeniedDescription": "您无权管理工作区。",
diff --git a/x-pack/test/accessibility/apps/spaces.ts b/x-pack/test/accessibility/apps/spaces.ts
index a08ae474497e5..6242896c263ba 100644
--- a/x-pack/test/accessibility/apps/spaces.ts
+++ b/x-pack/test/accessibility/apps/spaces.ts
@@ -111,14 +111,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await PageObjects.spaceSelector.clickManageSpaces();
await PageObjects.spaceSelector.clickOnDeleteSpaceButton('space_b');
await a11y.testAppSnapshot();
- // a11y test for no space name in confirm dialogue box
- await PageObjects.spaceSelector.confirmDeletingSpace();
- await a11y.testAppSnapshot();
});
// test starts with deleting space b so we can get the space selection page instead of logging out in the test
it('a11y test for space selection page', async () => {
- await PageObjects.spaceSelector.setSpaceNameTobeDeleted('space_b');
await PageObjects.spaceSelector.confirmDeletingSpace();
await a11y.testAppSnapshot();
await PageObjects.spaceSelector.clickSpaceCard('default');
diff --git a/x-pack/test/functional/page_objects/space_selector_page.ts b/x-pack/test/functional/page_objects/space_selector_page.ts
index 57ca0c97c63da..0a41e4b90287f 100644
--- a/x-pack/test/functional/page_objects/space_selector_page.ts
+++ b/x-pack/test/functional/page_objects/space_selector_page.ts
@@ -167,10 +167,6 @@ export function SpaceSelectorPageProvider({ getService, getPageObjects }: FtrPro
await testSubjects.click(`${spaceName}-deleteSpace`);
}
- async setSpaceNameTobeDeleted(spaceName: string) {
- await testSubjects.setValue('deleteSpaceInput', spaceName);
- }
-
async cancelDeletingSpace() {
await testSubjects.click('confirmModalCancelButton');
}