From b7eae14331caf3ae8c34599ba20c3d4256a80dff Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 25 Jul 2024 22:28:53 -0500 Subject: [PATCH 1/2] fix: legacy licenses missing feature_set field --- .../DeploySettingsPage/LicensesSettingsPage/LicenseCard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicenseCard.tsx b/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicenseCard.tsx index 15ccf92fa4e16..82f9567439fe8 100644 --- a/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicenseCard.tsx +++ b/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicenseCard.tsx @@ -33,7 +33,7 @@ export const LicenseCard: FC = ({ const licenseType = license.claims.trial ? "Trial" - : license.claims.feature_set.toLowerCase() === "premium" + : license.claims.feature_set?.toLowerCase() === "premium" ? "Premium" : "Enterprise"; From 9ee31b394bfeda7e7eabd24f04f641a08e25828e Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 25 Jul 2024 22:33:35 -0500 Subject: [PATCH 2/2] add storybook --- site/src/api/api.ts | 3 ++- site/src/testHelpers/entities.ts | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/site/src/api/api.ts b/site/src/api/api.ts index 3ee650f4f359e..ca006a3a16997 100644 --- a/site/src/api/api.ts +++ b/site/src/api/api.ts @@ -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; require_telemetry?: boolean; diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts index 3af51fd4c08e9..0254093481f0d 100644 --- a/site/src/testHelpers/entities.ts +++ b/site/src/testHelpers/entities.ts @@ -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, @@ -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, @@ -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,