dennii/Termix
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 22 Wiki Activity

fix: resolve merge conflicts from network graph PR #478 #500

Closed
ZacharyZcR wants to merge 1 commits from fix/network-graph-build-errors into dev-1.10.1
pull from: fix/network-graph-build-errors
merge into: :dev-1.10.1
Conversation 1 Commits 1 Files Changed 10
+62 -8
ZacharyZcR commented 2026-01-13 10:39:36 +11:00 (Migrated from github.com)
Copy Link
Copy Source

Summary

  • Fix multiple syntax errors introduced during merge of PR #478 (network graph feature)
  • Restore build functionality on dev-1.10.1 branch

Changes

  • HostManagerApp.tsx: Fix incorrect import path
  • AppView.tsx: Add missing closing tag for NetworkGraphView
  • stats-widgets.ts: Fix misplaced firewall type union
  • ServerStats.tsx: Fix unclosed return statement in ports case
  • server-stats.ts: Complete catch block for ports metrics
  • schema.ts: Close networkTopology table definition, add missing timestamp fields
  • db/index.ts: Complete error logging block
  • en.json: Add missing closing brace for ports object
  • user-data-import.ts: Fix type annotations for dynamic objects

Test plan

  • npm run build passes successfully
## Summary - Fix multiple syntax errors introduced during merge of PR #478 (network graph feature) - Restore build functionality on dev-1.10.1 branch ## Changes - `HostManagerApp.tsx`: Fix incorrect import path - `AppView.tsx`: Add missing closing tag for NetworkGraphView - `stats-widgets.ts`: Fix misplaced firewall type union - `ServerStats.tsx`: Fix unclosed return statement in ports case - `server-stats.ts`: Complete catch block for ports metrics - `schema.ts`: Close networkTopology table definition, add missing timestamp fields - `db/index.ts`: Complete error logging block - `en.json`: Add missing closing brace for ports object - `user-data-import.ts`: Fix type annotations for dynamic objects ## Test plan - [x] `npm run build` passes successfully
LukeGus commented 2026-01-13 11:04:29 +11:00 (Migrated from github.com)
Copy Link
Copy Source

I've already resolved this but haven't pushed yet.

I've already resolved this but haven't pushed yet.

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
bug
Something isn't working
 dependencies
Pull requests that update a dependency file
 docker
Pull requests that update docker code
 documentation
Improvements or additions to documentation
 duplicate
This issue or pull request already exists
 enhancement
New feature or request
 github_actions
Pull requests that update GitHub Actions code
 good first issue
Good for newcomers
 help wanted
Extra attention is needed
 invalid
This doesn't seem right
 javascript
Pull requests that update javascript code
 question
Further information is requested
 security
Questions about network security
 wontfix
This will not be worked on
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
dennii
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: dennii/Termix#500