Merge branch '26_1' into 26_1_global_format

Author: GoodDayForSurf

packages/devextreme-scss/scss/widgets/base/_menuBase.scss

@@ -21,19 +21,14 @@
     list-style-type: none;
     display: inline-block;
     white-space: nowrap;
-    cursor: pointer;
-  }
-
-  .dx-state-disabled,
-  &.dx-state-disabled .dx-menu-items-container {
-    cursor: default;
   }
 
   .dx-menu-item {
     display: inline-block;
     position: relative;
     height: 100%;
     width: 100%;
+    cursor: pointer;
 
     .dx-menu-item-content {
       white-space: nowrap;
@@ -80,6 +75,7 @@
 
     .dx-submenu {
       box-sizing: content-box;
+      cursor: default;
     }
   }
 
@@ -106,3 +102,10 @@
     }
   }
 }
+
+.dx-state-disabled {
+  &.dx-menu-item,
+  .dx-menu-item {
+    cursor: default;
+  }
+}

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

@@ -74,7 +74,7 @@ describe('LCP key validation', () => {
     expect(version).toBe(undefined);
   });
 
-  it('does not classify a valid DevExtreme product key as trial-expired when expiration metadata is in the past', () => {
+  it('does not classify a valid DevExtreme product key as expired when expiration metadata is in the past', () => {
     const { parseDevExpressProductKey, TokenKind } = loadParserWithBypassedSignatureCheck();
     const expiredAt = msToDotNetTicks(Date.UTC(2020, 0, 1));
 
@@ -83,17 +83,4 @@ describe('LCP key validation', () => {
 
     expect(token.kind).toBe(TokenKind.verified);
   });
-
-  it('returns trial-expired for expired trial keys without DevExtreme product access', () => {
-    const { parseDevExpressProductKey, TokenKind } = loadParserWithBypassedSignatureCheck();
-    const expiredAt = msToDotNetTicks(Date.UTC(2020, 0, 1));
-
-    const payload = `meta;251,0,0,${expiredAt};`;
-    const token = parseDevExpressProductKey(createLcpSource(payload));
-
-    expect(token.kind).toBe(TokenKind.corrupted);
-    if (token.kind === TokenKind.corrupted) {
-      expect(token.error).toBe('trial-expired');
-    }
-  });
 });

packages/devextreme/js/__internal/core/license/lcp_key_validation/lcp_key_validator.ts

@@ -6,15 +6,14 @@ import {
   PRODUCT_KIND_ERROR,
   type Token,
   TokenKind,
-  TRIAL_EXPIRED_ERROR,
   VERIFICATION_ERROR,
 } from '../types';
 import {
   LCP_SIGNATURE,
   RSA_PUBLIC_KEY_XML,
   SIGN_LENGTH,
 } from './const';
-import { findLatestDevExtremeVersion, getMaxExpiration } from './license_info';
+import { findLatestDevExtremeVersion } from './license_info';
 import { createProductInfo, type ProductInfo } from './product_info';
 import {
   dotNetTicksToMs,
@@ -96,13 +95,6 @@ export function parseDevExpressProductKey(productsLicenseSource: string): Token
 
     const maxVersionAllowed = findLatestDevExtremeVersion({ products });
 
-    if (!maxVersionAllowed) {
-      const maxExpiration = getMaxExpiration({ products });
-      if (maxExpiration !== Infinity && maxExpiration < Date.now()) {
-        return TRIAL_EXPIRED_ERROR;
-      }
-    }
-
     if (!maxVersionAllowed) {
       return PRODUCT_KIND_ERROR;
     }

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

@@ -83,9 +83,6 @@ function getLicenseCheckParams({
       if (license.error === 'product-kind') {
         return { preview, error: 'W0021', warningType: 'no-devextreme-license' };
       }
-      if (license.error === 'trial-expired') {
-        return { preview, error: 'W0020', warningType: 'trial-expired' };
-      }
       return { preview, error: 'W0021', warningType: 'invalid-key' };
     }
 

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

@@ -39,8 +39,6 @@ export const TEMPLATES = Object.freeze({
     switch (type) {
       case 'incompatibleVersion':
         return `Incompatible DevExpress license key version (v${keyVersion}). Download and register an updated DevExpress license key (v${requiredVersion}+). Clear npm/IDE/NuGet cache and rebuild your project (https://devexpress.com/DX1002).`;
-      case 'trialExpired':
-        return 'Your DevExpress trial period has expired. Purchase a license to continue using DevExpress product libraries.';
       default:
         return 'License key verification has failed.';
     }
@@ -108,12 +106,6 @@ export function logLicenseWarning(
       break;
     }
 
-    case 'trial-expired': {
-      const expiredLine = `${T.warningPrefix('W0020')} ${T.keyVerificationFailed('trialExpired')}`;
-      warnings.push([expiredLine]);
-      break;
-    }
-
     case 'no-devextreme-license':
       // Only the purchase line, no additional details
       break;

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

@@ -11,7 +11,7 @@ export enum TokenKind {
 
 export interface ErrorToken {
   readonly kind: TokenKind.corrupted;
-  readonly error: 'general' | 'verification' | 'decoding' | 'deserialization' | 'payload' | 'version' | 'product-kind' | 'trial-expired';
+  readonly error: 'general' | 'verification' | 'decoding' | 'deserialization' | 'payload' | 'version' | 'product-kind';
 }
 
 export interface VerifiedToken {
@@ -30,15 +30,13 @@ export const DESERIALIZATION_ERROR: ErrorToken = { kind: TokenKind.corrupted, er
 export const PAYLOAD_ERROR: ErrorToken = { kind: TokenKind.corrupted, error: 'payload' };
 export const VERSION_ERROR: ErrorToken = { kind: TokenKind.corrupted, error: 'version' };
 export const PRODUCT_KIND_ERROR: ErrorToken = { kind: TokenKind.corrupted, error: 'product-kind' };
-export const TRIAL_EXPIRED_ERROR: ErrorToken = { kind: TokenKind.corrupted, error: 'trial-expired' };
 
 export type LicenseWarningType = 'no-key'
   | 'invalid-key'
   | 'lcx-used'
   | 'old-devextreme-key'
   | 'version-mismatch'
-  | 'no-devextreme-license'
-  | 'trial-expired';
+  | 'no-devextreme-license';
 
 export interface LicenseCheckParams {
   preview: boolean;

packages/devextreme/license/devextreme-license.js

@@ -220,12 +220,7 @@ function main() {
                     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}`));
-                    }
+                    lines.push(prefixed(`${TEMPLATES.warningPrefix(code)} ${TEMPLATES.installationInstructions}`));
                 }
             }
 

packages/devextreme/license/dx-lcx-2-lcp.js

@@ -141,7 +141,6 @@ const TokenKind = Object.freeze({
 const GENERAL_ERROR = { kind: TokenKind.corrupted, error: 'general' };
 const DESERIALIZATION_ERROR = { kind: TokenKind.corrupted, error: 'deserialization' };
 const PRODUCT_KIND_ERROR = { kind: TokenKind.corrupted, error: 'product-kind' };
-const TRIAL_EXPIRED_ERROR = { kind: TokenKind.corrupted, error: 'trial-expired' };
 
 function readDevExtremeVersion() {
     try {
@@ -219,12 +218,6 @@ function parseLCP(lcpString) {
         }
 
         const maxVersionAllowed = findLatestDevExtremeVersion(products);
-        if(!maxVersionAllowed) {
-            const maxExpiration = getMaxExpiration(products);
-            if(maxExpiration !== Infinity && maxExpiration < Date.now()) {
-                return { ...TRIAL_EXPIRED_ERROR, licenseId };
-            }
-        }
 
         if(!maxVersionAllowed) { 
             return { ...PRODUCT_KIND_ERROR, licenseId }; 
@@ -261,9 +254,6 @@ function getLCPInfo(lcpString) {
             case 'product-kind':
                 warning = { type: 'trial' };
                 break;
-            case 'trial-expired':
-                warning = { type: 'trialExpired' };
-                break;
         }
     } else {
         licenseId = token.payload.licenseId || null;

packages/devextreme/license/messages.js

@@ -34,7 +34,6 @@ const KEY_SOURCES = Object.freeze({
 const WARNING_CODES = Object.freeze({
     general: 1001,
     incompatibleVersion: 1002,
-    trialExpired: 1003,
 });
 
 const TEMPLATES = Object.freeze({
@@ -56,12 +55,6 @@ const TEMPLATES = Object.freeze({
                 'Clear npm/IDE/NuGet cache and rebuild your project (https://devexpress.com/DX1002).',
             ].join(' ');
         }
-        if(type === 'trialExpired') {
-            return [
-                'Your DevExpress trial period has expired.',
-                'Purchase a license to continue using DevExpress product libraries.',
-            ].join(' ');
-        }
         return 'License key verification has failed.';
     },
 

packages/devextreme/testing/tests/DevExpress.ui.widgets/menuBase.markup.tests.js

@@ -1,6 +1,8 @@
 import $ from 'jquery';
 import MenuBase from 'ui/context_menu/ui.menu_base';
 
+import 'fluent_blue_light.css!';
+
 QUnit.testStart(function() {
     const markup =
         '<div id="menu"></div>';
@@ -9,13 +11,13 @@ QUnit.testStart(function() {
 });
 
 const DX_MENU_BASE_CLASS = 'dx-menu-base';
-
+const DX_MENU_ITEM_CLASS = 'dx-menu-item';
 
 function createMenu(options) {
     const element = $('#menu');
     const instance = new MenuBase(element, options);
 
-    return { instance: instance, element: element };
+    return { instance, element };
 }
 
 QUnit.module('Menu markup', () => {
@@ -24,5 +26,81 @@ QUnit.module('Menu markup', () => {
 
         assert.ok(menuBase.element.hasClass(DX_MENU_BASE_CLASS));
     });
-});
 
+    QUnit.module('Disabled item cursor style (T1327513)', () => {
+        QUnit.test('enabled menu item should have pointer cursor', function(assert) {
+            const menuBase = createMenu({
+                items: [
+                    { text: 'Item 1' },
+                    { text: 'Item 2', disabled: true },
+                ],
+            });
+
+            const $enabledItem = menuBase.element.find(`.${DX_MENU_ITEM_CLASS}`).eq(0);
+            const cursor = $enabledItem.css('cursor');
+
+            assert.strictEqual(cursor, 'pointer', 'enabled item has pointer cursor');
+        });
+
+        QUnit.test('disabled menu item should have default cursor', function(assert) {
+            const menuBase = createMenu({
+                items: [
+                    { text: 'Item 1' },
+                    { text: 'Item 2', disabled: true },
+                ],
+            });
+
+            const $disabledItem = menuBase.element.find(`.${DX_MENU_ITEM_CLASS}`).eq(1);
+            const cursor = $disabledItem.css('cursor');
+
+            assert.strictEqual(cursor, 'default', 'disabled item has default cursor');
+        });
+
+        QUnit.test('item should have default cursor when disabled at runtime', function(assert) {
+            const menuBase = createMenu({
+                items: [
+                    { text: 'Item 1', disabled: false },
+                    { text: 'Item 2', disabled: false },
+                ],
+            });
+
+            menuBase.instance.option('items[1].disabled', true);
+
+            const $disabledItem = menuBase.element.find(`.${DX_MENU_ITEM_CLASS}`).eq(1);
+            const cursor = $disabledItem.css('cursor');
+
+            assert.strictEqual(cursor, 'default', 'item has default cursor after disabling at runtime');
+        });
+
+        QUnit.test('items in disabled menu should have default cursor', function(assert) {
+            const menuBase = createMenu({
+                disabled: true,
+                items: [
+                    { text: 'Item 1' },
+                    { text: 'Item 2' },
+                ],
+            });
+            const $item = menuBase.element.find(`.${DX_MENU_ITEM_CLASS}`).eq(0);
+            const cursor = $item.css('cursor');
+            assert.strictEqual(cursor, 'default', 'items in disabled menu have default cursor');
+        });
+
+        QUnit.test('menu items with url should have correct cursor', function(assert) {
+            const menuBase = createMenu({
+                items: [
+                    { text: 'Item 1', url: 'https://example.com' },
+                    { text: 'Item 2', url: 'https://example.com/disabled', disabled: true },
+                ],
+            });
+
+            const $enabledItem = menuBase.element.find(`.${DX_MENU_ITEM_CLASS}`).eq(0);
+            const enabledItemCursor = $enabledItem.css('cursor');
+
+            const $disabledItem = menuBase.element.find(`.${DX_MENU_ITEM_CLASS}`).eq(1);
+            const disabledItemCursor = $disabledItem.css('cursor');
+
+            assert.strictEqual(enabledItemCursor, 'pointer', 'enabled item with url has pointer cursor');
+            assert.strictEqual(disabledItemCursor, 'default', 'disabled item with url has default cursor');
+        });
+    });
+});