Skip to content

Commit 80a6447

Browse files
Merge branch '26_1' into fix-lint
2 parents bc91937 + 609e118 commit 80a6447

47 files changed

Lines changed: 2548 additions & 570 deletions

Some content is hidden

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

apps/demos/Demos/DataGrid/AIAssistant/jQuery/index.js

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $(() => {
2424
type: 'json_schema',
2525
json_schema: {
2626
name: 'grid_assistant_response',
27-
strict: true,
27+
strict: false,
2828
schema: responseSchema,
2929
},
3030
};
@@ -120,6 +120,9 @@ $(() => {
120120
onInitialized(e) {
121121
chatInstance = e.component;
122122
},
123+
user: {
124+
id: 'user',
125+
},
123126
suggestions: {
124127
items: [
125128
{
@@ -151,19 +154,19 @@ $(() => {
151154
],
152155
onItemClick(e) {
153156
const { prompt, text } = e.itemData;
154-
155-
if (text === '💡 Help') {
156-
const message = {
157-
id: Date.now(),
158-
timestamp: new Date(),
159-
author: { id: 'user' },
160-
text: prompt,
161-
};
162-
163-
chatInstance.getDataSource().store().push([{ type: 'insert', data: message }]);
164-
} else {
165-
chatInstance.option('inputFieldText', prompt);
166-
}
157+
const userId = text === '💡 Help' ? 'help' : 'user';
158+
159+
const message = {
160+
id: Date.now(),
161+
timestamp: new Date(),
162+
author: { id: userId },
163+
text: prompt,
164+
};
165+
166+
chatInstance.getDataSource().store().push([{
167+
type: 'insert',
168+
data: message,
169+
}]);
167170
},
168171
},
169172
},

packages/devextreme/eslint-scheduler-allowlist.mjs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -66,23 +66,6 @@ const schedulerR1Overrides = [
6666
];
6767

6868
const schedulerLegacyMembers = [
69-
// workspaces/m_work_space.ts
70-
'_$allDayPanel',
71-
'_$dateTable',
72-
'_$dateTableScrollableContent',
73-
'_$flexContainer',
74-
'_$groupTable',
75-
'_$headerPanel',
76-
'_$headerPanelContainer',
77-
'_$thead',
78-
'_dateTableScrollable',
79-
'_getCellCount',
80-
'_getGroupCount',
81-
'_groupedStrategy',
82-
'_isHorizontalGroupedWorkSpace',
83-
'_shader',
84-
'_sidebarScrollable',
85-
8669
// m_scheduler.ts
8770
'_appointments',
8871
'_compactAppointmentsHelper',

0 commit comments

Comments
 (0)