Skip to content

Commit 1ff5c54

Browse files
nedtwiggnedtwigg
committed
refactor some project stuff into github-common
2 parents f5415ce + 4bdb01d commit 1ff5c54

4 files changed

Lines changed: 89 additions & 55 deletions

File tree

‎src/lib/enhancers/github/GitHubEditEnhancer.tsx‎

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@ import type {
77
} from "@/lib/enhancer"
88
import { logger } from "@/lib/logger"
99
import { fixupOvertype, modifyDOM } from "../overtype-misc"
10-
import { commonGitHubOptions, prepareGitHubHighlighter } from "./github-common"
10+
import {
11+
commonGitHubOptions,
12+
isInProjectCommentBox,
13+
isProjectUrl,
14+
parseProjectIssueParam,
15+
prepareGitHubHighlighter,
16+
} from "./github-common"
1117

1218
const GH_EDIT = "GH_EDIT" as const
1319

@@ -30,21 +36,14 @@ export class GitHubEditEnhancer implements CommentEnhancer<GitHubEditSpot> {
3036
}
3137

3238
// Check for project draft edit first
33-
const isProjectDraftEdit = location.pathname.match(
34-
/^\/(?:orgs|users)\/[^/]+\/projects\/\d+(?:\/views\/\d+)?/
35-
)
36-
if (isProjectDraftEdit) {
39+
if (isProjectUrl(location.pathname)) {
3740
const params = new URLSearchParams(location.search)
3841
const itemId = params.get("itemId")
39-
const issueParam = params.get("issue")
4042

4143
// Handle draft editing (itemId parameter)
4244
if (itemId) {
4345
// Exclude textareas within Shared-module__CommentBox (those are for adding new comments, not editing)
44-
const isInCommentBox = textarea.closest(
45-
'[class*="Shared-module__CommentBox"]'
46-
)
47-
if (!isInCommentBox) {
46+
if (!isInProjectCommentBox(textarea)) {
4847
const unique_key = `github.com:project-draft:${itemId}:edit-body`
4948
logger.debug(
5049
`${this.constructor.name} enhanced project draft body textarea`,
@@ -59,27 +58,20 @@ export class GitHubEditEnhancer implements CommentEnhancer<GitHubEditSpot> {
5958
}
6059

6160
// Handle existing issue comment editing (issue parameter)
62-
if (issueParam) {
63-
// Parse issue parameter: "owner|repo|number"
64-
const parts = issueParam.split("|")
65-
if (parts.length === 3) {
66-
const [owner, repo, numberStr] = parts
67-
const slug = `${owner}/${repo}`
68-
const number = parseInt(numberStr!, 10)
69-
70-
// Edit mode: empty placeholder
71-
// Add new comment mode: has placeholder "Add your comment here..." or similar
72-
if (!textarea.placeholder || textarea.placeholder.trim() === "") {
73-
const unique_key = `github.com:${slug}:${number}:edit-comment`
74-
logger.debug(
75-
`${this.constructor.name} enhanced project issue comment edit textarea`,
76-
unique_key
77-
)
78-
return {
79-
isIssue: true,
80-
type: GH_EDIT,
81-
unique_key,
82-
}
61+
const issueInfo = parseProjectIssueParam(params)
62+
if (issueInfo) {
63+
// Edit mode: empty placeholder
64+
// Add new comment mode: has placeholder "Add your comment here..." or similar
65+
if (!textarea.placeholder || textarea.placeholder.trim() === "") {
66+
const unique_key = `github.com:${issueInfo.slug}:${issueInfo.number}:edit-comment`
67+
logger.debug(
68+
`${this.constructor.name} enhanced project issue comment edit textarea`,
69+
unique_key
70+
)
71+
return {
72+
isIssue: true,
73+
type: GH_EDIT,
74+
unique_key,
8375
}
8476
}
8577
}

‎src/lib/enhancers/github/GitHubIssueAppendEnhancer.tsx‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ import type {
99
} from "@/lib/enhancer"
1010
import { logger } from "@/lib/logger"
1111
import { fixupOvertype, modifyDOM } from "../overtype-misc"
12-
import { commonGitHubOptions, prepareGitHubHighlighter } from "./github-common"
12+
import {
13+
commonGitHubOptions,
14+
isInProjectCommentBox,
15+
isProjectUrl,
16+
parseProjectIssueParam,
17+
prepareGitHubHighlighter,
18+
} from "./github-common"
1319

1420
const GH_ISSUE_APPEND = "GH_ISSUE_APPEND" as const
1521

@@ -46,33 +52,22 @@ export class GitHubIssueAppendEnhancer
4652
}
4753

4854
// Check for project URLs with issue parameter first
49-
const isProjectView = location.pathname.match(
50-
/^\/(?:orgs|users)\/[^/]+\/projects\/\d+(?:\/views\/\d+)?/
51-
)
52-
if (isProjectView) {
55+
if (isProjectUrl(location.pathname)) {
5356
const params = new URLSearchParams(location.search)
54-
const issueParam = params.get("issue")
5557
// Only match textareas within Shared-module__CommentBox (those are for adding new comments)
56-
const isInCommentBox = textarea.closest(
57-
'[class*="Shared-module__CommentBox"]'
58-
)
59-
if (issueParam && isInCommentBox) {
60-
// Parse issue parameter: "owner|repo|number" (URL encoded as owner%7Crepo%7Cnumber)
61-
const parts = issueParam.split("|")
62-
if (parts.length === 3) {
63-
const [owner, repo, numberStr] = parts
64-
const slug = `${owner}/${repo}`
65-
const number = parseInt(numberStr!, 10)
66-
const unique_key = `github.com:${slug}:${number}`
58+
if (isInProjectCommentBox(textarea)) {
59+
const issueInfo = parseProjectIssueParam(params)
60+
if (issueInfo) {
61+
const unique_key = `github.com:${issueInfo.slug}:${issueInfo.number}`
6762
// For project views, the title is in the side panel dialog
6863
const title =
6964
document
7065
.querySelector('[data-testid="issue-title"]')
7166
?.textContent?.trim() || ""
7267
return {
7368
domain: location.host,
74-
number,
75-
slug,
69+
number: issueInfo.number,
70+
slug: issueInfo.slug,
7671
title,
7772
type: GH_ISSUE_APPEND,
7873
unique_key,

‎src/lib/enhancers/github/GitHubIssueCreateEnhancer.tsx‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ import type {
88
} from "../../enhancer"
99
import { logger } from "../../logger"
1010
import { fixupOvertype, modifyDOM } from "../overtype-misc"
11-
import { commonGitHubOptions, prepareGitHubHighlighter } from "./github-common"
11+
import {
12+
commonGitHubOptions,
13+
isProjectUrl,
14+
prepareGitHubHighlighter,
15+
} from "./github-common"
1216

1317
const GH_ISSUE_CREATE = "GH_ISSUE_CREATE" as const
1418

@@ -38,10 +42,7 @@ export class GitHubIssueCreateEnhancer
3842
}
3943

4044
// Check for project board URLs first
41-
const isProjectView = location.pathname.match(
42-
/^\/(?:orgs|users)\/[^/]+\/projects\/\d+(?:\/views\/\d+)?/
43-
)
44-
if (isProjectView) {
45+
if (isProjectUrl(location.pathname)) {
4546
// Check if we're in a "Create new issue" dialog
4647
const dialog = textarea.closest('[role="dialog"]')
4748
if (dialog) {

‎src/lib/enhancers/github/github-common.ts‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,49 @@ function githubHighlighter(code: string, language?: string) {
6161
return escapeHtml(code)
6262
}
6363
}
64+
65+
// Project-related helper functions
66+
67+
/**
68+
* Check if the pathname matches a GitHub project URL pattern.
69+
* Matches: /orgs/{org}/projects/{id} or /users/{user}/projects/{id}
70+
* Optional: /views/{viewId} suffix
71+
*/
72+
export function isProjectUrl(pathname: string): boolean {
73+
return /^\/(?:orgs|users)\/[^/]+\/projects\/\d+(?:\/views\/\d+)?/.test(
74+
pathname
75+
)
76+
}
77+
78+
/**
79+
* Parse the issue parameter from project URLs.
80+
* Format: ?issue=owner|repo|number
81+
* Returns: { slug: "owner/repo", number: 123 } or null if invalid
82+
*/
83+
export function parseProjectIssueParam(
84+
searchParams: URLSearchParams
85+
): { slug: string; number: number } | null {
86+
const issueParam = searchParams.get("issue")
87+
if (!issueParam) return null
88+
89+
const parts = issueParam.split("|")
90+
if (parts.length !== 3) return null
91+
92+
const [owner, repo, numberStr] = parts
93+
const number = parseInt(numberStr!, 10)
94+
95+
if (Number.isNaN(number)) return null
96+
97+
return {
98+
slug: `${owner}/${repo}`,
99+
number,
100+
}
101+
}
102+
103+
/**
104+
* Check if an element is within a project CommentBox container.
105+
* CommentBox containers are used for adding new comments (not editing).
106+
*/
107+
export function isInProjectCommentBox(element: HTMLElement): boolean {
108+
return !!element.closest('[class*="Shared-module__CommentBox"]')
109+
}

0 commit comments

Comments
 (0)