Skip to content

Commit a1d8ead

Browse files
committed
chore: update Google Charts to v47
Changelog: https://developers.google.com/chart/interactive/docs/release_notes Fix #1238
1 parent aed285e commit a1d8ead

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public final class ResourceUrl {
3232
public static final String STATIC_RESOURCES_URL = "https://stamps.filezz.ru";
3333

3434
// MUST be updated when any of our resources were modified
35-
public static final String RESOURCES_VERSION = "v0.4.2.1";
35+
public static final String RESOURCES_VERSION = "v0.4.2.2";
3636

3737
// CheckStyle: ignore LineLength for next 10 lines
3838
private static final String CATALOG_UTILS_JS = "/public/js/" + RESOURCES_VERSION + "/CatalogUtils.min.js";

src/main/java/ru/mystamps/web/support/spring/security/ContentSecurityPolicyHeaderWriter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,8 @@ class ContentSecurityPolicyHeaderWriter implements HeaderWriter {
148148
// - 'https://unpkg.com' is required by react/react-dom
149149
private static final String SCRIPTS_SERIES_INFO_PAGE = " https://unpkg.com";
150150

151-
// - 'unsafe-eval' is required by loader.js from Google Charts
152151
// - 'https://www.gstatic.com' is required by Google Charts
153-
private static final String SCRIPT_COLLECTION_INFO = " 'unsafe-eval' https://www.gstatic.com";
152+
private static final String SCRIPT_COLLECTION_INFO = " https://www.gstatic.com";
154153

155154
// - 'self' is required for AJAX requests from our scripts
156155
// (country suggestions on /series/add and series sale import on /series/{id})

src/main/javascript/collection/info.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55

66
function initPage(statByCategories, statByCountries) {
7-
var chartsVersion = '44';
7+
var chartsVersion = '47';
88
google.charts.load(chartsVersion, {'packages':['corechart']});
99
google.charts.setOnLoadCallback(function drawCharts() {
1010
drawChart('categories-chart', createDataTable(statByCategories));

src/test/java/ru/mystamps/web/support/spring/security/ContentSecurityPolicyHeaderWriterTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ public void onCollectionInfoPageWithLocalResources() {
144144
+ "'report-sample' "
145145
+ "'unsafe-inline' "
146146
+ "'self' "
147-
+ "'unsafe-eval' "
148147
+ "https://www.gstatic.com"
149148
)
150149
// hope that all other directives are the same as on the index page
@@ -175,7 +174,6 @@ public void onCollectionInfoPageWithResourcesFromCdn() {
175174
+ "https://stamps.filezz.ru "
176175
+ "https://maxcdn.bootstrapcdn.com "
177176
+ "https://yandex.st "
178-
+ "'unsafe-eval' "
179177
+ "https://www.gstatic.com"
180178
)
181179
// hope that all other directives are the same as on the index page

0 commit comments

Comments
 (0)