deploy: BCStudentSoftwareDevTeam/celts@da48507

Author: BrianRamsay

BCStudentSoftwareDevTeam/celts/fix-all-vol-training-series/class_index.html

@@ -34,14 +34,13 @@ function on_click(sel, fn) {
 
 // Helpers for table sorting
 function getCellValue(row, column = 0) {
-    const cell = row.cells[column]  // nosemgrep: eslint.detect-object-injection
+    const cell = row.cells[column]
     if (cell.childElementCount == 1) {
-        var child = cell.firstElementChild;
-        if (child.tagName === "A") {
-            child = child.firstElementChild;
-        }
-        if (child instanceof HTMLDataElement && child.value) {
-            return child.value;
+        const child = cell.firstElementChild
+        if (child instanceof HTMLTimeElement && child.dateTime) {
+            return child.dateTime
+        } else if (child instanceof HTMLDataElement && child.value) {
+            return child.value
         }
     }
     return cell.innerText || cell.textContent;
@@ -51,62 +50,28 @@ function rowComparator(rowA, rowB, column = 0) {
     let valueA = getCellValue(rowA, column);
     let valueB = getCellValue(rowB, column);
     if (!isNaN(valueA) && !isNaN(valueB)) {
-        return valueA - valueB;
+        return valueA - valueB
     }
     return valueA.localeCompare(valueB, undefined, {numeric: true});
 }
 
 function sortColumn(th) {
     // Get the current sorting direction of the selected header,
-    // clear state on other headers and then set the new sorting direction.
+    // clear state on other headers and then set the new sorting direction
     const currentSortOrder = th.getAttribute("aria-sort");
     [...th.parentElement.cells].forEach(header => header.setAttribute("aria-sort", "none"));
-    var direction;
     if (currentSortOrder === "none") {
-        direction = th.dataset.defaultSortOrder || "ascending";
-    }
-    else if (currentSortOrder === "ascending") {
-        direction = "descending";
-    }
-    else {
-        direction = "ascending";
+        th.setAttribute("aria-sort", th.dataset.defaultSortOrder || "ascending");
+    } else {
+        th.setAttribute("aria-sort", currentSortOrder === "ascending" ? "descending" : "ascending");
     }
-    th.setAttribute("aria-sort", direction);
 
     const column = [...th.parentElement.cells].indexOf(th)
 
-    // Sort all rows and afterwards append them in order to move them in the DOM.
+    // Sort all rows and afterwards append them in order to move them in the DOM
     Array.from(th.closest("table").querySelectorAll("tbody tr"))
-        .sort((rowA, rowB) => rowComparator(rowA, rowB, column) * (direction === "ascending" ? 1 : -1))
-        .forEach(tr => tr.parentElement.appendChild(tr));
-
-    // Save the sort order for next time.
-    if (th.id !== "region") {
-        let th_id = "file";  // Sort by file if we don't have a column id
-        let current_direction = direction;
-        const stored_list = localStorage.getItem(coverage.INDEX_SORT_STORAGE);
-        if (stored_list) {
-            ({th_id, direction} = JSON.parse(stored_list))
-        }
-        localStorage.setItem(coverage.INDEX_SORT_STORAGE, JSON.stringify({
-            "th_id": th.id,
-            "direction": current_direction
-        }));
-        if (th.id !== th_id || document.getElementById("region")) {
-            // Sort column has changed, unset sorting by function or class.
-            localStorage.setItem(coverage.SORTED_BY_REGION, JSON.stringify({
-                "by_region": false,
-                "region_direction": current_direction
-            }));
-        }
-    }
-    else {
-        // Sort column has changed to by function or class, remember that.
-        localStorage.setItem(coverage.SORTED_BY_REGION, JSON.stringify({
-            "by_region": true,
-            "region_direction": direction
-        }));
-    }
+        .sort((rowA, rowB) => rowComparator(rowA, rowB, column) * (th.getAttribute("aria-sort") === "ascending" ? 1 : -1))
+        .forEach(tr => tr.parentElement.appendChild(tr) );
 }
 
 // Find all the elements with data-shortcut attribute, and use them to assign a shortcut key.
@@ -125,60 +90,21 @@ coverage.assign_shortkeys = function () {
 
 // Create the events for the filter box.
 coverage.wire_up_filter = function () {
-    // Populate the filter and hide100 inputs if there are saved values for them.
-    const saved_filter_value = localStorage.getItem(coverage.FILTER_STORAGE);
-    if (saved_filter_value) {
-        document.getElementById("filter").value = saved_filter_value;
-    }
-    const saved_hide100_value = localStorage.getItem(coverage.HIDE100_STORAGE);
-    if (saved_hide100_value) {
-        document.getElementById("hide100").checked = JSON.parse(saved_hide100_value);
-    }
-
     // Cache elements.
     const table = document.querySelector("table.index");
     const table_body_rows = table.querySelectorAll("tbody tr");
     const no_rows = document.getElementById("no_rows");
 
     // Observe filter keyevents.
-    const filter_handler = (event => {
+    document.getElementById("filter").addEventListener("input", debounce(event => {
         // Keep running total of each metric, first index contains number of shown rows
         const totals = new Array(table.rows[0].cells.length).fill(0);
         // Accumulate the percentage as fraction
-        totals[totals.length - 1] = { "numer": 0, "denom": 0 };  // nosemgrep: eslint.detect-object-injection
-
-        var text = document.getElementById("filter").value;
-        // Store filter value
-        localStorage.setItem(coverage.FILTER_STORAGE, text);
-        const casefold = (text === text.toLowerCase());
-        const hide100 = document.getElementById("hide100").checked;
-        // Store hide value.
-        localStorage.setItem(coverage.HIDE100_STORAGE, JSON.stringify(hide100));
+        totals[totals.length - 1] = { "numer": 0, "denom": 0 };
 
         // Hide / show elements.
         table_body_rows.forEach(row => {
-            var show = false;
-            // Check the text filter.
-            for (let column = 0; column < totals.length; column++) {
-                cell = row.cells[column];
-                if (cell.classList.contains("name")) {
-                    var celltext = cell.textContent;
-                    if (casefold) {
-                        celltext = celltext.toLowerCase();
-                    }
-                    if (celltext.includes(text)) {
-                        show = true;
-                    }
-                }
-            }
-
-            // Check the "hide covered" filter.
-            if (show && hide100) {
-                const [numer, denom] = row.cells[row.cells.length - 1].dataset.ratio.split(" ");
-                show = (numer !== denom);
-            }
-
-            if (!show) {
+            if (!row.cells[0].textContent.includes(event.target.value)) {
                 // hide
                 row.classList.add("hidden");
                 return;
@@ -188,20 +114,16 @@ coverage.wire_up_filter = function () {
             row.classList.remove("hidden");
             totals[0]++;
 
-            for (let column = 0; column < totals.length; column++) {
+            for (let column = 1; column < totals.length; column++) {
                 // Accumulate dynamic totals
-                cell = row.cells[column]  // nosemgrep: eslint.detect-object-injection
-                if (cell.classList.contains("name")) {
-                    continue;
-                }
+                cell = row.cells[column]
                 if (column === totals.length - 1) {
                     // Last column contains percentage
                     const [numer, denom] = cell.dataset.ratio.split(" ");
-                    totals[column]["numer"] += parseInt(numer, 10);  // nosemgrep: eslint.detect-object-injection
-                    totals[column]["denom"] += parseInt(denom, 10);  // nosemgrep: eslint.detect-object-injection
-                }
-                else {
-                    totals[column] += parseInt(cell.textContent, 10);  // nosemgrep: eslint.detect-object-injection
+                    totals[column]["numer"] += parseInt(numer, 10);
+                    totals[column]["denom"] += parseInt(denom, 10);
+                } else {
+                    totals[column] += parseInt(cell.textContent, 10);
                 }
             }
         });
@@ -220,89 +142,64 @@ coverage.wire_up_filter = function () {
 
         const footer = table.tFoot.rows[0];
         // Calculate new dynamic sum values based on visible rows.
-        for (let column = 0; column < totals.length; column++) {
+        for (let column = 1; column < totals.length; column++) {
             // Get footer cell element.
-            const cell = footer.cells[column];  // nosemgrep: eslint.detect-object-injection
-            if (cell.classList.contains("name")) {
-                continue;
-            }
+            const cell = footer.cells[column];
 
             // Set value into dynamic footer cell element.
             if (column === totals.length - 1) {
                 // Percentage column uses the numerator and denominator,
                 // and adapts to the number of decimal places.
                 const match = /\.([0-9]+)/.exec(cell.textContent);
                 const places = match ? match[1].length : 0;
-                const { numer, denom } = totals[column];  // nosemgrep: eslint.detect-object-injection
+                const { numer, denom } = totals[column];
                 cell.dataset.ratio = `${numer} ${denom}`;
                 // Check denom to prevent NaN if filtered files contain no statements
                 cell.textContent = denom
                     ? `${(numer * 100 / denom).toFixed(places)}%`
                     : `${(100).toFixed(places)}%`;
-            }
-            else {
-                cell.textContent = totals[column];  // nosemgrep: eslint.detect-object-injection
+            } else {
+                cell.textContent = totals[column];
             }
         }
-    });
-
-    document.getElementById("filter").addEventListener("input", debounce(filter_handler));
-    document.getElementById("hide100").addEventListener("input", debounce(filter_handler));
+    }));
 
     // Trigger change event on setup, to force filter on page refresh
     // (filter value may still be present).
     document.getElementById("filter").dispatchEvent(new Event("input"));
-    document.getElementById("hide100").dispatchEvent(new Event("input"));
 };
-coverage.FILTER_STORAGE = "COVERAGE_FILTER_VALUE";
-coverage.HIDE100_STORAGE = "COVERAGE_HIDE100_VALUE";
 
-// Set up the click-to-sort columns.
-coverage.wire_up_sorting = function () {
+coverage.INDEX_SORT_STORAGE = "COVERAGE_INDEX_SORT_2";
+
+// Loaded on index.html
+coverage.index_ready = function () {
+    coverage.assign_shortkeys();
+    coverage.wire_up_filter();
     document.querySelectorAll("[data-sortable] th[aria-sort]").forEach(
         th => th.addEventListener("click", e => sortColumn(e.target))
     );
 
     // Look for a localStorage item containing previous sort settings:
-    let th_id = "file", direction = "ascending";
     const stored_list = localStorage.getItem(coverage.INDEX_SORT_STORAGE);
-    if (stored_list) {
-        ({th_id, direction} = JSON.parse(stored_list));
-    }
-    let by_region = false, region_direction = "ascending";
-    const sorted_by_region = localStorage.getItem(coverage.SORTED_BY_REGION);
-    if (sorted_by_region) {
-        ({
-            by_region,
-            region_direction
-        } = JSON.parse(sorted_by_region));
-    }
 
-    const region_id = "region";
-    if (by_region && document.getElementById(region_id)) {
-        direction = region_direction;
-    }
-    // If we are in a page that has a column with id of "region", sort on
-    // it if the last sort was by function or class.
-    let th;
-    if (document.getElementById(region_id)) {
-        th = document.getElementById(by_region ? region_id : th_id);
-    }
-    else {
-        th = document.getElementById(th_id);
+    if (stored_list) {
+        const {column, direction} = JSON.parse(stored_list);
+        const th = document.querySelector("[data-sortable]").tHead.rows[0].cells[column];
+        th.setAttribute("aria-sort", direction === "ascending" ? "descending" : "ascending");
+        th.click()
     }
-    th.setAttribute("aria-sort", direction === "ascending" ? "descending" : "ascending");
-    th.click()
-};
-
-coverage.INDEX_SORT_STORAGE = "COVERAGE_INDEX_SORT_2";
-coverage.SORTED_BY_REGION = "COVERAGE_SORT_REGION";
 
-// Loaded on index.html
-coverage.index_ready = function () {
-    coverage.assign_shortkeys();
-    coverage.wire_up_filter();
-    coverage.wire_up_sorting();
+    // Watch for page unload events so we can save the final sort settings:
+    window.addEventListener("unload", function () {
+        const th = document.querySelector('[data-sortable] th[aria-sort="ascending"], [data-sortable] [aria-sort="descending"]');
+        if (!th) {
+            return;
+        }
+        localStorage.setItem(coverage.INDEX_SORT_STORAGE, JSON.stringify({
+            column: [...th.parentElement.cells].indexOf(th),
+            direction: th.getAttribute("aria-sort"),
+        }));
+    });
 
     on_click(".button_prev_file", coverage.to_prev_file);
     on_click(".button_next_file", coverage.to_next_file);
@@ -320,8 +217,7 @@ coverage.pyfile_ready = function () {
     if (frag.length > 2 && frag[1] === "t") {
         document.querySelector(frag).closest(".n").classList.add("highlight");
         coverage.set_sel(parseInt(frag.substr(2), 10));
-    }
-    else {
+    } else {
         coverage.set_sel(0);
     }
 
@@ -354,7 +250,7 @@ coverage.pyfile_ready = function () {
     }
 
     for (cls in coverage.filters) {
-        coverage.set_line_visibilty(cls, coverage.filters[cls]);  // nosemgrep: eslint.detect-object-injection
+        coverage.set_line_visibilty(cls, coverage.filters[cls]);
     }
 
     coverage.assign_shortkeys();
@@ -545,8 +441,7 @@ coverage.to_next_chunk_nicely = function () {
         if (line.parentElement !== document.getElementById("source")) {
             // The element is not a source line but the header or similar
             coverage.select_line_or_chunk(1);
-        }
-        else {
+        } else {
             // We extract the line number from the id
             coverage.select_line_or_chunk(parseInt(line.id.substring(1), 10));
         }
@@ -565,8 +460,7 @@ coverage.to_prev_chunk_nicely = function () {
         if (line.parentElement !== document.getElementById("source")) {
             // The element is not a source line but the header or similar
             coverage.select_line_or_chunk(coverage.lines_len);
-        }
-        else {
+        } else {
             // We extract the line number from the id
             coverage.select_line_or_chunk(parseInt(line.id.substring(1), 10));
         }
@@ -668,8 +562,7 @@ coverage.build_scroll_markers = function () {
         if (line_number === previous_line + 1) {
             // If this solid missed block just make previous mark higher.
             last_mark.style.height = `${line_top + line_height - last_top}px`;
-        }
-        else {
+        } else {
             // Add colored line in scroll_marker block.
             last_mark = document.createElement("div");
             last_mark.id = `m${line_number}`;
@@ -697,8 +590,7 @@ coverage.wire_up_sticky_header = function () {
     function updateHeader() {
         if (window.scrollY > header_bottom) {
             header.classList.add("sticky");
-        }
-        else {
+        } else {
             header.classList.remove("sticky");
         }
     }
@@ -726,8 +618,7 @@ coverage.expand_contexts = function (e) {
 document.addEventListener("DOMContentLoaded", () => {
     if (document.body.classList.contains("indexfile")) {
         coverage.index_ready();
-    }
-    else {
+    } else {
         coverage.pyfile_ready();
     }
 });