diff --git a/.github/codeowners-coverage-baseline.txt b/.github/codeowners-coverage-baseline.txt index 5d0a0cc80307..e649a1e84517 100644 --- a/.github/codeowners-coverage-baseline.txt +++ b/.github/codeowners-coverage-baseline.txt @@ -1195,8 +1195,6 @@ static/app/makeLazyloadComponent.spec.tsx static/app/makeLazyloadComponent.tsx static/app/plugins/basePlugin.tsx static/app/plugins/components/issueActions.tsx -static/app/plugins/components/pluginIcon.spec.tsx -static/app/plugins/components/pluginIcon.tsx static/app/plugins/components/settings.tsx static/app/plugins/defaultIssuePlugin.tsx static/app/plugins/defaultPlugin.tsx diff --git a/static/app/components/events/autofix/codingAgentIntegrationCta.tsx b/static/app/components/events/autofix/codingAgentIntegrationCta.tsx index 9b8d9efe1b2f..2f972acc5b65 100644 --- a/static/app/components/events/autofix/codingAgentIntegrationCta.tsx +++ b/static/app/components/events/autofix/codingAgentIntegrationCta.tsx @@ -7,8 +7,8 @@ import {Heading, Text} from '@sentry/scraps/text'; import type {SeerAutomationHandoffConfiguration} from 'sentry/components/events/autofix/types'; import {Placeholder} from 'sentry/components/placeholder'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; import {t, tct} from 'sentry/locale'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; import type {Project} from 'sentry/types/project'; import {trackAnalytics} from 'sentry/utils/analytics'; import {useDetailedProject} from 'sentry/utils/project/useDetailedProject'; diff --git a/static/app/components/events/autofix/githubCopilotIntegrationCta.tsx b/static/app/components/events/autofix/githubCopilotIntegrationCta.tsx index d6b5ee184254..c917c7efca39 100644 --- a/static/app/components/events/autofix/githubCopilotIntegrationCta.tsx +++ b/static/app/components/events/autofix/githubCopilotIntegrationCta.tsx @@ -6,8 +6,8 @@ import {Heading, Text} from '@sentry/scraps/text'; import {organizationIntegrationsCodingAgents} from 'sentry/components/events/autofix/useAutofix'; import {Placeholder} from 'sentry/components/placeholder'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; import {t} from 'sentry/locale'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; import {trackAnalytics} from 'sentry/utils/analytics'; import {useOrganization} from 'sentry/utils/useOrganization'; import {useUser} from 'sentry/utils/useUser'; diff --git a/static/app/components/events/autofix/v3/nextStep.tsx b/static/app/components/events/autofix/v3/nextStep.tsx index 30a71851ab45..9864adf9328c 100644 --- a/static/app/components/events/autofix/v3/nextStep.tsx +++ b/static/app/components/events/autofix/v3/nextStep.tsx @@ -29,8 +29,8 @@ import {PrIterationFeedbackForm} from 'sentry/components/events/autofix/v3/prIte import {IconAdd} from 'sentry/icons/iconAdd'; import {IconChevron} from 'sentry/icons/iconChevron'; import {IconOpen} from 'sentry/icons/iconOpen'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; import {t} from 'sentry/locale'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; import type {Group} from 'sentry/types/group'; import type {OrganizationIntegration} from 'sentry/types/integrations'; import {trackAnalytics} from 'sentry/utils/analytics'; diff --git a/static/app/components/notificationActions/notificationActionItem.tsx b/static/app/components/notificationActions/notificationActionItem.tsx index 9aab90683a30..8627795e3f45 100644 --- a/static/app/components/notificationActions/notificationActionItem.tsx +++ b/static/app/components/notificationActions/notificationActionItem.tsx @@ -18,8 +18,8 @@ import {DropdownMenu} from 'sentry/components/dropdownMenu'; import {OnCallServiceForm} from 'sentry/components/notificationActions/forms/onCallServiceForm'; import {SlackForm} from 'sentry/components/notificationActions/forms/slackForm'; import {IconEllipsis, IconMail} from 'sentry/icons'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; import {t} from 'sentry/locale'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; import type { AvailableNotificationAction, NotificationAction, diff --git a/static/app/components/workflowEngine/ui/actionMetadata.tsx b/static/app/components/workflowEngine/ui/actionMetadata.tsx index b3e45ca8395c..bdb8e69d4f77 100644 --- a/static/app/components/workflowEngine/ui/actionMetadata.tsx +++ b/static/app/components/workflowEngine/ui/actionMetadata.tsx @@ -1,8 +1,8 @@ import styled from '@emotion/styled'; import {IconMail} from 'sentry/icons'; +import {PluginIcon, type PluginIconProps} from 'sentry/icons/pluginIcon'; import {t} from 'sentry/locale'; -import {PluginIcon, type PluginIconProps} from 'sentry/plugins/components/pluginIcon'; import {ActionType} from 'sentry/types/workflowEngine/actions'; const ICON_SIZE = 20; diff --git a/static/app/debug/notifications/previews/slackPreview.tsx b/static/app/debug/notifications/previews/slackPreview.tsx index ac65abe10b01..353196cf0f72 100644 --- a/static/app/debug/notifications/previews/slackPreview.tsx +++ b/static/app/debug/notifications/previews/slackPreview.tsx @@ -14,7 +14,7 @@ import { NotificationProviderKey, type NotificationTemplateRegistration, } from 'sentry/debug/notifications/types'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; const SLACK_PREVIEW_BASE_URL = 'https://app.slack.com/block-kit-builder/'; diff --git a/static/app/debug/notifications/previews/teamsPreview.tsx b/static/app/debug/notifications/previews/teamsPreview.tsx index 6265fc07d66c..1110307b3996 100644 --- a/static/app/debug/notifications/previews/teamsPreview.tsx +++ b/static/app/debug/notifications/previews/teamsPreview.tsx @@ -15,8 +15,8 @@ import { type NotificationTemplateRegistration, } from 'sentry/debug/notifications/types'; import {IconCheckmark, IconCopy} from 'sentry/icons'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; import {t} from 'sentry/locale'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; import {useCopyToClipboard} from 'sentry/utils/useCopyToClipboard'; const MSTEAMS_PREVIEW_URL = 'https://adaptivecards.microsoft.com/designer.html'; diff --git a/static/app/icons/icons.stories.tsx b/static/app/icons/icons.stories.tsx index dc84adbf75ab..a073c820a2eb 100644 --- a/static/app/icons/icons.stories.tsx +++ b/static/app/icons/icons.stories.tsx @@ -13,16 +13,13 @@ import {Tooltip} from '@sentry/scraps/tooltip'; import {Sticky} from 'sentry/components/sticky'; import * as Icons from 'sentry/icons'; +import {IdentityIcon, type IdentityIconProps} from 'sentry/icons/identityIcon'; +import {PluginIcon, type PluginIconProps} from 'sentry/icons/pluginIcon'; import {type SVGIconProps} from 'sentry/icons/svgIcon'; -import {PluginIcon, type PluginIconProps} from 'sentry/plugins/components/pluginIcon'; import {fzf} from 'sentry/utils/search/fzf'; import {useCopyToClipboard} from 'sentry/utils/useCopyToClipboard'; import {useKeyPress} from 'sentry/utils/useKeyPress'; import {usePrismTokens} from 'sentry/utils/usePrismTokens'; -import { - IdentityIcon, - type IdentityIconProps, -} from 'sentry/views/settings/components/identityIcon'; type TIcon = { id: string; @@ -1732,7 +1729,7 @@ function PluginIconsSection({searchTerm}: {searchTerm: string}) { renderIcon={(icon: TIcon) => ( {icon.name} @@ -1784,7 +1781,7 @@ function IdentityIconsSection({searchTerm}: {searchTerm: string}) { name: 'IdentityIcon', defaultProps: {providerId: identity.id}, }} - importSource="sentry/views/settings/components/identityIcon" + importSource="sentry/icons/identityIcon" > {identity.name} diff --git a/static/app/views/settings/components/identityIcon.tsx b/static/app/icons/identityIcon.tsx similarity index 100% rename from static/app/views/settings/components/identityIcon.tsx rename to static/app/icons/identityIcon.tsx diff --git a/static/app/plugins/components/pluginIcon.spec.tsx b/static/app/icons/pluginIcon.spec.tsx similarity index 86% rename from static/app/plugins/components/pluginIcon.spec.tsx rename to static/app/icons/pluginIcon.spec.tsx index 313235c6b7b6..44b101d3a8f5 100644 --- a/static/app/plugins/components/pluginIcon.spec.tsx +++ b/static/app/icons/pluginIcon.spec.tsx @@ -1,6 +1,6 @@ import {render} from 'sentry-test/reactTestingLibrary'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; // For some reason jest only respects the last mocked, so we can't test // two different images here diff --git a/static/app/plugins/components/pluginIcon.tsx b/static/app/icons/pluginIcon.tsx similarity index 100% rename from static/app/plugins/components/pluginIcon.tsx rename to static/app/icons/pluginIcon.tsx diff --git a/static/app/views/alerts/rules/issue/addIntegrationRow.tsx b/static/app/views/alerts/rules/issue/addIntegrationRow.tsx index b2d937999778..3f40d6a89b22 100644 --- a/static/app/views/alerts/rules/issue/addIntegrationRow.tsx +++ b/static/app/views/alerts/rules/issue/addIntegrationRow.tsx @@ -5,7 +5,7 @@ import {LinkButton} from '@sentry/scraps/button'; import {Flex} from '@sentry/scraps/layout'; import {Access} from 'sentry/components/acl/access'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; import {ConfigStore} from 'sentry/stores/configStore'; import {useOrganization} from 'sentry/utils/useOrganization'; import {IntegrationButton} from 'sentry/views/settings/organizationIntegrations/integrationButton'; diff --git a/static/app/views/alerts/rules/issue/setupMessagingIntegrationButton.tsx b/static/app/views/alerts/rules/issue/setupMessagingIntegrationButton.tsx index c2eb03928922..aa613524fd57 100644 --- a/static/app/views/alerts/rules/issue/setupMessagingIntegrationButton.tsx +++ b/static/app/views/alerts/rules/issue/setupMessagingIntegrationButton.tsx @@ -4,8 +4,8 @@ import {Button} from '@sentry/scraps/button'; import {Flex} from '@sentry/scraps/layout'; import {useModal} from '@sentry/scraps/modal'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; import {t} from 'sentry/locale'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; import type { IntegrationProvider, OrganizationIntegration, diff --git a/static/app/views/issueDetails/actions/seerCommandPaletteActions.tsx b/static/app/views/issueDetails/actions/seerCommandPaletteActions.tsx index bc20207eff17..7e20b410e48f 100644 --- a/static/app/views/issueDetails/actions/seerCommandPaletteActions.tsx +++ b/static/app/views/issueDetails/actions/seerCommandPaletteActions.tsx @@ -15,8 +15,8 @@ import { useExplorerAutofix, } from 'sentry/components/events/autofix/useExplorerAutofix'; import {IconSeer} from 'sentry/icons'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; import {t} from 'sentry/locale'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; import type {Event} from 'sentry/types/event'; import type {Group} from 'sentry/types/group'; import type {Project} from 'sentry/types/project'; diff --git a/static/app/views/settings/account/accountIdentities.tsx b/static/app/views/settings/account/accountIdentities.tsx index 1626218dd2ce..b9d14d8cf542 100644 --- a/static/app/views/settings/account/accountIdentities.tsx +++ b/static/app/views/settings/account/accountIdentities.tsx @@ -19,12 +19,12 @@ import {PanelBody} from 'sentry/components/panels/panelBody'; import {PanelHeader} from 'sentry/components/panels/panelHeader'; import {PanelItem} from 'sentry/components/panels/panelItem'; import {SentryDocumentTitle} from 'sentry/components/sentryDocumentTitle'; +import {IdentityIcon} from 'sentry/icons/identityIcon'; import {t, tct} from 'sentry/locale'; import type {UserIdentityConfig} from 'sentry/types/auth'; import {UserIdentityCategory, UserIdentityStatus} from 'sentry/types/auth'; import {getApiUrl} from 'sentry/utils/api/getApiUrl'; import {setApiQueryData, useApiQuery} from 'sentry/utils/queryClient'; -import {IdentityIcon} from 'sentry/views/settings/components/identityIcon'; import {SettingsPageHeader} from 'sentry/views/settings/components/settingsPageHeader'; import {TextBlock} from 'sentry/views/settings/components/text/textBlock'; diff --git a/static/app/views/settings/organizationDataForwarding/components/dataForwarderRow.tsx b/static/app/views/settings/organizationDataForwarding/components/dataForwarderRow.tsx index 538a0c005e3b..7a3f476e80e8 100644 --- a/static/app/views/settings/organizationDataForwarding/components/dataForwarderRow.tsx +++ b/static/app/views/settings/organizationDataForwarding/components/dataForwarderRow.tsx @@ -4,8 +4,8 @@ import {Container, Flex, Grid} from '@sentry/scraps/layout'; import {Text} from '@sentry/scraps/text'; import {IconDelete, IconEdit} from 'sentry/icons'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; import {t, tct, tn} from 'sentry/locale'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; import {trackAnalytics} from 'sentry/utils/analytics'; import {useOrganization} from 'sentry/utils/useOrganization'; import {DataForwarderDeleteConfirm} from 'sentry/views/settings/organizationDataForwarding/components/dataForwarderDeleteConfirm'; diff --git a/static/app/views/settings/organizationDataForwarding/edit.tsx b/static/app/views/settings/organizationDataForwarding/edit.tsx index abdd5e355467..991294080e4e 100644 --- a/static/app/views/settings/organizationDataForwarding/edit.tsx +++ b/static/app/views/settings/organizationDataForwarding/edit.tsx @@ -15,8 +15,8 @@ import {NotFound} from 'sentry/components/errors/notFound'; import {LoadingIndicator} from 'sentry/components/loadingIndicator'; import {SentryDocumentTitle} from 'sentry/components/sentryDocumentTitle'; import {IconArrow} from 'sentry/icons/iconArrow'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; import {t} from 'sentry/locale'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; import type {Project} from 'sentry/types/project'; import {trackAnalytics} from 'sentry/utils/analytics'; import {useNavigate} from 'sentry/utils/useNavigate'; diff --git a/static/app/views/settings/organizationDataForwarding/setup.tsx b/static/app/views/settings/organizationDataForwarding/setup.tsx index 8f1b28d09b1d..df6efd2b585d 100644 --- a/static/app/views/settings/organizationDataForwarding/setup.tsx +++ b/static/app/views/settings/organizationDataForwarding/setup.tsx @@ -10,8 +10,8 @@ import Feature from 'sentry/components/acl/feature'; import {FeatureDisabled} from 'sentry/components/acl/featureDisabled'; import {SentryDocumentTitle} from 'sentry/components/sentryDocumentTitle'; import {IconArrow} from 'sentry/icons/iconArrow'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; import {t} from 'sentry/locale'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; import type {Project} from 'sentry/types/project'; import {trackAnalytics} from 'sentry/utils/analytics'; import {useNavigate} from 'sentry/utils/useNavigate'; diff --git a/static/app/views/settings/organizationIntegrations/integrationDetailedView.tsx b/static/app/views/settings/organizationIntegrations/integrationDetailedView.tsx index a02fd185cce4..a54467a1eb52 100644 --- a/static/app/views/settings/organizationIntegrations/integrationDetailedView.tsx +++ b/static/app/views/settings/organizationIntegrations/integrationDetailedView.tsx @@ -15,8 +15,8 @@ import {OverrideOrDefault} from 'sentry/components/overrideOrDefault'; import {Panel} from 'sentry/components/panels/panel'; import {PanelItem} from 'sentry/components/panels/panelItem'; import {SentryDocumentTitle} from 'sentry/components/sentryDocumentTitle'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; import {t} from 'sentry/locale'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; import type {ObjectStatus} from 'sentry/types/core'; import type {Integration, IntegrationProvider} from 'sentry/types/integrations'; import type {Organization} from 'sentry/types/organization'; diff --git a/static/app/views/settings/organizationIntegrations/integrationExternalMappings.tsx b/static/app/views/settings/organizationIntegrations/integrationExternalMappings.tsx index 44d2f5a64bec..c245351de53e 100644 --- a/static/app/views/settings/organizationIntegrations/integrationExternalMappings.tsx +++ b/static/app/views/settings/organizationIntegrations/integrationExternalMappings.tsx @@ -11,8 +11,8 @@ import {LoadingIndicator} from 'sentry/components/loadingIndicator'; import {PanelTable} from 'sentry/components/panels/panelTable'; import {QuestionTooltip} from 'sentry/components/questionTooltip'; import {IconAdd, IconArrow, IconDelete} from 'sentry/icons'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; import {t, tct} from 'sentry/locale'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; import type { ExternalActorMapping, ExternalActorMappingOrSuggestion, diff --git a/static/app/views/settings/organizationIntegrations/integrationIcon.tsx b/static/app/views/settings/organizationIntegrations/integrationIcon.tsx index 145cb3a3302e..3255daad8a2e 100644 --- a/static/app/views/settings/organizationIntegrations/integrationIcon.tsx +++ b/static/app/views/settings/organizationIntegrations/integrationIcon.tsx @@ -1,7 +1,7 @@ import {useState} from 'react'; import styled from '@emotion/styled'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; import type {Integration} from 'sentry/types/integrations'; type IconProps = { diff --git a/static/app/views/settings/organizationIntegrations/integrationListDirectory.tsx b/static/app/views/settings/organizationIntegrations/integrationListDirectory.tsx index c9064aa37ec6..c2cb4f9dfc29 100644 --- a/static/app/views/settings/organizationIntegrations/integrationListDirectory.tsx +++ b/static/app/views/settings/organizationIntegrations/integrationListDirectory.tsx @@ -21,8 +21,8 @@ import {Panel} from 'sentry/components/panels/panel'; import {PanelBody} from 'sentry/components/panels/panelBody'; import {SearchBar} from 'sentry/components/searchBar'; import {SentryDocumentTitle} from 'sentry/components/sentryDocumentTitle'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; import {t, tct} from 'sentry/locale'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; import type { AppOrProviderOrPlugin, DocIntegration, diff --git a/static/app/views/settings/organizationIntegrations/integrationRow.tsx b/static/app/views/settings/organizationIntegrations/integrationRow.tsx index 100940446fca..5be0766afad2 100644 --- a/static/app/views/settings/organizationIntegrations/integrationRow.tsx +++ b/static/app/views/settings/organizationIntegrations/integrationRow.tsx @@ -8,8 +8,8 @@ import {Flex} from '@sentry/scraps/layout'; import {Link} from '@sentry/scraps/link'; import {PanelItem} from 'sentry/components/panels/panelItem'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; import {t} from 'sentry/locale'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; import type { IntegrationInstallationStatus, SentryApp, diff --git a/static/app/views/settings/organizationIntegrations/webhookDetailedView.tsx b/static/app/views/settings/organizationIntegrations/webhookDetailedView.tsx index 5031abb938ea..3634e232d9b1 100644 --- a/static/app/views/settings/organizationIntegrations/webhookDetailedView.tsx +++ b/static/app/views/settings/organizationIntegrations/webhookDetailedView.tsx @@ -10,8 +10,8 @@ import {addErrorMessage} from 'sentry/actionCreators/indicator'; import {ContextPickerModalContainer as ContextPickerModal} from 'sentry/components/contextPickerModal'; import {LoadingError} from 'sentry/components/loadingError'; import {LoadingIndicator} from 'sentry/components/loadingIndicator'; +import {PluginIcon} from 'sentry/icons/pluginIcon'; import {t, tct} from 'sentry/locale'; -import {PluginIcon} from 'sentry/plugins/components/pluginIcon'; import type {Organization} from 'sentry/types/organization'; import type {PlatformKey} from 'sentry/types/platform'; import {apiOptions} from 'sentry/utils/api/apiOptions';