Remove old UI for switch to new campaigns workflow (#11891)

shared/src/testing/driver.ts

@@ -14,7 +14,7 @@ import puppeteer, {
 } from 'puppeteer'
 import { Key } from 'ts-key-enum'
 import { dataOrThrowErrors, gql, GraphQLResult } from '../graphql/graphql'
-import { IMutation, IQuery, ExternalServiceKind, IRepository, IPatchSet, IPatchInput } from '../graphql/schema'
+import { IMutation, IQuery, ExternalServiceKind, IRepository } from '../graphql/schema'
 import { readEnvironmentBoolean, retry } from './utils'
 import { formatPuppeteerConsoleMessage } from './console'
 import * as path from 'path'
@@ -478,21 +478,6 @@ export class Driver {
         return repository
     }
 
-    public async createPatchSetFromPatches(patches: IPatchInput[]): Promise<Pick<IPatchSet, 'previewURL'>> {
-        const resp = await this.makeGraphQLRequest<IMutation>({
-            request: gql`
-                mutation($patches: [PatchInput!]!) {
-                    createPatchSetFromPatches(patches: $patches) {
-                        previewURL
-                    }
-                }
-            `,
-            variables: { patches },
-        })
-        const { createPatchSetFromPatches } = dataOrThrowErrors(resp)
-        return createPatchSetFromPatches
-    }
-
     public async setConfig(
         path: jsonc.JSONPath,
         editFunction: (oldValue: jsonc.Node | undefined) => any

web/src/end-to-end/end-to-end.test.ts

@@ -1501,66 +1501,6 @@ describe('e2e test suite', () => {
         after(async () => {
             await driver.setConfig(['experimentalFeatures'], () => previousExperimentalFeatures)
         })
-        async function testCampaignPreview({
-            previewURL,
-            changesetCount,
-            snapshotName,
-        }: {
-            previewURL: string
-            changesetCount: number
-            snapshotName: string
-        }): Promise<void> {
-            await driver.page.goto(previewURL.replace('127.0.0.1', 'localhost'))
-            await driver.page.waitForSelector('.e2e-campaign-form')
-
-            // fill campaign preview form
-            await driver.page.type('.e2e-campaign-title', 'E2E campaign')
-
-            await driver.page.waitForSelector('.e2e-changeset-node')
-            // check there were exactly as expected diffs generated
-            const generatedChangesetCount = await driver.page.evaluate(
-                () => document.querySelectorAll('.e2e-changeset-node').length
-            )
-            expect(generatedChangesetCount).toEqual(changesetCount)
-            await percySnapshot(driver.page, snapshotName)
-        }
-        test('View campaign preview for patch set', async () => {
-            const repo = await driver.getRepository('github.com/sourcegraph-testing/automation-e2e-test')
-            const { previewURL } = await driver.createPatchSetFromPatches([
-                {
-                    repository: repo.id,
-                    baseRevision: '339d09ae1ce5907e0678ae5f1f91d9ad38db6107',
-                    baseRef: 'refs/heads/master',
-                    patch: `diff --unified file1.txt file1.txt
---- file1.txt 2020-01-01 01:02:03 -0700
-+++ file1.txt 2020-01-01 03:04:05 -0700
-@@ -1 +1,2 @@
- this is file 1
-+hello
-`,
-                },
-            ])
-            await testCampaignPreview({
-                previewURL,
-                changesetCount: 1,
-                snapshotName: 'Campaign preview page',
-            })
-        })
-        // TODO(eseliger): reenable once the dates of the chart are stable
-        test.skip('Manual campaign workflow', async () => {
-            await driver.page.goto(sourcegraphBaseUrl + '/campaigns/new')
-            await driver.page.waitForSelector('.e2e-campaign-form')
-            await percySnapshot(driver.page, 'Create manual campaign form')
-            await driver.page.type('.e2e-campaign-title', 'E2E manual campaign')
-            await driver.page.click('.e2e-campaign-create-btn')
-            await driver.page.waitForSelector('.e2e-campaign-get-started')
-            await percySnapshot(driver.page, 'Create manual campaign empty')
-            await driver.page.type('.e2e-track-changeset-repo', 'github.com/sourcegraph-testing/automation-e2e-test')
-            await driver.page.type('.e2e-track-changeset-id', '1')
-            await driver.page.click('.e2e-track-changeset-btn')
-            await driver.page.waitForSelector('.e2e-changeset-node')
-            await percySnapshot(driver.page, 'Create manual campaign added changeset')
-        })
     })
 
     describe('Interactive search mode (feature flagged)', () => {

web/src/enterprise/campaigns/detail/CampaignActionsBar.test.tsx

@@ -16,20 +16,15 @@ const PROPS = {
 
 describe('CampaignActionsBar', () => {
     test('new with patch set', () =>
-        expect(
-            shallow(<CampaignActionsBar {...PROPS} mode="viewing" previewingPatchSet={true} campaign={undefined} />)
-        ).toMatchSnapshot())
+        expect(shallow(<CampaignActionsBar {...PROPS} mode="viewing" campaign={undefined} />)).toMatchSnapshot())
     test('new without patch set', () =>
-        expect(
-            shallow(<CampaignActionsBar {...PROPS} mode="viewing" previewingPatchSet={false} campaign={undefined} />)
-        ).toMatchSnapshot())
+        expect(shallow(<CampaignActionsBar {...PROPS} mode="viewing" campaign={undefined} />)).toMatchSnapshot())
     test('not editable', () =>
         expect(
             shallow(
                 <CampaignActionsBar
                     {...PROPS}
                     mode="viewing"
-                    previewingPatchSet={false}
                     campaign={{
                         closedAt: null,
                         name: 'Super campaign',
@@ -47,7 +42,6 @@ describe('CampaignActionsBar', () => {
                 <CampaignActionsBar
                     {...PROPS}
                     mode="viewing"
-                    previewingPatchSet={false}
                     campaign={{
                         closedAt: null,
                         name: 'Super campaign',
@@ -65,7 +59,6 @@ describe('CampaignActionsBar', () => {
                 <CampaignActionsBar
                     {...PROPS}
                     mode="viewing"
-                    previewingPatchSet={false}
                     campaign={{
                         closedAt: new Date().toISOString(),
                         name: 'Super campaign',
@@ -83,7 +76,6 @@ describe('CampaignActionsBar', () => {
                 <CampaignActionsBar
                     {...PROPS}
                     mode="editing"
-                    previewingPatchSet={false}
                     campaign={{
                         closedAt: null,
                         name: 'Super campaign',
@@ -101,7 +93,6 @@ describe('CampaignActionsBar', () => {
                 <CampaignActionsBar
                     {...PROPS}
                     mode="editing"
-                    previewingPatchSet={false}
                     campaign={{
                         closedAt: null,
                         name: 'Super campaign',
@@ -119,7 +110,6 @@ describe('CampaignActionsBar', () => {
                 <CampaignActionsBar
                     {...PROPS}
                     mode="saving"
-                    previewingPatchSet={false}
                     campaign={{
                         closedAt: null,
                         name: 'Super campaign',
@@ -137,7 +127,6 @@ describe('CampaignActionsBar', () => {
                 <CampaignActionsBar
                     {...PROPS}
                     mode="deleting"
-                    previewingPatchSet={false}
                     campaign={{
                         closedAt: null,
                         name: 'Super campaign',
@@ -155,7 +144,6 @@ describe('CampaignActionsBar', () => {
                 <CampaignActionsBar
                     {...PROPS}
                     mode="closing"
-                    previewingPatchSet={false}
                     campaign={{
                         closedAt: null,
                         name: 'Super campaign',
@@ -173,7 +161,6 @@ describe('CampaignActionsBar', () => {
                 <CampaignActionsBar
                     {...PROPS}
                     mode="viewing"
-                    previewingPatchSet={false}
                     campaign={{
                         closedAt: null,
                         name: 'Super campaign',
@@ -191,7 +178,6 @@ describe('CampaignActionsBar', () => {
                 <CampaignActionsBar
                     {...PROPS}
                     mode="viewing"
-                    previewingPatchSet={false}
                     campaign={{
                         closedAt: null,
                         name: 'Super campaign',

web/src/enterprise/campaigns/detail/CampaignActionsBar.tsx

@@ -8,28 +8,18 @@ import { CampaignUIMode } from './CampaignDetails'
 
 interface Props {
     mode: CampaignUIMode
-    previewingPatchSet: boolean
 
     campaign?: Pick<GQL.ICampaign, 'name' | 'closedAt' | 'viewerCanAdminister'> & {
         status: Pick<GQL.ICampaign['status'], 'state'>
     }
 
     onClose: (closeChangesets: boolean) => Promise<void>
     onDelete: (closeChangesets: boolean) => Promise<void>
-    onEdit: React.MouseEventHandler
     formID: string
 }
 
-export const CampaignActionsBar: React.FunctionComponent<Props> = ({
-    campaign,
-    previewingPatchSet,
-    mode,
-    onClose,
-    onDelete,
-    onEdit,
-    formID,
-}) => {
-    const showActionButtons = campaign && !previewingPatchSet && campaign.viewerCanAdminister
+export const CampaignActionsBar: React.FunctionComponent<Props> = ({ campaign, mode, onClose, onDelete, formID }) => {
+    const showActionButtons = campaign?.viewerCanAdminister
     const showSpinner = mode === 'saving' || mode === 'deleting' || mode === 'closing'
     const editingCampaign = mode === 'editing' || mode === 'saving'
 
@@ -92,15 +82,6 @@ export const CampaignActionsBar: React.FunctionComponent<Props> = ({
                         <>
                             {!campaignClosed && (
                                 <>
-                                    <button
-                                        type="button"
-                                        id="e2e-campaign-edit"
-                                        className="btn btn-secondary mr-1"
-                                        onClick={onEdit}
-                                        disabled={actionsDisabled}
-                                    >
-                                        Edit
-                                    </button>
                                     <CloseDeleteCampaignPrompt
                                         disabled={actionsDisabled}
                                         disabledTooltip="Cannot close while campaign is being created"