Skip to content

fix: handle legacy licenses missing feature_set field #14025

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
Jul 26, 2024
Merged

fix: handle legacy licenses missing feature_set field #14025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7eae14
fix: legacy licenses missing feature_set field
Emyrk Jul 26, 2024
9ee31b3
add storybook
Emyrk Jul 26, 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
3 changes: 2 additions & 1 deletion site/src/api/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,8 @@ type Claims = {
account_id?: string;
trial: boolean;
all_features: boolean;
feature_set: string;
// feature_set is omitted on legacy licenses
feature_set?: string;
version: number;
features: Record<string, number>;
require_telemetry?: boolean;
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicenseCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const LicenseCard: FC<LicenseCardProps> = ({

const licenseType = license.claims.trial
? "Trial"
: license.claims.feature_set.toLowerCase() === "premium"
: license.claims.feature_set?.toLowerCase() === "premium"
? "Premium"
: "Enterprise";

Expand Down
3 changes: 0 additions & 3 deletions site/src/testHelpers/entities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2647,7 +2647,6 @@ export const MockLicenseResponse: GetLicensesResponse[] = [
claims: {
trial: false,
all_features: true,
feature_set: "", // Legacy is empty
version: 1,
features: {},
license_expires: 3420244800,
Expand All @@ -2661,7 +2660,6 @@ export const MockLicenseResponse: GetLicensesResponse[] = [
claims: {
trial: false,
all_features: true,
feature_set: "", // Legacy is empty
version: 1,
features: {},
license_expires: 1660104000,
Expand All @@ -2675,7 +2673,6 @@ export const MockLicenseResponse: GetLicensesResponse[] = [
claims: {
trial: false,
all_features: true,
feature_set: "", // Legacy is empty
version: 1,
features: {},
license_expires: 1682346425,
Expand Down
Loading