fix: Multiple button injections (#244)

* chore: updates dependencies * fix: multiple button injections * fix: public repo check
open-sauced · Aug 10, 2023 · 0e06d3e · 0e06d3e
1 parent 7ad0fdf
commit 0e06d3e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/src/hooks/useGetGitHubPageInfo.ts b/src/hooks/useGetGitHubPageInfo.ts
@@ -1,5 +1,6 @@
 import { useEffect, useState } from "react";
 import { isGithubPullRequestPage, isGithubRepoPage } from "../utils/urlMatchers";
+import { isPublicRepository } from "../utils/fetchGithubAPIData";
 
 interface GitHubPageInfo {
     pageUrl: string;
@@ -11,13 +12,13 @@ export const usGetGitHubPageInfo = () => {
     const [GithubPage, setGithubPage] = useState<GitHubPageInfo>({ pageUrl: "", pageTitle: "", type: "unknown" });
 
     useEffect(() => {
-        chrome.tabs.query({ active: true, currentWindow: true }, tabs => {
+        chrome.tabs.query({ active: true, currentWindow: true }, async tabs => {
             if (tabs.length > 0) {
                 const tab = tabs[0];
 
                 if (isGithubPullRequestPage(tab.url!)) {
                     setGithubPage({ pageUrl: tab.url!, pageTitle: tab.title!.split("by")[0].trim(), type: "PR" });
-                } else if (isGithubRepoPage(tab.url!)) {
+                } else if (isGithubRepoPage(tab.url!) && (await isPublicRepository(tab.url!))) {
                     setGithubPage({ pageUrl: tab.url!, pageTitle: "", type: "REPO" });
                 }
             }

diff --git a/src/utils/dom-utils/prWatcher.ts b/src/utils/dom-utils/prWatcher.ts
@@ -1,3 +1,5 @@
+import domUpdateWatch from "./domUpdateWatcher";
+
 const prEditWatch = (callback: () => void, delayInMs = 0) => {
     const observer = new MutationObserver((mutationList: MutationRecord[], observer: MutationObserver) => {
         mutationList.forEach(mutation => {
@@ -8,6 +10,11 @@ const prEditWatch = (callback: () => void, delayInMs = 0) => {
         });
     });
 
+    // Disconnect the observer when the user navigates to a new page
+    domUpdateWatch(() => {
+        observer.disconnect();
+    });
+
     observer.observe(document.body, { attributes: true, subtree: true });
 };