Skip to content

Commit 0dba017

Browse files
Merge branch '26_1' into 26_1_wip_check_ci
2 parents bd3baeb + 637b10a commit 0dba017

222 files changed

Lines changed: 10316 additions & 5932 deletions

File tree

Some content is hidden

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

.github/copilot-instructions.md

Lines changed: 67 additions & 464 deletions
Large diffs are not rendered by default.

apps/demos/Demos/DataGrid/AIAssistant/description.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
The AI Assistant for the DevExtreme [DataGrid](/Documentation/Guide/UI_Components/DataGrid/Overview/) allows you to interact with the component using natural language. The Chat also supports [speech-to-text input](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#speechToTextEnabled), ideal for hands-free interactions or entering longer prompts.
1+
The AI Assistant for the DevExtreme [DataGrid](/Documentation/Guide/UI_Components/DataGrid/Overview/) allows you to interact with the component using natural language. Our Chat implementation supports [speech-to-text input](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#speechToTextEnabled), ideal for hands-free interaction or entering longer prompts.
22

3-
You can use/configure the following DataGrid features in the AI Assistant Chat prompts:
3+
You can use/configure the following DataGrid features via AI Assistant Chat prompts:
44

55
- [Filtering and Searching](/Documentation/Guide/UI_Components/DataGrid/Filtering_and_Searching/)
66
- [Sorting](/Documentation/Guide/UI_Components/DataGrid/Sorting/)
@@ -11,7 +11,7 @@ You can use/configure the following DataGrid features in the AI Assistant Chat p
1111
- [Summaries](/Documentation/Guide/UI_Components/DataGrid/Summaries/Predefined_Aggregate_Functions/)
1212
- [Column Fixing](/Documentation/Guide/UI_Components/DataGrid/Columns/Column_Fixing/), [Resizing](/Documentation/Guide/UI_Components/DataGrid/Columns/Column_Sizing/), and [Reordering](/Documentation/Guide/UI_Components/DataGrid/Columns/Column_Reordering/)
1313

14-
The AI Assistant feature is also available for the DevExtreme [TreeList](/Documentation/ApiReference/UI_Components/dxTreeList/Configuration/#aiAssistant) component.
14+
This AI Assistant feature is also available in the DevExtreme [TreeList](/Documentation/ApiReference/UI_Components/dxTreeList/Configuration/#aiAssistant) component.
1515
<!--split-->
1616

1717
In this demo, the AI Assistant is enabled for a DataGrid that displays mock sales data with over 1500 records.
@@ -24,6 +24,6 @@ When connected to your own AI model/service without rate and data limits, the AI
2424

2525
[/note]
2626

27-
To enable the AI Assistant, configure the [aiIntegration](/Documentation/ApiReference/UI_Components/dxDataGrid/Configuration/#aiIntegration) or **aiAssistant**.[aiIntegration](/Documentation/ApiReference/UI_Components/dxDataGrid/Configuration/aiAssistant/#aiIntegration) object and set the **aiAssistant**.[enabled](/Documentation/ApiReference/UI_Components/dxDataGrid/Configuration/aiAssistant/#enabled) property to `true`. Once activated, the DataGrid adds a predefined item (*"aiAssistantButton"*) to the toolbar. This button opens the AI Assistant Chat in a draggable pop-up window.
27+
To enable the AI Assistant, configure the [aiIntegration](/Documentation/ApiReference/UI_Components/dxDataGrid/Configuration/#aiIntegration) or **aiAssistant**.[aiIntegration](/Documentation/ApiReference/UI_Components/dxDataGrid/Configuration/aiAssistant/#aiIntegration) object and set the **aiAssistant**.[enabled](/Documentation/ApiReference/UI_Components/dxDataGrid/Configuration/aiAssistant/#enabled) property to `true`. Once activated, the DataGrid adds a predefined item (*"aiAssistantButton"*) to the toolbar. This button opens our AI Assistant Chat in a draggable pop-up window.
2828

2929
This demo also configures [suggestions](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#suggestions) for the AI Assistant Chat. These buttons allow you to interact with the assistant in one click using predefined prompts. For additional information about suggestions, refer to the following demo: [DevExtreme Chat - Prompt Suggestions](/Demos/WidgetsGallery/Demo/Chat/PromptSuggestions/).

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,8 @@
99
<script src="../../../../node_modules/jquery/dist/jquery.min.js"></script>
1010
<script src="../../../../node_modules/devextreme-dist/js/dx.all.js"></script>
1111
<script src="../../../../node_modules/devextreme-dist/js/dx.ai-integration.js"></script>
12-
<script type="module">
13-
import { AzureOpenAI } from "https://esm.sh/openai@4.73.1";
14-
15-
window.AzureOpenAI = AzureOpenAI;
16-
</script>
1712
<script src="data.js"></script>
18-
<script src="index.js"></script>
13+
<script type="module" src="index.js"></script>
1914
</head>
2015
<body class="dx-viewport">
2116
<div class="demo-container">

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
// eslint-disable-next-line import/no-unresolved
2+
import { AzureOpenAI } from 'https://esm.sh/openai@4.73.1';
3+
4+
window.AzureOpenAI = AzureOpenAI;
5+
16
$(() => {
27
const deployment = 'gpt-4o-mini';
38
const apiVersion = '2024-02-01';

apps/demos/Demos/DataGrid/AIColumns/jQuery/index.html

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,8 @@
99
<script src="../../../../node_modules/jquery/dist/jquery.min.js"></script>
1010
<script src="../../../../node_modules/devextreme-dist/js/dx.all.js"></script>
1111
<script src="../../../../node_modules/devextreme-dist/js/dx.ai-integration.js"></script>
12-
<script type="module">
13-
import { AzureOpenAI } from "https://esm.sh/openai@4.73.1";
14-
15-
window.AzureOpenAI = AzureOpenAI;
16-
</script>
1712
<script src="data.js"></script>
18-
<script src="index.js"></script>
13+
<script type="module" src="index.js"></script>
1914
<link rel="stylesheet" type="text/css" href="styles.css" />
2015
</head>
2116
<body class="dx-viewport">

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
// eslint-disable-next-line import/no-unresolved
2+
import { AzureOpenAI } from 'https://esm.sh/openai@4.73.1';
3+
4+
window.AzureOpenAI = AzureOpenAI;
5+
16
$(() => {
27
const deployment = 'gpt-4o-mini';
38
const apiVersion = '2024-02-01';

apps/demos/Demos/TreeList/AIColumns/jQuery/index.html

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,8 @@
99
<script src="../../../../node_modules/jquery/dist/jquery.min.js"></script>
1010
<script src="../../../../node_modules/devextreme-dist/js/dx.all.js"></script>
1111
<script src="../../../../node_modules/devextreme-dist/js/dx.ai-integration.js"></script>
12-
<script type="module">
13-
import { AzureOpenAI } from "https://esm.sh/openai@4.73.1";
14-
15-
window.AzureOpenAI = AzureOpenAI;
16-
</script>
1712
<script src="data.js"></script>
18-
<script src="index.js"></script>
13+
<script type="module" src="index.js"></script>
1914
<link rel="stylesheet" type="text/css" href="styles.css" />
2015
</head>
2116
<body class="dx-viewport">

apps/demos/Demos/TreeList/AIColumns/jQuery/index.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
// eslint-disable-next-line import/no-unresolved
2+
import { AzureOpenAI } from 'https://esm.sh/openai@4.73.1';
3+
4+
window.AzureOpenAI = AzureOpenAI;
5+
16
$(() => {
27
const deployment = 'gpt-4o-mini';
38
const apiVersion = '2024-02-01';

apps/demos/utils/server/csp-server.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ const CSP_DEMO_ALLOWLIST = {
6868
'DataGrid/Cell': {
6969
'img-src': ['data:'],
7070
},
71-
// AI demo: inline <script type="module"> to import OpenAI SDK from esm.sh
7271
'DataGrid/AIColumns': {
73-
'script-src': ["'unsafe-inline'"],
7472
'connect-src': ['https://public-api.devexpress.com'],
7573
},
7674
'DataGrid/ExcelJSExportImages': {
@@ -145,10 +143,8 @@ const CSP_DEMO_ALLOWLIST = {
145143
'TagBox/Grouping': {
146144
'font-src': ['https://maxcdn.bootstrapcdn.com'],
147145
},
148-
// AI demos use inline <script type="module"> to import OpenAI SDK from esm.sh
149146
'TreeList/AIColumns': {
150147
'connect-src': ['https://public-api.devexpress.com'],
151-
'script-src': ["'unsafe-inline'"],
152148
},
153149
'TreeList/BatchEditing': {
154150
'img-src': ['data:'],

apps/react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"tsconfig-paths-webpack-plugin": "4.1.0",
2525
"webpack": "5.105.4",
2626
"webpack-cli": "5.1.4",
27-
"webpack-dev-server": "5.2.3"
27+
"webpack-dev-server": "5.2.4"
2828
},
2929
"scripts": {
3030
"test": "node runner.js",

0 commit comments

Comments
 (0)