Skip to content

Commit 4164e46

Browse files
Ruslan FarkhutdinovRuslan Farkhutdinov
andauthored
Security: Enable CSP check in JS for FileUploader/Validation demo (#32863)
Co-authored-by: Ruslan Farkhutdinov <ruslan.farkhutdinov@devexpress.com>
1 parent a2c9924 commit 4164e46

10 files changed

Lines changed: 25 additions & 15 deletions

File tree

apps/demos/Demos/FileUploader/Validation/Angular/app/app.component.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
float: left;
44
}
55

6+
::ng-deep .file-uploader-block + .file-uploader-block {
7+
float: right;
8+
}
9+
610
::ng-deep .note {
711
font-size: 10pt;
812
color: var(--dx-texteditor-color-label);

apps/demos/Demos/FileUploader/Validation/Angular/app/app.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
>Allowed file extensions: <span>.jpg, .jpeg, .gif, .png</span>.</span
1212
>
1313
</div>
14-
<div class="file-uploader-block" style="float: right">
14+
<div class="file-uploader-block">
1515
<dx-file-uploader
1616
[multiple]="true"
1717
uploadMode="useButtons"

apps/demos/Demos/FileUploader/Validation/React/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default function App() {
1515
.
1616
</span>
1717
</div>
18-
<div className="file-uploader-block" style={{ float: 'right' }}>
18+
<div className="file-uploader-block">
1919
<FileUploader multiple={true} uploadMode="useButtons" uploadUrl="https://js.devexpress.com/Demos/NetCore/FileUploader/Upload" maxFileSize={MAX_UPLOAD_FILE_SIZE} />
2020
<span className="note">{'Maximum file size: '}
2121
<span>4 MB</span>

apps/demos/Demos/FileUploader/Validation/React/styles.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
float: left;
44
}
55

6+
.file-uploader-block + .file-uploader-block {
7+
float: right;
8+
}
9+
610
.note {
711
font-size: 10pt;
812
color: var(--dx-texteditor-color-label);

apps/demos/Demos/FileUploader/Validation/ReactJs/App.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ export default function App() {
1818
<span>.jpg, .jpeg, .gif, .png</span>.
1919
</span>
2020
</div>
21-
<div
22-
className="file-uploader-block"
23-
style={{ float: 'right' }}
24-
>
21+
<div className="file-uploader-block">
2522
<FileUploader
2623
multiple={true}
2724
uploadMode="useButtons"

apps/demos/Demos/FileUploader/Validation/ReactJs/styles.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
float: left;
44
}
55

6+
.file-uploader-block + .file-uploader-block {
7+
float: right;
8+
}
9+
610
.note {
711
font-size: 10pt;
812
color: var(--dx-texteditor-color-label);

apps/demos/Demos/FileUploader/Validation/Vue/App.vue

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
<span>.jpg, .jpeg, .gif, .png</span>.
1313
</span>
1414
</div>
15-
<div
16-
class="file-uploader-block"
17-
style="float: right;"
18-
>
15+
<div class="file-uploader-block">
1916
<DxFileUploader
2017
:multiple="true"
2118
:max-file-size="4000000"
@@ -38,6 +35,10 @@ import DxFileUploader from 'devextreme-vue/file-uploader';
3835
float: left;
3936
}
4037
38+
.file-uploader-block + .file-uploader-block {
39+
float: right;
40+
}
41+
4142
.note {
4243
font-size: 10pt;
4344
color: var(--dx-texteditor-color-label);

apps/demos/Demos/FileUploader/Validation/jQuery/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div id="file-uploader-images"></div>
2020
<span class="note">Allowed file extensions: <span>.jpg, .jpeg, .gif, .png</span>.</span>
2121
</div>
22-
<div class="file-uploader-block" style="float: right">
22+
<div class="file-uploader-block">
2323
<div id="file-uploader-max-size"></div>
2424
<span class="note">Maximum file size: <span>4 MB</span>.</span>
2525
</div>

apps/demos/Demos/FileUploader/Validation/jQuery/styles.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
float: left;
44
}
55

6+
.file-uploader-block + .file-uploader-block {
7+
float: right;
8+
}
9+
610
.note {
711
font-size: 10pt;
812
color: var(--dx-texteditor-color-label);

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,6 @@ const CSP_DEMO_ALLOWLIST = {
197197
'script-src': ["'unsafe-inline'"],
198198
},
199199
// TODO: fix inline style attribute
200-
'FileUploader/Validation': {
201-
'style-src': ["'unsafe-inline'"],
202-
},
203-
// TODO: fix inline style attribute
204200
'DataGrid/RowSelection': {
205201
'style-src': ["'unsafe-inline'"],
206202
},

0 commit comments

Comments
 (0)