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

Show "Expired" for expired licenses #4967

Merged
merged 4 commits into from
Jan 3, 2025
Merged

Conversation

hardillb
Copy link
Contributor

@hardillb hardillb commented Jan 2, 2025

fixes #4889

Description

Admin overview showed "Expires: 2025-01-01" even when license has already expired, implying there was time left.

Now shows "Expied: 2024-01-01" after license has expired.

Related Issue(s)

#4889

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

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

fixes #4889

Admin overview showed "Expires: 2025-01-01" even when license has
already expired, implying there was time left.

Now shows "Expied: 2024-01-01" after license has expired.
@hardillb hardillb self-assigned this Jan 2, 2025
@hardillb hardillb requested a review from joepavitt January 2, 2025 10:06
Copy link

codecov bot commented Jan 2, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 78.43%. Comparing base (6d814ed) to head (488215d).
Report is 22 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4967   +/-   ##
=======================================
  Coverage   78.43%   78.43%           
=======================================
  Files         325      325           
  Lines       15353    15353           
  Branches     3530     3530           
=======================================
  Hits        12042    12042           
  Misses       3311     3311           
Flag Coverage Δ
backend 78.43% <ø> (ø)

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.

@ZJvandeWeg
Copy link
Member

@hardillb One style nitpick, but happy to be ignored and this to be merged as is.

@hardillb hardillb enabled auto-merge January 3, 2025 15:48
@hardillb hardillb merged commit b9795ee into main Jan 3, 2025
13 checks passed
@hardillb hardillb deleted the be-explicit-with-expired-license branch January 3, 2025 15:48
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.

Admin summary page shows time since license expired as remaining
2 participants