diff --git a/src/plugins/saved_objects_tagging_oss/common/index.ts b/src/plugins/saved_objects_tagging_oss/common/index.ts index 0af628c06a197..2d4506159d15c 100644 --- a/src/plugins/saved_objects_tagging_oss/common/index.ts +++ b/src/plugins/saved_objects_tagging_oss/common/index.ts @@ -9,6 +9,7 @@ export type { Tag, TagAttributes, + CreateTagOptions, GetAllTagsOptions, ITagsClient, TagWithOptionalId, diff --git a/x-pack/plugins/fleet/server/services/epm/kibana/assets/tag_assets.ts b/x-pack/plugins/fleet/server/services/epm/kibana/assets/tag_assets.ts index 86127c19e2811..44d55c660e99d 100644 --- a/x-pack/plugins/fleet/server/services/epm/kibana/assets/tag_assets.ts +++ b/x-pack/plugins/fleet/server/services/epm/kibana/assets/tag_assets.ts @@ -9,7 +9,8 @@ import { v5 as uuidv5 } from 'uuid'; import { uniqBy } from 'lodash'; import type { SavedObjectsImportSuccess } from '@kbn/core-saved-objects-common'; import { taggableTypes } from '@kbn/saved-objects-tagging-plugin/common/constants'; -import type { IAssignmentService, ITagsClient } from '@kbn/saved-objects-tagging-plugin/server'; +import type { IAssignmentService } from '@kbn/saved-objects-tagging-plugin/server'; +import type { ITagsClient } from '@kbn/saved-objects-tagging-plugin/common/types'; import type { KibanaAssetType } from '../../../../../common'; import type { PackageSpecTags } from '../../../../types'; diff --git a/x-pack/plugins/global_search_bar/public/components/result_tag_list.tsx b/x-pack/plugins/global_search_bar/public/components/result_tag_list.tsx index 5d8c90b536a1a..ce1069726ce0f 100644 --- a/x-pack/plugins/global_search_bar/public/components/result_tag_list.tsx +++ b/x-pack/plugins/global_search_bar/public/components/result_tag_list.tsx @@ -5,10 +5,10 @@ * 2.0. */ -import React, { FC } from 'react'; +import React, { type FC } from 'react'; import { i18n } from '@kbn/i18n'; import { EuiBadge } from '@elastic/eui'; -import type { Tag } from '@kbn/saved-objects-tagging-plugin/public'; +import type { Tag } from '@kbn/saved-objects-tagging-oss-plugin/common'; const MAX_TAGS_TO_SHOW = 3; diff --git a/x-pack/plugins/global_search_bar/public/lib/result_to_option.test.ts b/x-pack/plugins/global_search_bar/public/lib/result_to_option.test.ts index 0a2c5c57e725c..bbba64c08fcd6 100644 --- a/x-pack/plugins/global_search_bar/public/lib/result_to_option.test.ts +++ b/x-pack/plugins/global_search_bar/public/lib/result_to_option.test.ts @@ -6,7 +6,7 @@ */ import type { GlobalSearchResult } from '@kbn/global-search-plugin/common/types'; -import { Tag } from '@kbn/saved-objects-tagging-plugin/public'; +import type { Tag } from '@kbn/saved-objects-tagging-oss-plugin/common'; import { resultToOption } from './result_to_option'; const createSearchResult = (parts: Partial = {}): GlobalSearchResult => ({ diff --git a/x-pack/plugins/global_search_bar/public/lib/result_to_option.tsx b/x-pack/plugins/global_search_bar/public/lib/result_to_option.tsx index 7b28844f9e4ad..4fe654da2ad93 100644 --- a/x-pack/plugins/global_search_bar/public/lib/result_to_option.tsx +++ b/x-pack/plugins/global_search_bar/public/lib/result_to_option.tsx @@ -8,7 +8,8 @@ import React from 'react'; import type { EuiSelectableTemplateSitewideOption } from '@elastic/eui'; import type { GlobalSearchResult } from '@kbn/global-search-plugin/common/types'; -import type { SavedObjectTaggingPluginStart, Tag } from '@kbn/saved-objects-tagging-plugin/public'; +import type { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public'; +import type { Tag } from '@kbn/saved-objects-tagging-oss-plugin/common'; import { ResultTagList } from '../components/result_tag_list'; const cleanMeta = (str: string) => (str.charAt(0).toUpperCase() + str.slice(1)).replace(/-/g, ' '); diff --git a/x-pack/plugins/saved_objects_tagging/common/index.ts b/x-pack/plugins/saved_objects_tagging/common/index.ts index 785692065a60c..d883ac78c7c05 100644 --- a/x-pack/plugins/saved_objects_tagging/common/index.ts +++ b/x-pack/plugins/saved_objects_tagging/common/index.ts @@ -8,14 +8,6 @@ export type { TagsCapabilities } from './capabilities'; export { getTagsCapabilities } from './capabilities'; export { tagFeatureId, tagSavedObjectTypeName, tagManagementSectionId } from './constants'; -export type { - TagWithRelations, - TagAttributes, - Tag, - ITagsClient, - TagSavedObject, - TagWithOptionalId, -} from './types'; export type { TagValidation } from './validation'; export { validateTagColor, diff --git a/x-pack/plugins/saved_objects_tagging/common/test_utils/index.ts b/x-pack/plugins/saved_objects_tagging/common/test_utils/index.ts index 03f3f6e50d0de..3f506413028d8 100644 --- a/x-pack/plugins/saved_objects_tagging/common/test_utils/index.ts +++ b/x-pack/plugins/saved_objects_tagging/common/test_utils/index.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { SavedObject, SavedObjectReference } from '@kbn/core/types'; -import { Tag, TagAttributes } from '../types'; -import { TagsCapabilities } from '../capabilities'; -import { AssignableObject } from '../assignments'; +import type { SavedObject, SavedObjectReference } from '@kbn/core/types'; +import type { Tag, TagAttributes } from '../types'; +import type { TagsCapabilities } from '../capabilities'; +import type { AssignableObject } from '../assignments'; export const createReference = (type: string, id: string): SavedObjectReference => ({ type, diff --git a/x-pack/plugins/saved_objects_tagging/common/types.ts b/x-pack/plugins/saved_objects_tagging/common/types.ts index 2ea2ae0b4a363..e82c3c1e0443b 100644 --- a/x-pack/plugins/saved_objects_tagging/common/types.ts +++ b/x-pack/plugins/saved_objects_tagging/common/types.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { SavedObject } from '@kbn/core/types'; +import type { SavedObject } from '@kbn/core/types'; import type { Tag, TagAttributes } from '@kbn/saved-objects-tagging-oss-plugin/common'; export type TagSavedObject = SavedObject; @@ -20,6 +20,7 @@ export type TagWithRelations = Tag & { // re-export types from oss definition export type { Tag, + CreateTagOptions, TagAttributes, TagWithOptionalId, GetAllTagsOptions, diff --git a/x-pack/plugins/saved_objects_tagging/common/validation.ts b/x-pack/plugins/saved_objects_tagging/common/validation.ts index 6f5d7a672c0cc..feea7ba890448 100644 --- a/x-pack/plugins/saved_objects_tagging/common/validation.ts +++ b/x-pack/plugins/saved_objects_tagging/common/validation.ts @@ -6,7 +6,7 @@ */ import { i18n } from '@kbn/i18n'; -import { Tag } from './types'; +import type { Tag } from './types'; export const tagNameMinLength = 2; export const tagNameMaxLength = 50; diff --git a/x-pack/plugins/saved_objects_tagging/public/components/base/tag_badge.tsx b/x-pack/plugins/saved_objects_tagging/public/components/base/tag_badge.tsx index d2367219aa823..d6cbbb47fe451 100644 --- a/x-pack/plugins/saved_objects_tagging/public/components/base/tag_badge.tsx +++ b/x-pack/plugins/saved_objects_tagging/public/components/base/tag_badge.tsx @@ -5,10 +5,10 @@ * 2.0. */ -import React, { ReactElement } from 'react'; +import React, { type ReactElement } from 'react'; import { EuiBadge } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { TagAttributes } from '../../../common/types'; +import type { TagAttributes } from '../../../common/types'; export interface TagBadgeProps { tag: T; diff --git a/x-pack/plugins/saved_objects_tagging/public/components/base/tag_list.tsx b/x-pack/plugins/saved_objects_tagging/public/components/base/tag_list.tsx index cfe67c5ed0827..9ed583147464f 100644 --- a/x-pack/plugins/saved_objects_tagging/public/components/base/tag_list.tsx +++ b/x-pack/plugins/saved_objects_tagging/public/components/base/tag_list.tsx @@ -5,9 +5,9 @@ * 2.0. */ -import React, { FC } from 'react'; +import React, { type FC } from 'react'; import { EuiBadgeGroup } from '@elastic/eui'; -import { TagWithOptionalId } from '../../../common/types'; +import type { TagWithOptionalId } from '../../../common/types'; import { TagBadge } from './tag_badge'; export interface TagListProps { diff --git a/x-pack/plugins/saved_objects_tagging/public/components/base/tag_searchbar_option.tsx b/x-pack/plugins/saved_objects_tagging/public/components/base/tag_searchbar_option.tsx index 4abafe10345bb..c691d5120fa36 100644 --- a/x-pack/plugins/saved_objects_tagging/public/components/base/tag_searchbar_option.tsx +++ b/x-pack/plugins/saved_objects_tagging/public/components/base/tag_searchbar_option.tsx @@ -5,9 +5,9 @@ * 2.0. */ -import React, { FC } from 'react'; +import React, { type FC } from 'react'; import { EuiHealth, EuiText } from '@elastic/eui'; -import { Tag } from '../../../common'; +import type { Tag } from '../../../common/types'; import { testSubjFriendly } from '../../utils'; export interface TagSearchBarOptionProps { diff --git a/x-pack/plugins/saved_objects_tagging/public/components/base/tag_selector.tsx b/x-pack/plugins/saved_objects_tagging/public/components/base/tag_selector.tsx index 119058cc54c1f..039ac294690ab 100644 --- a/x-pack/plugins/saved_objects_tagging/public/components/base/tag_selector.tsx +++ b/x-pack/plugins/saved_objects_tagging/public/components/base/tag_selector.tsx @@ -5,7 +5,7 @@ * 2.0. */ -import React, { FC, useMemo, useCallback, useState } from 'react'; +import React, { type FC, useMemo, useCallback, useState } from 'react'; import { EuiComboBox, EuiHealth, @@ -17,9 +17,9 @@ import { EuiComboBoxProps, } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n-react'; -import { Tag } from '../../../common'; +import type { Tag } from '../../../common/types'; import { testSubjFriendly } from '../../utils'; -import { CreateModalOpener } from '../edition_modal'; +import type { CreateModalOpener } from '../edition_modal'; interface CreateOption { type: '__create_option__'; diff --git a/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_list.tsx b/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_list.tsx index 46deb57db7f40..d3c65926fa00f 100644 --- a/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_list.tsx +++ b/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_list.tsx @@ -5,14 +5,14 @@ * 2.0. */ -import React, { FC, useMemo } from 'react'; +import React, { type FC, useMemo } from 'react'; import useObservable from 'react-use/lib/useObservable'; -import { SavedObjectReference } from '@kbn/core/types'; -import { TagListComponentProps } from '@kbn/saved-objects-tagging-oss-plugin/public'; -import { Tag, TagWithOptionalId } from '../../../common/types'; +import type { SavedObjectReference } from '@kbn/core/types'; +import type { TagListComponentProps } from '@kbn/saved-objects-tagging-oss-plugin/public'; +import type { Tag, TagWithOptionalId } from '../../../common/types'; import { getObjectTags } from '../../utils'; import { TagList } from '../base'; -import { ITagsCache } from '../../services'; +import type { ITagsCache } from '../../services'; import { byNameTagSorter } from '../../utils'; interface SavedObjectTagListProps { diff --git a/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_selector.tsx b/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_selector.tsx index f5d8ea56cf0ac..85d3b2df80c11 100644 --- a/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_selector.tsx +++ b/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_selector.tsx @@ -5,13 +5,13 @@ * 2.0. */ -import React, { FC } from 'react'; +import React, { type FC } from 'react'; import useObservable from 'react-use/lib/useObservable'; -import { TagSelectorComponentProps } from '@kbn/saved-objects-tagging-oss-plugin/public'; -import { TagsCapabilities } from '../../../common'; +import type { TagSelectorComponentProps } from '@kbn/saved-objects-tagging-oss-plugin/public'; +import type { TagsCapabilities } from '../../../common'; import { TagSelector } from '../base'; -import { ITagsCache } from '../../services'; -import { CreateModalOpener } from '../edition_modal'; +import type { ITagsCache } from '../../services'; +import type { CreateModalOpener } from '../edition_modal'; interface GetConnectedTagSelectorOptions { cache: ITagsCache; diff --git a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_modal.test.tsx b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_modal.test.tsx index 598720c9359bf..c94ef0630d016 100644 --- a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_modal.test.tsx +++ b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_modal.test.tsx @@ -8,8 +8,8 @@ import React from 'react'; import { render, screen } from '@testing-library/react'; import { CreateTagModal } from './create_modal'; -import { IToasts, NotificationsStart } from '@kbn/core-notifications-browser'; -import { ITagsClient, Tag } from '@kbn/saved-objects-tagging-oss-plugin/common'; +import type { IToasts, NotificationsStart } from '@kbn/core-notifications-browser'; +import type { ITagsClient, Tag } from '../../../common/types'; import { I18nProvider } from '@kbn/i18n-react'; import userEvent from '@testing-library/user-event'; import { duplicateTagNameErrorMessage, managedTagConflictMessage } from './utils'; diff --git a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_modal.tsx b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_modal.tsx index 9f270771b3cc7..22710253cfb2a 100644 --- a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_modal.tsx +++ b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_modal.tsx @@ -5,12 +5,12 @@ * 2.0. */ -import React, { FC, useState, useCallback } from 'react'; +import React, { type FC, useState, useCallback } from 'react'; import { first, lastValueFrom } from 'rxjs'; import { i18n } from '@kbn/i18n'; import type { NotificationsStart } from '@kbn/core/public'; -import { ITagsClient, Tag, TagAttributes } from '../../../common/types'; +import type { ITagsClient, Tag, TagAttributes } from '../../../common/types'; import { isServerValidationError } from '../../services/tags'; import { getRandomColor, validateTag } from './utils'; import { CreateOrEditModal } from './create_or_edit_modal'; diff --git a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_or_edit_modal.tsx b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_or_edit_modal.tsx index 4c35b35a79343..2f9af6f33707e 100644 --- a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_or_edit_modal.tsx +++ b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_or_edit_modal.tsx @@ -5,7 +5,7 @@ * 2.0. */ -import React, { FC, useState, useCallback, useMemo, useRef } from 'react'; +import React, { type FC, useState, useCallback, useMemo, useRef } from 'react'; import { EuiButtonEmpty, EuiButton, @@ -28,9 +28,9 @@ import { import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; import useDebounce from 'react-use/lib/useDebounce'; +import type { TagAttributes } from '../../../common/types'; import { - TagAttributes, - TagValidation, + type TagValidation, validateTagColor, tagNameMaxLength, tagDescriptionMaxLength, diff --git a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/edit_modal.tsx b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/edit_modal.tsx index b8eb6f9a33246..df16cd971ce7c 100644 --- a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/edit_modal.tsx +++ b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/edit_modal.tsx @@ -5,11 +5,11 @@ * 2.0. */ -import React, { FC, useState, useCallback } from 'react'; +import React, { type FC, useState, useCallback } from 'react'; import { i18n } from '@kbn/i18n'; import type { NotificationsStart } from '@kbn/core/public'; import { first, lastValueFrom } from 'rxjs'; -import { ITagsClient, Tag, TagAttributes } from '../../../common/types'; +import type { ITagsClient, Tag, TagAttributes } from '../../../common/types'; import { isServerValidationError } from '../../services/tags'; import { CreateOrEditModal } from './create_or_edit_modal'; import { validateTag } from './utils'; diff --git a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/open_modal.tsx b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/open_modal.tsx index 63a784aa09c4d..cb11d2b625a70 100644 --- a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/open_modal.tsx +++ b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/open_modal.tsx @@ -9,9 +9,9 @@ import React from 'react'; import { EuiDelayRender, EuiLoadingSpinner } from '@elastic/eui'; import type { OverlayRef } from '@kbn/core/public'; import { toMountPoint } from '@kbn/react-kibana-mount'; -import { Tag, TagAttributes } from '../../../common/types'; -import { ITagInternalClient } from '../../services'; -import { StartServices } from '../../types'; +import type { Tag, TagAttributes } from '../../../common/types'; +import type { ITagInternalClient } from '../../services'; +import type { StartServices } from '../../types'; interface GetModalOpenerOptions extends StartServices { tagClient: ITagInternalClient; diff --git a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/use_validation.ts b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/use_validation.ts index 4c4c1d3ab4dac..7ea44dae656d4 100644 --- a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/use_validation.ts +++ b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/use_validation.ts @@ -9,8 +9,8 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { BehaviorSubject } from 'rxjs'; import useObservable from 'react-use/lib/useObservable'; -import { type TagValidation, validateTagName } from '../../../common'; import type { ITagsClient, TagAttributes } from '../../../common/types'; +import { type TagValidation, validateTagName } from '../../../common'; import { duplicateTagNameErrorMessage, managedTagConflictMessage, validateTag } from './utils'; const initialValidation: TagValidation = { diff --git a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/utils.ts b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/utils.ts index e5b98b35a18ae..60e5d17dc3cb3 100644 --- a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/utils.ts +++ b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/utils.ts @@ -8,9 +8,9 @@ import { useCallback, useEffect, useRef } from 'react'; import { i18n } from '@kbn/i18n'; +import type { TagAttributes } from '../../../common/types'; import { - TagAttributes, - TagValidation, + type TagValidation, validateTagColor, validateTagName, validateTagDescription, diff --git a/x-pack/plugins/saved_objects_tagging/public/index.ts b/x-pack/plugins/saved_objects_tagging/public/index.ts index aecd9405af01a..e0e401be8d841 100644 --- a/x-pack/plugins/saved_objects_tagging/public/index.ts +++ b/x-pack/plugins/saved_objects_tagging/public/index.ts @@ -9,7 +9,6 @@ import { PluginInitializerContext } from '@kbn/core/public'; import { SavedObjectTaggingPlugin } from './plugin'; export type { SavedObjectTaggingPluginStart } from './types'; -export type { Tag } from '../common'; export const plugin = (initializerContext: PluginInitializerContext) => new SavedObjectTaggingPlugin(initializerContext); diff --git a/x-pack/plugins/saved_objects_tagging/public/management/actions/assign.ts b/x-pack/plugins/saved_objects_tagging/public/management/actions/assign.ts index 7513b9d89c14b..17c740eb68f43 100644 --- a/x-pack/plugins/saved_objects_tagging/public/management/actions/assign.ts +++ b/x-pack/plugins/saved_objects_tagging/public/management/actions/assign.ts @@ -7,7 +7,7 @@ import { i18n } from '@kbn/i18n'; import { Observable, from, takeUntil } from 'rxjs'; -import { TagWithRelations } from '../../../common'; +import { TagWithRelations } from '../../../common/types'; import { getAssignFlyoutOpener } from '../../components/assign_flyout'; import { ITagAssignmentService } from '../../services/assignments'; import { ITagsCache } from '../../services/tags'; diff --git a/x-pack/plugins/saved_objects_tagging/public/management/actions/delete.ts b/x-pack/plugins/saved_objects_tagging/public/management/actions/delete.ts index 58aa3e71a65cc..48ad835170ffd 100644 --- a/x-pack/plugins/saved_objects_tagging/public/management/actions/delete.ts +++ b/x-pack/plugins/saved_objects_tagging/public/management/actions/delete.ts @@ -7,7 +7,7 @@ import { i18n } from '@kbn/i18n'; import { NotificationsStart, OverlayStart } from '@kbn/core/public'; -import { TagWithRelations } from '../../../common'; +import { TagWithRelations } from '../../../common/types'; import { ITagInternalClient } from '../../services/tags'; import { TagAction } from './types'; diff --git a/x-pack/plugins/saved_objects_tagging/public/management/actions/edit.ts b/x-pack/plugins/saved_objects_tagging/public/management/actions/edit.ts index 87b1d4ff32fd3..e19157b53ff02 100644 --- a/x-pack/plugins/saved_objects_tagging/public/management/actions/edit.ts +++ b/x-pack/plugins/saved_objects_tagging/public/management/actions/edit.ts @@ -6,7 +6,7 @@ */ import { i18n } from '@kbn/i18n'; -import { TagWithRelations } from '../../../common'; +import { TagWithRelations } from '../../../common/types'; import { getEditModalOpener } from '../../components/edition_modal'; import { ITagInternalClient } from '../../services/tags'; import { StartServices } from '../../types'; diff --git a/x-pack/plugins/saved_objects_tagging/public/management/actions/types.ts b/x-pack/plugins/saved_objects_tagging/public/management/actions/types.ts index 6a4a47181c822..208e118c56c77 100644 --- a/x-pack/plugins/saved_objects_tagging/public/management/actions/types.ts +++ b/x-pack/plugins/saved_objects_tagging/public/management/actions/types.ts @@ -6,7 +6,7 @@ */ import { Action as EuiTableAction } from '@elastic/eui/src/components/basic_table/action_types'; -import { TagWithRelations } from '../../../common'; +import { TagWithRelations } from '../../../common/types'; export type TagAction = EuiTableAction & { id: string; diff --git a/x-pack/plugins/saved_objects_tagging/public/management/components/table.tsx b/x-pack/plugins/saved_objects_tagging/public/management/components/table.tsx index f75d89d4b0ddf..cde4049a3a82b 100644 --- a/x-pack/plugins/saved_objects_tagging/public/management/components/table.tsx +++ b/x-pack/plugins/saved_objects_tagging/public/management/components/table.tsx @@ -10,7 +10,8 @@ import { EuiInMemoryTable, EuiBasicTableColumn, EuiLink, Query, EuiIconTip } fro import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; import { euiThemeVars } from '@kbn/ui-theme'; -import { TagsCapabilities, TagWithRelations } from '../../../common'; +import { TagsCapabilities } from '../../../common'; +import type { TagWithRelations } from '../../../common/types'; import { TagBadge } from '../../components'; import { TagAction } from '../actions'; diff --git a/x-pack/plugins/saved_objects_tagging/public/management/tag_management_page.tsx b/x-pack/plugins/saved_objects_tagging/public/management/tag_management_page.tsx index 659861a2a0eac..2a84ccdb9a6b5 100644 --- a/x-pack/plugins/saved_objects_tagging/public/management/tag_management_page.tsx +++ b/x-pack/plugins/saved_objects_tagging/public/management/tag_management_page.tsx @@ -12,10 +12,11 @@ import { Query } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { ChromeBreadcrumb, CoreStart } from '@kbn/core/public'; import { EuiSpacer } from '@elastic/eui'; -import { TagWithRelations, TagsCapabilities } from '../../common'; +import { TagsCapabilities } from '../../common'; +import type { TagWithRelations } from '../../common/types'; import { getCreateModalOpener } from '../components/edition_modal'; import { ITagInternalClient, ITagAssignmentService, ITagsCache } from '../services'; -import { TagBulkAction } from './types'; +import type { TagBulkAction } from './types'; import { Header, TagTable, ActionBar } from './components'; import { getTableActions } from './actions'; import { getBulkActions } from './bulk_actions'; diff --git a/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.test.ts b/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.test.ts index 35996639332c4..f9457cec01a86 100644 --- a/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.test.ts +++ b/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.test.ts @@ -7,7 +7,7 @@ import { httpServiceMock } from '@kbn/core/public/mocks'; import { getTagConnectionsUrl } from './get_tag_connections_url'; -import { TagWithRelations } from '../../../common/types'; +import type { TagWithRelations } from '../../../common/types'; const createTag = (name: string): TagWithRelations => ({ id: 'tag-id', diff --git a/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.ts b/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.ts index 0afa8d6781732..8c1da4cfb1d34 100644 --- a/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.ts +++ b/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { IBasePath } from '@kbn/core/public'; -import { TagWithRelations } from '../../../common/types'; +import type { IBasePath } from '@kbn/core/public'; +import type { TagWithRelations } from '../../../common/types'; /** * Returns the url to use to redirect to the SavedObject management section with given tag diff --git a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.test.ts b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.test.ts index 633c7185eac62..3d6217ff8e62e 100644 --- a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.test.ts +++ b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.test.ts @@ -6,8 +6,8 @@ */ import moment from 'moment'; -import { Tag, TagAttributes } from '../../../common/types'; -import { TagsCache, CacheRefreshHandler } from './tags_cache'; +import type { Tag, TagAttributes } from '../../../common/types'; +import { TagsCache, type CacheRefreshHandler } from './tags_cache'; const createTag = (parts: Partial): Tag => ({ id: 'tag-id', diff --git a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.ts b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.ts index 512c524cdbd27..facb5b263c818 100644 --- a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.ts +++ b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.ts @@ -5,11 +5,11 @@ * 2.0. */ -import { Duration } from 'moment'; -import { Observable, BehaviorSubject, Subject } from 'rxjs'; +import type { Duration } from 'moment'; +import { type Observable, BehaviorSubject, Subject } from 'rxjs'; import { takeUntil, first, mergeMap } from 'rxjs'; -import { ITagsCache } from '@kbn/saved-objects-tagging-oss-plugin/public'; -import { Tag, TagAttributes } from '../../../common/types'; +import type { ITagsCache } from '@kbn/saved-objects-tagging-oss-plugin/public'; +import type { Tag, TagAttributes } from '../../../common/types'; export type { ITagsCache }; diff --git a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.test.ts b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.test.ts index 6afafa3c2db21..576d4ce172c02 100644 --- a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.test.ts +++ b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.test.ts @@ -6,10 +6,10 @@ */ import { httpServiceMock } from '@kbn/core/public/mocks'; -import { Tag } from '../../../common/types'; +import type { Tag } from '../../../common/types'; import { createTag, createTagAttributes } from '../../../common/test_utils'; import { tagsCacheMock } from './tags_cache.mock'; -import { TagsClient, FindTagsOptions } from './tags_client'; +import { TagsClient, type FindTagsOptions } from './tags_client'; import { coreMock } from '@kbn/core/public/mocks'; describe('TagsClient', () => { diff --git a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.ts b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.ts index 224c658632523..17a138f051f82 100644 --- a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.ts +++ b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.ts @@ -5,16 +5,16 @@ * 2.0. */ -import { HttpSetup, AnalyticsServiceStart } from '@kbn/core/public'; +import type { HttpSetup, AnalyticsServiceStart } from '@kbn/core/public'; import { reportPerformanceMetricEvent } from '@kbn/ebt-tools'; -import { +import type { Tag, TagAttributes, GetAllTagsOptions, ITagsClient, TagWithRelations, } from '../../../common/types'; -import { ITagsChangeListener } from './tags_cache'; +import type { ITagsChangeListener } from './tags_cache'; const BULK_DELETE_TAG_EVENT = 'bulkDeleteTag'; const CREATE_TAG_EVENT = 'createTag'; diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.test.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.test.ts index e5216ea209177..7f200fcd3887d 100644 --- a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.test.ts +++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.test.ts @@ -5,9 +5,9 @@ * 2.0. */ -import { SavedObjectsTaggingApiUi } from '@kbn/saved-objects-tagging-oss-plugin/public'; +import type { SavedObjectsTaggingApiUi } from '@kbn/saved-objects-tagging-oss-plugin/public'; import { tagsCacheMock } from '../services/tags/tags_cache.mock'; -import { Tag } from '../../common/types'; +import type { Tag } from '../../common/types'; import { createTag } from '../../common/test_utils'; import { buildGetSearchBarFilter } from './get_search_bar_filter'; diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.tsx b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.tsx index 25e674bbf39d2..a70facdb21b3d 100644 --- a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.tsx +++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.tsx @@ -7,12 +7,12 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; -import { +import type { SavedObjectsTaggingApiUi, GetSearchBarFilterOptions, } from '@kbn/saved-objects-tagging-oss-plugin/public'; -import { Tag } from '../../common'; +import type { Tag } from '../../common/types'; import { TagSearchBarOption } from '../components'; export interface BuildGetSearchBarFilterOptions { diff --git a/x-pack/plugins/saved_objects_tagging/public/utils.ts b/x-pack/plugins/saved_objects_tagging/public/utils.ts index 38ae79f3ca033..c8137b694d307 100644 --- a/x-pack/plugins/saved_objects_tagging/public/utils.ts +++ b/x-pack/plugins/saved_objects_tagging/public/utils.ts @@ -5,9 +5,10 @@ * 2.0. */ -import { SavedObject, SavedObjectReference } from '@kbn/core/types'; -import { SavedObjectsFindOptionsReference } from '@kbn/core/public'; -import { Tag, tagSavedObjectTypeName } from '../common'; +import type { SavedObject, SavedObjectReference } from '@kbn/core/types'; +import type { SavedObjectsFindOptionsReference } from '@kbn/core/public'; +import type { Tag } from '../common/types'; +import { tagSavedObjectTypeName } from '../common'; type SavedObjectReferenceLike = SavedObjectReference | SavedObjectsFindOptionsReference; diff --git a/x-pack/plugins/saved_objects_tagging/server/index.ts b/x-pack/plugins/saved_objects_tagging/server/index.ts index 8c0d4f98b6994..3a33c6073c546 100644 --- a/x-pack/plugins/saved_objects_tagging/server/index.ts +++ b/x-pack/plugins/saved_objects_tagging/server/index.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { PluginInitializerContext } from '@kbn/core/server'; +import type { PluginInitializerContext } from '@kbn/core/server'; export { config } from './config'; export type { @@ -14,7 +14,6 @@ export type { CreateTagClientOptions, } from './types'; export type { IAssignmentService } from './services'; -export type { ITagsClient } from '../common'; export const plugin = async (initializerContext: PluginInitializerContext) => { const { SavedObjectTaggingPlugin } = await import('./plugin'); diff --git a/x-pack/plugins/saved_objects_tagging/server/request_handler_context.ts b/x-pack/plugins/saved_objects_tagging/server/request_handler_context.ts index 00f0de038851c..92cf2a7189f14 100644 --- a/x-pack/plugins/saved_objects_tagging/server/request_handler_context.ts +++ b/x-pack/plugins/saved_objects_tagging/server/request_handler_context.ts @@ -6,10 +6,10 @@ */ import type { CoreRequestHandlerContext, KibanaRequest } from '@kbn/core/server'; -import { SecurityPluginSetup } from '@kbn/security-plugin/server'; -import { ITagsClient } from '../common/types'; -import { ITagsRequestHandlerContext } from './types'; -import { TagsClient, IAssignmentService, AssignmentService } from './services'; +import type { SecurityPluginSetup } from '@kbn/security-plugin/server'; +import type { ITagsClient } from '../common/types'; +import type { ITagsRequestHandlerContext } from './types'; +import { TagsClient, type IAssignmentService, AssignmentService } from './services'; export class TagsRequestHandlerContext implements ITagsRequestHandlerContext { #client?: ITagsClient; diff --git a/x-pack/plugins/saved_objects_tagging/server/routes/internal/find_tags.ts b/x-pack/plugins/saved_objects_tagging/server/routes/internal/find_tags.ts index 8da060eda0cca..78286b160d218 100644 --- a/x-pack/plugins/saved_objects_tagging/server/routes/internal/find_tags.ts +++ b/x-pack/plugins/saved_objects_tagging/server/routes/internal/find_tags.ts @@ -6,9 +6,9 @@ */ import { schema } from '@kbn/config-schema'; +import type { TagAttributes } from '../../../common/types'; import type { TagsPluginRouter } from '../../types'; import { tagSavedObjectTypeName } from '../../../common/constants'; -import { TagAttributes } from '../../../common/types'; import { savedObjectToTag } from '../../services/tags'; import { addConnectionCount } from '../lib'; diff --git a/x-pack/plugins/saved_objects_tagging/server/routes/lib/get_connection_count.ts b/x-pack/plugins/saved_objects_tagging/server/routes/lib/get_connection_count.ts index e0fe44d65c015..cfbe0f15d2dd7 100644 --- a/x-pack/plugins/saved_objects_tagging/server/routes/lib/get_connection_count.ts +++ b/x-pack/plugins/saved_objects_tagging/server/routes/lib/get_connection_count.ts @@ -5,13 +5,13 @@ * 2.0. */ -import { +import type { SavedObjectsClientContract, SavedObjectsFindOptionsReference, SavedObject, } from '@kbn/core/server'; +import type { Tag, TagAttributes, TagWithRelations } from '../../../common/types'; import { tagSavedObjectTypeName } from '../../../common/constants'; -import { Tag, TagAttributes, TagWithRelations } from '../../../common/types'; export const addConnectionCount = async ( tags: Tag[], diff --git a/x-pack/plugins/saved_objects_tagging/server/saved_objects/tag.ts b/x-pack/plugins/saved_objects_tagging/server/saved_objects/tag.ts index d9e51dddea553..53e75ce6fa34c 100644 --- a/x-pack/plugins/saved_objects_tagging/server/saved_objects/tag.ts +++ b/x-pack/plugins/saved_objects_tagging/server/saved_objects/tag.ts @@ -5,8 +5,9 @@ * 2.0. */ -import { SavedObject, SavedObjectsType } from '@kbn/core/server'; -import { tagSavedObjectTypeName, TagAttributes } from '../../common'; +import type { SavedObject, SavedObjectsType } from '@kbn/core/server'; +import type { TagAttributes } from '../../common/types'; +import { tagSavedObjectTypeName } from '../../common'; export const tagType: SavedObjectsType = { name: tagSavedObjectTypeName, diff --git a/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.mock.ts b/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.mock.ts index 9507208971d84..5189f828f9606 100644 --- a/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.mock.ts +++ b/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.mock.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ITagsClient } from '../../../common/types'; +import type { ITagsClient } from '../../../common/types'; const createClientMock = () => { const mock: jest.Mocked = { diff --git a/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.test.ts b/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.test.ts index f12e147d87270..4666d0db2462d 100644 --- a/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.test.ts +++ b/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.test.ts @@ -8,8 +8,8 @@ import { validateTagMock } from './tags_client.test.mocks'; import { savedObjectsClientMock } from '@kbn/core/server/mocks'; -import { TagAttributes, TagSavedObject } from '../../../common/types'; -import { TagValidation } from '../../../common/validation'; +import type { TagAttributes, TagSavedObject } from '../../../common/types'; +import type { TagValidation } from '../../../common/validation'; import { TagsClient } from './tags_client'; import { TagValidationError } from './errors'; diff --git a/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.ts b/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.ts index f213f279975a3..8917eda90ca17 100644 --- a/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.ts +++ b/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.ts @@ -5,9 +5,14 @@ * 2.0. */ -import { SavedObjectsClientContract } from '@kbn/core/server'; -import { CreateTagOptions, Tag } from '@kbn/saved-objects-tagging-oss-plugin/common/types'; -import { TagSavedObject, TagAttributes, ITagsClient } from '../../../common/types'; +import type { SavedObjectsClientContract } from '@kbn/core/server'; +import type { + CreateTagOptions, + ITagsClient, + Tag, + TagAttributes, + TagSavedObject, +} from '../../../common/types'; import { tagSavedObjectTypeName } from '../../../common/constants'; import { TagValidationError } from './errors'; import { validateTag } from './validate_tag'; diff --git a/x-pack/plugins/saved_objects_tagging/server/services/tags/utils.ts b/x-pack/plugins/saved_objects_tagging/server/services/tags/utils.ts index e6ce04d40c409..203fc9f69c2eb 100644 --- a/x-pack/plugins/saved_objects_tagging/server/services/tags/utils.ts +++ b/x-pack/plugins/saved_objects_tagging/server/services/tags/utils.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { Tag, TagSavedObject } from '../../../common/types'; +import type { Tag, TagSavedObject } from '../../../common/types'; export const savedObjectToTag = (savedObject: TagSavedObject): Tag => { return { diff --git a/x-pack/plugins/saved_objects_tagging/server/services/tags/validate_tag.test.ts b/x-pack/plugins/saved_objects_tagging/server/services/tags/validate_tag.test.ts index d5ede58b6c8c2..857471bc6ce2c 100644 --- a/x-pack/plugins/saved_objects_tagging/server/services/tags/validate_tag.test.ts +++ b/x-pack/plugins/saved_objects_tagging/server/services/tags/validate_tag.test.ts @@ -5,13 +5,13 @@ * 2.0. */ +import type { TagAttributes } from '../../../common/types'; import { validateTagColorMock, validateTagNameMock, validateTagDescriptionMock, } from './validate_tag.test.mocks'; -import { TagAttributes } from '../../../common/types'; import { validateTag } from './validate_tag'; const createAttributes = (parts: Partial = {}): TagAttributes => ({ diff --git a/x-pack/plugins/saved_objects_tagging/server/services/tags/validate_tag.ts b/x-pack/plugins/saved_objects_tagging/server/services/tags/validate_tag.ts index 1bc1bc759868f..f3d72f2098dcc 100644 --- a/x-pack/plugins/saved_objects_tagging/server/services/tags/validate_tag.ts +++ b/x-pack/plugins/saved_objects_tagging/server/services/tags/validate_tag.ts @@ -5,9 +5,9 @@ * 2.0. */ -import { TagAttributes } from '../../../common/types'; +import type { TagAttributes } from '../../../common/types'; import { - TagValidation, + type TagValidation, validateTagColor, validateTagName, validateTagDescription, diff --git a/x-pack/plugins/saved_objects_tagging/server/types.ts b/x-pack/plugins/saved_objects_tagging/server/types.ts index 0bc023214151d..156be38e79a0d 100644 --- a/x-pack/plugins/saved_objects_tagging/server/types.ts +++ b/x-pack/plugins/saved_objects_tagging/server/types.ts @@ -10,8 +10,8 @@ import type { CustomRequestHandlerContext, SavedObjectsClientContract, } from '@kbn/core/server'; -import { ITagsClient } from '../common/types'; -import { IAssignmentService } from './services'; +import type { ITagsClient } from '../common/types'; +import type { IAssignmentService } from './services'; export interface ITagsRequestHandlerContext { tagsClient: ITagsClient; diff --git a/x-pack/plugins/security_solution/public/common/containers/tags/api.ts b/x-pack/plugins/security_solution/public/common/containers/tags/api.ts index 7e0f307c9926d..e0c38aeaecea7 100644 --- a/x-pack/plugins/security_solution/public/common/containers/tags/api.ts +++ b/x-pack/plugins/security_solution/public/common/containers/tags/api.ts @@ -10,7 +10,7 @@ import type { ITagsClient, TagAttributes, Tag as TagResponse, -} from '@kbn/saved-objects-tagging-plugin/common'; +} from '@kbn/saved-objects-tagging-oss-plugin/common'; import { INTERNAL_TAGS_URL } from '../../../../common/constants'; export interface Tag { diff --git a/x-pack/plugins/security_solution/public/dashboards/containers/use_fetch_security_tags.test.ts b/x-pack/plugins/security_solution/public/dashboards/containers/use_fetch_security_tags.test.ts index 3dadc008a9efa..e3da086796794 100644 --- a/x-pack/plugins/security_solution/public/dashboards/containers/use_fetch_security_tags.test.ts +++ b/x-pack/plugins/security_solution/public/dashboards/containers/use_fetch_security_tags.test.ts @@ -15,7 +15,7 @@ import { import { useKibana } from '../../common/lib/kibana'; import { useFetchSecurityTags } from './use_fetch_security_tags'; import { DEFAULT_TAGS_RESPONSE } from '../../common/containers/tags/__mocks__/api'; -import type { ITagsClient } from '@kbn/saved-objects-tagging-plugin/common'; +import type { ITagsClient } from '@kbn/saved-objects-tagging-oss-plugin/common'; import type { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public'; jest.mock('../../common/lib/kibana'); diff --git a/x-pack/plugins/security_solution/public/dashboards/context/dashboard_context.tsx b/x-pack/plugins/security_solution/public/dashboards/context/dashboard_context.tsx index 54b194a2dcbae..1ab2cf16fe7ce 100644 --- a/x-pack/plugins/security_solution/public/dashboards/context/dashboard_context.tsx +++ b/x-pack/plugins/security_solution/public/dashboards/context/dashboard_context.tsx @@ -7,7 +7,7 @@ import type { FC, PropsWithChildren } from 'react'; import React from 'react'; -import type { Tag } from '@kbn/saved-objects-tagging-plugin/common'; +import type { Tag } from '@kbn/saved-objects-tagging-oss-plugin/common'; import { useFetchSecurityTags } from '../containers/use_fetch_security_tags'; export interface TagReference extends Tag { diff --git a/x-pack/plugins/security_solution/server/lib/tags/saved_objects/create_tag.ts b/x-pack/plugins/security_solution/server/lib/tags/saved_objects/create_tag.ts index fac8e22737f12..774851a8a5265 100644 --- a/x-pack/plugins/security_solution/server/lib/tags/saved_objects/create_tag.ts +++ b/x-pack/plugins/security_solution/server/lib/tags/saved_objects/create_tag.ts @@ -10,7 +10,7 @@ import type { SavedObjectReference, SavedObjectsClientContract, } from '@kbn/core/server'; -import type { TagAttributes } from '@kbn/saved-objects-tagging-plugin/common'; +import type { TagAttributes } from '@kbn/saved-objects-tagging-oss-plugin/common'; import { getRandomColor } from '../../../../common/utils/get_ramdom_color'; interface CreateTagParams { diff --git a/x-pack/plugins/security_solution/server/lib/tags/saved_objects/find_tags_by_name.ts b/x-pack/plugins/security_solution/server/lib/tags/saved_objects/find_tags_by_name.ts index 7bcfb38b4313e..1b314c0c961a5 100644 --- a/x-pack/plugins/security_solution/server/lib/tags/saved_objects/find_tags_by_name.ts +++ b/x-pack/plugins/security_solution/server/lib/tags/saved_objects/find_tags_by_name.ts @@ -6,7 +6,7 @@ */ import type { SavedObjectsClientContract, SavedObjectsFindResult } from '@kbn/core/server'; -import type { TagAttributes } from '@kbn/saved-objects-tagging-plugin/common'; +import type { TagAttributes } from '@kbn/saved-objects-tagging-oss-plugin/common'; export const findTagsByName = async ({ savedObjectsClient, diff --git a/x-pack/plugins/security_solution/server/usage/dashboards/get_dashboards_metrics.ts b/x-pack/plugins/security_solution/server/usage/dashboards/get_dashboards_metrics.ts index df56f7c705435..ce964942723d8 100644 --- a/x-pack/plugins/security_solution/server/usage/dashboards/get_dashboards_metrics.ts +++ b/x-pack/plugins/security_solution/server/usage/dashboards/get_dashboards_metrics.ts @@ -6,7 +6,7 @@ */ import type { SavedObjectsClientContract, Logger, SavedObjectsFindResult } from '@kbn/core/server'; -import type { TagWithOptionalId } from '@kbn/saved-objects-tagging-plugin/common'; +import type { TagWithOptionalId } from '@kbn/saved-objects-tagging-oss-plugin/common'; import { SECURITY_TAG_NAME } from '../../../common/constants'; interface GetDashboardMetricsOptions { diff --git a/x-pack/plugins/security_solution/tsconfig.json b/x-pack/plugins/security_solution/tsconfig.json index 4fab53a0ada90..bbebd8f7ace92 100644 --- a/x-pack/plugins/security_solution/tsconfig.json +++ b/x-pack/plugins/security_solution/tsconfig.json @@ -95,7 +95,6 @@ "@kbn/securitysolution-exception-list-components", "@kbn/rison", "@kbn/shared-ux-page-kibana-template", - "@kbn/saved-objects-tagging-plugin", "@kbn/securitysolution-hook-utils", "@kbn/test-jest-helpers", "@kbn/safer-lodash-set",