Skip to content

Commit c03d61c

Browse files
authored
Initial disable of domain name edit component (#54876)
1 parent b298e42 commit c03d61c

2 files changed

Lines changed: 1 addition & 69 deletions

File tree

src/fixtures/tests/playwright-rendering.spec.ts

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -797,59 +797,6 @@ test.describe('translations', () => {
797797
})
798798
})
799799

800-
test.describe('domain edit', () => {
801-
test('edit a domain (using header nav)', async ({ page }) => {
802-
test.skip(true, 'Editing domain from header is disabled')
803-
804-
await page.goto('/')
805-
await expect(page.getByText('Domain name:')).not.toBeVisible()
806-
await page.getByLabel('Select GitHub product version').click()
807-
await page
808-
.getByLabel(/Enterprise Server/)
809-
.first()
810-
.click()
811-
await expect(page.getByText('Domain name:')).toBeVisible()
812-
await page.getByRole('button', { name: 'Edit' }).click()
813-
814-
await expect(page.getByTestId('domain-name-edit-form')).toBeVisible()
815-
await expect(page.getByRole('heading', { name: 'Edit your domain name' })).toBeVisible()
816-
await page.getByLabel('Your domain name', { exact: true }).fill(' github.com ')
817-
await expect(page.getByText("Can't be github.com")).toBeVisible()
818-
await page.getByLabel('Your domain name', { exact: true }).fill('github.peterbe.com ')
819-
await expect(page.getByText("Can't be github.com")).not.toBeVisible()
820-
await page.getByRole('button', { name: 'Save' }).click()
821-
822-
// This tests that the dialog is gone.
823-
// XXX Peterbe: These don't work and I don't know why yet.
824-
await expect(page.getByTestId('domain-name-edit-form')).not.toBeVisible()
825-
await expect(page.getByText('github.peterbe.com')).toBeVisible()
826-
})
827-
828-
test('edit a domain (clicking HOSTNAME)', async ({ page }) => {
829-
await page.goto('/get-started/markdown/replace-domain')
830-
await page.getByLabel('Select GitHub product version').click()
831-
await page.getByLabel('Enterprise Server 3.12').click() // XXX
832-
833-
// This is generally discourage in Playwright, but necessary here
834-
// in this case. Because of the way
835-
// the `main.addEventListener('click', ...)` is handled, it's setting
836-
// up that event listener too late. In fact, it happens in a useEffect.
837-
// Adding a little delay makes is much more likely that the event
838-
// listener has been set up my the time we fire the `.click()` on the
839-
// next line.
840-
await page.waitForTimeout(500)
841-
await page.getByText('HOSTNAME', { exact: true }).first().click()
842-
843-
await expect(page.getByTestId('domain-name-edit-form')).toBeVisible()
844-
await page
845-
.getByTestId('domain-name-edit-form')
846-
.getByLabel('Your domain name')
847-
.fill('peterbe.ghe.com')
848-
await page.getByTestId('domain-name-edit-form').getByLabel('Your domain name').press('Enter')
849-
await expect(page.getByTestId('domain-name-edit-form')).not.toBeVisible()
850-
})
851-
})
852-
853800
test.describe('view pages with custom domain cookie', () => {
854801
test('view article page', async ({ page }) => {
855802
await page.goto(

src/frame/components/page-header/Header.tsx

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import { Suspense, useCallback, useEffect, useRef, useState } from 'react'
1+
import { useCallback, useEffect, useRef, useState } from 'react'
22
import cx from 'classnames'
33
import { useRouter } from 'next/router'
44
import { Dialog, IconButton } from '@primer/react'
55
import { MarkGithubIcon, ThreeBarsIcon } from '@primer/octicons-react'
6-
import dynamic from 'next/dynamic'
76

87
import { DEFAULT_VERSION, useVersion } from 'src/versions/components/useVersion'
98
import { Link } from 'src/frame/components/Link'
@@ -24,10 +23,6 @@ import { EXPERIMENTS } from '@/events/components/experiments/experiments'
2423
import { useShouldShowExperiment } from '@/events/components/experiments/useShouldShowExperiment'
2524
import { useQueryParam } from '@/frame/components/hooks/useQueryParam'
2625

27-
const DomainNameEdit = dynamic(() => import('src/links/components/DomainNameEdit'), {
28-
ssr: false,
29-
})
30-
3126
export const Header = () => {
3227
const router = useRouter()
3328
const { error } = useMainContext()
@@ -134,8 +129,6 @@ export const Header = () => {
134129
homeURL += `/${currentVersion}`
135130
}
136131

137-
const showDomainNameEdit = currentVersion.startsWith('enterprise-server@')
138-
139132
return (
140133
<div
141134
data-container="header"
@@ -176,14 +169,6 @@ export const Header = () => {
176169
<div className="hide-sm border-left pl-3">
177170
<VersionPicker />
178171
</div>
179-
180-
{showDomainNameEdit && (
181-
<div className="hide-sm xborder-left pl-3">
182-
<Suspense>
183-
<DomainNameEdit />
184-
</Suspense>
185-
</div>
186-
)}
187172
</div>
188173
{showNewSearch ? (
189174
<HeaderSearchAndWidgets

0 commit comments

Comments
 (0)