Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit96011e1

Browse files
authored
fix: handle legacy licenses missing feature_set field (#14025)
* fix: legacy licenses missing feature_set field
1 parent5b35f65 commit96011e1

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

‎site/src/api/api.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,8 @@ type Claims = {
329329
account_id?:string;
330330
trial:boolean;
331331
all_features:boolean;
332-
feature_set:string;
332+
// feature_set is omitted on legacy licenses
333+
feature_set?:string;
333334
version:number;
334335
features:Record<string,number>;
335336
require_telemetry?:boolean;

‎site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicenseCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const LicenseCard: FC<LicenseCardProps> = ({
3333

3434
constlicenseType=license.claims.trial
3535
?"Trial"
36-
:license.claims.feature_set.toLowerCase()==="premium"
36+
:license.claims.feature_set?.toLowerCase()==="premium"
3737
?"Premium"
3838
:"Enterprise";
3939

‎site/src/testHelpers/entities.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2647,7 +2647,6 @@ export const MockLicenseResponse: GetLicensesResponse[] = [
26472647
claims:{
26482648
trial:false,
26492649
all_features:true,
2650-
feature_set:"",// Legacy is empty
26512650
version:1,
26522651
features:{},
26532652
license_expires:3420244800,
@@ -2661,7 +2660,6 @@ export const MockLicenseResponse: GetLicensesResponse[] = [
26612660
claims:{
26622661
trial:false,
26632662
all_features:true,
2664-
feature_set:"",// Legacy is empty
26652663
version:1,
26662664
features:{},
26672665
license_expires:1660104000,
@@ -2675,7 +2673,6 @@ export const MockLicenseResponse: GetLicensesResponse[] = [
26752673
claims:{
26762674
trial:false,
26772675
all_features:true,
2678-
feature_set:"",// Legacy is empty
26792676
version:1,
26802677
features:{},
26812678
license_expires:1682346425,

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp