Merge pull request #19 from hzoo/global-scope

Global scope

Author: hzoo

src/content.js

@@ -6,7 +6,7 @@ const isPR = (path) => /^\/[^/]+\/[^/]+\/pull\/\d+/.test(path);
 const isIssue = (path) => /^\/[^/]+\/[^/]+\/issues\/\d+/.test(path);
 const getCurrentUser = () => $(".js-menu-target img").attr("alt").slice(1) || "";
 const isPrivate = () => $(".repo-private-label").length > 0;
-let showOrgOnly = false;
+let statsScope = "repo";
 
 function getContributor() {
   let $contributor = $(".timeline-comment-wrapper .timeline-comment-header-text strong");
@@ -31,8 +31,13 @@ function getContributorInfo() {
   };
 
   // global variable
-  if (showOrgOnly) {
+  if (statsScope === "org") {
     ret.user = org;
+    ret.repoPath = org;
+  }
+
+  if (statsScope === "account") {
+    ret.repoPath = "__self";
   }
 
   injectInitialUI(ret);
@@ -51,19 +56,31 @@ function buildUrl({base, q: {type, filterUser, author, repo, user}, sort, order,
   query += `${order ? `&order=${order}`: ""}`;
   query += `${per_page ? `&per_page=${per_page}`: ""}`;
   query += `${sort ? `&sort=${sort}`: ""}`;
+
   return query;
 }
 
 function contributorCount({access_token, contributor, user, repoPath, old = {}, type}) {
+  let repo = repoPath;
+
+  // global variable
+  if (statsScope === "org") {
+    repo = undefined;
+    repoPath = repoPath.split("/")[0];
+  } else if (statsScope === "account") {
+    repo = undefined;
+    repoPath = "__self";
+  }
+
   let searchURL = buildUrl({
     access_token,
     base: "https://api.github.com/search/issues",
     order: "asc",
     per_page: "1",
     q: {
       type,
+      repo,
       author: contributor,
-      repo: user ? undefined : repoPath,
       user: user
     },
     sort: "created"
@@ -152,6 +169,21 @@ function makeUpdateLabel(time) {
   return `<time datetime="${time}" is="relative-time"></time>`;
 }
 
+function issueOrPrLink(type, repoPath, contributor) {
+  let end = `${type === "pr" ? "pulls" : "issues"}?utf8=%E2%9C%93&q=is:both+is:${type}+author:${contributor}`;
+
+  // repo
+  if (repoPath.split("/").length === 2) {
+    return `/${repoPath}/${end}`;
+  // account
+  } else if (repoPath === "__self") {
+    return `https://github.com/${end}`;
+  // org
+  } else {
+    return `https://github.com/${end}+user:${repoPath}`;
+  }
+}
+
 function injectInitialUI({ contributor, repoPath }) {
   let $elem = $(".timeline-comment-header-text").first();
   let prId = "gce-num-prs";
@@ -174,20 +206,23 @@ function injectInitialUI({ contributor, repoPath }) {
         <div class="dropdown-header">
           View options
         </div>
-        <a class="dropdown-item" id="gce-across-this-org">
-          across this org
-        </a>
         <a class="dropdown-item selected" id="gce-in-this-repo">
             ${$checkbox}
           in this repo
         </a>
+        <a class="dropdown-item" id="gce-in-this-org">
+          in this org
+        </a>
+        <a class="dropdown-item" id="gce-in-this-account">
+          in this account
+        </a>
       </ul>
     </div>
   </div>`;
 
   $elem.before(`<span class="timeline-comment-label">
-<a href="/${repoPath}/pulls?utf8=%E2%9C%93&q=is:both+is:pr+author:${contributor}" id="${prId}">${prText}</a>
-<a href="/${repoPath}/issues?utf8=%E2%9C%93&q=is:both+is:issue+author:${contributor}" id="${issueId}">${issueText}</a>
+<a href="${issueOrPrLink("pr", repoPath, contributor)}" id="${prId}">${prText}</a>
+<a href="${issueOrPrLink("issue", repoPath, contributor)}" id="${issueId}">${issueText}</a>
 ${dropdown}
 </span>
   `);
@@ -200,29 +235,65 @@ ${dropdown}
     update(getContributorInfo());
   });
 
-  let $acrossThisOrg = $("#gce-across-this-org");
+  let $inThisOrg = $("#gce-in-this-org");
   let $inThisRepo = $("#gce-in-this-repo");
+  let $inThisAccount = $("#gce-in-this-account");
   let $dropdownText = $("#gce-dropdown-text");
 
-  $acrossThisOrg.dom[0].addEventListener("click", function() {
-    $acrossThisOrg.addClass("selected");
+  $inThisOrg.dom[0].addEventListener("click", function() {
+    $inThisOrg.addClass("selected");
     $inThisRepo.removeClass("selected");
-    $acrossThisOrg.html(`${$checkbox} across this org`);
-    $inThisRepo.html('in this repo');
-    $dropdownText.html('across this org');
+    $inThisAccount.removeClass("selected");
+
+    $inThisOrg.html(`${$checkbox} in this org`);
+    $dropdownText.html("in this org");
+
+    $inThisAccount.html("in this account");
+    $inThisRepo.html("in this repo");
+
+    $(`#${prId}`).attr("href", issueOrPrLink("pr", repoPath.split("/")[0], contributor));
+    $(`#${issueId}`).attr("href", issueOrPrLink("issue", repoPath.split("/")[0], contributor));
+
     // global
-    showOrgOnly = true;
+    statsScope = "org";
     update(getContributorInfo());
   });
 
   $inThisRepo.dom[0].addEventListener("click", function() {
     $inThisRepo.addClass("selected");
-    $acrossThisOrg.removeClass("selected");
+    $inThisOrg.removeClass("selected");
+    $inThisAccount.removeClass("selected");
+
     $inThisRepo.html(`${$checkbox} in this repo`);
-    $acrossThisOrg.html('across this org');
-    $dropdownText.html('in this repo');
+    $dropdownText.html("in this repo");
+
+    $inThisAccount.html("in this account");
+    $inThisOrg.html("in this org");
+
+    $(`#${prId}`).attr("href", issueOrPrLink("pr", repoPath, contributor));
+    $(`#${issueId}`).attr("href", issueOrPrLink("issue", repoPath, contributor));
+
+    // global
+    statsScope = "repo";
+    update(getContributorInfo());
+  });
+
+  $inThisAccount.dom[0].addEventListener("click", function() {
+    $inThisAccount.addClass("selected");
+    $inThisOrg.removeClass("selected");
+    $inThisRepo.removeClass("selected");
+
+    $inThisAccount.html(`${$checkbox} in this account`);
+    $dropdownText.html("in this account");
+
+    $inThisRepo.html("in this repo");
+    $inThisOrg.html("in this org");
+
+    $(`#${prId}`).attr("href", issueOrPrLink("pr", "__self", contributor));
+    $(`#${issueId}`).attr("href", issueOrPrLink("issue", "__self", contributor));
+
     // global
-    showOrgOnly = false;
+    statsScope = "account";
     update(getContributorInfo());
   });
 }
@@ -247,7 +318,14 @@ function updateTextNodes({ prText, issueText, lastUpdate }) {
 function update({ contributor, repoPath, currentNum, user }) {
   getStorage(contributor, repoPath)
   .then((storage) => {
-    let storageRes = storage[contributor][user ? user : repoPath] = {};
+    let path = repoPath;
+    if (user) {
+      path = user;
+    } else if (statsScope === "account") {
+      path = "__self";
+    }
+
+    let storageRes = storage[`${contributor}|${path}`] || {};
 
     if (storageRes.prs || storageRes.issues) {
       updateTextNodes(appendPRText(currentNum, storageRes));

src/options.js

@@ -22,8 +22,7 @@ document.addEventListener("DOMContentLoaded", () => {
 
   clearCacheLink.addEventListener("click", () => {
     let temp = accessTokenInput.value;
-    clearSyncStorage()
-    .then(() => {
+    chrome.storage.sync.clear(() => {
       setSyncStorage({ "access_token": temp });
       document.querySelector("#feedback").textContent = "Storage Cleared";
     });

src/storage.js

@@ -25,20 +25,13 @@ function promisify(func) {
 
 window.getSyncStorage = promisify(chrome.storage.sync.get.bind(chrome.storage.sync));
 window.setSyncStorage = promisify(chrome.storage.sync.set.bind(chrome.storage.sync));
-window.clearSyncStorage = promisify(chrome.storage.sync.clear.bind(chrome.storage.sync));
 
 window.setStorage = (CONTRIBUTOR, ORG_REPO_PATH, value) => {
   return window.setSyncStorage({
-    [CONTRIBUTOR]: {
-      [ORG_REPO_PATH]: value
-    }
+    [`${CONTRIBUTOR}|${ORG_REPO_PATH}`]: value
   });
 };
 
 window.getStorage = (CONTRIBUTOR, ORG_REPO_PATH) => {
-  return window.getSyncStorage({
-    [CONTRIBUTOR]: {
-      [ORG_REPO_PATH]: {}
-    }
-  });
+  return window.getSyncStorage(`${CONTRIBUTOR}|${ORG_REPO_PATH}`);
 };