Merge branch '25_2' into v2_2682_25_2

Author: sjbur

.github/instructions/localization.instructions.md

@@ -0,0 +1,39 @@
+---
+applyTo: "**/localization/messages/**/*.json"
+---
+
+# CRITICAL: DO NOT REVIEW LOCALIZATION FILES
+
+These files are managed by a dedicated localization team through a separate workflow.
+
+## Absolute Prohibitions - You MUST NOT:
+
+- ❌ NEVER suggest translating English text to other languages
+- ❌ NEVER comment that text should be translated to match the locale
+- ❌ NEVER suggest alternative translations or phrasings in any language
+- ❌ NEVER comment on language consistency (e.g., "this should be in Arabic")
+- ❌ NEVER suggest changing text content for localization purposes
+- ❌ NEVER comment on which language should be used
+- ❌ NEVER suggest adding or removing message keys
+- ❌ NEVER provide language-specific style recommendations
+
+## Why These Files Are Off-Limits:
+
+Translation suggestions make PR pages UNRESPONSIVE and overwhelm human reviewers. The localization team handles all translation work through a separate quality assurance process.
+
+## The ONLY Acceptable Comments:
+
+✅ Critical JSON syntax errors that would break the build (missing commas, unclosed brackets)
+✅ Severe grammar errors (ONLY if they would cause user confusion)
+
+## Examples of FORBIDDEN Comments:
+
+- ❌ "This English text should be translated to Arabic"
+- ❌ "Translation is missing for this locale"
+- ❌ "Consider translating '(No subject)' to '(بدون موضوع)'"
+- ❌ "This text is in English but should be in German"
+- ❌ "Inconsistent language - use native translation"
+
+If you have ANY doubt about whether to comment on a localization file, DO NOT COMMENT.
+
+Focus your review on actual code files instead.

.github/workflows/testcafe_tests.yml

@@ -102,10 +102,8 @@ jobs:
           { componentFolder: "dataGrid/common", name: "dataGrid / common (3/5)", indices: "3/5" },
           { componentFolder: "dataGrid/common", name: "dataGrid / common (4/5)", indices: "4/5" },
           { componentFolder: "dataGrid/common", name: "dataGrid / common (5/5)", indices: "5/5" },
-          { componentFolder: "dataGrid/sticky/common", name: "dataGrid / sticky common" },
-          { componentFolder: "dataGrid/sticky/fixed", name: "dataGrid / sticky (1/3)", indices: "1/3" },
-          { componentFolder: "dataGrid/sticky/fixed", name: "dataGrid / sticky (2/3)", indices: "2/3" },
-          { componentFolder: "dataGrid/sticky/fixed", name: "dataGrid / sticky (3/3)", indices: "3/3" },
+          { componentFolder: "dataGrid/sticky", name: "dataGrid / sticky (1/2)", indices: "1/2" },
+          { componentFolder: "dataGrid/sticky", name: "dataGrid / sticky (2/2)", indices: "2/2" },
           { componentFolder: "cardView", name: "cardView" },
 
           # Scheduler tests need to be reworked to work in fluent theme
@@ -120,8 +118,7 @@ jobs:
           { componentFolder: "scheduler/timezones", name: "scheduler / timezones (Europe/Berlin)", timezone: "Europe/Berlin", theme: 'generic.light' },
           { componentFolder: "scheduler/timezones", name: "scheduler / timezones (America/Los_Angeles)", timezone: "America/Los_Angeles", theme: 'generic.light' },
 
-          { componentFolder: "editors", name: "editors (1/2)", indices: "1/2" },
-          { componentFolder: "editors", name: "editors (2/2)", indices: "2/2" },
+          { componentFolder: "editors", name: "editors" },
           { componentFolder: "navigation", name: "navigation" },
         ]
     runs-on: devextreme-shr2

apps/demos/Demos/FilterBuilder/WithDataGrid/Angular/app/app.component.html

@@ -8,7 +8,7 @@
   [dataSource]="dataSource"
   [filterValue]="gridFilterValue"
   [showBorders]="true"
-  [columns]="fields"
+  [columns]="columns"
   [height]="300"
 >
 </dx-data-grid>

apps/demos/Demos/FilterBuilder/WithDataGrid/Angular/app/app.component.ts

@@ -8,7 +8,7 @@ import {
 } from 'devextreme-angular';
 
 import { Service } from './app.service';
-import type { Fields, Condition, Product } from './app.service';
+import type { Fields, Columns, Condition, Product } from './app.service';
 
 if (!/localhost/.test(document.location.host)) {
   enableProdMode();
@@ -32,12 +32,15 @@ export class AppComponent {
 
   fields: Fields;
 
+  columns: Columns;
+
   filter: Condition;
 
   gridFilterValue: Condition;
 
   constructor(service: Service) {
     this.fields = service.getFields();
+    this.columns = service.getColumns();
     this.filter = service.getFilter();
     this.gridFilterValue = this.filter;
     this.dataSource = service.getProducts();

apps/demos/Demos/FilterBuilder/WithDataGrid/Angular/app/app.service.ts

@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 
 export type Condition = Condition[] | string | number;
 export type Fields = typeof fields;
+export type Columns = typeof columns;
 
 export interface Product {
   Product_ID: number;
@@ -21,12 +22,43 @@ const filter: Condition = [
     ['Product_Cost', '<', 200],
   ],
 ];
-const fields: Record<string, string | number>[] = [
+
+const fields: Record<string, string>[] = [
+  {
+    caption: 'ID',
+    dataField: 'Product_ID',
+    dataType: 'number',
+  }, {
+    dataField: 'Product_Name',
+    dataType: 'string',
+  }, {
+    caption: 'Cost',
+    dataField: 'Product_Cost',
+    dataType: 'number',
+    format: 'currency',
+  }, {
+    dataField: 'Product_Sale_Price',
+    caption: 'Sale Price',
+    dataType: 'number',
+    format: 'currency',
+  }, {
+    dataField: 'Product_Retail_Price',
+    caption: 'Retail Price',
+    dataType: 'number',
+    format: 'currency',
+  }, {
+    dataField: 'Product_Current_Inventory',
+    dataType: 'number',
+    caption: 'Inventory',
+  },
+];
+
+const columns: Record<string, string | number>[] = [
   {
     caption: 'ID',
-    width: 50,
     dataField: 'Product_ID',
     dataType: 'number',
+    width: 50,
   }, {
     dataField: 'Product_Name',
     dataType: 'string',
@@ -209,6 +241,10 @@ const products: Product[] = [
 
 @Injectable()
 export class Service {
+  getColumns(): Columns {
+    return columns;
+  }
+
   getFields(): Fields {
     return fields;
   }

apps/demos/Demos/FilterBuilder/WithDataGrid/React/App.tsx

@@ -2,7 +2,7 @@ import React, { useCallback, useState } from 'react';
 import FilterBuilder, { type FilterBuilderTypes } from 'devextreme-react/filter-builder';
 import Button from 'devextreme-react/button';
 import DataGrid from 'devextreme-react/data-grid';
-import { filter, fields, products } from './data.ts';
+import { filter, fields, columns, products } from './data.ts';
 
 const App = () => {
   const [value, setValue] = useState(filter);
@@ -27,7 +27,7 @@ const App = () => {
         dataSource={products}
         filterValue={gridFilterValue}
         showBorders={true}
-        columns={fields}
+        columns={columns}
         height={300}
       />
     </div>

apps/demos/Demos/FilterBuilder/WithDataGrid/React/data.ts

@@ -1,5 +1,25 @@
 import { DataType } from 'devextreme/common';
 
+interface Product {
+  Product_ID: number;
+  Product_Name: string;
+  Product_Cost: string;
+  Product_Sale_Price: string;
+  Product_Retail_Price: string;
+  Product_Current_Inventory: number;
+}
+
+interface Field {
+  caption?: string,
+  dataField: string,
+  dataType: DataType,
+  format?: string,
+}
+
+interface Column extends Field {
+  width?: number,
+}
+
 export const filter = [
   ['Product_Current_Inventory', '<>', 0],
   'or',
@@ -10,16 +30,9 @@ export const filter = [
   ],
 ];
 
-export const fields: {
-  caption?: string,
-  width?: number,
-  dataField: string,
-  dataType: DataType,
-  format?: string,
-}[] = [
+export const fields: Field[] = [
   {
     caption: 'ID',
-    width: 50,
     dataField: 'Product_ID',
     dataType: 'number',
   }, {
@@ -47,14 +60,36 @@ export const fields: {
   },
 ];
 
-interface Product {
-  Product_ID: number;
-  Product_Name: string;
-  Product_Cost: string;
-  Product_Sale_Price: string;
-  Product_Retail_Price: string;
-  Product_Current_Inventory: number;
-}
+export const columns: Column[] = [
+  {
+    caption: 'ID',
+    dataField: 'Product_ID',
+    dataType: 'number',
+    width: 50,
+  }, {
+    dataField: 'Product_Name',
+    dataType: 'string',
+  }, {
+    caption: 'Cost',
+    dataField: 'Product_Cost',
+    dataType: 'number',
+    format: 'currency',
+  }, {
+    dataField: 'Product_Sale_Price',
+    caption: 'Sale Price',
+    dataType: 'number',
+    format: 'currency',
+  }, {
+    dataField: 'Product_Retail_Price',
+    caption: 'Retail Price',
+    dataType: 'number',
+    format: 'currency',
+  }, {
+    dataField: 'Product_Current_Inventory',
+    dataType: 'number',
+    caption: 'Inventory',
+  },
+];
 
 export const products: Product[] = [
   {

apps/demos/Demos/FilterBuilder/WithDataGrid/ReactJs/App.js

@@ -2,7 +2,9 @@ import React, { useCallback, useState } from 'react';
 import FilterBuilder from 'devextreme-react/filter-builder';
 import Button from 'devextreme-react/button';
 import DataGrid from 'devextreme-react/data-grid';
-import { filter, fields, products } from './data.js';
+import {
+  filter, fields, columns, products,
+} from './data.js';
 
 const App = () => {
   const [value, setValue] = useState(filter);
@@ -35,7 +37,7 @@ const App = () => {
         dataSource={products}
         filterValue={gridFilterValue}
         showBorders={true}
-        columns={fields}
+        columns={columns}
         height={300}
       />
     </div>

apps/demos/Demos/FilterBuilder/WithDataGrid/ReactJs/data.js

@@ -6,7 +6,6 @@ export const filter = [
 export const fields = [
   {
     caption: 'ID',
-    width: 50,
     dataField: 'Product_ID',
     dataType: 'number',
   },
@@ -38,6 +37,41 @@ export const fields = [
     caption: 'Inventory',
   },
 ];
+export const columns = [
+  {
+    caption: 'ID',
+    dataField: 'Product_ID',
+    dataType: 'number',
+    width: 50,
+  },
+  {
+    dataField: 'Product_Name',
+    dataType: 'string',
+  },
+  {
+    caption: 'Cost',
+    dataField: 'Product_Cost',
+    dataType: 'number',
+    format: 'currency',
+  },
+  {
+    dataField: 'Product_Sale_Price',
+    caption: 'Sale Price',
+    dataType: 'number',
+    format: 'currency',
+  },
+  {
+    dataField: 'Product_Retail_Price',
+    caption: 'Retail Price',
+    dataType: 'number',
+    format: 'currency',
+  },
+  {
+    dataField: 'Product_Current_Inventory',
+    dataType: 'number',
+    caption: 'Inventory',
+  },
+];
 export const products = [
   {
     Product_ID: 1,

apps/demos/Demos/FilterBuilder/WithDataGrid/Vue/App.vue

@@ -16,7 +16,7 @@
       :data-source="products"
       :filter-value="gridFilterValue"
       :show-borders="true"
-      :columns="fields"
+      :columns="columns"
       :height="300"
     />
   </div>
@@ -26,7 +26,7 @@ import { ref } from 'vue';
 import DxFilterBuilder from 'devextreme-vue/filter-builder';
 import DxButton from 'devextreme-vue/button';
 import DxDataGrid from 'devextreme-vue/data-grid';
-import { filter, fields, products } from './data.ts';
+import { filter, fields, columns, products } from './data.ts';
 
 const filterValue = ref(filter);
 const gridFilterValue = ref(filter);