From 7d7688a7559059175f9b7f3b079946aa251d146f Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Wed, 24 Jul 2024 18:58:19 -0500
Subject: [PATCH 1/4] chore: indicate premium vs enterprise on license page

Premium licenses should say "premium" instead of "enterprise"
---
 .../LicensesSettingsPage/LicenseCard.tsx      |  8 ++++-
 site/src/testHelpers/entities.ts              | 31 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicenseCard.tsx b/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicenseCard.tsx
index f3c9707c19e22..15ccf92fa4e16 100644
--- a/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicenseCard.tsx
+++ b/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicenseCard.tsx
@@ -31,6 +31,12 @@ export const LicenseCard: FC<LicenseCardProps> = ({
   const currentUserLimit =
     license.claims.features["user_limit"] || userLimitLimit;
 
+  const licenseType = license.claims.trial
+    ? "Trial"
+    : license.claims.feature_set.toLowerCase() === "premium"
+      ? "Premium"
+      : "Enterprise";
+
   return (
     <Paper
       key={license.id}
@@ -64,7 +70,7 @@ export const LicenseCard: FC<LicenseCardProps> = ({
       >
         <span css={styles.licenseId}>#{license.id}</span>
         <span css={styles.accountType} className="account-type">
-          {license.claims.trial ? "Trial" : "Enterprise"}
+          {licenseType}
         </span>
         <Stack
           direction="row"
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
index 453f1455615ec..c5c45a50a5baa 100644
--- a/site/src/testHelpers/entities.ts
+++ b/site/src/testHelpers/entities.ts
@@ -2567,6 +2567,34 @@ export const MockWorkspaceAgentLogs: TypesGen.WorkspaceAgentLog[] = [
 ];
 
 export const MockLicenseResponse: GetLicensesResponse[] = [
+  {
+    id: 2,
+    uploaded_at: "1660104000",
+    expires_at: "3420244800", // expires on 5/20/2078
+    uuid: "1",
+    claims: {
+      trial: false,
+      all_features: true,
+      feature_set: "PREMIUM",
+      version: 1,
+      features: {},
+      license_expires: 3420244800,
+    },
+  },
+  {
+    id: 3,
+    uploaded_at: "1660104000",
+    expires_at: "3420244800", // expires on 5/20/2078
+    uuid: "1",
+    claims: {
+      trial: false,
+      all_features: true,
+      feature_set: "enterprise",
+      version: 1,
+      features: {},
+      license_expires: 3420244800,
+    },
+  },
   {
     id: 1,
     uploaded_at: "1660104000",
@@ -2575,6 +2603,7 @@ export const MockLicenseResponse: GetLicensesResponse[] = [
     claims: {
       trial: false,
       all_features: true,
+      feature_set: "", // Legacy is empty
       version: 1,
       features: {},
       license_expires: 3420244800,
@@ -2588,6 +2617,7 @@ export const MockLicenseResponse: GetLicensesResponse[] = [
     claims: {
       trial: false,
       all_features: true,
+      feature_set: "", // Legacy is empty
       version: 1,
       features: {},
       license_expires: 1660104000,
@@ -2601,6 +2631,7 @@ export const MockLicenseResponse: GetLicensesResponse[] = [
     claims: {
       trial: false,
       all_features: true,
+      feature_set: "", // Legacy is empty
       version: 1,
       features: {},
       license_expires: 1682346425,

From bddea60ed1f24946d31ac902351aa980bc1ff0a3 Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Wed, 24 Jul 2024 19:03:47 -0500
Subject: [PATCH 2/4] fixup! chore: indicate premium vs enterprise on license
 page

---
 site/src/api/api.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/src/api/api.ts b/site/src/api/api.ts
index 07010543a63e5..4c8d5641e0908 100644
--- a/site/src/api/api.ts
+++ b/site/src/api/api.ts
@@ -329,6 +329,7 @@ type Claims = {
   account_id?: string;
   trial: boolean;
   all_features: boolean;
+  feature_set: string;
   version: number;
   features: Record<string, number>;
   require_telemetry?: boolean;

From d634c3e3a4c67279b749557b19a1b1f6944e57a6 Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Wed, 24 Jul 2024 19:31:37 -0500
Subject: [PATCH 3/4] number 1 is checked in tests

---
 site/src/testHelpers/entities.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
index c5c45a50a5baa..6d4b13aa9a799 100644
--- a/site/src/testHelpers/entities.ts
+++ b/site/src/testHelpers/entities.ts
@@ -2568,7 +2568,7 @@ export const MockWorkspaceAgentLogs: TypesGen.WorkspaceAgentLog[] = [
 
 export const MockLicenseResponse: GetLicensesResponse[] = [
   {
-    id: 2,
+    id: 1,
     uploaded_at: "1660104000",
     expires_at: "3420244800", // expires on 5/20/2078
     uuid: "1",
@@ -2582,7 +2582,7 @@ export const MockLicenseResponse: GetLicensesResponse[] = [
     },
   },
   {
-    id: 3,
+    id: 1,
     uploaded_at: "1660104000",
     expires_at: "3420244800", // expires on 5/20/2078
     uuid: "1",

From b148b84806eb6c103182d9d685b3761a7afababa Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Wed, 24 Jul 2024 19:38:30 -0500
Subject: [PATCH 4/4] order matters for some tests

---
 site/src/testHelpers/entities.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
index 6d4b13aa9a799..78bb252473ed4 100644
--- a/site/src/testHelpers/entities.ts
+++ b/site/src/testHelpers/entities.ts
@@ -2575,7 +2575,7 @@ export const MockLicenseResponse: GetLicensesResponse[] = [
     claims: {
       trial: false,
       all_features: true,
-      feature_set: "PREMIUM",
+      feature_set: "enterprise",
       version: 1,
       features: {},
       license_expires: 3420244800,
@@ -2589,7 +2589,7 @@ export const MockLicenseResponse: GetLicensesResponse[] = [
     claims: {
       trial: false,
       all_features: true,
-      feature_set: "enterprise",
+      feature_set: "PREMIUM",
       version: 1,
       features: {},
       license_expires: 3420244800,