Skip to content

Small cleanup of NanN display and license type #2228

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 29, 2025
Merged

Small cleanup of NanN display and license type #2228

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Frontend/src/composables/serviceLicense.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const emptyLicense: License = {
license_status: LicenseStatus.Unavailable,
license_extension_url: "",
licenseEdition: computed(() => {
return license.license_type && license.edition ? ", " + license.edition : "";
return `${license.license_type}${license.edition ? `, ${license.edition}` : ""}`;
}),
formattedInstanceName: computed(() => {
return license.instance_name || "Upgrade ServiceControl to v3.4.0+ to see more information about this license";
Expand Down Expand Up @@ -115,6 +115,7 @@ function getSubscriptionDaysLeft(license: UnwrapNestedRefs<License>) {
const isExpiring = license.license_status === "ValidWithExpiringSubscription";

const expiringIn = useGetDayDiffFromToday(license.expiration_date);
if (isNaN(expiringIn)) return "";
if (!isExpiring) return " - " + expiringIn + " days left";
if (expiringIn === 0) return " - expiring today";
if (expiringIn === 1) return " - expiring tomorrow";
Expand All @@ -127,6 +128,7 @@ function getTrialDaysLeft(license: UnwrapNestedRefs<License>) {
const isExpiring = license.license_status === "ValidWithExpiringTrial";

const expiringIn = useGetDayDiffFromToday(license.expiration_date);
if (isNaN(expiringIn)) return "";
if (!isExpiring) return " - " + expiringIn + " days left";
if (expiringIn === 0) return " - expiring today";
if (expiringIn === 1) return " - expiring tomorrow";
Expand All @@ -137,6 +139,7 @@ function getUpgradeDaysLeft(license: UnwrapNestedRefs<License>) {
if (license.license_status === "InvalidDueToExpiredUpgradeProtection") return " - expired";

const expiringIn = useGetDayDiffFromToday(license.upgrade_protection_expiration);
if (isNaN(expiringIn)) return "";
if (expiringIn <= 0) return " - expired";
if (expiringIn === 0) return " - expiring today";
if (expiringIn === 1) return " - 1 day left";
Expand Down