diff --git a/client/web/BUILD.bazel b/client/web/BUILD.bazel index e8435a4228a..8dd44c673a3 100644 --- a/client/web/BUILD.bazel +++ b/client/web/BUILD.bazel @@ -1713,8 +1713,6 @@ ts_project( "src/user/settings/ScimAlert.tsx", "src/user/settings/UserSettingsArea.tsx", "src/user/settings/UserSettingsSidebar.tsx", - "src/user/settings/aboutOrganization/AboutOrganizationPage.tsx", - "src/user/settings/aboutOrganization/index.ts", "src/user/settings/accessTokens/UserSettingsCreateAccessTokenCallbackPage.tsx", "src/user/settings/accessTokens/UserSettingsCreateAccessTokenPage.tsx", "src/user/settings/accessTokens/UserSettingsTokensArea.tsx", @@ -2473,7 +2471,6 @@ ts_project( "src/team/new/NewTeamPage.story.tsx", "src/tour/components/Tour/Tour.story.tsx", "src/user/profile/UserProfile.story.tsx", - "src/user/settings/aboutOrganization/AboutOrganizationPage.story.tsx", ], tags = [TAG_SEARCHSUITE], tsconfig = ":tsconfig", diff --git a/client/web/src/user/settings/UserSettingsSidebar.tsx b/client/web/src/user/settings/UserSettingsSidebar.tsx index 477988fa01d..14a50d76c85 100644 --- a/client/web/src/user/settings/UserSettingsSidebar.tsx +++ b/client/web/src/user/settings/UserSettingsSidebar.tsx @@ -1,9 +1,9 @@ -import { type FC, useState, useCallback } from 'react' +import { type FC, useCallback, useState } from 'react' import { mdiMenu, mdiPlus } from '@mdi/js' import classNames from 'classnames' -import { ProductStatusBadge, Button, Link, Icon, type ProductStatusType, Tooltip } from '@sourcegraph/wildcard' +import { Button, Icon, Link, ProductStatusBadge, type ProductStatusType, Tooltip } from '@sourcegraph/wildcard' import type { AuthenticatedUser } from '../../auth' import type { BatchChangesProps } from '../../batches' @@ -94,25 +94,20 @@ export const UserSettingsSidebar: FC = props => { ))} - {!siteAdminViewingOtherUser && - (window.context.sourcegraphDotComMode ? ( - - About organizations - - ) : ( -
- -
- ))} + {!siteAdminViewingOtherUser && ( +
+ +
+ )} )} diff --git a/client/web/src/user/settings/aboutOrganization/AboutOrganizationPage.module.scss b/client/web/src/user/settings/aboutOrganization/AboutOrganizationPage.module.scss deleted file mode 100644 index 64b0a4a8503..00000000000 --- a/client/web/src/user/settings/aboutOrganization/AboutOrganizationPage.module.scss +++ /dev/null @@ -1,3 +0,0 @@ -.self-hosted-cta-content { - font-size: 1rem; -} diff --git a/client/web/src/user/settings/aboutOrganization/AboutOrganizationPage.story.tsx b/client/web/src/user/settings/aboutOrganization/AboutOrganizationPage.story.tsx deleted file mode 100644 index 5b29c5e99ef..00000000000 --- a/client/web/src/user/settings/aboutOrganization/AboutOrganizationPage.story.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import type { Decorator, Meta } from '@storybook/react' - -import { noOpTelemetryRecorder } from '@sourcegraph/shared/src/telemetry' -import { NOOP_TELEMETRY_SERVICE } from '@sourcegraph/shared/src/telemetry/telemetryService' - -import { WebStory } from '../../../components/WebStory' - -import { AboutOrganizationPage } from './AboutOrganizationPage' - -const decorator: Decorator = story => {() =>
{story()}
}
- -const config: Meta = { - title: 'web/Organizations/AboutOrganizationPage', - decorators: [decorator], -} - -export default config - -export const Basic = (): JSX.Element => ( - -) diff --git a/client/web/src/user/settings/aboutOrganization/AboutOrganizationPage.tsx b/client/web/src/user/settings/aboutOrganization/AboutOrganizationPage.tsx deleted file mode 100644 index 15bfc1f50ca..00000000000 --- a/client/web/src/user/settings/aboutOrganization/AboutOrganizationPage.tsx +++ /dev/null @@ -1,47 +0,0 @@ -import React, { useEffect } from 'react' - -import type { TelemetryV2Props } from '@sourcegraph/shared/src/telemetry' -import type { TelemetryProps } from '@sourcegraph/shared/src/telemetry/telemetryService' -import { PageHeader, Text } from '@sourcegraph/wildcard' - -import { PageTitle } from '../../../components/PageTitle' -import { SelfHostedCta } from '../../../components/SelfHostedCta' - -import styles from './AboutOrganizationPage.module.scss' - -interface AboutOrganizationPageProps extends TelemetryProps, TelemetryV2Props {} - -export const AboutOrganizationPage: React.FunctionComponent> = ({ - telemetryService, - telemetryRecorder, -}) => { - useEffect(() => { - telemetryService.logViewEvent('AboutOrg') - telemetryRecorder.recordEvent('settings.aboutOrganizations', 'view') - }, [telemetryService, telemetryRecorder]) - - return ( - <> - - - - - Need more enterprise features? Run Sourcegraph self-hosted - - - For additional code hosts and enterprise only features, install Sourcegraph self-hosted. - - - - ) -} diff --git a/client/web/src/user/settings/aboutOrganization/index.ts b/client/web/src/user/settings/aboutOrganization/index.ts deleted file mode 100644 index cc2d0472b82..00000000000 --- a/client/web/src/user/settings/aboutOrganization/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './AboutOrganizationPage' diff --git a/client/web/src/user/settings/routes.tsx b/client/web/src/user/settings/routes.tsx index 73c59d25d84..37b1c8d49c4 100644 --- a/client/web/src/user/settings/routes.tsx +++ b/client/web/src/user/settings/routes.tsx @@ -30,11 +30,6 @@ const UserSettingsSecurityPage = lazyComponent( 'UserSettingsSecurityPage' ) -const AboutOrganizationPage = lazyComponent( - () => import('./aboutOrganization/AboutOrganizationPage'), - 'AboutOrganizationPage' -) - const shouldRenderBatchChangesPage = ({ batchChangesEnabled, user: { viewerCanAdminister }, @@ -79,12 +74,6 @@ export const userSettingsAreaRoutes: readonly UserSettingsAreaRoute[] = [ render: lazyComponent(() => import('./research/ProductResearch'), 'ProductResearchPage'), condition: () => window.context.productResearchPageEnabled, }, - { - path: 'about-organizations', - render: props => ( - - ), - }, { path: 'permissions', render: lazyComponent(