fix: add instanceName to license display (#6065)

## About the changes - Shows the instanceName from the license - add new feature flag `enableLicenseChecker` used to enforce a valid license.
Unleash · Jan 30, 2024 · 38df2e1 · 38df2e1
1 parent 3ff19f3
commit 38df2e1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/frontend/src/component/admin/license/License.tsx b/frontend/src/component/admin/license/License.tsx
@@ -80,19 +80,27 @@ export const License = () => {
                                     Customer
                                 </StyledPropertyName>
                                 <StyledPropertyDetails>
-                                    {license?.customer}
+                                    {license.customer}
+                                </StyledPropertyDetails>
+                            </StyledDataCollectionPropertyRow>
+                            <StyledDataCollectionPropertyRow>
+                                <StyledPropertyName>
+                                    Instance Name
+                                </StyledPropertyName>
+                                <StyledPropertyDetails>
+                                    {license.instanceName}
                                 </StyledPropertyDetails>
                             </StyledDataCollectionPropertyRow>
                             <StyledDataCollectionPropertyRow>
                                 <StyledPropertyName>Plan</StyledPropertyName>
                                 <StyledPropertyDetails>
-                                    {license?.plan}
+                                    {license.plan}
                                 </StyledPropertyDetails>
                             </StyledDataCollectionPropertyRow>
                             <StyledDataCollectionPropertyRow>
                                 <StyledPropertyName>Seats</StyledPropertyName>
                                 <StyledPropertyDetails>
-                                    {license?.seats}
+                                    {license.seats}
                                 </StyledPropertyDetails>
                             </StyledDataCollectionPropertyRow>
                             <StyledDataCollectionPropertyRow>

diff --git a/frontend/src/hooks/api/getters/useLicense/useLicense.ts b/frontend/src/hooks/api/getters/useLicense/useLicense.ts
@@ -21,6 +21,7 @@ export interface License {
     license?: {
         token: string;
         customer: string;
+        instanceName: string;
         plan: string;
         seats: number;
         expireAt: Date;

diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap
@@ -90,6 +90,7 @@ exports[`should create default config 1`] = `
       "embedProxy": true,
       "embedProxyFrontend": true,
       "enableLicense": false,
+      "enableLicenseChecker": false,
       "encryptEmails": false,
       "executiveDashboard": false,
       "extendedUsageMetrics": false,

diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts
@@ -7,6 +7,7 @@ export type IFlagKey =
     | 'anonymiseEventLog'
     | 'encryptEmails'
     | 'enableLicense'
+    | 'enableLicenseChecker'
     | 'embedProxy'
     | 'embedProxyFrontend'
     | 'responseTimeWithAppNameKillSwitch'
@@ -55,6 +56,7 @@ export type IFlags = Partial<{ [key in IFlagKey]: boolean | Variant }>;
 const flags: IFlags = {
     anonymiseEventLog: false,
     enableLicense: false,
+    enableLicenseChecker: false,
     embedProxy: parseEnvVarBoolean(
         process.env.UNLEASH_EXPERIMENTAL_EMBED_PROXY,
         true,