{
{getShareWarning()}
-
- }
- labelAppend={
-
- }
- fullWidth
- >
- setSelectedSpaceIds(selection)}
- />
-
+ setSelectedSpaceIds(selection)}
+ />
);
};
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_action.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_action.tsx
index ba9a6473999df..677632e942e9a 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_action.tsx
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_action.tsx
@@ -5,13 +5,14 @@
*/
import React from 'react';
import { i18n } from '@kbn/i18n';
-import { NotificationsStart } from 'src/core/public';
+import { NotificationsStart, StartServicesAccessor } from 'src/core/public';
import {
SavedObjectsManagementAction,
SavedObjectsManagementRecord,
} from '../../../../../src/plugins/saved_objects_management/public';
import { ShareSavedObjectsToSpaceFlyout } from './components';
import { SpacesManager } from '../spaces_manager';
+import { PluginsStart } from '../plugin';
export class ShareToSpaceSavedObjectsManagementAction extends SavedObjectsManagementAction {
public id: string = 'share_saved_objects_to_space';
@@ -39,7 +40,8 @@ export class ShareToSpaceSavedObjectsManagementAction extends SavedObjectsManage
constructor(
private readonly spacesManager: SpacesManager,
- private readonly notifications: NotificationsStart
+ private readonly notifications: NotificationsStart,
+ private readonly getStartServices: StartServicesAccessor
) {
super();
}
@@ -56,6 +58,7 @@ export class ShareToSpaceSavedObjectsManagementAction extends SavedObjectsManage
savedObject={this.record}
spacesManager={this.spacesManager}
toastNotifications={this.notifications.toasts}
+ getStartServices={this.getStartServices}
/>
);
};
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_service.test.ts b/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_service.test.ts
index 0f0fa7d22214f..6ce4c49c528af 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_service.test.ts
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_service.test.ts
@@ -8,7 +8,7 @@ import { ShareToSpaceSavedObjectsManagementAction } from './share_saved_objects_
// import { ShareToSpaceSavedObjectsManagementColumn } from './share_saved_objects_to_space_column';
import { spacesManagerMock } from '../spaces_manager/mocks';
import { ShareSavedObjectsToSpaceService } from '.';
-import { notificationServiceMock } from 'src/core/public/mocks';
+import { coreMock, notificationServiceMock } from 'src/core/public/mocks';
import { savedObjectsManagementPluginMock } from '../../../../../src/plugins/saved_objects_management/public/mocks';
describe('ShareSavedObjectsToSpaceService', () => {
@@ -18,6 +18,7 @@ describe('ShareSavedObjectsToSpaceService', () => {
spacesManager: spacesManagerMock.create(),
notificationsSetup: notificationServiceMock.createSetupContract(),
savedObjectsManagementSetup: savedObjectsManagementPluginMock.createSetupContract(),
+ getStartServices: coreMock.createSetup().getStartServices,
};
const service = new ShareSavedObjectsToSpaceService();
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_service.ts b/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_service.ts
index 9f6e57c355380..892731a0c5739 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_service.ts
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_service.ts
@@ -4,21 +4,32 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { NotificationsSetup } from 'src/core/public';
+import { NotificationsSetup, StartServicesAccessor } from 'src/core/public';
import { SavedObjectsManagementPluginSetup } from 'src/plugins/saved_objects_management/public';
import { ShareToSpaceSavedObjectsManagementAction } from './share_saved_objects_to_space_action';
// import { ShareToSpaceSavedObjectsManagementColumn } from './share_saved_objects_to_space_column';
import { SpacesManager } from '../spaces_manager';
+import { PluginsStart } from '../plugin';
interface SetupDeps {
spacesManager: SpacesManager;
savedObjectsManagementSetup: SavedObjectsManagementPluginSetup;
notificationsSetup: NotificationsSetup;
+ getStartServices: StartServicesAccessor;
}
export class ShareSavedObjectsToSpaceService {
- public setup({ spacesManager, savedObjectsManagementSetup, notificationsSetup }: SetupDeps) {
- const action = new ShareToSpaceSavedObjectsManagementAction(spacesManager, notificationsSetup);
+ public setup({
+ spacesManager,
+ savedObjectsManagementSetup,
+ notificationsSetup,
+ getStartServices,
+ }: SetupDeps) {
+ const action = new ShareToSpaceSavedObjectsManagementAction(
+ spacesManager,
+ notificationsSetup,
+ getStartServices
+ );
savedObjectsManagementSetup.actions.register(action);
// Note: this column is hidden for now because no saved objects are shareable. It should be uncommented when at least one saved object type is multi-namespace.
// const column = new ShareToSpaceSavedObjectsManagementColumn(spacesManager);
diff --git a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts
index f666c823bd365..0888448753353 100644
--- a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts
+++ b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts
@@ -21,6 +21,7 @@ function createSpacesManagerMock() {
shareSavedObjectAdd: jest.fn().mockResolvedValue(undefined),
shareSavedObjectRemove: jest.fn().mockResolvedValue(undefined),
resolveCopySavedObjectsErrors: jest.fn().mockResolvedValue(undefined),
+ getShareSavedObjectPermissions: jest.fn().mockResolvedValue(undefined),
redirectToSpaceSelector: jest.fn().mockResolvedValue(undefined),
} as unknown) as jest.Mocked;
}
diff --git a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.test.ts b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.test.ts
index 508669361c23f..06cf3ef17dc82 100644
--- a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.test.ts
+++ b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.test.ts
@@ -104,4 +104,24 @@ describe('SpacesManager', () => {
);
});
});
+
+ describe('#getShareSavedObjectPermissions', () => {
+ it('retrieves share permissions for the specified type and returns result', async () => {
+ const coreStart = coreMock.createStart();
+ const shareToAllSpaces = Symbol();
+ coreStart.http.get.mockResolvedValue({ shareToAllSpaces });
+ const spacesManager = new SpacesManager(coreStart.http);
+ expect(coreStart.http.get).toHaveBeenCalledTimes(1); // initial call to get active space
+
+ const result = await spacesManager.getShareSavedObjectPermissions('foo');
+ expect(coreStart.http.get).toHaveBeenCalledTimes(2);
+ expect(coreStart.http.get).toHaveBeenLastCalledWith(
+ '/api/spaces/_share_saved_object_permissions',
+ {
+ query: { type: 'foo' },
+ }
+ );
+ expect(result).toEqual({ shareToAllSpaces });
+ });
+ });
});
diff --git a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts
index 2daf9ab420efc..98b00c58bf27d 100644
--- a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts
+++ b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts
@@ -106,6 +106,12 @@ export class SpacesManager {
});
}
+ public async getShareSavedObjectPermissions(
+ type: string
+ ): Promise<{ shareToAllSpaces: boolean }> {
+ return this.http.get('/api/spaces/_share_saved_object_permissions', { query: { type } });
+ }
+
public async shareSavedObjectAdd(object: SavedObject, spaces: string[]): Promise {
return this.http.post(`/api/spaces/_share_saved_object_add`, {
body: JSON.stringify({ object, spaces }),
diff --git a/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.test.ts b/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.test.ts
index 4502b081034aa..397ef6e20dfa8 100644
--- a/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.test.ts
+++ b/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.test.ts
@@ -1323,3 +1323,122 @@ describe('#delete', () => {
});
});
});
+
+describe('#hasGlobalAllPrivilegesForObjectType', () => {
+ const type = 'foo';
+
+ describe(`authorization is null`, () => {
+ test(`returns true`, async () => {
+ const mockAuditLogger = createMockAuditLogger();
+ const mockDebugLogger = createMockDebugLogger();
+ const mockConfig = createMockConfig();
+ const authorization = null;
+ const request = Symbol() as any;
+
+ const client = new SpacesClient(
+ mockAuditLogger as any,
+ mockDebugLogger,
+ authorization,
+ null,
+ mockConfig,
+ null,
+ request
+ );
+
+ const result = await client.hasGlobalAllPrivilegesForObjectType(type);
+ expect(result).toEqual(true);
+ expect(mockAuditLogger.spacesAuthorizationFailure).toHaveBeenCalledTimes(0);
+ expect(mockAuditLogger.spacesAuthorizationSuccess).toHaveBeenCalledTimes(0);
+ });
+ });
+
+ describe(`authorization.mode.useRbacForRequest is false`, () => {
+ test(`returns true`, async () => {
+ const mockAuditLogger = createMockAuditLogger();
+ const mockDebugLogger = createMockDebugLogger();
+ const mockConfig = createMockConfig();
+ const { mockAuthorization } = createMockAuthorization();
+ mockAuthorization.mode.useRbacForRequest.mockReturnValue(false);
+ const request = Symbol() as any;
+
+ const client = new SpacesClient(
+ mockAuditLogger as any,
+ mockDebugLogger,
+ mockAuthorization,
+ null,
+ mockConfig,
+ null,
+ request
+ );
+
+ const result = await client.hasGlobalAllPrivilegesForObjectType(type);
+ expect(result).toEqual(true);
+ });
+ });
+
+ describe('useRbacForRequest is true', () => {
+ test(`returns false if user is not authorized to enumerate spaces`, async () => {
+ const mockAuditLogger = createMockAuditLogger();
+ const mockDebugLogger = createMockDebugLogger();
+ const mockConfig = createMockConfig();
+ const { mockAuthorization, mockCheckPrivilegesGlobally } = createMockAuthorization();
+ mockAuthorization.mode.useRbacForRequest.mockReturnValue(true);
+ mockCheckPrivilegesGlobally.mockReturnValue({ hasAllRequested: false });
+ const request = Symbol() as any;
+
+ const client = new SpacesClient(
+ mockAuditLogger as any,
+ mockDebugLogger,
+ mockAuthorization,
+ null,
+ mockConfig,
+ null,
+ request
+ );
+
+ const result = await client.hasGlobalAllPrivilegesForObjectType(type);
+ expect(result).toEqual(false);
+ expect(mockAuthorization.checkPrivilegesWithRequest).toHaveBeenCalledWith(request);
+ expect(mockCheckPrivilegesGlobally).toHaveBeenCalledWith({
+ kibana: [
+ mockAuthorization.actions.savedObject.get(type, 'create'),
+ mockAuthorization.actions.savedObject.get(type, 'get'),
+ mockAuthorization.actions.savedObject.get(type, 'update'),
+ mockAuthorization.actions.savedObject.get(type, 'delete'),
+ ],
+ });
+ });
+
+ test(`returns true if user is authorized to enumerate spaces`, async () => {
+ const mockAuditLogger = createMockAuditLogger();
+ const mockDebugLogger = createMockDebugLogger();
+ const mockConfig = createMockConfig();
+ const { mockAuthorization, mockCheckPrivilegesGlobally } = createMockAuthorization();
+ mockAuthorization.mode.useRbacForRequest.mockReturnValue(true);
+ mockCheckPrivilegesGlobally.mockReturnValue({ hasAllRequested: true });
+ const request = Symbol() as any;
+
+ const client = new SpacesClient(
+ mockAuditLogger as any,
+ mockDebugLogger,
+ mockAuthorization,
+ null,
+ mockConfig,
+ null,
+ request
+ );
+
+ const result = await client.hasGlobalAllPrivilegesForObjectType(type);
+ expect(result).toEqual(true);
+ expect(mockAuthorization.checkPrivilegesWithRequest).toHaveBeenCalledWith(request);
+ expect(mockCheckPrivilegesGlobally).toHaveBeenCalledWith({
+ kibana: [
+ mockAuthorization.actions.savedObject.get(type, 'create'),
+ mockAuthorization.actions.savedObject.get(type, 'get'),
+ mockAuthorization.actions.savedObject.get(type, 'update'),
+ mockAuthorization.actions.savedObject.get(type, 'delete'),
+ ],
+ });
+ });
+ });
+});
diff --git a/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.ts b/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.ts
index 50e7182b76686..e0fdc64285d5f 100644
--- a/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.ts
+++ b/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.ts
@@ -215,6 +215,27 @@ export class SpacesClient {
await repository.delete('space', id);
}
+ public async hasGlobalAllPrivilegesForObjectType(type: string) {
+ if (this.useRbac()) {
+ const kibanaPrivileges = ['create', 'get', 'update', 'delete'].map((operation) =>
+ this.authorization!.actions.savedObject.get(type, operation)
+ );
+ const checkPrivileges = this.authorization!.checkPrivilegesWithRequest(this.request);
+ const { hasAllRequested } = await checkPrivileges.globally({ kibana: kibanaPrivileges });
+ // we do not audit the outcome of this privilege check, because it is called automatically to determine UI capabilities
+ this.debugLogger(
+ `SpacesClient.hasGlobalAllPrivilegesForObjectType, using RBAC. Result: ${hasAllRequested}`
+ );
+ return hasAllRequested;
+ }
+
+ // If not RBAC, then security isn't enabled and we can enumerate all spaces
+ this.debugLogger(
+ `SpacesClient.hasGlobalAllPrivilegesForObjectType, NOT USING RBAC. Result: true`
+ );
+ return true;
+ }
+
private useRbac(): boolean {
return this.authorization != null && this.authorization.mode.useRbacForRequest(this.request);
}
diff --git a/x-pack/plugins/spaces/server/routes/api/external/share_to_space.ts b/x-pack/plugins/spaces/server/routes/api/external/share_to_space.ts
index 1ffa94cfe80be..cc3573896ca8f 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/share_to_space.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/share_to_space.ts
@@ -13,7 +13,7 @@ import { ALL_SPACES_STRING } from '../../../lib/utils/namespace';
const uniq = (arr: T[]): T[] => Array.from(new Set(arr));
export function initShareToSpacesApi(deps: ExternalRouteDeps) {
- const { externalRouter, getStartServices } = deps;
+ const { externalRouter, getStartServices, spacesService } = deps;
const shareSchema = schema.object({
spaces: schema.arrayOf(
@@ -37,6 +37,25 @@ export function initShareToSpacesApi(deps: ExternalRouteDeps) {
object: schema.object({ type: schema.string(), id: schema.string() }),
});
+ externalRouter.get(
+ {
+ path: '/api/spaces/_share_saved_object_permissions',
+ validate: { query: schema.object({ type: schema.string() }) },
+ },
+ createLicensedRouteHandler(async (_context, request, response) => {
+ const spacesClient = await spacesService.scopedClient(request);
+
+ const { type } = request.query;
+
+ try {
+ const shareToAllSpaces = await spacesClient.hasGlobalAllPrivilegesForObjectType(type);
+ return response.ok({ body: { shareToAllSpaces } });
+ } catch (error) {
+ return response.customError(wrapError(error));
+ }
+ })
+ );
+
externalRouter.post(
{ path: '/api/spaces/_share_saved_object_add', validate: { body: shareSchema } },
createLicensedRouteHandler(async (_context, request, response) => {
From e68ecc43d2f34daae257fed6d19f90b83ad84e7d Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Wed, 30 Sep 2020 11:01:13 -0400
Subject: [PATCH 12/25] Change saved objects table to use force-delete
This is necessary when deleting saved objects that exist in
multiple namespaces.
---
...in-core-public.savedobjectsclient.delete.md | 2 +-
...na-plugin-core-public.savedobjectsclient.md | 2 +-
src/core/public/public.api.md | 3 ++-
.../saved_objects/saved_objects_client.ts | 18 ++++++++++++++++--
.../objects_table/saved_objects_table.tsx | 2 +-
5 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsclient.delete.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsclient.delete.md
index 3b5f5630e8060..3a5dcb51e2c42 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectsclient.delete.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsclient.delete.md
@@ -9,5 +9,5 @@ Deletes an object
Signature:
```typescript
-delete: (type: string, id: string) => ReturnType;
+delete: (type: string, id: string, options?: SavedObjectsDeleteOptions | undefined) => ReturnType;
```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsclient.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsclient.md
index 904b9cce09d4e..6e53b169b8bed 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectsclient.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsclient.md
@@ -23,7 +23,7 @@ The constructor for this class is marked as internal. Third-party code should no
| [bulkCreate](./kibana-plugin-core-public.savedobjectsclient.bulkcreate.md) | | (objects?: SavedObjectsBulkCreateObject[], options?: SavedObjectsBulkCreateOptions) => Promise<SavedObjectsBatchResponse<unknown>> | Creates multiple documents at once |
| [bulkGet](./kibana-plugin-core-public.savedobjectsclient.bulkget.md) | | (objects?: Array<{
id: string;
type: string;
}>) => Promise<SavedObjectsBatchResponse<unknown>> | Returns an array of objects by id |
| [create](./kibana-plugin-core-public.savedobjectsclient.create.md) | | <T = unknown>(type: string, attributes: T, options?: SavedObjectsCreateOptions) => Promise<SimpleSavedObject<T>> | Persists an object |
-| [delete](./kibana-plugin-core-public.savedobjectsclient.delete.md) | | (type: string, id: string) => ReturnType<SavedObjectsApi['delete']> | Deletes an object |
+| [delete](./kibana-plugin-core-public.savedobjectsclient.delete.md) | | (type: string, id: string, options?: SavedObjectsDeleteOptions | undefined) => ReturnType<SavedObjectsApi['delete']> | Deletes an object |
| [find](./kibana-plugin-core-public.savedobjectsclient.find.md) | | <T = unknown>(options: SavedObjectsFindOptions) => Promise<SavedObjectsFindResponsePublic<T>> | Search for objects |
| [get](./kibana-plugin-core-public.savedobjectsclient.get.md) | | <T = unknown>(type: string, id: string) => Promise<SimpleSavedObject<T>> | Fetches a single object |
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 5970c9a8571c4..c681d9bd758ad 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -1029,8 +1029,9 @@ export class SavedObjectsClient {
}>) => Promise>;
bulkUpdate(objects?: SavedObjectsBulkUpdateObject[]): Promise>;
create: (type: string, attributes: T, options?: SavedObjectsCreateOptions) => Promise>;
+ // Warning: (ae-forgotten-export) The symbol "SavedObjectsDeleteOptions" needs to be exported by the entry point index.d.ts
// Warning: (ae-forgotten-export) The symbol "SavedObjectsClientContract" needs to be exported by the entry point index.d.ts
- delete: (type: string, id: string) => ReturnType;
+ delete: (type: string, id: string, options?: SavedObjectsDeleteOptions | undefined) => ReturnType;
// Warning: (ae-forgotten-export) The symbol "SavedObjectsFindOptions" needs to be exported by the entry point index.d.ts
find: (options: SavedObjectsFindOptions_2) => Promise>;
get: (type: string, id: string) => Promise>;
diff --git a/src/core/public/saved_objects/saved_objects_client.ts b/src/core/public/saved_objects/saved_objects_client.ts
index 6a10eb44d9ca4..beed3e6fe0a18 100644
--- a/src/core/public/saved_objects/saved_objects_client.ts
+++ b/src/core/public/saved_objects/saved_objects_client.ts
@@ -96,6 +96,12 @@ export interface SavedObjectsBatchResponse {
savedObjects: Array>;
}
+/** @public */
+export interface SavedObjectsDeleteOptions {
+ /** Force deletion of an object that exists in multiple namespaces */
+ force?: boolean;
+}
+
/**
* Return type of the Saved Objects `find()` method.
*
@@ -261,12 +267,20 @@ export class SavedObjectsClient {
* @param id
* @returns
*/
- public delete = (type: string, id: string): ReturnType => {
+ public delete = (
+ type: string,
+ id: string,
+ options?: SavedObjectsDeleteOptions
+ ): ReturnType => {
if (!type || !id) {
return Promise.reject(new Error('requires type and id'));
}
- return this.savedObjectsFetch(this.getPath([type, id]), { method: 'DELETE' });
+ const query = {
+ force: !!options?.force,
+ };
+
+ return this.savedObjectsFetch(this.getPath([type, id]), { method: 'DELETE', query });
};
/**
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
index d879a71cc2269..5011c0299abe8 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
@@ -468,7 +468,7 @@ export class SavedObjectsTable extends Component
- savedObjectsClient.delete(object.type, object.id)
+ savedObjectsClient.delete(object.type, object.id, { force: true })
);
await Promise.all(deletes);
From f855fcde1ca9fe37f4654e52b0c00cc4db6ca788 Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Wed, 30 Sep 2020 13:43:28 -0400
Subject: [PATCH 13/25] Fix "Copy to space" functional test
Could not figure out why this broke, I did not change this flyout.
At any rate, clicking a different part of the radio button fixed
it.
---
.../page_objects/copy_saved_objects_to_space_page.ts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/x-pack/test/functional/page_objects/copy_saved_objects_to_space_page.ts b/x-pack/test/functional/page_objects/copy_saved_objects_to_space_page.ts
index 6b8680271635b..00a364bb7543e 100644
--- a/x-pack/test/functional/page_objects/copy_saved_objects_to_space_page.ts
+++ b/x-pack/test/functional/page_objects/copy_saved_objects_to_space_page.ts
@@ -37,9 +37,9 @@ export function CopySavedObjectsToSpacePageProvider({
if (!overwrite) {
const radio = await testSubjects.find('cts-copyModeControl-overwriteRadioGroup');
// a radio button consists of a div tag that contains an input, a div, and a label
- // we can't click the input directly, need to go up one level and click the parent div
- const div = await radio.findByXpath("//div[input[@id='overwriteDisabled']]");
- await div.click();
+ // we can't click the input directly, need to click the label
+ const label = await radio.findByCssSelector('label[for="overwriteDisabled"]');
+ await label.click();
}
await testSubjects.click(`cts-space-selector-row-${destinationSpaceId}`);
},
From 1761d87784c33570c6aa29aaac4179fece7b6123 Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Wed, 30 Sep 2020 14:53:35 -0400
Subject: [PATCH 14/25] Fix unit tests that broke due to e68ecc4
---
src/core/public/saved_objects/saved_objects_client.test.ts | 4 +++-
.../objects_table/saved_objects_table.test.tsx | 6 ++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/core/public/saved_objects/saved_objects_client.test.ts b/src/core/public/saved_objects/saved_objects_client.test.ts
index 20824af38af0f..fab651379ea6a 100644
--- a/src/core/public/saved_objects/saved_objects_client.test.ts
+++ b/src/core/public/saved_objects/saved_objects_client.test.ts
@@ -132,7 +132,9 @@ describe('SavedObjectsClient', () => {
Object {
"body": undefined,
"method": "DELETE",
- "query": undefined,
+ "query": Object {
+ "force": false,
+ },
},
]
`);
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
index 1bc3dc8066520..0adf55ed6bebb 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
@@ -544,11 +544,13 @@ describe('SavedObjectsTable', () => {
expect(mockSavedObjectsClient.bulkGet).toHaveBeenCalledWith(mockSelectedSavedObjects);
expect(mockSavedObjectsClient.delete).toHaveBeenCalledWith(
mockSavedObjects[0].type,
- mockSavedObjects[0].id
+ mockSavedObjects[0].id,
+ { force: true }
);
expect(mockSavedObjectsClient.delete).toHaveBeenCalledWith(
mockSavedObjects[1].type,
- mockSavedObjects[1].id
+ mockSavedObjects[1].id,
+ { force: true }
);
expect(component.state('selectedSavedObjects').length).toBe(0);
});
From ebf7da0648f2bf87aa21f4fa550f3a526a70901c Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Thu, 1 Oct 2020 10:03:42 -0400
Subject: [PATCH 15/25] PR review feedback
---
x-pack/plugins/spaces/public/plugin.tsx | 6 +++---
.../components/selectable_spaces_control.tsx | 4 ++--
.../components/share_to_space_flyout.tsx | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/x-pack/plugins/spaces/public/plugin.tsx b/x-pack/plugins/spaces/public/plugin.tsx
index 1d86d0664407a..2a08f41266456 100644
--- a/x-pack/plugins/spaces/public/plugin.tsx
+++ b/x-pack/plugins/spaces/public/plugin.tsx
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import { CoreSetup, CoreStart, Plugin, StartServicesAccessor } from 'src/core/public';
import { HomePublicPluginSetup } from 'src/plugins/home/public';
import { SavedObjectsManagementPluginSetup } from 'src/plugins/saved_objects_management/public';
import { ManagementStart, ManagementSetup } from 'src/plugins/management/public';
@@ -53,7 +53,7 @@ export class SpacesPlugin implements Plugin['getStartServices'],
+ getStartServices: core.getStartServices as StartServicesAccessor,
spacesManager: this.spacesManager,
securityLicense: plugins.security?.license,
});
@@ -73,7 +73,7 @@ export class SpacesPlugin implements Plugin['getStartServices'],
+ getStartServices: core.getStartServices as StartServicesAccessor,
});
const copySavedObjectsToSpaceService = new CopySavedObjectsToSpaceService();
copySavedObjectsToSpaceService.setup({
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx
index 9ba4a7c537a04..a8e20f8135979 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx
@@ -84,7 +84,7 @@ export const SelectableSpacesControl = (props: Props) => {
@@ -120,7 +120,7 @@ export const SelectableSpacesControl = (props: Props) => {
);
const hiddenSpacesLabel = i18n.translate(
'xpack.spaces.management.shareToSpace.shareModeControl.hiddenCountLabel',
- { defaultMessage: '({hiddenCount} hidden)', values: { hiddenCount } }
+ { defaultMessage: '+{hiddenCount} hidden', values: { hiddenCount } }
);
const hiddenSpaces = hiddenCount ? {hiddenSpacesLabel} : null;
return (
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout.tsx
index 929f33cdf021b..ceba7e2097746 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout.tsx
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout.tsx
@@ -233,7 +233,7 @@ export const ShareSavedObjectsToSpaceFlyout = (props: Props) => {
}
return (
-
+
From 48f0698ffdd921ac7986f95366a1b40f0cef899a Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Thu, 1 Oct 2020 10:05:57 -0400
Subject: [PATCH 16/25] Tweak "no spaces available" text
Use "subdued" color and spacer to bring it more in line with other
text.
---
.../components/no_spaces_available.tsx | 43 ++++++++++---------
1 file changed, 23 insertions(+), 20 deletions(-)
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/no_spaces_available.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/no_spaces_available.tsx
index 52fc0bb32f5a4..f4fcda0d451e7 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/no_spaces_available.tsx
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/no_spaces_available.tsx
@@ -5,7 +5,7 @@
*/
import React from 'react';
-import { EuiLink, EuiText } from '@elastic/eui';
+import { EuiLink, EuiSpacer, EuiText } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { ApplicationStart } from 'src/core/public';
@@ -21,24 +21,27 @@ export const NoSpacesAvailable = (props: Props) => {
}
return (
-
-
-
-