Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix device editor tunnel status indicator #3504

Merged
merged 4 commits into from
Feb 21, 2024
Merged

Conversation

Steve-Mcl
Copy link
Contributor

@Steve-Mcl Steve-Mcl commented Feb 20, 2024

fixes #3473
fixes #3499

Description

Pass hashid not id in querying tunnel state

Reverts changes made in #3427 7f32d0c

working demo

chrome_h8a7o3Ryvn

Related Issue(s)

#3473
#3499

Checklist

  • I have read the contribution guidelines
  • Suitable unit/system level tests have been added and they pass
  • Documentation has been updated
    • Upgrade instructions
    • Configuration details
    • Concepts
  • Changes flowforge.yml?
    • Issue/PR raised on FlowFuse/helm to update ConfigMap Template
    • Issue/PR raised on FlowFuse/CloudProject to update values for Staging/Production

Labels

  • Backport needed? -> add the backport label
  • Includes a DB migration? -> add the area:migration label

Copy link

codecov bot commented Feb 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (07b531b) 41.77% compared to head (73e0ae0) 41.77%.
Report is 9 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #3504   +/-   ##
=======================================
  Coverage   41.77%   41.77%           
=======================================
  Files         616      616           
  Lines       23433    23433           
  Branches     5680     5680           
=======================================
  Hits         9790     9790           
  Misses      13643    13643           
Flag Coverage Δ
backend 78.57% <100.00%> (ø)
frontend 1.99% <0.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

forge/db/views/Device.js Outdated Show resolved Hide resolved
@Steve-Mcl
Copy link
Contributor Author

Steve-Mcl commented Feb 20, 2024

Tests passing now - I didnt spot that the test introduced in the breaking PR was also using an id in the .should.have. test
'/api/v1/devices/1/editor/proxy/?access_token=token12e' (note the ID not the HASH)

What i dont understand is why the view was changed at all!

As it stands: this PR reverts the view to use the devices hashid and it updates the test to use the hashid in all parts

I have scanned the PR for other places where an assumption about using id vs hashid might have been made - i dont see any & all tests are now passing.

@knolleary knolleary merged commit c187908 into main Feb 21, 2024
10 checks passed
@knolleary knolleary deleted the 3473-revert-parts-of-3427 branch February 21, 2024 09:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants