Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updating jdk17 branch with master branch changes. #1756

Open
wants to merge 60 commits into
base: JDK17
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
55dda5c
chore: Enable javascript builds with ES2015+ syntax [BACKLOG-40011]
davidmsantos90 Jan 19, 2024
d7c6aee
fix: jasmine unhandled promise rejection errors [BACKLOG-40011]
davidmsantos90 Jan 23, 2024
51c240d
[BACKLOG-40205] Remove echarts from platformBundle to reduce its size
AAravind27 Mar 15, 2024
d642ded
Merge pull request #1754 from AAravind27/new-bundle-charts
krishnaalluhitachi Mar 18, 2024
c523672
[BACKLOG-38917] Add Radar charts
AAravind27 Feb 27, 2024
74c451f
Merge pull request #1753 from AAravind27/Radar
AAravind27 Mar 25, 2024
5ea5420
[BACKLOG-40372] Fixes translations for labels of Calculated Field Dia…
hv-vamsi Mar 27, 2024
1a884a0
[BACKLOG-40336] Link some echart properties with Chart Options
AAravind27 Mar 26, 2024
93be1ee
Merge pull request #1760 from AAravind27/BACKLOG-40336
AAravind27 Apr 8, 2024
a6bd025
Merge pull request #1759 from hv-vamsi/master
peterrinehart Apr 11, 2024
064f53d
[BACKLOG-40336] Set default value to properties
AAravind27 Apr 9, 2024
9ee8c16
Merge pull request #1761 from AAravind27/BACKLOG-40336
peterrinehart Apr 13, 2024
b086d69
[BACKLOG-40489] Error when accessing browse files with a user with sp…
singletonc Apr 24, 2024
35fecfb
Merge pull request #1762 from singletonc/BACKLOG-40489
NJtwentyone Apr 29, 2024
8dd20ef
[BACKLOG-40383] Implement chart interactions
AAravind27 Apr 22, 2024
6c42f30
Merge pull request #1763 from AAravind27/BACKLOG-40383
peterrinehart May 2, 2024
ea4ba8c
[BACKLOG-40259] - Added stage-separated version for Gauge chart
jsaraf May 7, 2024
0358db8
Merge pull request #1764 from jsaraf/BACKLOG-40259
jsaraf May 14, 2024
a59a8e5
[BACKLOG-39579] JDK17 - Build issue for https://github.com/pentaho/pe…
srallapa May 21, 2024
75a3f98
[BACKLOG-40383] Implement chart interactions
AAravind27 May 24, 2024
e32e6ac
Merge pull request #1768 from AAravind27/BACKLOG-40383
krishnaalluhitachi May 27, 2024
aee18d3
chore: code cleanup
davidmsantos90 May 23, 2024
06d9a97
fix: Sanitize messages and title in message box [PPP-5061]
davidmsantos90 May 23, 2024
8cf8876
[PPP-5078] Insecure deserialization in Pentaho Interactive Reporting.
SaiPrasannaL Jun 4, 2024
d199f1e
Merge pull request #1770 from SaiPrasannaL/origin/PPP-5078
krishnaalluhitachi Jun 5, 2024
869be3e
[PPP-5078] Insecure deserialization in Pentaho Interactive Reporting.
SaiPrasannaL Jun 6, 2024
130c45e
Merge pull request #1771 from SaiPrasannaL/origin/PPP-5078
krishnaalluhitachi Jun 6, 2024
9184645
fix: event listener of 'change:init' failed [BACKLOG-40956]
davidmsantos90 Jun 6, 2024
756aaf1
[BACKLOG-40816 Update and validate in-product links in Pentaho 10.1 -…
ddiroma Jun 6, 2024
86914e6
Merge pull request #1773 from ddiroma/40816
peterrinehart Jun 6, 2024
28640f7
[PPP-5078] Insecure deserialization in Pentaho Interactive Reporting.
SaiPrasannaL Jun 7, 2024
a9e5930
Merge pull request #1774 from SaiPrasannaL/origin/PPP-5078
krishnaalluhitachi Jun 7, 2024
1bf2b9d
[BACKLOG-40998] fix: Replace null coalescing operator with OR operator
AAravind27 Jun 11, 2024
5992836
Merge pull request #1775 from AAravind27/master
peterrinehart Jun 11, 2024
c15faa3
fix: MessageBox usage with html in title and message [BACKLOG-40907]
davidmsantos90 Jun 17, 2024
db0b0f5
[BACKLOG-41392] fix: show formatted value in legend for gauge
AAravind27 Jul 4, 2024
bb2a90b
Merge pull request #1779 from AAravind27/BACKLOG-41392
krishnaalluhitachi Jul 4, 2024
43f8ae8
[BACKLOG-41380] fix: show formatted value in tooltip for radar
AAravind27 Jul 5, 2024
f621dd8
Merge pull request #1780 from AAravind27/BACKLOG-41380
krishnaalluhitachi Jul 5, 2024
4f7bb15
[CLEANUP] updated versions via release version merger
Jul 8, 2024
3d148d8
[PPP-4305] Upgrade boostsrap.js to 3.4.1
befc Jul 2, 2024
be4baf2
Revert "[PPP-4305] Upgrade boostsrap.js to 3.4.1"
befc Jul 23, 2024
ad0b147
Merge pull request #1781 from pentaho/revert-1778-PPP-4305
smmribeiro Jul 25, 2024
736ccc4
[PPP-4790] sanitize html to address XSS Vulnerabilities (#1782)
loonatic Aug 6, 2024
457e8d4
[PPP-4174] Migrate axis2 web services to jax-rs and remove axis2
peterrinehart Aug 22, 2024
335de7a
Merge pull request #1785 from peterrinehart/PPP-4174-clean
tkafalas Aug 26, 2024
921c21e
[PPP-4174] Removing unnecessary unit tests; no more XML to parse.
peterrinehart Aug 27, 2024
61132a9
Merge pull request #1786 from peterrinehart/PPP-4174-unit_test_fix
rsleem Aug 28, 2024
7dc7033
chore: bump puppeter to latest version
davidmsantos90 Sep 2, 2024
072fddd
fix: update dojo to v1.17.3 [PPP-4824]
davidmsantos90 Jun 27, 2024
64a498e
HNC-766: updated copyright headers
lgrill-pentaho Sep 24, 2024
82d41c4
Revert "HNC-766: updated copyright headers"
lgrill-pentaho Sep 24, 2024
da48cdb
[PPP-5255]-working on test cases for xss utility function
Rangashivani Oct 15, 2024
a22fc3b
Revert "[PPP-5255]-working on test cases for xss utility function"
Rangashivani Oct 15, 2024
4f22f8a
fix: indent Issue on PIR report creation [BACKLOG-42478]
davidmsantos90 Oct 11, 2024
930bf60
[PPP-4174] Use classes from data-access when processing server respon…
peterrinehart Oct 24, 2024
d87e707
[PPP-4893][PPP-5077][PPP-5128][PPP-4407][PPP-4660][PPP-4760][PPP-5043…
Nov 7, 2024
44b9356
Merge pull request #1802 from angel-ramoscardona/karaf-upgrade-4.4.6
rmansoor Nov 8, 2024
bc7a6aa
DEVO-11194: updated license and copyright headers
lgrill-pentaho Nov 11, 2024
f671840
[ANALYZER-4145] - Multiselect feature for Analyzer Report Filter no l…
miguelappleton Nov 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 13 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -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
34 changes: 27 additions & 7 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down Expand Up @@ -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"
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ bin
/impl/server/pentaho.log
docs/.jekyll-metadata
docs/_site
.eslintcache
13 changes: 13 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"printWidth": 100,
"trailingComma": "es5"
}
17 changes: 17 additions & 0 deletions .puppeteerrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*! ******************************************************************************
*
* Pentaho
*
* Copyright (C) 2024 by Hitachi Vantara, LLC : http://www.pentaho.com
*
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file.
*
* Change Date: 2029-07-20
******************************************************************************/
const { join } = require("path");

module.exports = {
// Changes the location where Puppeteer will install Chrome.
cacheDirectory: join(__dirname, "target"),
};
70 changes: 59 additions & 11 deletions License.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,63 @@
Copyright 2002 - 2023 Hitachi Vantara. All rights reserved.
Pentaho Developer Edition 10.3 Copyright 2024 Hitachi Vantara, LLC; licensed under the
Business Source License 1.1 (BSL). This project may include third party components that
are individually licensed per the terms indicated by their respective copyright owners
included in text file or in the source code.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
License text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.
"Business Source License" is a trademark of MariaDB Corporation Ab.

http://www.apache.org/licenses/LICENSE-2.0
Parameters

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Licensor: Hitachi Vantara, LLC.
Licensed Work: Pentaho Developer Edition 10.3. The Licensed Work is (c) 2024
Hitachi Vantara, LLC.
Additional Use Grant: None
Change Date: Four years from the date the Licensed Work is published.
Change License: Apache 2.0

The source code contained herein is licensed by these terms unless otherwise specified.
For information about alternative licensing arrangements for the Licensed Work,
please contact [email protected].

Notice

Business Source License 1.1

Terms

The Licensor hereby grants you the right to copy, modify, create derivative
works, redistribute, and make non-production use of the Licensed Work. The
Licensor may make an Additional Use Grant, above, permitting limited production use.

Effective on the Change Date, or the fourth anniversary of the first publicly
available distribution of a specific version of the Licensed Work under this
License, whichever comes first, the Licensor hereby grants you rights under
the terms of the Change License, and the rights granted in the paragraph
above terminate.

If your use of the Licensed Work does not comply with the requirements
currently in effect as described in this License, you must purchase a
commercial license from the Licensor, its affiliated entities, or authorized
resellers, or you must refrain from using the Licensed Work.

All copies of the original and modified Licensed Work, and derivative works
of the Licensed Work, are subject to this License. This License applies
separately for each version of the Licensed Work and the Change Date may vary
for each version of the Licensed Work released by Licensor.

You must conspicuously display this License on each original or modified copy
of the Licensed Work. If you receive the Licensed Work in original or
modified form from a third party, the terms and conditions set forth in this
License apply to your use of that work.

Any use of the Licensed Work in violation of this License will automatically
terminate your rights under this License for the current and all other
versions of the Licensed Work.

This License does not grant you any right in any trademark or logo of
Licensor or its affiliates (provided that you may use a trademark or logo of
Licensor as expressly required by this License).

TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE.
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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
--------------

Expand Down
4 changes: 2 additions & 2 deletions assemblies/client-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<parent>
<groupId>org.pentaho</groupId>
<artifactId>common-ui-assemblies</artifactId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
</parent>
<artifactId>common-ui-client-config</artifactId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>Client config folder</name>
<description>Ensures the client's configuration deploy folder is enabled.</description>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/npmpackage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.pentaho</groupId>
<artifactId>common-ui-assemblies</artifactId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
21 changes: 9 additions & 12 deletions assemblies/npmpackage/src/main/javascript/Sandbox.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
/*!
* Copyright 2019 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.
* You may obtain a copy of the License at
* Pentaho
*
* http://www.apache.org/licenses/LICENSE-2.0
* Copyright (C) 2024 by Hitachi Vantara, LLC : http://www.pentaho.com
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file.
*
* Change Date: 2029-07-20
******************************************************************************/

define([
"pentaho/module/util",
"pentaho/visual/util",
Expand Down
21 changes: 9 additions & 12 deletions assemblies/npmpackage/src/main/javascript/loader.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
/*!
* Copyright 2019 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.
* You may obtain a copy of the License at
* Pentaho
*
* http://www.apache.org/licenses/LICENSE-2.0
* Copyright (C) 2024 by Hitachi Vantara, LLC : http://www.pentaho.com
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file.
*
* Change Date: 2029-07-20
******************************************************************************/


"use strict";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
/*!
* Copyright 2019 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.
* You may obtain a copy of the License at
* Pentaho
*
* http://www.apache.org/licenses/LICENSE-2.0
* Copyright (C) 2024 by Hitachi Vantara, LLC : http://www.pentaho.com
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file.
*
* Change Date: 2029-07-20
******************************************************************************/


(function() {

Expand Down
21 changes: 9 additions & 12 deletions assemblies/npmpackage/src/main/javascript/webcontext.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
/*!
* Copyright 2019 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.
* You may obtain a copy of the License at
* Pentaho
*
* http://www.apache.org/licenses/LICENSE-2.0
* Copyright (C) 2024 by Hitachi Vantara, LLC : http://www.pentaho.com
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file.
*
* Change Date: 2029-07-20
******************************************************************************/


(function(global) {

Expand Down
8 changes: 4 additions & 4 deletions assemblies/platform-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>org.pentaho</groupId>
<artifactId>common-ui-assemblies</artifactId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
</parent>
<groupId>pentaho</groupId>
<artifactId>common-ui</artifactId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Common-UI Platform Plugin</name>
<description>
Expand All @@ -33,8 +33,8 @@

<!-- Versions -->
<flexjson.version>2.1</flexjson.version>
<pentaho-modeler.version>10.2.0.0-SNAPSHOT</pentaho-modeler.version>
<commons-gwt.version>10.2.0.0-SNAPSHOT</commons-gwt.version>
<pentaho-modeler.version>10.3.0.0-SNAPSHOT</pentaho-modeler.version>
<commons-gwt.version>10.3.0.0-SNAPSHOT</commons-gwt.version>
</properties>
<dependencies>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
/*! ******************************************************************************
*
* Pentaho
*
* Copyright (C) 2024 by Hitachi Vantara, LLC : http://www.pentaho.com
*
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file.
*
* Change Date: 2029-07-20
******************************************************************************/

// Use the server platform i18n service.
(function() {
Expand Down
Loading