Merge pull request #19291 from highcharts/dash/merge-fix

Fixed merge issues with climate demo
highcharts · Jul 4, 2023 · fc38246 · fc38246
2 parents 885c81f + 29dd938
commit fc38246
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 22 deletions.
diff --git a/css/dashboards.css b/css/dashboards.css
@@ -1,5 +1,5 @@
 /**
- * @license Highcharts Dashboards v0.0.2
+ * @license Highcharts Dashboards v@product.version@
  *
  * (c) 2009-2023 Highsoft AS
  *

diff --git a/css/datagrid.css b/css/datagrid.css
@@ -1,5 +1,5 @@
 /**
- * @license Highcharts Dashboards v0.0.1
+ * @license Highcharts Dashboards v@product.version@
  *
  * (c) 2009-2023 Highsoft AS
  *

diff --git a/samples/dashboards/demo/climate/demo.html b/samples/dashboards/demo/climate/demo.html
@@ -5,13 +5,13 @@
 <script src="https://code.highcharts.com/dashboards/datagrid.js"></script>
 <script src="https://code.highcharts.com/highcharts.js"></script>
 <script src="https://code.highcharts.com/highcharts-more.js"></script>
-<script src="https://code.highcharts.com/modules/accessibility.js"></script>
-<script src="https://code.highcharts.com/modules/data-tools.js"></script> <!-- @todo replace with math module -->
-<script src="https://code.highcharts.com/modules/map.js"></script>
+<script src="https://code.highcharts.com/maps/modules/map.js"></script>
+<script src="https://code.highcharts.com/stock/modules/stock.js"></script>
 <script src="https://code.highcharts.com/modules/solid-gauge.js"></script>
-<script src="https://code.highcharts.com/modules/stock.js"></script>
 <script src="https://code.highcharts.com/modules/timeline.js"></script>
+<script src="https://code.highcharts.com/modules/accessibility.js"></script>
 <script src="https://code.highcharts.com/dashboards/modules/dashboards-plugin.js"></script>
+<script src="https://code.highcharts.com/dashboards/modules/math-modifier.js"></script>
 
 <div id="container">Loading...</div>
 

diff --git a/samples/dashboards/demo/climate/demo.js b/samples/dashboards/demo/climate/demo.js
@@ -15,7 +15,7 @@ Highcharts.SVGRenderer.prototype.symbols.rightarrow = (x, y, w, h) => [
     'Z'
 ];
 
-const MathModifier = Highcharts.DataModifier.types.Math; // @todo switch module
+const MathModifier = Dashboards.DataModifier.types.Math;
 const RangeModifier = Dashboards.DataModifier.types.Range;
 
 const colorStopsDays = [

diff --git a/samples/dashboards/demo/datagrid-mathmodifier/demo.css b/samples/dashboards/demo/datagrid-mathmodifier/demo.css
@@ -1,4 +1,4 @@
-@import url("https://code.highcharts.com/css/dashboards/gui.css");
+@import url("https://code.highcharts.com/css/dashboards.css");
 @import url("https://code.highcharts.com/css/highcharts.css");
 @import url("https://code.highcharts.com/css/datagrid.css");
 

diff --git a/tools/gulptasks/dashboards/dist-build.js b/tools/gulptasks/dashboards/dist-build.js
@@ -3,16 +3,58 @@
  */
 
 
+const fs = require('fs');
 const gulp = require('gulp');
 const path = require('path');
 
 
+/* *
+ *
+ *  Functions
+ *
+ * */
+
+
+function buildCSS(
+    sourceFolder,
+    targetFolder,
+    release
+) {
+
+    const fsLib = require('../lib/fs');
+
+    fsLib.copyAllFiles(
+        sourceFolder,
+        targetFolder,
+        true,
+        file => (
+            path.basename(file)[0] !== '.' &&
+            (
+                file.includes('dashboards') ||
+                file.includes('datagrid')
+            )
+        )
+    );
+
+    for (const cssFile of fsLib.getFilePaths(targetFolder)) {
+        fs.writeFileSync(
+            cssFile,
+            fs
+                .readFileSync(cssFile, 'utf8')
+                .replace(/@product.version@/gu, release)
+        );
+    }
+
+}
+
+
 /* *
  *
  *  Tasks
  *
  * */
 
+
 /**
  * Creates the ./build/dist/dashboards setup.
  *
@@ -24,6 +66,14 @@ async function distBuild() {
     const fsLib = require('../lib/fs');
     const logLib = require('../lib/log');
 
+    const {
+        release
+    } = require('yargs').argv;
+
+    if (!/^\d+\.\d+\.\d+(?:-\w+)?$/su.test(release)) {
+        throw new Error('No valid `--release x.x.x` provided.');
+    }
+
     const {
         buildFolder,
         bundleTargetFolder,
@@ -40,18 +90,7 @@ async function distBuild() {
     logLib.success(`Created ${buildCodeTarget}`);
 
     const buildCssTarget = path.join(buildCodeTarget, 'css');
-    fsLib.copyAllFiles(
-        cssFolder,
-        buildCssTarget,
-        true,
-        file => (
-            path.basename(file)[0] !== '.' &&
-            (
-                file.includes('dashboards') ||
-                file.includes('datagrid')
-            )
-        )
-    );
+    buildCSS(cssFolder, buildCssTarget, release);
     logLib.success(`Created ${buildCssTarget}`);
 
     // temporary until dashboards/dist-examples task works

diff --git a/tools/gulptasks/dashboards/dist-upload.js b/tools/gulptasks/dashboards/dist-upload.js
@@ -360,10 +360,16 @@ async function distUpload() {
         HTTP_MAX_AGE.fiveYears
     );
 
+    // Hack
+    const sourceCssFolder = path.join(sourceFolder, 'css');
+    const sourceGfxFolder = path.join(sourceFolder, 'gfx');
+    logLib.warn('Uploading to css & gfx...');
+    await uploadFolder(sourceCssFolder, targetStorage, bucket, 'css');
+    await uploadFolder(sourceGfxFolder, targetStorage, bucket, 'gfx');
+
     logLib.warn('Uploading to zips/...');
     await uploadZips(buildFolder, targetStorage, bucket, 'zips/');
 
-
     logLib.success('Uploading Done.');
 
 }

diff --git a/ts/Data/DataPool.ts b/ts/Data/DataPool.ts
@@ -230,7 +230,7 @@ class DataPool implements DataEvent.Emitter {
             connector
                 .load()
                 .then((connector): (DataConnector|Promise<DataConnector>) => {
-                    if (options.options.dataModifier) {
+                    if (options?.options?.dataModifier) {
                         const ModifierClass = DataModifier
                             .types[options.options.dataModifier.type];