Skip to content

Commit 28a5dd5

Browse files
authored
Merge branch '25_2' into 25_2_2979-fix-ts-problems-and-make-ts-improvements-in-demos-navigation
2 parents a6363a2 + 224b6fb commit 28a5dd5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+2626
-997
lines changed

apps/demos/utils/visual-tests/matrix-test-helper.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,12 @@ export function shouldRunTestAtIndex(testIndex) {
209209

210210
const SKIPPED_TESTS = {
211211
jQuery: {
212-
DataGrid: ['RemoteGrouping'],
212+
DataGrid: ['RemoteGrouping', 'EditStateManagement'],
213213
},
214214
Angular: {
215215
Charts: ['Crosshair'],
216216
Common: ['PopupAndNotificationsOverview'],
217-
DataGrid: ['EditStateManagement', 'Toolbar', 'RemoteGrouping'],
217+
DataGrid: ['EditStateManagement', 'Toolbar', 'RemoteGrouping', 'EditStateManagement'],
218218
Scheduler: ['ContextMenu'],
219219
FileUploader: ['CustomDropzone'],
220220
},
@@ -223,14 +223,14 @@ const SKIPPED_TESTS = {
223223
Common: ['PopupAndNotificationsOverview'],
224224
// NOTE: Context menu item position is different across themes
225225
Scheduler: ['ContextMenu'],
226-
DataGrid: ['EditStateManagement', 'Toolbar', 'RemoteGrouping'],
226+
DataGrid: ['EditStateManagement', 'Toolbar', 'RemoteGrouping', 'EditStateManagement'],
227227
FileUploader: ['CustomDropzone']
228228
},
229229
React: {
230230
Charts: ['Crosshair'],
231231
Common: ['PopupAndNotificationsOverview'],
232232
Scheduler: ['ContextMenu'],
233-
DataGrid: ['EditStateManagement', 'Toolbar', 'RemoteGrouping'],
233+
DataGrid: ['EditStateManagement', 'Toolbar', 'RemoteGrouping', 'EditStateManagement'],
234234
FileUploader: ['CustomDropzone']
235235
},
236236
};

packages/devextreme-angular/build.config.js

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)