From a51eb40dca2a0503715a06655afc66ba0c2c93d0 Mon Sep 17 00:00:00 2001 From: Jake Howell Date: Sat, 28 Feb 2026 00:23:41 +1100 Subject: [PATCH] fix: marshal `convertLicenses()` into a `[]` instead of `nil` (#22366) This was a bad smell that was being addressed by the frontend. This type was generating out to be a `nil`/`null` instead of an empty `License[]`. Now this returns as an empty array and we can actively check if we have no licenses with a length of `0`. --- enterprise/coderd/licenses.go | 2 +- .../LicensesSettingsPage/LicensesSettingsPageView.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/enterprise/coderd/licenses.go b/enterprise/coderd/licenses.go index 91fd4250b2..401ecca7cd 100644 --- a/enterprise/coderd/licenses.go +++ b/enterprise/coderd/licenses.go @@ -349,7 +349,7 @@ func convertLicense(dl database.License, c jwt.MapClaims) codersdk.License { } func convertLicenses(licenses []database.License) ([]codersdk.License, error) { - var out []codersdk.License + out := make([]codersdk.License, 0, len(licenses)) for _, l := range licenses { c, err := decodeClaims(l) if err != nil { diff --git a/site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/LicensesSettingsPageView.tsx b/site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/LicensesSettingsPageView.tsx index 62df8c904e..4444d2cdee 100644 --- a/site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/LicensesSettingsPageView.tsx +++ b/site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/LicensesSettingsPageView.tsx @@ -134,7 +134,7 @@ const LicensesSettingsPageView: FC = ({ )} - {!isLoading && licenses === null && ( + {!isLoading && licenses?.length === 0 && (