License: Small fixes from testing (#33373)

Author: ajivanyandev

packages/devextreme/js/__internal/core/license/license_validation.test.ts

@@ -378,7 +378,7 @@ describe('license check', () => {
     { token: TOKEN_23_2, version: '42.4.5' },
     { token: TOKEN_23_1, version: '23.3.0' },
     { token: TOKEN_23_2, version: '42.4.0' },
-  ])('Trial panel should be displayed if license is outdated (>=1 major for RTM, >=2 major for preview)', ({ token, version }) => {
+  ])('Trial panel should be displayed if license is outdated', ({ token, version }) => {
     validateLicense(token, version);
     expect(trialPanelSpy).toHaveBeenCalledTimes(1);
   });

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

@@ -5,7 +5,6 @@ import { fullVersion } from '@js/core/version';
 import type { Version } from '../../utils/version';
 import {
   assertedVersionsCompatible,
-  getPreviousMajorVersion,
   parseVersion,
 } from '../../utils/version';
 import {
@@ -64,7 +63,7 @@ function getLicenseCheckParams({
   try {
     preview = isPreview(version.patch);
 
-    const { major, minor } = preview ? getPreviousMajorVersion(version) : version;
+    const { major, minor } = version;
 
     if (!licenseKey || licenseKey === LICENSE_KEY_PLACEHOLDER) {
       return { preview, error: 'W0019', warningType: 'no-key' };

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

@@ -70,31 +70,40 @@ export function logLicenseWarning(
 
   const warnings: string[][] = [[purchaseLine]];
 
+  const pushToLastGroup = (...items: string[]): void => {
+    const lastGroup = warnings[warnings.length - 1];
+    if (lastGroup.length === 1) {
+      lastGroup.push('', ...items);
+    } else {
+      lastGroup.push(...items);
+    }
+  };
+
   switch (warningType) {
     case 'no-key':
-      warnings[warnings.length - 1].push(T.keyNotFound);
+      pushToLastGroup(T.keyNotFound);
       warnings.push([installLine]);
       break;
 
     case 'invalid-key':
-      warnings[warnings.length - 1].push(T.keyVerificationFailed());
+      pushToLastGroup(T.keyVerificationFailed());
       warnings.push([installLine]);
       break;
 
     case 'lcx-used':
       // eslint-disable-next-line spellcheck/spell-checker
-      warnings[warnings.length - 1].push(T.keyVerificationFailed(), T.lcxUsedInsteadOfLcp);
+      pushToLastGroup(T.keyVerificationFailed(), T.lcxUsedInsteadOfLcp);
       warnings.push([installLine]);
       break;
 
     case 'old-devextreme-key':
-      warnings[warnings.length - 1].push(T.keyVerificationFailed(), T.oldDevExtremeKey);
+      pushToLastGroup(T.keyVerificationFailed(), T.oldDevExtremeKey);
       warnings.push([installLine]);
       break;
 
     case 'version-mismatch': {
       const incompatibleLine = `${T.warningPrefix('W0020')} ${T.keyVerificationFailed('incompatibleVersion', versionInfo?.keyVersion, versionInfo?.requiredVersion)}`;
-      warnings[warnings.length - 1].push(T.keyVerificationFailed());
+      pushToLastGroup(T.keyVerificationFailed());
       warnings.push([incompatibleLine]);
       break;
     }

packages/devextreme/license/devextreme-license.js

@@ -212,14 +212,20 @@ function main() {
             if(warning.type !== 'trial') {
                 const code = TEMPLATES.warningCodeByType(warning.type);
 
-                lines.push(
-                    TEMPLATES.keyVerificationFailed(warning.type, warning.keyVersion, warning.currentVersion),
-                );
-
-                if(warning.type === 'trialExpired') {
-                    lines.push(prefixed(`${TEMPLATES.warningPrefix(code)} ${TEMPLATES.purchaseLicense}`));
+                if(warning.type === 'incompatibleVersion') {
+                    lines.push(
+                        prefixed(`${TEMPLATES.warningPrefix(code)} ${TEMPLATES.keyVerificationFailed(warning.type, warning.keyVersion, warning.currentVersion)}`),
+                    );
                 } else {
-                    lines.push(prefixed(`${TEMPLATES.warningPrefix(code)} ${TEMPLATES.installationInstructions}`));
+                    lines.push(
+                        TEMPLATES.keyVerificationFailed(warning.type, warning.keyVersion, warning.currentVersion),
+                    );
+
+                    if(warning.type === 'trialExpired') {
+                        lines.push(prefixed(`${TEMPLATES.warningPrefix(code)} ${TEMPLATES.purchaseLicense}`));
+                    } else {
+                        lines.push(prefixed(`${TEMPLATES.warningPrefix(code)} ${TEMPLATES.installationInstructions}`));
+                    }
                 }
             }