diff --git a/.vscode/settings.json b/.vscode/settings.json index ea13c0b..fa871bf 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,5 +4,7 @@ "Repos", "kamino", "linkstring" - ] + ], + "html.format.indentInnerHtml": true, + "html.format.wrapAttributes": "preserve" } \ No newline at end of file diff --git a/app.js b/app.js index 5f15eef..a58a254 100644 --- a/app.js +++ b/app.js @@ -106,7 +106,7 @@ function initializeExtension() { $('.noClone').click(() => { closeModal() }) - } + } } function saveAppliedFilters(urlObj) { @@ -162,7 +162,7 @@ function saveAppliedFilters(urlObj) { { filters: item.filters, }, - () => {} + () => { } ) } } @@ -211,7 +211,7 @@ function loadRepos() { // create a way to go to options without using the extension context menu $('.kamino-heading').click(() => { - chrome.runtime.sendMessage({ action: 'goToOptions' }, (response) => {}) + chrome.runtime.sendMessage({ action: 'goToOptions' }, (response) => { }) }) // if there's no personal access token, disable the button @@ -231,7 +231,7 @@ function loadRepos() { $('.repoDropdown').append('
  • Last Used
    • ') $('.repoDropdown').append('
  • The Rest
    • ') - getRepos('https://api.github.com/user/repos?per_page=100').then(() => {}) + getRepos('https://api.github.com/user/repos?per_page=100').then(() => { }) } function compileRepositoryList(list, searchTerm) { @@ -312,32 +312,45 @@ function getGithubIssue(repo, closeOriginal) { '', `https://api.github.com/repos/${urlObj.organization}/${urlObj.currentRepo}/issues/${urlObj.issueNumber}` ).then((issue) => { - // build new issue - const newIssue = { - title: issue.data.title, - body: `From ${urlObj.currentRepo} created by [${issue.data.user.login}](${issue.data.user.html_url}): ${urlObj.organization}/${urlObj.currentRepo}#${urlObj.issueNumber} \n\n${issue.data.body}`, - labels: issue.data.labels, - } - - createGithubIssue(newIssue, repo, issue.data, closeOriginal) + createGithubIssue(repo, issue.data, closeOriginal) }) } // create the cloned GitHub issue -function createGithubIssue(newIssue, repo, oldIssue, closeOriginal) { +function createGithubIssue(repo, oldIssue, closeOriginal) { const urlObj = populateUrlMetadata() - ajaxRequest('POST', newIssue, `https://api.github.com/repos/${repo}/issues`).then((response) => { - // clone comments from old issue to new issue - cloneOldIssueComments( - response.data.number, - repo, - `https://api.github.com/repos/${urlObj.organization}/${urlObj.currentRepo}/issues/${urlObj.issueNumber}/comments?per_page=100` - ).then((res) => { - // add a comment to the closed issue - commentOnIssue(repo, oldIssue, response.data, closeOriginal) + chrome.storage.sync.get( + { + preventReferences: false, + }, + (item) => { + const newIssueBody = `From ${urlObj.currentRepo} created by [${oldIssue.user.login}](${oldIssue.user.html_url}): [${urlObj.organization}/${urlObj.currentRepo}#${urlObj.issueNumber}](https://github.com/${urlObj.organization}/${urlObj.currentRepo}/issues/${urlObj.issueNumber}) \n\n${oldIssue.body}`; + + // build new issue + const newIssue = { + title: oldIssue.title, + body: item.preventReferences ? preventReferences(newIssueBody) : newIssueBody, + labels: oldIssue.labels, + } + + ajaxRequest('POST', newIssue, `https://api.github.com/repos/${repo}/issues`).then((response) => { + // clone comments from old issue to new issue + cloneOldIssueComments( + response.data.number, + repo, + `https://api.github.com/repos/${urlObj.organization}/${urlObj.currentRepo}/issues/${urlObj.issueNumber}/comments?per_page=100` + ).then((res) => { + // add a comment to the closed issue + commentOnIssue(repo, oldIssue, response.data, closeOriginal) + }) + }) }) - }) +} + +function preventReferences(text) { + // replace "github.com" links with "www.github.com" links, which do not cause references on the original issue due to the "www" (see https://github.com/orgs/community/discussions/23123#discussioncomment-3239240) + return text.replace(/https:\/\/github.com\//gi, "https://www.github.com/") } function cloneOldIssueComments(newIssue, repo, url) { @@ -345,6 +358,7 @@ function cloneOldIssueComments(newIssue, repo, url) { chrome.storage.sync.get( { cloneComments: false, + preventReferences: false, }, (item) => { if (!item.cloneComments) { @@ -358,13 +372,13 @@ function cloneOldIssueComments(newIssue, repo, url) { comments.data.reduce( (p, comment) => p.then(_ => { const c = { - body: comment.body, + body: item.preventReferences ? preventReferences(comment.body) : comment.body, } return ajaxRequest('POST', c, `https://api.github.com/repos/${repo}/issues/${newIssue}/comments`) }), Promise.resolve() - ).then((res) => { - return Promise.resolve({}) + ).then((res) => { + return Promise.resolve({}) }) } ) @@ -382,7 +396,7 @@ function closeGithubIssue(oldIssue) { 'PATCH', issueToClose, `https://api.github.com/repos/${urlObj.organization}/${urlObj.currentRepo}/issues/${urlObj.issueNumber}` - ).then((done) => {}) + ).then((done) => { }) } function commentOnIssue(repo, oldIssue, newIssue, closeOriginal) { @@ -426,7 +440,7 @@ function goToIssueList(repo, issueNumber, org, oldRepo) { // based on user settings, determines if the issues list will open after a clone or not chrome.runtime.sendMessage( { repo: repo, issueNumber: issueNumber, organization: org, oldRepo: oldRepo }, - (response) => {} + (response) => { } ) } @@ -538,7 +552,7 @@ function addToMostUsed(repo) { { mostUsed: item.mostUsed, }, - (done) => {} + (done) => { } ) } ) diff --git a/options.html b/options.html index 3b8e096..264d7a2 100644 --- a/options.html +++ b/options.html @@ -1,5 +1,6 @@ + Kamino Settings @@ -7,8 +8,7 @@ href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-eOJMYsd53ii+scO/bJGFsiCZc+5NDVN2yr8+0RDqr0Ql0h+rP48ckxlpbzKgwra6" - crossorigin="anonymous" - /> + crossorigin="anonymous" /> @@ -42,7 +42,8 @@

    General Settings

    - +
    @@ -54,10 +55,15 @@

    General Settings

    - + +
    + +
    +
    @@ -77,8 +83,8 @@

    General Settings

    + crossorigin="anonymous"> - + + \ No newline at end of file diff --git a/options.js b/options.js index 1cccd8f..a4fcd31 100644 --- a/options.js +++ b/options.js @@ -5,6 +5,7 @@ function save_options() { const createTab = document.getElementById('create-tab').checked const cloneComments = document.getElementById('clone-comments').checked const disableCommentsOnOriginal = document.getElementById('disable-comment-on-original') + const preventReferences = document.getElementById('prevent-references') chrome.storage.sync.set( { @@ -13,6 +14,7 @@ function save_options() { createTab, cloneComments, disableCommentsOnOriginal, + preventReferences }, function () { // Update status to let user know options were saved. @@ -38,6 +40,7 @@ function restore_options() { createTab: true, cloneComments: false, disableCommentsOnOriginal: false, + preventReferences: false, }, function (items) { document.getElementById('github-pat').value = items.githubToken @@ -45,6 +48,7 @@ function restore_options() { document.getElementById('create-tab').checked = items.createTab document.getElementById('clone-comments').checked = items.cloneComments document.getElementById('disable-comment-on-original').checked = items.disableCommentsOnOriginal + document.getElementById('prevent-references').checked = items.preventReferences } ) } diff --git a/templates/button.handlebars b/templates/button.handlebars index 2d5c9df..9cd1bc1 100644 --- a/templates/button.handlebars +++ b/templates/button.handlebars @@ -1,21 +1,24 @@
    - +
    -
    -
    +
      diff --git a/templates/modal.handlebars b/templates/modal.handlebars index 8271ced..db41d51 100644 --- a/templates/modal.handlebars +++ b/templates/modal.handlebars @@ -9,8 +9,10 @@

      {{confirmText}}

      - - + +