[FIX] Persist all branches list after filtering

Author: NirmalScaria

js/fetchCommits.js

@@ -142,14 +142,16 @@ async function fetchCommits() {
     if (await fetchCommitsPage(repoOwner, repoName, "NONE")) {
         console.log("--FETCHED BRANCHES--");
         console.log("--COST : '" + APIcost + "'--");
+        var allBranchesObject = {}
         branches = branches.map(branch => {
             heads.push({
                 name: branch.name,
                 oid: branch.target.history.edges[0].node.oid,
             });
+            allBranchesObject[branch.name] = branch.target.history.edges[0].node.oid;
             branch.target.history.edges[0].node.isHead = true;
             return branch;
         })
-        await sortCommits(branches, heads);
+        await sortCommits(branches, heads, allBranchesObject);
     }
 }

js/fetchFilteredCommits.js

@@ -1,6 +1,6 @@
 
 
-async function fetchFilteredCommits(selectedBranchNames, selectedBranches) {
+async function fetchFilteredCommits(selectedBranchNames, selectedBranches, allBranches) {
     var branches = [];
     // Recurcively call this function unti all the branches are fetched
     // (GitHub API has a limit of 100 branches per request)
@@ -156,9 +156,11 @@ async function fetchFilteredCommits(selectedBranchNames, selectedBranches) {
             branch.target.history.edges[0].node.isHead = true;
             return branch;
         })
-        await sortCommits(branches, heads);
+        await sortCommits(branches, heads, allBranches);
+    }
+    else {
+        console.log("Fetch failure");
     }
-    console.log("Fetch failure");
 }
 
 // Branch names of git allows a lot of flexibiliity in variable naming

js/setBranchOptions.js

@@ -1,9 +1,9 @@
-function setBranchOptions(branches, selectedBranchNames) {
+function setBranchOptions(branches, selectedBranchNames, allBranches) {
     var branchesContainer = document.getElementById("branches-list-parent");
     var existingChild = branchesContainer.children[0];
 
-    var branchNames =new Set()
-    for (var branch in branches) {
+    var branchNames = new Set()
+    for (var branch in allBranches) {
         var branchname = branch;
         branchNames.add(branchname);
     }
@@ -59,13 +59,13 @@ function setBranchOptions(branches, selectedBranchNames) {
 
     var branchFilterButton = document.getElementById("branch-filter-button");
     var selectedBranchCommitIds = []
-    
+
     branchFilterButton.addEventListener("click", () => {
         selectedBranchCommitIds = [];
         for (var branch of selectedBranchNames) {
-            selectedBranchCommitIds.push(branches[branch]);
+            selectedBranchCommitIds.push(allBranches[branch]);
         }
         showCommitsLoading();
-        fetchFilteredCommits(selectedBranchNames, selectedBranchCommitIds);
+        fetchFilteredCommits(selectedBranchNames, selectedBranchCommitIds, allBranches);
     });
 }

js/showCommits.js

@@ -144,7 +144,7 @@ async function getCommitDetails(repoOwner, repoName, commits, allCommits) {
   return ([commits, allCommits]);
 }
 
-async function showCommits(commits, branchNames, allCommits, heads, pageNo) {
+async function showCommits(commits, branchNames, allCommits, heads, pageNo, allBranches) {
   var presentUrl = window.location.href;
   var repoOwner = presentUrl.split('/')[3];
   var repoName = presentUrl.split('/')[4];
@@ -207,7 +207,7 @@ async function showCommits(commits, branchNames, allCommits, heads, pageNo) {
 
   // Display the branches filter dropdown button with default value only (All branches)
   await loadBranchesButton();
-  setBranchOptions(branchNames, Object.keys(branchNames));
+  setBranchOptions(branchNames, Object.keys(branchNames), allBranches);
   contentView.appendChild(commitsOutsideContainer);
 
   addNextPageButton(commits, branchNames, allCommits, heads, pageNo);

js/sortCommits.js

@@ -10,9 +10,10 @@ const parseDate = dateString => {
     return new Date(Date.UTC(+b[0], +b[1] - 1, +b[2], +b[3] + hrOffset, +b[4] + minOffset, +b[5], +b[6] || 0));
 };
 
-async function sortCommits(branches, heads) {
+async function sortCommits(branches, heads, allBranches) {
     var branchNames = {};
     var commitsObject = {};
+    var allBranchNames = {};
 
     // The branches array contains the name of branch as well as
     // the commit history (latest 10 per branch) on the branch
@@ -50,19 +51,30 @@ async function sortCommits(branches, heads) {
         if (brancesInThisCommit != undefined) {
             brancesInThisCommit.forEach(thisBranch => {
                 // if (!branchNames.includes(thisBranch)) {
-                    // branchNames.push(thisBranch);
+                // branchNames.push(thisBranch);
                 // }
                 branchNames[thisBranch] = "";
+                allBranchNames[thisBranch] = "";
             });
         }
     });
 
-    for(var branch of branches){
+    for (var branch of branches) {
         branchNames[branch.name] = branch.target.history.edges[0].node.oid;
     }
+    // TODO: This is hacky. The variable allBranches is not standardised throughout project.
+    // Sometimes it is array, sometimes it is object. Fix this at the source instead of here.
+    if (typeof allBranches == "array") {
+        for (var branch of allBranches) {
+            allBranchNames[branch.name] = branch.target.history.edges[0].node.oid;
+        }
+    }
+    else {
+        allBranchNames = allBranches;
+    }
 
     console.log("--COMMITS FOR THIS PAGE ARE--");
     console.log(commitsObject.slice(0, 10));
-    await showCommits(commitsObject.slice(0, 10), branchNames, commits, heads, 1);
+    await showCommits(commitsObject.slice(0, 10), branchNames, commits, heads, 1, allBranchNames);
     showLegend(heads);
 }