updating jdk17 branch with master branch changes.

.eslintignore

@@ -0,0 +1,13 @@
+node_modules
+target
+config
+assembly
+docs
+resources
+resources-filtered
+
+# ignored sources (external libs)
+**/web/bootstrap
+**/web/dataapi/Xmla.js
+**/web/handlebars
+**/web/underscore

.eslintrc.json

@@ -1,10 +1,28 @@
 {
-  "extends": "google",
+  "extends": [
+    "plugin:import/recommended",
+    "airbnb-base",
+    "prettier"
+  ],
+
+  "plugins": ["import"],
+
+  "parserOptions": {
+    "ecmaVersion": 2020
+  },
+
   "env": {
     "amd" : true,
     "jasmine": true,
     "browser": true
   },
+
+  "globals": {
+    "inject": true,
+    "module": true,
+    "requirejs": true
+  },
+
   "rules": {
     "indent": ["error", 2, {
       "VariableDeclarator": {
@@ -81,11 +99,13 @@
       {"blankLine": "always", "prev": "block-like", "next": "return"},
       {"blankLine": "always", "prev": "directive", "next": "*"},
       {"blankLine": "any",    "prev": "directive", "next": "directive"}
-    ]
-  },
-  "globals": {
-    "inject": true,
-    "module": true,
-    "requirejs": true
+    ],
+
+    "no-restricted-syntax": "off",
+    "no-plusplus": ["warn", { "allowForLoopAfterthoughts": true }],
+    "no-underscore-dangle": "off",
+    "import/no-amd": "off",
+    "prefer-rest-params": "off",
+    "prefer-spread": "off"
   }
 }

.gitignore

@@ -18,3 +18,4 @@ bin
 /impl/server/pentaho.log
 docs/.jekyll-metadata
 docs/_site
+.eslintcache

.prettierignore

@@ -0,0 +1,13 @@
+node_modules
+target
+config
+assembly
+docs
+resources
+resources-filtered
+
+# ignored sources (external libs)
+**/web/bootstrap
+**/web/dataapi/Xmla.js
+**/web/handlebars
+**/web/underscore

.prettierrc

@@ -0,0 +1,4 @@
+{
+  "printWidth": 100,
+  "trailingComma": "es5"
+}

.puppeteerrc.js

@@ -0,0 +1,6 @@
+const { join } = require("path");
+
+module.exports = {
+    // Changes the location where Puppeteer will install Chrome.
+    cacheDirectory: join(__dirname, "target"),
+};

License.txt

@@ -1,4 +1,4 @@
-Copyright 2002 - 2023 Hitachi Vantara. All rights reserved.
+Copyright 2002 - 2024 Hitachi Vantara. All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -1,7 +1,17 @@
-# Common-UI #
+<div align="center">
+
+# Common-UI
+
 Common-ui historically contains commonly used utils/frameworks (e.g. jquery) that are used across the platform.
 As we move forward with OSGI it is expected for these to be removed from common-ui to be deployed in a more modular way.
 
+
+![Java](https://img.shields.io/badge/Java-11-brightorange?logo=openjdk)
+![Javascript](https://img.shields.io/badge/JavaScript-323330?logo=javascript)
+![Node](https://img.shields.io/badge/node-16-brightgreen?logo=node.js)
+
+</div>
+
 How to build
 --------------
 

assemblies/webpackage/src/main/resources-filtered/common-ui/preconfig.js

@@ -156,6 +156,7 @@ if(!useDebug) {
     "pentaho/environment",
     "pentaho/_core/main",
     "pentaho/config/service",
+    "pentaho/config/impl/Service",
     "pentaho/module/service",
     "pentaho/module/metaService",
     "pentaho/module/metaOf",
@@ -317,6 +318,7 @@ if(!useDebug) {
     "pentaho/visual/action/Select",
     "pentaho/visual/action/SelectExecution",
     "pentaho/visual/action/Execute",
+    "pentaho/visual/action/Message",
     "pentaho/visual/role/Mode",
     "pentaho/visual/role/Mapping",
     "pentaho/visual/role/Property",
@@ -346,8 +348,6 @@ if(!useDebug) {
     "pentaho/visual/models/types/FontStyle",
     "pentaho/visual/models/types/Sides",
     "pentaho/visual/models/types/LabelsOption",
-    "pentaho/visual/models/types/WaterDirection",
-    "pentaho/visual/models/types/TreemapLayoutMode",
     "pentaho/visual/models/Abstract",
     "pentaho/visual/models/types/DisplayUnits",
     "pentaho/visual/models/CartesianAbstract",
@@ -356,11 +356,11 @@ if(!useDebug) {
     "pentaho/visual/models/types/MaxChartsPerRow",
     "pentaho/visual/models/types/MultiChartRangeScope",
     "pentaho/visual/models/types/MultiChartOverflow",
+    "pentaho/visual/models/types/MultiChartMax",
     "pentaho/visual/models/mixins/MultiCharted",
     "pentaho/visual/models/types/EmptyCellMode",
     "pentaho/visual/models/mixins/Interpolated",
     "pentaho/visual/models/PointAbstract",
-    "pentaho/visual/models/LineAbstract",
     "pentaho/visual/models/AreaStacked",
     "pentaho/visual/models/BarAbstract",
     "pentaho/visual/models/types/TrendType",
@@ -382,20 +382,23 @@ if(!useDebug) {
     "pentaho/visual/models/types/SizeByNegativesMode",
     "pentaho/visual/models/mixins/ScaleSizeContinuous",
     "pentaho/visual/models/Bubble",
+    "pentaho/visual/models/Boxplot",
+    "pentaho/visual/models/Dot",
     "pentaho/visual/models/Pie",
     "pentaho/visual/models/Donut",
-    "pentaho/visual/models/Dot",
     "pentaho/visual/models/HeatGrid",
+    "pentaho/visual/models/LineAbstract",
     "pentaho/visual/models/Line",
     "pentaho/visual/models/LineStacked",
     "pentaho/visual/models/Scatter",
     "pentaho/visual/models/types/SliceOrder",
     "pentaho/visual/models/Sunburst",
-    "pentaho/visual/models/Waterfall",
-    "pentaho/visual/models/Treemap",
-    "pentaho/visual/models/Boxplot",
     "pentaho/visual/models/Funnel",
     "pentaho/visual/models/Gauge",
+    "pentaho/visual/models/types/WaterDirection",
+    "pentaho/visual/models/Waterfall",
+    "pentaho/visual/models/types/TreemapLayoutMode",
+    "pentaho/visual/models/Treemap",
     "pentaho/visual/models/all",
     "pentaho/visual/role/adaptation/Strategy",
     "pentaho/visual/role/adaptation/IdentityStrategy",
@@ -417,7 +420,6 @@ if(!useDebug) {
     "pentaho/ccc/visual/CartesianAbstract",
     "pentaho/ccc/visual/CategoricalContinuousAbstract",
     "pentaho/ccc/visual/PointAbstract",
-    "pentaho/ccc/visual/LineAbstract",
     "pentaho/ccc/visual/AreaAbstract",
     "pentaho/ccc/visual/Area",
     "pentaho/ccc/visual/AreaStacked",
@@ -437,20 +439,21 @@ if(!useDebug) {
     "pentaho/ccc/visual/Boxplot",
     "pentaho/ccc/visual/MetricPointAbstract",
     "pentaho/ccc/visual/Bubble",
+    "pentaho/ccc/visual/Dot",
     "pentaho/ccc/visual/Pie",
     "pentaho/ccc/visual/Donut",
-    "pentaho/ccc/visual/Dot",
     "pentaho/ccc/visual/HeatGrid",
+    "pentaho/ccc/visual/LineAbstract",
     "pentaho/ccc/visual/Line",
     "pentaho/ccc/visual/LineStacked",
     "pentaho/ccc/visual/Scatter",
     "pentaho/ccc/visual/Sunburst",
     "pentaho/ccc/visual/Treemap",
-    "pentaho/visual/views/echarts/echartsView",
-    "pentaho/visual/views/echarts/Funnel",
-    "pentaho/visual/views/echarts/Gauge",
     "pentaho/ccc/visual/Waterfall",
     "pentaho/ccc/visual/all",
+    "pentaho/visual/views/echarts/Abstract",
+    "pentaho/visual/views/echarts/Funnel",
+    "pentaho/visual/views/echarts/Gauge",
     "pentaho/visual/views/all"
   ];
 }

impl/client/pom.xml

@@ -19,7 +19,7 @@
     for each of the constituents (e.g. vizapi, prompting) of the current artifact.</description>
 
   <properties>
-    <js.project.list>dojo-release,requirejs,jquery,jquery-i18n-properties,pentaho-cdf-js,angular,angular-animate,angular-i18n,uirouter__core,uirouter__angularjs,echarts</js.project.list>
+    <js.project.list>dojo-release,prantlf__requirejs,jquery,jquery-i18n-properties,pentaho-cdf-js,angular,angular-animate,angular-i18n,uirouter__core,uirouter__angularjs,echarts</js.project.list>
     <build.javascriptReportDirectory>target/js-reports</build.javascriptReportDirectory>
 
     <docjs.config.file>jsdoc-vizapi.json</docjs.config.file>
@@ -30,6 +30,9 @@
     <requirejs.config.files.pattern>**/*-require-js-cfg.js</requirejs.config.files.pattern>
     <webjars.target.directory>${build.dependenciesDirectory}/META-INF/resources/webjars</webjars.target.directory>
 
+    <nodejs.version>v16.20.2</nodejs.version>
+    <npm.version>8.19.4</npm.version>
+
     <!-- The parent POM declarations of these properties
          use `project.rootdir` which does not seem to exist...
     <frontend-maven-plugin.installDirectory>${project.basedir}/target</frontend-maven-plugin.installDirectory>
@@ -59,7 +62,7 @@
     </dependency>
     <dependency>
       <groupId>org.webjars.npm</groupId>
-      <artifactId>requirejs</artifactId>
+      <artifactId>prantlf__requirejs</artifactId>
     </dependency>
     <dependency>
       <groupId>org.webjars.npm</groupId>

impl/client/src/main/assembly/dependencies-js-assembly.xml

@@ -24,7 +24,7 @@
     </fileSet>
 
     <fileSet>
-      <directory>${webjars.target.directory}/requirejs/${requirejs.version}</directory>
+      <directory>${webjars.target.directory}/prantlf__requirejs/${prantlf.requirejs.version}</directory>
       <outputDirectory>.</outputDirectory>
       <includes>
         <include>**/require.js</include>

impl/client/src/main/config/javascript/build.js

@@ -1,7 +1,7 @@
 /*!
  * HITACHI VANTARA PROPRIETARY AND CONFIDENTIAL
  *
- * Copyright 2002 - 2018 Hitachi Vantara. All rights reserved.
+ * Copyright 2002 - 2024 Hitachi Vantara. All rights reserved.
  *
  * NOTICE: All information including source code contained herein is, and
  * remains the sole property of Hitachi Vantara and its licensors. The intellectual
@@ -90,22 +90,31 @@
   // removed from the output folder.
   removeCombined: true,
 
-  // How to optimize all the JS files in the build output directory.
-  optimize: "${js.build.optimizer}",
+  // Disable the included UglifyJS that only understands ES5 or earlier syntax.
+  // If the source uses ES2015 or later syntax, pass "optimize: 'none'" to r.js
+  // and use an ES2015+ compatible minifier after running r.js.
+  optimize: "none",
 
   optimizeCss: "none",
 
-  // If using UglifyJS2 for script optimization, these config options can be
-  // used to pass configuration values to UglifyJS2.
-  // For possible `output`   values see: https://github.com/mishoo/UglifyJS2#beautifier-options
-  // For possible `compress` values see: https://github.com/mishoo/UglifyJS2#compressor-options
-  uglify2: {
-    output: {
-      beautify: false
-    },
-    warnings: false,
-    mangle: true,
-    compress: true
+  onBuildWrite(moduleName, path, contents) {
+    // check value to see if code should be minified/uglified
+    if ("${js.build.optimizer}" === "none") {
+      return contents;
+    }
+
+    const { minify } = require.nodeRequire("uglify-js");
+    const { code, error } = minify(contents, {
+      output: {
+        beautify: false
+      }
+    });
+
+    if (error) {
+      throw new Error(error);
+    }
+
+    return code;
   },
 
   // Cannot use preserveLicenseComments and generateSourceMaps together...
@@ -125,6 +134,7 @@
     "cdf/lib/CCC/pvc": "empty:",
     "cdf/lib/CCC/cdo": "empty:",
     "cdf/lib/CCC/protovis": "empty:",
+    "common-ui/echarts": "empty:",
 
     // These AMD loader plugins are used in lots of code which has nothing to do with
     // the platform bundle code.

impl/client/src/main/resources-filtered/web/common-ui-require-js-cfg.js

@@ -770,8 +770,6 @@
       "pentaho/visual/models/types/FontStyle",
       "pentaho/visual/models/types/Sides",
       "pentaho/visual/models/types/LabelsOption",
-      "pentaho/visual/models/types/WaterDirection",
-      "pentaho/visual/models/types/TreemapLayoutMode",
       "pentaho/visual/models/Abstract",
       "pentaho/visual/models/types/DisplayUnits",
       "pentaho/visual/models/CartesianAbstract",
@@ -806,21 +804,23 @@
       "pentaho/visual/models/types/SizeByNegativesMode",
       "pentaho/visual/models/mixins/ScaleSizeContinuous",
       "pentaho/visual/models/Bubble",
+      "pentaho/visual/models/Boxplot",
+      "pentaho/visual/models/Dot",
       "pentaho/visual/models/Pie",
       "pentaho/visual/models/Donut",
-      "pentaho/visual/models/Funnel",
-      "pentaho/visual/models/Gauge",
-      "pentaho/visual/models/Treemap",
       "pentaho/visual/models/HeatGrid",
-      "pentaho/visual/models/Line",
       "pentaho/visual/models/LineAbstract",
+      "pentaho/visual/models/Line",
       "pentaho/visual/models/LineStacked",
       "pentaho/visual/models/Scatter",
-      "pentaho/visual/models/Boxplot",
-      "pentaho/visual/models/Dot",
       "pentaho/visual/models/types/SliceOrder",
       "pentaho/visual/models/Sunburst",
+      "pentaho/visual/models/Funnel",
+      "pentaho/visual/models/Gauge",
+      "pentaho/visual/models/types/WaterDirection",
       "pentaho/visual/models/Waterfall",
+      "pentaho/visual/models/types/TreemapLayoutMode",
+      "pentaho/visual/models/Treemap",
       "pentaho/visual/models/all",
       "pentaho/visual/role/adaptation/Strategy",
       "pentaho/visual/role/adaptation/IdentityStrategy",
@@ -861,21 +861,22 @@
       "pentaho/ccc/visual/Boxplot",
       "pentaho/ccc/visual/MetricPointAbstract",
       "pentaho/ccc/visual/Bubble",
+      "pentaho/ccc/visual/Dot",
       "pentaho/ccc/visual/Pie",
       "pentaho/ccc/visual/Donut",
-      "pentaho/visual/views/echarts/Funnel",
-      "pentaho/visual/views/echarts/Gauge",
-      "pentaho/visual/views/echarts/Abstract",
       "pentaho/ccc/visual/HeatGrid",
-      "pentaho/ccc/visual/Line",
       "pentaho/ccc/visual/LineAbstract",
-      "pentaho/ccc/visual/Scatter",
+      "pentaho/ccc/visual/Line",
       "pentaho/ccc/visual/LineStacked",
-      "pentaho/ccc/visual/Dot",
+      "pentaho/ccc/visual/Scatter",
       "pentaho/ccc/visual/Sunburst",
       "pentaho/ccc/visual/Treemap",
       "pentaho/ccc/visual/Waterfall",
-      "pentaho/ccc/visual/all"
+      "pentaho/ccc/visual/all",
+      "pentaho/visual/views/echarts/Abstract",
+      "pentaho/visual/views/echarts/Funnel",
+      "pentaho/visual/views/echarts/Gauge",
+      "pentaho/visual/views/all"
     ];
   }
 })();