Skip to content

Commit 6fe16b5

Browse files
OctomergerOctomerger
authored
Merge pull request #12291 from github/repo-sync
repo sync
2 parents 7053070 + 6eef4fe commit 6fe16b5

73 files changed

Lines changed: 227 additions & 199 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/repo-sync.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ jobs:
128128
pr_body: "This is an automated pull request to sync changes between the public and private repos.\n\n:robot: This pull request should be merged (not squashed) to preserve continuity across repos, so please let a bot do the merging!"
129129
pr_label: automated-reposync-pr
130130
github_token: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}
131+
# This will exit 0 if there's no difference between `repo-sync`
132+
# and `main`. And if so, no PR will be created.
133+
pr_allow_empty: false
131134

132135
- name: Find pull request
133136
uses: juliangruber/find-pull-request-action@db875662766249c049b2dcd85293892d61cb0b51

‎components/sidebar/SidebarHomepage.tsx‎

Lines changed: 44 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { useRouter } from 'next/router'
22
import { LinkExternalIcon } from '@primer/octicons-react'
3+
import { ActionList } from '@primer/components'
34

45
import { useVersion } from 'components/hooks/useVersion'
56
import { useMainContext } from 'components/context/MainContext'
@@ -11,43 +12,53 @@ export const SidebarHomepage = () => {
1112
const router = useRouter()
1213
const { currentVersion } = useVersion()
1314
const { activeProducts, isFPT } = useMainContext()
15+
const navItems = []
16+
17+
for (let i = 0; i < activeProducts.length; i++) {
18+
const product = activeProducts[i]
19+
20+
if (!isFPT && !product.versions?.includes(currentVersion) && !product.external) {
21+
continue
22+
}
23+
24+
const href = `${!product.external ? `/${router.locale}` : ''}${
25+
product.versions?.includes(currentVersion) && !isFPT
26+
? `/${currentVersion}/${product.id}`
27+
: product.href
28+
}`
29+
30+
navItems.push({
31+
renderItem: () => (
32+
<ActionList.Item
33+
as="li"
34+
key={product.id}
35+
title={`${product.name}${product.external ? '(External Site)' : ''}`}
36+
className="my-2"
37+
sx={{ padding: 0 }}
38+
>
39+
<Link
40+
href={href}
41+
target={product.external ? '_blank' : undefined}
42+
className="f4 pl-4 pr-5 py-2 color-fg-default no-underline width-full"
43+
>
44+
{product.name}
45+
{product.external && (
46+
<span className="ml-1">
47+
<LinkExternalIcon size="small" />
48+
</span>
49+
)}
50+
</Link>
51+
</ActionList.Item>
52+
),
53+
})
54+
}
1455

1556
return (
1657
<ul data-testid="sidebar" className="mt-4">
1758
{!isFPT && <AllProductsLink />}
18-
19-
{activeProducts.map((product) => {
20-
if (!isFPT && !product.versions?.includes(currentVersion) && !product.external) {
21-
return null
22-
}
23-
24-
const href = `${!product.external ? `/${router.locale}` : ''}${
25-
product.versions?.includes(currentVersion) && !isFPT
26-
? `/${currentVersion}/${product.id}`
27-
: product.href
28-
}`
29-
30-
return (
31-
<li
32-
key={product.id}
33-
title={`${product.name}${product.external ? '(External Site)' : ''}`}
34-
className="my-3"
35-
>
36-
<Link
37-
href={href}
38-
target={product.external ? '_blank' : undefined}
39-
className="f4 pl-4 pr-5 py-2 color-fg-default no-underline"
40-
>
41-
{product.name}
42-
{product.external && (
43-
<span className="ml-1">
44-
<LinkExternalIcon size="small" />
45-
</span>
46-
)}
47-
</Link>
48-
</li>
49-
)
50-
})}
59+
<li>
60+
<ActionList {...{ as: 'ul' }} items={navItems}></ActionList>
61+
</li>
5162
</ul>
5263
)
5364
}

‎components/sidebar/SidebarProduct.tsx‎

Lines changed: 40 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { useRouter } from 'next/router'
22
import cx from 'classnames'
33
import { useState, useEffect, SyntheticEvent } from 'react'
44
import { ChevronDownIcon } from '@primer/octicons-react'
5+
import { ActionList } from '@primer/components'
56

67
import { Link } from 'components/Link'
78
import { ProductTreeNode, useMainContext } from 'components/context/MainContext'
@@ -114,28 +115,37 @@ const CollapsibleSection = (props: SectionProps) => {
114115
const title = page.renderedShortTitle || page.renderedFullTitle
115116

116117
const isCurrent = routePath === page.href
117-
return (
118-
<li
119-
data-testid="sidebar-article"
120-
data-is-current-page={isCurrent}
121-
key={page.href}
122-
className={cx(
123-
'position-relative',
124-
styles.sidebarArticle,
125-
isCurrent && ['text-bold', styles.sidebarArticleActive]
126-
)}
127-
>
128-
<Link
129-
href={page.href}
118+
return {
119+
text: title,
120+
renderItem: () => (
121+
<ActionList.Item
122+
data-testid="sidebar-article"
123+
data-is-current-page={isCurrent}
124+
as="li"
130125
className={cx(
131-
'd-block pl-6 pr-5 py-1 no-underline',
132-
isCurrent ? 'color-fg-accent' : 'color-fg-default'
126+
'position-relative',
127+
styles.sidebarArticle,
128+
isCurrent && ['text-bold', styles.sidebarArticleActive]
133129
)}
130+
sx={{
131+
padding: '2px 0',
132+
':hover': {
133+
borderRadius: 0,
134+
},
135+
}}
134136
>
135-
{title}
136-
</Link>
137-
</li>
138-
)
137+
<Link
138+
href={page.href}
139+
className={cx(
140+
'd-block pl-6 pr-5 py-1 no-underline width-full',
141+
isCurrent ? 'color-fg-accent' : 'color-fg-default'
142+
)}
143+
>
144+
{title}
145+
</Link>
146+
</ActionList.Item>
147+
),
148+
}
139149
}
140150

141151
return (
@@ -172,19 +182,23 @@ const CollapsibleSection = (props: SectionProps) => {
172182
<summary>
173183
<div className={cx('pl-4 pr-5 py-2 no-underline')}>{childTitle}</div>
174184
</summary>
175-
<ul data-testid="sidebar-article-group" className="my-2 pb-2">
176-
{childPage.childPages.map(renderTerminalPageLink)}
177-
</ul>
185+
<div data-testid="sidebar-article-group" className="pb-0">
186+
<ActionList
187+
{...{ as: 'ul' }}
188+
items={childPage.childPages.map((cp) => {
189+
return renderTerminalPageLink(cp)
190+
})}
191+
></ActionList>
192+
</div>
178193
</details>
179194
</li>
180195
)
181196
})}
182197
</ul>
183198
) : page.childPages[0]?.page.documentType === 'article' ? (
184-
<ul data-testid="sidebar-article-group" className="list-style-none pb-2">
185-
{/* <!-- some categories have no maptopics, only articles --> */}
186-
{page.childPages.map(renderTerminalPageLink)}
187-
</ul>
199+
<div data-testid="sidebar-article-group" className="pb-0">
200+
<ActionList {...{ as: 'ul' }} items={page.childPages.map(renderTerminalPageLink)} />
201+
</div>
188202
) : null}
189203
</>
190204
}

‎lib/search/indexes/github-docs-3.0-cn-records.json.br‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:04fb89f60232c931deba00faaa4db448487dc7f75a7f2ffcb10cb024e8392b96
3-
size 640488
2+
oid sha256:d75bf7e8e9e4ab87fcf375548aa58053c8763993c0d7231a8862516d292069ed
3+
size 640539

‎lib/search/indexes/github-docs-3.0-cn.json.br‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:bfab7c54689f7e000dbee449a07220117689ee67907251a424c54268e2df2bdc
3-
size 1109486
2+
oid sha256:1c657ee802dd31299be1fd1e5928151a3932e57dd2c8aff6243edab0d141d5ef
3+
size 1109088

‎lib/search/indexes/github-docs-3.0-en-records.json.br‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:7d573272a4eb8ef6dbdcda6506433774d78f364caad2c08578c874c35b431af4
3-
size 944920
2+
oid sha256:9fe08ccebc82241c059a3b43522f9767523568abcff635a34b98751596bbed9c
3+
size 945063

‎lib/search/indexes/github-docs-3.0-en.json.br‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:9656199925945f193fbb1981a583a178160d8e140f2f17673b08ba74835ead7c
3-
size 3859458
2+
oid sha256:341aa5e3ea18cfa5df5b7f7f4b9dbae6869a870c95d64782f9f32981d4e5120c
3+
size 3859621

‎lib/search/indexes/github-docs-3.0-es-records.json.br‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:8670723c1517da68cc9558a874bf862b529070dbe39b107930c5e9f78867c285
3-
size 544976
2+
oid sha256:9392d2aa4879016f2957a86c35521bf229ac44fe55d0c99accd3a7152a142c9a
3+
size 545147

‎lib/search/indexes/github-docs-3.0-es.json.br‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:cc095dbe2b6504c43051efeb0ede9f4371179b8a7cf0f8860542b9b4fc42a444
3-
size 2163560
2+
oid sha256:12f4956e335db917c3b32eeb5c8f6d29347a45148a3c2922af57b877c24876c9
3+
size 2162389

‎lib/search/indexes/github-docs-3.0-ja-records.json.br‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:66491af2d22f4f3ce6a2d042ecb44b332fb6ae0835a33f311a4cab7822309e41
3-
size 666368
2+
oid sha256:689129e5af86354e1a43b48ef1f6b780531a6ecb8e06f1f14dca41435c5f325c
3+
size 666293

0 commit comments

Comments
 (0)