diff --git a/extensions/git-extended/media/index.css b/extensions/git-extended/media/index.css new file mode 100644 index 00000000000..e282ab96406 --- /dev/null +++ b/extensions/git-extended/media/index.css @@ -0,0 +1,79 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +.title { + display: flex; + align-items: flex-start; + margin-top: 10px; +} + +h3 { + margin: 0; +} + +body hr { + display: block; + height: 1px; + border: 0; + border-top: 1px solid #555; + margin: 0 !important; + padding: 0; + +} +body .review-comment { + padding: 20px; + display: flex; +} + +body .review-comment .avatar-container { + margin-top: 4px !important; +} + +body img.avatar { + height: 28px; + width: 28px; + max-width: 28px; + max-height: 28px; + display: inline-block; + overflow: hidden; + line-height: 1; + vertical-align: middle; + border-radius: 3px; + border-style: none; + margin-right: 5px; +} + +body .review-comment .review-comment-contents { + margin-left: 20px; +} + +body { + margin: auto; + width: 100%; + max-width: 1200px; +} + +.prIcon { + display: flex; + border-radius: 10px; + margin-right: 5px; + margin-top: 18px; +} + +.status { + display: inline-block; + height: 28px; + box-sizing: border-box; + line-height: 20px; + border-radius: 3px; + color: white; + padding: 4px 8px; + margin-right: 5px; +} + +.details { + display: flex; + flex-direction: column; +} \ No newline at end of file diff --git a/extensions/git-extended/media/index.js b/extensions/git-extended/media/index.js new file mode 100644 index 00000000000..f5278cab07b --- /dev/null +++ b/extensions/git-extended/media/index.js @@ -0,0 +1,231 @@ +/******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) { +/******/ return installedModules[moduleId].exports; +/******/ } +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { +/******/ configurable: false, +/******/ enumerable: true, +/******/ get: getter +/******/ }); +/******/ } +/******/ }; +/******/ +/******/ // define __esModule on exports +/******/ __webpack_require__.r = function(exports) { +/******/ Object.defineProperty(exports, '__esModule', { value: true }); +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; +/******/ +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = "./preview-src/index.ts"); +/******/ }) +/************************************************************************/ +/******/ ({ + +/***/ "./preview-src/index.ts": +/*!******************************!*\ + !*** ./preview-src/index.ts ***! + \******************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +Object.defineProperty(exports, "__esModule", { value: true }); +const pullRequestOverviewRenderer_1 = __webpack_require__(/*! ./pullRequestOverviewRenderer */ "./preview-src/pullRequestOverviewRenderer.ts"); +// declare var acquireVsCodeApi: any; +// const vscode = acquireVsCodeApi(); +function handleMessage(event) { + const message = event.data; // The json data that the extension sent + switch (message.command) { + case 'initialize': + document.getElementById('pullrequest').innerHTML = message.pullrequest.events.map(pullRequestOverviewRenderer_1.renderTimelineEvent).join(''); + setTitleHTML(message.pullrequest); + break; + default: + break; + } +} +window.addEventListener('message', handleMessage); +function setTitleHTML(pr) { + document.getElementById('title').innerHTML = ` +
+
+
+

${pr.title} (#${pr.number})

+
+
+
${pullRequestOverviewRenderer_1.getStatus(pr)}
+ + ${pr.author.login} +
+
+ ${pr.body} +
+
+ `; +} + + +/***/ }), + +/***/ "./preview-src/pullRequestOverviewRenderer.ts": +/*!****************************************************!*\ + !*** ./preview-src/pullRequestOverviewRenderer.ts ***! + \****************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +Object.defineProperty(exports, "__esModule", { value: true }); +var EventType; +(function (EventType) { + EventType[EventType["Committed"] = 0] = "Committed"; + EventType[EventType["Mentioned"] = 1] = "Mentioned"; + EventType[EventType["Subscribed"] = 2] = "Subscribed"; + EventType[EventType["Commented"] = 3] = "Commented"; + EventType[EventType["Reviewed"] = 4] = "Reviewed"; + EventType[EventType["Other"] = 5] = "Other"; +})(EventType = exports.EventType || (exports.EventType = {})); +function renderComment(user, body) { + return `
+ +
+
+ +
+
+
+ ${user.login} +
+
+ ${body} +
+
+
+
`; +} +exports.renderComment = renderComment; +function renderCommit(timelineEvent) { + return `
+ +
+
+
+ ${timelineEvent.author.name} commit: ${timelineEvent.message} (${timelineEvent.sha}) +
+
+
+
`; +} +exports.renderCommit = renderCommit; +function renderReview(timelineEvent) { + return `
+ +
+
+
+ ${timelineEvent.user.login} left a review. +
+
+
+
`; +} +exports.renderReview = renderReview; +function renderTimelineEvent(timelineEvent) { + switch (timelineEvent.event) { + case EventType.Committed: + return renderCommit(timelineEvent); + case EventType.Commented: + return renderComment(timelineEvent.user, timelineEvent.body); + case EventType.Reviewed: + return renderReview(timelineEvent); + } + return ''; +} +exports.renderTimelineEvent = renderTimelineEvent; +// export function getStatusBGCoor(pr: any) { +// if (pr.isMerged) { +// return '#6f42c1'; +// } else if (pr.isOpen) { +// return '#2cbe4e'; +// } else { +// return '#cb2431'; +// } +// } +function getStatus(pr) { + if (pr.isMerged) { + return 'Merged'; + } + else if (pr.isOpen) { + return 'Open'; + } + else { + return 'Closed'; + } +} +exports.getStatus = getStatus; + + +/***/ }) + +/******/ }); +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./preview-src/index.ts","webpack:///./preview-src/pullRequestOverviewRenderer.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./preview-src/index.ts\");\n","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { renderTimelineEvent, getStatus } from './pullRequestOverviewRenderer';\n\n// declare var acquireVsCodeApi: any;\n// const vscode = acquireVsCodeApi();\n\nfunction handleMessage(event: any) {\n\tconst message = event.data; // The json data that the extension sent\n\tswitch (message.command) {\n\t\tcase 'initialize':\n\t\t\tdocument.getElementById('pullrequest')!.innerHTML = message.pullrequest.events.map(renderTimelineEvent).join('');\n\t\t\tsetTitleHTML(message.pullrequest);\n\t\t\tbreak;\n\t\tdefault:\n\t\t\tbreak;\n\t}\n}\n\nwindow.addEventListener('message', handleMessage);\n\n\nfunction setTitleHTML(pr: any){\n\tdocument.getElementById('title')!.innerHTML = `\n\t\t\t<div class=\"prIcon\"><svg width=\"64\" height=\"64\" class=\"octicon octicon-git-compare\" viewBox=\"0 0 14 16\" version=\"1.1\" aria-hidden=\"true\"><path fill=\"#FFFFFF\" fill-rule=\"evenodd\" d=\"M5 12H4c-.27-.02-.48-.11-.69-.31-.21-.2-.3-.42-.31-.69V4.72A1.993 1.993 0 0 0 2 1a1.993 1.993 0 0 0-1 3.72V11c.03.78.34 1.47.94 2.06.6.59 1.28.91 2.06.94h1v2l3-3-3-3v2zM2 1.8c.66 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2C1.35 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2zm11 9.48V5c-.03-.78-.34-1.47-.94-2.06-.6-.59-1.28-.91-2.06-.94H9V0L6 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 12 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z\"></path></svg></div>\n\t\t\t<div class=\"details\">\n\t\t\t\t<div>\n\t\t\t\t\t<h2>${pr.title} (<a href=${pr.html_url}>#${pr.number}</a>) </h2>\n\t\t\t\t</div>\n\t\t\t\t<div>\n\t\t\t\t\t<div class=\"status\">${getStatus(pr)}</div>\n\t\t\t\t\t<img class=\"avatar\" src=\"${pr.author.avatar_url}\">\n\t\t\t\t\t<strong class=\"author\"><a href=\"${pr.author.html_url}\">${pr.author.login}</a></strong>\n\t\t\t\t</div>\n\t\t\t\t<div class=\"comment-body\">\n\t\t\t\t\t${pr.body}\n\t\t\t\t</div>\n\t\t\t</div>\n\t\t`;\n}","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nexport enum EventType {\n\tCommitted,\n\tMentioned,\n\tSubscribed,\n\tCommented,\n\tReviewed,\n\tOther\n}\n\nexport interface Author {\n\tname: string;\n\temail: string;\n\tdate: Date;\n}\n\nexport interface Committer {\n\tname: string;\n\temail: string;\n\tdate: Date;\n}\n\nexport interface Tree {\n\tsha: string;\n\turl: string;\n}\n\nexport interface Parent {\n\tsha: string;\n\turl: string;\n\thtml_url: string;\n}\n\nexport interface Verification {\n\tverified: boolean;\n\treason: string;\n\tsignature?: any;\n\tpayload?: any;\n}\n\nexport interface User {\n\tlogin: string;\n\tid: number;\n\tavatar_url: string;\n\tgravatar_id: string;\n\turl: string;\n\thtml_url: string;\n\tfollowers_url: string;\n\tfollowing_url: string;\n\tgists_url: string;\n\tstarred_url: string;\n\tsubscriptions_url: string;\n\torganizations_url: string;\n\trepos_url: string;\n\tevents_url: string;\n\treceived_events_url: string;\n\ttype: string;\n\tsite_admin: boolean;\n}\n\nexport interface Html {\n\thref: string;\n}\n\nexport interface PullRequest {\n\thref: string;\n}\n\nexport interface Links {\n\thtml: Html;\n\tpull_request: PullRequest;\n}\n\nexport interface MentionEvent {\n\tid: number;\n\turl: string;\n\tactor: User;\n\tevent: EventType;\n\tcommit_id: string;\n\tcommit_url: string;\n\tcreated_at: Date;\n}\n\nexport interface SubscribeEvent {\n\tid: number;\n\turl: string;\n\tactor: User;\n\tevent: EventType;\n\tcommit_id: string;\n\tcommit_url: string;\n\tcreated_at: Date;\n}\n\nexport interface CommentEvent {\n\turl: string;\n\thtml_url: string;\n\tauthor: Author;\n\tuser: User;\n\tcreated_at: Date;\n\tupdated_at: Date;\n\tid: number;\n\tevent: EventType;\n\tactor: User;\n\tauthor_association: string;\n\tbody: string;\n}\n\nexport interface ReviewEvent {\n\tid: number;\n\tuser: User;\n\tbody: string;\n\tcommit_id: string;\n\tsubmitted_at: Date;\n\tstate: string;\n\thtml_url: string;\n\tpull_request_url: string;\n\tauthor_association: string;\n\t_links: Links;\n\tevent: EventType;\n}\n\nexport interface CommitEvent {\n\tsha: string;\n\turl: string;\n\thtml_url: string;\n\tauthor: Author;\n\tcommitter: Committer;\n\ttree: Tree;\n\tmessage: string;\n\tparents: Parent[];\n\tverification: Verification;\n\tevent: EventType;\n}\n\nexport type TimelineEvent = CommitEvent | ReviewEvent | SubscribeEvent | CommentEvent | MentionEvent;\n\nexport function renderComment(user: any, body: string): string {\n\treturn `<hr><div class=\"comment-container\">\n\n\t<div class=\"review-comment\" tabindex=\"0\" role=\"treeitem\">\n\t\t<div class=\"avatar-container\">\n\t\t\t<img class=\"avatar\" src=\"${user.avatar_url}\">\n\t\t</div>\n\t\t<div class=\"review-comment-contents\">\n\t\t\t<div>\n\t\t\t\t<strong class=\"author\"><a href=\"${user.html_url}\">${user.login}</a></strong>\n\t\t\t</div>\n\t\t\t<div class=\"comment-body\">\n\t\t\t\t${body}\n\t\t\t</div>\n\t\t</div>\n\t</div>\n</div>`;\n}\n\nexport function renderCommit(timelineEvent: CommitEvent): string {\n\treturn `<hr><div class=\"comment-container\">\n\n\t<div class=\"review-comment\" tabindex=\"0\" role=\"treeitem\">\n\t\t<div class=\"review-comment-contents\">\n\t\t\t<div>\n\t\t\t\t<strong>${timelineEvent.author.name} commit: <a href=\"${timelineEvent.html_url}\">${timelineEvent.message} (${timelineEvent.sha})</a></strong>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n</div>`;\n}\n\nexport function renderReview(timelineEvent: ReviewEvent): string {\n\treturn `<hr><div class=\"comment-container\">\n\n\t<div class=\"review-comment\" tabindex=\"0\" role=\"treeitem\">\n\t\t<div class=\"review-comment-contents\">\n\t\t\t<div>\n\t\t\t\t<strong><a href=\"${timelineEvent.html_url}\">${timelineEvent.user.login} left a review.</a></strong><span></span>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n</div>`;\n}\n\nexport function renderTimelineEvent(timelineEvent: TimelineEvent): string {\n\tswitch (timelineEvent.event) {\n\t\tcase EventType.Committed:\n\t\t\treturn renderCommit((<CommitEvent>timelineEvent));\n\t\tcase EventType.Commented:\n\t\t\treturn renderComment((<CommentEvent>timelineEvent).user, (<CommentEvent>timelineEvent).body);\n\t\tcase EventType.Reviewed:\n\t\t\treturn renderReview((<ReviewEvent>timelineEvent));\n\t}\n\treturn '';\n}\n\n// export function getStatusBGCoor(pr: any) {\n// \tif (pr.isMerged) {\n// \t\treturn '#6f42c1';\n// \t} else if (pr.isOpen) {\n// \t\treturn '#2cbe4e';\n// \t} else {\n// \t\treturn '#cb2431';\n// \t}\n// }\n\nexport function getStatus(pr: any) {\n\tif (pr.isMerged) {\n\t\treturn 'Merged';\n\t} else if (pr.isOpen) {\n\t\treturn 'Open';\n\t} else {\n\t\treturn 'Closed';\n\t}\n}"],"sourceRoot":""} \ No newline at end of file diff --git a/extensions/git-extended/preview-src/index.ts b/extensions/git-extended/preview-src/index.ts index 703e914d348..7406a32749f 100644 --- a/extensions/git-extended/preview-src/index.ts +++ b/extensions/git-extended/preview-src/index.ts @@ -3,16 +3,41 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -declare var acquireVsCodeApi: any; -const vscode = acquireVsCodeApi(); +import { renderTimelineEvent, getStatus } from './pullRequestOverviewRenderer'; -window.addEventListener('message', event => { +// declare var acquireVsCodeApi: any; +// const vscode = acquireVsCodeApi(); + +function handleMessage(event: any) { const message = event.data; // The json data that the extension sent switch (message.command) { - case 'refactor': - console.log('hahah'); + case 'initialize': + document.getElementById('pullrequest')!.innerHTML = message.pullrequest.events.map(renderTimelineEvent).join(''); + setTitleHTML(message.pullrequest); break; default: break; } -}); \ No newline at end of file +} + +window.addEventListener('message', handleMessage); + + +function setTitleHTML(pr: any) { + document.getElementById('title')!.innerHTML = ` +
+
+
+

${pr.title} (#${pr.number})

+
+
+
${getStatus(pr)}
+ + ${pr.author.login} +
+
+ ${pr.body} +
+
+ `; +} \ No newline at end of file diff --git a/extensions/git-extended/preview-src/pullRequestOverviewRenderer.ts b/extensions/git-extended/preview-src/pullRequestOverviewRenderer.ts new file mode 100644 index 00000000000..06b66dfe023 --- /dev/null +++ b/extensions/git-extended/preview-src/pullRequestOverviewRenderer.ts @@ -0,0 +1,216 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +export enum EventType { + Committed, + Mentioned, + Subscribed, + Commented, + Reviewed, + Other +} + +export interface Author { + name: string; + email: string; + date: Date; +} + +export interface Committer { + name: string; + email: string; + date: Date; +} + +export interface Tree { + sha: string; + url: string; +} + +export interface Parent { + sha: string; + url: string; + html_url: string; +} + +export interface Verification { + verified: boolean; + reason: string; + signature?: any; + payload?: any; +} + +export interface User { + login: string; + id: number; + avatar_url: string; + gravatar_id: string; + url: string; + html_url: string; + followers_url: string; + following_url: string; + gists_url: string; + starred_url: string; + subscriptions_url: string; + organizations_url: string; + repos_url: string; + events_url: string; + received_events_url: string; + type: string; + site_admin: boolean; +} + +export interface Html { + href: string; +} + +export interface PullRequest { + href: string; +} + +export interface Links { + html: Html; + pull_request: PullRequest; +} + +export interface MentionEvent { + id: number; + url: string; + actor: User; + event: EventType; + commit_id: string; + commit_url: string; + created_at: Date; +} + +export interface SubscribeEvent { + id: number; + url: string; + actor: User; + event: EventType; + commit_id: string; + commit_url: string; + created_at: Date; +} + +export interface CommentEvent { + url: string; + html_url: string; + author: Author; + user: User; + created_at: Date; + updated_at: Date; + id: number; + event: EventType; + actor: User; + author_association: string; + body: string; +} + +export interface ReviewEvent { + id: number; + user: User; + body: string; + commit_id: string; + submitted_at: Date; + state: string; + html_url: string; + pull_request_url: string; + author_association: string; + _links: Links; + event: EventType; +} + +export interface CommitEvent { + sha: string; + url: string; + html_url: string; + author: Author; + committer: Committer; + tree: Tree; + message: string; + parents: Parent[]; + verification: Verification; + event: EventType; +} + +export type TimelineEvent = CommitEvent | ReviewEvent | SubscribeEvent | CommentEvent | MentionEvent; + +export function renderComment(user: any, body: string): string { + return `
+ +
+
+ +
+
+
+ ${user.login} +
+
+ ${body} +
+
+
+
`; +} + +export function renderCommit(timelineEvent: CommitEvent): string { + return `
+ +
+
+
+ ${timelineEvent.author.name} commit: ${timelineEvent.message} (${timelineEvent.sha}) +
+
+
+
`; +} + +export function renderReview(timelineEvent: ReviewEvent): string { + return `
+ +
+
+
+ ${timelineEvent.user.login} left a review. +
+
+
+
`; +} + +export function renderTimelineEvent(timelineEvent: TimelineEvent): string { + switch (timelineEvent.event) { + case EventType.Committed: + return renderCommit((timelineEvent)); + case EventType.Commented: + return renderComment((timelineEvent).user, (timelineEvent).body); + case EventType.Reviewed: + return renderReview((timelineEvent)); + } + return ''; +} + +// export function getStatusBGCoor(pr: any) { +// if (pr.isMerged) { +// return '#6f42c1'; +// } else if (pr.isOpen) { +// return '#2cbe4e'; +// } else { +// return '#cb2431'; +// } +// } + +export function getStatus(pr: any) { + if (pr.isMerged) { + return 'Merged'; + } else if (pr.isOpen) { + return 'Open'; + } else { + return 'Closed'; + } +} \ No newline at end of file diff --git a/extensions/git-extended/preview-src/tsconfig.json b/extensions/git-extended/preview-src/tsconfig.json index 9684d1ec2d9..bf039f52791 100644 --- a/extensions/git-extended/preview-src/tsconfig.json +++ b/extensions/git-extended/preview-src/tsconfig.json @@ -8,5 +8,8 @@ "strict": true, "noImplicitAny": true, "noUnusedLocals": true - } + }, + "include": [ + "./**/*" + ] } \ No newline at end of file diff --git a/extensions/git-extended/src/commands.ts b/extensions/git-extended/src/commands.ts index b4634cca2d2..e7ff1cfc441 100644 --- a/extensions/git-extended/src/commands.ts +++ b/extensions/git-extended/src/commands.ts @@ -8,10 +8,7 @@ import * as vscode from 'vscode'; import { PullRequestModel } from './common/models/pullRequestModel'; import { FileChangeTreeItem } from './common/treeItems'; import { ReviewManager } from './review/reviewManager'; -import { TimelineEvent, EventType, CommentEvent, ReviewEvent, CommitEvent } from './common/models/timelineEvent'; -const MarkdownIt = require('markdown-it'); - -let panel: vscode.WebviewPanel; +import { PullRequestOverviewPanel } from './common/pullRequestOverview'; export function registerCommands(context: vscode.ExtensionContext) { // initialize resources @@ -40,231 +37,6 @@ export function registerCommands(context: vscode.ExtensionContext) { context.subscriptions.push(vscode.commands.registerCommand('pr.openDescription', async (pr: PullRequestModel) => { // Create and show a new webview - console.log(pr); - console.log(pr.prItem); - if (panel) { - panel.title = `Pull Request #${pr.prNumber}`; - } else { - panel = vscode.window.createWebviewPanel( - 'pullRequestDescription', // Identifies the type of the webview. Used internally - `Pull Request #${pr.prNumber}`, // Title of the panel displayed to the user - vscode.ViewColumn.One, // Editor column to show the new webview panel in. - {} // Webview options. More on these later. - ); - } - - panel.webview.html = getHtmlForWebview(); //await getWebviewContent(pr); + PullRequestOverviewPanel.createOrShow(context.extensionPath, pr); })); - - let md = new MarkdownIt(); - - function getHtmlForWebview() { - const scriptPathOnDisk = vscode.Uri.file(path.join(this._extensionPath, 'media', 'index.js')); - const scriptUri = scriptPathOnDisk.with({ scheme: 'vscode-resource' }); - - const nonce = new Date().getTime() + '' + new Date().getMilliseconds(); - - return ` - - - - - - - Cat Coding - - - - - `; - } - - async function getWebviewContent(pr: PullRequestModel) { - const timelineEvents = await pr.getTimelineEvents(); - return ` - - - - - Pull Request - - - -
-
-
-
-

${pr.title} (#${pr.prNumber})

-
-
-
${getStatus(pr)}
- - ${pr.prItem.user.login} -
-
- ${md.render(pr.prItem.body)} -
-
-
-
- - ${timelineEvents.map(renderTimelineEvent).join('')} -
- - `; - } - - function getStatusBGCoor(pr: PullRequestModel) { - if (pr.isMerged) { - return '#6f42c1'; - } else if (pr.isOpen) { - return '#2cbe4e'; - } else { - return '#cb2431'; - } - } - - function getStatus(pr: PullRequestModel) { - if (pr.isMerged) { - return 'Merged'; - } else if (pr.isOpen) { - return 'Open'; - } else { - return 'Closed'; - } - } - - function renderComment(user: any, body: string): string { - return `
- -
-
- -
-
- -
- ${md.render(body)} -
-
-
-
`; - } - - function renderCommit(timelineEvent: CommitEvent): string { - return `
- -
-
-
- ${timelineEvent.author.name} commit: ${timelineEvent.message} (${timelineEvent.sha}) -
-
-
-
`; - } - - function renderReview(timelineEvent: ReviewEvent): string { - return `
- -
-
- -
-
-
`; - } - - function renderTimelineEvent(timelineEvent: TimelineEvent): string { - switch (timelineEvent.event) { - case EventType.Committed: - return renderCommit((timelineEvent)); - case EventType.Commented: - return renderComment((timelineEvent).user, (timelineEvent).body); - case EventType.Reviewed: - return renderReview((timelineEvent)); - } - return ''; - } } diff --git a/extensions/git-extended/src/common/pullRequestOverview.ts b/extensions/git-extended/src/common/pullRequestOverview.ts new file mode 100644 index 00000000000..6042ebb410c --- /dev/null +++ b/extensions/git-extended/src/common/pullRequestOverview.ts @@ -0,0 +1,143 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +'use strict'; + +import * as vscode from 'vscode'; +import * as path from 'path'; +import { PullRequestModel } from './models/pullRequestModel'; + +const MarkdownIt = require('markdown-it'); + +export class PullRequestOverviewPanel { + /** + * Track the currently panel. Only allow a single panel to exist at a time. + */ + public static currentPanel: PullRequestOverviewPanel | undefined; + + private static readonly viewType = 'PullRequestOverview'; + + private readonly _panel: vscode.WebviewPanel; + private readonly _extensionPath: string; + private _disposables: vscode.Disposable[] = []; + private _pullRequest: PullRequestModel; + private _md = MarkdownIt(); + + public static createOrShow(extensionPath: string, pullRequestModel: PullRequestModel) { + const column = vscode.window.activeTextEditor ? vscode.window.activeTextEditor.viewColumn : undefined; + + // If we already have a panel, show it. + // Otherwise, create a new panel. + if (PullRequestOverviewPanel.currentPanel) { + PullRequestOverviewPanel.currentPanel._panel.reveal(column); + } else { + PullRequestOverviewPanel.currentPanel = new PullRequestOverviewPanel(extensionPath, column || vscode.ViewColumn.One); + } + + PullRequestOverviewPanel.currentPanel.update(pullRequestModel); + PullRequestOverviewPanel.currentPanel._panel.webview.postMessage({ + command: 'refactor' + }); + } + + private constructor(extensionPath: string, column: vscode.ViewColumn) { + this._extensionPath = extensionPath; + + // Create and show a new webview panel + this._panel = vscode.window.createWebviewPanel(PullRequestOverviewPanel.viewType, 'Pull Request', column, { + // Enable javascript in the webview + enableScripts: true, + + // And restric the webview to only loading content from our extension's `media` directory. + localResourceRoots: [ + vscode.Uri.file(path.join(this._extensionPath, 'media')) + ] + }); + + // Listen for when the panel is disposed + // This happens when the user closes the panel or when the panel is closed programatically + this._panel.onDidDispose(() => this.dispose(), null, this._disposables); + + // Handle messages from the webview + this._panel.webview.onDidReceiveMessage(message => { + console.log(message); + this._onDidReceiveMessage(message); + }, null, this._disposables); + } + + public async update(pullRequestModel: PullRequestModel) { + this._pullRequest = pullRequestModel; + this._panel.webview.html = this.getHtmlForWebview(); + const timelineEvents = await pullRequestModel.getTimelineEvents(); + this._panel.webview.postMessage({ + command: 'initialize', + pullrequest: { + number: pullRequestModel.prNumber, + title: pullRequestModel.title, + body: pullRequestModel.prItem.body, + author: pullRequestModel.author, + state: pullRequestModel.state, + events: timelineEvents + } + }); + } + + private _onDidReceiveMessage(message) { + switch (message.command) { + case 'alert': + vscode.window.showErrorMessage(message.text); + return; + } + } + + public dispose() { + PullRequestOverviewPanel.currentPanel = undefined; + + // Clean up our resources + this._panel.dispose(); + + while (this._disposables.length) { + const x = this._disposables.pop(); + if (x) { + x.dispose(); + } + } + } + + private getHtmlForWebview() { + const scriptPathOnDisk = vscode.Uri.file(path.join(this._extensionPath, 'media', 'index.js')); + const scriptUri = scriptPathOnDisk.with({ scheme: 'vscode-resource' }); + const stylePathOnDisk = vscode.Uri.file(path.join(this._extensionPath, 'media', 'index.css')); + const styleUri = stylePathOnDisk.with({ scheme: 'vscode-resource' }); + const baseStyles = ``; + + const nonce = getNonce(); + + return ` + + + + + ${baseStyles} + + + Cat Coding + + + +
+
+ + `; + } +} + +function getNonce() { + let text = ''; + const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + for (let i = 0; i < 32; i++) { + text += possible.charAt(Math.floor(Math.random() * possible.length)); + } + return text; +} \ No newline at end of file diff --git a/extensions/git-extended/tsconfig.json b/extensions/git-extended/tsconfig.json index 9508ff037b1..36a3c1ca47b 100644 --- a/extensions/git-extended/tsconfig.json +++ b/extensions/git-extended/tsconfig.json @@ -11,6 +11,9 @@ "rootDir": "./src", "jsx": "react" }, + "include": [ + "src/**/*" + ], "exclude": [ "node_modules", ".vscode-test"