Skip to content

Commit 7015c36

Browse files
committed
Fix bad legacy imports
1 parent fdd6f28 commit 7015c36

File tree

72 files changed

+123
-69
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+123
-69
lines changed

src/core/public/saved_objects/index.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,10 @@ export {
4040
SavedObjectsBaseOptions,
4141
SavedObjectsFindOptions,
4242
SavedObjectsMigrationVersion,
43+
SavedObjectsImportResponse,
44+
SavedObjectsImportConflictError,
45+
SavedObjectsImportUnsupportedTypeError,
46+
SavedObjectsImportMissingReferencesError,
47+
SavedObjectsImportUnknownError,
48+
SavedObjectsImportError,
4349
} from '../../server/types';

src/legacy/core_plugins/kibana/public/dashboard/migrations/migrations_730.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
// This file should be moved to dashboard/server/
20+
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
1921
import { SavedObjectsMigrationLogger } from 'src/core/server';
2022
import { inspect } from 'util';
2123
import { DashboardDoc730ToLatest, DashboardDoc700To720 } from './types';

src/legacy/core_plugins/kibana/public/management/sections/objects/lib/process_import_response.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
SavedObjectsImportMissingReferencesError,
2525
SavedObjectsImportUnknownError,
2626
SavedObjectsImportError,
27-
} from 'src/core/server';
27+
} from 'src/core/public';
2828

2929
export interface ProcessedImportResponse {
3030
failedImports: Array<{

x-pack/legacy/plugins/actions/server/shim.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Legacy } from 'kibana';
99
import * as Rx from 'rxjs';
1010
import { ActionsConfigType } from './types';
1111
import { TaskManager } from '../../task_manager';
12-
import { XPackMainPlugin } from '../../xpack_main/xpack_main';
12+
import { XPackMainPlugin } from '../../xpack_main/server/xpack_main';
1313
import KbnServer from '../../../../../src/legacy/server/kbn_server';
1414
import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../spaces';
1515
import {

x-pack/legacy/plugins/alerting/server/shim.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Hapi from 'hapi';
88
import { Legacy } from 'kibana';
99
import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../spaces';
1010
import { TaskManager } from '../../task_manager';
11-
import { XPackMainPlugin } from '../../xpack_main/xpack_main';
11+
import { XPackMainPlugin } from '../../xpack_main/server/xpack_main';
1212
import KbnServer from '../../../../../src/legacy/server/kbn_server';
1313
import {
1414
PluginSetupContract as EncryptedSavedObjectsSetupContract,

x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import React, { ReactNode } from 'react';
1515
import { render, waitForElement } from '@testing-library/react';
1616
import '@testing-library/jest-dom/extend-expect';
1717
import { MemoryRouter } from 'react-router-dom';
18+
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
1819
import { APMConfig } from '../../../../../plugins/apm/server';
1920
import { LocationProvider } from '../context/LocationContext';
2021
import { PromiseReturnType } from '../../typings/common';

x-pack/legacy/plugins/canvas/shareable_runtime/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import { RefObject } from 'react';
88
// @ts-ignore Unlinked Webpack Type
99
import ContainerStyle from 'types/interpreter';
10-
import { SavedObject, SavedObjectAttributes } from 'src/core/server';
10+
import { SavedObject, SavedObjectAttributes } from 'src/core/public';
1111

1212
import { ElementPosition, CanvasPage, CanvasWorkpad, RendererSpec } from '../types';
1313

x-pack/legacy/plugins/infra/public/hooks/use_bulk_get_saved_object.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
import { useState, useCallback } from 'react';
88

99
import { npStart } from 'ui/new_platform';
10-
import { SavedObjectsBatchResponse } from 'src/core/public';
11-
import { SavedObjectAttributes } from 'src/core/server';
10+
import { SavedObjectAttributes, SavedObjectsBatchResponse } from 'src/core/public';
1211

1312
export const useBulkGetSavedObject = (type: string) => {
1413
const [data, setData] = useState<SavedObjectsBatchResponse<SavedObjectAttributes> | null>(null);

x-pack/legacy/plugins/infra/public/hooks/use_create_saved_object.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
import { useState, useCallback } from 'react';
88

99
import { npStart } from 'ui/new_platform';
10-
import { SavedObjectsCreateOptions, SimpleSavedObject } from 'src/core/public';
11-
import { SavedObjectAttributes } from 'src/core/server';
10+
import {
11+
SavedObjectAttributes,
12+
SavedObjectsCreateOptions,
13+
SimpleSavedObject,
14+
} from 'src/core/public';
1215

1316
export const useCreateSavedObject = (type: string) => {
1417
const [data, setData] = useState<SimpleSavedObject<SavedObjectAttributes> | null>(null);

x-pack/legacy/plugins/infra/public/hooks/use_find_saved_object.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
import { useState, useCallback } from 'react';
88

99
import { npStart } from 'ui/new_platform';
10-
import { SavedObjectsBatchResponse } from 'src/core/public';
11-
import { SavedObjectAttributes } from 'src/core/server';
10+
import { SavedObjectAttributes, SavedObjectsBatchResponse } from 'src/core/public';
1211

1312
export const useFindSavedObject = <SavedObjectType extends SavedObjectAttributes>(type: string) => {
1413
const [data, setData] = useState<SavedObjectsBatchResponse<SavedObjectType> | null>(null);

0 commit comments

Comments
 (0)