Skip to content

Commit 4f39226

Browse files
Revert "Demos: DataGrid/TreeList aicolumn - handle inline module" (#33674)
reverted cuz demos are broken in WG shell
1 parent 4e8dd4e commit 4f39226

7 files changed

Lines changed: 22 additions & 18 deletions

File tree

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@
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>
1217
<script src="data.js"></script>
13-
<script type="module" src="index.js"></script>
18+
<script src="index.js"></script>
1419
</head>
1520
<body class="dx-viewport">
1621
<div class="demo-container">

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
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-
61
$(() => {
72
const deployment = 'gpt-4o-mini';
83
const apiVersion = '2024-02-01';

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@
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>
1217
<script src="data.js"></script>
13-
<script type="module" src="index.js"></script>
18+
<script src="index.js"></script>
1419
<link rel="stylesheet" type="text/css" href="styles.css" />
1520
</head>
1621
<body class="dx-viewport">

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
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-
61
$(() => {
72
const deployment = 'gpt-4o-mini';
83
const apiVersion = '2024-02-01';

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@
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>
1217
<script src="data.js"></script>
13-
<script type="module" src="index.js"></script>
18+
<script src="index.js"></script>
1419
<link rel="stylesheet" type="text/css" href="styles.css" />
1520
</head>
1621
<body class="dx-viewport">

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
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-
61
$(() => {
72
const deployment = 'gpt-4o-mini';
83
const apiVersion = '2024-02-01';

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ 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. Cannot move to a separate file or index.js
7172
'DataGrid/AIColumns': {
73+
'script-src': ["'unsafe-inline'"],
7274
'connect-src': ['https://public-api.devexpress.com'],
7375
},
7476
'DataGrid/ExcelJSExportImages': {
@@ -143,8 +145,10 @@ const CSP_DEMO_ALLOWLIST = {
143145
'TagBox/Grouping': {
144146
'font-src': ['https://maxcdn.bootstrapcdn.com'],
145147
},
148+
// AI demos use inline <script type="module"> to import OpenAI SDK from esm.sh. Cannot move to a separate file or index.js
146149
'TreeList/AIColumns': {
147150
'connect-src': ['https://public-api.devexpress.com'],
151+
'script-src': ["'unsafe-inline'"],
148152
},
149153
'TreeList/BatchEditing': {
150154
'img-src': ['data:'],

0 commit comments

Comments
 (0)