diff --git a/src/plugins/saved_objects/public/saved_object/saved_object_loader.ts b/src/plugins/dashboard/public/services/saved_object_loader.ts similarity index 95% rename from src/plugins/saved_objects/public/saved_object/saved_object_loader.ts rename to src/plugins/dashboard/public/services/saved_object_loader.ts index 10872b5d9cd1a..521d6645e30f9 100644 --- a/src/plugins/saved_objects/public/saved_object/saved_object_loader.ts +++ b/src/plugins/dashboard/public/services/saved_object_loader.ts @@ -12,9 +12,13 @@ import { SavedObjectsFindOptionsReference, SavedObjectReference, } from 'kibana/public'; -import { SavedObject } from '../types'; -import { StringUtils } from './helpers/string_utils'; +import { SavedObject } from '../../../saved_objects/public'; +import { upperFirst } from './string_utils'; +/** + * @deprecated + * @removeBy 8.0 + */ export interface SavedObjectLoaderFindOptions { size?: number; fields?: string[]; @@ -23,6 +27,8 @@ export interface SavedObjectLoaderFindOptions { /** * @deprecated + * @removeBy 8.0 + * * The SavedObjectLoader class provides some convenience functions * to load and save one kind of saved objects (specified in the constructor). * @@ -46,7 +52,7 @@ export class SavedObjectLoader { this.loaderProperties = { name: `${this.lowercaseType}s`, - noun: StringUtils.upperFirst(this.type), + noun: upperFirst(this.type), nouns: `${this.lowercaseType}s`, }; } diff --git a/src/plugins/dashboard/public/services/saved_objects.ts b/src/plugins/dashboard/public/services/saved_objects.ts index 305ff3c2014f8..afd778d78b271 100644 --- a/src/plugins/dashboard/public/services/saved_objects.ts +++ b/src/plugins/dashboard/public/services/saved_objects.ts @@ -11,11 +11,11 @@ export type { SavedObject, SavedObjectsStart, SavedObjectSaveOpts, - SavedObjectLoaderFindOptions, } from '../../../saved_objects/public'; export { showSaveModal, - SavedObjectLoader, SavedObjectSaveModal, getSavedObjectFinder, } from '../../../saved_objects/public'; +export { SavedObjectLoader } from './saved_object_loader'; +export type { SavedObjectLoaderFindOptions } from './saved_object_loader'; diff --git a/src/plugins/saved_objects/public/saved_object/helpers/string_utils.test.ts b/src/plugins/dashboard/public/services/string_utils.test.ts similarity index 53% rename from src/plugins/saved_objects/public/saved_object/helpers/string_utils.test.ts rename to src/plugins/dashboard/public/services/string_utils.test.ts index 4e7258f1575dc..ed96cb4f1a0a1 100644 --- a/src/plugins/saved_objects/public/saved_object/helpers/string_utils.test.ts +++ b/src/plugins/dashboard/public/services/string_utils.test.ts @@ -6,17 +6,17 @@ * Side Public License, v 1. */ -import { StringUtils } from './string_utils'; +import { upperFirst } from './string_utils'; -describe('StringUtils class', () => { - describe('static upperFirst', () => { +describe('StringUtils', () => { + describe('upperFirst', () => { test('should converts the first character of string to upper case', () => { - expect(StringUtils.upperFirst()).toBe(''); - expect(StringUtils.upperFirst('')).toBe(''); + expect(upperFirst()).toBe(''); + expect(upperFirst('')).toBe(''); - expect(StringUtils.upperFirst('Fred')).toBe('Fred'); - expect(StringUtils.upperFirst('fred')).toBe('Fred'); - expect(StringUtils.upperFirst('FRED')).toBe('FRED'); + expect(upperFirst('Fred')).toBe('Fred'); + expect(upperFirst('fred')).toBe('Fred'); + expect(upperFirst('FRED')).toBe('FRED'); }); }); }); diff --git a/src/plugins/saved_objects/public/saved_object/helpers/string_utils.ts b/src/plugins/dashboard/public/services/string_utils.ts similarity index 55% rename from src/plugins/saved_objects/public/saved_object/helpers/string_utils.ts rename to src/plugins/dashboard/public/services/string_utils.ts index 5d4551f0c200c..31a36b38155d7 100644 --- a/src/plugins/saved_objects/public/saved_object/helpers/string_utils.ts +++ b/src/plugins/dashboard/public/services/string_utils.ts @@ -6,13 +6,11 @@ * Side Public License, v 1. */ -export class StringUtils { - /** - * Returns a version of the string with the first letter capitalized. - * @param str {string} - * @returns {string} - */ - public static upperFirst(str: string = ''): string { - return str ? str.charAt(0).toUpperCase() + str.slice(1) : ''; - } +/** + * Returns a version of the string with the first letter capitalized. + * @param str {string} + * @returns {string} + */ +export function upperFirst(str: string = ''): string { + return str ? str.charAt(0).toUpperCase() + str.slice(1) : ''; } diff --git a/src/plugins/saved_objects/public/index.ts b/src/plugins/saved_objects/public/index.ts index d63e20f5f5673..5e6e67f7e4acc 100644 --- a/src/plugins/saved_objects/public/index.ts +++ b/src/plugins/saved_objects/public/index.ts @@ -13,17 +13,11 @@ export { SavedObjectSaveModal, SavedObjectSaveModalOrigin, showSaveModal } from export type { SavedObjectFinderUiProps, SavedObjectMetaData } from './finder'; export { getSavedObjectFinder, SavedObjectFinderUi } from './finder'; export type { - SavedObjectLoaderFindOptions, SavedObjectDecorator, SavedObjectDecoratorFactory, SavedObjectDecoratorConfig, } from './saved_object'; -export { - SavedObjectLoader, - checkForDuplicateTitle, - saveWithConfirmation, - isErrorNonFatal, -} from './saved_object'; +export { checkForDuplicateTitle, saveWithConfirmation, isErrorNonFatal } from './saved_object'; export type { SavedObjectSaveOpts, SavedObject, SavedObjectConfig } from './types'; export { PER_PAGE_SETTING, LISTING_LIMIT_SETTING } from '../common'; export type { SavedObjectsStart, SavedObjectSetup } from './plugin'; diff --git a/src/plugins/saved_objects/public/saved_object/index.ts b/src/plugins/saved_objects/public/saved_object/index.ts index f30730a1c39ac..01770866b65ed 100644 --- a/src/plugins/saved_objects/public/saved_object/index.ts +++ b/src/plugins/saved_objects/public/saved_object/index.ts @@ -7,8 +7,6 @@ */ export { createSavedObjectClass } from './saved_object'; -export type { SavedObjectLoaderFindOptions } from './saved_object_loader'; -export { SavedObjectLoader } from './saved_object_loader'; export { checkForDuplicateTitle } from './helpers/check_for_duplicate_title'; export { saveWithConfirmation } from './helpers/save_with_confirmation'; export { isErrorNonFatal } from './helpers/save_saved_object'; diff --git a/src/plugins/saved_objects/public/saved_object/saved_object.ts b/src/plugins/saved_objects/public/saved_object/saved_object.ts index c038669510b78..a437431a9d827 100644 --- a/src/plugins/saved_objects/public/saved_object/saved_object.ts +++ b/src/plugins/saved_objects/public/saved_object/saved_object.ts @@ -29,8 +29,6 @@ export function createSavedObjectClass( * provides additional functionality besides loading/saving/deleting/etc. * * It is overloaded and configured to provide type-aware functionality. - * To just retrieve the attributes of saved objects, it is recommended to use SavedObjectLoader - * which returns instances of SimpleSavedObject which don't introduce additional type-specific complexity. * @param {*} config */ class SavedObjectClass {