Skip to content

Fix GitLab #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 10, 2025
Merged

Fix GitLab #194

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbe9531
Fix GitLab
filiptronicek Jun 9, 2025
f48983c
Update button-contributions-copy.ts
filiptronicek Jun 9, 2025
55f02d7
fix gitlab panel and new issue layouts
filiptronicek Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 6 additions & 19 deletions src/button/button-contributions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,15 +232,15 @@ export const buttonContributions: ButtonContributionParams[] = [
id: "gl-merge-request",
exampleUrls: ["https://gitlab.com/svenefftinge/browser-extension-test/-/merge_requests/1"],
match: /\/merge_requests\//,
selector: "body[data-project-id] div.detail-page-header-actions.is-merge-request > div",
containerElement: createElement("div", { marginLeft: "8px", marginRight: "-8px" }),
selector: "#content-body > div.merge-request .js-issuable-actions",
containerElement: createElement("div", {}),
application: "gitlab",
insertBefore: "body[data-project-id] div.detail-page-header-actions.is-merge-request > div > div",
insertBefore: "#content-body > div.merge-request .js-issuable-actions > div.dropdown.gl-dropdown",
manipulations: [
{
// make the clone button secondary
element:
"#content-body > div.merge-request > div.detail-page-header.border-bottom-0.gl-display-block.gl-pt-5.gl-sm-display-flex\\!.is-merge-request > div.detail-page-header-actions.gl-align-self-start.is-merge-request.js-issuable-actions.gl-display-flex > div > div.gl-sm-ml-3.dropdown.gl-dropdown > button",
"#content-body > div.merge-request .js-issuable-actions > div.dropdown.gl-dropdown > button",
remove: "btn-confirm",
},
],
Expand All @@ -249,23 +249,10 @@ export const buttonContributions: ButtonContributionParams[] = [
id: "gl-issue",
exampleUrls: ["https://gitlab.com/svenefftinge/browser-extension-test/-/issues/1"],
match: /\/issues\//,
selector:
"#content-body > div.issue-details.issuable-details.js-issue-details > div.detail-page-description.content-block.js-detail-page-description.gl-pt-3.gl-pb-0.gl-border-none > div:nth-child(1) > div > div.gl-flex.gl-items-start.gl-flex-col.md\\:gl-flex-row.gl-gap-3.gl-pt-3 > div",
selector: "xpath://*[@id='content-body']/div[2]/div/section/section/div[2]/div[1]/div[2]",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

L252 applies to existing issues, not newly created issues.

Perhaps we can make a duplicate entry, but with a slightly different selector?

Ref: https://linear.app/gitpod/issue/NEXT-4008/browser-extension-open-button-missing-on-pull-request-page-for#comment-05536ac1

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kylos101 in the end, I found a selector that works for both, utilizing their data-testid attributes on elements. Let's cross our fingers that GitLab keeps those stable 🤞

containerElement: createElement("div", { marginLeft: "0", marginRight: "0px" }),
application: "gitlab",
insertBefore: "#new-actions-header-dropdown",
manipulations: [
{
element:
"#content-body > div.issue-details.issuable-details.js-issue-details > div.detail-page-description.content-block.js-detail-page-description.gl-pt-3.gl-pb-0.gl-border-none > div.js-issue-widgets > div > div > div.new-branch-col.gl-font-size-0.gl-my-2 > div > div.btn-group.available > button.gl-button.btn.btn-md.btn-confirm.js-create-merge-request",
remove: "btn-confirm",
},
{
element:
"#content-body > div.issue-details.issuable-details.js-issue-details > div.detail-page-description.content-block.js-detail-page-description.gl-pt-3.gl-pb-0.gl-border-none > div.js-issue-widgets > div > div > div.new-branch-col.gl-font-size-0.gl-my-2 > div > div.btn-group.available > button.gl-button.btn.btn-icon.btn-md.btn-confirm.js-dropdown-toggle.dropdown-toggle.create-merge-request-dropdown-toggle",
remove: "btn-confirm",
},
],
insertBefore: "xpath://*[@id='content-body']/div[2]/div/section/section/div[2]/div[1]/div[2]/div",
},

// GitHub
Expand Down
15 changes: 15 additions & 0 deletions src/button/button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,21 @@
--dropdown-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}

@media (prefers-color-scheme: dark) {
.gitlab {
--primary-bg-color: #63a6e9;
--primary-hover-bg-color: #9ec7f1;
--primary-color: #18171d;
--primary-hover-color: #18171d;
--primary-separator-color: #18171e;

--dropdown-color: #ececef;
--dropdown-bg-color: #28272e;
--dropdown-hover-bg-color: #4f4e53;
--dropdown-border-color: #4c4b51;
}
}

.bitbucket-server {
--font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Fira Sans, Droid Sans,
Helvetica Neue, sans-serif;
Expand Down
25 changes: 6 additions & 19 deletions test/src/button-contributions-copy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,15 +232,15 @@ export const buttonContributions: ButtonContributionParams[] = [
id: "gl-merge-request",
exampleUrls: ["https://gitlab.com/svenefftinge/browser-extension-test/-/merge_requests/1"],
match: /\/merge_requests\//,
selector: "body[data-project-id] div.detail-page-header-actions.is-merge-request > div",
containerElement: createElement("div", { marginLeft: "8px", marginRight: "-8px" }),
selector: "#content-body > div.merge-request .js-issuable-actions",
containerElement: createElement("div", {}),
application: "gitlab",
insertBefore: "body[data-project-id] div.detail-page-header-actions.is-merge-request > div > div",
insertBefore: "#content-body > div.merge-request .js-issuable-actions > div.dropdown.gl-dropdown",
manipulations: [
{
// make the clone button secondary
element:
"#content-body > div.merge-request > div.detail-page-header.border-bottom-0.gl-display-block.gl-pt-5.gl-sm-display-flex\\!.is-merge-request > div.detail-page-header-actions.gl-align-self-start.is-merge-request.js-issuable-actions.gl-display-flex > div > div.gl-sm-ml-3.dropdown.gl-dropdown > button",
"#content-body > div.merge-request .js-issuable-actions > div.dropdown.gl-dropdown > button",
remove: "btn-confirm",
},
],
Expand All @@ -249,23 +249,10 @@ export const buttonContributions: ButtonContributionParams[] = [
id: "gl-issue",
exampleUrls: ["https://gitlab.com/svenefftinge/browser-extension-test/-/issues/1"],
match: /\/issues\//,
selector:
"#content-body > div.issue-details.issuable-details.js-issue-details > div.detail-page-description.content-block.js-detail-page-description.gl-pt-3.gl-pb-0.gl-border-none > div:nth-child(1) > div > div.gl-flex.gl-items-start.gl-flex-col.md\\:gl-flex-row.gl-gap-3.gl-pt-3 > div",
selector: "xpath://*[@id='content-body']/div[2]/div/section/section/div[2]/div[1]/div[2]",
containerElement: createElement("div", { marginLeft: "0", marginRight: "0px" }),
application: "gitlab",
insertBefore: "#new-actions-header-dropdown",
manipulations: [
{
element:
"#content-body > div.issue-details.issuable-details.js-issue-details > div.detail-page-description.content-block.js-detail-page-description.gl-pt-3.gl-pb-0.gl-border-none > div.js-issue-widgets > div > div > div.new-branch-col.gl-font-size-0.gl-my-2 > div > div.btn-group.available > button.gl-button.btn.btn-md.btn-confirm.js-create-merge-request",
remove: "btn-confirm",
},
{
element:
"#content-body > div.issue-details.issuable-details.js-issue-details > div.detail-page-description.content-block.js-detail-page-description.gl-pt-3.gl-pb-0.gl-border-none > div.js-issue-widgets > div > div > div.new-branch-col.gl-font-size-0.gl-my-2 > div > div.btn-group.available > button.gl-button.btn.btn-icon.btn-md.btn-confirm.js-dropdown-toggle.dropdown-toggle.create-merge-request-dropdown-toggle",
remove: "btn-confirm",
},
],
insertBefore: "xpath://*[@id='content-body']/div[2]/div/section/section/div[2]/div[1]/div[2]/div",
},

// GitHub
Expand Down
Loading