[MIM-1765] Make title for axises on highchart required (#2515)

* Make title for axises on highchart required * Use offline exporting of highchart graphs * revome global * fix lowercase
statisticsnorway · Feb 12, 2024 · 2bf1656 · 2bf1656
1 parent fb55e64
commit 2bf1656
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 17 deletions.
diff --git a/src/main/resources/assets/js/app/highchart.es6 b/src/main/resources/assets/js/app/highchart.es6
@@ -6,6 +6,7 @@ import Highcharts from 'highcharts'
 import highchartsModuleData from 'highcharts/modules/data'
 import highchartsModuleAccessibility from 'highcharts/modules/accessibility'
 import highchartsModuleExporting from 'highcharts/modules/exporting'
+import highchartsModuleOfflineExporting from 'highcharts/modules/offline-exporting'
 import highchartsModuleNoDataToDisplay from 'highcharts/modules/no-data-to-display'
 import highchartsModuleExportData from 'highcharts/modules/export-data'
 import zipcelx from 'zipcelx/lib/legacy'
@@ -15,8 +16,9 @@ import accessibilityLang from '../highchart-lang.json'
 // Initialize exporting module.
 highchartsModuleData(Highcharts)
 highchartsModuleAccessibility(Highcharts)
-highchartsModuleExporting(Highcharts)
 highchartsModuleNoDataToDisplay(Highcharts)
+highchartsModuleExporting(Highcharts)
+highchartsModuleOfflineExporting(Highcharts)
 highchartsModuleExportData(Highcharts)
 
 const EMPTY_CONFIG = {
@@ -156,9 +158,7 @@ export function init() {
                 event_label: label,
               })
 
-              this.exportChart({
-                type: 'png',
-              })
+              this.exportChartLocal() //png is default
             },
           },
           downloadJPEG: {
@@ -169,8 +169,8 @@ export function init() {
                 event_label: label,
               })
 
-              this.exportChart({
-                type: 'jpeg',
+              this.exportChartLocal({
+                type: 'image/jpeg',
               })
             },
           },
@@ -182,7 +182,7 @@ export function init() {
                 event_label: label,
               })
 
-              this.exportChart({
+              this.exportChartLocal({
                 type: 'application/pdf',
               })
             },
@@ -195,8 +195,8 @@ export function init() {
                 event_label: label,
               })
 
-              this.exportChart({
-                type: 'svg',
+              this.exportChartLocal({
+                type: 'image/svg+xml',
               })
             },
           },

diff --git a/src/main/resources/site/content-types/highchart/highchart.xml b/src/main/resources/site/content-types/highchart/highchart.xml
@@ -130,6 +130,7 @@
       <items>
         <input name="xAxisTitle" type="TextLine">
           <label>X-akse, tittel</label>
+          <occurrences minimum="1" maximum="1"/>
         </input>
         <input name="xAxisType" type="RadioButton">
           <label>X-skala</label>
@@ -174,6 +175,7 @@
       <items>
         <input name="yAxisTitle" type="TextLine">
           <label>Y-akse, tittel</label>
+          <occurrences minimum="1" maximum="1"/>
         </input>
         <input name="yAxisOffset" type="TextLine">
           <label>Plassering av y-aksetittel</label>

diff --git a/src/main/resources/site/parts/highchart/Highchart.jsx b/src/main/resources/site/parts/highchart/Highchart.jsx
@@ -10,6 +10,7 @@ import accessibilityLang from './../../../assets/js/highchart-lang.json'
 
 if (typeof Highcharts === 'object') {
   require('highcharts/modules/exporting')(Highcharts)
+  require('highcharts/modules/offline-exporting')(Highcharts)
   require('highcharts/modules/export-data')(Highcharts)
   require('highcharts/modules/data')(Highcharts)
   require('highcharts/modules/no-data-to-display')(Highcharts)
@@ -160,9 +161,7 @@ function Highchart(props) {
                     addGtagForEvent(props.GA_TRACKING_ID, action, category, label)
                   }
 
-                  this.exportChart({
-                    type: 'png',
-                  })
+                  this.exportChartLocal() // png is default
                 },
               },
               downloadJPEG: {
@@ -173,8 +172,8 @@ function Highchart(props) {
                     addGtagForEvent(props.GA_TRACKING_ID, action, category, label)
                   }
 
-                  this.exportChart({
-                    type: 'jpeg',
+                  this.exportChartLocal({
+                    type: 'image/jpeg',
                   })
                 },
               },
@@ -186,7 +185,7 @@ function Highchart(props) {
                     addGtagForEvent(props.GA_TRACKING_ID, action, category, label)
                   }
 
-                  this.exportChart({
+                  this.exportChartLocal({
                     type: 'application/pdf',
                   })
                 },
@@ -199,8 +198,8 @@ function Highchart(props) {
                     addGtagForEvent(props.GA_TRACKING_ID, action, category, label)
                   }
 
-                  this.exportChart({
-                    type: 'svg',
+                  this.exportChartLocal({
+                    type: 'image/svg+xml',
                   })
                 },
               },

diff --git a/src/main/resources/site/parts/highchartExpert/HighchartExpert.jsx b/src/main/resources/site/parts/highchartExpert/HighchartExpert.jsx
@@ -8,6 +8,7 @@ import accessibilityLang from './../../../assets/js/highchart-lang.json'
 
 if (typeof Highcharts === 'object') {
   require('highcharts/modules/exporting')(Highcharts)
+  require('highcharts/modules/offline-exporting')(Highcharts)
   require('highcharts/modules/export-data')(Highcharts)
   require('highcharts/modules/data')(Highcharts)
   require('highcharts/modules/no-data-to-display')(Highcharts)

diff --git a/src/main/resources/site/parts/highmap/Highmap.jsx b/src/main/resources/site/parts/highmap/Highmap.jsx
@@ -11,6 +11,7 @@ import accessibilityLang from './../../../assets/js/highchart-lang.json'
 if (typeof Highcharts === 'object') {
   require('highcharts/modules/accessibility')(Highcharts)
   require('highcharts/modules/exporting')(Highcharts)
+  require('highcharts/modules/offline-exporting')(Highcharts)
   require('highcharts/modules/export-data')(Highcharts)
   require('highcharts/modules/map')(Highcharts)
 }

diff --git a/src/main/resources/site/parts/nameSearch/nameSearch.jsx b/src/main/resources/site/parts/nameSearch/nameSearch.jsx
@@ -7,6 +7,7 @@ import { X } from 'react-feather'
 import Highcharts from 'highcharts'
 import HighchartsReact from 'highcharts-react-official'
 import highchartsExporting from 'highcharts/modules/exporting'
+import highchartsExportingOffline from 'highcharts/modules/offline-exporting'
 import highchartsExportData from 'highcharts/modules/export-data'
 import highchartsAccessibility from 'highcharts/modules/accessibility'
 import { useMediaQuery } from 'react-responsive'
@@ -16,6 +17,7 @@ import accessibilityLang from './../../../assets/js/highchart-lang.json'
 
 if (typeof window !== 'undefined' && typeof Highcharts === 'object') {
   highchartsExporting(Highcharts)
+  highchartsExportingOffline(Highcharts)
   highchartsExportData(Highcharts)
   highchartsAccessibility(Highcharts)
 }