Merge branch '25_2' into 25_2_reduce_runners

Author: EugeniyKiyashko

packages/devextreme/js/__internal/core/license/trial_panel.client.test.ts

@@ -0,0 +1,71 @@
+/**
+ * @jest-environment jsdom
+ */
+import {
+  beforeEach, describe, expect, it,
+} from '@jest/globals';
+
+import { renderTrialPanel } from './trial_panel.client';
+
+describe('trial panel client', () => {
+  beforeEach(() => {
+    document.body.innerHTML = '';
+  });
+
+  it('should not display subscription text when subscriptions parameter is empty string', () => {
+    renderTrialPanel(
+      'https://example.com/buy',
+      'https://example.com/docs',
+      '25.2.0',
+      '',
+    );
+
+    const triggerElement = document.querySelector('dx-license-trigger');
+    expect(triggerElement).not.toBeNull();
+
+    const panelElement = document.querySelector('dx-license');
+    if (panelElement) {
+      const text = panelElement.textContent ?? '';
+      expect(text).not.toContain('Included in Subscriptions:');
+    }
+  });
+
+  it('should set subscriptions attribute when parameter is a valid string', () => {
+    renderTrialPanel(
+      'https://example.com/buy',
+      'https://example.com/docs',
+      '25.2.0',
+      'Universal, DXperience',
+    );
+
+    const triggerElement = document.querySelector('dx-license-trigger');
+    expect(triggerElement).not.toBeNull();
+
+    const subscriptionsAttr = triggerElement?.getAttribute('subscriptions');
+    expect(subscriptionsAttr).toBe('Universal, DXperience');
+  });
+
+  it('should not display subscription text when subscriptions parameter is actual null', () => {
+    renderTrialPanel(
+      'https://example.com/buy',
+      'https://example.com/docs',
+      '25.2.0',
+      null as any, // Actual null value
+    );
+
+    const triggerElement = document.querySelector('dx-license-trigger');
+    expect(triggerElement).not.toBeNull();
+
+    // When null is passed, it gets converted to string "null" as HTML attribute
+    const subscriptionsAttr = triggerElement?.getAttribute('subscriptions');
+    expect(subscriptionsAttr).toBe('');
+
+    // Ensure the panel element doesn't show "Included in Subscriptions: null"
+    // This is the key test - our fix should prevent displaying "null"
+    const panelElement = document.querySelector('dx-license');
+    if (panelElement) {
+      const text = panelElement.textContent ?? '';
+      expect(text).not.toContain('Included in Subscriptions: null');
+    }
+  });
+});

packages/devextreme/js/__internal/core/license/trial_panel.client.ts

@@ -304,10 +304,11 @@ class DxLicenseTrigger extends SafeHTMLElement {
       const license = document.createElement(componentNames.panel);
 
       Object.values(attributeNames).forEach((attrName) => {
-        license.setAttribute(
-          attrName,
-          this.getAttribute(attrName) as string,
-        );
+        const attrValue = this.getAttribute(attrName);
+
+        if (attrValue) {
+          license.setAttribute(attrName, attrValue);
+        }
       });
 
       license.setAttribute(DATA_PERMANENT_ATTRIBUTE, '');
@@ -338,7 +339,7 @@ export function renderTrialPanel(
   buyNowUrl: string,
   licensingDocUrl: string,
   version: string,
-  subscriptions = '',
+  subscriptions: string | undefined | null,
   customStyles?: CustomTrialPanelStyles,
 ): void {
   registerCustomComponents(customStyles);
@@ -348,7 +349,7 @@ export function renderTrialPanel(
   trialPanelTrigger.setAttribute(attributeNames.buyNow, buyNowUrl);
   trialPanelTrigger.setAttribute(attributeNames.licensingDoc, licensingDocUrl);
   trialPanelTrigger.setAttribute(attributeNames.version, version);
-  trialPanelTrigger.setAttribute(attributeNames.subscriptions, subscriptions);
+  trialPanelTrigger.setAttribute(attributeNames.subscriptions, subscriptions ?? '');
 
   document.body.appendChild(trialPanelTrigger);
 }

packages/devextreme/js/__internal/core/license/trial_panel.ts

@@ -9,7 +9,7 @@ export function showTrialPanel(
   buyNowUrl: string,
   licensingDocUrl: string,
   version: string,
-  subscriptions?: string,
+  subscriptions?: string | null,
   customStyles?: CustomTrialPanelStyles,
 ): void {
   if (isClient()) {