Skip to content

Commit 1d83015

Browse files
committed
additional cleanup
1 parent 307822c commit 1d83015

File tree

3 files changed

+5
-27
lines changed

3 files changed

+5
-27
lines changed

x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.test.ts

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,5 @@ describe('CopySavedObjectsToSpaceService', () => {
3333
expect.any(CopyToSpaceSavedObjectsManagementAction)
3434
);
3535
});
36-
37-
it('will not re-register the CopyToSpaceSavedObjectsManagementAction', () => {
38-
const deps = {
39-
spacesManager: spacesManagerMock.create(),
40-
// we don't have a proper NP mock for this yet
41-
managementSetup: ({
42-
savedObjects: {
43-
registry: {
44-
has: jest.fn().mockReturnValue(true),
45-
register: jest.fn(),
46-
},
47-
},
48-
} as unknown) as ManagementSetup,
49-
};
50-
51-
const service = new CopySavedObjectsToSpaceService();
52-
service.setup(deps);
53-
54-
expect(deps.managementSetup.savedObjects.registry.register).toHaveBeenCalledTimes(0);
55-
});
5636
});
5737
});

x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ interface SetupDeps {
1616
export class CopySavedObjectsToSpaceService {
1717
public setup({ spacesManager, managementSetup }: SetupDeps) {
1818
const action = new CopyToSpaceSavedObjectsManagementAction(spacesManager);
19-
if (!managementSetup.savedObjects.registry.has(action.id)) {
20-
managementSetup.savedObjects.registry.register(action);
21-
}
19+
managementSetup.savedObjects.registry.register(action);
2220
}
2321
}

x-pack/legacy/plugins/spaces/public/management/legacy_page_routes.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ routes.when('/management/spaces/list', {
5353
k7Breadcrumbs: getListBreadcrumbs,
5454
requireUICapability: 'management.kibana.spaces',
5555
controller($scope: any) {
56-
$scope.$$postDigest(async () => {
56+
$scope.$$postDigest(() => {
5757
const domNode = document.getElementById(reactRootNodeId);
5858

59-
const { spacesManager } = await spacesNPStart;
59+
const { spacesManager } = spacesNPStart;
6060

6161
render(
6262
<I18nContext>
@@ -83,10 +83,10 @@ routes.when('/management/spaces/create', {
8383
k7Breadcrumbs: getCreateBreadcrumbs,
8484
requireUICapability: 'management.kibana.spaces',
8585
controller($scope: any) {
86-
$scope.$$postDigest(async () => {
86+
$scope.$$postDigest(() => {
8787
const domNode = document.getElementById(reactRootNodeId);
8888

89-
const { spacesManager } = await spacesNPStart;
89+
const { spacesManager } = spacesNPStart;
9090

9191
render(
9292
<I18nContext>

0 commit comments

Comments
 (0)