diff --git a/client/cody/webviews/ConnectApp.tsx b/client/cody/webviews/ConnectApp.tsx index 4837d67e157..0371b47b407 100644 --- a/client/cody/webviews/ConnectApp.tsx +++ b/client/cody/webviews/ConnectApp.tsx @@ -21,7 +21,7 @@ export const ConnectApp: React.FunctionComponent = props => { type="button" onClick={() => openLink('sourcegraph://user/settings/tokens/new/callback?requestFrom=CODY')} > - Connect Sourcegraph App + Connect Cody App

) diff --git a/client/cody/webviews/Settings.tsx b/client/cody/webviews/Settings.tsx index 7fe3ee8be8e..800a496b688 100644 --- a/client/cody/webviews/Settings.tsx +++ b/client/cody/webviews/Settings.tsx @@ -16,9 +16,7 @@ export const Settings: React.FunctionComponent
- {serverEndpoint && ( -

🟢 Connected to {isLocalApp(serverEndpoint) ? 'Sourcegraph App' : serverEndpoint}

- )} + {serverEndpoint &&

🟢 Connected to {isLocalApp(serverEndpoint) ? 'Cody App' : serverEndpoint}

} Logout diff --git a/client/web/BUILD.bazel b/client/web/BUILD.bazel index 8ca5779cd3c..d8ff51fcdc7 100644 --- a/client/web/BUILD.bazel +++ b/client/web/BUILD.bazel @@ -722,7 +722,6 @@ ts_project( "src/enterprise/insights/admin-ui/query.ts", "src/enterprise/insights/components/DownloadFileButton.tsx", "src/enterprise/insights/components/code-insights-page/CodeInsightsPage.tsx", - "src/enterprise/insights/components/code-insights-page/limit-access-banner/CodeInsightsLimitAccessAppBanner.tsx", "src/enterprise/insights/components/code-insights-page/limit-access-banner/CodeInsightsLimitAccessBanner.tsx", "src/enterprise/insights/components/creation-ui/CodeInsightDashboardsVisibility.tsx", "src/enterprise/insights/components/creation-ui/code-insight-time-step-picker/CodeInsightTimeStepPicker.tsx", diff --git a/client/web/src/auth/SignInPage.tsx b/client/web/src/auth/SignInPage.tsx index d95506bd870..b2c0d0e3939 100644 --- a/client/web/src/auth/SignInPage.tsx +++ b/client/web/src/auth/SignInPage.tsx @@ -166,7 +166,7 @@ export const SignInPage: React.FunctionComponent eventLogger.log('ClickedOnAppCTA', { location: 'SignInPage' })} > - download Sourcegraph app + download Cody app {' '} or{' '} - download Sourcegraph app + download Cody app or = ({ telemetryService }) => { return ( - + > = ({ authenticatedUser, isSourcegraphDotCom, - isSourcegraphApp, ...props }) => { const canCreate: true | string = useMemo(() => { @@ -79,7 +77,6 @@ export const GlobalBatchChangesArea: React.FunctionComponent } diff --git a/client/web/src/enterprise/batches/list/BatchChangeListPage.story.tsx b/client/web/src/enterprise/batches/list/BatchChangeListPage.story.tsx index f87d4d29344..23eeacabad0 100644 --- a/client/web/src/enterprise/batches/list/BatchChangeListPage.story.tsx +++ b/client/web/src/enterprise/batches/list/BatchChangeListPage.story.tsx @@ -103,7 +103,6 @@ export const ListOfBatchChanges: Story = args => { canCreate={args.canCreate || "You don't have permission to create batch changes"} settingsCascade={EMPTY_SETTINGS_CASCADE} isSourcegraphDotCom={args.isDotCom} - isSourcegraphApp={args.isApp} authenticatedUser={null} /> @@ -122,11 +121,6 @@ ListOfBatchChanges.argTypes = { control: { type: 'boolean' }, defaultValue: false, }, - isApp: { - name: 'is Sourcegraph App', - control: { type: 'boolean' }, - defaultValue: false, - }, } ListOfBatchChanges.storyName = 'List of batch changes' @@ -145,7 +139,6 @@ export const ListOfBatchChangesSpecificNamespace: Story = () => { namespaceID="test-12345" settingsCascade={EMPTY_SETTINGS_CASCADE} isSourcegraphDotCom={false} - isSourcegraphApp={false} authenticatedUser={null} /> @@ -174,7 +167,6 @@ export const ListOfBatchChangesServerSideExecutionEnabled: Story = () => { }, }} isSourcegraphDotCom={false} - isSourcegraphApp={false} authenticatedUser={null} /> @@ -198,7 +190,6 @@ export const LicensingNotEnforced: Story = () => { canCreate={true} settingsCascade={EMPTY_SETTINGS_CASCADE} isSourcegraphDotCom={false} - isSourcegraphApp={false} authenticatedUser={null} /> @@ -222,7 +213,6 @@ export const NoBatchChanges: Story = () => { canCreate={true} settingsCascade={EMPTY_SETTINGS_CASCADE} isSourcegraphDotCom={false} - isSourcegraphApp={false} authenticatedUser={null} /> @@ -247,7 +237,6 @@ export const AllBatchChangesTabEmpty: Story = () => { openTab="batchChanges" settingsCascade={EMPTY_SETTINGS_CASCADE} isSourcegraphDotCom={false} - isSourcegraphApp={false} authenticatedUser={null} /> diff --git a/client/web/src/enterprise/batches/list/BatchChangeListPage.tsx b/client/web/src/enterprise/batches/list/BatchChangeListPage.tsx index c4358c65fac..807bfca9043 100644 --- a/client/web/src/enterprise/batches/list/BatchChangeListPage.tsx +++ b/client/web/src/enterprise/batches/list/BatchChangeListPage.tsx @@ -8,7 +8,6 @@ import { dataOrThrowErrors, useQuery } from '@sourcegraph/http-client' import { Settings } from '@sourcegraph/shared/src/schema/settings.schema' import { SettingsCascadeProps } from '@sourcegraph/shared/src/settings/settings' import { TelemetryProps } from '@sourcegraph/shared/src/telemetry/telemetryService' -import { addSourcegraphAppOutboundUrlParameters } from '@sourcegraph/shared/src/util/url' import { Button, PageHeader, Link, Container, H3, Text, screenReaderAnnounce } from '@sourcegraph/wildcard' import { AuthenticatedUser } from '../../../auth' @@ -25,7 +24,6 @@ import { ShowMoreButton, SummaryContainer, } from '../../../components/FilteredConnection/ui' -import { LimitedAccessBanner } from '../../../components/LimitedAccessBanner' import { Page } from '../../../components/Page' import { ListBatchChange, @@ -58,7 +56,6 @@ export interface BatchChangeListPageProps extends TelemetryProps, SettingsCascad headingElement: 'h1' | 'h2' namespaceID?: Scalars['ID'] isSourcegraphDotCom: boolean - isSourcegraphApp: boolean authenticatedUser: AuthenticatedUser | null /** For testing only. */ openTab?: SelectedTab @@ -79,7 +76,6 @@ export const BatchChangeListPage: React.FunctionComponent { const location = useLocation() @@ -181,34 +177,12 @@ export const BatchChangeListPage: React.FunctionComponentBatch Changes - {isSourcegraphApp && ( - - Batch Changes is currently available to try for free, up to 10 changesets, while Sourcegraph App is - in beta. Pricing and availability for Batch Changes is subject to change in future releases.{' '} - - For unlimited access to Batch Changes,{' '} - - sign up for an Enterprise trial. - - - - )} {!isSourcegraphDotCom && canUseBatchChanges && ( )} {selectedTab === 'gettingStarted' && ( - + )} {selectedTab === 'batchChanges' && ( <> diff --git a/client/web/src/enterprise/batches/list/GettingStarted.tsx b/client/web/src/enterprise/batches/list/GettingStarted.tsx index af6a64ef7a7..e487511b1f4 100644 --- a/client/web/src/enterprise/batches/list/GettingStarted.tsx +++ b/client/web/src/enterprise/batches/list/GettingStarted.tsx @@ -2,7 +2,6 @@ import React from 'react' import { mdiOpenInNew } from '@mdi/js' -import { addSourcegraphAppOutboundUrlParameters } from '@sourcegraph/shared/src/util/url' import { Alert, Container, H2, H3, Link, Text, Icon, useReducedMotion } from '@sourcegraph/wildcard' import { BatchChangesIcon } from '../../../batches/icons' @@ -12,7 +11,6 @@ import { eventLogger } from '../../../tracking/eventLogger' export interface GettingStartedProps { isSourcegraphDotCom: boolean - isSourcegraphApp?: boolean // canCreate indicates whether or not the currently-authenticated user has sufficient // permissions to create a batch change in whatever context this getting started // section is being presented. If not, canCreate will be a string reason why the user @@ -25,7 +23,6 @@ const productPageUrl = 'https://about.sourcegraph.com/batch-changes' export const GettingStarted: React.FunctionComponent> = ({ isSourcegraphDotCom, - isSourcegraphApp, canCreate, className, }) => { @@ -85,15 +82,7 @@ export const GettingStarted: React.FunctionComponent
  • - + Product page{' '} diff --git a/client/web/src/enterprise/insights/CodeInsightsAppRouter.tsx b/client/web/src/enterprise/insights/CodeInsightsAppRouter.tsx index 39213dc2206..e7434fd01a9 100644 --- a/client/web/src/enterprise/insights/CodeInsightsAppRouter.tsx +++ b/client/web/src/enterprise/insights/CodeInsightsAppRouter.tsx @@ -30,7 +30,6 @@ const EditInsightLazyPage = lazyComponent( export interface CodeInsightsAppRouter extends TelemetryProps { authenticatedUser: AuthenticatedUser - isSourcegraphApp: boolean } const rootPagePathsToTab = { @@ -40,7 +39,7 @@ const rootPagePathsToTab = { } export const CodeInsightsAppRouter = withAuthenticatedUser(props => { - const { telemetryService, isSourcegraphApp } = props + const { telemetryService } = props const fetched = useLicense() const api = useApi() @@ -51,42 +50,25 @@ export const CodeInsightsAppRouter = withAuthenticatedUser - + } /> - } - /> + } /> - } - /> + } /> - } + element={} /> {Object.entries(rootPagePathsToTab).map(([path, activeTab]) => ( - } + element={} /> ))} @@ -95,22 +77,14 @@ export const CodeInsightsAppRouter = withAuthenticatedUser `/insights/${params.insightId}/edit`} />} /> - } /> + } /> `/insights/${params.insightId}`} />} /> - - } - /> + } /> } /> diff --git a/client/web/src/enterprise/insights/CodeInsightsRouter.tsx b/client/web/src/enterprise/insights/CodeInsightsRouter.tsx index 154440eff7d..b0b81c61309 100644 --- a/client/web/src/enterprise/insights/CodeInsightsRouter.tsx +++ b/client/web/src/enterprise/insights/CodeInsightsRouter.tsx @@ -15,11 +15,10 @@ const CodeInsightsDotComGetStartedLazy = lazyComponent( export interface CodeInsightsRouterProps extends TelemetryProps { authenticatedUser: AuthenticatedUser | null isSourcegraphDotCom: boolean - isSourcegraphApp: boolean } export const CodeInsightsRouter: FC = props => { - const { authenticatedUser, telemetryService, isSourcegraphApp } = props + const { authenticatedUser, telemetryService } = props if (!window.context?.codeInsightsEnabled) { return ( @@ -30,11 +29,5 @@ export const CodeInsightsRouter: FC = props => { ) } - return ( - - ) + return } diff --git a/client/web/src/enterprise/insights/components/code-insights-page/CodeInsightsPage.tsx b/client/web/src/enterprise/insights/components/code-insights-page/CodeInsightsPage.tsx index 57354a7d363..d00ef380de0 100644 --- a/client/web/src/enterprise/insights/components/code-insights-page/CodeInsightsPage.tsx +++ b/client/web/src/enterprise/insights/components/code-insights-page/CodeInsightsPage.tsx @@ -3,12 +3,9 @@ import React from 'react' import { Page } from '../../../../components/Page' import { useUiFeatures } from '../../hooks' -import { CodeInsightsLimitedAccessAppBanner } from './limit-access-banner/CodeInsightsLimitAccessAppBanner' import { CodeInsightsLimitAccessBanner } from './limit-access-banner/CodeInsightsLimitAccessBanner' -interface CodeInsightsPageProps extends React.HTMLAttributes { - isSourcegraphApp: boolean -} +interface CodeInsightsPageProps extends React.HTMLAttributes {} /** * Shared common component for creation a typical code insights pages. Contains common styles @@ -19,8 +16,7 @@ export const CodeInsightsPage: React.FunctionComponent - {props.isSourcegraphApp && } - {!licensed && !props.isSourcegraphApp && } + {!licensed && } {props.children} ) diff --git a/client/web/src/enterprise/insights/components/code-insights-page/limit-access-banner/CodeInsightsLimitAccessAppBanner.tsx b/client/web/src/enterprise/insights/components/code-insights-page/limit-access-banner/CodeInsightsLimitAccessAppBanner.tsx deleted file mode 100644 index 27ccda68f74..00000000000 --- a/client/web/src/enterprise/insights/components/code-insights-page/limit-access-banner/CodeInsightsLimitAccessAppBanner.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import { AuthenticatedUser } from '@sourcegraph/shared/src/auth' -import { addSourcegraphAppOutboundUrlParameters } from '@sourcegraph/shared/src/util/url' -import { Link } from '@sourcegraph/wildcard' - -import { LimitedAccessBanner } from '../../../../../components/LimitedAccessBanner' - -interface Props { - authenticatedUser: Pick | null | undefined - className?: string -} -export const CodeInsightsLimitedAccessAppBanner: React.FC = props => ( - - Code Insights is currently available to try for free, up to 2 insights, while Sourcegraph App is in beta. - Pricing and availability for Code Insights is subject to change in future releases.{' '} - - For unlimited access to Insights,{' '} - - sign up for an Enterprise trial. - - - -) diff --git a/client/web/src/enterprise/insights/modals/GaConfirmationModal.story.tsx b/client/web/src/enterprise/insights/modals/GaConfirmationModal.story.tsx index 9a9006198bb..8d18140c86b 100644 --- a/client/web/src/enterprise/insights/modals/GaConfirmationModal.story.tsx +++ b/client/web/src/enterprise/insights/modals/GaConfirmationModal.story.tsx @@ -53,7 +53,7 @@ export const GaConfirmationModalExample: React.FunctionComponent

    Some content

    - +
    diff --git a/client/web/src/enterprise/insights/modals/GaConfirmationModal.tsx b/client/web/src/enterprise/insights/modals/GaConfirmationModal.tsx index e69fa863b0b..5acc2d8d1ed 100644 --- a/client/web/src/enterprise/insights/modals/GaConfirmationModal.tsx +++ b/client/web/src/enterprise/insights/modals/GaConfirmationModal.tsx @@ -9,14 +9,11 @@ import { FourLineChart, LangStatsInsightChart, ThreeLineChart } from './componen import styles from './GaConfirmationModal.module.scss' -interface Props { - isSourcegraphApp: boolean -} -export const GaConfirmationModal: FC = props => { +export const GaConfirmationModal: FC = () => { const [isGaAccepted, setGaAccepted] = useTemporarySetting('insights.freeGaExpiredAccepted', false) const { licensed } = useUiFeatures() - const showConfirmationModal = !licensed && isGaAccepted === false && !props.isSourcegraphApp + const showConfirmationModal = !licensed && isGaAccepted === false if (!showConfirmationModal) { return null diff --git a/client/web/src/enterprise/insights/pages/CodeInsightsRootPage.test.tsx b/client/web/src/enterprise/insights/pages/CodeInsightsRootPage.test.tsx index 43391dd61e3..4fb0e7a999e 100644 --- a/client/web/src/enterprise/insights/pages/CodeInsightsRootPage.test.tsx +++ b/client/web/src/enterprise/insights/pages/CodeInsightsRootPage.test.tsx @@ -105,7 +105,6 @@ describe('CodeInsightsRootPage', () => { , { route: '/insights/dashboards/foo', @@ -121,7 +120,6 @@ describe('CodeInsightsRootPage', () => { , { route: '/insights/dashboards/foo', diff --git a/client/web/src/enterprise/insights/pages/CodeInsightsRootPage.tsx b/client/web/src/enterprise/insights/pages/CodeInsightsRootPage.tsx index 55357223d2a..3a2d7004c72 100644 --- a/client/web/src/enterprise/insights/pages/CodeInsightsRootPage.tsx +++ b/client/web/src/enterprise/insights/pages/CodeInsightsRootPage.tsx @@ -44,7 +44,6 @@ export enum CodeInsightsRootPageTab { interface CodeInsightsRootPageProps extends TelemetryProps { dashboardId?: string activeTab: CodeInsightsRootPageTab - isSourcegraphApp: boolean } export const CodeInsightsRootPage: FC = memo(props => { @@ -76,7 +75,7 @@ export const CodeInsightsRootPage: FC = memo(props => } return ( - + = memo(props => - + }> - + diff --git a/client/web/src/enterprise/insights/pages/dashboards/creation/InsightsDashboardCreationPage.story.tsx b/client/web/src/enterprise/insights/pages/dashboards/creation/InsightsDashboardCreationPage.story.tsx index 241dd49e478..aa6984953e0 100644 --- a/client/web/src/enterprise/insights/pages/dashboards/creation/InsightsDashboardCreationPage.story.tsx +++ b/client/web/src/enterprise/insights/pages/dashboards/creation/InsightsDashboardCreationPage.story.tsx @@ -39,7 +39,7 @@ export const InsightsDashboardCreationLicensed: Story = () => { return ( - + ) } @@ -49,7 +49,7 @@ export const InsightsDashboardCreationUnlicensed: Story = () => { return ( - + ) } diff --git a/client/web/src/enterprise/insights/pages/dashboards/creation/InsightsDashboardCreationPage.tsx b/client/web/src/enterprise/insights/pages/dashboards/creation/InsightsDashboardCreationPage.tsx index 183d7a1e050..6aac3020e97 100644 --- a/client/web/src/enterprise/insights/pages/dashboards/creation/InsightsDashboardCreationPage.tsx +++ b/client/web/src/enterprise/insights/pages/dashboards/creation/InsightsDashboardCreationPage.tsx @@ -19,9 +19,7 @@ import { import styles from './InsightsDashboardCreationPage.module.scss' -interface InsightsDashboardCreationPageProps extends TelemetryProps { - isSourcegraphApp: boolean -} +interface InsightsDashboardCreationPageProps extends TelemetryProps {} export const InsightsDashboardCreationPage: React.FunctionComponent< React.PropsWithChildren @@ -58,7 +56,7 @@ export const InsightsDashboardCreationPage: React.FunctionComponent< } return ( - + @@ -71,11 +69,7 @@ export const InsightsDashboardCreationPage: React.FunctionComponent< - + {formAPI => ( <>
  • - + Product page
  • diff --git a/client/web/src/enterprise/insights/pages/landing/getting-started/components/dynamic-code-insight-example/DynamicCodeInsightExample.tsx b/client/web/src/enterprise/insights/pages/landing/getting-started/components/dynamic-code-insight-example/DynamicCodeInsightExample.tsx index da92c2c1579..5d3981ae07d 100644 --- a/client/web/src/enterprise/insights/pages/landing/getting-started/components/dynamic-code-insight-example/DynamicCodeInsightExample.tsx +++ b/client/web/src/enterprise/insights/pages/landing/getting-started/components/dynamic-code-insight-example/DynamicCodeInsightExample.tsx @@ -39,12 +39,10 @@ const INITIAL_INSIGHT_VALUES: CodeInsightExampleFormValues = { query: 'TODO', } -interface DynamicCodeInsightExampleProps extends TelemetryProps, React.HTMLAttributes { - isSourcegraphApp?: boolean -} +interface DynamicCodeInsightExampleProps extends TelemetryProps, React.HTMLAttributes {} export const DynamicCodeInsightExample: FC = props => { - const { telemetryService, isSourcegraphApp, ...otherProps } = props + const { telemetryService, ...otherProps } = props const { repositoryUrl, loading: repositoryValueLoading } = useExampleRepositoryUrl() @@ -138,7 +136,7 @@ export const DynamicCodeInsightExample: FC = pro
    - +