Hide grace period note when in self-serve trial (#8768)

This commit is contained in:
Alex Morask 2024-04-30 10:55:00 -04:00 committed by GitHub
parent e7416384dc
commit 418d4642da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 1 deletions

View File

@ -42,7 +42,10 @@
: subscription.expirationWithGracePeriod : subscription.expirationWithGracePeriod
) | date: "mediumDate" ) | date: "mediumDate"
}} }}
<div *ngIf="subscription.hasSeparateGracePeriod" class="tw-text-muted"> <div
*ngIf="subscription.hasSeparateGracePeriod && !subscription.isInTrial"
class="tw-text-muted"
>
{{ {{
"selfHostGracePeriodHelp" "selfHostGracePeriodHelp"
| i18n: (subscription.expirationWithGracePeriod | date: "mediumDate") | i18n: (subscription.expirationWithGracePeriod | date: "mediumDate")

View File

@ -58,4 +58,16 @@ export class SelfHostedOrganizationSubscriptionView implements View {
get isExpiredAndOutsideGracePeriod() { get isExpiredAndOutsideGracePeriod() {
return this.hasExpiration && this.expirationWithGracePeriod < new Date(); return this.hasExpiration && this.expirationWithGracePeriod < new Date();
} }
/**
* In the case of a trial, where there is no grace period, the expirationWithGracePeriod and expirationWithoutGracePeriod will
* be exactly the same. This can be used to hide the grace period note.
*/
get isInTrial() {
return (
this.expirationWithGracePeriod &&
this.expirationWithoutGracePeriod &&
this.expirationWithGracePeriod.getTime() === this.expirationWithoutGracePeriod.getTime()
);
}
} }