@necrolab/dashboard 0.4.219 → 0.4.221

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@necrolab/dashboard",
-    "version": "0.4.219",
+    "version": "0.4.221",
     "scripts": {
         "build": "npx workbox-cli generateSW workbox-config.js && vite build",
         "dev": "vite",
@@ -14,7 +14,7 @@
     "dependencies": {
         "@faker-js/faker": "^7.6.0",
         "@msgpack/msgpack": "^3.0.0-beta2",
-        "@necrolab/tm-renderer": "^0.1.3",
+        "@necrolab/tm-renderer": "^0.1.4",
         "@vitejs/plugin-vue": "^5.0.3",
         "@vueuse/core": "^10.7.2",
         "autoprefixer": "^10.4.17",

package/src/libs/Filter.js

@@ -10,6 +10,18 @@ const colors = {
 
 const BASE_CSS = `path[generaladmission]:hover {fill: ${colors.HIGHLIGHT};pointer-events:all;cursor:pointer;}`;
 
+const getAttributeValue = (element, attributeName) => {
+    try {
+        return element.attributes[attributeName]?.nodeValue?.trim() || "";
+    } catch {
+        return "";
+    }
+};
+
+const getTextContent = (element) => {
+    return element.innerHTML?.trim() || "";
+};
+
 const isWheelchair = (p) => {
     if (p.row === "W" || p.sectionName === "W") return false;
     return [("W", "ADA")].some((part) => p.row !== "W" && (p.row?.includes(part) || p.sectionName?.includes(part)));
@@ -88,22 +100,29 @@ const cleanupFilter = (f) => {
 
     return ret;
 };
+
 const getSectionNameMapping = () => {
     const sectionRealName = {};
+
     [...document.querySelectorAll("path")].forEach((t) => {
-        try {
-            const sec = t.attributes.section.nodeValue.trim();
-            const secName = t.attributes.sectionname.nodeValue.trim();
+        const sec = getAttributeValue(t, "section");
+        const secName = getAttributeValue(t, "sectionname");
+        if (sec && secName) {
             sectionRealName[sec] = secName;
-        } catch {
-            /* empty */
         }
     });
 
     [...document.querySelectorAll("tspan")].forEach((t) => {
-        const sec = t.attributes.section.nodeValue.trim();
-        if (!sectionRealName[sec]) sectionRealName[sec] = t.innerHTML.trim();
-        else if (!sectionRealName[sec]?.includes(t.innerHTML)) sectionRealName[sec] += " " + t.innerHTML.trim();
+        const sec = getAttributeValue(t, "section");
+        const content = getTextContent(t);
+
+        if (sec && content) {
+            if (!sectionRealName[sec]) {
+                sectionRealName[sec] = content;
+            } else if (!sectionRealName[sec].includes(content)) {
+                sectionRealName[sec] += " " + content;
+            }
+        }
     });
 
     log("getSectionNameMapping:", sectionRealName);
@@ -112,20 +131,21 @@ const getSectionNameMapping = () => {
 
 const getReverseSectionNameMapping = () => {
     const reverseSectionName = {};
+
     [...document.querySelectorAll("path")].forEach((t) => {
-        try {
-            const sec = t.attributes.section.nodeValue.trim();
-            const secName = t.attributes.sectionname.nodeValue.trim();
+        const sec = getAttributeValue(t, "section");
+        const secName = getAttributeValue(t, "sectionname");
+
+        if (sec && secName) {
             if (!reverseSectionName[secName]) {
                 reverseSectionName[secName] = [];
             }
             if (!reverseSectionName[secName].includes(sec)) {
                 reverseSectionName[secName].push(sec);
             }
-        } catch {
-            /* empty */
         }
     });
+
     log("getReverseSectionNameMapping", reverseSectionName);
     return reverseSectionName;
 };
@@ -192,10 +212,11 @@ export default class FilterBuilder {
             const row = this.rows[i];
             row.onclick = () => {
                 const parsed = {
-                    section: row.attributes.section.nodeValue,
-                    row: row.attributes.row.nodeValue,
-                    id: row.attributes.id.nodeValue
+                    section: getAttributeValue(row, "section"),
+                    row: getAttributeValue(row, "row"),
+                    id: getAttributeValue(row, "id")
                 };
+
                 log(`Adding filter ${parsed.section}`);
                 const matchingFilter = this.filters.find(
                     (f) =>
@@ -203,6 +224,7 @@ export default class FilterBuilder {
                         f.section === parsed.section &&
                         (f.rows?.includes(parsed.row) || !Array.isArray(f.rows))
                 );
+
                 if (matchingFilter) {
                     log(`Filter for ${parsed.section}/${parsed.row} already exists (${matchingFilter.id})`);
                     if (this.expandedFilter === matchingFilter.id) this.setExpandedFilter(null);
@@ -219,21 +241,24 @@ export default class FilterBuilder {
 
             row.onmouseover = () => {
                 const parsed = {
-                    section: row.attributes.section.nodeValue,
-                    row: row.attributes.row.nodeValue,
-                    id: row.attributes.id.nodeValue
+                    section: getAttributeValue(row, "section"),
+                    row: getAttributeValue(row, "row"),
+                    id: getAttributeValue(row, "id")
                 };
+
                 const matchingFilter = this.filters.find(
                     (f) =>
                         this.isForCurrentEvent(f) &&
                         f.section === parsed.section &&
                         (f.rows?.includes(parsed.row) || !Array.isArray(f.rows))
                 );
+
                 if (!matchingFilter) return;
                 if (Array.isArray(matchingFilter.rows))
                     matchingFilter.rows.forEach((row) => this.highlight({ section: parsed.section, row: row }));
                 else this.highlight({ section: matchingFilter.section });
             };
+
             row.onmouseout = () => {
                 if (!this.isDragging) this.clearHighlight();
             };
@@ -332,8 +357,7 @@ export default class FilterBuilder {
             if (!this.isForCurrentEvent(filter)) return;
 
             const tryFindRealName = Object.entries(gaSectionNameMapping).find(
-                // eslint-disable-next-line no-unused-vars
-                ([_, v]) => v === filter.section && v.includes(" ")
+                ([, v]) => v === filter.section && v.includes(" ")
             )?.[0];
 
             if (tryFindRealName) {
@@ -395,7 +419,7 @@ export default class FilterBuilder {
 
         for (let i = 0; i < labels.length; i++) {
             const label = labels[i];
-            const section = label.attributes.section.nodeValue;
+            const section = getAttributeValue(label, "section");
 
             label.onclick = () => {
                 // filter exists already for section - return
@@ -415,17 +439,20 @@ export default class FilterBuilder {
 
                 if (isWheelchair({ section: gaSectionNameMapping[section] || section })) return;
 
-                const isGA = document.querySelectorAll(`path[sectionname="${section.trim()}"][row]`).length === 0;
+                const isGA = document.querySelectorAll(`path[sectionname="${section}"][row]`).length === 0;
 
                 try {
                     if (isGA) {
-                        this.addFilter({
-                            section: gaSectionNameMapping[section].trim(),
-                            event: this.currentEventId
-                        });
+                        const realSectionName = gaSectionNameMapping[section];
+                        if (realSectionName) {
+                            this.addFilter({
+                                section: realSectionName,
+                                event: this.currentEventId
+                            });
+                        }
                     } else {
                         const reverseMapping = getReverseSectionNameMapping();
-                        const sections = reverseMapping[section.trim()] || [section.trim()];
+                        const sections = reverseMapping[section] || [section];
                         log("labelHandler: non-ga", sections, section);
                         sections.forEach((s) => {
                             this.addFilter({
@@ -452,7 +479,7 @@ export default class FilterBuilder {
 
         for (let i = 0; i < GASections.length; i++) {
             const path = GASections[i];
-            const section = path.attributes.name.nodeValue;
+            const section = getAttributeValue(path, "name");
             const sectionName = gaSectionNameMapping[section];
 
             path.onclick = () => {
@@ -466,7 +493,6 @@ export default class FilterBuilder {
                     return;
                 }
                 log(`GAHandler: adding filter for ${section} (realname: ${sectionName})`, section, sectionName);
-
                 this.addFilter({
                     section: sectionName,
                     event: this.currentEventId

package/src/views/Accounts.vue

@@ -138,9 +138,8 @@ const filterAccounts = () => {
     if (show === "Enabled") accs = accs.filter((p) => p.enabled);
     if (show === "Disabled") accs = accs.filter((p) => !p.enabled);
     ui.logger.Info(`Filtered accounts for ${ui.currentModule}`);
-    console.log(accs);
+
     accs = accs.filter((acc) => acc.module === ui.currentModule);
-    console.log(accs);
 
     if (tag !== "Any") accs = accs.filter((p) => p.tags.includes(ui.search.accounts.tag));
     if (!query) return (ui.search.accounts.results = accs);

package/src/views/Console.vue

@@ -147,7 +147,7 @@ const scrollTo = (dir) => {
         if (dir === "up") $autoscroll.value.el.scrollTop = 0;
         else $autoscroll.value.el.scrollTop = parseInt($autoscroll.value.el.children[1].style.height);
     } catch (e) {
-        console.log("Error scrolling", e);
+        if (DEBUG) console.log("Error scrolling", e);
     }
 };
 
@@ -171,7 +171,6 @@ const handleWebsocketMessages = (msg) => {
             addAnsiToOutput(l);
         });
     } else if (msg.type === "console") {
-        console.log(msg);
         makeTaskLogMapping([msg]);
         if (data.includes("Cleared logs")) logLines.value = [];
         addAnsiToOutput(msg);
@@ -181,7 +180,7 @@ const handleWebsocketMessages = (msg) => {
 const makeTaskLogMapping = (lines) => {
     lines.forEach((l) => {
         if (!l.metadata) {
-            console.log("Error getting metadata", l);
+            if (DEBUG) console.log("Error getting metadata", l);
             return;
         }
         const region = l.metadata.siteId?.split("_")?.[1];
@@ -209,7 +208,7 @@ onMounted(() => {
 
     socket.onmessage = (event) => {
         const msg = JSON.parse(event.data);
-        console.log("Received message", msg);
+        if (DEBUG) console.log("Received message", msg);
         msg.forEach((e) => {
             handleWebsocketMessages(e);
         });

package/src/views/FilterBuilder.vue

@@ -329,6 +329,8 @@ if (!DEBUG)
     RendererFactory.then((r) => {
         rendererFactory = new r.default();
         rendererFactory.init();
+    }).catch((error) => {
+        console.error("Failed to initialize renderer:", error);
     });
 
 const updateShownVenue = async () => {