rename etalons, fix tests, update menu sorting groups

DevExpress · Dec 4, 2024 · 8ac0980 · 8ac0980
1 parent 579eddf
commit 8ac0980
Show file tree

Hide file tree

Showing 6 changed files with 106 additions and 105 deletions.
diff --git a/apps/demos/menuMeta.json b/apps/demos/menuMeta.json
@@ -1088,12 +1088,12 @@
         ]
       },
       {
-        "Name": "Sorting",
+        "Name": "Filtering",
         "Equivalents": "",
         "Demos": [
           {
-            "Title": "Multiple Sorting",
-            "Name": "MultipleSorting",
+            "Title": "Search Panel",
+            "Name": "SearchPanel",
             "Widget": "TreeList",
             "MvcAdditionalFiles": [
               "/Controllers/ApiControllers/TreeListTasksController.cs",
@@ -1102,16 +1102,54 @@
               "/Models/SampleData/EmployeeTasks.cs"
             ],
             "DemoType": "Web"
+          },
+          {
+            "Title": "Filter Row",
+            "Name": "FilterRow",
+            "Widget": "TreeList",
+            "MvcAdditionalFiles": [
+              "/Models/TreeList/Employee.cs",
+              "/Models/SampleData/TreeListEmployees.cs"
+            ],
+            "DemoType": "Web"
+          },
+          {
+            "Title": "Column Header Filter",
+            "Name": "ColumnHeaderFilter",
+            "Widget": "TreeList",
+            "MvcAdditionalFiles": [
+              "/Models/TreeList/Employee.cs",
+              "/Models/SampleData/TreeListEmployees.cs"
+            ],
+            "DemoType": "Web"
+          },
+          {
+            "Title": "Filter Panel",
+            "Equivalents": "dxFilterBuilder, FilterBuilder, QueryBuilder, dxFilterPanel, FilterPanel",
+            "Name": "FilterPanel",
+            "Widget": "TreeList",
+            "DemoType": "Web",
+            "MvcAdditionalFiles": [
+              "/Models/SampleData/OrdersWithCustomerInfo.cs",
+              "/Models/OrderWithCustomerInfo.cs",
+              "/Models/CustomerInfo.cs"
+            ]
+          },
+          {
+            "Title": "Filter Modes",
+            "Name": "FilterModes",
+            "Widget": "TreeList",
+            "DemoType": "Web"
           }
         ]
       },
       {
-        "Name": "Paging",
+        "Name": "Sorting",
         "Equivalents": "",
         "Demos": [
           {
-            "Title": "Paging",
-            "Name": "Paging",
+            "Title": "Multiple Sorting",
+            "Name": "MultipleSorting",
             "Widget": "TreeList",
             "MvcAdditionalFiles": [
               "/Controllers/ApiControllers/TreeListTasksController.cs",
@@ -1189,36 +1227,6 @@
           }
         ]
       },
-      {
-        "Name": "Node Drag & Drop",
-        "Equivalents": "",
-        "Demos": [
-          {
-            "Title": "Node Drag & Drop",
-            "Name": "LocalReordering",
-            "Widget": "TreeList",
-            "Equivalents": "Node Drag and Drop",
-            "Modules": "devextreme-aspnet-data-nojquery",
-            "MvcAdditionalFiles": [
-              "/Scripts/data/employees.js"
-            ],
-            "DemoType": "Web"
-          }
-        ]
-      },
-      {
-        "Name": "Focused Row",
-        "Equivalents": "",
-        "Demos": [
-          {
-            "Title": "Focused Row",
-            "Name": "FocusedRow",
-            "Widget": "TreeList",
-            "DemoType": "Web",
-            "Modules": "devextreme-aspnet-data-nojquery"
-          }
-        ]
-      },
       {
         "Name": "Selection",
         "Equivalents": "",
@@ -1247,12 +1255,25 @@
         ]
       },
       {
-        "Name": "Filtering",
+        "Name": "Focused Row",
         "Equivalents": "",
         "Demos": [
           {
-            "Title": "Search Panel",
-            "Name": "SearchPanel",
+            "Title": "Focused Row",
+            "Name": "FocusedRow",
+            "Widget": "TreeList",
+            "DemoType": "Web",
+            "Modules": "devextreme-aspnet-data-nojquery"
+          }
+        ]
+      },
+      {
+        "Name": "Paging",
+        "Equivalents": "",
+        "Demos": [
+          {
+            "Title": "Paging",
+            "Name": "Paging",
             "Widget": "TreeList",
             "MvcAdditionalFiles": [
               "/Controllers/ApiControllers/TreeListTasksController.cs",
@@ -1261,44 +1282,23 @@
               "/Models/SampleData/EmployeeTasks.cs"
             ],
             "DemoType": "Web"
-          },
-          {
-            "Title": "Filter Row",
-            "Name": "FilterRow",
-            "Widget": "TreeList",
-            "MvcAdditionalFiles": [
-              "/Models/TreeList/Employee.cs",
-              "/Models/SampleData/TreeListEmployees.cs"
-            ],
-            "DemoType": "Web"
-          },
+          }
+        ]
+      },
+      {
+        "Name": "Drag & Drop",
+        "Equivalents": "",
+        "Demos": [
           {
-            "Title": "Column Header Filter",
-            "Name": "ColumnHeaderFilter",
+            "Title": "Node Drag & Drop",
+            "Name": "LocalReordering",
             "Widget": "TreeList",
+            "Equivalents": "Node Drag and Drop",
+            "Modules": "devextreme-aspnet-data-nojquery",
             "MvcAdditionalFiles": [
-              "/Models/TreeList/Employee.cs",
-              "/Models/SampleData/TreeListEmployees.cs"
+              "/Scripts/data/employees.js"
             ],
             "DemoType": "Web"
-          },
-          {
-            "Title": "Filter Panel",
-            "Equivalents": "dxFilterBuilder, FilterBuilder, QueryBuilder, dxFilterPanel, FilterPanel",
-            "Name": "FilterPanel",
-            "Widget": "TreeList",
-            "DemoType": "Web",
-            "MvcAdditionalFiles": [
-              "/Models/SampleData/OrdersWithCustomerInfo.cs",
-              "/Models/OrderWithCustomerInfo.cs",
-              "/Models/CustomerInfo.cs"
-            ]
-          },
-          {
-            "Title": "Filter Modes",
-            "Name": "FilterModes",
-            "Widget": "TreeList",
-            "DemoType": "Web"
           }
         ]
       },
@@ -3185,56 +3185,56 @@
         ]
       },
       {
-        "Name": "Virtual Scrolling",
+        "Name": "Grouping",
         "Equivalents": "",
         "Demos": [
           {
-            "Title": "Virtual Scrolling",
-            "Name": "VirtualScrolling",
+            "Title": "Grouping by Resources",
+            "Name": "GroupingByResources",
             "Widget": "Scheduler",
-            "MvcAdditionalFiles": [],
+            "MvcAdditionalFiles": [
+              "/Models/EmployeeTask.cs",
+              "/Models/SampleData/Tasks.cs"
+            ],
+            "DemoType": "Web"
+          },
+          {
+            "Title": "Grouping By Date",
+            "Name": "GroupByDate",
+            "Widget": "Scheduler",
+            "MvcAdditionalFiles": [
+              "/Models/EmployeeTask.cs",
+              "/Models/SampleData/GroupByDateTasks.cs"
+            ],
             "DemoType": "Web"
           }
         ]
       },
       {
-        "Name": "Appearance",
+        "Name": "Virtual Scrolling",
         "Equivalents": "",
         "Demos": [
           {
-            "Title": "Drag & Drop",
-            "Name": "CustomDragAndDrop",
+            "Title": "Virtual Scrolling",
+            "Name": "VirtualScrolling",
             "Widget": "Scheduler",
-            "Equivalents": "Custom Drag and Drop",
-            "MvcAdditionalFiles": [
-              "/Models/Appointment.cs",
-              "/Models/SampleData/Appointments.cs"
-            ],
+            "MvcAdditionalFiles": [],
             "DemoType": "Web"
           }
         ]
       },
       {
-        "Name": "Grouping",
+        "Name": "Drag & Drop",
         "Equivalents": "",
         "Demos": [
           {
-            "Title": "Grouping by Resources",
-            "Name": "GroupingByResources",
-            "Widget": "Scheduler",
-            "MvcAdditionalFiles": [
-              "/Models/EmployeeTask.cs",
-              "/Models/SampleData/Tasks.cs"
-            ],
-            "DemoType": "Web"
-          },
-          {
-            "Title": "Grouping By Date",
-            "Name": "GroupByDate",
+            "Title": "Drag & Drop",
+            "Name": "DragAndDrop",
             "Widget": "Scheduler",
+            "Equivalents": "Custom Drag and Drop",
             "MvcAdditionalFiles": [
-              "/Models/EmployeeTask.cs",
-              "/Models/SampleData/GroupByDateTasks.cs"
+              "/Models/Appointment.cs",
+              "/Models/SampleData/Appointments.cs"
             ],
             "DemoType": "Web"
           }

diff --git a/apps/demos/redirects.json b/apps/demos/redirects.json
@@ -100,6 +100,7 @@
     { "Widget": "Scheduler", "Name": "LimitAppointmentCountPerCell", "NewWidget": "Scheduler", "NewName": "AppointmentCountPerCell" },
     { "Widget": "Scheduler", "Name": "ContextMenuIntegration", "NewWidget": "Scheduler", "NewName": "ContextMenu" },
     { "Widget": "Scheduler", "Name": "GroupOrientation", "NewWidget": "Scheduler", "NewName": "GroupingByResources" },
+    { "Widget": "Scheduler", "Name": "CustomDragAndDrop", "NewWidget": "Scheduler", "NewName": "DragAndDrop" },
     { "Widget": "Drawer", "Name": "HorizontalOpening", "NewWidget": "Drawer", "NewName": "LeftOrRightPosition" },
     { "Widget": "Drawer", "Name": "VerticalOpening", "NewWidget": "Drawer", "NewName": "TopOrBottomPosition" },
     { "Widget": "NavBar", "Name": "Overview", "NewWidget": "Tabs", "NewName": "Overview" },

diff --git a/...CustomDragAndDrop (fluent.blue.light).png → ...duler-DragAndDrop (fluent.blue.light).png b/...CustomDragAndDrop (fluent.blue.light).png → ...duler-DragAndDrop (fluent.blue.light).png
diff --git a/...stomDragAndDrop (material.blue.light).png → ...ler-DragAndDrop (material.blue.light).png b/...stomDragAndDrop (material.blue.light).png → ...ler-DragAndDrop (material.blue.light).png
diff --git a/...g/etalons/Scheduler-CustomDragAndDrop.png → ...testing/etalons/Scheduler-DragAndDrop.png b/...g/etalons/Scheduler-CustomDragAndDrop.png → ...testing/etalons/Scheduler-DragAndDrop.png
diff --git a/apps/demos/utils/visual-tests/matrix-test-helper.js b/apps/demos/utils/visual-tests/matrix-test-helper.js
@@ -172,7 +172,7 @@ const SKIPPED_TESTS = {
   jQuery: {
     Charts: [
       { demo: 'ZoomingAndScrollingAPI', themes: [THEME.material] },
-      { demo: 'TooltipHTMLSupport', themes: [THEME.material] },
+      { demo: 'TooltipCustomization', themes: [THEME.material] },
     ],
     DataGrid: [
       { demo: 'CellEditing', themes: [THEME.material] },
@@ -203,11 +203,11 @@ const SKIPPED_TESTS = {
       { demo: 'Crosshair', themes: [THEME.generic, THEME.material, THEME.fluent] },
       { demo: 'CustomAnnotations', themes: [THEME.generic, THEME.material, THEME.fluent] },
       { demo: 'LoadDataOnDemand', themes: [THEME.generic, THEME.material, THEME.fluent] },
-      { demo: 'CustomLegendMarkers', themes: [THEME.generic, THEME.material, THEME.fluent] },
-      { demo: 'PieWithResolvedLabelOverlapping', themes: [THEME.generic, THEME.material] },
+      { demo: 'LegendMarkersCustomization', themes: [THEME.generic, THEME.material, THEME.fluent] },
+      { demo: 'PieResolveLabelOverlap', themes: [THEME.generic, THEME.material] },
       { demo: 'ZoomingAndScrollingAPI', themes: [THEME.generic, THEME.material, THEME.fluent] },
-      { demo: 'ZoomingOnAreaSelection', themes: [THEME.generic, THEME.material, THEME.fluent] },
-      { demo: 'TooltipHTMLSupport', themes: [THEME.material] },
+      { demo: 'AreaSelectionZooming', themes: [THEME.generic, THEME.material, THEME.fluent] },
+      { demo: 'TooltipCustomization', themes: [THEME.material] },
     ],
     VectorMap: [
       { demo: 'TooltipHTMLSupport', themes: [THEME.material] },
@@ -273,7 +273,7 @@ const SKIPPED_TESTS = {
     Charts: [
       { demo: 'Overview', themes: [THEME.material] },
       { demo: 'ZoomingAndScrollingAPI', themes: [THEME.material] },
-      { demo: 'ZoomingOnAreaSelection', themes: [THEME.material] },
+      { demo: 'AreaSelectionZooming', themes: [THEME.material] },
       { demo: 'DialogsAndNotificationsOverview', themes: [THEME.material] },
     ],
     VectorMap: [