-
- {title}
-
- {filteredCount} / {totalCount}
-
-
-
+
+
+
+ {title}
+
+ {filteredCount} / {totalCount}
+
+
+
+
+
+ {/* Warning for stale boards */}
+ {extraBoards.length > 0 && (
+
+
+
{extraBoards.length} stale board(s) affecting counts
+
+ )}
);
};
diff --git a/frontend/testing-view/src/features/workspace/store/workspacesSlice.ts b/frontend/testing-view/src/features/workspace/store/workspacesSlice.ts
index ea09a6844..28a1be861 100644
--- a/frontend/testing-view/src/features/workspace/store/workspacesSlice.ts
+++ b/frontend/testing-view/src/features/workspace/store/workspacesSlice.ts
@@ -63,9 +63,9 @@ export const createWorkspacesSlice: StateCreator<
const newWorkspaceFilters = {
...state.workspaceFilters,
[newWorkspaceId]: {
- commands: createFullFilter(commands),
- telemetry: createFullFilter(telemetry),
- logs: createFullFilter(telemetry),
+ commands: createFullFilter(commands, get().boards),
+ telemetry: createFullFilter(telemetry, get().boards),
+ logs: createFullFilter(telemetry, get().boards),
},
};
diff --git a/frontend/testing-view/src/hooks/useBoardData.ts b/frontend/testing-view/src/hooks/useBoardData.ts
index 22ff3d8f9..3f40f4cfc 100644
--- a/frontend/testing-view/src/hooks/useBoardData.ts
+++ b/frontend/testing-view/src/hooks/useBoardData.ts
@@ -90,6 +90,8 @@ export function useBoardData(
logger.testingView.log("[useBoardData] Commands data processed");
+ console.log("availableBoards", availableBoards);
+
return {
telemetryCatalog: telemetryCatalogResult,
commandsCatalog: commandsCatalogResult,
diff --git a/frontend/testing-view/src/hooks/useTransformedBoards.ts b/frontend/testing-view/src/hooks/useTransformedBoards.ts
index c8fc04c40..aa7cda62b 100644
--- a/frontend/testing-view/src/hooks/useTransformedBoards.ts
+++ b/frontend/testing-view/src/hooks/useTransformedBoards.ts
@@ -12,6 +12,7 @@ export function useTransformedBoards(
const setTelemetryCatalog = useStore((s) => s.setTelemetryCatalog);
const setCommandsCatalog = useStore((s) => s.setCommandsCatalog);
+ const setBoards = useStore((s) => s.setBoards);
const initializeWorkspaceFilters = useStore(
(s) => s.initializeWorkspaceFilters,
);
@@ -25,7 +26,14 @@ export function useTransformedBoards(
setTelemetryCatalog(transformedBoards.telemetryCatalog);
setCommandsCatalog(transformedBoards.commandsCatalog);
- initializeWorkspaceFilters();
+ setBoards(Array.from(transformedBoards.boards));
+
+ const hasTelemetryData =
+ Object.keys(transformedBoards.telemetryCatalog).length > 0;
+ const hasCommandsData =
+ Object.keys(transformedBoards.commandsCatalog).length > 0;
+
+ if (hasTelemetryData && hasCommandsData) initializeWorkspaceFilters();
}, [
transformedBoards,
setTelemetryCatalog,
diff --git a/frontend/testing-view/src/lib/utils.test.ts b/frontend/testing-view/src/lib/utils.test.ts
index 947b6c5c7..fa667af7a 100644
--- a/frontend/testing-view/src/lib/utils.test.ts
+++ b/frontend/testing-view/src/lib/utils.test.ts
@@ -105,7 +105,17 @@ describe("getTypeBadgeClass", () => {
describe("emptyFilter", () => {
it("should return the correct empty filter", () => {
- expect(createEmptyFilter()).toStrictEqual({
+ const boards = [
+ "BCU",
+ "PCU",
+ "LCU",
+ "HVSCU",
+ "HVSCU-Cabinet",
+ "BMSL",
+ "VCU",
+ ];
+
+ expect(createEmptyFilter(boards)).toStrictEqual({
BCU: [],
PCU: [],
LCU: [],
@@ -133,7 +143,17 @@ describe("fullFilter", () => {
VCU: [],
};
- expect(createFullFilter(testDataSource)).toStrictEqual({
+ const boards = [
+ "BCU",
+ "PCU",
+ "LCU",
+ "HVSCU",
+ "HVSCU-Cabinet",
+ "BMSL",
+ "VCU",
+ ];
+
+ expect(createFullFilter(testDataSource, boards)).toStrictEqual({
BCU: [1],
PCU: [2],
LCU: [3],
diff --git a/frontend/testing-view/src/lib/utils.ts b/frontend/testing-view/src/lib/utils.ts
index fe0306338..0df30e9c3 100644
--- a/frontend/testing-view/src/lib/utils.ts
+++ b/frontend/testing-view/src/lib/utils.ts
@@ -1,5 +1,4 @@
import { ACRONYMS } from "../constants/acronyms";
-import { BOARD_NAMES } from "../constants/boards";
import { variablesBadgeClasses } from "../constants/variablesBadgeClasses";
import type {
FilterScope,
@@ -29,8 +28,8 @@ export const generateInitialFilters = (
);
};
-export const createEmptyFilter = (): TabFilter => {
- return BOARD_NAMES.reduce((acc, category) => {
+export const createEmptyFilter = (boards: BoardName[]): TabFilter => {
+ return boards.reduce((acc, category) => {
acc[category] = [];
return acc;
}, {} as TabFilter);
@@ -38,8 +37,9 @@ export const createEmptyFilter = (): TabFilter => {
export const createFullFilter = (
dataSource: Record
,
+ boards: BoardName[],
): TabFilter => {
- return BOARD_NAMES.reduce((acc, category) => {
+ return boards.reduce((acc, category) => {
acc[category] = dataSource[category]?.map((item) => item.id) || [];
return acc;
}, {} as TabFilter);
@@ -119,3 +119,11 @@ export const formatTimestamp = (ts: MessageTimestamp) => {
if (!ts) return "00:00:00";
return `${ts.hour.toString().padStart(2, "0")}:${ts.minute.toString().padStart(2, "0")}:${ts.second.toString().padStart(2, "0")}`;
};
+
+export const detectExtraBoards = (
+ activeFilters: TabFilter | undefined,
+ boards: BoardName[],
+) =>
+ Object.keys(activeFilters || {}).filter(
+ (key) => !boards.includes(key),
+ ) as BoardName[];
diff --git a/frontend/testing-view/src/store/slices/catalogSlice.ts b/frontend/testing-view/src/store/slices/catalogSlice.ts
index e2e60017f..dcd365534 100644
--- a/frontend/testing-view/src/store/slices/catalogSlice.ts
+++ b/frontend/testing-view/src/store/slices/catalogSlice.ts
@@ -15,6 +15,10 @@ export interface CatalogSlice {
setTelemetryCatalog: (
telemetryCatalog: Record,
) => void;
+
+ // Boards
+ boards: BoardName[];
+ setBoards: (boards: BoardName[]) => void;
}
export const createCatalogSlice: StateCreator = (
@@ -24,4 +28,6 @@ export const createCatalogSlice: StateCreator = (
telemetryCatalog: {} as Record,
setCommandsCatalog: (commandsCatalog) => set({ commandsCatalog }),
setTelemetryCatalog: (telemetryCatalog) => set({ telemetryCatalog }),
+ boards: [] as BoardName[],
+ setBoards: (boards) => set({ boards }),
});
diff --git a/go.work b/go.work
index 521811c76..957518330 100644
--- a/go.work
+++ b/go.work
@@ -2,4 +2,5 @@ go 1.23.1
use (
./backend
+ ./packet-sender
)
diff --git a/packet-sender/main.go b/packet-sender/main.go
index 9a52ccb99..f748519f3 100644
--- a/packet-sender/main.go
+++ b/packet-sender/main.go
@@ -7,8 +7,6 @@ import (
boardpkg "packet_sender/pkg/board"
"packet_sender/pkg/listener"
"packet_sender/pkg/sender"
- "path"
- "path/filepath"
"strings"
adj_module "github.com/HyperloopUPV-H8/h9-backend/pkg/adj"
@@ -66,11 +64,13 @@ func getConn(lip string, lport uint16, rip string, rport uint16) *net.UDPConn {
// getADJ loads the same ADJ used by backend directly from backend/cmd/adj.
func getADJ() adj_module.ADJ {
- adjPath, err := filepath.Abs(path.Join("..", "backend", "cmd", "adj"))
- if err != nil {
- log.Fatalf("Failed to resolve ADJ path: %v", err)
- }
- adj_module.RepoPath = adjPath + string(filepath.Separator)
+ // adjPath, err := filepath.Abs(path.Join("..", "backend", "cmd", "adj"))
+ // if err != nil {
+ // log.Fatalf("Failed to resolve ADJ path: %v", err)
+ // }
+ // adj_module.RepoPath = adjPath + string(filepath.Separator)
+
+ // Uses the same ADJ RepoPath as the backend by default
adj, err := adj_module.NewADJ("")
if err != nil {
diff --git a/packet-sender/package.json b/packet-sender/package.json
new file mode 100644
index 000000000..d96551e08
--- /dev/null
+++ b/packet-sender/package.json
@@ -0,0 +1,12 @@
+{
+ "name": "packet-sender",
+ "version": "1.0.0",
+ "private": true,
+ "author": "Hyperloop UPV Team",
+ "license": "MIT",
+ "scripts": {
+ "build": "go build -o packet-sender main.go",
+ "build:ci": "go build",
+ "test": "go test ./..."
+ }
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9698bd788..29d83d227 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -34,6 +34,9 @@ importers:
'@iarna/toml':
specifier: ^2.2.5
version: 2.2.5
+ ansi-to-html:
+ specifier: ^0.7.2
+ version: 0.7.2
electron-store:
specifier: ^11.0.2
version: 11.0.2
@@ -1805,6 +1808,11 @@ packages:
resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==}
engines: {node: '>=12'}
+ ansi-to-html@0.7.2:
+ resolution: {integrity: sha512-v6MqmEpNlxF+POuyhKkidusCHWWkaLcGRURzivcU3I9tv7k4JVhFcnukrM5Rlk2rUywdZuzYAZ+kbZqWCnfN3g==}
+ engines: {node: '>=8.0.0'}
+ hasBin: true
+
app-builder-bin@4.0.0:
resolution: {integrity: sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==}
@@ -2392,6 +2400,9 @@ packages:
resolution: {integrity: sha512-phv3E1Xl4tQOShqSte26C7Fl84EwUdZsyOuSSk9qtAGyyQs2s3jJzComh+Abf4g187lUUAvH+H26omrqia2aGg==}
engines: {node: '>=10.13.0'}
+ entities@2.2.0:
+ resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}
+
env-paths@2.2.1:
resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
engines: {node: '>=6'}
@@ -6218,6 +6229,10 @@ snapshots:
ansi-styles@6.2.3: {}
+ ansi-to-html@0.7.2:
+ dependencies:
+ entities: 2.2.0
+
app-builder-bin@4.0.0: {}
app-builder-bin@5.0.0-alpha.12: {}
@@ -7045,6 +7060,8 @@ snapshots:
graceful-fs: 4.2.11
tapable: 2.3.0
+ entities@2.2.0: {}
+
env-paths@2.2.1: {}
env-paths@3.0.0: {}