Skip to content

fix: [Feature Preview] compare hours elapsed within range instead of dates #3752

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 2 commits into from
Nov 14, 2024
Merged

fix: [Feature Preview] compare hours elapsed within range instead of dates #3752

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
448441e
compare hours elapsed within range instead of dates
sergiolms Nov 14, 2024
943da85
replace magic number
sergiolms Nov 14, 2024
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
17 changes: 14 additions & 3 deletions src/features.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { StoredFeaturePreviewUsagePeriod } from './constants.storage';
import { proFeaturePreviewUsages } from './constants.subscription';
import { proFeaturePreviewUsageDurationInDays, proFeaturePreviewUsages } from './constants.subscription';
import type { RepositoryVisibility } from './git/gitProvider';
import type { RequiredSubscriptionPlans, Subscription } from './plus/gk/account/subscription';
import { capitalize } from './system/string';
Expand Down Expand Up @@ -60,17 +60,28 @@ export function getFeaturePreviewLabel(feature: FeaturePreviews) {
}
}

const hoursInMs = 3600000;

export function isFeaturePreviewActive(featurePreview?: FeaturePreview) {
const usages = featurePreview?.usages;
if (usages == null || usages.length === 0) return false;

return usages.length <= proFeaturePreviewUsages && new Date(usages[usages.length - 1].expiresOn) > new Date();
const remainingHours = (new Date(usages[usages.length - 1].expiresOn).getTime() - new Date().getTime()) / hoursInMs;
return (
usages.length <= proFeaturePreviewUsages &&
remainingHours > 0 &&
remainingHours < 24 * proFeaturePreviewUsageDurationInDays
);
}

export function isFeaturePreviewExpired(featurePreview: FeaturePreview) {
const usages = featurePreview.usages;
if (usages == null || usages.length === 0) return false;

const remainingHours = (new Date(usages[usages.length - 1].expiresOn).getTime() - new Date().getTime()) / hoursInMs;
return (
usages.length > proFeaturePreviewUsages ||
(usages.length === proFeaturePreviewUsages && new Date(usages[usages.length - 1].expiresOn) < new Date())
(usages.length === proFeaturePreviewUsages && remainingHours <= 0) ||
remainingHours >= 24 * proFeaturePreviewUsageDurationInDays
);
}
Loading