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

v4.23.0 #1179

Merged
merged 20 commits into from
Dec 19, 2023
Merged

v4.23.0 #1179

merged 20 commits into from
Dec 19, 2023

Conversation

TheTrunk
Copy link
Member

@TheTrunk TheTrunk commented Dec 18, 2023

  • Simplifies UPNP check
  • Simplifies apiServer of FluxOS
  • HomeUI now shows expired applications
  • HomeUI now shows all marketplace deployed applications
  • HomeUI - It is now possible to redeploy expired application as well as any active application
  • HomeUI - Copying and import of applications specifications json (ASJ)
  • Docker prune improvments

TheTrunk and others added 17 commits December 13, 2023 16:26
* Streamline app start

The current app.js and apiserver.js are essentially duplicates.
This commit removes a lot of that duplication. Also simplifies
the way UPnP is loaded, and retests UPnP on every config reload.

* Use isUPnP variable instead of testing for userconfig each time

* Fix typing for UPnPService

* Remove UPnP duplication from serviceManager

* Fix UPnP check to match current implementatio

If apiPort is set and it's not 16127 - it's a UPnP node
If apiPort is set and it's 16127 and routerIP is set - it's UPnP
if apiPort is set and it's 16127 and no routerIP set - It's normal
If no apiPort is set and no RouterIP is set - it's normal

* Remove unneeded term for upnp check

---------

Co-authored-by: Tadeas Kmenta <[email protected]>
Copy link

codecov bot commented Dec 18, 2023

Codecov Report

Attention: 33 lines in your changes are missing coverage. Please review.

Comparison is base (400be09) 51.28% compared to head (56df9dc) 51.18%.
Report is 24 commits behind head on master.

Files Patch % Lines
ZelBack/src/services/appsService.js 11.76% 30 Missing ⚠️
ZelBack/src/services/dockerService.js 0.00% 2 Missing ⚠️
ZelBack/src/services/upnpService.js 50.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1179      +/-   ##
==========================================
- Coverage   51.28%   51.18%   -0.10%     
==========================================
  Files          43       43              
  Lines       13916    13935      +19     
==========================================
- Hits         7137     7133       -4     
- Misses       6779     6802      +23     

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

Copy link
Member

@Cabecinha84 Cabecinha84 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ack

@Cabecinha84
Copy link
Member

@TheTrunk haven't commit rebuild HomeUI because it shows 132 files changed to commit on my laptop...

Also something about the change, I don't like 100% the My Expired Apps tab because it shows up all rows...
If I had one app, that I had running for one year, paying the renew every 1 month, it will show it 12 times...

I think we should only show one row with the latest version that got expired.

But some nice improvments.

Cheers!

@TheTrunk
Copy link
Member Author

@TheTrunk haven't commit rebuild HomeUI because it shows 132 files changed to commit on my laptop...

Also something about the change, I don't like 100% the My Expired Apps tab because it shows up all rows... If I had one app, that I had running for one year, paying the renew every 1 month, it will show it 12 times...

I think we should only show one row with the latest version that got expired.

But some nice improvments.

Cheers!

Hi that is exactly how it should be working. It should always show the latest specifications - the app should be shown just one time with latest specifications. Is that not the case?

@Cabecinha84
Copy link
Member

@TheTrunk haven't commit rebuild HomeUI because it shows 132 files changed to commit on my laptop...
Also something about the change, I don't like 100% the My Expired Apps tab because it shows up all rows... If I had one app, that I had running for one year, paying the renew every 1 month, it will show it 12 times...
I think we should only show one row with the latest version that got expired.
But some nice improvments.
Cheers!

Hi that is exactly how it should be working. It should always show the latest specifications - the app should be shown just one time with latest specifications. Is that not the case?

you are correct, I just saw so many presearch on my end that tought it was the case but the app name is different. All good! Nice work!
image

@TheTrunk TheTrunk merged commit 59626c9 into master Dec 19, 2023
5 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants